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

package/dist/startup-failure.js

@@ -0,0 +1,38 @@
+import { RequestError } from "@agentclientprotocol/sdk/unstable";
+/** Makes the CLI write an `error_during_execution` result with a
+ *  `startup_failure_reason` before it exits on a known startup failure. Without
+ *  it, some failures (e.g. `proxy_invalid`) end with stderr and an exit code
+ *  alone. The SDK then rejects `initializationResult()` with an error that
+ *  carries the reason as `startupFailureReason`. */
+export const STARTUP_FAILURE_RESULTS_ENV = { CLAUDE_CODE_STARTUP_FAILURE_RESULTS: "1" };
+/** The SDK's prefix on the message of an error built from an error result. */
+const ERROR_RESULT_PREFIX = "Claude Code returned an error result: ";
+/** Reasons that signing in again, or with another account, can fix. */
+const AUTH_REQUIRED_REASONS = new Set([
+    "gateway_signin_required",
+    "org_pin_mismatch",
+    "org_config_refused",
+]);
+/** The ACP error for a CLI that refused to start, or `undefined` when `error`
+ *  carries no `startupFailureReason` (older CLIs, failures without a known
+ *  cause). The message is the CLI's own, which says what to fix, e.g.
+ *  `Invalid proxy URL in HTTPS_PROXY: … Fix or unset HTTPS_PROXY and restart
+ *  Claude Code.`; `data.startupFailureReason` carries the reason. */
+export function startupFailureError(error) {
+    if (!(error instanceof Error))
+        return undefined;
+    const reason = error.startupFailureReason;
+    if (typeof reason !== "string" || reason === "")
+        return undefined;
+    const message = error.message.startsWith(ERROR_RESULT_PREFIX)
+        ? error.message.slice(ERROR_RESULT_PREFIX.length)
+        : error.message;
+    const data = { startupFailureReason: reason };
+    if (AUTH_REQUIRED_REASONS.has(reason)) {
+        return RequestError.authRequired(data, message);
+    }
+    if (reason === "cwd_unavailable") {
+        return RequestError.invalidParams(data, message);
+    }
+    return RequestError.internalError(data, message);
+}

package/dist/subagent-history.d.ts

