zcode-acp-server 0.1.0 → 0.3.0

package/dist/handlers/background-tasks.d.ts

@@ -0,0 +1,72 @@
+/**
+ * Session-scoped background-task listener.
+ *
+ * Background sub-agents (the Agent/Task tool launched with `run_in_background:
+ * true`) keep producing events AFTER `session/prompt` has returned: their
+ * internal tool calls stream as `tool.updated`, and when they finish the
+ * backend auto-triggers a notification turn (`turn.started` with
+ * `inputSource:"background_task"`) whose `text_delta` carries the result.
+ *
+ * The per-prompt turn loop (`runEventTurn`) exits at `turn.completed` and
+ * unregisters its listener, so without this module ALL of those post-turn
+ * events are silently dropped — the user sees "background task launched" and
+ * then nothing.
+ *
+ * This listener is registered once per session (lives across prompts) and
+ * forwards a curated subset to the ACP client as out-of-band `session/update`
+ * notifications:
+ *
+ *   - `session.updated` carrying `taskId`  → background task status change.
+ *     First sighting emits a fresh `tool_call` card (`[background] …`);
+ *     subsequent sightings emit `tool_call_update` with the new status.
+ *   - `turn.started` with `inputSource:"background_task"` → marks the start
+ *     of a notification turn; its `model.streaming text_delta` is forwarded
+ *     as `agent_message_chunk` so the user sees the background result.
+ *
+ * Everything else is ignored — the turn loop handles normal turns and normal
+ * tool calls. Per the design decision, background agents' INTERNAL tool calls
+ * are NOT expanded here (only the task-level card + the final result message).
+ *
+ * All work is best-effort: failures are logged via `warn()` and never thrown
+ * into the event loop (would crash the bridge, per AGENTS.md).
+ */
+import type { EventListener } from "../backend/client.js";
+import type { ZcodeEvent } from "../backend/types.js";
+import type { ZcodeAcpServer } from "../server.js";
+export declare class BackgroundTaskListener implements EventListener {
+    private readonly server;
+    readonly zcodeSid: string;
+    /** taskId → tracked state. */
+    private readonly tasks;
+    /**
+     * The turnId of the currently-active background notification turn, if any.
+     * While set, that turn's `model.streaming text_delta` events are forwarded
+     * to the client as `agent_message_chunk`.
+     */
+    private activeNotifyTurnId;
+    constructor(server: ZcodeAcpServer, zcodeSid: string);
+    handleEvent(event: ZcodeEvent): void;
+    /** Handle a `session.updated` carrying a background task status. */
+    private onTaskStatus;
+    /**
+     * Push a status update for an already-tracked task. For background Bash
+     * (reusesLaunchCard), a terminal-state transition also streams the final
+     * output via terminal_output and closes the terminal UI with terminal_exit
+     * (mirroring dispatchTerminalUpdate's 2-notification split), then clears
+     * terminalSentData so the launch card is fully retired.
+     */
+    private emitStatusUpdate;
+    /** Forward a text delta from the active background notification turn. */
+    private forwardText;
+    private firstMessageId;
+    private activeMessageId;
+    /**
+     * Mark a tracked task as cancelled (used by `session/cancelBackgroundTask`).
+     * Emits a final `failed` update with `_meta.backgroundTask.cancelled = true`
+     * so the editor card reflects the cancellation, then drops local state. For
+     * background Bash reusing a launch terminal card, also emits terminal_exit
+     * and clears terminalSentData so the terminal UI closes cleanly.
+     */
+    markCancelled(taskId: string): Promise<void>;
+}
+//# sourceMappingURL=background-tasks.d.ts.map

