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

package/dist/session-mode.js

@@ -1,5 +1,6 @@
 import { RequestError, } from "@agentclientprotocol/sdk";
 import { AIR_KIND_KEY, airOnlyMeta } from "./air-extension.js";
+import { resolvePermissionMode } from "./permissions/modes.js";
 import { noticeOrTranscriptUpdate, noticeTranscriptText, sentenceCase, } from "./session-notices.js";
 export const MODE_CONFIG_ID = "mode";
 export const AUTO_MODE_FALLBACK = "acceptEdits";
@@ -11,6 +12,27 @@ const AUTO_MODE_FALLBACK_NOTICE = {
     title: "Auto mode unavailable",
     description: sentenceCase(AUTO_MODE_FALLBACK_REASON),
 };
+/**
+ * The permission mode a new Claude query starts in.
+ *
+ * An explicit mode wins. A resume or a load continues in the mode of the last
+ * user record of the transcript. If that mode is unknown or not available now,
+ * for example bypass, the session starts in `defaultMode` of the settings.
+ */
+export function resolveInitialPermissionMode(sources, logger, allowBypass) {
+    if (sources.explicit !== undefined) {
+        return resolvePermissionMode(sources.explicit, logger, allowBypass);
+    }
+    if (sources.resumed !== undefined) {
+        let rejected = false;
+        const mode = resolvePermissionMode(sources.resumed, { error: () => (rejected = true) }, allowBypass);
+        if (!rejected)
+            return mode;
+        logger.error(`Ignoring permission mode "${sources.resumed}" of the resumed transcript: ` +
+            `not available in this session.`);
+    }
+    return resolvePermissionMode(sources.defaultMode, logger, allowBypass);
+}
 /** Owns session-mode policy and the ACP/SDK synchronization it requires. */
 export class SessionModeManager {
     options;

package/dist/tool-calls/client-capabilities.d.ts

@@ -16,6 +16,14 @@ export declare class ClientCapabilities {
     readonly diffPatch: boolean;
     /** The capabilities that only JetBrains AIR declares. */
     readonly air: AirCapabilities;
+    /**
+     * The client speaks ACP v2. Its diffs carry structured `changes` and an
+     * optional git patch, which a v1 diff cannot express. Only the v2 surface
+     * sets this, never the capabilities that a client sends. A v2 client also
+     * takes the terminal extension (`terminalOutput`), which the v2 surface
+     * sends as display terminals.
+     */
+    readonly v2: boolean;
     constructor(
     /** The client renders a terminal from `_meta.terminal_info`, `terminal_output`, and `terminal_exit`. */
     terminalOutput?: boolean, 
@@ -24,8 +32,18 @@ export declare class ClientCapabilities {
     /** The client accepts an exact git patch in a diff (`jetbrains.air` `diffPatch`). */
     diffPatch?: boolean, 
     /** The capabilities that only JetBrains AIR declares. */
-    air?: AirCapabilities);
-    static from(capabilities: AcpClientCapabilities | null | undefined): ClientCapabilities;
+    air?: AirCapabilities, 
+    /**
+     * The client speaks ACP v2. Its diffs carry structured `changes` and an
+     * optional git patch, which a v1 diff cannot express. Only the v2 surface
+     * sets this, never the capabilities that a client sends. A v2 client also
+     * takes the terminal extension (`terminalOutput`), which the v2 surface
+     * sends as display terminals.
+     */
+    v2?: boolean);
+    static from(capabilities: AcpClientCapabilities | null | undefined, { v2 }?: {
+        v2?: boolean;
+    }): ClientCapabilities;
 }
 /** The capabilities of JetBrains AIR, read from `_meta.jetbrains.air`. */
 export interface AirCapabilities {

package/dist/tool-calls/client-capabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-capabilities.d.ts","sourceRoot":"","sources":["../../src/tool-calls/client-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,IAAI,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAS5F;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAE3B,wGAAwG;IACxG,QAAQ,CAAC,cAAc,EAAE,OAAO;IAChC,4FAA4F;IAC5F,QAAQ,CAAC,mBAAmB,EAAE,OAAO;IACrC,qFAAqF;IACrF,QAAQ,CAAC,SAAS,EAAE,OAAO;IAC3B,yDAAyD;IACzD,QAAQ,CAAC,GAAG,EAAE,eAAe;;IAP7B,wGAAwG;IAC/F,cAAc,GAAE,OAAe;IACxC,4FAA4F;IACnF,mBAAmB,GAAE,OAAe;IAC7C,qFAAqF;IAC5E,SAAS,GAAE,OAAe;IACnC,yDAAyD;IAChD,GAAG,GAAE,eAAwB;IAGxC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,GAAG,kBAAkB;CAiBxF;AAED,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B"}
+{"version":3,"file":"client-capabilities.d.ts","sourceRoot":"","sources":["../../src/tool-calls/client-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,IAAI,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAS5F;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAE3B,wGAAwG;IACxG,QAAQ,CAAC,cAAc,EAAE,OAAO;IAChC,4FAA4F;IAC5F,QAAQ,CAAC,mBAAmB,EAAE,OAAO;IACrC,qFAAqF;IACrF,QAAQ,CAAC,SAAS,EAAE,OAAO;IAC3B,yDAAyD;IACzD,QAAQ,CAAC,GAAG,EAAE,eAAe;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,OAAO;;IAfpB,wGAAwG;IAC/F,cAAc,GAAE,OAAe;IACxC,4FAA4F;IACnF,mBAAmB,GAAE,OAAe;IAC7C,qFAAqF;IAC5E,SAAS,GAAE,OAAe;IACnC,yDAAyD;IAChD,GAAG,GAAE,eAAwB;IACtC;;;;;;OAMG;IACM,EAAE,GAAE,OAAe;IAG9B,MAAM,CAAC,IAAI,CACT,YAAY,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EACtD,EAAE,EAAU,EAAE,GAAE;QAAE,EAAE,CAAC,EAAE,OAAO,CAAA;KAAO,GACpC,kBAAkB;CAkBtB;AAED,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B"}

package/dist/tool-calls/client-capabilities.js

@@ -12,6 +12,7 @@ export class ClientCapabilities {
     terminalOutputDelta;
     diffPatch;
     air;
+    v2;
     constructor(
     /** The client renders a terminal from `_meta.terminal_info`, `terminal_output`, and `terminal_exit`. */
     terminalOutput = false, 
@@ -20,20 +21,29 @@ export class ClientCapabilities {
     /** The client accepts an exact git patch in a diff (`jetbrains.air` `diffPatch`). */
     diffPatch = false, 
     /** The capabilities that only JetBrains AIR declares. */
-    air = NO_AIR) {
+    air = NO_AIR, 
+    /**
+     * The client speaks ACP v2. Its diffs carry structured `changes` and an
+     * optional git patch, which a v1 diff cannot express. Only the v2 surface
+     * sets this, never the capabilities that a client sends. A v2 client also
+     * takes the terminal extension (`terminalOutput`), which the v2 surface
+     * sends as display terminals.
+     */
+    v2 = false) {
         this.terminalOutput = terminalOutput;
         this.terminalOutputDelta = terminalOutputDelta;
         this.diffPatch = diffPatch;
         this.air = air;
+        this.v2 = v2;
     }
-    static from(capabilities) {
+    static from(capabilities, { v2 = false } = {}) {
         const meta = capabilities?._meta;
         const terminalOutputDelta = meta?.["terminal_output_delta"] === true;
-        return new ClientCapabilities(terminalOutputDelta || meta?.["terminal_output"] === true, terminalOutputDelta, clientSupportsAirCapability(capabilities, AIR_DIFF_PATCH_CAPABILITY), {
+        return new ClientCapabilities(v2 || terminalOutputDelta || meta?.["terminal_output"] === true, terminalOutputDelta, clientSupportsAirCapability(capabilities, AIR_DIFF_PATCH_CAPABILITY), {
             client: isAirClient(capabilities),
             rawInputRendering: clientSupportsAirCapability(capabilities, AIR_RAW_INPUT_RENDERING_CAPABILITY),
             planFile: clientSupportsAirCapability(capabilities, AIR_PLAN_FILE_CAPABILITY),
-        });
+        }, v2);
     }
 }
 const NO_AIR = {

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":"AAAA,OAAO,KAAK,EACV,kBAAkB,IAAI,qBAAqB,EAC3C,wBAAwB,EACxB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI5F,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAK3D,yCAAyC;AACzC,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE;QAIX,QAAQ,CAAC,EAAE,MAAM,CAAC;QAIlB,YAAY,CAAC,EAAE,OAAO,CAAC;QAIvB,eAAe,CAAC,EAAE,MAAM,CAAC;QAMzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAG1B,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB,SAAS,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC9C,CAAC;IAEF,SAAS,CAAC,EAAE;QACV,GAAG,CAAC,EAAE;YACJ,OAAO,CAAC,EAAE,MAAM,CAAC;YAGjB,YAAY,CAAC,EAAE,MAAM,CAAC;YAGtB,QAAQ,CAAC,EAAE,IAAI,CAAC;YAGhB,KAAK,CAAC,EAAE;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YACxC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,CAAC;KACH,CAAC;IAEF,gBAAgB,CAAC,EAAE,IAAI,CAAC;IAExB,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,eAAe,CAAC,EAAE;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,qBAAqB,CAAC,EAAE;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,CAAC;CACH,CAAC;AAEF,oFAAoF;AACpF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qFAAqF;IACrF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,IAAI,CACV,cAAc,EACd,eAAe,GAAG,iBAAiB,GAAG,uBAAuB,GAAG,eAAe,CAChF,CAAC;CACH;AAED,4DAA4D;AAC5D,KAAK,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;IAE5B,QAAQ,CAAC,YAAY,EAAE,kBAAkB;IACzC,sEAAsE;IACtE,QAAQ,CAAC,MAAM;gBAFN,YAAY,GAAE,kBAA6C;IACpE,sEAAsE;IAC7D,MAAM,UAAQ;IAGzB,MAAM,CAAC,GAAG,CACR,YAAY,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EACtD,MAAM,UAAQ,GACb,mBAAmB;IAItB,+BAA+B;IAC/B,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY;IAQ3E,8FAA8F;IAC9F,QAAQ,CACN,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,MAAM,GACX;QACD,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;KAChC;IAUD;;;OAGG;IACH,QAAQ,CACN,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,eAAe,EAAE,CAAA;KAAO,GAC1F,cAAc;IA4BjB,6DAA6D;IAC7D,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,cAAc;IAc1D;;;;;;OAMG;IACH,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM;;;;;;;;;IAarF;;;;;OAKG;IACH,kBAAkB,CAChB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;QACnC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,IAAI,CAAC,EAAE,cAAc,CAAC;QACtB,4EAA4E;QAC5E,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;KAChC,GACL,wBAAwB,CAAC,UAAU,CAAC;IA+BvC,kCAAkC;IAClC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,eAAe;IAqBzF,+EAA+E;IAC/E,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,cAAc;IA6CzF;;;;;OAKG;IACH,MAAM,CACJ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC7E,cAAc,EAAE;IAuEnB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;OAIG;IACG,UAAU,CACd,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,MAAM,CAAC,EACrC,YAAY,EAAE,OAAO,EACrB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA4BtC;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAChD,GAAG,cAAc;IAyBlB;;;;OAIG;IACH,gBAAgB,CAAC,MAAM,EAAE;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,cAAc;IA0BlB;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,GAAG,cAAc;IAsBlB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;IAgBzD;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,eAAe,EAAE;IAS1E;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,cAAc;CA0BtF"}
+{"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

@@ -118,8 +118,9 @@ export class AcpToolCallRenderer {
     permissionToolCall(toolUse, options = {}) {
         const facts = this.facts(toolUse, options.cwd);
         if (!this.capabilities.air.client) {
-            // The upstream shape: the whole tool call again.
-            const content = this.toolUseContent(toolUse.id, facts);
+            // The upstream shape: the whole tool call again. A v2 client also gets
+            // the exact preview patch, which the tool call does not show.
+            const content = options.previewContent ?? this.toolUseContent(toolUse.id, facts);
             const locations = [...(facts.locations ?? []), ...(options.extraLocations ?? [])];
             return {
                 toolCallId: toolUse.id,

package/dist/tool-calls/reporters/file-edit.d.ts

@@ -22,7 +22,7 @@ type NormalizedWriteInput = Partial<FileWriteInput> & {
 export declare function normalizeWriteInput(input: unknown): NormalizedWriteInput | undefined;
 /** Edit: the diff holds the old and the new text. */
 export declare class EditReporter implements ToolReporter {
-    toolUse(input: unknown, { cwd }: ToolUseContext): ToolUseFacts;
+    toolUse(input: unknown, { cwd, capabilities }: ToolUseContext): ToolUseFacts;
     toolResult(): ToolResultFacts;
     hookResult(toolResponse: unknown, context: ToolUseContext): Promise<ToolResultFacts>;
 }

package/dist/tool-calls/reporters/file-edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-edit.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/file-edit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,6CAA6C,CAAC;AAIrD,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;GAGG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,YAAY;IAiCpF,UAAU,IAAI,eAAe;IAI7B,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAGrF;AAED,yFAAyF;AACzF,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAI9E;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAYpF;AAED,qDAAqD;AACrD,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,cAAc,GAAG,YAAY;IAyB9D,UAAU,IAAI,eAAe;IAI7B,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAGrF;AAwCD;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IAsB5E;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe;CAMxD"}
+{"version":3,"file":"file-edit.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/file-edit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,6CAA6C,CAAC;AAQrD,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;GAGG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,YAAY;IAoCpF,UAAU,IAAI,eAAe;IAI7B,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAGrF;AAED,yFAAyF;AACzF,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAI9E;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAYpF;AAED,qDAAqD;AACrD,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IA0B5E,UAAU,IAAI,eAAe;IAI7B,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;CAGrF;AAyCD;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IAsB5E;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe;CAMxD"}

package/dist/tool-calls/reporters/file-edit.js

@@ -1,4 +1,4 @@
-import { patchUpdateFromDiffToolResponse, toolUpdateFromDiffToolResponse } from "../../diff.js";
+import { patchUpdateFromDiffToolResponse, toolUpdateFromDiffToolResponse, v2UpdateFromDiffToolResponse, } from "../../diff.js";
 import { markdownEscape, resultText, textContent, toDisplayPath } from "../content.js";
 /**
  * Write: the diff holds the file text. The PostToolUse hook sends the final
@@ -14,12 +14,15 @@ export class WriteReporter {
             locations: write?.file_path ? [{ path: write.file_path }] : [],
         };
         if (write?.file_path) {
-            // A negotiated client gets the exact patch from the approval preview or
-            // from the PostToolUse hook. The input does not tell whether the file
-            // exists, so the live tool call shows no diff: a diff without the old
-            // text would claim a creation. The adapter reads the file only for the
-            // preview. A replay has no preview and no hook, so it keeps the diff.
-            if (!capabilities.diffPatch || replay) {
+            // A negotiated client and a v2 client get the exact patch from the
+            // approval preview or from the PostToolUse hook. The input does not tell
+            // whether the file exists, so the live tool call shows no diff: a diff
+            // without the old text would claim a creation. The adapter reads the
+            // file only for the preview. A replay has no preview and no hook, so it
+            // keeps the diff, except for a v2 client: a v2 diff names the operation,
+            // which the input does not tell.
+            const inputDiff = capabilities.v2 ? false : !capabilities.diffPatch || replay;
+            if (inputDiff) {
                 facts.change = [
                     {
                         type: "diff",
@@ -68,7 +71,7 @@ export function normalizeWriteInput(input) {
 }
 /** Edit: the diff holds the old and the new text. */
 export class EditReporter {
-    toolUse(input, { cwd }) {
+    toolUse(input, { cwd, capabilities }) {
         const edit = input;
         const displayPath = edit?.file_path ? toDisplayPath(edit.file_path, cwd) : undefined;
         const facts = {
@@ -76,10 +79,11 @@ export class EditReporter {
             kind: "edit",
             locations: edit?.file_path ? [{ path: edit.file_path }] : [],
         };
-        if (edit?.file_path && (edit.old_string || edit.new_string)) {
-            // The standard diff, also for a client that negotiated patches: the
-            // input holds a snippet, not the file, so a patch would need line
-            // numbers that the adapter does not know here.
+        // The standard diff, also for a client that negotiated patches: the input
+        // holds a snippet, not the file, so a patch would need line numbers that
+        // the adapter does not know here. A v2 diff cannot hold a snippet, so a v2
+        // client gets the patch from the PostToolUse hook alone.
+        if (edit?.file_path && (edit.old_string || edit.new_string) && !capabilities.v2) {
             facts.change = [
                 {
                     type: "diff",
@@ -104,12 +108,14 @@ export class EditReporter {
  * PostToolUse `tool_response`. For Write it replaces the optimistic creation
  * diff with the real diff of an updated file. A negotiated client gets an
  * exact git patch built from the written file, or the standard diff when none
- * can be built.
+ * can be built. A v2 client gets a v2 diff.
  */
 async function finalChange(toolResponse, { capabilities }) {
+    if (capabilities.v2)
+        return v2UpdateFromDiffToolResponse(toolResponse);
     if (!capabilities.diffPatch)
         return toolUpdateFromDiffToolResponse(toolResponse);
-    const patch = await patchUpdateFromDiffToolResponse(toolResponse);
+    const patch = await patchUpdateFromDiffToolResponse(toolResponse, "air");
     if (patch)
         return patch;
     const created = createdFileDiff(toolResponse);

package/dist/turn-events.d.ts

@@ -13,9 +13,14 @@ export interface TurnEvents {
     /**
      * Claude Code took the prompt in as the user message `messageId` of the
      * conversation. Reported at most once per turn, and never after
-     * {@link ended} or {@link failed}. For a prompt Claude Code echoes, that is
-     * the echo; for a command it does not echo (such as `/compact`), it is the
-     * command's result, after any output the command streamed.
+     * {@link ended} or {@link failed}.
+     *
+     * When Claude Code reports command lifecycles (`msg_lifecycle_v1`), that is
+     * when the prompt starts a turn, before the turn's output. Otherwise, and
+     * while another turn is still active (held for its background work,
+     * steered, or cancelled but not yet ended), it is the prompt's echo, after
+     * that turn ended; for a command Claude Code does not echo (such as
+     * `/compact`), it is the command's result, after any output it streamed.
      */
     inserted(messageId: string): void;
     /**
@@ -37,9 +42,10 @@ export interface TurnEvents {
     ended(outcome: TurnOutcome): void;
     /**
      * The turn failed. Without {@link inserted} before, Claude Code was not seen
-     * taking the prompt in.
+     * taking the prompt in. `title`, when the agent has one, describes the
+     * failure for the user in plain text, such as "API Error: 529 Overloaded".
      */
-    failed(error: unknown): void;
+    failed(error: unknown, title?: string): void;
 }
 /** Why a turn ended. Every ACP version has these reasons. */
 export type StopReason = "end_turn" | "max_tokens" | "max_turn_requests" | "refusal" | "cancelled";

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;;;;;;OAMG;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;;;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"}
+{"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,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9C;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/usage-markdown.d.ts

@@ -2,6 +2,8 @@ import type { SDKControlGetUsageResponse } from "@anthropic-ai/claude-agent-sdk"
 /** Validate the experimental SDK response at the runtime boundary. */
 export declare function parseUsageResponse(value: unknown): SDKControlGetUsageResponse | null;
 export declare function isUsageCommandText(text: string): boolean;
+/** Escape the Markdown syntax characters of `value` and fold its line breaks. */
+export declare function escapeMarkdown(value: string): string;
 /** Render the SDK's structured `/usage` response as Markdown. */
 export declare function formatUsageResponse(usage: SDKControlGetUsageResponse): string;
 //# sourceMappingURL=usage-markdown.d.ts.map

package/dist/usage-markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-markdown.d.ts","sourceRoot":"","sources":["../src/usage-markdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AA8DjF,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,0BAA0B,GAAG,IAAI,CAMpF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AA0ED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,0BAA0B,GAAG,MAAM,CAiE7E"}
+{"version":3,"file":"usage-markdown.d.ts","sourceRoot":"","sources":["../src/usage-markdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AA8DjF,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,0BAA0B,GAAG,IAAI,CAMpF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AASD,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEpD;AA+DD,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,0BAA0B,GAAG,MAAM,CAiE7E"}

package/dist/usage-markdown.js

@@ -71,7 +71,8 @@ function usageBar(percent) {
     const filled = clamped === 0 ? 0 : Math.max(1, Math.round((clamped / 100) * cells));
     return `${"█".repeat(filled)}${"░".repeat(cells - filled)}`;
 }
-function escapeMarkdown(value) {
+/** Escape the Markdown syntax characters of `value` and fold its line breaks. */
+export function escapeMarkdown(value) {
     return value.replace(/([\\`*_[\]<>|])/g, "\\$1").replace(/[\r\n]+/g, " ");
 }
 function formatDuration(milliseconds) {

package/dist/utils.d.ts

@@ -13,4 +13,16 @@ export declare function nodeToWebWritable(nodeStream: Writable): WritableStream<
 export declare function nodeToWebReadable(nodeStream: Readable): ReadableStream<Uint8Array>;
 export declare function unreachable(value: never, logger?: Logger): void;
 export declare function sleep(time: number): Promise<void>;
+/** The outcome of {@link raceTimeoutAndAbort}. */
+export type RaceOutcome<T> = {
+    type: "done";
+    value: T;
+} | {
+    type: "timeout";
+} | {
+    type: "aborted";
+};
+/** Wait for `promise` until `timeoutMs` passes or `signal` aborts. A rejection
+ *  of `promise` rejects the result. The timer does not keep the process alive. */
+export declare function raceTimeoutAndAbort<T>(promise: Promise<T>, timeoutMs: number, signal: AbortSignal): Promise<RaceOutcome<T>>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,qBAAa,QAAQ,CAAC,CAAC,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,IAAI,CAAS;IAErB,IAAI,CAAC,IAAI,EAAE,CAAC;IASZ,GAAG;IAQH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;CAgB3C;AAGD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAclF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAUlF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAgB,QAQjE;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,qBAAa,QAAQ,CAAC,CAAC,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,IAAI,CAAS;IAErB,IAAI,CAAC,IAAI,EAAE,CAAC;IASZ,GAAG;IAQH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;CAgB3C;AAGD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAclF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAUlF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAgB,QAQjE;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD;AAED,kDAAkD;AAClD,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAEpG;kFACkF;AAClF,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAoBzB"}

package/dist/utils.js

@@ -79,3 +79,31 @@ export function unreachable(value, logger = console) {
 export function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
+/** Wait for `promise` until `timeoutMs` passes or `signal` aborts. A rejection
+ *  of `promise` rejects the result. The timer does not keep the process alive. */
+export async function raceTimeoutAndAbort(promise, timeoutMs, signal) {
+    let timeout;
+    let onAbort;
+    try {
+        return await Promise.race([
+            promise.then((value) => ({ type: "done", value })),
+            new Promise((resolve) => {
+                timeout = setTimeout(() => resolve({ type: "timeout" }), timeoutMs);
+                timeout.unref?.();
+            }),
+            new Promise((resolve) => {
+                onAbort = () => resolve({ type: "aborted" });
+                if (signal.aborted)
+                    onAbort();
+                else
+                    signal.addEventListener("abort", onAbort, { once: true });
+            }),
+        ]);
+    }
+    finally {
+        if (timeout)
+            clearTimeout(timeout);
+        if (onAbort)
+            signal.removeEventListener("abort", onAbort);
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAa9E;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA4Bb"}
+{"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;AAiB9E;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA6Cb"}

package/dist/v2/agent.js

@@ -1,8 +1,11 @@
 import * as v2 from "@agentclientprotocol/sdk/experimental/v2";
 import { ClaudeAcpAgent } from "../acp-agent.js";
 import { v1InitializeRequest, v2InitializeResponse } from "./initialize.js";
-import { v1NewSessionRequest, v1ResumeSessionRequest, v1SetSessionConfigOptionRequest, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
+import { v1PermissionResponse, v2PermissionRequest } from "./permission.js";
+import { v2Prompt } from "./prompt.js";
+import { v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
 import { v2SessionUpdate } from "./session-update.js";
+import { V2Terminals } from "./terminal.js";
 /**
  * The ACP v2 surface, for one connection.
  *
@@ -12,10 +15,12 @@ import { v2SessionUpdate } from "./session-update.js";
  */
 export function v2AgentApp(logger, onAgent) {
     let agent;
+    let client;
     return v2
         .agent({ name: "claude-code-acp" })
         .onConnect((connection) => {
-        agent = new ClaudeAcpAgent(new V2ClientConnection(connection.client), logger);
+        client = new V2ClientConnection(connection.client, logger ?? console);
+        agent = new ClaudeAcpAgent(client, logger, { v2: true });
         onAgent(agent);
     })
         .onRequest(v2.methods.agent.initialize, async ({ params }) => v2InitializeResponse(await agent.initialize(v1InitializeRequest(params))))
@@ -23,25 +28,75 @@ 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.close, ({ params }) => agent.closeSession(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, async ({ params }) => {
+        const response = await agent.closeSession(params);
+        client.terminals.forget(params.sessionId);
+        return response;
+    })
         .onRequest(v2.methods.agent.session.delete, ({ params }) => agent.deleteSession(params))
         .onRequest(v2.methods.agent.session.setConfigOption, async ({ params }) => {
         const { configOptions, ...response } = await agent.setSessionConfigOption(v1SetSessionConfigOptionRequest(params));
         return { ...response, configOptions: v2ConfigOptions(configOptions) };
-    });
+    })
+        .onRequest(v2.methods.agent.session.prompt, ({ params }) => v2Prompt(agent, params, (update) => {
+        void client.send({ sessionId: params.sessionId, update });
+    }))
+        .onNotification(v2.methods.agent.session.cancel, ({ params }) => agent.cancel(params));
 }
 /**
  * The {@link AcpClient} of an ACP v2 connection: it sends the v1 messages of
  * the agent as v2 messages.
- *
- * The v2 surface does not serve prompts yet, so permission requests, which
- * only a prompt turn makes, still reject.
  */
 class V2ClientConnection {
     ctx;
-    constructor(ctx) {
+    logger;
+    /**
+     * The sessions whose history replays, each with the messages that the
+     * replay has cleared so far.
+     */
+    replays = new Map();
+    /** The display terminals of the commands that the agent runs. */
+    terminals = new V2Terminals();
+    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,
+     * so they go out in the order of the calls. The agent's consumer awaits each
+     * of its updates before it reports the next turn event, so a turn's state
+     * follows the output that came before it. (An update the consumer is still
+     * routing can be overtaken by an event from elsewhere, such as a permission
+     * request opening.)
+     */
+    send(notification) {
+        return this.ctx.notify(v2.methods.client.session.update, notification).catch((error) => {
+            this.logger.error(`Failed to send a ${notification.update.sessionUpdate} update:`, error);
+        });
     }
     extNotification(method, params) {
         if (!isExtensionMethod(method)) {
@@ -50,16 +105,48 @@ class V2ClientConnection {
         return this.ctx.notify(method, params);
     }
     async sessionUpdate({ update, ...notification }) {
-        const v2Update = v2SessionUpdate(update);
-        if (v2Update) {
-            await this.ctx.notify(v2.methods.client.session.update, {
-                ...notification,
-                update: v2Update,
-            });
+        const updates = this.v2Updates(notification.sessionId, update).flatMap((v2Update) => {
+            const clear = this.replayClear(notification.sessionId, v2Update);
+            return clear ? [clear, v2Update] : [v2Update];
+        });
+        // 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 })));
+    }
+    /**
+     * 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}).
+     */
+    v2Updates(sessionId, update) {
+        if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
+            const v2Update = v2SessionUpdate(update);
+            return v2Update ? [v2Update] : [];
         }
+        const { terminal, report } = this.terminals.split(sessionId, update);
+        const reportUpdate = report && v2SessionUpdate(report);
+        return [...terminal, ...(reportUpdate ? [reportUpdate] : [])];
     }
-    requestPermission() {
-        return Promise.reject(new Error("The ACP v2 surface does not serve session/request_permission yet"));
+    /**
+     * 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 });
+        return v1PermissionResponse(response);
     }
     // Elicitation is the same in v1 and v2.
     createElicitation(params, signal) {
@@ -81,6 +168,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/initialize.d.ts

@@ -14,11 +14,8 @@ export declare function v1InitializeRequest(request: v2.InitializeRequest): Init
 /**
  * The v2 `initialize` response for the v1 response of the agent.
  *
- * It advertises no `session` capability yet. A v2 agent that advertises
- * `session` must serve the whole session baseline (`session/new`, `list`,
- * `resume`, `close`, `prompt`, `cancel`, and `update`), and the v2 surface of
- * the adapter does not serve it yet. Nor does it advertise the unstable
- * `providers` methods, which the v2 surface does not serve yet either.
+ * It does not advertise the unstable `providers` methods, which the v2
+ * surface does not serve yet.
  */
 export declare function v2InitializeResponse(response: InitializeResponse): v2.InitializeResponse;
 //# sourceMappingURL=initialize.d.ts.map

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,CAwBpF;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAcxF"}
+{"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,CAwBpF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAiBxF"}