@agentclientprotocol/claude-agent-acp 0.69.0 → 0.71.0

package/dist/clear-context-coordinator.js

@@ -0,0 +1,80 @@
+import { DEFAULT_AGENT_ID, DEFAULT_MODEL_ID, EFFORT_CONFIG_ID } from "./session-config-ids.js";
+function restartParams(session) {
+    const originalParams = session.creationParams ?? { cwd: session.cwd, mcpServers: [] };
+    const currentEffort = session.configOptions.find((option) => option.id === EFFORT_CONFIG_ID)?.currentValue;
+    const originalMeta = originalParams._meta;
+    const originalOptions = originalMeta?.claudeCode?.options;
+    const unmanagedOptions = { ...(originalOptions ?? {}) };
+    delete unmanagedOptions.model;
+    delete unmanagedOptions.agent;
+    delete unmanagedOptions.effort;
+    return {
+        ...originalParams,
+        _meta: {
+            ...(originalMeta ?? {}),
+            claudeCode: {
+                ...(originalMeta?.claudeCode ?? {}),
+                options: {
+                    ...unmanagedOptions,
+                    ...(session.models.currentModelId !== DEFAULT_MODEL_ID
+                        ? { model: session.models.currentModelId }
+                        : {}),
+                    ...(session.currentAgent !== DEFAULT_AGENT_ID ? { agent: session.currentAgent } : {}),
+                    ...(typeof currentEffort === "string" && currentEffort !== "default"
+                        ? { effort: currentEffort }
+                        : {}),
+                },
+            },
+        },
+    };
+}
+/** Replace Claude's private conversation and attach the still-pending ACP turn
+ * to it. The host owns provider-specific creation and stream mechanics; this
+ * coordinator owns the ordering and state transfer invariants. */
+export async function continuePlanInFreshContext(sessionId, oldSession, reset, host, signal) {
+    const assertRestartActive = (session) => {
+        if (signal?.aborted || (session && host.currentSession(sessionId) !== session)) {
+            throw new Error("Clear-context restart aborted");
+        }
+    };
+    assertRestartActive();
+    const turn = oldSession.activeTurn;
+    if (!turn || turn.settled || host.currentSession(sessionId) !== oldSession) {
+        throw new Error("Cannot clear context without an active ACP turn");
+    }
+    const params = restartParams(oldSession);
+    host.closeQueryStream(oldSession);
+    const freshSession = await host.restartSession(params, {
+        publicSessionId: sessionId,
+        permissionMode: reset.mode,
+    });
+    assertRestartActive(freshSession);
+    // Do not consume the reset or mutate the turn until a replacement exists.
+    // A failed restart must remain distinguishable from a lost query transport.
+    turn.carriedUsage = { ...oldSession.accumulatedUsage };
+    turn.carriedModelUsage = { ...oldSession.accumulatedModelUsage };
+    oldSession.pendingExitPlanContextReset = undefined;
+    if (oldSession.fastModeEnabled !== freshSession.fastModeEnabled) {
+        try {
+            await host.applyFastMode(freshSession, oldSession.fastModeEnabled);
+        }
+        catch (error) {
+            host.logError("Failed to restore Fast mode after clearing context:", error);
+        }
+        assertRestartActive(freshSession);
+    }
+    oldSession.activeTurn = null;
+    oldSession.turnQueue = [];
+    freshSession.turnQueue = [turn];
+    freshSession.contextUsedTokens = 0;
+    try {
+        await host.publishSessionState(sessionId, reset.mode, freshSession.configOptions);
+    }
+    catch (error) {
+        host.logError("Failed to publish clear-context session state:", error);
+    }
+    assertRestartActive(freshSession);
+    freshSession.input.push(host.continuationMessage(sessionId, reset.plan, turn.promptUuid));
+    assertRestartActive(freshSession);
+    host.ensureConsumer(freshSession, sessionId);
+}

package/dist/exit-plan.d.ts