package/dist/handlers/background-tasks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-tasks.d.ts","sourceRoot":"","sources":["../../src/handlers/background-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAwEnD,qBAAa,sBAAuB,YAAW,aAAa;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,8BAA8B;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkC;IACxD;;;;OAIG;IACH,OAAO,CAAC,kBAAkB,CAAuB;gBAErC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;IAKpD,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmDpC,oEAAoE;YACtD,YAAY;IAkE1B;;;;;;OAMG;YACW,gBAAgB;IAiG9B,yEAAyE;YAC3D,WAAW;IAczB,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,eAAe;IAIvB;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BnD"}

package/dist/handlers/background-tasks.js

@@ -0,0 +1,330 @@
+/**
+ * Session-scoped background-task listener.
+ *
+ * Background sub-agents (the Agent/Task tool launched with `run_in_background:
+ * true`) keep producing events AFTER `session/prompt` has returned: their
+ * internal tool calls stream as `tool.updated`, and when they finish the
+ * backend auto-triggers a notification turn (`turn.started` with
+ * `inputSource:"background_task"`) whose `text_delta` carries the result.
+ *
+ * The per-prompt turn loop (`runEventTurn`) exits at `turn.completed` and
+ * unregisters its listener, so without this module ALL of those post-turn
+ * events are silently dropped — the user sees "background task launched" and
+ * then nothing.
+ *
+ * This listener is registered once per session (lives across prompts) and
+ * forwards a curated subset to the ACP client as out-of-band `session/update`
+ * notifications:
+ *
+ *   - `session.updated` carrying `taskId`  → background task status change.
+ *     First sighting emits a fresh `tool_call` card (`[background] …`);
+ *     subsequent sightings emit `tool_call_update` with the new status.
+ *   - `turn.started` with `inputSource:"background_task"` → marks the start
+ *     of a notification turn; its `model.streaming text_delta` is forwarded
+ *     as `agent_message_chunk` so the user sees the background result.
+ *
+ * Everything else is ignored — the turn loop handles normal turns and normal
+ * tool calls. Per the design decision, background agents' INTERNAL tool calls
+ * are NOT expanded here (only the task-level card + the final result message).
+ *
+ * All work is best-effort: failures are logged via `warn()` and never thrown
+ * into the event loop (would crash the bridge, per AGENTS.md).
+ */
+import { randomUUID } from "node:crypto";
+import { log, warn } from "../utils.js";
+/** Map a zcode background task status string to an ACP ToolCallStatus. */
+function toAcpStatus(status) {
+    if (status === "completed")
+        return "completed";
+    if (status === "failed" || status === "error" || status === "cancelled")
+        return "failed";
+    return "in_progress"; // running / pending / unknown
+}
+/** Build the card title for a background task. */
+function cardTitle(description) {
+    const d = (description ?? "").trim();
+    return d ? `[background] ${d}` : "[background] task";
+}
+export class BackgroundTaskListener {
+    server;
+    zcodeSid;
+    /** taskId → tracked state. */
+    tasks = new Map();
+    /**
+     * The turnId of the currently-active background notification turn, if any.
+     * While set, that turn's `model.streaming text_delta` events are forwarded
+     * to the client as `agent_message_chunk`.
+     */
+    activeNotifyTurnId = null;
+    constructor(server, zcodeSid) {
+        this.server = server;
+        this.zcodeSid = zcodeSid;
+    }
+    handleEvent(event) {
+        try {
+            if (event.type === "session.updated") {
+                const raw = event.payload;
+                if (raw && typeof raw.taskId === "string" && raw.taskId) {
+                    // taskId is verified string above; cast to the full shape (other
+                    // fields are optional and read defensively inside onTaskStatus).
+                    void this.onTaskStatus(raw);
+                }
+                return;
+            }
+            if (event.type === "turn.started") {
+                const inputSource = event.payload?.["inputSource"];
+                const turnId = event.payload?.["turnId"] ?? "";
+                if (inputSource === "background_task") {
+                    this.activeNotifyTurnId = turnId || null;
+                    if (this.activeNotifyTurnId) {
+                        log(`  [bg] background notification turn started (${turnId.slice(-8)})`);
+                    }
+                }
+                return;
+            }
+            // Inside an active background notification turn → forward text deltas.
+            if (this.activeNotifyTurnId) {
+                if (event.type === "model.streaming") {
+                    const kind = event.payload?.["kind"];
+                    if (kind === "text_delta") {
+                        const delta = event.payload?.["delta"] ?? "";
+                        if (delta)
+                            void this.forwardText(delta);
+                    }
+                    return;
+                }
+                if (event.type === "turn.completed" || event.type === "turn.failed") {
+                    log(`  [bg] background notification turn ended (${event.type})`);
+                    this.activeNotifyTurnId = null;
+                    // Reset the result messageId so the NEXT background task in this
+                    // session gets its own — otherwise the editor would merge/overwrite
+                    // distinct tasks' outputs under one shared messageId.
+                    this.firstMessageId = null;
+                    return;
+                }
+            }
+        }
+        catch (e) {
+            warn(`BackgroundTaskListener: event handling failed: ${e instanceof Error ? e.message : String(e)}`);
+        }
+    }
+    /** Handle a `session.updated` carrying a background task status. */
+    async onTaskStatus(p) {
+        const taskId = p.taskId;
+        const status = p.status ?? "running";
+        const acpStatus = toAcpStatus(status);
+        let task = this.tasks.get(taskId);
+        if (!task) {
+            // First sighting → decide whether to reuse the launch card or mint a
+            // fresh bg_* card. Background Bash: the dispatcher seeds
+            // `terminalSentData[toolCallId]` when the launch card is created, so its
+            // presence means the client already has a terminal card for this call —
+            // route the lifecycle back to it instead of creating a duplicate. Sub-
+            // agents (Agent/Task tool) have no such launch card → fall back to bg_*.
+            const launchToolCallId = p.toolCallId;
+            const reusesLaunchCard = !!launchToolCallId && this.server.terminalSentData.has(launchToolCallId);
+            if (reusesLaunchCard) {
+                task = {
+                    acpCallId: launchToolCallId,
+                    sourceToolCallId: launchToolCallId,
+                    reusesLaunchCard: true,
+                    description: p.description ?? "",
+                    lastStatus: "",
+                };
+                this.tasks.set(taskId, task);
+                // The launch card already exists (dispatch created it in the main
+                // turn). Don't emit a new tool_call — just push the first status update
+                // so the card reflects "running in background" with task metadata.
+                await this.emitStatusUpdate(task, acpStatus, p);
+                log(`  [bg] reusing launch card ${launchToolCallId.slice(-12)} for task ${taskId.slice(-12)}`);
+                return;
+            }
+            // No launch card to reuse → emit a fresh [background] tool_call card.
+            task = {
+                acpCallId: `bg_${randomUUID().slice(0, 12)}`,
+                reusesLaunchCard: false,
+                description: p.description ?? "",
+                lastStatus: "",
+            };
+            this.tasks.set(taskId, task);
+            const meta = {
+                backgroundTask: {
+                    taskId,
+                    agentId: p.terminalId ?? undefined,
+                    outputPath: p.outputPath ?? undefined,
+                    sourceToolCallId: p.toolCallId ?? undefined,
+                },
+            };
+            const ok = await this.server.notifyByZcodeSid(this.zcodeSid, {
+                sessionUpdate: "tool_call",
+                toolCallId: task.acpCallId,
+                title: cardTitle(task.description),
+                kind: "other",
+                status: acpStatus,
+                _meta: meta,
+            });
+            task.lastStatus = acpStatus;
+            if (ok) {
+                log(`  [bg] task card emitted: ${taskId.slice(-12)} status=${acpStatus}`);
+            }
+            return;
+        }
+        await this.emitStatusUpdate(task, acpStatus, p);
+    }
+    /**
+     * Push a status update for an already-tracked task. For background Bash
+     * (reusesLaunchCard), a terminal-state transition also streams the final
+     * output via terminal_output and closes the terminal UI with terminal_exit
+     * (mirroring dispatchTerminalUpdate's 2-notification split), then clears
+     * terminalSentData so the launch card is fully retired.
+     */
+    async emitStatusUpdate(task, acpStatus, p) {
+        // Skip no-op status updates (same as last advertised).
+        if (task.lastStatus === acpStatus && !task.reusesLaunchCard)
+            return;
+        const meta = {
+            backgroundTask: { taskId: p.taskId },
+        };
+        if (p.outputPath)
+            meta.backgroundTask["outputPath"] = p.outputPath;
+        const isTerminal = acpStatus === "completed" || acpStatus === "failed";
+        // Background Bash closing a launch terminal card: stream final output +
+        // emit terminal_exit so Zed's terminal UI finalises. The terminal_output
+        // diff guard mirrors dispatchTerminalUpdate (only emit the suffix beyond
+        // what was already streamed; for a background launch the launch text was
+        // already sent, so outputTail here is the real command output).
+        if (task.reusesLaunchCard && task.sourceToolCallId) {
+            // Stream any new command output via terminal_output. The output is
+            // tracked on `task.streamedOutput` (NOT server.terminalSentData) because
+            // terminalSentData holds the launch acknowledgement text written by the
+            // dispatcher, which is unrelated to the command's actual stdout — they
+            // aren't prefix-related, so diffing against the launch text would drop
+            // the real output entirely. Each session.updated carries a CUMULATIVE
+            // outputTail snapshot, so we diff against what we last streamed and emit
+            // only the suffix (mirrors dispatchTerminalUpdate's progress diffing).
+            const finalOutput = p.outputTail ?? p.stdoutTail ?? "";
+            const lastSent = task.streamedOutput ?? "";
+            if (finalOutput) {
+                const delta = lastSent && finalOutput.startsWith(lastSent)
+                    ? finalOutput.slice(lastSent.length)
+                    : finalOutput;
+                if (delta) {
+                    task.streamedOutput = finalOutput;
+                    await this.server.notifyByZcodeSid(this.zcodeSid, {
+                        sessionUpdate: "tool_call_update",
+                        toolCallId: task.sourceToolCallId,
+                        _meta: { terminal_output: { terminal_id: task.sourceToolCallId, data: delta } },
+                    });
+                }
+            }
+            // terminal_exit only fires on a terminal status. A non-terminal (running)
+            // update has streamed its progress above; also push an in_progress status
+            // update with backgroundTask metadata so the card reflects "running in
+            // background" on first sighting (the launch card was left in_progress by
+            // the dispatcher, but we still advertise the status to attach taskId).
+            if (!isTerminal) {
+                await this.server.notifyByZcodeSid(this.zcodeSid, {
+                    sessionUpdate: "tool_call_update",
+                    toolCallId: task.sourceToolCallId,
+                    status: acpStatus,
+                    _meta: meta,
+                });
+                task.lastStatus = acpStatus;
+                return;
+            }
+            const exitCode = acpStatus === "failed" ? 1 : 0;
+            meta.backgroundTask["completed"] = true;
+            await this.server.notifyByZcodeSid(this.zcodeSid, {
+                sessionUpdate: "tool_call_update",
+                toolCallId: task.sourceToolCallId,
+                status: acpStatus,
+                content: [{ type: "terminal", terminalId: task.sourceToolCallId }],
+                _meta: {
+                    ...meta,
+                    claudeCode: { toolName: "Bash" },
+                    terminal_exit: {
+                        terminal_id: task.sourceToolCallId,
+                        exit_code: exitCode,
+                        signal: null,
+                    },
+                },
+            });
+            this.server.terminalSentData.delete(task.sourceToolCallId);
+            task.lastStatus = acpStatus;
+            log(`  [bg] launch card ${task.sourceToolCallId.slice(-12)} → ${acpStatus} (terminal_exit)`);
+            return;
+        }
+        // Subsequent sighting (bg_* card) or non-terminal → status update only.
+        if (task.lastStatus === acpStatus)
+            return;
+        const ok = await this.server.notifyByZcodeSid(this.zcodeSid, {
+            sessionUpdate: "tool_call_update",
+            toolCallId: task.acpCallId,
+            status: acpStatus,
+            _meta: meta,
+        });
+        task.lastStatus = acpStatus;
+        if (ok) {
+            log(`  [bg] task status update: ${p.taskId.slice(-12)} → ${acpStatus}`);
+        }
+    }
+    /** Forward a text delta from the active background notification turn. */
+    async forwardText(delta) {
+        // Allocate the messageId lazily so an empty-result turn emits nothing.
+        let msgId = this.activeMessageId();
+        if (!msgId) {
+            msgId = `bg_msg_${randomUUID().slice(0, 12)}`;
+            this.firstMessageId = msgId;
+        }
+        await this.server.notifyByZcodeSid(this.zcodeSid, {
+            sessionUpdate: "agent_message_chunk",
+            content: { type: "text", text: delta },
+            messageId: msgId,
+        });
+    }
+    firstMessageId = null;
+    activeMessageId() {
+        return this.firstMessageId;
+    }
+    /**
+     * Mark a tracked task as cancelled (used by `session/cancelBackgroundTask`).
+     * Emits a final `failed` update with `_meta.backgroundTask.cancelled = true`
+     * so the editor card reflects the cancellation, then drops local state. For
+     * background Bash reusing a launch terminal card, also emits terminal_exit
+     * and clears terminalSentData so the terminal UI closes cleanly.
+     */
+    async markCancelled(taskId) {
+        const task = this.tasks.get(taskId);
+        if (!task)
+            return;
+        if (task.reusesLaunchCard && task.sourceToolCallId) {
+            await this.server.notifyByZcodeSid(this.zcodeSid, {
+                sessionUpdate: "tool_call_update",
+                toolCallId: task.sourceToolCallId,
+                status: "failed",
+                content: [{ type: "terminal", terminalId: task.sourceToolCallId }],
+                _meta: {
+                    backgroundTask: { taskId, cancelled: true },
+                    claudeCode: { toolName: "Bash" },
+                    terminal_exit: {
+                        terminal_id: task.sourceToolCallId,
+                        exit_code: 1,
+                        signal: null,
+                    },
+                },
+            });
+            this.server.terminalSentData.delete(task.sourceToolCallId);
+        }
+        else {
+            await this.server.notifyByZcodeSid(this.zcodeSid, {
+                sessionUpdate: "tool_call_update",
+                toolCallId: task.acpCallId,
+                status: "failed",
+                _meta: { backgroundTask: { taskId, cancelled: true } },
+            });
+        }
+        this.tasks.delete(taskId);
+        log(`  [bg] task cancelled: ${taskId.slice(-12)}`);
+    }
+}
+//# sourceMappingURL=background-tasks.js.map

