diff --git a/doc/design/stdlib-subtask.md b/doc/design/stdlib-subtask.md index e24a268..3b635b3 100644 --- a/doc/design/stdlib-subtask.md +++ b/doc/design/stdlib-subtask.md @@ -20,6 +20,8 @@ `quiet=` / `静默=`(默认 `True`):仅影响 **文件** 子任务的 **TTY**。默认 **piped 捕获** stdout/stderr(父终端不被污染,`wait` map 带截断后的 `stdout`/`stderr` 供父智能体观察);`False` 时继承父进程 stdout/stderr(map 中 I/O 字段为空)。**答案载荷仍以 `# main` 返回值为主**(经 `--emit-result` 旁路)。外联子任务仍经管道收集 stdout 供 `join` 返回,不受此参数影响。 +**事件转发(文件子任务)**:spawn 时设置 `MARQDO_EVENT_FORWARD=<临时 ndjson>`;子进程内 `EventBus.publish` 追加写入该文件;父在 `wait` 阻塞期间 tail 并 republish(加 `source=child`)。这样子 LLM `stream=True` 的 token 能进 `marqdo view` SSE,而不破坏 quiet TTY 契约。函数子任务在同进程内,本来就共享 EventBus。 + 父进程结束(含 panic)时 **KillOnDrop** 终止所有文件/外联子进程;函数线程标记为 killed 并 detach(无法强杀 OS 线程)。 `poll` → `{ status: running | done | failed, … }`;函数 done 时含 `value`,进程/外联 failed 时含 `code` 或 `error`。 diff --git a/doc/design/view.md b/doc/design/view.md index 707e5e9..623ac44 100644 --- a/doc/design/view.md +++ b/doc/design/view.md @@ -118,16 +118,18 @@ marqdo view output tests/structure/hello.mq.md -o /tmp/hello-doc | **Answer** | `delta` | **主文**;token 连续拼进同一段落(禁止每 token 换行);主色正文 | | **Decision** | `decision` | 时间线条目标记(`RUN` / `CONTINUE` / `DONE` / `REUSE` / `NEW` + 可选 summary) | | **Tool** | `tool_start` / `tool_end` | 父 Plan-and-Move 的 CALL/READ:名称 + kind;`tool_end` 可带截断 `result` | -| **Child / Workbook** | `round` | **独立卡片**:轮次、退出码、workbook 链(`/file?path=`)、可选 `result` 摘要;与父思考/答案视觉分离 | -| **Status** | `run_start` / `done` / `error` | 顶栏状态 + 错误行;`done.result` 仅在无 Answer 块时作摘要,不与 reasoning 混排 | +| **Phase** | `decompose` | 父 pre-run 分解开始(workbook 链);填补「决策后到首 token」空隙 | +| **Child / Workbook** | `await` → `round` | `await`:Child **running…** 占位卡(quiet 子任务等待中);`round`:升级为完成卡(退出码 + 可选 `result`) | +| **Status** | `run_start` / `done` / `error` | 顶栏状态 + 错误行;嵌套 LLM `done`(无 `run_id`)只冲刷 drip,不改顶栏;终态 `done.result` 仅在无 Answer 时作摘要 | **传输与流畅度(对齐 ChatGPT 类产品):** 1. **Run = 一次 `fetch` POST**,用 `ReadableStream` 读响应体里的 SSE 帧;**不要**页载常驻 `EventSource`。 2. **「Run with input」拦截表单**:`preventDefault` 后走同一 Stream `/api/run`,**禁止整页重载**;带 `?stdin=` 进入时 live 页也不再阻塞跑完,改为自动开 Stream。 -3. **只改 Stream 对话框 DOM**;token **按动画帧合批**写入单一文本节点(避免每 token 触发布局)。 +3. **只改 Stream 对话框 DOM**;token **按动画帧合批一次写入**(rAF coalesce,不人为节流;打字感来自网络到达节奏)。 4. **Stick-to-bottom**:仅在用户仍贴底时跟随;程序化 `scrollTop` 产生的 scroll 事件忽略;上拉后不抢滚动,可点「↓ Latest」。 -5. **Stop**:`AbortController` 中止 fetch。 +5. **Stop**:`AbortController` 中止 fetch。 +6. **子任务并发进度**:`spawn` 立即返回;`wait` 阻塞父循环期间,子进程经 `MARQDO_EVENT_FORWARD` 把 EventBus 帧实时转发到父 SSE;view 把 `source=child` 的 delta 画进 Child 卡。quiet 仍不污染父 TTY。 视觉约束(与 §2 一致): diff --git a/doc/roadmap/agent-streaming.md b/doc/roadmap/agent-streaming.md index 6435bfe..1bdc306 100644 --- a/doc/roadmap/agent-streaming.md +++ b/doc/roadmap/agent-streaming.md @@ -104,9 +104,10 @@ ext/ai/agent step/plan 订阅事件 → 可选透传或写回「过程槽」 plan 特有: -- 每轮 `await_workbook` 前后发 `round`。 +- `await_workbook` **前**发 `await`(view Child running 占位);结束后发 `round`。 +- 父 pre-run 分解发 `decompose`。 - 父 LLM 的 `complete` 若 `stream=True`,`delta` 冒泡到 plan 的 stream。 -- **子文件 quiet 不变**;若需看子内部模型吐字,由子工作簿自己 `stream=True` 并把摘要 **返回** 或写回,而不是继承子 stdout。 +- **子文件 quiet 不变(TTY)**;默认骨架 `step stream=True`,子 EventBus 经 `MARQDO_EVENT_FORWARD` **实时转发**到父 SSE(`source=child`)。答案仍以 `# main` 返回为准。 ### 3.4 呈现面 @@ -158,7 +159,7 @@ S3 view 订阅(EventBus + GET /api/events + POST /api/run) ✅ 1. `plan` / `多步` 增加 `stream` / `echo` / `trace`(中文 `流式` / `打印增量` / `轨迹`)。 2. 事件挂在返回 map 的 `events`;父 `complete` 只冒泡 `delta`/`error`(嵌套 `done` 不进列表)。 3. `trace=True` → 写回槽 `trace`(与 TTY `echo` 可分立)。 -4. **体验(父先子后)**:非命中路径先 `plan:decompose`(父 pre-run 分解,可流式),再 `plan:await`(子 quiet)。修订轮仍是观察后父决策。SSE 本身用 `tests/ext/llm-stream-live.mq.md`。 +4. **体验(父先子后)**:非命中路径先 `decompose`(SSE + 可选 TTY `plan:decompose`),再 `await`(SSE 占位 + 可选 TTY `plan:await`),子 quiet。修订轮仍是观察后父决策。SSE 本身用 `tests/ext/llm-stream-live.mq.md`。 验收: diff --git a/ext/ai/agent.mq.md b/ext/ai/agent.mq.md index 5e5d457..f46e130 100644 --- a/ext/ai/agent.mq.md +++ b/ext/ai/agent.mq.md @@ -100,7 +100,7 @@ Allowlist check, then invoke the runbook `##` via `lib/subtask` (`spawn fn=` → Build a runnable workbook. `skeleton=single` (default): one worker `step`. `skeleton=dual`: research then write agents. On success the parent chooses DONE; runtime `agent_workbook_solidify` freezes the answer. *`q` = > json.quote text=`goal` * -*`esc` = > json.parse text={"h":"---\ntitle: agent workbook\n> ext/ai/llm.mq.md\n> ext/ai/agent.mq.md\n> lib/json.mq.md\n> lib/sys.mq.md\n> lib/writeback.mq.md\n> lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > json.parse text=[] \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. Finish the task; do not invent tools. Prefer a direct answer. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"} * +*`esc` = > json.parse text={"h":"---\ntitle: agent workbook\n> ext/ai/llm.mq.md\n> ext/ai/agent.mq.md\n> lib/json.mq.md\n> lib/sys.mq.md\n> lib/writeback.mq.md\n> lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > json.parse text=[] \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. Finish the task; do not invent tools. Prefer a direct answer. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 stream=True \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 stream=True \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 stream=True \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"} * *`h` = > json.get value=`esc` key=h * *`s1` = > json.get value=`esc` key=s1 * *`s2` = > json.get value=`esc` key=s2 * @@ -1126,17 +1126,19 @@ LLM Plan → CALL/READ/DECISION loop. Returns `{decision,reply,observation,event + `stream`=False + `echo`=False -TTY marker for pre-run parent decompose (before any child spawn). +Pre-run parent decompose marker. With `stream=True`, publish `{type:decompose}` so view is not silent before the first child. 1. `stream` + *`ev` = > json.parse text={"type":"decompose"} * + *`ev` = > json.set map=`ev` key=workbook value=`workbook` * + > sys.stream_publish event=`ev` 1. `echo` > print text=plan:decompose 2. * *`_` = 1* + **`ev`** 2. * - *`_` = 1* - -**** + **** ## plan_echo_await + `round` @@ -1144,18 +1146,21 @@ TTY marker for pre-run parent decompose (before any child spawn). + `stream`=False + `echo`=False -TTY-only marker before `await_workbook` so `stream+echo` is not silent during the (often long) child run. +Marker before `await_workbook`. With `stream=True`, publish `{type:await,round,workbook}` so the Stream panel shows progress while the quiet child runs (TTY `echo` optional). 1. `stream` + *`ev` = > json.parse text={"type":"await"} * + *`ev` = > json.set map=`ev` key=round value=`round` * + *`ev` = > json.set map=`ev` key=workbook value=`workbook` * + > sys.stream_publish event=`ev` 1. `echo` > print text=plan:await > print text=`round` 2. * *`_` = 1* + **`ev`** 2. * - *`_` = 1* - -**** + **** ## workbook_has_worker_step + `path` diff --git a/src/host/event_bus.rs b/src/host/event_bus.rs index fd66e20..3f4ef92 100644 --- a/src/host/event_bus.rs +++ b/src/host/event_bus.rs @@ -1,7 +1,11 @@ //! Process-wide stream event bus for `marqdo view` SSE (S3). //! Publishers: LLM SSE parse, optional `host_stream_publish`. -//! Subscribers: view `GET /api/events`. +//! Subscribers: view `GET /api/events` / `POST /api/run`. +//! +//! File subtasks set `MARQDO_EVENT_FORWARD=`; the child appends each +//! published event so the parent can fan them onto its own bus while `wait` blocks. +use std::io::Write; use std::sync::mpsc::{self, Receiver, Sender}; use std::sync::{Mutex, OnceLock}; @@ -35,10 +39,11 @@ impl EventBus { } pub fn publish_json(&self, json_line: &str) { - let Ok(mut g) = self.subs.lock() else { - return; - }; - g.retain(|tx| tx.send(json_line.to_string()).is_ok()); + if let Ok(mut g) = self.subs.lock() { + g.retain(|tx| tx.send(json_line.to_string()).is_ok()); + } + // Child → parent bridge (no-op unless spawn set the env). + forward_to_parent_file(json_line); } pub fn publish_value(&self, v: &Value) { @@ -48,6 +53,23 @@ impl EventBus { } } +fn forward_to_parent_file(json_line: &str) { + let Ok(path) = std::env::var("MARQDO_EVENT_FORWARD") else { + return; + }; + if path.is_empty() { + return; + } + if let Ok(mut f) = std::fs::OpenOptions::new() + .create(true) + .append(true) + .open(&path) + { + let _ = writeln!(f, "{json_line}"); + let _ = f.flush(); + } +} + /// Publish a Marqdo map (or any value) onto the global bus. pub fn publish(v: &Value) { EventBus::global().publish_value(v); diff --git a/src/host/subtask.rs b/src/host/subtask.rs index 30742c9..06549db 100644 --- a/src/host/subtask.rs +++ b/src/host/subtask.rs @@ -1,12 +1,17 @@ //! Concurrent subtasks: OS file children, in-process functions, foreign subprocesses. //! Parent `HostContext` drop kills/waits file & foreign children; function threads detach. +//! +//! Quiet file children get `MARQDO_EVENT_FORWARD` so LLM stream events published in the +//! child process are tailed into the parent EventBus while `wait` blocks (view SSE). use std::collections::HashMap; -use std::io::Read; +use std::io::{Read, Seek, SeekFrom}; use std::path::PathBuf; use std::process::{Child, Command, Stdio}; +use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, Mutex}; use std::thread::{self, JoinHandle}; +use std::time::Duration; /// Cap for file-child stdout/stderr returned on `wait` (parent observation). const FILE_IO_CAP: usize = 8 * 1024; @@ -37,11 +42,81 @@ impl std::fmt::Debug for Handle { pub(crate) struct FileTask { child: Child, result_path: PathBuf, + /// NDJSON path the child appends EventBus frames to (`MARQDO_EVENT_FORWARD`). + events_path: Option, + /// Stops the parent-side tailer that republishes child events. + forward_stop: Option>, + forward: Option>, /// Present when `quiet=True` (piped capture). Absent when inheriting TTY. stdout: Option>, stderr: Option>, } +fn stop_event_forward(task: &mut FileTask) { + if let Some(stop) = task.forward_stop.take() { + stop.store(true, Ordering::SeqCst); + } + if let Some(h) = task.forward.take() { + let _ = h.join(); + } + if let Some(p) = task.events_path.take() { + let _ = std::fs::remove_file(p); + } +} + +/// Tail `MARQDO_EVENT_FORWARD` NDJSON and republish onto the parent bus with `source=child`. +fn spawn_event_forwarder(path: PathBuf, stop: Arc) -> JoinHandle<()> { + thread::spawn(move || { + let mut pos: u64 = 0; + let mut carry = String::new(); + loop { + let done = stop.load(Ordering::SeqCst); + if let Ok(mut f) = std::fs::File::open(&path) { + if f.seek(SeekFrom::Start(pos)).is_ok() { + let mut buf = String::new(); + if f.read_to_string(&mut buf).is_ok() && !buf.is_empty() { + pos += buf.len() as u64; + carry.push_str(&buf); + while let Some(idx) = carry.find('\n') { + let line = carry[..idx].trim().to_string(); + carry.drain(..=idx); + if line.is_empty() { + continue; + } + republish_child_event(&line); + } + } + } + } + if done { + if !carry.is_empty() { + let line = carry.trim(); + if !line.is_empty() { + republish_child_event(line); + } + carry.clear(); + } + break; + } + thread::sleep(Duration::from_millis(16)); + } + }) +} + +fn republish_child_event(line: &str) { + let Ok(mut v) = serde_json::from_str::(line) else { + return; + }; + // Skip nested terminal frames — parent owns run lifecycle. + if v.get("type").and_then(|t| t.as_str()) == Some("done") && v.get("run_id").is_none() { + return; + } + if let Some(obj) = v.as_object_mut() { + obj.insert("source".into(), serde_json::json!("child")); + } + crate::host::event_bus::EventBus::global().publish_json(&v.to_string()); +} + pub(crate) struct ForeignTask { child: Child, temp_script: PathBuf, @@ -136,6 +211,7 @@ pub fn kill_all(ctx: &mut HostContext) { Handle::File(mut task) => { let _ = task.child.kill(); let _ = task.child.wait(); + stop_event_forward(&mut task); if let Some(h) = task.stdout.take() { let _ = h.join(); } @@ -252,6 +328,15 @@ fn spawn_file( cmd.arg(as_text(item, "arg")?); } } + // Bridge child EventBus → parent while wait blocks (view SSE / concurrent progress). + let events_path = std::env::temp_dir().join(format!( + "marqdo-events-{}-{}.ndjson", + std::process::id(), + id + )); + let _ = std::fs::write(&events_path, ""); + cmd.env("MARQDO_EVENT_FORWARD", &events_path); + let mut child = cmd .spawn() .map_err(|e| format!("subtask spawn {}: {e}", file.display()))?; @@ -276,11 +361,16 @@ fn spawn_file( } else { (None, None) }; + let forward_stop = Arc::new(AtomicBool::new(false)); + let forward = spawn_event_forwarder(events_path.clone(), Arc::clone(&forward_stop)); ctx.subtasks.insert( id, Handle::File(FileTask { child, result_path, + events_path: Some(events_path), + forward_stop: Some(forward_stop), + forward: Some(forward), stdout, stderr, }), @@ -445,10 +535,12 @@ pub fn join(ctx: &mut HostContext, id: &Value) -> Result { .ok_or_else(|| format!("subtask: unknown id {id}"))?; match handle { Handle::File(mut task) => { + // Forwarder runs concurrently while we block on the OS child. let status = task .child .wait() .map_err(|e| format!("subtask join: {e}"))?; + stop_event_forward(&mut task); let code = status.code().unwrap_or(-1) as i64; let value = read_emitted_result(&task.result_path); let _ = std::fs::remove_file(&task.result_path); @@ -547,6 +639,7 @@ pub fn kill(ctx: &mut HostContext, id: &Value) -> Result { .kill() .map_err(|e| format!("subtask kill: {e}"))?; let _ = task.child.wait(); + stop_event_forward(&mut task); if let Some(h) = task.stdout.take() { let _ = h.join(); } diff --git a/src/view/html.rs b/src/view/html.rs index e079908..1a66fce 100644 --- a/src/view/html.rs +++ b/src/view/html.rs @@ -682,6 +682,29 @@ section.block > h2 { background: #f8fafc; padding: 0.65rem 0.85rem; } +.stream-child-await { + border-left-color: #94a3b8; + background: #f8fafc; + opacity: 0.95; +} +.stream-child-await .stream-child-head strong { + color: #64748b; +} +.stream-phase { + display: flex; + flex-wrap: wrap; + align-items: baseline; + gap: 0.35rem 0.65rem; + font: 0.78rem/1.35 var(--sans); + color: var(--muted); + padding: 0.2rem 0; + border-top: 1px dashed var(--line); +} +.stream-phase strong { + font-weight: 600; + color: #475569; + letter-spacing: 0.02em; +} .stream-child-head { display: flex; flex-wrap: wrap; @@ -1017,9 +1040,11 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { var ignoreScroll = false; var pendingReason = ""; var pendingAnswer = ""; + var pendingChild = ""; var raf = 0; - // Drip 1 Unicode scalar per frame (一字一吐). Catch up if backlog grows. - var CHARS_PER_TICK = 1; + // Industry pattern: coalesce tokens to one DOM write per animation frame. + // Do NOT artificially drip/hold text — network pacing is the typing effect. + var awaitCards = Object.create(null); var abortCtrl = null; function nearBottom() {{ @@ -1077,6 +1102,8 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { answerNode = null; pendingReason = ""; pendingAnswer = ""; + pendingChild = ""; + awaitCards = Object.create(null); if (raf) {{ cancelAnimationFrame(raf); raf = 0; }} pinned = true; updateJump(); @@ -1112,6 +1139,25 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { answerEl.appendChild(answerNode); turn.appendChild(answerEl); }} + function flushChildPending() {{ + if (!pendingChild) return; + var keys = Object.keys(awaitCards); + var card = keys.length ? awaitCards[keys[keys.length - 1]] : null; + if (!card || !card.parentNode) {{ + pendingAnswer += pendingChild; + pendingChild = ""; + return; + }} + var out = card.querySelector(".stream-child-body"); + if (!out) {{ + out = document.createElement("div"); + out.className = "stream-child-body"; + card.appendChild(out); + }} + out.textContent += pendingChild; + pendingChild = ""; + if (status) status.textContent = "child streaming…"; + }} function flushPendingAll() {{ if (raf) {{ cancelAnimationFrame(raf); raf = 0; }} if (pendingReason) {{ @@ -1124,32 +1170,23 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { answerNode.data += pendingAnswer; pendingAnswer = ""; }} + flushChildPending(); scrollIfPinned(); }} function dripPending() {{ raf = 0; - function take(src, n) {{ - var chars = Array.from(src); - var takeN = Math.min(n, chars.length); - return [chars.slice(0, takeN).join(""), chars.slice(takeN).join("")]; - }} if (pendingReason) {{ ensureThinking(); - var n = pendingReason.length > 240 ? 12 : (pendingReason.length > 80 ? 4 : CHARS_PER_TICK); - var r = take(pendingReason, n); - reasonNode.data += r[0]; - pendingReason = r[1]; - }} else if (pendingAnswer) {{ + reasonNode.data += pendingReason; + pendingReason = ""; + }} + if (pendingAnswer) {{ ensureAnswer(); - var n2 = pendingAnswer.length > 240 ? 12 : (pendingAnswer.length > 80 ? 4 : CHARS_PER_TICK); - var a = take(pendingAnswer, n2); - answerNode.data += a[0]; - pendingAnswer = a[1]; + answerNode.data += pendingAnswer; + pendingAnswer = ""; }} + flushChildPending(); scrollIfPinned(); - if (pendingReason || pendingAnswer) {{ - raf = requestAnimationFrame(dripPending); - }} }} function queueText(kind, text) {{ if (!text) return; @@ -1157,6 +1194,11 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { else pendingAnswer += text; if (!raf) raf = requestAnimationFrame(dripPending); }} + function appendChildStream(text) {{ + if (!text) return; + pendingChild += text; + if (!raf) raf = requestAnimationFrame(dripPending); + }} function formatResult(v) {{ if (v == null) return ""; if (typeof v === "string") return v; @@ -1216,10 +1258,83 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { turn.appendChild(card); scrollIfPinned(); }} + function addPhaseMark(label, ev) {{ + flushPendingAll(); + ensureTurn(); + var row = document.createElement("div"); + row.className = "stream-phase"; + var strong = document.createElement("strong"); + strong.textContent = label; + row.appendChild(strong); + if (ev && ev.workbook) {{ + var a = document.createElement("a"); + a.href = "/file?path=" + encodeURIComponent(ev.workbook); + a.textContent = ev.workbook; + row.appendChild(a); + }} + turn.appendChild(row); + scrollIfPinned(); + }} + function addAwaitCard(ev) {{ + flushPendingAll(); + var key = String(ev.round != null ? ev.round : "?"); + var existing = awaitCards[key]; + if (existing && existing.parentNode) {{ + existing.className = "stream-child stream-child-await"; + var t0 = existing.querySelector("strong"); + if (t0) t0.textContent = "Child running…"; + if (status) status.textContent = "awaiting child…"; + scrollIfPinned(); + return; + }} + var card = document.createElement("div"); + card.className = "stream-child stream-child-await"; + card.setAttribute("data-await-round", key); + var head = document.createElement("div"); + head.className = "stream-child-head"; + var title = document.createElement("strong"); + title.textContent = "Child running…"; + head.appendChild(title); + var meta = document.createElement("span"); + meta.className = "stream-child-meta"; + var bits = []; + if (ev.round != null) bits.push("round " + ev.round); + bits.push("waiting"); + meta.textContent = bits.join(" · "); + head.appendChild(meta); + if (ev.workbook) {{ + var a = document.createElement("a"); + a.href = "/file?path=" + encodeURIComponent(ev.workbook); + a.textContent = ev.workbook; + head.appendChild(a); + }} + card.appendChild(head); + var live = document.createElement("div"); + live.className = "stream-child-body"; + card.appendChild(live); + body.appendChild(card); + awaitCards[key] = card; + if (status) status.textContent = "awaiting child…"; + resetTurnRefs(); + scrollIfPinned(); + }} function addChildCard(ev) {{ flushPendingAll(); - var card = document.createElement("div"); - card.className = "stream-child"; + var key = String(ev.round != null ? ev.round : "?"); + var card = awaitCards[key]; + var liveText = ""; + if (card && card.parentNode) {{ + var live = card.querySelector(".stream-child-body"); + if (live) liveText = live.textContent || ""; + delete awaitCards[key]; + card.className = "stream-child"; + card.removeAttribute("data-await-round"); + card.innerHTML = ""; + }} else {{ + card = document.createElement("div"); + card.className = "stream-child"; + body.appendChild(card); + }} var head = document.createElement("div"); head.className = "stream-child-head"; var title = document.createElement("strong"); @@ -1240,13 +1355,14 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { }} card.appendChild(head); var res = formatResult(ev.result); + if (!res && liveText) res = liveText; if (res) {{ var out = document.createElement("div"); out.className = "stream-child-body"; out.textContent = res.length > 8000 ? res.slice(0, 8000) + "…" : res; card.appendChild(out); }} - body.appendChild(card); + if (status) status.textContent = "running…"; resetTurnRefs(); scrollIfPinned(); }} @@ -1261,9 +1377,11 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { function handleEvent(ev) {{ var t = ev.type || "?"; if (t === "reasoning") {{ - queueText("reasoning", ev.text || ""); + if (ev.source === "child") appendChildStream(ev.text || ""); + else queueText("reasoning", ev.text || ""); }} else if (t === "delta") {{ - queueText("answer", ev.text || ""); + if (ev.source === "child") appendChildStream(ev.text || ""); + else queueText("answer", ev.text || ""); }} else if (t === "error") {{ addError(ev.message || "error"); if (status) status.textContent = "error"; @@ -1271,6 +1389,11 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { addDecision(ev); }} else if (t === "tool_start" || t === "tool_end") {{ addToolCard(ev); + }} else if (t === "decompose") {{ + addPhaseMark("DECOMPOSE", ev); + if (status) status.textContent = "planning…"; + }} else if (t === "await") {{ + addAwaitCard(ev); }} else if (t === "round") {{ addChildCard(ev); }} else if (t === "run_start") {{ @@ -1289,15 +1412,18 @@ pub fn layout(title: &str, nav: &str, main: &str) -> String { turn.appendChild(mark); scrollIfPinned(); }} else if (t === "done") {{ + // Nested LLM `done` (no run_id): flush drip only; do not rewrite Answer/status. flushPendingAll(); - if (ev.run_id != null && status) status.textContent = "done"; - var hasAnswer = answerNode && answerNode.data; - if (!hasAnswer && typeof ev.result === "string" && ev.result) {{ - ensureAnswer(); - answerNode.data += ev.result; - scrollIfPinned(); + if (ev.run_id != null) {{ + if (status) status.textContent = "done"; + var hasAnswer = answerNode && answerNode.data; + if (!hasAnswer && typeof ev.result === "string" && ev.result) {{ + ensureAnswer(); + answerNode.data += ev.result; + scrollIfPinned(); + }} + if (thinkingEl && (answerNode && answerNode.data)) thinkingEl.open = false; }} - if (thinkingEl && (answerNode && answerNode.data)) thinkingEl.open = false; }} }} function setRunning(on) {{ diff --git a/src/view/mod.rs b/src/view/mod.rs index 2539dfa..26fcd88 100644 --- a/src/view/mod.rs +++ b/src/view/mod.rs @@ -678,9 +678,11 @@ impl SseBody { } fn for_run(rx: Receiver, run_id: u64) -> Self { + // Prime with a comment so proxies/browsers flush response headers immediately + // (industry SSE practice: first bytes ASAP after Content-Type). Self { rx, - buf: Vec::new(), + buf: b": connected\n\n".to_vec(), pos: 0, stop_run_id: Some(run_id), closed: false, @@ -713,6 +715,8 @@ impl Read for SseBody { } match self.rx.recv_timeout(Duration::from_secs(15)) { Ok(json) => { + // One event per TCP write — smooth token UX. Do not coalesce large + // batches (that caused jumpy "dump then pause" in the Stream panel). let terminal = self .stop_run_id .map(|id| Self::frame_ends_run(&json, id)) diff --git a/tests/ext/agent-plan-stream-offline.mq.md b/tests/ext/agent-plan-stream-offline.mq.md index 39acc41..6f74e75 100644 --- a/tests/ext/agent-plan-stream-offline.mq.md +++ b/tests/ext/agent-plan-stream-offline.mq.md @@ -59,3 +59,13 @@ description: plan_append_*/plan_finish_stream; confirm=True with stream attaches *`plast` = > at value=`pevs` index=0 * *`pt` = > json.get value=`plast` key=type * > print text=`pt` + +*`aev` = > agent.plan_echo_await round=2 workbook=wb.mq.md stream=True * +*`at` = > json.get value=`aev` key=type * +> print text=`at` +*`ar` = > json.get value=`aev` key=round * +> print text=`ar` + +*`dev` = > agent.plan_echo_decompose workbook=wb.mq.md stream=True * +*`dt` = > json.get value=`dev` key=type * +> print text=`dt` diff --git a/tests/gold.rs b/tests/gold.rs index 34b8bea..c97eb4d 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -1504,7 +1504,10 @@ done child pending 1 -done", +done +await +2 +decompose", ); }