@agentclientprotocol/claude-agent-acp 0.85.2-preview.9 → 0.86.1-preview.1

package/dist/v2/session.d.ts

@@ -3,14 +3,39 @@
  * `ClaudeAcpAgent`: v2 requests become the v1 requests that the agent serves,
  * and its v1 responses become v2 responses.
  */
-import { type AvailableCommand, type NewSessionRequest, type NewSessionResponse, type ResumeSessionRequest, type ResumeSessionResponse, type SessionConfigOption, type SetSessionConfigOptionRequest } from "@agentclientprotocol/sdk";
+import { type AvailableCommand, type ForkSessionRequest, type LoadSessionRequest, type NewSessionRequest, type NewSessionResponse, type ResumeSessionRequest, type ResumeSessionResponse, type SessionConfigOption, type SetSessionConfigOptionRequest } from "@agentclientprotocol/sdk";
 import * as v2 from "@agentclientprotocol/sdk/experimental/v2";
 export declare function v1NewSessionRequest(params: v2.NewSessionRequest): NewSessionRequest;
 /**
- * `replayFrom` is rejected until the v2 surface can translate the replayed
- * history, which needs the message and tool call updates.
+ * The v1 request that a v2 `session/resume` means.
+ *
+ * v2 restores a session with `session/resume` and replays its history only
+ * when `replayFrom` asks for it. v1 has two methods: `session/resume`, which
+ * never replays, and `session/load`, which replays the whole history before it
+ * responds. `replayFrom: { type: "start" }` is the second; a cursor that
+ * starts elsewhere is rejected.
  */
-export declare function v1ResumeSessionRequest(params: v2.ResumeSessionRequest): ResumeSessionRequest;
+export declare function v1RestoreSessionRequest(params: v2.ResumeSessionRequest): {
+    method: "resume";
+    request: ResumeSessionRequest;
+} | {
+    method: "load";
+    request: LoadSessionRequest;
+};
+/**
+ * The v1 requests that a v2 `session/fork` means.
+ *
+ * The agent's v1 fork copies the transcript into a new session and returns
+ * only its id; a v1 client then resumes or loads it. A v2 fork returns the new
+ * session with its config options, like `session/new`, so the client can
+ * prompt it. The v2 surface therefore forks, then resumes the fork without
+ * replay, with the request's `cwd`, `additionalDirectories`, and
+ * `mcpServers`. The request's `_meta` goes to the fork alone.
+ */
+export declare function v1ForkSessionRequests(params: v2.ForkSessionRequest): {
+    fork: ForkSessionRequest;
+    resume: (sessionId: string) => ResumeSessionRequest;
+};
 /** v2 drops `modes`: the session mode is the `mode` config option, which the agent always lists. */
 export declare function v2NewSessionResponse(response: NewSessionResponse): v2.NewSessionResponse;
 export declare function v2ResumeSessionResponse(response: ResumeSessionResponse): v2.ResumeSessionResponse;

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/v2/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EAGxB,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAInF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAAG,oBAAoB,CAS5F;AAED,oGAAoG;AACpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAExF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,qBAAqB,CAKjG;AAED,uEAAuE;AACvE,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,EAAE,CAAC,6BAA6B,GACvC,6BAA6B,CAgB/B;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAQxF;AAWD,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAKvF"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/v2/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAEvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EAGxB,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAInF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAE7B;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAkBlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,GAAG;IACpE,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,oBAAoB,CAAC;CACrD,CAUA;AAED,oGAAoG;AACpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAExF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,qBAAqB,CAKjG;AAED,uEAAuE;AACvE,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,EAAE,CAAC,6BAA6B,GACvC,6BAA6B,CAgB/B;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAQxF;AAWD,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAKvF"}

package/dist/v2/session.js

@@ -11,15 +11,50 @@ export function v1NewSessionRequest(params) {
     return { ...request, mcpServers: (mcpServers ?? []).map(v1McpServer) };
 }
 /**
- * `replayFrom` is rejected until the v2 surface can translate the replayed
- * history, which needs the message and tool call updates.
+ * The v1 request that a v2 `session/resume` means.
+ *
+ * v2 restores a session with `session/resume` and replays its history only
+ * when `replayFrom` asks for it. v1 has two methods: `session/resume`, which
+ * never replays, and `session/load`, which replays the whole history before it
+ * responds. `replayFrom: { type: "start" }` is the second; a cursor that
+ * starts elsewhere is rejected.
  */
