@agentclientprotocol/claude-agent-acp 0.85.2-preview.13 → 0.85.2-preview.14

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;AAgB9E;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CAoCb"}
+{"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;AAgB9E;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CAyCb"}

package/dist/v2/agent.js

@@ -3,7 +3,7 @@ import { ClaudeAcpAgent } from "../acp-agent.js";
 import { v1InitializeRequest, v2InitializeResponse } from "./initialize.js";
 import { v1PermissionResponse, v2PermissionRequest } from "./permission.js";
 import { v2Prompt } from "./prompt.js";
-import { v1NewSessionRequest, v1ResumeSessionRequest, v1SetSessionConfigOptionRequest, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
+import { v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
 import { v2SessionUpdate } from "./session-update.js";
 /**
  * The ACP v2 surface, for one connection.
@@ -27,7 +27,12 @@ export function v2AgentApp(logger, onAgent) {
         .onRequest(v2.methods.agent.auth.logout, ({ params }) => agent.logout(params))
         .onRequest(v2.methods.agent.session.new, async ({ params }) => v2NewSessionResponse(await agent.newSession(v1NewSessionRequest(params))))
         .onRequest(v2.methods.agent.session.list, ({ params }) => agent.listSessions(params))
-        .onRequest(v2.methods.agent.session.resume, async ({ params }) => v2ResumeSessionResponse(await agent.resumeSession(v1ResumeSessionRequest(params))))
+        .onRequest(v2.methods.agent.session.resume, async ({ params }) => {
+        const restore = v1RestoreSessionRequest(params);
+        return v2ResumeSessionResponse(restore.method === "resume"
+            ? await agent.resumeSession(restore.request)
+            : await client.replaying(params.sessionId, () => agent.loadSession(restore.request)));
+    })
         .onRequest(v2.methods.agent.session.close, ({ params }) => agent.closeSession(params))
         .onRequest(v2.methods.agent.session.delete, ({ params }) => agent.deleteSession(params))
         .onRequest(v2.methods.agent.session.setConfigOption, async ({ params }) => {
@@ -46,10 +51,32 @@ export function v2AgentApp(logger, onAgent) {
 class V2ClientConnection {
     ctx;
     logger;
+    /**
+     * The sessions whose history replays, each with the messages that the
+     * replay has cleared so far.
+     */
+    replays = new Map();
     constructor(ctx, logger) {
         this.ctx = ctx;
         this.logger = logger;
     }
+    /**
+     * Runs `restore`, which replays the history of `sessionId`.
+     *
+     * The agent replays messages as chunks. A v2 client may still hold a
+     * replayed message, and chunks append, so before the first replayed chunk of
+     * each message the client gets the message with no content, which clears it,
+     * as v2 requires of a message replayed as chunks.
+     */
+    async replaying(sessionId, restore) {
+        this.replays.set(sessionId, new Set());
+        try {
+            return await restore();
+        }
+        finally {
+            this.replays.delete(sessionId);
+        }
+    }
     /**
      * Sends a v2 session update, and logs rather than rejects when that fails.
      * It and {@link sessionUpdate} hand updates to the connection synchronously,
@@ -72,12 +99,35 @@ class V2ClientConnection {
     }
     async sessionUpdate({ update, ...notification }) {
         const v2Update = v2SessionUpdate(update);
-        if (v2Update) {
-            await this.ctx.notify(v2.methods.client.session.update, {
-                ...notification,
-                update: v2Update,
-            });
-        }
+        if (!v2Update)
+            return;
+        const clear = this.replayClear(notification.sessionId, v2Update);
+        // Both go to the connection before either is awaited, so a chunk that
+        // another call sends meanwhile cannot come between them.
+        await Promise.all([
+            ...(clear
+                ? [this.ctx.notify(v2.methods.client.session.update, { ...notification, update: clear })]
+                : []),
+            this.ctx.notify(v2.methods.client.session.update, { ...notification, update: v2Update }),
+        ]);
+    }
+    /**
+     * The update that clears the message of a replayed chunk, when it is the
+     * first replayed chunk of that message (see {@link replaying}).
+     */
+    replayClear(sessionId, update) {
+        const cleared = this.replays.get(sessionId);
+        if (!cleared)
+            return undefined;
+        const kind = MESSAGE_OF_CHUNK.get(update.sessionUpdate);
+        if (!kind)
+            return undefined;
+        const { messageId } = update;
+        const key = `${kind} ${messageId}`;
+        if (cleared.has(key))
+            return undefined;
+        cleared.add(key);
+        return emptyMessage(kind, messageId);
     }
     async requestPermission(params, signal) {
         const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest(params), { cancellationSignal: signal });
@@ -103,6 +153,23 @@ class V2ClientConnection {
         return Promise.reject(new Error("ACP v2 has no client file system"));
     }
 }
+/** The message update of each message chunk. */
+const MESSAGE_OF_CHUNK = new Map([
+    ["user_message_chunk", "user_message"],
+    ["agent_message_chunk", "agent_message"],
+    ["agent_thought_chunk", "agent_thought"],
+]);
+function emptyMessage(kind, messageId) {
+    const message = { messageId, content: [] };
+    switch (kind) {
+        case "user_message":
+            return { ...message, sessionUpdate: kind };
+        case "agent_message":
+            return { ...message, sessionUpdate: kind };
+        default:
+            return { ...message, sessionUpdate: kind };
+    }
+}
 function isExtensionMethod(method) {
     return method.startsWith("_");
 }

package/dist/v2/session.d.ts

@@ -3,14 +3,25 @@
  * `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 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;
+};
 /** 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,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,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,29 @@ 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) },
+    };
 }
 /** v2 drops `modes`: the session mode is the `mode` config option, which the agent always lists. */
 export function v2NewSessionResponse(response) {

package/package.json

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