@agentclientprotocol/claude-agent-acp 0.99.2-preview.5 → 0.99.2-preview.7

package/dist/native-subagents.js

@@ -1,4 +1,6 @@
 import { RequestError, } from "@agentclientprotocol/sdk/unstable";
+import { realpath } from "node:fs/promises";
+import path from "node:path";
 import { AIR_SUBAGENT_KEY, airExtensionMeta } from "./air-extension.js";
 import { MODEL_CONFIG_ID } from "./session-model.js";
 import { isFinalToolCallStatus } from "./tool-calls/renderer.js";
@@ -28,6 +30,11 @@ export class NativeSubagentRuntime {
     identityByToolUse = new Map();
     controlByToolUse = new Map();
     configBySession = new Map();
+    /**
+     * The RFD form: the working directory of each child, by session id, as its
+     * hooks last reported it. A hook can come before the child is announced.
+     */
+    cwdBySession = new Map();
     childByParentToolUse = new Map();
     /**
      * The child session of each tool call that went to a child session. A later
@@ -224,6 +231,85 @@ export class NativeSubagentRuntime {
         config.publishing = publishing.catch(() => { });
         await publishing;
     }
+    /**
+     * The RFD form: takes the working directory of the child `agentId`, the
+     * `cwd` of one of its hooks. A child that Claude Code runs in its own
+     * worktree (Agent `isolation: "worktree"`) reports the worktree. The client
+     * gets the `cwd` only when it differs from the parent's, in the
+     * announcement or in a `subagent_update` right after it. Claude Code runs a
+     * child's SubagentStart hook before its first model request, so the `cwd`
+     * reaches the client before the child's first tool call.
+     */
+    async reportCwd(agentId, cwd) {
+        if (this.form !== "rfd" || agentId === this.rootSessionId || !path.isAbsolute(cwd))
+            return;
+        const known = this.children.get(agentId) ?? this.childOfSession(agentId);
+        const sessionId = known?.sessionId ?? agentId;
+        if (!known && !this.cwdBySession.has(sessionId)) {
+            const pending = [...this.cwdBySession.keys()].filter((id) => !this.childOfSession(id)).length;
+            if (pending >= MAX_PENDING_PARENTS) {
+                this.logger.log(`Session ${this.rootSessionId}: dropping cwd for unannounced subagent ${agentId}; pending buffer limit reached`);
+                return;
+            }
+        }
+        this.cwdBySession.set(sessionId, cwd);
+        if (!known)
+            return;
+        // An announcement in flight may have been built without this `cwd`.
+        if (known.announcePromise)
+            await known.announcePromise.catch(() => { });
+        if (known.announced)
+            await this.publishCwd(known);
+    }
+    /**
+     * The `cwd` of `child` that the client does not hold yet: its working
+     * directory when that differs from its parent's, `null` when it is back in
+     * the parent's after it reported another, else undefined.
+     */
+    async unreportedCwd(child) {
+        const cwd = this.cwdBySession.get(child.sessionId);
+        if (cwd === undefined)
+            return undefined;
+        const inherited = this.effectiveCwd(child.parentSessionId);
+        if (inherited !== undefined && (await sameDirectory(cwd, inherited))) {
+            return child.reportedCwd ? null : undefined;
+        }
+        return cwd === child.reportedCwd ? undefined : cwd;
+    }
+    /**
+     * The working directory of the session `sessionId` as the client holds it:
+     * the root's from session setup, a child's reported `cwd`, else its
+     * parent's.
+     */
+    effectiveCwd(sessionId) {
+        const seen = new Set();
+        let child = this.childOfSession(sessionId);
+        while (child && !seen.has(child.sessionId)) {
+            if (child.reportedCwd)
+                return child.reportedCwd;
+            seen.add(child.sessionId);
+            child = this.childOfSession(child.parentSessionId);
+        }
+        return this.session.cwd;
+    }
+    /** The RFD form: sends the `cwd` of the announced `child` that the client does not hold. */
+    async publishCwd(child) {
+        if (this.form !== "rfd")
+            return;
+        // Concurrent hooks of one child report the same `cwd` once.
+        const publishing = (child.cwdPublishing ?? Promise.resolve()).then(async () => {
+            const cwd = await this.unreportedCwd(child);
+            if (cwd === undefined)
+                return;
+            await this.publish({
+                sessionId: child.parentSessionId,
+                update: { sessionUpdate: "subagent_update", sessionId: child.sessionId, cwd },
+            });
+            child.reportedCwd = cwd;
+        });
+        child.cwdPublishing = publishing.catch(() => { });
+        await publishing;
+    }
     async routeUpdate(notification, deliver, forcedSessionId) {
         const { update } = notification;
         const claudeMeta = update._meta?.claudeCode;
@@ -686,10 +772,15 @@ export class NativeSubagentRuntime {
             }
             if (child.announced)
                 continue;
+            // A hook of the resumed agent may have reported a newer `cwd`.
+            if (entry.cwd && !this.cwdBySession.has(child.sessionId)) {
+                this.cwdBySession.set(child.sessionId, entry.cwd);
+            }
             if (entry.agentId === agentId) {
                 await this.announce(child);
             }
             else {
+                const cwd = await this.unreportedCwd(child);
                 await this.publish({
                     sessionId: child.parentSessionId,
                     update: {
@@ -697,8 +788,11 @@ export class NativeSubagentRuntime {
                         sessionId: child.sessionId,
                         ...(child.title ? { title: child.title } : {}),
                         ...(child.description ? { description: child.description } : {}),
+                        ...(cwd ? { cwd } : {}),
                     },
                 });
+                if (cwd)
+                    child.reportedCwd = cwd;
                 child.announced = true;
             }
             for (const pending of this.takePending(entry.launchId))
@@ -846,6 +940,7 @@ export class NativeSubagentRuntime {
     withdraw(taskId, child) {
         this.children.delete(taskId);
         this.configBySession.delete(child.sessionId);
+        this.cwdBySession.delete(child.sessionId);
         if (child.parentToolUseId) {
             this.takePending(child.parentToolUseId);
             this.cleanupControl(child.parentToolUseId);
@@ -863,13 +958,16 @@ export class NativeSubagentRuntime {
         await this.reportState(child, rfdEndState("failed", { error }));
     }
     /**
-     * Announces `child` in the client's form, then its configuration. A runtime
-     * without a form never does.
+     * Announces `child` in the client's form, with its `cwd` in the RFD form,
+     * then its configuration. A runtime without a form never does.
      */
     async announce(child) {
         if (!this.form)
             return;
-        await announceNativeSubagent(child, this.publish, this.form);
+        const cwd = this.form === "rfd" && !child.announced ? await this.unreportedCwd(child) : undefined;
+        await announceNativeSubagent(child, this.publish, this.form, cwd ?? undefined);
+        // A hook that reported a `cwd` while the announcement was being built.
+        await this.publishCwd(child);
         await this.publishConfiguration(child);
     }
     /** The RFD form: publishes the work state of `child` on its parent. */
@@ -1105,6 +1203,7 @@ export class NativeSubagentRuntime {
         this.identityByToolUse.clear();
         this.controlByToolUse.clear();
         this.configBySession.clear();
+        this.cwdBySession.clear();
         this.childByParentToolUse.clear();
         this.taskFinishPromises.clear();
         this.senderByToolUse.clear();
@@ -1272,7 +1371,7 @@ export function responseModelEntry(model, models) {
  * `NativeSubagentRuntime.cancelChild`), and nothing else. AIR's draft grants
  * no capabilities.
  */
-export async function announceNativeSubagent(child, publish, form) {
+export async function announceNativeSubagent(child, publish, form, cwd) {
     if (child.announced)
         return;
     if (child.announcePromise)
@@ -1287,10 +1386,13 @@ export async function announceNativeSubagent(child, publish, form) {
                     sessionId: child.sessionId,
                     ...(child.title ? { title: child.title } : {}),
                     ...(child.description ? { description: child.description } : {}),
+                    ...(cwd ? { cwd } : {}),
                     capabilities: { cancel: {} },
                     state: { state: "running" },
                 },
             });
+            if (cwd)
+                child.reportedCwd = cwd;
             child.announced = true;
             // The immediate parent made the Agent/Task call that launched the child.
             if (child.prompt) {
@@ -1723,3 +1825,15 @@ function promptField(prompt) {
 function nonBlankString(value) {
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
+/**
+ * Whether `left` and `right` are the same directory, also when one is
+ * spelled through a symlink, e.g. `/tmp/project` and `/private/tmp/project`
+ * on macOS. A path that does not exist is compared as written.
+ */
+export async function sameDirectory(left, right) {
+    if (path.resolve(left) === path.resolve(right))
+        return true;
+    const real = (dir) => realpath(dir).catch(() => path.resolve(dir));
+    const [realLeft, realRight] = await Promise.all([real(left), real(right)]);
+    return realLeft === realRight;
+}

package/dist/session-index/service.d.ts

@@ -77,7 +77,9 @@ export declare function deleteSessionIfStored(sessionId: string, deleteSession?:
 /**
  * `session/delete` of an AIR client without `sessionIndex`, which uses delete
  * to mark a session done: archives it instead, so the transcript survives. A
- * session without a transcript fails as the SDK delete did.
+ * session without a transcript has nothing to archive and succeeds, as ACP
+ * asks of a delete of a session that never existed (see
+ * {@link deleteSessionIfStored}).
  */
 export declare function archiveInsteadOfDelete(sessionId: string, service: SessionIndexService): Promise<void>;
 /** How {@link SessionIndexService.retitle} reaches the session. */

package/dist/session-index/service.d.ts.map

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

package/dist/session-index/service.js

@@ -270,13 +270,6 @@ async function isTranscriptOf(transcript, paths) {
 function isSdkNotFound(error) {
     return error instanceof Error && /^Session \S+ not found in /.test(error.message);
 }
-/** The error the SDK `deleteSession` gives for a session id it rejects or
- *  does not find, which a client without `sessionIndex` got before. */
-function sdkDeleteError(sessionId) {
-    return new Error(isSessionId(sessionId)
-        ? `Session ${sessionId} not found in any project directory`
-        : `Invalid sessionId: ${sessionId}`);
-}
 /**
  * `session/delete` of a client that is neither AIR nor a `sessionIndex` client:
  * the SDK delete of the session's transcript. A session without one succeeds,
@@ -301,15 +294,17 @@ export async function deleteSessionIfStored(sessionId, deleteSession = sdkDelete
 /**
  * `session/delete` of an AIR client without `sessionIndex`, which uses delete
  * to mark a session done: archives it instead, so the transcript survives. A
- * session without a transcript fails as the SDK delete did.
+ * session without a transcript has nothing to archive and succeeds, as ACP
+ * asks of a delete of a session that never existed (see
+ * {@link deleteSessionIfStored}).
  */
 export async function archiveInsteadOfDelete(sessionId, service) {
     if (!isSessionId(sessionId))
-        throw sdkDeleteError(sessionId);
+        return;
     // The SDK delete skips empty transcripts, so they do not count.
     const found = await service.index.findTranscripts(sessionId);
     if (found.length === 0)
-        throw sdkDeleteError(sessionId);
+        return;
     await service.retitle(sessionId, archiveTo(true), { sidecar: "existing" });
 }
 export class SessionIndexService {

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/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"}