-export function v1ResumeSessionRequest(params) {
+export function v1RestoreSessionRequest(params) {
     const { replayFrom, mcpServers, ...request } = params;
-    if (replayFrom != null) {
-        throw RequestError.invalidParams({ replayFrom }, "The ACP v2 surface does not replay session history yet");
+    if (replayFrom == null) {
+        return {
+            method: "resume",
+            request: { ...request, ...(mcpServers ? { mcpServers: mcpServers.map(v1McpServer) } : {}) },
+        };
     }
-    return { ...request, ...(mcpServers ? { mcpServers: mcpServers.map(v1McpServer) } : {}) };
+    if (replayFrom.type !== "start") {
+        throw RequestError.invalidParams({ replayFrom }, `Replaying from a ${replayFrom.type} cursor is not supported`);
+    }
+    return {
+        method: "load",
+        request: { ...request, mcpServers: (mcpServers ?? []).map(v1McpServer) },
+    };
+}
+/**
+ * The v1 requests that a v2 `session/fork` means.
+ *
+ * The agent's v1 fork copies the transcript into a new session and returns
+ * only its id; a v1 client then resumes or loads it. A v2 fork returns the new
+ * session with its config options, like `session/new`, so the client can
+ * prompt it. The v2 surface therefore forks, then resumes the fork without
+ * replay, with the request's `cwd`, `additionalDirectories`, and
+ * `mcpServers`. The request's `_meta` goes to the fork alone.
+ */
+export function v1ForkSessionRequests(params) {
+    const { mcpServers, _meta, ...request } = params;
+    const session = {
+        ...request,
+        ...(mcpServers ? { mcpServers: mcpServers.map(v1McpServer) } : {}),
+    };
+    return {
+        fork: { ...session, ...(_meta != null ? { _meta } : {}) },
+        resume: (sessionId) => ({ ...session, sessionId }),
+    };
 }
 /** v2 drops `modes`: the session mode is the `mode` config option, which the agent always lists. */
 export function v2NewSessionResponse(response) {

package/dist/v2/terminal.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Agent-owned display terminals for the commands that the agent runs.
+ *
+ * The agent reports a command through the terminal extension of ACP v1
+ * clients, as codex-acp does: `_meta.terminal_info` names the terminal of a
+ * tool call, whose content references it; `terminal_output` (a snapshot) or
+ * `terminal_output_delta` (a chunk) carries the output, and `terminal_exit` the
+ * exit. ACP v2 standardizes this as display-only terminals: the same content
+ * reference, and `terminal_update` and `terminal_output_chunk` for the
+ * terminal's state. The agent reports to a v2 client as to a client of the
+ * extension (`ToolCallClientCapabilities.from`), and {@link V2Terminals} turns
+ * the extension's keys into those updates.
+ */
+import type { ToolCall, ToolCallUpdate } from "@agentclientprotocol/sdk";
+import type * as v2 from "@agentclientprotocol/sdk/experimental/v2";
+type V1ToolCallReport = (ToolCall & {
+    sessionUpdate: "tool_call";
+}) | (ToolCallUpdate & {
+    sessionUpdate: "tool_call_update";
+});
+/** The terminal updates of the tool call reports of one v2 connection. */
+export declare class V2Terminals {
+    /** The terminal and the last reported command of each running command, by session and tool call. */
+    private readonly running;
+    /**
+     * The terminal updates that a tool call report carries in the extension's
+     * keys, and the report without them, or undefined when nothing else is left
+     * in it.
+     *
+     * The extension names no command, so the terminal gets the command of the
+     * tool call's `rawInput` once a report carries it: the first report of a
+     * streamed tool use has no input yet.
+     */
+    split(sessionId: string, report: V1ToolCallReport): {
+        terminal: v2.SessionUpdate[];
+        report: V1ToolCallReport | undefined;
+    };
+    /** Forgets the terminals of a session. */
+    forget(sessionId: string): void;
+}
+export {};
+//# sourceMappingURL=terminal.d.ts.map

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

@@ -0,0 +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,0BAA0B,CAAC;AACzE,OAAO,KAAK,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAEpE,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"}

package/dist/v2/terminal.js

@@ -0,0 +1,95 @@
+const TERMINAL_KEYS = [
+    "terminal_info",
+    "terminal_output",
+    "terminal_output_delta",
+    "terminal_exit",
+];
+/** The terminal updates of the tool call reports of one v2 connection. */
+export class V2Terminals {
+    /** The terminal and the last reported command of each running command, by session and tool call. */
+    running = new Map();
+    /**
+     * The terminal updates that a tool call report carries in the extension's
+     * keys, and the report without them, or undefined when nothing else is left
+     * in it.
+     *
+     * The extension names no command, so the terminal gets the command of the
+     * tool call's `rawInput` once a report carries it: the first report of a
+     * streamed tool use has no input yet.
+     */
+    split(sessionId, report) {
+        const meta = (report._meta ?? {});
+        const key = `${sessionId} ${report.toolCallId}`;
+        if (meta.terminal_info)
+            this.running.set(key, { terminalId: meta.terminal_info.terminal_id });
+        const terminal = [];
+        const running = this.running.get(key);
+        if (running) {
+            const command = commandOf(report.rawInput);
+            const newCommand = command !== undefined && command !== running.command;
+            if (newCommand)
+                running.command = command;
+            const { terminal_output: output, terminal_output_delta: delta, terminal_exit: exit } = meta;
+            if (meta.terminal_info || newCommand || output || exit) {
+                terminal.push({
+                    sessionUpdate: "terminal_update",
+                    terminalId: running.terminalId,
+                    ...(newCommand ? { command } : {}),
+                    ...(output ? { output: { data: base64(output.data) } } : {}),
+                    ...(exit
+                        ? {
+                            exitStatus: {
+                                ...(exit.exit_code != null ? { exitCode: exit.exit_code } : {}),
+                                ...(exit.signal != null ? { signal: exit.signal } : {}),
+                            },
+                        }
+                        : {}),
+                });
+            }
+            if (delta) {
+                terminal.push({
+                    sessionUpdate: "terminal_output_chunk",
+                    terminalId: running.terminalId,
+                    data: base64(delta.data),
+                });
+            }
+            if (exit)
+                this.running.delete(key);
+        }
+        return { terminal, report: withoutTerminalKeys(report) };
+    }
+    /** Forgets the terminals of a session. */
+    forget(sessionId) {
+        for (const key of this.running.keys()) {
+            if (key.startsWith(`${sessionId} `))
+                this.running.delete(key);
+        }
+    }
+}
+/**
+ * The report without the extension's keys, or undefined when it carried
+ * nothing else but `_meta`: the output report of a command carries the output
+ * alone, and only the stamps that every report of the tool call repeats. In v2
+ * a concrete `_meta` replaces the stored one, so sending them would drop the
+ * other keys that the tool call holds.
+ */
+function withoutTerminalKeys(report) {
+    if (!report._meta || !TERMINAL_KEYS.some((key) => key in report._meta))
+        return report;
+    const meta = Object.fromEntries(Object.entries(report._meta).filter(([key]) => !TERMINAL_KEYS.includes(key)));
+    const stripped = { ...report };
+    if (Object.keys(meta).length > 0)
+        stripped._meta = meta;
+    else
+        delete stripped._meta;
+    const fields = Object.keys(stripped).filter((key) => key !== "sessionUpdate" && key !== "toolCallId" && key !== "_meta");
+    return fields.length > 0 || report.sessionUpdate === "tool_call" ? stripped : undefined;
+}
+function commandOf(rawInput) {
+    const command = rawInput?.command;
+    return typeof command === "string" && command.length > 0 ? command : undefined;
+}
+/** The output bytes, base64-encoded as a v2 terminal carries them. */
+function base64(text) {
+    return Buffer.from(text, "utf8").toString("base64");
+}

package/dist/v2/tool-call.d.ts

@@ -0,0 +1,38 @@
+/**
+ * The v2 form of the tool call reports that `ClaudeAcpAgent` sends as v1
+ * `tool_call` and `tool_call_update` updates, and in permission requests.
+ */
+import type { ToolCall, ToolCallUpdate } from "@agentclientprotocol/sdk";
+import type * as v2 from "@agentclientprotocol/sdk/experimental/v2";
+type V1ToolCallReport = (ToolCall & {
+    sessionUpdate: "tool_call";
+}) | (ToolCallUpdate & {
+    sessionUpdate: "tool_call_update";
+});
+type V2ToolCallUpdate = v2.ToolCallUpdate & {
+    sessionUpdate: "tool_call_update";
+};
+/**
+ * The v2 form of a v1 tool call report.
+ *
+ * v1 reports a new tool call with `tool_call` and changes it with
+ * `tool_call_update`; v2 has one `tool_call_update` that upserts by
+ * `toolCallId`. Both leave a field that a report omits unchanged, and both
+ * replace `content` and `locations` as whole arrays. They differ on `null`:
+ * in v1 it leaves the field unchanged too, in v2 it clears the field, so `null`
+ * fields are left out.
+ *
+ * Diffs need what a v1 diff does not say, so the agent builds them in v2 form
+ * for a v2 client (`v2DiffContent`), and they pass as they are. Terminal
+ * content references a display terminal, as in v2: a v2 client has no client
+ * terminals, so the agent's only terminals are those of its terminal extension
+ * (see `terminal.ts`).
+ */
+export declare function v2ToolCallUpdate(report: V1ToolCallReport): V2ToolCallUpdate;
+/**
+ * The v2 form of the fields of a v1 tool call report, which a session update
+ * and the subject of a permission request carry. See {@link v2ToolCallUpdate}.
+ */
+export declare function v2ToolCallPatch(toolCall: ToolCall | ToolCallUpdate): v2.ToolCallUpdate;
+export {};
+//# sourceMappingURL=tool-call.d.ts.map

package/dist/v2/tool-call.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-call.d.ts","sourceRoot":"","sources":["../../src/v2/tool-call.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAmB,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1F,OAAO,KAAK,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAEpE,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;AAE7D,KAAK,gBAAgB,GAAG,EAAE,CAAC,cAAc,GAAG;IAAE,aAAa,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAElF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAE3E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,cAAc,GAAG,EAAE,CAAC,cAAc,CAUtF"}

package/dist/v2/tool-call.js

@@ -0,0 +1,49 @@
+/**
+ * The v2 form of a v1 tool call report.
+ *
+ * v1 reports a new tool call with `tool_call` and changes it with
+ * `tool_call_update`; v2 has one `tool_call_update` that upserts by
+ * `toolCallId`. Both leave a field that a report omits unchanged, and both
+ * replace `content` and `locations` as whole arrays. They differ on `null`:
+ * in v1 it leaves the field unchanged too, in v2 it clears the field, so `null`
+ * fields are left out.
+ *
+ * Diffs need what a v1 diff does not say, so the agent builds them in v2 form
+ * for a v2 client (`v2DiffContent`), and they pass as they are. Terminal
+ * content references a display terminal, as in v2: a v2 client has no client
+ * terminals, so the agent's only terminals are those of its terminal extension
+ * (see `terminal.ts`).
+ */
+export function v2ToolCallUpdate(report) {
+    return { ...v2ToolCallPatch(report), sessionUpdate: "tool_call_update" };
+}
+/**
+ * The v2 form of the fields of a v1 tool call report, which a session update
+ * and the subject of a permission request carry. See {@link v2ToolCallUpdate}.
+ */
+export function v2ToolCallPatch(toolCall) {
+    const patch = Object.fromEntries(Object.entries(toolCall).filter(([key, value]) => value !== null && key !== "sessionUpdate" && key !== "content"));
+    return {
+        ...patch,
+        ...(toolCall.content != null ? { content: toolCall.content.map(v2ToolCallContent) } : {}),
+    };
+}
+function v2ToolCallContent(item) {
+    switch (item.type) {
+        case "content":
+            // v2 content blocks are a superset of the v1 blocks.
+            return item;
+        case "terminal":
+            return item;
+        default:
+            if (isV2Diff(item))
+                return item;
+            // A v1 diff names one path, with old and new texts that can be a
+            // snippet: v2 cannot say which operation it is, nor give its patch.
+            throw new Error("An ACP v2 client cannot take a v1 diff");
+    }
+}
+/** A diff that the agent built in v2 form, which travels as v1 content. */
+function isV2Diff(item) {
+    return "changes" in item;
+}

package/package.json

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