@agentclientprotocol/claude-agent-acp 0.95.1-preview.1 → 0.95.1-preview.3

package/dist/native-subagents.js

@@ -1,5 +1,6 @@
 import { RequestError, } from "@agentclientprotocol/sdk/unstable";
 import { AIR_SUBAGENT_KEY, airExtensionMeta } from "./air-extension.js";
+import { MODEL_CONFIG_ID } from "./session-model.js";
 import { isFinalToolCallStatus } from "./tool-calls/renderer.js";
 const MAX_PENDING_PARENTS = 64;
 const MAX_PENDING_UPDATES = 256;
@@ -17,6 +18,7 @@ export class NativeSubagentRuntime {
     logger;
     lineage;
     launchedAgent;
+    models;
     enabled;
     /** The form of the child sessions; see {@link SubagentForm}. */
     form;
@@ -42,6 +44,12 @@ export class NativeSubagentRuntime {
      * closes an unfinished call has no `toolName` to recognize it by.
      */
     hiddenLaunches = new Map();
+    /**
+     * The RFD form: the SendMessage calls that the client is not shown, until
+     * their final update, with their first report and the session that made
+     * them. A message that reaches an announced child replaces its call.
+     */
+    hiddenSendMessages = 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
@@ -69,14 +77,17 @@ export class NativeSubagentRuntime {
      * `form` is undefined for a client without native subagent sessions. The RFD
      * form restores an agent from before a load or resume with `lineage`. The AIR
      * form does too, and `launchedAgent` finds the agent that a launch call made.
+     * `models` maps the model of a child response to the root session's entry
+     * (see {@link reportModel}).
      */
-    constructor(form, rootSessionId, session, publish, logger, lineage, launchedAgent) {
+    constructor(form, rootSessionId, session, publish, logger, lineage, launchedAgent, models) {
         this.rootSessionId = rootSessionId;
         this.session = session;
         this.publish = publish;
         this.logger = logger;
         this.lineage = lineage;
         this.launchedAgent = launchedAgent;
+        this.models = models;
         this.form = form;
         this.enabled = form !== undefined;
         this.children = session.nativeSubagentsByTaskId ??= new Map();
@@ -90,9 +101,10 @@ export class NativeSubagentRuntime {
     }
     async route(notification, deliver, forcedSessionId) {
         const routed = await this.routeUpdate(notification, deliver, forcedSessionId);
-        if (routed)
-            this.rememberSendMessage(routed);
-        return routed;
+        if (!routed)
+            return routed;
+        this.rememberSendMessage(routed);
+        return this.form === "rfd" ? this.routeRfdSendMessage(routed, forcedSessionId) : routed;
     }
     /**
      * The RFD form: the work state that the client holds for the announced child
@@ -104,57 +116,71 @@ export class NativeSubagentRuntime {
         const child = this.children.get(sessionId);
         return child?.announced ? child.workState : undefined;
     }
-    /** Report the model of a child response, not the parent's model or a launch-time alias. */
+    /**
+     * Reports the model of a child response, an exact model id, as the entry of
+     * the root session's `model` option that matches it, else as the id (see
+     * {@link responseModelEntry}). The child gets no model before its first
+     * response: the adapter cannot tell the model that Claude Code picks for it.
+     * The client gets a new configuration only when the entry changes.
+     */
     async reportModel(parentToolUseId, model, deliver) {
-        if (this.form !== "rfd" || !parentToolUseId || !model || model === "<synthetic>") {
+        if (!this.form || !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 }],
-                    },
-                ],
+                configOptions: [childModelOption(responseModelEntry(model, this.models))],
                 _meta: { claudeCode: { parentToolUseId } },
             },
         });
     }
