@agentclientprotocol/claude-agent-acp 0.94.1-preview.8 → 0.95.0

package/dist/native-subagents.js

@@ -1,5 +1,6 @@
-import { RequestError } from "@agentclientprotocol/sdk/unstable";
+import { RequestError, } from "@agentclientprotocol/sdk/unstable";
 import { AIR_SUBAGENT_KEY, airExtensionMeta } from "./air-extension.js";
+import { isFinalToolCallStatus } from "./tool-calls/renderer.js";
 const MAX_PENDING_PARENTS = 64;
 const MAX_PENDING_UPDATES = 256;
 const MAX_PENDING_UPDATES_PER_PARENT = 32;
@@ -24,6 +25,7 @@ export class NativeSubagentRuntime {
     parentByToolUse;
     identityByToolUse = new Map();
     controlByToolUse = new Map();
+    configBySession = new Map();
     childByParentToolUse = new Map();
     /**
      * The child session of each tool call that went to a child session. A later
@@ -34,6 +36,18 @@ export class NativeSubagentRuntime {
     taskFinishPromises = new Map();
     /** The session that made each SendMessage call. */
     senderByToolUse = new Map();
+    /**
+     * The RFD form: the Agent/Task calls that the client is not shown, until
+     * their final update. Kept by id because the adapter's own report that
+     * closes an unfinished call has no `toolName` to recognize it by.
+     */
+    hiddenLaunches = new Map();
+    /**
+     * The RFD form: the SubagentHandback calls of announced children that the
+     * client is not shown yet, with their first report, the report from their
+     * input, and the call that delegated the run.
+     */
+    handbacks = new Map();
     generationByTaskId = new Map();
     pending = new Map();
     pendingCount = 0;
@@ -80,10 +94,85 @@ export class NativeSubagentRuntime {
             this.rememberSendMessage(routed);
         return routed;
     }
+    /** Report the model of a child response, not the parent's model or a launch-time alias. */
+    async reportModel(parentToolUseId, model, deliver) {
+        if (this.form !== "rfd" || !parentToolUseId || !model || model === "<synthetic>") {
+            return;
+        }
+        await deliver({
+            sessionId: this.rootSessionId,
+            update: {
+                sessionUpdate: "config_option_update",
+                configOptions: [
+                    {
+                        id: "model",
+                        name: "Model",
+                        category: "model",
+                        type: "select",
+                        currentValue: model,
+                        options: [{ value: model, name: model }],
+                    },
+                ],
+                _meta: { claudeCode: { parentToolUseId } },
+            },
+        });
+    }
+    /** Hook observations can precede the task event that establishes a child's parent. */
+    async reportConfiguration(agentId, options, meta) {
+        if (this.form !== "rfd" || agentId === this.rootSessionId || options.length === 0)
+            return;
+        let config = this.configBySession.get(agentId);
+        if (!config) {
+            const pending = [...this.configBySession.keys()].filter((id) => !this.children.has(id)).length;
+            if (!this.children.has(agentId) && pending >= MAX_PENDING_PARENTS) {
+                this.logger.log(`Session ${this.rootSessionId}: dropping configuration for unannounced subagent ${agentId}; pending buffer limit reached`);
+                return;
+            }
+            config = { options: new Map(), publishing: Promise.resolve() };
+            this.configBySession.set(agentId, config);
+        }
+        for (const option of options)
+            config.options.set(option.id, option);
+        const child = this.children.get(agentId);
+        if (child?.announced)
+            await this.publishConfiguration(child, meta);
+    }
+    async publishConfiguration(child, meta) {
+        const config = this.configBySession.get(child.sessionId);
+        if (!config)
+            return;
+        // SDK hooks can run concurrently with streamed responses. Serialize snapshots
+        // so a delayed publication cannot replace newer settings with older ones.
+        const publishing = config.publishing.then(async () => {
+            if (this.configBySession.get(child.sessionId) !== config)
+                return;
+            const priority = ["mode", "model", "thought_level", "model_config"];
+            const rank = (option) => {
+                const index = priority.indexOf(option.category ?? "");
+                return index < 0 ? priority.length : index;
+            };
+            const configOptions = [...config.options.values()].sort((left, right) => rank(left) - rank(right));
+            const snapshot = JSON.stringify(configOptions);
+            if (config.published === snapshot)
+                return;
+            await this.publish({
+                sessionId: child.sessionId,
+                update: {
+                    sessionUpdate: "config_option_update",
+                    configOptions,
+                    ...(meta ? { _meta: meta } : {}),
+                },
+            });
+            config.published = snapshot;
+        });
+        // The caller receives the error; later observations must still be able to retry.
+        config.publishing = publishing.catch(() => { });
+        await publishing;
+    }
     async routeUpdate(notification, deliver, forcedSessionId) {
         const { update } = notification;
         const claudeMeta = update._meta?.claudeCode;
-        const isControl = isNativeSubagentControlUpdate(update);
+        const isControl = this.isControlUpdate(update);
         if (!this.enabled)
             return notification;
         if (this.enabled && isControl) {
@@ -126,12 +215,18 @@ export class NativeSubagentRuntime {
                     if (forcedSessionId) {
                         return { ...notification, sessionId: forcedSessionId };
                     }
-                    return failedControlFallback(initial, notification, parentSessionId ?? this.rootSessionId);
+                    return unexposedControlFallback(initial, notification, parentSessionId ?? this.rootSessionId);
                 }
                 return forcedSessionId ? { ...notification, sessionId: forcedSessionId } : null;
             }
-            // The RFD form: the Agent/Task tool call is the parent's record of the
-            // delegation, so it stays a tool call of the session that made it.
+            // The RFD form: the parent's session messages replace the Agent/Task
+            // tool call, its prompt as the parent's outgoing message (see
+            // `linkedSessionMessages`) and its result as the child's reply (see
+            // `launchReply`). A call made inside a child that is not announced yet
+            // is buffered below, as any update of that child.
+            if (!parentPending) {
+                return this.routeRfdLaunch(notification, child, parentSessionId ?? this.rootSessionId, forcedSessionId);
+            }
         }
         const toolCallId = update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update"
             ? update.toolCallId
@@ -147,6 +242,19 @@ export class NativeSubagentRuntime {
             return { ...notification, sessionId: forcedSessionId };
         }
         const owner = toolCallId ? this.childByToolCall.get(toolCallId) : undefined;
+        const announcedChild = owner ??
+            (claudeMeta?.parentToolUseId
+                ? this.childByParentToolUse.get(claudeMeta.parentToolUseId)
+                : undefined);
+        if (this.form === "rfd" && announcedChild?.announced) {
+            if (update.sessionUpdate === "config_option_update") {
+                await this.reportConfiguration(announcedChild.sessionId, update.configOptions, update._meta);
+                return null;
+            }
+            const handback = await this.routeRfdHandback(notification, announcedChild);
+            if (handback !== undefined)
+                return handback;
+        }
         if (owner)
             return this.toChild(owner, notification, toolCallId);
         if (this.enabled && claudeMeta?.parentToolUseId) {
@@ -392,6 +500,7 @@ export class NativeSubagentRuntime {
             this.pendingCount = 0;
             this.identityByToolUse.clear();
             this.controlByToolUse.clear();
+            this.configBySession.clear();
             this.parentByToolUse.clear();
             this.forgetRestores();
         }
@@ -676,6 +785,7 @@ export class NativeSubagentRuntime {
      */
     withdraw(taskId, child) {
         this.children.delete(taskId);
+        this.configBySession.delete(child.sessionId);
         if (child.parentToolUseId) {
             this.takePending(child.parentToolUseId);
             this.cleanupControl(child.parentToolUseId);
@@ -696,6 +806,7 @@ export class NativeSubagentRuntime {
     async announce(child) {
         if (this.form)
             await announceNativeSubagent(child, this.publish, this.form);
+        await this.publishConfiguration(child);
     }
     /** The RFD form: publishes the work state of `child` on its parent. */
     async reportState(child, state) {
@@ -762,6 +873,94 @@ export class NativeSubagentRuntime {
                 this.senderByToolUse.delete(oldest);
         }
     }
+    /**
+     * The RFD form: an update of the Agent/Task call that launches `child`,
+     * which the parent's session messages replace. Only a launch whose child
+     * was never exposed stays a tool call of the parent, with its final status,
+     * since the RFD lets the Agent represent unexposed work through the parent.
+     * A background launch completes before its child starts, so its completion
+     * is not such a case.
+     */
+    async routeRfdLaunch(notification, child, parentSessionId, forcedSessionId) {
+        const { update } = notification;
+        if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
+            return null;
+        }
+        const toolCallId = update.toolCallId;
+        // A permission request already showed the call to the client, so it
+        // keeps getting its updates.
+        if (forcedSessionId)
+            return { ...notification, sessionId: forcedSessionId };
+        const launch = this.hiddenLaunches.get(toolCallId) ?? { background: false };
+        if (isBackgroundLaunch(update.rawInput))
+            launch.background = true;
+        if (!isFinalToolCallStatus(update.status)) {
+            this.hiddenLaunches.set(toolCallId, launch);
+            return null;
+        }
+        this.hiddenLaunches.delete(toolCallId);
+        if (child?.announcePromise)
+            await child.announcePromise;
+        const background = launch.background;
+        if (child?.announced) {
+            const reply = update.status === "completed" && !background && !child.handedBack?.has(toolCallId)
+                ? launchReply(toolCallId, child.sessionId, child.parentSessionId, update)
+                : undefined;
+            if (reply)
+                await this.publish(reply);
+            return null;
+        }
+        if (background && update.status === "completed")
+            return null;
+        this.takePending(toolCallId);
+        const initial = this.controlByToolUse.get(toolCallId);
+        this.cleanupControl(toolCallId);
+        return unexposedControlFallback(initial, notification, parentSessionId);
+    }
+    /**
+     * The RFD form: an update of a SubagentHandback call of the announced
+     * `child`, which its report replaces: the child's message to its parent,
+     * see {@link linkedSessionMessages}. A failed call delivered nothing, so the
+     * child is shown the call after all. `undefined` for any other update.
+     */
+    async routeRfdHandback(notification, child) {
+        const { update } = notification;
+        if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
+            return undefined;
+        }
+        const claudeMeta = update._meta?.claudeCode;
+        let handback = this.handbacks.get(update.toolCallId);
+        if (!handback) {
+            if (claudeMeta?.toolName !== HANDBACK_TOOL)
+                return undefined;
+            handback = {
+                initial: notification,
+                delegationId: claudeMeta.parentToolUseId ?? child.parentToolUseId,
+            };
+            this.handbacks.set(update.toolCallId, handback);
+        }
+        handback.message = handbackMessage(update.rawInput) ?? handback.message;
+        if (!isFinalToolCallStatus(update.status))
+            return null;
+        this.handbacks.delete(update.toolCallId);
+        if (update.status === "completed" && handback.message) {
+            for (const view of linkedSessionMessages(update.toolCallId, child.sessionId, child.parentSessionId, handback.message)) {
+                await this.publish(view);
+            }
+            if (handback.delegationId)
+                (child.handedBack ??= new Set()).add(handback.delegationId);
+            return null;
+        }
+        return unexposedControlFallback(handback.initial, notification, child.sessionId);
+    }
+    /** Whether `update` is of an Agent/Task call, by its tool name or, in the
+     *  RFD form, by the id of a call the client is not shown. */
+    isControlUpdate(update) {
+        if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
+            return false;
+        }
+        return this.hiddenLaunches.has(update.toolCallId) || isNativeSubagentControlUpdate(update);
+    }
     rememberToolCallOwner(toolCallId, child) {
         this.childByToolCall.delete(toolCallId);
         this.childByToolCall.set(toolCallId, child);
@@ -805,9 +1004,12 @@ export class NativeSubagentRuntime {
         this.parentByToolUse.clear();
         this.identityByToolUse.clear();
         this.controlByToolUse.clear();
+        this.configBySession.clear();
         this.childByParentToolUse.clear();
         this.taskFinishPromises.clear();
         this.senderByToolUse.clear();
+        this.hiddenLaunches.clear();
+        this.handbacks.clear();
         this.generationByTaskId.clear();
         this.pending.clear();
         this.pendingCount = 0;
@@ -949,7 +1151,7 @@ export async function announceNativeSubagent(child, publish, form) {
             child.announced = true;
             // The immediate parent made the Agent/Task call that launched the child.
             if (child.prompt) {
-                await publishPrompt(child, child.prompt, child.parentToolUseId, child.parentSessionId, publish);
+                await publishPrompt(child, child.prompt, child.parentToolUseId, child.parentSessionId, publish, { replacesLaunch: true });
             }
             return;
         }
@@ -1008,13 +1210,23 @@ export async function finishNativeSubagent(session, taskId, state, publish) {
  * Agent/Task call or a SendMessage, so a prompt whose id is already in the
  * transcript is the same delegation and is not sent again. `sender` is the
  * session that made that call, when known.
+ *
+ * A launch's prompt (`replacesLaunch`) also goes to the parent, see
+ * {@link linkedSessionMessages}. A SendMessage call stays a tool call of the
+ * sender, so its message has only the incoming view.
  */
-async function publishPrompt(child, prompt, toolUseId, sender, publish) {
+async function publishPrompt(child, prompt, toolUseId, sender, publish, { replacesLaunch = false } = {}) {
     child.promptIds ??= new Set();
     const messageId = toolUseId ?? `${child.sessionId}:prompt:${child.promptIds.size + 1}`;
     if (child.promptIds.has(messageId))
         return;
     child.promptIds.add(messageId);
+    if (replacesLaunch && sender !== undefined && toolUseId !== undefined) {
+        for (const view of linkedSessionMessages(toolUseId, sender, child.sessionId, prompt)) {
+            await publish(view);
+        }
+        return;
+    }
     await publish({
         sessionId: child.sessionId,
         update: {
@@ -1026,6 +1238,87 @@ async function publishPrompt(child, prompt, toolUseId, sender, publish) {
         },
     });
 }
+/**
+ * The RFD form: a message that a tool call sent, which the client is not
+ * shown, as two session messages: the sender's outgoing view, then the
+ * recipient's incoming one. That call is a launch's Agent/Task call, whose
+ * prompt goes from the parent to the child, or a child's SubagentHandback
+ * call, whose report goes from the child to the parent. Both views use the
+ * call's tool use id, and each names the other with the draft RFD's
+ * `recipientMessageId` and `senderMessageId`.
+ */
+export function linkedSessionMessages(toolUseId, senderSessionId, recipientSessionId, text) {
+    const message = {
+        sessionUpdate: "session_message",
+        messageId: toolUseId,
+        senderSessionId,
+        recipientSessionId,
+        content: [{ type: "text", text }],
+    };
+    return [
+        {
+            sessionId: senderSessionId,
+            update: { ...message, recipientMessageId: toolUseId },
+        },
+        {
+            sessionId: recipientSessionId,
+            update: { ...message, senderMessageId: toolUseId },
+        },
+    ];
+}
+/**
+ * The tool with which a child hands its report to its parent, when Claude
+ * Code runs in hand-back mode. The Agent/Task result then only says that the
+ * report was delivered as a message, with `handback: "send"` in its
+ * structured result.
+ */
+export const HANDBACK_TOOL = "SubagentHandback";
+/** The report of a SubagentHandback call, from its input. */
+export function handbackMessage(input) {
+    const message = input?.message;
+    return typeof message === "string" && message.trim() ? message : undefined;
+}
+/**
+ * The RFD form: the answer of a foreground child, from the completed result
+ * of the Agent/Task call `launchId` that launched it, as the child's message
+ * in the parent's transcript (its incoming view). It replaces that call's
+ * result, which the parent is not shown. The child's transcript has its
+ * answer as its own agent message, not as a session message, so this view
+ * links to no other. `undefined` for a result without text. Not used for a
+ * run whose child handed back its report: the result has no report then.
+ */
+export function launchReply(launchId, childSessionId, parentSessionId, result) {
+    const content = replyContent(result);
+    if (content.length === 0)
+        return undefined;
+    return {
+        sessionId: parentSessionId,
+        update: {
+            sessionUpdate: "session_message",
+            messageId: `${launchId}:reply`,
+            senderSessionId: childSessionId,
+            recipientSessionId: parentSessionId,
+            content,
+        },
+    };
+}
+/**
+ * The text of a completed launch's result, from the tool call's `content`:
+ * `AgentReporter` removed the parts meant for the model there (the
+ * `agentId: … (use SendMessage …)` line, the `<usage>` block and the hand-back
+ * frame), which `rawOutput` still has.
+ */
+function replyContent(result) {
+    return (result.content ?? []).flatMap((item) => item.type === "content" && item.content.type === "text" && item.content.text.trim()
+        ? [{ type: "text", text: item.content.text }]
+        : []);
+}
+/** Whether an Agent/Task call's input runs its child in the background. */
+function isBackgroundLaunch(rawInput) {
+    return (typeof rawInput === "object" &&
+        rawInput !== null &&
+        rawInput.run_in_background === true);
+}
 /** The RFD form: whether the child's foreground work is in progress. */
 function isWorking(child) {
     return child.workState === "running" || child.workState === "requires_action";
@@ -1165,7 +1458,13 @@ function isFailedToolCallUpdate(update) {
     return ((update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") &&
         update.status === "failed");
 }
-function failedControlFallback(initial, terminal, sessionId) {
+/**
+ * A tool call that the client was not shown, as one `tool_call` with its
+ * final status, shown after all: an Agent/Task call whose child was never
+ * exposed (AIR's draft shows only a failed one, the RFD form also a completed
+ * one), or a failed SubagentHandback call.
+ */
+function unexposedControlFallback(initial, terminal, sessionId) {
     if (terminal.update.sessionUpdate !== "tool_call" &&
         terminal.update.sessionUpdate !== "tool_call_update") {
         return { ...terminal, sessionId };
@@ -1178,7 +1477,7 @@ function failedControlFallback(initial, terminal, sessionId) {
             update: {
                 ...terminal.update,
                 sessionUpdate: "tool_call",
-                status: "failed",
+                status: terminal.update.status ?? "failed",
                 // The synthesized tool_call is this call's first report, so give it
                 // the standard `name` the initial one would have carried.
                 ...(typeof claudeMeta?.toolName === "string" ? { name: claudeMeta.toolName } : {}),
@@ -1198,7 +1497,7 @@ function failedControlFallback(initial, terminal, sessionId) {
             ...initial.update,
             ...terminal.update,
             sessionUpdate: "tool_call",
-            status: "failed",
+            status: terminal.update.status ?? "failed",
             title: typeof terminal.update.title === "string" && terminal.update.title.trim().length > 0
                 ? terminal.update.title
                 : initial.update.title,

package/dist/session-effort.d.ts

@@ -14,5 +14,6 @@ export declare function settingsEffortForModel(settings: Settings, modelInfo: Mo
  * matching the SDK. Keep unrelated per-model entries from lower tiers while
  * replacing entries supplied at the programmatic tier. */
 export declare function mergeEffortSettings(base: Settings, override: Settings | undefined): Settings;
+export declare function effortLevelName(level: string): string;
 export declare function buildEffortConfigOption(modelInfos: ModelInfo[], currentModelId: string, currentEffortLevel: string | undefined, useRecommendedValue: boolean): SessionConfigOption | undefined;
 //# sourceMappingURL=session-effort.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"session-effort.d.ts","sourceRoot":"","sources":["../src/session-effort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAIvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAK3D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAE9E;AAMD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,QAAQ,GACjB;IAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,IAAI,CAAA;CAAE,CAGvD;AASD;;2EAE2E;AAC3E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAgBpB;AAED;;0DAE0D;AAC1D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAkB5F;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,GAAG,SAAS,CA2CjC"}
+{"version":3,"file":"session-effort.d.ts","sourceRoot":"","sources":["../src/session-effort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAIvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAK3D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAE9E;AAMD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,QAAQ,GACjB;IAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,IAAI,CAAA;CAAE,CAGvD;AASD;;2EAE2E;AAC3E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAgBpB;AAED;;0DAE0D;AAC1D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAkB5F;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,GAAG,SAAS,CAwCjC"}

package/dist/session-effort.js

@@ -58,6 +58,12 @@ export function mergeEffortSettings(base, override) {
             : undefined,
     };
 }
+export function effortLevelName(level) {
+    return level
+        .split(/[_-]/)
+        .map((part) => (part ? part.charAt(0).toUpperCase() + part.slice(1) : part))
+        .join(" ");
+}
 export function buildEffortConfigOption(modelInfos, currentModelId, currentEffortLevel, useRecommendedValue) {
     const currentModelInfo = modelInfos.find((model) => model.value === currentModelId);
     const supportedLevels = currentModelInfo?.supportsEffort
@@ -72,10 +78,7 @@ export function buildEffortConfigOption(modelInfos, currentModelId, currentEffor
         ...(useRecommendedValue ? [] : [{ value: "default", name: "Default" }]),
         ...supportedLevels.map((level) => ({
             value: level,
-            name: level
-                .split(/[_-]/)
-                .map((part) => (part ? part.charAt(0).toUpperCase() + part.slice(1) : part))
-                .join(" "),
+            name: effortLevelName(level),
         })),
     ];
     const includes = (level) => (!useRecommendedValue && level === "default") || supportedLevels.includes(level);

package/dist/subagent-history.d.ts

@@ -68,9 +68,13 @@ export declare function readSubagentMessages(sessionId: string, agentId: string,
  * The transcript of a `subagent_type: "fork"` child without the context it
  * inherited. A fork transcript starts with a copy of the parent's launching
  * assistant message (its text, thinking and every tool_use, including the
- * Agent call itself), then a user message with a "Fork started — processing
- * in background" tool_result for each of those tool_uses and the text
- * `<fork-boilerplate>…</fork-boilerplate>\nYour directive: <prompt>`. A fork
+ * Agent call itself), then a user message with a placeholder tool_result for
+ * each of those tool_uses and the text
+ * `<fork-boilerplate>…</fork-boilerplate>\nYour directive: <prompt>`. Since
+ * Claude Code 2.1.307 the fork's own Agent call gets "Fork started — that fork
+ * is you." and the other tool_uses get "This is the parent's call, not
+ * yours. …"; before that, every one got "Fork started — processing in
+ * background". Only the directive text is matched here. A fork
  * launched from inside a subagent also gets a copy of that subagent's history
  * before them. None of it is the child's own work: replayed as is, the
  * parent's text and tool calls would show again in the child.

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;;;;;;;;;;;;;GAaG;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;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"}

package/dist/subagent-history.js

@@ -234,9 +234,13 @@ function isForkDirectiveMessage(message) {
  * The transcript of a `subagent_type: "fork"` child without the context it
  * inherited. A fork transcript starts with a copy of the parent's launching
  * assistant message (its text, thinking and every tool_use, including the
- * Agent call itself), then a user message with a "Fork started — processing
- * in background" tool_result for each of those tool_uses and the text
- * `<fork-boilerplate>…</fork-boilerplate>\nYour directive: <prompt>`. A fork
+ * Agent call itself), then a user message with a placeholder tool_result for
+ * each of those tool_uses and the text
+ * `<fork-boilerplate>…</fork-boilerplate>\nYour directive: <prompt>`. Since
+ * Claude Code 2.1.307 the fork's own Agent call gets "Fork started — that fork
+ * is you." and the other tool_uses get "This is the parent's call, not
+ * yours. …"; before that, every one got "Fork started — processing in
+ * background". Only the directive text is matched here. A fork
  * launched from inside a subagent also gets a copy of that subagent's history
  * before them. None of it is the child's own work: replayed as is, the
  * parent's text and tool calls would show again in the child.

package/dist/subagent-replay.d.ts

@@ -8,6 +8,13 @@
  * history to the child session. Every child's end goes out before the replay
  * ends, since no subagent from before the reload still runs.
  *
+ * As live, the parent is not shown the Agent or Task call of a child that the
+ * replay announces: the launch's prompt is the parent's outgoing message, and
+ * a foreground child's answer is its reply to the parent. A child's
+ * successful SubagentHandback call is its message to the parent instead.
+ * Unlike live, the replay does not tell runs apart, so a child that handed
+ * back any report gets no reply from its launch's result.
+ *
  * A launch without metadata has no known id, so it is not announced: the RFD
  * forbids inventing one. Its Agent call stays an ordinary tool call of the
  * parent, and a notice says that subagent history is missing.
@@ -33,6 +40,8 @@ export type ReplayChild = {
     notified?: SubagentState;
     announced: boolean;
     promptSent: boolean;
+    /** Whether it handed a report to its parent with a SubagentHandback call. */
+    handedBack?: boolean;
 };
 export declare class RfdSubagentReplay {
     private readonly history;
@@ -45,6 +54,8 @@ export declare class RfdSubagentReplay {
     private readonly omitted;
     /** Children whose transcript could not be read: only their association is replayed. */
     private withoutHistory;
+    /** The SubagentHandback calls, with their report and whether their result failed. */
+    private readonly handbacks;
     constructor(history: SubagentHistory, publish: Publish);
     /**
      * Registers the launches, the launch results, and the SendMessage calls in
@@ -73,6 +84,15 @@ export declare class RfdSubagentReplay {
      * comes from the launch call.
      */
     childReplayed(child: ReplayChild, messages: readonly SessionMessage[]): Promise<void>;
+    /**
+     * Takes a replayed update of a tool call, from the transcript of `owner`
+     * when it is a child's. Returns whether the client is not shown it: an
+     * update of the launch of a child that the replay shows, or of a successful
+     * SubagentHandback call of `owner`. A foreground launch's completed result
+     * goes out as the child's reply, and a hand-back as the child's message to
+     * its parent.
+     */
+    toolCallUpdate(update: AcpSessionNotification["update"], owner: ReplayChild | undefined): Promise<boolean>;
     /**
      * Takes a persisted task notification. Returns whether it was a child's:
      * its task id is the agent id.
@@ -86,7 +106,7 @@ export declare class RfdSubagentReplay {
      */
     finish(supportsNotices: boolean, rootSessionId: string): Promise<void>;
     private registerLaunch;
-    /** The prompt of the launch, with the launch's id, as live. */
+    /** The prompt of the launch, with the launch's id, to the parent and the child, as live. */
     private sendPrompt;
     /**
      * A message that a SendMessage call delivered. Claude Code frames it for the

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

@@ -1 +1 @@
-{"version":3,"file":"subagent-replay.d.ts","sourceRoot":"","sources":["../src/subagent-replay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAShF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE7E,KAAK,OAAO,GAAG,CAAC,YAAY,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvE,8DAA8D;AAC9D,MAAM,MAAM,WAAW,GAAG;IACxB,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;IACvB,wCAAwC;IACxC,eAAe,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,mEAAmE;IACnE,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,iEAAiE;IACjE,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAUF,qBAAa,iBAAiB;IAW1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,iEAAiE;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyB;IACtD,8DAA8D;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,uFAAuF;IACvF,OAAO,CAAC,cAAc,CAAK;gBAGR,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO;IAGnC;;;OAGG;IACH,IAAI,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IA6BvE,kFAAkF;IAClF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIzD,mFAAmF;IAC7E,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBjD;;;;;;;;;;OAUG;IACG,YAAY,CAChB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;IAanB;;;;OAIG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3F;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAOzD;;;;;OAKG;IACG,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B5E,OAAO,CAAC,cAAc;IAwBtB,+DAA+D;YACjD,UAAU;IAKxB;;;;;;;OAOG;YACW,YAAY;YAoBZ,WAAW;CAiB1B;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,WAAW,GAAG,QAAQ,GAAG,WAAW,CAMtC"}
+{"version":3,"file":"subagent-replay.d.ts","sourceRoot":"","sources":["../src/subagent-replay.ts"],"names":[],"mappings":"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"}