@@ -14,6 +14,11 @@ export interface SubagentRecord {
     background: boolean;
     /** Whether the user stopped it. */
     stoppedByUser: boolean;
+    /**
+     * Its working directory, when Claude Code placed it outside its parent's:
+     * in a worktree of its own or of an ancestor, or in a `cwd` of its own.
+     */
+    cwd?: string;
 }
 /** Where the subagent transcripts of a session are. */
 export interface SubagentHistory {
@@ -31,7 +36,9 @@ export interface SubagentHistory {
  * Claude keeps the history of a subagent in its own transcript,
  * `<session>/subagents/agent-<id>.jsonl`, next to the session transcript.
  * The `agent-<id>.meta.json` file beside it names the launching tool use.
- * The ids are empty for a session without a local transcript.
+ * For a child that Claude Code placed elsewhere, it has `worktreePath`,
+ * `inheritedWorktreePath` or `cwd`; then the child's working directory is the
+ * `cwd` of its transcript's records. The ids are empty for a session without a local transcript.
  */
 export declare function subagentHistory(sessionId: string): Promise<SubagentHistory>;
 /**

package/dist/subagent-history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-history.d.ts","sourceRoot":"","sources":["../src/subagent-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7F,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uDAAuD;IACvD,UAAU,EAAE,OAAO,CAAC;IACpB,mCAAmC;IACnC,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,uDAAuD;AACvD,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAwCjF;AAOD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CAAE,GAC1C,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmD/B;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAW5D;AA0DD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE;IAAE,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CAAE,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC,CAW3B;AAyBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,CAkB5E"}
+{"version":3,"file":"subagent-history.d.ts","sourceRoot":"","sources":["../src/subagent-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAKxC,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7F,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uDAAuD;IACvD,UAAU,EAAE,OAAO,CAAC;IACpB,mCAAmC;IACnC,aAAa,EAAE,OAAO,CAAC;IACvB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,uDAAuD;AACvD,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CA+CjF;AAgCD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CAAE,GAC1C,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAoD/B;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAW5D;AA0DD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE;IAAE,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CAAE,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC,CAW3B;AAyBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,CAkB5E"}

package/dist/subagent-history.js

@@ -11,7 +11,9 @@ import { findTranscript } from "./resumed-session.js";
  * Claude keeps the history of a subagent in its own transcript,
  * `<session>/subagents/agent-<id>.jsonl`, next to the session transcript.
  * The `agent-<id>.meta.json` file beside it names the launching tool use.
- * The ids are empty for a session without a local transcript.
+ * For a child that Claude Code placed elsewhere, it has `worktreePath`,
+ * `inheritedWorktreePath` or `cwd`; then the child's working directory is the
+ * `cwd` of its transcript's records. The ids are empty for a session without a local transcript.
  */
 export async function subagentHistory(sessionId) {
     const agents = new Map();
@@ -35,6 +37,12 @@ export async function subagentHistory(sessionId) {
             if (typeof meta?.toolUseId !== "string")
                 return;
             const text = (value) => (typeof value === "string" ? value : undefined);
+            const placement = [meta.cwd, meta.worktreePath, meta.inheritedWorktreePath]
+                .map(text)
+                .find((value) => value && path.isAbsolute(value));
+            const cwd = placement
+                ? ((await recordedCwd(path.join(directory, `agent-${match[1]}.jsonl`))) ?? placement)
+                : undefined;
             agents.set(meta.toolUseId, {
                 agentId: match[1],
                 name: text(meta.name),
@@ -42,6 +50,7 @@ export async function subagentHistory(sessionId) {
                 description: text(meta.description),
                 background: meta.requestShape === "background",
                 stoppedByUser: meta.stoppedByUser === true,
+                ...(cwd ? { cwd } : {}),
             });
         }
         catch {
@@ -55,6 +64,35 @@ export async function subagentHistory(sessionId) {
     const dir = (await getSessionInfo(sessionId).catch(() => undefined))?.cwd;
     return dir ? { agents, dir } : { agents };
 }
+/**
+ * The `cwd` of the first record of the transcript `file` that has one, or
+ * undefined when the file cannot be read. Claude Code writes the working
+ * directory of the session or subagent on each record.
+ */
+async function recordedCwd(file) {
+    const stream = createReadStream(file, { encoding: "utf8" });
+    try {
+        for await (const line of readline.createInterface({ input: stream, crlfDelay: Infinity })) {
+            if (!line.includes('"cwd"'))
+                continue;
+            try {
+                const cwd = JSON.parse(line)?.cwd;
+                if (typeof cwd === "string" && path.isAbsolute(cwd))
+                    return cwd;
+            }
+            catch {
+                // A damaged record; a later one can have the `cwd`.
+            }
+        }
+    }
+    catch {
+        // An unreadable transcript; the caller falls back to the metadata's path.
+    }
+    finally {
+        stream.destroy();
+    }
+    return undefined;
+}
 /** The folder of the subagent transcripts, next to the session transcript `transcript`. */
 function subagentsDirectory(transcript, sessionId) {
     return path.join(path.dirname(transcript), sessionId, "subagents");
@@ -121,6 +159,7 @@ export async function subagentLineage(sessionId, agentId, logger) {
             agentId: current,
             launchId: launch.launchId,
             ...(launcher !== null ? { parentAgentId: launcher } : {}),
+            ...(launch.record.cwd ? { cwd: launch.record.cwd } : {}),
             ...(launch.record.name ? { name: launch.record.name } : {}),
             ...(launch.record.agentType ? { agentType: launch.record.agentType } : {}),
             ...(launch.record.description ? { description: launch.record.description } : {}),

package/dist/subagent-replay.d.ts

@@ -54,6 +54,8 @@ export type ReplayChild = {
     /** The state of the child's last persisted task notification. */
     notified?: SubagentState;
     announced: boolean;
+    /** The `cwd` that the replay reported for it; undefined while it inherits its parent's. */
+    cwd?: string;
     promptSent: boolean;
     /** Whether it handed a report to its parent with a SubagentHandback call. */
     handedBack?: boolean;
@@ -72,6 +74,8 @@ export declare class RfdSubagentReplay {
      * {@link currentStates}, after the load response.
      */
     private readonly mapsDuringReplay;
+    /** The working directory of the root session, which a child inherits unless it reports its own. */
+    private readonly rootCwd?;
     /** The children by the id of the tool use that launched each. */
     private readonly children;
     private readonly byAgentId;
@@ -88,7 +92,9 @@ export declare class RfdSubagentReplay {
      * A load lacks the list until the CLI started, so it maps only in
      * {@link currentStates}, after the load response.
      */
-    mapsDuringReplay?: boolean);
+    mapsDuringReplay?: boolean, 
+    /** The working directory of the root session, which a child inherits unless it reports its own. */
+    rootCwd?: string | undefined);
     /**
      * Registers the launches, the launch results, and the SendMessage calls in
      * `messages`, the transcript of the session `ownerSessionId`.
@@ -98,10 +104,16 @@ export declare class RfdSubagentReplay {
     childOfLaunch(toolUseId: string): ReplayChild | undefined;
     /**
      * Announces `child` on its parent, as live: running, with the parent's
-     * labels. Then it sends `firstModel`, the model of the child's first
-     * response, when the transcript has one.
+     * labels, and with its recorded `cwd` when that differs from its parent's.
+     * Then it sends `firstModel`, the model of the child's first response, when
+     * the transcript has one.
      */
     announce(child: ReplayChild, firstModel?: string): Promise<void>;
+    /**
+     * The working directory of the session `sessionId` as the client holds it:
+     * a child's reported `cwd`, else its parent's, up to the root's.
+     */
+    private effectiveCwd;
     /**
      * Takes the model of a replayed response of the child `owner`. A child
      * whose model changes gets its `model` option again.
@@ -156,6 +168,10 @@ export declare class RfdSubagentReplay {
      * when a live session is loaded again. Such a child reports that state and
      * can be cancelled, as live. Any other child cannot be running, because the
      * process that ran it is gone, so its replayed end is its current state.
+     *
+     * A replayed `cwd` whose directory is gone, such as a worktree that Claude
+     * Code removed when the child finished, is cleared with `cwd: null`, as the
+     * RFD requires after a reconnection.
      */
     currentStates(live: (sessionId: string) => WorkState["state"] | undefined, liveConfiguration?: (sessionId: string) => SessionConfigOption[] | undefined): AcpSessionNotification[];
     private registerLaunch;

package/dist/subagent-replay.d.ts.map

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

package/dist/subagent-replay.js

@@ -1,10 +1,12 @@
-import { childModelOption, HANDBACK_TOOL, handbackMessage, isNativeSubagentControlTool, launchReply, linkedSessionMessages, nativeSubagentState, responseModelEntry, rfdEndState, rfdLabels, } from "./native-subagents.js";
+import { statSync } from "node:fs";
+import { childModelOption, HANDBACK_TOOL, handbackMessage, isNativeSubagentControlTool, launchReply, linkedSessionMessages, nativeSubagentState, responseModelEntry, rfdEndState, rfdLabels, sameDirectory, } from "./native-subagents.js";
 import { noticeUpdate } from "./session-notices.js";
 export class RfdSubagentReplay {
     history;
     publish;
     models;
     mapsDuringReplay;
+    rootCwd;
     /** The children by the id of the tool use that launched each. */
     children = new Map();
     byAgentId = new Map();
@@ -21,11 +23,14 @@ export class RfdSubagentReplay {
      * A load lacks the list until the CLI started, so it maps only in
      * {@link currentStates}, after the load response.
      */
-    mapsDuringReplay = true) {
+    mapsDuringReplay = true, 
+    /** The working directory of the root session, which a child inherits unless it reports its own. */
+    rootCwd) {
         this.history = history;
         this.publish = publish;
         this.models = models;
         this.mapsDuringReplay = mapsDuringReplay;
+        this.rootCwd = rootCwd;
     }
     /**
      * Registers the launches, the launch results, and the SendMessage calls in
@@ -76,13 +81,19 @@ export class RfdSubagentReplay {
     }
     /**
      * Announces `child` on its parent, as live: running, with the parent's
-     * labels. Then it sends `firstModel`, the model of the child's first
-     * response, when the transcript has one.
+     * labels, and with its recorded `cwd` when that differs from its parent's.
+     * Then it sends `firstModel`, the model of the child's first response, when
+     * the transcript has one.
      */
     async announce(child, firstModel) {
         if (child.announced)
             return;
         const labels = rfdLabels(child.record.name ?? child.input.name, child.record.agentType ?? child.input.subagent_type, child.record.description ?? child.input.description);
+        const inherited = this.effectiveCwd(child.parentSessionId);
+        const cwd = child.record.cwd &&
+            (inherited === undefined || !(await sameDirectory(child.record.cwd, inherited)))
+            ? child.record.cwd
+            : undefined;
         await this.publish({
             sessionId: child.parentSessionId,
             update: {
@@ -90,12 +101,29 @@ export class RfdSubagentReplay {
                 sessionId: child.sessionId,
                 ...(labels.title ? { title: labels.title } : {}),
                 ...(labels.description ? { description: labels.description } : {}),
+                ...(cwd ? { cwd } : {}),
                 state: { state: "running" },
             },
         });
+        child.cwd = cwd;
         child.announced = true;
         await this.responseModel(child, firstModel);
     }
+    /**
+     * The working directory of the session `sessionId` as the client holds it:
+     * a child's reported `cwd`, else its parent's, up to the root's.
+     */
+    effectiveCwd(sessionId) {
+        const seen = new Set();
+        let child = this.byAgentId.get(sessionId);
+        while (child && !seen.has(child.sessionId)) {
+            if (child.cwd)
+                return child.cwd;
+            seen.add(child.sessionId);
+            child = this.byAgentId.get(child.parentSessionId);
+        }
+        return this.rootCwd;
+    }
     /**
      * Takes the model of a replayed response of the child `owner`. A child
      * whose model changes gets its `model` option again.
@@ -258,6 +286,10 @@ export class RfdSubagentReplay {
      * when a live session is loaded again. Such a child reports that state and
      * can be cancelled, as live. Any other child cannot be running, because the
      * process that ran it is gone, so its replayed end is its current state.
+     *
+     * A replayed `cwd` whose directory is gone, such as a worktree that Claude
+     * Code removed when the child finished, is cleared with `cwd: null`, as the
+     * RFD requires after a reconnection.
      */
     currentStates(live, liveConfiguration) {
         return [...this.children.values()]
@@ -278,6 +310,7 @@ export class RfdSubagentReplay {
                         sessionUpdate: "subagent_update",
                         sessionId: child.sessionId,
                         ...(liveState !== undefined ? { capabilities: { cancel: {} } } : {}),
+                        ...(child.cwd && !isDirectory(child.cwd) ? { cwd: null } : {}),
                         state,
                     },
                 },
@@ -427,6 +460,15 @@ function textOf(content) {
         .filter((text) => typeof text === "string")
         .join("\n");
 }
+/** Whether `dir` is an existing directory. */
+function isDirectory(dir) {
+    try {
+        return statSync(dir).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
 /** A message that a SendMessage call delivered to the child. */
 function isDelivery(message) {
     return message.origin?.kind === "coordinator";

package/dist/tool-calls/reporters/interaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/interaction.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IAYvE,iEAAiE;IACjE,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe;IASvD;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CASrE;AAED,2GAA2G;AAC3G,qBAAa,qBAAsB,YAAW,YAAY;IACxD,OAAO,IAAI,YAAY;CAGxB;AAqBD,oEAAoE;AACpE,qBAAa,uBAAwB,YAAW,YAAY;IAC1D;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;CAgBxE;AAED,wEAAwE;AACxE,qBAAa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAKrC,UAAU,IAAI,eAAe;CAG9B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAyBtC;AAED,kEAAkE;AAClE,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAmBtC;AAED,8EAA8E;AAC9E,qBAAa,eAAgB,YAAW,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAgBtC;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IACvD,WAAW,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CAGtF;AA4HD;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AA0C9D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,cAAc,GACrB,MAAM,GAAG,SAAS,CA8EpB"}
+{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/interaction.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IAYvE,iEAAiE;IACjE,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe;IASvD;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CASrE;AAED,2GAA2G;AAC3G,qBAAa,qBAAsB,YAAW,YAAY;IACxD,OAAO,IAAI,YAAY;CAGxB;AAqBD,oEAAoE;AACpE,qBAAa,uBAAwB,YAAW,YAAY;IAC1D;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;CAgBxE;AAED,wEAAwE;AACxE,qBAAa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAKrC,UAAU,IAAI,eAAe;CAG9B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAyBtC;AAED,kEAAkE;AAClE,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAmBtC;AAED,8EAA8E;AAC9E,qBAAa,eAAgB,YAAW,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAgBtC;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IACvD,WAAW,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CAGtF;AAiID;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AA0C9D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,cAAc,GACrB,MAAM,GAAG,SAAS,CA8EpB"}

package/dist/tool-calls/reporters/interaction.js

@@ -256,14 +256,15 @@ function frontmatterScalar(raw) {
     return value;
 }
 /**
- * The `name:` that the frontmatter of [skillMdPath] declares, or `undefined` when it declares none.
+ * The `name:` that the frontmatter of [skillMdPath] declares, `undefined` when it declares none,
+ * or `null` when the file could not be read.
  *
  * Only the frontmatter block is parsed, so a `name:` further down the body is not a name.
  */
 function declaredSkillName(skillMdPath) {
     const head = frontmatterHead(skillMdPath);
     if (head === undefined) {
-        return undefined;
+        return null;
     }
     const lines = head.split(/\r?\n/);
     if (lines[0]?.trim() !== "---") {
@@ -298,6 +299,10 @@ function cachedDeclaredName(skillMdPath, stats) {
         return cached.declaredName;
     }
     const declaredName = declaredSkillName(skillMdPath);
+    // A transient read error can clear without changing the stat signature, so the next pass must retry it.
+    if (declaredName === null) {
+        return null;
+    }
     if (scannedSkills.size >= MAX_CACHED_SKILLS) {
         scannedSkills.clear();
     }
@@ -333,7 +338,7 @@ function skillsByDeclaredName(containerDir, scans) {
             continue;
         }
         const name = cachedDeclaredName(file, stats);
-        if (name !== undefined && !byName.has(name)) {
+        if (typeof name === "string" && !byName.has(name)) {
             byName.set(name, file);
         }
     }

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

package/dist/v2/agent.js

@@ -39,11 +39,11 @@ export function v2AgentApp(logger, onAgent) {
         .onRequest(v2.methods.agent.providers.set, ({ params }) => agent.unstable_setProvider(params))
         .onRequest(v2.methods.agent.providers.disable, ({ params }) => agent.unstable_disableProvider(params))
         .onRequest(v2.methods.agent.session.new, async ({ params }) => {
-        const response = await agent.newSession(v1NewSessionRequest(params));
-        return {
-            ...v2NewSessionResponse(response),
-            ...(await setupCommands(agent, response.sessionId, logger)),
-        };
+        const request = v1NewSessionRequest(params);
+        const response = await agent.newSession(request);
+        const commands = await setupCommands(agent, response.sessionId, logger);
+        afterSetupResponse(agent, response.sessionId, request.mcpServers, commands, logger);
+        return { ...v2NewSessionResponse(response), ...commands };
     })
         .onRequest(v2.methods.agent.session.list, ({ params }) => agent.listSessions(params))
         .onRequest(v2.methods.agent.session.resume, async ({ params }) => {
@@ -65,16 +65,19 @@ export function v2AgentApp(logger, onAgent) {
         const commands = await setupCommands(agent, params.sessionId, logger);
         // The response ends a replay. The subagents RFD treats the replayed
         // subagent states before it as history, so their current states follow it.
-        setTimeout(() => void agent.publishCurrentSubagentStates(params.sessionId), 0);
+        afterSetupResponse(agent, params.sessionId, restore.request.mcpServers ?? [], commands, logger, () => void agent.publishCurrentSubagentStates(params.sessionId));
         return { ...v2ResumeSessionResponse(response), ...commands };
     })
         .onRequest(v2.methods.agent.session.fork, ({ params }) => agent.forking(params.sessionId, async () => {
         // The agent starts the forked session, so the client can prompt it.
-        const response = await agent.unstable_forkSession(v1ForkSessionRequest(params));
+        const request = v1ForkSessionRequest(params);
+        const response = await agent.unstable_forkSession(request);
+        const commands = await setupCommands(agent, response.sessionId, logger);
+        afterSetupResponse(agent, response.sessionId, request.mcpServers ?? [], commands, logger);
         return {
             sessionId: response.sessionId,
             ...v2ResumeSessionResponse(response),
-            ...(await setupCommands(agent, response.sessionId, logger)),
+            ...commands,
         };
     }))
         .onRequest(v2.methods.agent.session.close, async ({ params }) => {
@@ -111,12 +114,13 @@ function stateSnapshot(state) {
     return { sessionUpdate: "state_update", state: "requires_action" };
 }
 /**
- * The `availableCommands` of a setup response, so a client can show the
- * session's commands without waiting for an update. The agent sends a v1
- * client the same list as an `available_commands_update` after the response,
- * and a v2 client none (`ClaudeAcpAgent.afterSetupResponse`). Later changes
- * still arrive as updates. An empty list is left out, as the draft asks. The
- * commands are optional, so a failure to read them does not fail the setup.
+ * The `availableCommands` of a setup response, which v2 requires when the
+ * session has commands. The agent sends a v1 client the same list as an
+ * `available_commands_update` after the response, and a v2 client none
+ * (`ClaudeAcpAgent.afterSetupResponse`). Later changes still arrive as
+ * updates. An empty list is left out, as the draft asks. A failure to read
+ * the commands does not fail the setup: the result is `undefined`, and
+ * {@link afterSetupResponse} sends the commands in an update instead.
  */
 async function setupCommands(agent, sessionId, logger) {
     try {
@@ -125,9 +129,30 @@ async function setupCommands(agent, sessionId, logger) {
     }
     catch (error) {
         (logger ?? console).error(`Session ${sessionId}: failed to read the session's commands`, error);
-        return {};
+        return undefined;
     }
 }
+/**
+ * The work that follows a v2 setup response, run once the response is sent
+ * (`ClaudeAcpAgent.afterSetupResponse` does it on v1):
+ *
+ * - When `commands` is `undefined` (reading them for the response failed),
+ *   an `available_commands_update` with the commands, read again.
+ * - `then`, such as sending the current states of replayed subagents.
+ * - OAuth for the MCP servers that need it. Its URL elicitation must not
+ *   reach the client before the response, which v2 asks against.
+ */
+function afterSetupResponse(agent, sessionId, mcpServers, commands, logger, then) {
+    setTimeout(() => {
+        if (!commands) {
+            agent.sendAvailableCommandsUpdate(sessionId).catch((error) => {
+                (logger ?? console).error(`Session ${sessionId}: failed to send the session's commands`, error);
+            });
+        }
+        then?.();
+        agent.authenticateMcpServers(sessionId, mcpServers);
+    }, 0);
+}
 /**
  * The {@link AcpClient} of an ACP v2 connection: it sends the v1 messages of
  * the agent as v2 messages.
@@ -291,7 +316,7 @@ class V2ClientConnection {
     async requestPermission(params, signal) {
         // The subject is an update of the tool call, with its stored `_meta`.
         const toolCall = this.toolCallMeta.subject(params.sessionId, params.toolCall);
-        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest({ ...params, toolCall }), { cancellationSignal: signal });
+        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest({ ...params, toolCall }), { cancellationSignal: signal, stopWaitingOnCancel: true });
         return v1PermissionResponse(response);
     }
     // Elicitation is the same in v1 and v2.
@@ -300,7 +325,7 @@ class V2ClientConnection {
         // The v1 types accept a property schema with any tag; the v2 types accept
         // one only in a received value. As on v1, an MCP server's schema is
         // relayed here unchanged, so this cast does not check it.
-        params, { cancellationSignal: signal });
+        params, { cancellationSignal: signal, stopWaitingOnCancel: true });
     }
     completeElicitation(params) {
         return this.ctx.notify(v2.methods.client.elicitation.complete, params);

package/dist/v2/initialize.d.ts

@@ -15,7 +15,22 @@ export declare function v1InitializeRequest(request: v2.InitializeRequest): Init
  * The v2 `initialize` response for the v1 response of the agent.
  *
  * It does not advertise what the v2 surface does not serve yet: the
- * extensions of {@link UNSERVED_EXTENSION_KEYS}.
+ * extensions of {@link UNSERVED_EXTENSION_KEYS}, and the AIR extensions of
+ * {@link withoutUnservedAirExtensions}.
  */
 export declare function v2InitializeResponse(response: InitializeResponse): v2.InitializeResponse;
+/**
+ * The session capabilities of the v2 surface, which serves each through a v1
+ * method of the agent.
+ *
+ * - The session baseline: `session/new`, `list`, `resume` (with replay),
+ *   `close`, `prompt`, `cancel`, and `update`.
+ * - `session/delete`, `session/fork` (which returns a session the client can
+ *   prompt at once), and `additionalDirectories`.
+ * - The prompt content and MCP transports that the agent's v1 `initialize`
+ *   lists: images, embedded context, and HTTP servers. Stdio servers are in the
+ *   v1 baseline; v2 has no SSE transport.
+ * - `systemPrompt`, in `append` and `override` mode.
+ */
+export declare const V2_SESSION_CAPABILITIES: v2.SessionCapabilities;
 //# 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,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAGxE,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAmCpF;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAuBxF"}
+{"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,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAIxE,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAmCpF;AASD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CA2BxF;AA0BD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,uBAAuB,EAAE,EAAE,CAAC,mBAOxC,CAAC"}

package/dist/v2/initialize.js

@@ -9,6 +9,7 @@
  */
 import { PROTOCOL_VERSION as V1_PROTOCOL_VERSION, } from "@agentclientprotocol/sdk/unstable";
 import * as v2 from "@agentclientprotocol/sdk/experimental/v2/unstable";
+import { AIR_ASYNC_TASKS_CAPABILITY, AIR_GOAL_KEY } from "../air-extension.js";
 import { SYSTEM_PROMPT_CAPABILITY } from "../client-system-prompt.js";
 /** The v1 `initialize` request that a v2 client means. */
 export function v1InitializeRequest(request) {
@@ -57,14 +58,15 @@ const UNSERVED_EXTENSION_KEYS = ["steering"];
  * The v2 `initialize` response for the v1 response of the agent.
  *
  * It does not advertise what the v2 surface does not serve yet: the
- * extensions of {@link UNSERVED_EXTENSION_KEYS}.
+ * extensions of {@link UNSERVED_EXTENSION_KEYS}, and the AIR extensions of
+ * {@link withoutUnservedAirExtensions}.
  */
 export function v2InitializeResponse(response) {
     if (!response.agentInfo) {
         throw new Error("ACP v2 requires agentInfo, and the agent reported none");
     }
     const meta = response.agentCapabilities?._meta;
-    const topMeta = Object.fromEntries(Object.entries(response._meta ?? {}).filter(([key]) => !UNSERVED_EXTENSION_KEYS.includes(key)));
+    const topMeta = withoutUnservedAirExtensions(Object.fromEntries(Object.entries(response._meta ?? {}).filter(([key]) => !UNSERVED_EXTENSION_KEYS.includes(key))));
     return {
         protocolVersion: v2.PROTOCOL_VERSION,
         info: response.agentInfo,
@@ -81,6 +83,27 @@ export function v2InitializeResponse(response) {
         ...(Object.keys(topMeta).length > 0 ? { _meta: topMeta } : {}),
     };
 }
+/**
+ * `meta` without the AIR extensions whose methods the v2 surface does not
+ * register: the `asyncTasks` capability (`_session/async_task/stop`) and the
+ * `goal` entry (`_session/goal`) of `_meta.jetbrains.air`.
+ */
+function withoutUnservedAirExtensions(meta) {
+    const jetbrains = asRecord(meta.jetbrains);
+    const air = asRecord(jetbrains.air);
+    if (Object.keys(air).length === 0)
+        return meta;
+    const served = Object.fromEntries(Object.entries(air).filter(([key]) => key !== AIR_GOAL_KEY));
+    if (Array.isArray(served.capabilities)) {
+        served.capabilities = served.capabilities.filter((capability) => capability !== AIR_ASYNC_TASKS_CAPABILITY);
+    }
+    return { ...meta, jetbrains: { ...jetbrains, air: served } };
+}
+function asRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : {};
+}
 /**
  * The session capabilities of the v2 surface, which serves each through a v1
  * method of the agent.
@@ -94,7 +117,7 @@ export function v2InitializeResponse(response) {
  *   v1 baseline; v2 has no SSE transport.
  * - `systemPrompt`, in `append` and `override` mode.
  */
-const V2_SESSION_CAPABILITIES = {
+export const V2_SESSION_CAPABILITIES = {
     prompt: { image: {}, embeddedContext: {} },
     mcp: { stdio: {}, http: {} },
     delete: {},

package/dist/v2/permission.d.ts

@@ -18,8 +18,11 @@ export declare function v2PermissionRequest(request: AcpPermissionRequest): v2.R
  * The v1 form of the answer to a permission request.
  *
  * v2 adds outcomes that v1 does not know, which the draft says are no
- * approval. They become `cancelled`, which the agent reads as an aborted tool
- * use, as it does a cancelled prompt.
+ * approval. They become `cancelled`. In v2, `cancelled` also means that the
+ * user dismissed the prompt or the client declined it by policy. So the agent
+ * reads a `cancelled` outcome on v2 as the user refusing the tool, unless a
+ * `session/cancel` is stopping the session's work: then the tool use is
+ * aborted, as on v1.
  */
 export declare function v1PermissionResponse(response: v2.RequestPermissionResponse): RequestPermissionResponse;
 //# sourceMappingURL=permission.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/v2/permission.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,KAAK,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAC7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAG3E;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,EAAE,CAAC,wBAAwB,CAY9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,EAAE,CAAC,yBAAyB,GACrC,yBAAyB,CAS3B"}
+{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/v2/permission.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,KAAK,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAC7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAG3E;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,EAAE,CAAC,wBAAwB,CAY9F;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,EAAE,CAAC,yBAAyB,GACrC,yBAAyB,CAS3B"}

package/dist/v2/permission.js

@@ -24,8 +24,11 @@ export function v2PermissionRequest(request) {
  * The v1 form of the answer to a permission request.
  *
  * v2 adds outcomes that v1 does not know, which the draft says are no
- * approval. They become `cancelled`, which the agent reads as an aborted tool
- * use, as it does a cancelled prompt.
+ * approval. They become `cancelled`. In v2, `cancelled` also means that the
+ * user dismissed the prompt or the client declined it by policy. So the agent
+ * reads a `cancelled` outcome on v2 as the user refusing the tool, unless a
+ * `session/cancel` is stopping the session's work: then the tool use is
+ * aborted, as on v1.
  */
 export function v1PermissionResponse(response) {
     const outcome = response.outcome;

package/dist/v2/prompt.d.ts

@@ -51,7 +51,8 @@ export declare function v2Foreground(send: (update: v2.SessionUpdate) => void):
  * so such a block fails the request with invalid params (-32602) rather than
  * being dropped from the prompt. The same goes for an embedded blob that
  * Claude cannot read, e.g. an `application/zip` resource: `promptToClaude`
- * would drop it.
+ * would drop it. An empty `prompt` fails the same way: v2 requires at least
+ * one content block.
  */
 export declare function v1PromptRequest({ prompt, ...request }: v2.PromptRequest): PromptRequest;
 export declare function v1ContentBlock(block: v2.ContentBlock): ContentBlock;