-    /** Hook observations can precede the task event that establishes a child's parent. */
+    /** The configuration that the client last got for the announced child `sessionId`, if any. */
+    configurationOf(sessionId) {
+        const published = this.configBySession.get(sessionId)?.published;
+        if (!this.childOfSession(sessionId)?.announced || !published)
+            return undefined;
+        return JSON.parse(published);
+    }
+    /**
+     * Takes configuration options of the child `agentId`: an SDK agent id, as a
+     * hook names it, or a child session id. 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)
+        if (!this.form || agentId === this.rootSessionId || options.length === 0)
             return;
-        let config = this.configBySession.get(agentId);
+        // In AIR's draft, the session id of a resumed or restored agent is
+        // `<agent id>:generation:<n>`, so the agent id names its current generation.
+        const known = this.children.get(agentId) ?? this.childOfSession(agentId);
+        const sessionId = known?.sessionId ?? agentId;
+        let config = this.configBySession.get(sessionId);
         if (!config) {
-            const pending = [...this.configBySession.keys()].filter((id) => !this.children.has(id)).length;
-            if (!this.children.has(agentId) && pending >= MAX_PENDING_PARENTS) {
+            const pending = [...this.configBySession.keys()].filter((id) => !this.childOfSession(id)).length;
+            if (!known && 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);
+            this.configBySession.set(sessionId, 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);
+        if (known?.announced)
+            await this.publishConfiguration(known, meta);
     }
     async publishConfiguration(child, meta) {
         const config = this.configBySession.get(child.sessionId);
-        if (!config)
+        // AIR's draft ends a child for good, so it gets no update after its end,
+        // also when the end comes while this publication waits for an earlier one.
+        const ended = () => this.form === "air" && (child.terminalState !== undefined || !!child.terminalPromise);
+        if (!config || ended())
             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)
+            if (this.configBySession.get(child.sessionId) !== config || ended())
                 return;
             const priority = ["mode", "model", "thought_level", "model_config"];
             const rank = (option) => {
@@ -256,11 +282,11 @@ export class NativeSubagentRuntime {
             (claudeMeta?.parentToolUseId
                 ? this.childByParentToolUse.get(claudeMeta.parentToolUseId)
                 : undefined);
+        if (announcedChild?.announced && update.sessionUpdate === "config_option_update") {
+            await this.reportConfiguration(announcedChild.sessionId, update.configOptions, update._meta);
+            return null;
+        }
         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;
@@ -781,7 +807,10 @@ export class NativeSubagentRuntime {
             });
         }
         if (prompt && toolUseId) {
-            await publishPrompt(child, prompt, toolUseId, this.senderByToolUse.get(toolUseId), this.publish);
+            const sendMessage = this.hiddenSendMessages.get(toolUseId);
+            await publishPrompt(child, prompt, toolUseId, sendMessage?.sender ?? this.senderByToolUse.get(toolUseId), this.publish, { replacesCall: sendMessage !== undefined });
+            if (sendMessage)
+                sendMessage.delivered = true;
         }
         for (const pending of toolUseId ? this.takePending(toolUseId) : [])
             await deliver(pending);
@@ -812,10 +841,14 @@ export class NativeSubagentRuntime {
             return;
         await this.reportState(child, rfdEndState("failed", { error }));
     }
-    /** Announces `child` in the client's form. A runtime without one never does. */
+    /**
+     * Announces `child` in the client's form, then its configuration. A runtime
+     * without a form never does.
+     */
     async announce(child) {
-        if (this.form)
-            await announceNativeSubagent(child, this.publish, this.form);
+        if (!this.form)
+            return;
+        await announceNativeSubagent(child, this.publish, this.form);
         await this.publishConfiguration(child);
     }
     /** The RFD form: publishes the work state of `child` on its parent. */
@@ -963,6 +996,42 @@ export class NativeSubagentRuntime {
         }
         return unexposedControlFallback(handback.initial, notification, child.sessionId);
     }