package/dist/handlers/background-tasks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-tasks.js","sourceRoot":"","sources":["../../src/handlers/background-tasks.ts"],"names":[],"mappings":"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"}

package/dist/handlers/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/handlers/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAKrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,yEAAyE;AACzE,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,GAAG,CAAC,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,aAAa,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAmCf"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/handlers/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAcrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAInD,yEAAyE;AACzE,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,GAAG,CAAC,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,aAAa,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAsCf"}

package/dist/handlers/dispatch.js

@@ -9,8 +9,9 @@
  */
 import { randomUUID } from "node:crypto";
 import { currentModelCached } from "../config/model-cache.js";
-import { modelContextWindow } from "../config/options.js";
-import { extractExitCode, TOOL_KIND_MAP } from "../translators/tool-helpers.js";
+import { buildConfigOptions, formatModelValue, modelContextWindow, parseModelValue, } from "../config/options.js";
+import { extractExitCode, parseSubagentMetadata, TOOL_KIND_MAP, } from "../translators/tool-helpers.js";
+import { warn } from "../utils.js";
 import { sendSessionUpdate } from "./io.js";
 /** Dispatch one internal event to the ACP client as a session/update. */
 export async function dispatchEvent(server, cx, acpSid, ev, chunkMsgId) {
@@ -47,6 +48,52 @@ export async function dispatchEvent(server, cx, acpSid, ev, chunkMsgId) {
         case "FilesChanged":
             await dispatchFilesChanged(cx, acpSid, ev);
             break;
+        case "ConfigChanged":
+            await dispatchConfigChanged(server, cx, acpSid, ev);
+            break;
+    }
+}
+/**
+ * Session settings changed (model/mode/thoughtLevel switch). Push the rebuilt
+ * configOptions (+ current_mode_update for mode) so the editor UI follows the
+ * switch immediately — even mid-turn, without waiting for turn completion.
+ *
+ * Builds the option structures from the session's authoritative settings
+ * (`session/read` via buildConfigOptions), then overlays the values from the
+ * event patch. A state.updated patch only carries the fields that actually
+ * changed, so building from the null defaults instead would reset every
+ * untouched field — most visibly the model dropdown jumping back to the
+ * default model mid-conversation.
+ * Best-effort: failures are logged and swallowed, never thrown into the loop.
+ */
+async function dispatchConfigChanged(server, cx, acpSid, ev) {
+    try {
+        // Fall back to null (defaults) only if the session mapping isn't live yet —
+        // events routed through a registered turn loop always have it.
+        const zcodeSid = server.resolveSid(acpSid) ?? null;
+        const options = await buildConfigOptions(server, zcodeSid);
+        if (ev.model)
+            options[0].currentValue = formatModelValue(ev.model.providerId, ev.model.modelId);
+        if (ev.mode !== undefined)
+            options[1].currentValue = ev.mode;
+        if (ev.thought !== undefined)
+            options[2].currentValue = ev.thought;
+        await sendSessionUpdate(cx, acpSid, {
+            sessionUpdate: "config_option_update",
+            configOptions: options,
+        });
+        if (ev.mode !== undefined) {
+            // Mirror the advertised mode so turn-completion reconciliation
+            // (emitModeIfChanged) doesn't re-emit the same value.
+            server.lastMode.set(acpSid, ev.mode);
+            await sendSessionUpdate(cx, acpSid, {
+                sessionUpdate: "current_mode_update",
+                currentModeId: ev.mode,
+            });
+        }
+    }
+    catch (e) {
+        warn(`dispatch: ConfigChanged failed (${e instanceof Error ? e.message : String(e)})`);
     }
 }
 function dispatchToolCallNew(server, cx, acpSid, ev) {
@@ -54,6 +101,9 @@ function dispatchToolCallNew(server, cx, acpSid, ev) {
     const meta = { claudeCode: { toolName: ev.tool } };
     if (termSupported)
         meta["terminal_info"] = { terminal_id: ev.callId };
+    // Mark sub-agent dispatch cards so editors can badge them from creation.
+    if (ev.tool === "Agent" || ev.tool === "Task")
+        meta["subagent"] = true;
     const update = {
         sessionUpdate: "tool_call",
         toolCallId: ev.callId,
@@ -80,8 +130,18 @@ function dispatchToolCallUpdate(server, cx, acpSid, ev) {
     const toolName = ev.tool ?? "";
     const termSupported = server.supportsTerminalOutput() && (toolName === "Bash" || toolName === "bash");
     if (termSupported) {
-        // Bash terminal protocol (full 2-notification split arrives in Commit 5).
-        // For now emit the terminal_output data + the standard update with status.
+        // Background Bash: the `result` event carries the launch acknowledgement
+        // ("Command running in background with ID: exec_…"), NOT the final output.
+        // Closing the card now (terminal_exit + status:completed) would make it
+        // indistinguishable from a normal Bash call and steal the lifecycle from
+        // the BackgroundTaskListener, which owns the real completion via
+        // out-of-band `session.updated` events. So stream any launch text via
+        // terminal_output and leave the card in_progress.
+        if (ev.background) {
+            return dispatchTerminalUpdate(server, cx, acpSid, ev, toolName, {
+                skipExit: true,
+            });
+        }
         return dispatchTerminalUpdate(server, cx, acpSid, ev, toolName);
     }
     const update = {
@@ -92,6 +152,15 @@ function dispatchToolCallUpdate(server, cx, acpSid, ev) {
     const meta = {};
     if (toolName)
         meta["claudeCode"] = { toolName };
+    // Sub-agent (Agent/Task tool) result: surface structured metadata so editors
+    // can badge the card (agentId, background flag, token/tool/time usage). The
+    // raw result text is left in `content` for the user-facing view.
+    if ((toolName === "Agent" || toolName === "Task") &&
+        (ev.status === "completed" || ev.status === "failed")) {
+        const sub = parseSubagentMetadata(ev.rawResult);
+        if (sub)
+            meta["subagent"] = sub;
+    }
     if (ev.output !== undefined)
         update.rawOutput = ev.output;
     if (ev.diffContent && ev.diffContent.length > 0) {
@@ -110,30 +179,69 @@ function dispatchToolCallUpdate(server, cx, acpSid, ev) {
  * Bash terminal update — the 2-notification split (matches acp-agent.ts:5061-5094
  * and the Python bridge's _dispatch_event). Zed correlates by terminal_id, so
  * the two notifications MUST be separate:
- *   ① terminal_output — pure data, no status/content. Sent on BOTH progress and
- *      result states (whenever there's data) so live output streams.
+ *   ① terminal_output — pure data, no status/content. Streams live output.
  *   ② terminal_exit — terminal state only: status + content[type:terminal] +
- *      _meta.terminal_exit (with exitCode) + rawOutput text fallback. Sent ONLY
- *      on completed/failed.
+ *      _meta.terminal_exit (with exitCode). Sent ONLY on completed/failed.
  *
  * Merging them into one notification causes Zed to clear the content once the
  * turn completes (the original bug); splitting keeps the output visible.
+ *
+ * OUTPUT DEDUP (two distinct hazards, both fixed here):
+ *  - Progress replay: zcode's `stdoutTail` is a CUMULATIVE snapshot of the tail,
+ *    but terminal_output.data is APPEND semantics. Without diffing, each progress
+ *    event replays the whole tail → N× duplication. We track the last-sent
+ *    snapshot per callId and emit only the suffix beyond it.
+ *  - Result replay: zcode's result payload re-sends the COMPLETE output. Once
+ *    progress has streamed it, emitting it again would duplicate every line.
+ *    So on completed/failed we SKIP terminal_output IF any progress already
+ *    streamed data for this callId; for short commands (scheduled → result, no
+ *    progress) nothing was sent yet, so we emit the full output once.
  */
-async function dispatchTerminalUpdate(_server, cx, acpSid, ev, toolName) {
-    // ① terminal_output (pure data) — progress and result both emit it.
+async function dispatchTerminalUpdate(server, cx, acpSid, ev, toolName, opts = {}) {
+    // Extract the textual output from whichever payload field carries it.
     let termData = ev.rawOutput ?? ev.rawResult;
     if (termData && typeof termData === "object" && !Array.isArray(termData)) {
         termData = termData["content"] ?? "";
     }
-    if (termData) {
-        await sendSessionUpdate(cx, acpSid, {
-            sessionUpdate: "tool_call_update",
-            toolCallId: ev.callId,
-            _meta: { terminal_output: { terminal_id: ev.callId, data: String(termData) } },
-        });
+    const full = termData ? String(termData) : "";
+    const lastSent = server.terminalSentData.get(ev.callId) ?? "";
+    // ① terminal_output (pure data, append semantics).
+    //    - progress (in_progress): zcode's stdoutTail is a CUMULATIVE snapshot of
+    //      the tail, but terminal_output.data is APPEND semantics, so we diff and
+    //      emit only the suffix beyond the last-sent snapshot.
+    //    - result (completed/failed): the full output was already streamed during
+    //      progress, and zcode's result re-sends the complete tail → skip, UNLESS
+    //      no progress ever fired (short command: scheduled → result). In that
+    //      case nothing was streamed yet, so emit the full output once.
+    const isResult = ev.status === "completed" || ev.status === "failed";
+    const alreadyStreamed = server.terminalSentData.has(ev.callId);
+    if (full && !(isResult && alreadyStreamed)) {
+        const delta = lastSent && full.startsWith(lastSent) ? full.slice(lastSent.length) : full;
+        if (delta) {
+            server.terminalSentData.set(ev.callId, full);
+            await sendSessionUpdate(cx, acpSid, {
+                sessionUpdate: "tool_call_update",
+                toolCallId: ev.callId,
+                _meta: { terminal_output: { terminal_id: ev.callId, data: delta } },
+            });
+        }
+    }
+    // Background Bash launch: leave the card in_progress — BackgroundTaskListener
+    // owns the final status + terminal_exit via out-of-band session.updated. We
+    // MUST still seed terminalSentData with an empty entry (even when no launch
+    // text was streamed) so the listener can recognise this callId as a tracked
+    // launch card and route its updates back to the same card.
+    if (opts.skipExit) {
+        if (!server.terminalSentData.has(ev.callId)) {
+            server.terminalSentData.set(ev.callId, "");
+        }
+        return;
     }
     // ② terminal_exit (terminal state) — only on completed/failed.
-    if (ev.status === "completed" || ev.status === "failed") {
+    //    Deliberately omits rawOutput: the output was already streamed via
+    //    terminal_output.data above, and Zed renders BOTH the terminal buffer and
+    //    the rawOutput fallback — including rawOutput here duplicates every line.
+    if (isResult) {
         const exitCode = extractExitCode(ev.rawResult, ev.status === "failed");
         const exitUpdate = {
             sessionUpdate: "tool_call_update",
@@ -145,10 +253,10 @@ async function dispatchTerminalUpdate(_server, cx, acpSid, ev, toolName) {
                 terminal_exit: { terminal_id: ev.callId, exit_code: exitCode, signal: null },
             },
         };
-        // rawOutput gives Zed a text fallback outside the terminal render path.
-        if (ev.output !== undefined)
-            exitUpdate.rawOutput = ev.output;
         await sendSessionUpdate(cx, acpSid, exitUpdate);
+        // Terminal session ended — clear the snapshot so a future tool reusing this
+        // callId (shouldn't happen, but defensively) starts fresh.
+        server.terminalSentData.delete(ev.callId);
     }
 }
 async function dispatchUsageDelta(server, cx, acpSid, ev) {
@@ -156,8 +264,12 @@ async function dispatchUsageDelta(server, cx, acpSid, ev) {
     // config.json limit.context so the editor can render the context bar.
     let size = ev.size;
     if (!size) {
-        const modelId = await currentModelCached(server, acpSid);
-        size = modelContextWindow(modelId);
+        // Resolve to the real backend session id — `acpSid` may be a lazy
+        // session/new placeholder that the backend rejects with "Session is not
+        // active", wasting a 5s request timeout on every usage_update.
+        const zcodeSid = server.resolveSid(acpSid) ?? acpSid;
+        const { providerId, modelId } = parseModelValue(await currentModelCached(server, zcodeSid));
+        size = modelContextWindow(providerId, modelId);
     }
     await sendSessionUpdate(cx, acpSid, {
         sessionUpdate: "usage_update",