@@ -0,0 +1,42 @@
+import type { SessionNotification } from "@agentclientprotocol/sdk";
+import type { SDKResultMessage } from "@anthropic-ai/claude-agent-sdk";
+import { type ClearContextCoordinatorHost, type ClearContextReset, type ClearContextSession, type ClearContextTurn } from "./clear-context-coordinator.js";
+export declare function acceptedPlanToolResult(notification: SessionNotification, toolUseId: string | undefined): SessionNotification;
+type ExitPlanState = {
+    toolUseCache: Record<string, {
+        name: string;
+    } | undefined>;
+    pendingExitPlanModeInterruption?: {
+        toolUseId: string;
+        toolResultSeen: boolean;
+    };
+    pendingExitPlanContextReset?: ClearContextReset;
+};
+/** Reconcile an SDK user message with the two pending ExitPlanMode lanes and
+ * return the accepted plan tool id whose rendered update must be completed. */
+export declare function observeExitPlanToolResults(message: {
+    type: string;
+    tool_result_meta?: unknown;
+}, content: unknown, state: ExitPlanState): string | undefined;
+export declare function executionDiagnostic(message: SDKResultMessage): string | undefined;
+/** Claude wraps a rejected ExitPlanMode explanation in a Markdown code fence.
+ * Strip exactly one complete outer fence for that tool only. */
+export declare function exitPlanModeRawOutput(toolName: string, content: unknown): unknown;
+export type ExitPlanRestartHost<Session extends ClearContextSession<Turn>, Turn extends ClearContextTurn> = Omit<ClearContextCoordinatorHost<Session, Turn>, "publishSessionState" | "continuationMessage"> & {
+    sessionUpdate(notification: SessionNotification): Promise<void>;
+    destroyReplacement(sessionId: string, session: Session): void;
+    settleCancelledTurn(oldSession: Session, turnSession: Session, turn: Turn): void;
+    settleFailedTurn(turnSession: Session, turn: Turn, error: unknown): void;
+};
+/** Owns the lifetime of accepted-plan context replacements. In particular, a
+ * session cancellation invalidates an in-progress async restart so a late
+ * restartSession result cannot recreate a closed public session. */
+export declare class ExitPlanCoordinator<Session extends ClearContextSession<Turn>, Turn extends ClearContextTurn> {
+    private readonly host;
+    private readonly restarts;
+    constructor(host: ExitPlanRestartHost<Session, Turn>);
+    cancel(sessionId: string): void;
+    restart(sessionId: string, oldSession: Session, reset: ClearContextReset): Promise<void>;
+}
+export {};
+//# sourceMappingURL=exit-plan.d.ts.map

package/dist/exit-plan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"exit-plan.d.ts","sourceRoot":"","sources":["../src/exit-plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EAEtB,MAAM,gCAAgC,CAAC;AAGxC,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,mBAAmB,EACjC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,mBAAmB,CAarB;AAeD,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAC3D,+BAA+B,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC;IACjF,2BAA2B,CAAC,EAAE,iBAAiB,CAAC;CACjD,CAAC;AA0BF;+EAC+E;AAC/E,wBAAgB,0BAA0B,CACxC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,EACrD,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,aAAa,GACnB,MAAM,GAAG,SAAS,CA0BpB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAKjF;AAED;gEACgE;AAChE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAMjF;AAED,MAAM,MAAM,mBAAmB,CAC7B,OAAO,SAAS,mBAAmB,CAAC,IAAI,CAAC,EACzC,IAAI,SAAS,gBAAgB,IAC3B,IAAI,CACN,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,EAC1C,qBAAqB,GAAG,qBAAqB,CAC9C,GAAG;IACF,aAAa,CAAC,YAAY,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9D,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACjF,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1E,CAAC;AAEF;;oEAEoE;AACpE,qBAAa,mBAAmB,CAC9B,OAAO,SAAS,mBAAmB,CAAC,IAAI,CAAC,EACzC,IAAI,SAAS,gBAAgB;IAIjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsC;gBAElC,IAAI,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;IAErE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIzB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAiE/F"}

package/dist/exit-plan.js

