@agentclientprotocol/claude-agent-acp 0.99.2-preview.11 → 0.99.2-preview.13

package/dist/native-subagents.js

@@ -123,6 +123,31 @@ export class NativeSubagentRuntime {
         const child = this.children.get(sessionId);
         return child?.announced ? child.workState : undefined;
     }
+    /**
+     * The RFD form: the `subagent_update` that tells a client that holds nothing
+     * of the announced child `sessionId` of this live session what it is now:
+     * its labels, its directory, its `cancel` capability, and its work state.
+     * Undefined when no such child runs here.
+     */
+    currentUpdate(sessionId) {
+        if (this.form !== "rfd")
+            return undefined;
+        const child = this.childOfSession(sessionId);
+        if (!child?.announced || !child.workState)
+            return undefined;
+        return {
+            sessionId: child.parentSessionId,
+            update: {
+                sessionUpdate: "subagent_update",
+                sessionId: child.sessionId,
+                ...(child.title ? { title: child.title } : {}),
+                ...(child.description ? { description: child.description } : {}),
+                ...(child.reportedCwd ? { cwd: child.reportedCwd } : {}),
+                capabilities: { cancel: {} },
+                state: { state: child.workState },
+            },
+        };
+    }
     /**
      * Reports the model of a child response, an exact model id, as the entry of
      * the root session's `model` option that matches it, else as the id (see

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

@@ -29,4 +29,14 @@ export declare function backgroundedBashToolCall(notification: SessionNotificati
  * the exit when the command's task ends (see `Session.backgroundTerminals`).
  */
 export declare function withRunningTerminal(notification: SessionNotification, toolCallId: string | undefined): SessionNotification;
+/**
+ * Keeps the tool call of a task that went on in the background running: the
+ * tool result update of a tool call in `toolCallIds` reports `in_progress`
+ * instead of `completed`.
+ *
+ * A Monitor or Workflow call returns as soon as its task starts. The consumer
+ * reports the task's end, or its pause, on the tool call (see
+ * `Session.backgroundToolCalls`).
+ */
+export declare function withRunningToolCall(notification: SessionNotification, toolCallIds: ReadonlySet<string>): SessionNotification;
 //# sourceMappingURL=background.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/tool-calls/background.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAG7E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,mBAAmB,EACjC,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,EAC5C,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAgBrB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,EACjC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,mBAAmB,CAiBrB"}
