@agentclientprotocol/claude-agent-acp 0.89.2-preview.2 → 0.89.2-preview.20

package/dist/tool-calls/renderer.d.ts

@@ -85,12 +85,31 @@ export declare class AcpToolCallRenderer {
     replay?: boolean);
     static for(capabilities: AcpClientCapabilities | null | undefined, replay?: boolean): AcpToolCallRenderer;
     /**
-     * The status of a tool result. `nonExecution` is why Claude Code stamped an
-     * error result instead of the tool's output. A run that was aborted is
-     * `cancelled` for a v2 client, which has that status; every other client
-     * gets `failed`, with the kind in `_meta.claudeCode.nonExecutionKind`.
+     * Whether the client keeps a tool call's `_meta` across reports: AIR merges
+     * its keys, and v2 stores it. Such a client gets no `toolResponse` text that
+     * the tool call's content already shows, which it would otherwise keep.
      */
-    resultStatus(isError: boolean, nonExecution: ToolResultMeta | undefined): ToolCallStatus;
+    private get keepsMeta();
+    /**
+     * The status of a tool result. Claude Code reports a run that it aborted in
+     * one of three ways:
+     * - an error result whose `nonExecution` kind says so (`interrupted`,
+     *   `cancelled`);
+     * - a command result that says `interrupted` (for example, a steering
+     *   message landed just before the command started);
+     * - any error result of the work that a `session/cancel` stopped
+     *   (`run.cancelled`). The kind does not say so there: CLI 2.1.293 stamps a
+     *   command that the interrupt killed `user-rejected`, as if the user had
+     *   refused it.
+     *
+     * Such a run is `cancelled` for a v2 client, which has that status. Every
+     * other client gets `failed` for the error, with the kind in
+     * `_meta.claudeCode.nonExecutionKind`, and `completed` for the command.
+     */
+    resultStatus(isError: boolean, nonExecution: ToolResultMeta | undefined, run?: {
+        interrupted?: boolean;
+        cancelled?: boolean;
+    }): ToolCallStatus;
     /** The facts of a tool use. */
     facts(toolUse: Pick<ToolUse, "name" | "input">, cwd?: string): ToolUseFacts;
     /** The standard fields of a tool use: the title, the kind, the content, and the locations. */