@@ -0,0 +1,154 @@
+import { continuePlanInFreshContext, } from "./clear-context-coordinator.js";
+import { parseToolResultMeta } from "./tool-result-meta.js";
+export function acceptedPlanToolResult(notification, toolUseId) {
+    const update = notification.update;
+    if (!toolUseId ||
+        update.sessionUpdate !== "tool_call_update" ||
+        update.toolCallId !== toolUseId) {
+        return notification;
+    }
+    const completed = { ...update };
+    delete completed.rawOutput;
+    delete completed.content;
+    return { ...notification, update: { ...completed, status: "completed" } };
+}
+function containsToolResultFor(content, toolUseId) {
+    return (Array.isArray(content) &&
+        content.some((block) => typeof block === "object" &&
+            block !== null &&
+            block.type === "tool_result" &&
+            block.tool_use_id === toolUseId));
+}
+function rejectedExitPlanToolUseId(content, toolUseCache, rawToolResultMeta) {
+    if (!Array.isArray(content))
+        return undefined;
+    const toolResultMeta = parseToolResultMeta(rawToolResultMeta);
+    if (!toolResultMeta)
+        return undefined;
+    for (const block of content) {
+        if (typeof block !== "object" || block === null)
+            continue;
+        const { type, tool_use_id: toolUseId, is_error: isError } = block;
+        if (type === "tool_result" &&
+            typeof toolUseId === "string" &&
+            isError === true &&
+            toolResultMeta.get(toolUseId)?.nonExecutionKind === "user-rejected" &&
+            toolUseCache[toolUseId]?.name === "ExitPlanMode") {
+            return toolUseId;
+        }
+    }
+    return undefined;
+}
+/** Reconcile an SDK user message with the two pending ExitPlanMode lanes and
+ * return the accepted plan tool id whose rendered update must be completed. */
+export function observeExitPlanToolResults(message, content, state) {
+    if (message.type !== "user")
+        return undefined;
+    const rejectedToolUseId = rejectedExitPlanToolUseId(content, state.toolUseCache, message.tool_result_meta);
+    if (rejectedToolUseId) {
+        // The stream is authoritative: resumed queries can lose the short-lived
+        // marker installed by canUseTool, while metadata preserves correlation.
+        state.pendingExitPlanModeInterruption = {
+            toolUseId: rejectedToolUseId,
+            toolResultSeen: true,
+        };
+    }
+    const pendingInterruption = state.pendingExitPlanModeInterruption;
+    if (pendingInterruption && containsToolResultFor(content, pendingInterruption.toolUseId)) {
+        pendingInterruption.toolResultSeen = true;
+    }
+    const pendingReset = state.pendingExitPlanContextReset;
+    return pendingReset && containsToolResultFor(content, pendingReset.toolUseId)
+        ? pendingReset.toolUseId
+        : undefined;
+}
+export function executionDiagnostic(message) {
+    if (message.subtype === "success") {
+        return message.result.startsWith("[ede_diagnostic]") ? message.result : undefined;
+    }
+    return message.errors.find((error) => error.startsWith("[ede_diagnostic]"));
+}
+/** Claude wraps a rejected ExitPlanMode explanation in a Markdown code fence.
+ * Strip exactly one complete outer fence for that tool only. */
+export function exitPlanModeRawOutput(toolName, content) {
+    if (toolName !== "ExitPlanMode" || typeof content !== "string") {
+        return content;
+    }
+    const fenced = /^\s*```[^\r\n]*\r?\n([\s\S]*?)\r?\n```\s*$/.exec(content);
+    return fenced?.[1] ?? content;
+}
+/** Owns the lifetime of accepted-plan context replacements. In particular, a
+ * session cancellation invalidates an in-progress async restart so a late
+ * restartSession result cannot recreate a closed public session. */
+export class ExitPlanCoordinator {
+    host;
+    restarts = new Map();
+    constructor(host) {
+        this.host = host;
+    }
+    cancel(sessionId) {
+        this.restarts.get(sessionId)?.abort();
+    }
+    async restart(sessionId, oldSession, reset) {
+        this.cancel(sessionId);
+        const controller = new AbortController();
+        this.restarts.set(sessionId, controller);
+        try {
+            const clearContextHost = {
+                ...this.host,
+                publishSessionState: async (id, mode, configOptions) => {
+                    await this.host.sessionUpdate({
+                        sessionId: id,
+                        update: { sessionUpdate: "current_mode_update", currentModeId: mode },
+                    });
+                    await this.host.sessionUpdate({
+                        sessionId: id,
+                        update: { sessionUpdate: "config_option_update", configOptions },
+                    });
+                },
+                continuationMessage: (id, plan, promptUuid) => ({
+                    type: "user",
+                    message: {
+                        role: "user",
+                        content: [{ type: "text", text: `Implement the following plan:\n\n${plan}` }],
+                    },
+                    session_id: id,
+                    parent_tool_use_id: null,
+                    origin: { kind: "human" },
+                    uuid: promptUuid,
+                }),
+            };
+            await continuePlanInFreshContext(sessionId, oldSession, reset, clearContextHost, controller.signal);
+        }
+        catch (error) {
+            const currentSession = this.host.currentSession(sessionId);
+            const replacement = currentSession !== oldSession ? currentSession : undefined;
+            if (replacement)
+                this.host.destroyReplacement(sessionId, replacement);
+            const turn = replacement?.activeTurn ?? oldSession.activeTurn;
+            if (turn && !turn.settled) {
+                const turnSession = replacement?.activeTurn === turn ? replacement : oldSession;
+                if (controller.signal.aborted) {
+                    this.host.settleCancelledTurn(oldSession, turnSession, turn);
+                }
+                else {
+                    // A provider/session-creation failure is turn-scoped. Settling it
+                    // here keeps it out of the query consumer's transport-loss catch.
+                    this.host.settleFailedTurn(turnSession, turn, error);
+                }
+                oldSession.activeTurn = null;
+                oldSession.turnQueue = (oldSession.turnQueue ?? []).filter((queued) => queued !== turn);
+                if (replacement) {
+                    replacement.activeTurn = null;
+                    replacement.turnQueue = (replacement.turnQueue ?? []).filter((queued) => queued !== turn);
+                }
+            }
+            oldSession.pendingExitPlanContextReset = undefined;
+        }
+        finally {
+            if (this.restarts.get(sessionId) === controller) {
+                this.restarts.delete(sessionId);
+            }
+        }
+    }
+}