+    /**
+     * The RFD form: an update of a SendMessage call, which its message replaces
+     * once it reaches an announced child: the sender's outgoing view and the
+     * child's incoming one, see {@link linkedSessionMessages}. The SDK reports
+     * that delivery before the call's final update. A call whose message reached
+     * no announced child, such as one to the parent, is shown after all, with its
+     * final status. Any other update is returned as is.
+     */
+    routeRfdSendMessage(notification, forcedSessionId) {
+        const { update } = notification;
+        if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
+            return notification;
+        }
+        const toolCallId = update.toolCallId;
+        // A permission request already showed the call to the client, so it keeps
+        // getting its updates, and its message goes only to the child.
+        if (forcedSessionId) {
+            this.hiddenSendMessages.delete(toolCallId);
+            return notification;
+        }
+        let sendMessage = this.hiddenSendMessages.get(toolCallId);
+        if (!sendMessage) {
+            const claudeMeta = update._meta?.claudeCode;
+            if (update.sessionUpdate !== "tool_call" || claudeMeta?.toolName !== "SendMessage") {
+                return notification;
+            }
+            sendMessage = { initial: notification, sender: notification.sessionId, delivered: false };
+            this.hiddenSendMessages.set(toolCallId, sendMessage);
+        }
+        if (!isFinalToolCallStatus(update.status))
+            return null;
+        this.hiddenSendMessages.delete(toolCallId);
+        if (sendMessage.delivered)
+            return null;
+        return unexposedControlFallback(sendMessage.initial, notification, sendMessage.sender);
+    }
     /** 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) {
@@ -1019,6 +1088,7 @@ export class NativeSubagentRuntime {
         this.taskFinishPromises.clear();
         this.senderByToolUse.clear();
         this.hiddenLaunches.clear();
+        this.hiddenSendMessages.clear();
         this.handbacks.clear();
         this.generationByTaskId.clear();
         this.pending.clear();
@@ -1131,6 +1201,31 @@ export class NativeSubagentRuntime {
         return `${taskId}:generation:${generation}`;
     }
 }
+/**
+ * The `model` option of a child session. The client cannot change a child's
+ * configuration, so the select offers only the current model.
+ */
+export function childModelOption(entry) {
+    return {
+        id: MODEL_CONFIG_ID,
+        name: "Model",
+        category: "model",
+        type: "select",
+        currentValue: entry.value,
+        options: [{ value: entry.value, name: entry.name }],
+    };
+}
+/**
+ * The model entry for `model`, the model id of a child's response: the entry
+ * of the root session's `model` option that matches it, else the id, with its
+ * display name when the session's model list has one. Undefined for no model,
+ * and for `<synthetic>`, which marks a message that no model wrote.
+ */
+export function responseModelEntry(model, models) {
+    if (typeof model !== "string" || !model || model === "<synthetic>")
+        return undefined;
+    return models?.entry(model) ?? { value: model, name: models?.name(model) ?? model };
+}
 /**
  * Announces the child on its parent, once, before any update of the child.
  * The RFD form announces it as running and then sends the prompt as the
@@ -1161,7 +1256,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, { replacesLaunch: true });
+                await publishPrompt(child, child.prompt, child.parentToolUseId, child.parentSessionId, publish, { replacesCall: true });
             }
             return;
         }
@@ -1221,17 +1316,17 @@ export async function finishNativeSubagent(session, taskId, state, publish) {
  * 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.
+ * When the message replaces its call (`replacesCall`), a launch's or a
+ * SendMessage call the client is not shown, it also goes to the sender, see
+ * {@link linkedSessionMessages}. Otherwise it has only the incoming view.
  */