+{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/tool-calls/background.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAG7E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,mBAAmB,EACjC,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,EAC5C,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAgBrB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,EACjC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,mBAAmB,CAiBrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,mBAAmB,EACjC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,mBAAmB,CAUrB"}

package/dist/tool-calls/background.js

@@ -59,3 +59,21 @@ export function withRunningTerminal(notification, toolCallId) {
         delete next._meta;
     return { ...notification, update: next };
 }
+/**
+ * Keeps the tool call of a task that went on in the background running: the
+ * tool result update of a tool call in `toolCallIds` reports `in_progress`
+ * instead of `completed`.
+ *
+ * A Monitor or Workflow call returns as soon as its task starts. The consumer
+ * reports the task's end, or its pause, on the tool call (see
+ * `Session.backgroundToolCalls`).
+ */
+export function withRunningToolCall(notification, toolCallIds) {
+    const update = notification.update;
+    if (update.sessionUpdate !== "tool_call_update" ||
+        !toolCallIds.has(update.toolCallId) ||
+        update.status !== "completed") {
+        return notification;
+    }
+    return { ...notification, update: { ...update, status: "in_progress" } };
+}

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

@@ -3,6 +3,14 @@ import { type ToolResultMeta } from "../tool-result-meta.js";
 import { ClientCapabilities } from "./client-capabilities.js";
 import type { ToolResultContext, ToolResultFacts, ToolUse, ToolUseFacts } from "./facts.js";
 export type ToolCallUpdate = SessionNotification["update"];
+/**
+ * ACP v2's `cancelled` and `paused` tool call statuses. v1's statuses have no
+ * such values, and the agent builds its reports in v1 types, so they travel as
+ * v1 statuses. Only a v2 client gets them, and the v2 surface sends them as
+ * they are (`src/v2/tool-call.ts`).
+ */
+export declare const V2_CANCELLED: ToolCallStatus;
+export declare const V2_PAUSED: ToolCallStatus;
 /** Whether `status` ends a tool call: `completed`, `failed`, or, on v2, `cancelled`. */
 export declare function isFinalToolCallStatus(status: ToolCallStatus | null | undefined): boolean;
 /** The `_meta` of a tool call report. */

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

@@ -10,12 +10,13 @@ import { grepPath } from "./reporters/search.js";
 /** The id suffix of the call that clears the plan file of an approved plan for AIR. */
 const PLAN_FILE_CLEAR_SUFFIX = ":plan-file-clear";
 /**
- * ACP v2's `cancelled` tool call status. v1's statuses have no such value, and
- * the agent builds its reports in v1 types, so it travels as a v1 status. Only
- * a v2 client gets it, and the v2 surface sends it as it is
- * (`src/v2/tool-call.ts`).
+ * ACP v2's `cancelled` and `paused` tool call statuses. v1's statuses have no
+ * such values, and the agent builds its reports in v1 types, so they travel as
+ * v1 statuses. Only a v2 client gets them, and the v2 surface sends them as
+ * they are (`src/v2/tool-call.ts`).
  */
-const V2_CANCELLED = "cancelled";
+export const V2_CANCELLED = "cancelled";
+export const V2_PAUSED = "paused";
 /** Whether `status` ends a tool call: `completed`, `failed`, or, on v2, `cancelled`. */
 export function isFinalToolCallStatus(status) {
     return status === "completed" || status === "failed" || status === V2_CANCELLED;

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

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,mDAAmD,CAAC;AACxE,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAqB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA4Gb"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,mDAAmD,CAAC;AACxE,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAsB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CAyIb"}

package/dist/v2/agent.js

@@ -1,5 +1,6 @@
 import * as v2 from "@agentclientprotocol/sdk/experimental/v2/unstable";
 import { ClaudeAcpAgent } from "../acp-agent.js";
+import { stateUpdate, V2Background } from "./background.js";
 import { v1InitializeRequest, v2InitializeResponse } from "./initialize.js";
 import { v1PermissionResponse, v2PermissionRequest } from "./permission.js";
 import { v2Foreground, v2Prompt } from "./prompt.js";
@@ -29,6 +30,14 @@ export function v2AgentApp(logger, onAgent) {
             foreground: (sessionId) => v2Foreground((update) => {
                 void client.send({ sessionId, update });
             }),
+            background: {
+                changed: (report) => {
+                    for (const notification of client.background.changed(report)) {
+                        void client.send(notification);
+                    }
+                },
+                forget: (sessionId) => client.background.forget(sessionId),
+            },
         });
         onAgent(agent);
     })