package/dist/file-change-audit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-change-audit.d.ts","sourceRoot":"","sources":["../src/file-change-audit.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAEpC,MAAM,gCAAgC,CAAC;AAKxC,eAAO,MAAM,mCAAmC,0BAA0B,CAAC;AAC3E,eAAO,MAAM,6BAA6B,qBAAqB,CAAC;AAChE,eAAO,MAAM,2BAA2B,yBAAyB,CAAC;AAClE,eAAO,MAAM,gCAAgC,gDAA0E,CAAC;AAKxH,eAAO,MAAM,kCAAkC,QAAa,CAAC;AAG7D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,UAAU,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,iCAAiC,CAAC;CAC3C,CACJ,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAC3C,WAAW,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,eAAe,CAAC;AAQ9E,KAAK,6BAA6B,GAAG;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,cAAc,EAAE,MAAM,wBAAwB,GAAG,SAAS,CAAC;IAC3D,OAAO,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,cAAc,EAAE,YAAY,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,EAAE,CACjB,KAAK,EAAE,wBAAwB,EAC/B,MAAM,EAAE,iCAAiC,KACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAoBF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAiBhF;AAED,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAW5E;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,2BAA2B,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAYD,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,wBAAwB,CAK1F;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,wBAAwB,GAAG,SAAS,GAAG,OAAO,CAEjG;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,6BAA6B,GACrC,sBAAsB,CAmJxB"}
+{"version":3,"file":"file-change-audit.d.ts","sourceRoot":"","sources":["../src/file-change-audit.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAEpC,MAAM,gCAAgC,CAAC;AAMxC,eAAO,MAAM,mCAAmC,0BAA0B,CAAC;AAC3E,eAAO,MAAM,6BAA6B,qBAAqB,CAAC;AAChE,eAAO,MAAM,2BAA2B,yBAAyB,CAAC;AAClE,eAAO,MAAM,gCAAgC,gDAA0E,CAAC;AAKxH,eAAO,MAAM,kCAAkC,QAAa,CAAC;AAG7D,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,UAAU,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACD;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,iCAAiC,CAAC;CAC3C,CACJ,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAC3C,WAAW,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,eAAe,CAAC;AAE9E,KAAK,6BAA6B,GAAG;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,cAAc,EAAE,MAAM,wBAAwB,GAAG,SAAS,CAAC;IAC3D,OAAO,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,cAAc,EAAE,YAAY,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,EAAE,CACjB,KAAK,EAAE,wBAAwB,EAC/B,MAAM,EAAE,iCAAiC,KACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAoBF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAiBhF;AAED,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAE5E;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,2BAA2B,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzB;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,wBAAwB,CAK1F;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,wBAAwB,GAAG,SAAS,GAAG,OAAO,CAEjG;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,6BAA6B,GACrC,sBAAsB,CAmJxB"}

package/dist/file-change-audit.js

@@ -2,6 +2,7 @@ import { createSdkMcpServer, } from "@anthropic-ai/claude-agent-sdk";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { z } from "zod";
+import { airExtensionMeta, clientSupportsAirCapability, withAirMeta } from "./air-extension.js";
 export const AGENT_FILE_CHANGE_REPORT_CAPABILITY = "agentFileChangeReport";
 export const FILE_CHANGE_AUDIT_SERVER_NAME = "claude_agent_acp";
 export const FILE_CHANGE_AUDIT_TOOL_NAME = "report_changed_files";
@@ -11,11 +12,6 @@ const MAX_REPORTED_PATHS = 1024;
 const MAX_REPORTED_PATH_LENGTH = 4096;
 export const AGENT_FILE_CHANGE_REPORT_MAX_BYTES = 256 * 1024;
 const REQUEST_ID_PATTERN = /^[A-Za-z0-9._:-]{1,128}$/;
-const JETBRAINS_META_KEY = "jetbrains";
-const AIR_META_KEY = "air";
-const AIR_EXTENSION_VERSION = 1;
-const AIR_EXTENSION_CAPABILITIES_KEY = "capabilities";
-const AIR_AGENT_FILE_CHANGE_REPORT_KEY = "agentFileChangeReport";
 const reportInputSchema = {
     paths: z
         .array(z.string())
@@ -32,7 +28,7 @@ const reportInputSchema = {
         .describe("Why the report may be incomplete or uncertain."),
 };
 export function agentFileChangeReportRequestId(meta) {
-    const air = airExtension(meta);
+    const air = airExtensionMeta(meta);
     const request = air?.agentFileChangeReportRequest;
     if (!request || typeof request !== "object" || Array.isArray(request))
         return undefined;
@@ -49,35 +45,10 @@ export function agentFileChangeReportRequestId(meta) {
         : undefined;
 }
 export function supportsAgentFileChangeReport(capabilities) {
-    if (!capabilities || typeof capabilities !== "object" || Array.isArray(capabilities)) {
-        return false;
-    }
-    const air = airExtension(capabilities._meta);
-    const advertised = air?.[AIR_EXTENSION_CAPABILITIES_KEY];
-    return (air?.version === AIR_EXTENSION_VERSION &&
-        Array.isArray(advertised) &&
-        advertised.includes(AGENT_FILE_CHANGE_REPORT_CAPABILITY));
+    return clientSupportsAirCapability(capabilities, AGENT_FILE_CHANGE_REPORT_CAPABILITY);
 }
 export function agentFileChangeReportMeta(result) {
-    return {
-        [JETBRAINS_META_KEY]: {
-            [AIR_META_KEY]: {
-                version: AIR_EXTENSION_VERSION,
-                [AIR_AGENT_FILE_CHANGE_REPORT_KEY]: result,
-            },
-        },
-    };
-}
-function airExtension(meta) {
-    if (!meta || typeof meta !== "object" || Array.isArray(meta))
-        return undefined;
-    const jetbrains = meta[JETBRAINS_META_KEY];
-    if (!jetbrains || typeof jetbrains !== "object" || Array.isArray(jetbrains))
-        return undefined;
-    const air = jetbrains[AIR_META_KEY];
-    return air && typeof air === "object" && !Array.isArray(air)
-        ? air
-        : undefined;
+    return withAirMeta(undefined, AGENT_FILE_CHANGE_REPORT_CAPABILITY, result);
 }
 export function createFileChangeAuditTurnState(requestId) {
     return {

package/dist/fork-session.d.ts

@@ -0,0 +1,12 @@
+import { ForkSessionRequest, ForkSessionResponse } from "@agentclientprotocol/sdk";
+type ForkSessionDependencies = {
+    liveMessageIdToUuid?: ReadonlyMap<string, string>;
+    messageIdForGrouping: (message: {
+        type?: string;
+        uuid?: string | null;
+        message?: unknown;
+    }) => string | undefined;
+};
+export declare function forkSession(params: ForkSessionRequest, dependencies: ForkSessionDependencies): Promise<ForkSessionResponse>;
+export {};
+//# sourceMappingURL=fork-session.d.ts.map

package/dist/fork-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fork-session.d.ts","sourceRoot":"","sources":["../src/fork-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAgB,MAAM,0BAA0B,CAAC;AAkBjG,KAAK,uBAAuB,GAAG;IAC7B,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,oBAAoB,EAAE,CAAC,OAAO,EAAE;QAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,KAAK,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAeF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,kBAAkB,EAC1B,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,mBAAmB,CAAC,CAoC9B"}

package/dist/fork-session.js

@@ -0,0 +1,41 @@
+import { RequestError } from "@agentclientprotocol/sdk";
+import { forkSession as forkClaudeSession, getSessionMessages, } from "@anthropic-ai/claude-agent-sdk";
+function forkPointMessageId(meta) {
+    const fork = meta?.jetbrains?.air?.fork;
+    if (fork?.version !== 1)
+        return undefined;
+    const messageId = fork.messageId?.trim();
+    return messageId || undefined;
+}
+function forkPointMessageIdCandidates(messageId) {
+    // Older AIR builds sent their visible segment id. Prefer the exact id before its ACP source id.
+    const protocolMessageId = messageId.replace(/:segment:\d+$/, "");
+    return protocolMessageId === messageId ? [messageId] : [messageId, protocolMessageId];
+}
+export async function forkSession(params, dependencies) {
+    const messageId = forkPointMessageId(params._meta);
+    if (!messageId) {
+        const forked = await forkClaudeSession(params.sessionId, { dir: params.cwd });
+        return { sessionId: forked.sessionId };
+    }
+    const candidateIds = forkPointMessageIdCandidates(messageId);
+    const liveUuid = candidateIds
+        .map((candidateId) => dependencies.liveMessageIdToUuid?.get(candidateId))
+        .find(Boolean);
+    const history = liveUuid
+        ? undefined
+        : await getSessionMessages(params.sessionId, { dir: params.cwd });
+    const messageUuid = liveUuid ??
+        candidateIds
+            .map((candidateId) => history?.find((message) => dependencies.messageIdForGrouping(message) === candidateId)
+            ?.uuid)
+            .find(Boolean);
+    if (!messageUuid) {
+        throw RequestError.invalidParams({ messageId }, `Fork point message ${messageId} was not found in session ${params.sessionId}`);
+    }
+    const forked = await forkClaudeSession(params.sessionId, {
+        dir: params.cwd,
+        upToMessageId: messageUuid,
+    });
+    return { sessionId: forked.sessionId };
+}

package/dist/index.js

@@ -2,6 +2,8 @@
 import { resolveSettings } from "@anthropic-ai/claude-agent-sdk";
 import { claudeCliPath, runAcp } from "./acp-agent.js";
 import packageJson from "../package.json" with { type: "json" };
+import { appendFileSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
 // `--cli` is checked first so that `--version`/`-v` (and any other flags) are
 // forwarded to the wrapped native CLI rather than swallowed by our own version
 // handler below. Our version flag only applies when not delegating.
@@ -57,7 +59,28 @@ else {
     process.on("unhandledRejection", (reason, promise) => {
         console.error("Unhandled Rejection at:", promise, "reason:", reason);
     });
-    const { connection, agent } = runAcp();
+    const logDirectory = process.env.CLAUDE_AGENT_LOGS;
+    const logger = logDirectory
+        ? (() => {
+            mkdirSync(logDirectory, { recursive: true });
+            const logFile = join(logDirectory, "agent.log");
+            const writeLog = (...args) => {
+                const rendered = args
+                    .map((arg) => (arg instanceof Error ? (arg.stack ?? arg.message) : String(arg)))
+                    .join(" ");
+                appendFileSync(logFile, `${new Date().toISOString()} pid=${process.pid} ${rendered}\n`);
+            };
+            return {
+                log: writeLog,
+                error: (...args) => {
+                    console.error(...args);
+                    writeLog(...args);
+                },
+            };
+        })()
+        : undefined;
+    logger?.log("Claude ACP started");
+    const { connection, agent } = runAcp(logger);
     async function shutdown() {
         await agent.dispose().catch((err) => {
             console.error("Error during cleanup:", err);

package/dist/native-subagents.d.ts

@@ -0,0 +1,71 @@
+import type { AcpSessionNotification, SubagentState } from "./acp-subagents.js";
+export type NativeSubagent = {
+    sessionId: string;
+    parentSessionId: string;
+    parentToolUseId?: string;
+    name: string;
+    task: string;
+    announced?: boolean;
+    terminalState?: SubagentState;
+    /** Connection-local single-flight state; never serialized on the wire. */
+    announcePromise?: Promise<void>;
+    /** Connection-local single-flight state; never serialized on the wire. */
+    terminalPromise?: Promise<void>;
+};
+export type NativeSubagentSession = {
+    nativeSubagentsByTaskId?: Map<string, NativeSubagent>;
+    nativeSubagentTaskIdByToolUseId?: Map<string, string>;
+    nativeSubagentParentByToolUseId?: Map<string, string>;
+};
+type Publish = (notification: AcpSessionNotification) => Promise<void>;
+type Logger = {
+    log(message: string): void;
+};
+type TaskStarted = {
+    taskId: string;
+    toolUseId?: string | null;
+    subagentType?: unknown;
+    description?: unknown;
+    prompt?: unknown;
+};
+/**
+ * Owns the connection-local native subagent registry and all ACP lifecycle
+ * ordering. The main agent only supplies SDK facts and delivers routed output.
+ */
+export declare class NativeSubagentRuntime {
+    private readonly rootSessionId;
+    private readonly session;
+    private readonly publish;
+    private readonly logger;
+    readonly enabled: boolean;
+    private readonly children;
+    private readonly taskByToolUse;
+    private readonly parentByToolUse;
+    private readonly identityByToolUse;
+    private readonly controlByToolUse;
+    private readonly childByParentToolUse;
+    private readonly taskFinishPromises;
+    private readonly generationByTaskId;
+    private readonly pending;
+    private pendingCount;
+    constructor(enabled: boolean, rootSessionId: string, session: NativeSubagentSession, publish: Publish, logger: Logger);
+    route(notification: AcpSessionNotification, deliver: Publish, forcedSessionId?: string): Promise<AcpSessionNotification | null>;
+    taskStarted(task: TaskStarted, deliver: Publish): Promise<void>;
+    finishTask(taskId: string, status: unknown, deliver: Publish, toolUseId?: string | null): Promise<void>;
+    finishAll(state: SubagentState, deliver: Publish): Promise<void>;
+    discardPending(parentToolUseId: string): void;
+    clear(): void;
+    private takePending;
+    private buffer;
+    private cleanupControl;
+    private nextChildSessionId;
+}
+export declare function announceNativeSubagent(child: NativeSubagent, publish: Publish): Promise<void>;
+export declare function finishNativeSubagent(session: NativeSubagentSession, taskId: string, state: SubagentState, publish: Publish): Promise<void>;
+export declare function nativeSubagentState(status: unknown): SubagentState | undefined;
+export declare function isNativeSubagentControlUpdate(update: AcpSessionNotification["update"]): update is Extract<AcpSessionNotification["update"], {
+    sessionUpdate: "tool_call" | "tool_call_update";
+}>;
+export declare function isNativeSubagentControlTool(toolName: unknown): boolean;
+export {};
+//# sourceMappingURL=native-subagents.d.ts.map

package/dist/native-subagents.d.ts.map

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