@@ -146,6 +165,7 @@ export declare class AcpToolCallRenderer {
     resultFacts(toolUse: ToolUse, result: ResultBlock, structured?: unknown): ToolResultFacts;
     /** The result fields of a tool result, before the status and the tool name. */
     resultFields(toolUse: ToolUse, result: ResultBlock, structured?: unknown): RenderedResult;
+    private fieldsOfResult;
     /**
      * The reports of a tool result. A command sends its output as a separate
      * report first, like codex-acp: the output, then the exit and the status.
@@ -155,6 +175,7 @@ export declare class AcpToolCallRenderer {
     result(toolUse: ToolUse, result: ResultBlock, options?: {
         structured?: unknown;
         nonExecution?: ToolResultMeta;
+        cancelled?: boolean;
     }): ToolCallUpdate[];
     /**
      * Whether AIR shows [toolUse] as the list of viewed files: a read or a
@@ -165,7 +186,8 @@ export declare class AcpToolCallRenderer {
     /**
      * The report of a PostToolUse hook: the final change of an edit tool, and
      * the `status` and `isAsync` markers of the `tool_response`. The rest of the
-     * `tool_response` repeats output that the content already carries.
+     * `tool_response` repeats output that the content already carries, such as
+     * the whole text of a written file.
      */
     hookResult(toolUse: Pick<ToolUse, "id" | "name">, toolResponse: unknown, cwd?: string): Promise<ToolCallUpdate | undefined>;
     /**
@@ -199,11 +221,14 @@ export declare class AcpToolCallRenderer {
      * reached a complete assistant message, for example because Claude switched
      * to a steering message), a v2 client gets `cancelled` and every other
      * client `failed`, since v1 has no `cancelled`. If Claude Code ran it but
-     * returned no result, it failed.
+     * returned no result, it failed, unless a `session/cancel` ended the turn
+     * (`cancelled`): the cancel stopped the run, so a v2 client gets `cancelled`
+     * for it too.
      */
     unfinished(call: {
         toolCallId: string;
         ran: boolean;
+        cancelled?: boolean;
     }): ToolCallUpdate;
     /**
      * The report of a tool progress beat. The field tracker sends the

package/dist/tool-calls/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/tool-calls/renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/tool-calls/renderer.ts"],"names":[],"mappings":"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"}

package/dist/tool-calls/renderer.js

@@ -41,15 +41,35 @@ export class AcpToolCallRenderer {
         return new AcpToolCallRenderer(ClientCapabilities.from(capabilities), replay);
     }
     /**
-     * The status of a tool result. `nonExecution` is why Claude Code stamped an
-     * error result instead of the tool's output. A run that was aborted is
-     * `cancelled` for a v2 client, which has that status; every other client
-     * gets `failed`, with the kind in `_meta.claudeCode.nonExecutionKind`.
+     * Whether the client keeps a tool call's `_meta` across reports: AIR merges
+     * its keys, and v2 stores it. Such a client gets no `toolResponse` text that
+     * the tool call's content already shows, which it would otherwise keep.
      */
-    resultStatus(isError, nonExecution) {
-        if (!isError)
-            return "completed";
-        return this.capabilities.v2 && isAbortedToolResult(nonExecution) ? V2_CANCELLED : "failed";
+    get keepsMeta() {
+        return this.capabilities.air.client || this.capabilities.v2;
+    }
+    /**
+     * The status of a tool result. Claude Code reports a run that it aborted in
+     * one of three ways:
+     * - an error result whose `nonExecution` kind says so (`interrupted`,
+     *   `cancelled`);
+     * - a command result that says `interrupted` (for example, a steering
+     *   message landed just before the command started);
+     * - any error result of the work that a `session/cancel` stopped
+     *   (`run.cancelled`). The kind does not say so there: CLI 2.1.293 stamps a
+     *   command that the interrupt killed `user-rejected`, as if the user had
+     *   refused it.
+     *
+     * Such a run is `cancelled` for a v2 client, which has that status. Every
+     * other client gets `failed` for the error, with the kind in
+     * `_meta.claudeCode.nonExecutionKind`, and `completed` for the command.
+     */
+    resultStatus(isError, nonExecution, run = {}) {
+        const aborted = run.interrupted === true ||
+            (isError && (run.cancelled === true || isAbortedToolResult(nonExecution)));
+        if (this.capabilities.v2 && aborted)
+            return V2_CANCELLED;
+        return isError ? "failed" : "completed";
     }
     /** The facts of a tool use. */
     facts(toolUse, cwd) {
@@ -191,7 +211,9 @@ export class AcpToolCallRenderer {
     }
     /** The result fields of a tool result, before the status and the tool name. */
     resultFields(toolUse, result, structured) {
-        const facts = this.resultFacts(toolUse, result, structured);
+        return this.fieldsOfResult(toolUse, result, this.resultFacts(toolUse, result, structured));
+    }
+    fieldsOfResult(toolUse, result, facts) {
         const { command, ...fields } = facts;
         if (!command)
             return fields;
@@ -252,7 +274,8 @@ export class AcpToolCallRenderer {
      * when no other field carries the result.
      */
     result(toolUse, result, options = {}) {
-        const { _meta: resultMeta, ...fields } = this.resultFields(toolUse, result, options.structured);
+        const facts = this.resultFacts(toolUse, result, options.structured);
+        const { _meta: resultMeta, ...fields } = this.fieldsOfResult(toolUse, result, facts);
         // AIR shows a read or a search that names a path as the list of viewed
         // files. That view does not show the text of the result, so it stays out.
         const viewedFiles = this.capabilities.air.client && result.is_error !== true && this.namesViewedFile(toolUse);
@@ -299,7 +322,10 @@ export class AcpToolCallRenderer {
             },
             toolCallId: toolUse.id,
             sessionUpdate: "tool_call_update",
-            status: this.resultStatus(result.is_error === true, options.nonExecution),
+            status: this.resultStatus(result.is_error === true, options.nonExecution, {
+                interrupted: facts.command?.interrupted === true,
+                cancelled: options.cancelled,
+            }),
             ...(rawOutput !== undefined ? { rawOutput } : {}),
             ...(planFilePath ? { rawInput: planFileInput(toolUse.input, planFilePath) } : {}),
             ...fields,
@@ -339,14 +365,15 @@ export class AcpToolCallRenderer {
     /**
      * The report of a PostToolUse hook: the final change of an edit tool, and
      * the `status` and `isAsync` markers of the `tool_response`. The rest of the
-     * `tool_response` repeats output that the content already carries.
+     * `tool_response` repeats output that the content already carries, such as
+     * the whole text of a written file.
      */
     async hookResult(toolUse, toolResponse, cwd) {
         const reporter = reporterFor(toolUse.name);
         const change = reporter.hookResult
             ? await reporter.hookResult(toolResponse, { cwd, capabilities: this.capabilities })
             : {};
-        if (!this.capabilities.air.client) {
+        if (!this.keepsMeta) {
             // The upstream shape: the whole tool_response, on every hook.
             return {
                 _meta: { claudeCode: { toolResponse, toolName: toolUse.name } },
@@ -402,9 +429,10 @@ export class AcpToolCallRenderer {
      */
     permissionDenied(denial) {
         const reason = denial.decisionReason ?? denial.message;
-        // AIR gets the SDK message only when it differs from the reason, which
-        // the content shows. Every other client gets the upstream toolResponse.
-        const extraMessage = !this.capabilities.air.client
+        // AIR and v2 get the SDK message only when it differs from the reason,
+        // which the content shows. Every other client gets the upstream
+        // toolResponse.
+        const extraMessage = !this.keepsMeta
             ? { decisionReason: denial.decisionReason, message: denial.message }
             : denial.decisionReason !== undefined &&
                 denial.message !== undefined &&
@@ -431,17 +459,22 @@ export class AcpToolCallRenderer {
      * reached a complete assistant message, for example because Claude switched
      * to a steering message), a v2 client gets `cancelled` and every other
      * client `failed`, since v1 has no `cancelled`. If Claude Code ran it but
-     * returned no result, it failed.
+     * returned no result, it failed, unless a `session/cancel` ended the turn
+     * (`cancelled`): the cancel stopped the run, so a v2 client gets `cancelled`
+     * for it too.
      */
     unfinished(call) {
+        const stopped = !call.ran || call.cancelled === true;
         return {
             sessionUpdate: "tool_call_update",
             toolCallId: call.toolCallId,
-            status: !call.ran && this.capabilities.v2 ? V2_CANCELLED : "failed",
+            status: stopped && this.capabilities.v2 ? V2_CANCELLED : "failed",
             content: [
-                textContent(call.ran
-                    ? "Claude ended the turn without returning a result for this tool."
-                    : "Claude stopped this tool call before it ran."),
+                textContent(!call.ran
+                    ? "Claude stopped this tool call before it ran."
+                    : call.cancelled
+                        ? "The turn was cancelled before this tool call returned a result."
+                        : "Claude ended the turn without returning a result for this tool."),
             ],
         };
     }

package/dist/turn-events.d.ts

@@ -1,10 +1,11 @@
 /**
- * A prompt turn as the adapter understands it, independent of the ACP version.
+ * A prompt turn and the foreground work of a session, as the adapter
+ * understands them, independent of the ACP version.
  *
- * The agent reports each turn through {@link TurnEvents}, and each ACP version
- * maps the events to its own messages. ACP v1 answers `session/prompt` when the
- * turn ends or fails. ACP v2 answers it when the prompt is inserted, and
- * reports the rest as session state.
+ * The agent reports how each prompt is answered through {@link TurnEvents}:
+ * ACP v1 answers `session/prompt` when the turn ends or fails, and ACP v2 when
+ * the prompt is inserted. ACP v2 also reports the session's work as state,
+ * which the agent reports through {@link ForegroundEvents}.
  *
  * The agent calls these synchronously while it updates its own state, so a
  * handler must not throw, nor call back into the agent before it returns.
@@ -23,18 +24,6 @@ export interface TurnEvents {
      * `/compact`), it is the command's result, after any output it streamed.
      */
     inserted(messageId: string): void;
-    /**
-     * The turn waits for the user: a permission request or a question is open in
-     * the session. Requests do not say which prompt they are for, so this
-     * includes one opened before the turn was inserted. Only reported after
-     * {@link inserted}.
-     */
-    awaitingUser(): void;
-    /**
-     * The turn works again: no request is open any more. A turn that ends or
-     * fails while it waits reports that instead.
-     */
-    resumed(): void;
     /**
      * The turn ended. A queued turn that is cancelled before it is inserted
      * ends too, without {@link inserted}; Claude Code may still run its prompt.
@@ -47,6 +36,39 @@ export interface TurnEvents {
      */
     failed(error: unknown): void;
 }
+/**
+ * The foreground work of a session: what a client would wait for before it
+ * sends the next prompt. One piece of work runs at a time, and the next starts
+ * with {@link running}. The work is either:
+ *
+ * - A prompt's turn, from {@link TurnEvents.inserted} until its result, or
+ *   until it fails or is cancelled. A turn that v1 holds open for the
+ *   background subagents it spawned (`Turn.deferredSettle`) ends its work at
+ *   its result all the same: the hold only delays v1's answer.
+ * - A model cycle that Claude Code starts on its own while no work runs: for
+ *   example, its follow-up after a background command or subagent finished,
+ *   or its answer to a message from another session. It runs until its result.
+ *
+ * A prompt that Claude Code takes in while a cycle runs takes the cycle over:
+ * the cycle reports nothing more, and the turn reports from there.
+ */
+export interface ForegroundEvents {
+    /** The work started, or works again after it waited for the user. */
+    running(): void;
+    /**
+     * The work waits for the user: a permission request or a question is open in
+     * the session. Requests do not say which work they are for, so this includes
+     * one opened before the work started.
+     */
+    awaitingUser(): void;
+    /** The work ended. */
+    ended(outcome: TurnOutcome): void;
+    /**
+     * The work failed with `error`, the JSON-RPC error that v1 answers the
+     * prompt with.
+     */
+    failed(error: unknown): void;
+}
 /** Why a turn ended. Every ACP version has these reasons. */
 export type StopReason = "end_turn" | "max_tokens" | "max_turn_requests" | "refusal" | "cancelled";
 /** How a turn ended. */

package/dist/turn-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-events.d.ts","sourceRoot":"","sources":["../src/turn-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC;IACrB;;;OAGG;IACH,OAAO,IAAI,IAAI,CAAC;IAChB;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,6DAA6D;AAC7D,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,mBAAmB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEnG,wBAAwB;AACxB,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"turn-events.d.ts","sourceRoot":"","sources":["../src/turn-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,OAAO,IAAI,IAAI,CAAC;IAChB;;;;OAIG;IACH,YAAY,IAAI,IAAI,CAAC;IACrB,sBAAsB;IACtB,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,6DAA6D;AAC7D,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,mBAAmB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEnG,wBAAwB;AACxB,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/dist/v2/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CAoEb"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAoB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA2Eb"}

package/dist/v2/agent.js

@@ -2,10 +2,11 @@ import * as v2 from "@agentclientprotocol/sdk/experimental/v2";
 import { ClaudeAcpAgent } from "../acp-agent.js";
 import { v1InitializeRequest, v2InitializeResponse } from "./initialize.js";
 import { v1PermissionResponse, v2PermissionRequest } from "./permission.js";
-import { v2Prompt } from "./prompt.js";
-import { v1ForkSessionRequests, v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2AvailableCommands, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
-import { v2SessionUpdate } from "./session-update.js";
+import { v2Foreground, v2Prompt } from "./prompt.js";
+import { v1ForkSessionRequest, v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2AvailableCommands, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
+import { v2ChildStateUpdate, v2SessionUpdate } from "./session-update.js";
 import { V2Terminals } from "./terminal.js";
+import { V2ToolCallMeta } from "./tool-call-meta.js";
 /**
  * The ACP v2 surface, for one connection.
  *
@@ -22,7 +23,12 @@ export function v2AgentApp(logger, onAgent) {
         .agent({ name: "claude-code-acp" })
         .onConnect((connection) => {
         client = new V2ClientConnection(connection.client, logger ?? console);
-        agent = new ClaudeAcpAgent(client, logger, { v2: true });
+        agent = new ClaudeAcpAgent(client, logger, {
+            v2: true,
+            foreground: (sessionId) => v2Foreground((update) => {
+                void client.send({ sessionId, update });
+            }),
+        });
         onAgent(agent);
     })
         .onRequest(v2.methods.agent.initialize, async ({ params }) => v2InitializeResponse(await agent.initialize(v1InitializeRequest(params))))
@@ -50,17 +56,18 @@ export function v2AgentApp(logger, onAgent) {
         };
     })
         .onRequest(v2.methods.agent.session.fork, async ({ params }) => {
-        const requests = v1ForkSessionRequests(params);
-        const { sessionId } = await agent.unstable_forkSession(requests.fork);
+        // The agent starts the forked session, so the client can prompt it.
+        const response = await agent.unstable_forkSession(v1ForkSessionRequest(params));
         return {
-            sessionId,
-            ...v2ResumeSessionResponse(await agent.resumeSession(requests.resume(sessionId))),
-            ...(await setupCommands(agent, sessionId, logger)),
+            sessionId: response.sessionId,
+            ...v2ResumeSessionResponse(response),
+            ...(await setupCommands(agent, response.sessionId, logger)),
         };
     })
         .onRequest(v2.methods.agent.session.close, async ({ params }) => {
         const response = await agent.closeSession(params);
         client.terminals.forget(params.sessionId);
+        client.toolCallMeta.forget(params.sessionId);
         return response;
     })
         .onRequest(v2.methods.agent.session.delete, ({ params }) => agent.deleteSession(params))
@@ -100,11 +107,16 @@ class V2ClientConnection {
     logger;
     /**
      * The sessions whose history replays, each with the messages that the
-     * replay has cleared so far.
+     * replay has cleared so far. A subagent that a replay announces replays
+     * with it.
      */
     replays = new Map();
+    /** The session whose replay announced each replaying subagent. */
+    replayRoots = new Map();
     /** The display terminals of the commands that the agent runs. */
     terminals = new V2Terminals();
+    /** The `_meta` that the client stores for each tool call. */
+    toolCallMeta = new V2ToolCallMeta();
     constructor(ctx, logger) {
         this.ctx = ctx;
         this.logger = logger;
@@ -124,6 +136,12 @@ class V2ClientConnection {
         }
         finally {
             this.replays.delete(sessionId);
+            for (const [child, root] of this.replayRoots) {
+                if (root !== sessionId)
+                    continue;
+                this.replays.delete(child);
+                this.replayRoots.delete(child);
+            }
         }
     }
     /**
@@ -147,17 +165,32 @@ class V2ClientConnection {
         return this.ctx.notify(method, params);
     }
     async sessionUpdate({ update, ...notification }) {
+        // A subagent that a replay announces replays too, so its messages are
+        // cleared before their first replayed chunk, as the parent's are.
+        if (update.sessionUpdate === "subagent_update" &&
+            this.replays.has(notification.sessionId) &&
+            !this.replays.has(update.sessionId)) {
+            this.replays.set(update.sessionId, new Set());
+            this.replayRoots.set(update.sessionId, this.replayRoots.get(notification.sessionId) ?? notification.sessionId);
+        }
         const updates = this.v2Updates(notification.sessionId, update).flatMap((v2Update) => {
             const clear = this.replayClear(notification.sessionId, v2Update);
             return clear ? [clear, v2Update] : [v2Update];
         });
+        // A subagent's work state also goes to the child's own stream, after the
+        // parent's copy.
+        const childState = v2ChildStateUpdate(update);
         // Every update goes to the connection before any is awaited, so an update
         // that another call sends meanwhile cannot come between them.
-        await Promise.all(updates.map((v2Update) => this.ctx.notify(v2.methods.client.session.update, { ...notification, update: v2Update })));
+        await Promise.all([
+            ...updates.map((v2Update) => this.ctx.notify(v2.methods.client.session.update, { ...notification, update: v2Update })),
+            ...(childState ? [this.ctx.notify(v2.methods.client.session.update, childState)] : []),
+        ]);
     }
     /**
      * The v2 updates of a v1 update: for a tool call report, the updates of its
-     * terminal first, then the report itself (see {@link V2Terminals}).
+     * terminal first (see {@link V2Terminals}), then the report itself, with the
+     * `_meta` that the client stores (see {@link V2ToolCallMeta}).
      */
     v2Updates(sessionId, update) {
         if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
@@ -165,7 +198,10 @@ class V2ClientConnection {
             return v2Update ? [v2Update] : [];
         }
         const { terminal, report } = this.terminals.split(sessionId, update);
-        const reportUpdate = report && v2SessionUpdate(report);
+        if (!report)
+            return terminal;
+        const starts = report.sessionUpdate === "tool_call";
+        const reportUpdate = v2SessionUpdate(this.toolCallMeta.apply(sessionId, report, starts));
         return [...terminal, ...(reportUpdate ? [reportUpdate] : [])];
     }
     /**
@@ -187,7 +223,9 @@ class V2ClientConnection {
         return emptyMessage(kind, messageId);
     }
     async requestPermission(params, signal) {
-        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest(params), { cancellationSignal: signal });
+        // The subject is an update of the tool call, with its stored `_meta`.
+        const toolCall = this.toolCallMeta.subject(params.sessionId, params.toolCall);
+        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest({ ...params, toolCall }), { cancellationSignal: signal });
         return v1PermissionResponse(response);
     }
     // Elicitation is the same in v1 and v2.

package/dist/v2/initialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/v2/initialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CA0BpF;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAuBxF"}
+{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/v2/initialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAmCpF;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAuBxF"}

package/dist/v2/initialize.js

@@ -26,6 +26,15 @@ export function v1InitializeRequest(request) {
             // compaction as a compaction entity rather than as a "Compact
             // conversation" tool call, also on replay.
             session: { configOptions: { boolean: {} }, notices: {}, compaction: {} },
+            // Every v2 client takes `plan_update`, with the draft's markdown and file
+            // plans, and `plan_removed`; v1 asks for the `plan` marker. With it, the
+            // agent shows an approved ExitPlanMode plan as a markdown plan.
+            plan: {},
+            // Subagent updates are part of v2's baseline session model (the subagents
+            // RFD), so every v2 client takes them; v1 asks for the `subagents`
+            // capability. With it, the agent reports each Agent or Task subagent as a
+            // child session.
+            subagents: {},
             // v1 marks terminal auth support with a boolean, v2 with an object.
             auth: {
                 terminal: capabilities?.auth?.terminal != null,
@@ -78,7 +87,7 @@ export function v2InitializeResponse(response) {
  * - The session baseline: `session/new`, `list`, `resume` (with replay),
  *   `close`, `prompt`, `cancel`, and `update`.
  * - `session/delete`, `session/fork` (which returns a session the client can
- *   prompt, see `v1ForkSessionRequests`), and `additionalDirectories`.
+ *   prompt at once), and `additionalDirectories`.
  * - The prompt content and MCP transports that the agent's v1 `initialize`
  *   lists: images, embedded context, and HTTP servers. Stdio servers are in the
  *   v1 baseline; v2 has no SSE transport.

package/dist/v2/prompt.d.ts

@@ -7,31 +7,42 @@
 import { type PromptRequest } from "@agentclientprotocol/sdk";
 import * as v2 from "@agentclientprotocol/sdk/experimental/v2";
 import type { ClaudeAcpAgent } from "../acp-agent.js";
+import type { ForegroundEvents } from "../turn-events.js";
 /**
  * Starts a turn for `params`, and answers when Claude Code takes the prompt
- * in. `send` delivers a session update of the prompt's session; it must not
- * throw, and must deliver updates in the order it is called, also relative to
- * the agent's own updates.
+ * in, with the id of the user message it became. `send` delivers a session
+ * update of the prompt's session; it must not throw, and must deliver updates
+ * in the order it is called, also relative to the agent's own updates.
  *
- * - Taken in: the prompt's `user_message`, then `running`, then the answer.
- * - Waiting on a permission request or a question: `requires_action`, and
- *   `running` once none is open.
- * - Ended: `idle` with the stop reason, usage, and `_meta` of the turn.
- * - Failed after it was taken in: `idle` with the `error` stop reason and the
- *   JSON-RPC error that v1 answers the prompt with, so a client can show its
- *   message and handle its code as for an error response (for example,
- *   `-32000` starts the client's sign-in).
+ * - Taken in: the prompt's `user_message`, then the answer. From then on, the
+ *   turn is the session's foreground work, which reports its states (see
+ *   {@link v2Foreground}).
  * - Ended or failed before it was taken in: the answer is a JSON-RPC error,
  *   `-32800` for a prompt that a cancel ended in the queue.
- *
- * Deferred decision: a turn whose background subagents still run ends only
- * when they finish (`Turn.deferredSettle`), so `idle` waits for them too. The
- * hold exists for v1, whose clients stop listening at the prompt response.
- * v2 allows background updates while idle, so it could report `idle` at the
- * turn's result instead, with a turn event for the hold. To be decided with
- * async tasks (step 6 in `docs/acp-v2.md`).
  */
 export declare function v2Prompt(agent: ClaudeAcpAgent, params: v2.PromptRequest, send: (update: v2.SessionUpdate) => void): Promise<v2.PromptResponse>;
+/**
+ * Reports the foreground work of a session (see {@link ForegroundEvents}) as
+ * its `state_update`s. `send` delivers a session update of that session, as
+ * for {@link v2Prompt}.
+ *
+ * - Started: `running`. For a prompt's turn, right after its `user_message`.
+ * - Waiting on a permission request or a question: `requires_action`, and
+ *   `running` once none is open.
+ * - Ended: `idle` with the stop reason, usage, and `_meta` of the work.
+ * - Failed: `idle` with the `error` stop reason and the JSON-RPC error that v1
+ *   answers the prompt with, so a client can show its message and handle its
+ *   code as for an error response (for example, `-32000` starts the client's
+ *   sign-in).
+ *
+ * The work is a prompt's turn or a model cycle that Claude Code started on its
+ * own, such as its follow-up after a background subagent finished. A turn's
+ * work ends at its result, also when v1 holds the turn's answer for the
+ * background subagents it spawned (`Turn.deferredSettle`): v2 allows
+ * background updates while idle, so the subagents' output and requests arrive
+ * after `idle`, and their follow-up is a cycle of its own.
+ */
+export declare function v2Foreground(send: (update: v2.SessionUpdate) => void): ForegroundEvents;
 /**
  * A v2 prompt may hold content blocks that v1 cannot express: a custom one,
  * or one from a newer ACP version. Clients send only the kinds the agent

package/dist/v2/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/v2/prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,EAAE,CAAC,aAAa,EACxB,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GACvC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,CAoD5B;AAgCD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,CAAC,aAAa,GAAG,aAAa,CAEvF"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/v2/prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAuC,MAAM,mBAAmB,CAAC;AAE/F;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,EAAE,CAAC,aAAa,EACxB,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GACvC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,CAiC5B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GAAG,gBAAgB,CAoBvF;AAgCD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,CAAC,aAAa,GAAG,aAAa,CAEvF"}