@@ -57,10 +66,17 @@ export function v2AgentApp(logger, onAgent) {
         await agent.publishCurrentSessionInfo(params.sessionId);
         // v2 requires a snapshot of the foreground state after the replay and
         // before the response, also without a replay: a resumed live session can
-        // be running a turn, or waiting on a permission request.
+        // be running a turn, or waiting on a permission request. The current
+        // state of each subagent, terminal and tool call it lists comes first,
+        // as v2 requires. The subagents' go again after the response (see below).
+        await agent.publishLiveSubagents(params.sessionId, client.background.listedSubagents(params.sessionId));
+        await agent.publishBackgroundToolCalls(params.sessionId, client.background.listedToolCalls(params.sessionId));
+        for (const notification of client.background.currentItems(params.sessionId)) {
+            void client.send(notification);
+        }
         void client.send({
             sessionId: params.sessionId,
-            update: stateSnapshot(agent.foregroundState(params.sessionId)),
+            update: stateUpdate(agent.foregroundState(params.sessionId)),
         });
         const commands = await setupCommands(agent, params.sessionId, logger);
         // The response ends a replay. The subagents RFD treats the replayed
@@ -103,16 +119,16 @@ export function v2AgentApp(logger, onAgent) {
         .onRequest(v2.methods.agent.session.prompt, ({ params }) => v2Prompt(agent, params, (update) => {
         void client.send({ sessionId: params.sessionId, update });
     }))
+        .onRequest(v2.methods.agent.terminal.cancel, async ({ params }) => {
+        await agent.cancelBackgroundTerminal(params);
+        return {};
+    })
+        .onRequest(v2.methods.agent.toolCall.cancel, async ({ params }) => {
+        await agent.cancelBackgroundToolCall(params);
+        return {};
+    })
         .onNotification(v2.methods.agent.session.cancel, ({ params }) => agent.cancel(params));
 }
-/** The `state_update` that reports `state` as the current foreground state. */
-function stateSnapshot(state) {
-    if (state === "idle")
-        return { sessionUpdate: "state_update", state: "idle" };
-    if (state === "running")
-        return { sessionUpdate: "state_update", state: "running" };
-    return { sessionUpdate: "state_update", state: "requires_action" };
-}
 /**
  * The `availableCommands` of a setup response, which v2 requires when the
  * session has commands. The agent sends a v1 client the same list as an
@@ -179,6 +195,8 @@ class V2ClientConnection {
     terminals = new V2Terminals();
     /** The `_meta` that the client stores for each tool call. */
     toolCallMeta = new V2ToolCallMeta();
+    /** The `background` list of each session's `state_update`s. */
+    background = new V2Background(this.terminals);
     constructor(ctx, logger) {
         this.ctx = ctx;
         this.logger = logger;
@@ -225,7 +243,9 @@ class V2ClientConnection {
      * request opening.)
      */
     send(notification) {
-        return this.ctx.notify(v2.methods.client.session.update, notification).catch((error) => {
+        return this.ctx
+            .notify(v2.methods.client.session.update, this.background.stamp(notification))
+            .catch((error) => {
             this.logger.error(`Failed to send a ${notification.update.sessionUpdate} update:`, error);
         });
     }
@@ -257,11 +277,13 @@ class V2ClientConnection {
             childState = undefined;
         }
         // 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 })),
-            ...(childState ? [this.ctx.notify(v2.methods.client.session.update, childState)] : []),
-        ]);
+        // that another call sends meanwhile cannot come between them. The parent's
+        // copy is stamped first: a child's announcement starts its list.
+        const stamped = [
+            ...updates.map((v2Update) => this.background.stamp({ ...notification, update: v2Update })),
+            ...(childState ? [this.background.stamp(childState)] : []),
+        ];
+        await Promise.all(stamped.map((v2Notification) => this.ctx.notify(v2.methods.client.session.update, v2Notification)));
     }
     /**
      * The v2 updates of a v1 update: for a tool call report, the updates of its

package/dist/v2/background.d.ts

@@ -0,0 +1,72 @@
+/**
+ * The `background` lists of the v2 sessions of a connection (see
+ * `background-work.ts`, which builds them).
+ *
+ * A session that reports its background work gets its list on every
+ * `state_update` of its own stream, as v2 requires, from the list the agent
+ * reports when the session starts. A subagent session of such a session
+ * reports its own list from its announcement on, also in the parent's mirror
+ * of its state (`subagent_update.state`).
+ */
+import type * as v2 from "@agentclientprotocol/sdk/experimental/v2/unstable";
+import type { BackgroundReport, WorkStateName } from "../background-work.js";
+import type { V2Terminals } from "./terminal.js";
+/** The `state_update` that reports `state` as the session's current work state. */
+export declare function stateUpdate(state: WorkStateName): v2.SessionUpdate;
+export declare class V2Background {
+    private readonly terminals;
+    /**
+     * The latest list of each session that reports one, whether a state of the
+     * session carried it, and the parent of a subagent session.
+     */
+    private readonly sessions;
+    /**
+     * The tool calls that advertise `cancel`, by session and tool call. Like a
+     * terminal's (see `V2Terminals.advertiseCancel`), the capability goes with
+     * the final status.
+     */
+    private readonly cancellableToolCalls;
+    constructor(terminals: V2Terminals);
+    /**
+     * `notification` with the session's list, when it is a `state_update` of a
+     * session that reports one, or a `subagent_update` that mirrors the state of
+     * such a child. A child of a session that reports its list reports its own
+     * from its announcement on: empty, until the agent reports it.
+     */
+    stamp(notification: v2.UpdateSessionNotification): v2.UpdateSessionNotification;
+    /**
+     * Records the new list of a session, and returns the updates that report it:
+     *
+     * - For each terminal or tool call that the list adds, a `terminal_update`
+     *   or `tool_call_update` that lets the client cancel it. It comes before
+     *   the first list that names it, as v2 requires of an announcement: its
+     *   own updates came earlier.
+     * - Once a state of the session carried a list, the state again with the
+     *   new list, without a stop reason: a repeated `idle` is no new
+     *   completion. A subagent's goes to its parent's mirror first, as its
+     *   other states do.
+     */
+    changed(report: BackgroundReport): v2.UpdateSessionNotification[];
+    /**
+     * The current `terminal_update` of each terminal that the session
+     * `sessionId` lists, and the `cancel` capability of each tool call that it
+     * lists, whose other fields the agent sends (see
+     * `ClaudeAcpAgent.publishBackgroundToolCalls`). v2 requires them before the
+     * state snapshot of `session/resume`, as a replay may not have delivered
+     * them.
+     */
+    currentItems(sessionId: string): v2.UpdateSessionNotification[];
+    /** The tool calls that the session `sessionId` lists. */
+    listedToolCalls(sessionId: string): string[];
+    /**
+     * The update that lets the client cancel the listed terminal or tool call
+     * `item`, unless it advertises that already. `again` sends it anyway, as
+     * the item's current state.
+     */
+    private advertiseCancel;
+    /** The subagent sessions that the session `sessionId` lists. */
+    listedSubagents(sessionId: string): string[];
+    /** Forgets the list of a session, and those of its subagent sessions. */
+    forget(sessionId: string): void;
+}
+//# sourceMappingURL=background.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/v2/background.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAC7E,OAAO,KAAK,EAAkB,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUjD,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG,EAAE,CAAC,aAAa,CAElE;AAUD,qBAAa,YAAY;IAiBX,OAAO,CAAC,QAAQ,CAAC,SAAS;IAhBtC;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGrB;IAEJ;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAqB;gBAE7B,SAAS,EAAE,WAAW;IAEnD;;;;;OAKG;IACH,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,yBAAyB,GAAG,EAAE,CAAC,yBAAyB;IAiC/E;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,MAAM,EAAE,gBAAgB,GAAG,EAAE,CAAC,yBAAyB,EAAE;IAyBjE;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC,yBAAyB,EAAE;IAM/D,yDAAyD;IACzD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAM5C;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAyBvB,gEAAgE;IAChE,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAM5C,yEAAyE;IACzE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAShC"}

package/dist/v2/background.js

@@ -0,0 +1,166 @@
+/** `state` as the current work state of a session, with no stop reason. */
+function currentState(state) {
+    if (state === "idle")
+        return { state: "idle" };
+    if (state === "running")
+        return { state: "running" };
+    if (state === "requires_action")
+        return { state: "requires_action" };
+    return { state: "unknown" };
+}
+/** The `state_update` that reports `state` as the session's current work state. */
+export function stateUpdate(state) {
+    return { sessionUpdate: "state_update", ...currentState(state) };
+}
+/** `state` with the list `background`. */
+function withBackground(state, background) {
+    return { ...state, background };
+}
+/** The final tool call statuses. */
+const FINAL_STATUSES = new Set(["completed", "failed", "cancelled"]);
+export class V2Background {
+    terminals;
+    /**
+     * The latest list of each session that reports one, whether a state of the
+     * session carried it, and the parent of a subagent session.
+     */
+    sessions = new Map();
+    /**
+     * The tool calls that advertise `cancel`, by session and tool call. Like a
+     * terminal's (see `V2Terminals.advertiseCancel`), the capability goes with
+     * the final status.
+     */
+    cancellableToolCalls = new Set();
+    constructor(terminals) {
+        this.terminals = terminals;
+    }
+    /**
+     * `notification` with the session's list, when it is a `state_update` of a
+     * session that reports one, or a `subagent_update` that mirrors the state of
+     * such a child. A child of a session that reports its list reports its own
+     * from its announcement on: empty, until the agent reports it.
+     */
+    stamp(notification) {
+        const { sessionId, update } = notification;
+        if (update.sessionUpdate === "tool_call_update" &&
+            FINAL_STATUSES.has(String(update.status)) &&
+            this.cancellableToolCalls.delete(`${sessionId} ${update.toolCallId}`)) {
+            // A tool call that reached its final status can no longer be cancelled.
+            return { ...notification, update: { ...update, capabilities: null } };
+        }
+        if (update.sessionUpdate === "state_update") {
+            const session = this.sessions.get(sessionId);
+            if (!session)
+                return notification;
+            session.reported = true;
+            return { ...notification, update: { ...update, background: session.items } };
+        }
+        if (update.sessionUpdate === "subagent_update" && this.sessions.has(sessionId)) {
+            const subagent = update;
+            let child = this.sessions.get(subagent.sessionId);
+            if (!child) {
+                child = { items: [], reported: false, parent: sessionId };
+                this.sessions.set(subagent.sessionId, child);
+            }
+            if (subagent.state) {
+                return {
+                    ...notification,
+                    update: { ...subagent, state: withBackground(subagent.state, child.items) },
+                };
+            }
+        }
+        return notification;
+    }
+    /**
+     * Records the new list of a session, and returns the updates that report it:
+     *
+     * - For each terminal or tool call that the list adds, a `terminal_update`
+     *   or `tool_call_update` that lets the client cancel it. It comes before
+     *   the first list that names it, as v2 requires of an announcement: its
+     *   own updates came earlier.
+     * - Once a state of the session carried a list, the state again with the
+     *   new list, without a stop reason: a repeated `idle` is no new
+     *   completion. A subagent's goes to its parent's mirror first, as its
+     *   other states do.
+     */
+    changed(report) {
+        const { sessionId, items, state, parentSessionId } = report;
+        const session = this.sessions.get(sessionId);
+        const unchanged = session && JSON.stringify(session.items) === JSON.stringify(items);
+        this.sessions.set(sessionId, {
+            items,
+            reported: session?.reported ?? false,
+            parent: parentSessionId ?? session?.parent,
+        });
+        const known = new Set((session?.items ?? []).map((item) => JSON.stringify(item)));
+        const updates = items.flatMap((item) => known.has(JSON.stringify(item)) ? [] : this.advertiseCancel(sessionId, item, false));
+        if (session?.reported && state && !unchanged) {
+            if (parentSessionId) {
+                updates.push({
+                    sessionId: parentSessionId,
+                    update: { sessionUpdate: "subagent_update", sessionId, state: currentState(state) },
+                });
+            }
+            updates.push({ sessionId, update: stateUpdate(state) });
+        }
+        return updates;
+    }
+    /**
+     * The current `terminal_update` of each terminal that the session
+     * `sessionId` lists, and the `cancel` capability of each tool call that it
+     * lists, whose other fields the agent sends (see
+     * `ClaudeAcpAgent.publishBackgroundToolCalls`). v2 requires them before the
+     * state snapshot of `session/resume`, as a replay may not have delivered
+     * them.
+     */
+    currentItems(sessionId) {
+        return (this.sessions.get(sessionId)?.items ?? []).flatMap((item) => this.advertiseCancel(sessionId, item, true));
+    }
+    /** The tool calls that the session `sessionId` lists. */
+    listedToolCalls(sessionId) {
+        return (this.sessions.get(sessionId)?.items ?? []).flatMap((item) => item.type === "tool_call" ? [item.toolCallId] : []);
+    }
+    /**
+     * The update that lets the client cancel the listed terminal or tool call
+     * `item`, unless it advertises that already. `again` sends it anyway, as
+     * the item's current state.
+     */
+    advertiseCancel(sessionId, item, again) {
+        if (item.type === "terminal") {
+            const update = this.terminals.advertiseCancel(sessionId, item.terminalId, again);
+            return update ? [{ sessionId, update }] : [];
+        }
+        if (item.type !== "tool_call")
+            return [];
+        const key = `${sessionId} ${item.toolCallId}`;
+        if (this.cancellableToolCalls.has(key) && !again)
+            return [];
+        this.cancellableToolCalls.add(key);
+        return [
+            {
+                sessionId,
+                update: {
+                    sessionUpdate: "tool_call_update",
+                    toolCallId: item.toolCallId,
+                    capabilities: { cancel: {} },
+                },
+            },
+        ];
+    }
+    /** The subagent sessions that the session `sessionId` lists. */
+    listedSubagents(sessionId) {
+        return (this.sessions.get(sessionId)?.items ?? []).flatMap((item) => item.type === "subagent" ? [item.sessionId] : []);
+    }
+    /** Forgets the list of a session, and those of its subagent sessions. */
+    forget(sessionId) {
+        this.sessions.delete(sessionId);
+        for (const key of this.cancellableToolCalls) {
+            if (key.startsWith(`${sessionId} `))
+                this.cancellableToolCalls.delete(key);
+        }
+        for (const [child, { parent }] of this.sessions) {
+            if (parent === sessionId)
+                this.forget(child);
+        }
+    }
+}

package/dist/v2/terminal.d.ts

@@ -35,6 +35,14 @@ export declare class V2Terminals {
         terminal: v2.SessionUpdate[];
         report: V1ToolCallReport | undefined;
     };
+    /**
+     * The `terminal_update` that lets the client cancel the running terminal
+     * `terminalId` of the session `sessionId` with `terminal/cancel`, with its
+     * command, or undefined when the terminal is not running. `again` sends it
+     * also when the terminal advertises the capability already, as the current
+     * state of the terminal.
+     */
+    advertiseCancel(sessionId: string, terminalId: string, again?: boolean): v2.SessionUpdate | undefined;
     /** Forgets the terminals of a session. */
     forget(sessionId: string): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/v2/terminal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE7E,KAAK,gBAAgB,GACjB,CAAC,QAAQ,GAAG;IAAE,aAAa,EAAE,WAAW,CAAA;CAAE,CAAC,GAC3C,CAAC,cAAc,GAAG;IAAE,aAAa,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAAC;AAiB7D,0EAA0E;AAC1E,qBAAa,WAAW;IACtB,oGAAoG;IACpG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+D;IAEvF;;;;;;;;OAQG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,gBAAgB,GACvB;QAAE,QAAQ,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC;QAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE;IAuCzE,0CAA0C;IAC1C,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAKhC"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/v2/terminal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE7E,KAAK,gBAAgB,GACjB,CAAC,QAAQ,GAAG;IAAE,aAAa,EAAE,WAAW,CAAA;CAAE,CAAC,GAC3C,CAAC,cAAc,GAAG;IAAE,aAAa,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAAC;AAiB7D,0EAA0E;AAC1E,qBAAa,WAAW;IACtB,oGAAoG;IACpG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAGpB;IAEJ;;;;;;;;OAQG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,gBAAgB,GACvB;QAAE,QAAQ,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC;QAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE;IAyCzE;;;;;;OAMG;IACH,eAAe,CACb,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,KAAK,UAAQ,GACZ,EAAE,CAAC,aAAa,GAAG,SAAS;IAa/B,0CAA0C;IAC1C,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAKhC"}