-async function publishPrompt(child, prompt, toolUseId, sender, publish, { replacesLaunch = false } = {}) {
+async function publishPrompt(child, prompt, toolUseId, sender, publish, { replacesCall = 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) {
+    if (replacesCall && sender !== undefined && toolUseId !== undefined) {
         for (const view of linkedSessionMessages(toolUseId, sender, child.sessionId, prompt)) {
             await publish(view);
         }
@@ -1252,8 +1347,9 @@ async function publishPrompt(child, prompt, toolUseId, sender, publish, { replac
  * 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
+ * prompt goes from the parent to the child, a SendMessage call, whose message
+ * goes from its sender to a 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`.
  */
@@ -1472,7 +1568,8 @@ function isFailedToolCallUpdate(update) {
  * 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.
+ * one), a SendMessage call whose message reached no announced child, or a
+ * failed SubagentHandback call.
  */
 function unexposedControlFallback(initial, terminal, sessionId) {
     if (terminal.update.sessionUpdate !== "tool_call" &&

package/dist/session-model.d.ts

@@ -69,5 +69,28 @@ export declare function applyAvailableModelsAllowlist(sdkModels: ModelInfo[], al
  */
 export declare function narrowToGatewayModels(models: ModelInfo[], listedModelIds: readonly string[], regionPrefix?: string): ModelInfo[];
 export declare function getAvailableModels(query: Query, models: ModelInfo[], sdkModels: ModelInfo[], settingsManager: ModelSettingsSource, logger: ModelLogger, isResumedSession: boolean, sessionId: string, resumedModelHint?: string, narrowedByGateway?: boolean): Promise<SessionModelState>;
+/** The display name of the model id `model` in `modelInfos`, if it is there. */
+export declare function modelDisplayName(modelInfos: ModelInfo[], model: string): string | undefined;
+/**
+ * The entry of the `model` option among `configOptions` for `model`, a model
+ * id that a response reported, so that a client can compare it with the
+ * session's own model. Best first:
+ *
+ * 1. the current entry, when it runs that model up to a context hint: a
+ *    session on `opus[1m]` or `default` that answers as `claude-opus-4-6`;
+ * 2. the entry whose value or resolved model is that id;
+ * 3. an entry that runs that model up to a context hint.
+ *
+ * Among several entries for one model, a concrete entry comes before
+ * `default`, as in {@link resolveModelPreference}. Undefined when no entry
+ * matches. A model's resolved id comes from `modelInfos`
+ * (`ModelInfo.resolvedModel`), the wire id that a response reports, as for
+ * {@link matchResumedModel}. It is compared as it is: a dated id such as
+ * `claude-haiku-4-5-20251001` matches only the same dated id.
+ */
+export declare function modelEntryFor(configOptions: readonly SessionConfigOption[], modelInfos: ModelInfo[], model: string): {
+    value: string;
+    name: string;
+} | undefined;
 export {};
 //# sourceMappingURL=session-model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"session-model.d.ts","sourceRoot":"","sources":["../src/session-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAIjF,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC,CAAC;AACF,KAAK,mBAAmB,GAAG;IAAE,WAAW,IAAI,QAAQ,CAAA;CAAE,CAAC;AAmGvD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CA2ChG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAyBnF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,SAAS,EAAE,EACvB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAsDrB;AA+CD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CASvF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EAAE,EACtB,SAAS,EAAE,MAAM,EAAE,EACnB,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,YAAY,GAAE,SAAS,MAAM,EAAO,GACnC,SAAS,EAAE,CA6Db;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EAAE,EACnB,cAAc,EAAE,SAAS,MAAM,EAAE,EACjC,YAAY,CAAC,EAAE,MAAM,GACpB,SAAS,EAAE,CAiBb;AAWD,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,SAAS,EAAE,EACnB,SAAS,EAAE,SAAS,EAAE,EACtB,eAAe,EAAE,mBAAmB,EACpC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,UAAQ,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAoJ5B"}
+{"version":3,"file":"session-model.d.ts","sourceRoot":"","sources":["../src/session-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAIjF,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC,CAAC;AACF,KAAK,mBAAmB,GAAG;IAAE,WAAW,IAAI,QAAQ,CAAA;CAAE,CAAC;AAmGvD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CA2ChG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAyBnF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,SAAS,EAAE,EACvB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAsDrB;AA+CD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CASvF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EAAE,EACtB,SAAS,EAAE,MAAM,EAAE,EACnB,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,YAAY,GAAE,SAAS,MAAM,EAAO,GACnC,SAAS,EAAE,CA6Db;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EAAE,EACnB,cAAc,EAAE,SAAS,MAAM,EAAE,EACjC,YAAY,CAAC,EAAE,MAAM,GACpB,SAAS,EAAE,CAiBb;AAWD,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,SAAS,EAAE,EACnB,SAAS,EAAE,SAAS,EAAE,EACtB,eAAe,EAAE,mBAAmB,EACpC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,UAAQ,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAoJ5B;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG3F;AAUD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,aAAa,EAAE,SAAS,mBAAmB,EAAE,EAC7C,UAAU,EAAE,SAAS,EAAE,EACvB,KAAK,EAAE,MAAM,GACZ;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAkB7C"}

package/dist/session-model.js

@@ -523,3 +523,46 @@ export async function getAvailableModels(query, models, sdkModels, settingsManag
         currentModelId: currentModel.value,
     };
 }
+/** The display name of the model id `model` in `modelInfos`, if it is there. */
+export function modelDisplayName(modelInfos, model) {
+    return modelInfos.find((info) => info.value === model || info.resolvedModel === model)
+        ?.displayName;
+}
+/** The flat entries of a session's `model` select option. */
+function modelOptionEntries(option) {
+    if (option.type !== "select")
+        return [];
+    return option.options.flatMap((entry) => "value" in entry ? [{ value: entry.value, name: entry.name }] : entry.options);
+}
+/**
+ * The entry of the `model` option among `configOptions` for `model`, a model
+ * id that a response reported, so that a client can compare it with the
+ * session's own model. Best first:
+ *
+ * 1. the current entry, when it runs that model up to a context hint: a
+ *    session on `opus[1m]` or `default` that answers as `claude-opus-4-6`;
+ * 2. the entry whose value or resolved model is that id;
+ * 3. an entry that runs that model up to a context hint.
+ *
+ * Among several entries for one model, a concrete entry comes before
+ * `default`, as in {@link resolveModelPreference}. Undefined when no entry
+ * matches. A model's resolved id comes from `modelInfos`
+ * (`ModelInfo.resolvedModel`), the wire id that a response reports, as for
+ * {@link matchResumedModel}. It is compared as it is: a dated id such as
+ * `claude-haiku-4-5-20251001` matches only the same dated id.
+ */
+export function modelEntryFor(configOptions, modelInfos, model) {
+    const option = configOptions.find((candidate) => candidate.id === MODEL_CONFIG_ID);
+    if (option?.type !== "select")
+        return undefined;
+    // Concrete entries first; `sort` keeps the list order otherwise.
+    const entries = modelOptionEntries(option).sort((left, right) => Number(left.value === "default") - Number(right.value === "default"));
+    const observed = canonicalizeModelId(model);
+    const resolved = (value) => canonicalizeModelId(modelInfos.find((info) => info.value === value)?.resolvedModel ?? value);
+    const sameModel = (value) => stripContextHints(resolved(value)) === stripContextHints(observed);
+    const current = entries.find((entry) => entry.value === option.currentValue);
+    if (current && sameModel(current.value))
+        return current;
+    return (entries.find((entry) => entry.value === model || resolved(entry.value) === observed) ??
+        entries.find((entry) => sameModel(entry.value)));
+}

package/dist/subagent-replay.d.ts

@@ -16,13 +16,26 @@
  * 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 SendMessage call whose message the replay delivered to a child before it
+ * reached the call is that message too: the sender's outgoing view, at the
+ * call, and the child's incoming one, in the child's history. A child's
+ * history follows its launch, so a call to a child from its parent is always
+ * delivered first. Any other SendMessage call stays a tool call.
+ *
+ * Right after its announcement, each child gets its `model` option: the model
+ * of its first response, in its transcript. A later response with another
+ * model sends it again. A child without responses gets none. After the load
+ * response, a model goes again only when the session's model list, which the
+ * replay can lack, maps it to another entry.
+ *
  * 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.
  */
+import type { SessionConfigOption } from "@agentclientprotocol/sdk/unstable";
 import type { SessionMessage } from "@anthropic-ai/claude-agent-sdk";
 import type { AcpSessionNotification, SubagentState } from "./acp-subagents.js";
-import { type WorkState } from "./native-subagents.js";
+import { type ModelEntry, type SubagentModels, type WorkState } from "./native-subagents.js";
 import type { SubagentHistory, SubagentRecord } from "./subagent-history.js";
 type Publish = (notification: AcpSessionNotification) => Promise<void>;
 /** A child that the replay shows: its launch has metadata. */
@@ -44,10 +57,15 @@ export type ReplayChild = {
     promptSent: boolean;
     /** Whether it handed a report to its parent with a SubagentHandback call. */
     handedBack?: boolean;
+    /** The `model` option entry that the replay sent. */
+    model?: ModelEntry;
+    /** The model id of the latest response in its transcript. */
+    responseModel?: string;
 };
 export declare class RfdSubagentReplay {
     private readonly history;
     private readonly publish;
+    private readonly models?;
     /** The children by the id of the tool use that launched each. */
     private readonly children;
     private readonly byAgentId;
@@ -58,7 +76,7 @@ export declare class RfdSubagentReplay {
     private withoutHistory;
     /** The SubagentHandback calls, with their report and whether their result failed. */
     private readonly handbacks;
-    constructor(history: SubagentHistory, publish: Publish);
+    constructor(history: SubagentHistory, publish: Publish, models?: SubagentModels | undefined);
     /**
      * Registers the launches, the launch results, and the SendMessage calls in
      * `messages`, the transcript of the session `ownerSessionId`.
@@ -66,8 +84,18 @@ export declare class RfdSubagentReplay {
     scan(messages: readonly SessionMessage[], ownerSessionId: string): void;
     /** The child that the tool use `toolUseId` launched, when the replay shows it. */
     childOfLaunch(toolUseId: string): ReplayChild | undefined;
-    /** Announces `child` on its parent, as live: running, with the parent's labels. */
-    announce(child: ReplayChild): Promise<void>;
+    /**
+     * 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.
+     */
+    announce(child: ReplayChild, firstModel?: string): Promise<void>;
+    /**
+     * Takes the model of a replayed response of the child `owner`. A child
+     * whose model changes gets its `model` option again.
+     */
+    responseModel(owner: ReplayChild, model: string | undefined): Promise<void>;
+    private sendModel;
     /**
      * The rest of a child's user message to replay, or `null` when nothing is
      * left, after its text went out as the child's incoming `session_message`.
@@ -89,10 +117,11 @@ export declare class RfdSubagentReplay {
     /**
      * 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
+     * update of the launch of a child that the replay shows, of a SendMessage
+     * call whose message the replay already delivered, 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.
+     * goes out as the child's reply, a delivered SendMessage as the sender's
+     * outgoing message, and a hand-back as the child's message to its parent.
      */
     toolCallUpdate(update: AcpSessionNotification["update"], owner: ReplayChild | undefined): Promise<boolean>;
     /**
@@ -116,7 +145,7 @@ export declare class RfdSubagentReplay {
      * 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.
      */
-    currentStates(live: (sessionId: string) => WorkState["state"] | undefined): AcpSessionNotification[];
+    currentStates(live: (sessionId: string) => WorkState["state"] | undefined, liveConfiguration?: (sessionId: string) => SessionConfigOption[] | undefined): AcpSessionNotification[];
     private registerLaunch;
     /** The prompt of the launch, with the launch's id, to the parent and the child, as live. */
     private sendPrompt;
@@ -127,10 +156,15 @@ export declare class RfdSubagentReplay {
      * first undelivered SendMessage to the child whose message the delivered
      * text contains. With that call, the message has the call's id and text and
      * its sender, as live; without it, its transcript id and the delivered text.
+     * Unless the replay already showed the call as a tool call, the message
+     * replaces it, so this view names the sender's view, which goes out at the
+     * call (see {@link toolCallUpdate}).
      */
     private sendDelivery;
     private sendMessage;
 }
+/** The model of the first response in `messages`, a subagent's transcript. */
+export declare function firstResponseModel(messages: readonly SessionMessage[]): string | undefined;
 /**
  * The end of a foreground launch from its tool result: an error result that
  * names a stop is a cancellation, any other error a failure.

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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAOL,KAAK,UAAU,EAKf,KAAK,cAAc,EACnB,KAAK,SAAS,EACf,MAAM,uBAAuB,CAAC;AAE/B,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;IACpB,6EAA6E;IAC7E,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,qDAAqD;IACrD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAeF,qBAAa,iBAAiB;IAgB1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAjB1B,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;IAC3B,qFAAqF;IACrF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;gBAGe,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,cAAc,YAAA;IAG1C;;;OAGG;IACH,IAAI,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAmCvE,kFAAkF;IAClF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIzD;;;;OAIG;IACG,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtE;;;OAGG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;YAOnE,SAAS;IAYvB;;;;;;;;;;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;;;;;;;;OAQG;IACG,cAAc,CAClB,MAAM,EAAE,sBAAsB,CAAC,QAAQ,CAAC,EACxC,KAAK,EAAE,WAAW,GAAG,SAAS,GAC7B,OAAO,CAAC,OAAO,CAAC;IAoDnB;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAOzD;;;OAGG;IACG,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B5E;;;;;;;;;;OAUG;IACH,aAAa,CACX,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,EAC3D,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,mBAAmB,EAAE,GAAG,SAAS,GAC3E,sBAAsB,EAAE;IAoC3B,OAAO,CAAC,cAAc;IAwBtB,4FAA4F;YAC9E,UAAU;IAYxB;;;;;;;;;;OAUG;YACW,YAAY;YAsBZ,WAAW;CAmB1B;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,GAAG,SAAS,CAO1F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,WAAW,GAAG,QAAQ,GAAG,WAAW,CAMtC"}