package/dist/v2/terminal.js

@@ -42,6 +42,8 @@ export class V2Terminals {
                                 ...(exit.exit_code != null ? { exitCode: exit.exit_code } : {}),
                                 ...(exit.signal != null ? { signal: exit.signal } : {}),
                             },
+                            // An exited terminal can no longer be cancelled.
+                            ...(running.cancellable ? { capabilities: null } : {}),
                         }
                         : {}),
                 });
@@ -58,6 +60,26 @@ export class V2Terminals {
         }
         return { terminal, report: withoutTerminalKeys(report) };
     }
+    /**
+     * The `terminal_update` that lets the client cancel the running terminal
+     * `terminalId` of the session `sessionId` with `terminal/cancel`, with its
+     * command, or undefined when the terminal is not running. `again` sends it
+     * also when the terminal advertises the capability already, as the current
+     * state of the terminal.
+     */
+    advertiseCancel(sessionId, terminalId, again = false) {
+        // The agent names a command's terminal after its tool call.
+        const running = this.running.get(`${sessionId} ${terminalId}`);
+        if (!running || (running.cancellable && !again))
+            return undefined;
+        running.cancellable = true;
+        return {
+            sessionUpdate: "terminal_update",
+            terminalId,
+            ...(running.command !== undefined ? { command: running.command } : {}),
+            capabilities: { cancel: {} },
+        };
+    }
     /** Forgets the terminals of a session. */
     forget(sessionId) {
         for (const key of this.running.keys()) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.99.2-preview.11",
+  "version": "0.99.2-preview.13",
   "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",