neoctl 0.2.42 → 0.2.44

package/dist/web/agent-content-detail.js

@@ -141,7 +141,7 @@ function part(owner, v) {
     if (v === undefined)
         return absent();
     const isTruncated = truncated(v);
-    return { state: isTruncated ? 'truncated' : 'complete', text: text(sanitize(owner, v)), reason: isTruncated ? '保存的源数据已截断，不是全文' : '已保存内容的脱敏全文' };
+    return { state: isTruncated ? 'truncated' : 'complete', text: text(sanitize(owner, v)), reason: isTruncated ? '保存的源数据已截断，不是全文' : '已保存内容的原始全文' };
 }
 function preview(p, max = 2048) {
     return p.text.length <= max ? p : { state: 'truncated', text: p.text.slice(0, max), reason: '摘要明确截断；不作为全文' };

package/dist/web/index.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import type { TimingRecord } from "../core/query-timing.js";
 import { type ImageResultMetadata } from "./image-result-metadata.js";
 import { type IncomingMessage, type ServerResponse } from "node:http";
 import { QueryEngine } from "../core/query-engine.js";
@@ -41,7 +42,14 @@ export interface WebRuntimePluginDefinition extends Pick<NeoPluginResource, "id"
     promptSections?: readonly PromptSection[];
     presentToolResult?: NeoPluginResource["presentToolResult"];
 }
+export interface WebPluginSnapshot {
+    plugins: readonly WebRuntimePluginDefinition[];
+    release: () => void;
+}
 interface WebRuntimePluginSupport {
+    resolveCatalog?: () => readonly WebRuntimePluginDefinition[];
+    acquire?: (overrides: Readonly<Record<string, boolean>>) => WebPluginSnapshot;
+    pendingOverrides?: Record<string, boolean>;
     catalog: WebRuntimePluginDefinition[];
     overrides: Record<string, boolean>;
     basePromptSections: PromptSection[];
@@ -161,6 +169,7 @@ interface UiLine {
     toolPresentation?: ToolPresentation;
     parentToolName?: string;
     toolUseId?: string;
+    timing?: TimingRecord;
     parentToolUseId?: string;
     title?: string;
     bodyTitle?: string;
@@ -188,6 +197,15 @@ type WebActionResult<T extends object = object> = ({
     ok: true;
 } & T) | WebActionFailure;
 interface UiStatus {
+    modelOutput?: {
+        kind: "text";
+    } | {
+        kind: "tool_call";
+        callId: string;
+        name?: string;
+    };
+    queryTiming?: TimingRecord;
+    toolTimings?: TimingRecord[];
     phase: string;
     detail?: string;
     currentTool?: {
@@ -234,6 +252,9 @@ export interface CreateWebRuntimeOptions {
     plugins?: readonly string[];
     /** Switchable plugins supplied by the embedding application. */
     externalPlugins?: readonly WebRuntimePluginDefinition[];
+    resolveExternalPlugins?: WebRuntimePluginSupport["resolveCatalog"];
+    acquirePluginSnapshot?: WebRuntimePluginSupport["acquire"];
+    reservePluginToolNames?: (names: readonly string[]) => void;
     /** Per-session plugin overrides. Missing ids inherit the global setting. */
     sessionPluginOverrides?: Readonly<Record<string, boolean>>;
     persistSessionPluginOverrides?: WebRuntimePluginSupport["persist"];
@@ -312,6 +333,7 @@ type WebLineOperation = {
 };
 export declare function runWebServer(argv?: string[], runtimeOptions?: RunWebServerOptions): Promise<void>;
 export declare function createWebRuntime(options?: CreateWebRuntimeOptions): Promise<WebRuntime>;
+export declare function refreshRuntimePlugins(runtime: WebRuntime, engine?: QueryEngine): void;
 /** Called only at a safe turn boundary or while idle, never during tool execution. */
 export declare function refreshGlobalToolOverrides(runtime: Pick<WebRuntime, "tools" | "toolSupport">): void;
 /** Bind only the foreground view; never stop work owned by another session. */
@@ -438,7 +460,7 @@ export declare class WebRepl {
                 steps: {
                     id: string;
                     title: string;
-                    status: "completed" | "running" | "failed";
+                    status: "running" | "completed" | "failed";
                 }[] | undefined;
             };
             pendingMessageCount: number;
@@ -566,7 +588,7 @@ export declare class WebRepl {
                 steps: {
                     id: string;
                     title: string;
-                    status: "completed" | "running" | "failed";
+                    status: "running" | "completed" | "failed";
                 }[] | undefined;
             };
             pendingMessageCount: number;
@@ -651,6 +673,12 @@ export declare class WebRepl {
     sessionPlugins(): {
         sessionId: string | undefined;
         busy: boolean;
+        items: never[];
+        pending?: undefined;
+    } | {
+        sessionId: string | undefined;
+        busy: boolean;
+        pending: boolean;
         items: {
             id: string;
             name: string;
@@ -791,6 +819,7 @@ export declare class WebRepl {
     private backgroundTasks;
     private detachRunningForeground;
     private reattachRunningSession;
+    private timedStatus;
     private reduce;
     private finalizeLiveLine;
     private finalizeThinkingLine;

package/dist/web/index.js

@@ -183,6 +183,9 @@ export async function createWebRuntime(options = {}) {
     };
     for (const tool of createSubagentTools(taskStore, resumeHandler))
         registerTool(tool, { source: "builtin" });
+    const pluginToolNames = new Set(pluginCatalog.flatMap(plugin => plugin.tools.map(tool => tool.name)));
+    options.reservePluginToolNames?.(tools.list(undefined, { includeDeferred: true }).filter(tool => !pluginToolNames.has(tool.name)).flatMap(tool => [tool.name, ...(tool.aliases ?? [])]).concat(toolCatalog.filter(tool => tool.source !== "plugin").map(tool => tool.name)));
+    agentRuntime.acquireTurnResources = (sessionId) => acquireWebPluginTurn(runtime, false, runtime.engine, sessionId);
     const globalToolOverrides = normalizeToolOverrides(options.globalToolOverrides, toolCatalog);
     const sessionToolOverrides = normalizeToolOverrides(options.sessionToolOverrides, toolCatalog);
     applyToolOverrides(tools, toolCatalog, globalToolOverrides, sessionToolOverrides);
@@ -196,7 +199,10 @@ export async function createWebRuntime(options = {}) {
         modelGateway,
         tools,
         contextManagerFactory: (cwd) => new DefaultContextManager({ cwd }),
-        refreshTools: () => {
+        acquireTurnResources: (engine) => acquireWebPluginTurn(runtime, true, engine),
+        refreshTools: (engine) => {
+            if (runtime)
+                refreshRuntimePlugins(runtime, engine);
             if (!options.resolveGlobalToolOverrides)
                 return;
             if (runtime)
@@ -239,14 +245,16 @@ export async function createWebRuntime(options = {}) {
         defaultReasoning: modelConfig?.defaultReasoning,
         envPath: process.env.NEO_ENV_FILE?.trim() ? path.resolve(process.env.NEO_ENV_FILE.trim()) : envLoad.userDotEnvPath,
         envNotice: envLoad.createdUserDotEnv ? formatCreatedEnvNotice(envLoad.userDotEnvPath) : undefined,
-        pluginSupport: pluginCatalog.length ? {
+        pluginSupport: {
+            resolveCatalog: options.resolveExternalPlugins,
+            acquire: options.acquirePluginSnapshot,
             catalog: pluginCatalog,
             overrides: pluginOverrides,
             basePromptSections: [...(options.externalPromptSections ?? [])],
             basePluginIds: [...(options.plugins ?? [])],
             persist: options.persistSessionPluginOverrides,
             resolve: options.resolveSessionPluginOverrides,
-        } : undefined,
+        },
         toolSupport: {
             catalog: toolCatalog,
             globalOverrides: globalToolOverrides,
@@ -259,6 +267,92 @@ export async function createWebRuntime(options = {}) {
     };
     return runtime;
 }
+/** Build first, publish only after all registrations validate. Never called by a child on the parent registry. */
+function buildPluginRegistry(runtime, catalog, overrides) {
+    const registry = runtime.tools.clone();
+    for (const plugin of runtime.pluginSupport?.catalog ?? [])
+        for (const tool of plugin.tools)
+            registry.unregister(tool.name);
+    const names = new Set(registry.names({ includeDisabled: true }));
+    for (const plugin of catalog)
+        for (const tool of plugin.tools) {
+            if (names.has(tool.name))
+                throw new Error(`duplicate plugin/host tool: ${tool.name}`);
+            names.add(tool.name);
+        }
+    for (const plugin of activeWebRuntimePlugins(catalog, overrides))
+        for (const tool of plugin.tools)
+            registry.register(tool);
+    const support = runtime.toolSupport;
+    if (support) {
+        const global = support.resolveGlobal?.() ?? support.globalOverrides;
+        const all = [...support.catalog.filter(tool => tool.source !== "plugin"), ...catalog.flatMap(plugin => plugin.tools.map(tool => ({ name: tool.name })))];
+        for (const tool of all)
+            registry.setEnabled(tool.name, support.sessionOverrides[tool.name] ?? global[tool.name] ?? isToolEnabledByDefault(tool.name));
+    }
+    return registry;
+}
+export function refreshRuntimePlugins(runtime, engine = runtime.engine) {
+    const support = runtime.pluginSupport;
+    if (!support)
+        return;
+    const catalog = normalizeWebRuntimePlugins(support.resolveCatalog?.() ?? support.catalog);
+    const overrides = normalizePluginOverrides(resolveRuntimePluginOverrides(runtime, engine), catalog);
+    const registry = buildPluginRegistry(runtime, catalog, overrides);
+    // Only plugin registrations change. Built-in objects (including task managers) retain identity.
+    for (const plugin of support.catalog)
+        for (const tool of plugin.tools)
+            runtime.tools.unregister(tool.name);
+    const active = activeWebRuntimePlugins(catalog, overrides);
+    for (const plugin of active)
+        for (const tool of plugin.tools) {
+            runtime.tools.register(tool);
+            runtime.tools.setEnabled(tool.name, registry.isEnabled(tool.name) === true);
+        }
+    support.catalog = catalog;
+    support.overrides = overrides;
+    support.pendingOverrides = undefined;
+    if (runtime.toolSupport)
+        runtime.toolSupport.catalog = [
+            ...runtime.toolSupport.catalog.filter(tool => tool.source !== "plugin"),
+            ...catalog.flatMap(plugin => plugin.tools.map(tool => ({ name: tool.name, source: "plugin", pluginId: plugin.id, pluginName: plugin.name, presentation: toolPresentationForSource(tool.name, "plugin") }))),
+        ];
+    engine.setRuntimePlugins([...support.basePluginIds, ...active.map(plugin => plugin.id)], [...support.basePromptSections, ...active.flatMap(plugin => plugin.promptSections ?? [])]);
+}
+function resolveRuntimePluginOverrides(runtime, engine, sessionId = engine.snapshot().session?.sessionId) {
+    const support = runtime.pluginSupport;
+    if (!support)
+        return {};
+    if (engine === runtime.engine && sessionId === engine.snapshot().session?.sessionId && support.pendingOverrides)
+        return support.pendingOverrides;
+    const resolved = sessionId ? support.resolve?.(sessionId) : undefined;
+    // Web hosts publish in-memory settings synchronously. Legacy async embedders retain loaded overrides.
+    if (resolved && !(resolved instanceof Promise))
+        return resolved;
+    if (resolved instanceof Promise)
+        void resolved.catch(() => { });
+    return support.overrides;
+}
+/** Children acquire independent tools/prompts; they never refresh the parent's in-flight context. */
+function acquireWebPluginTurn(runtime, main, engine = runtime.engine, sessionId) {
+    if (main) {
+        refreshRuntimePlugins(runtime, engine);
+        refreshGlobalToolOverrides(runtime);
+    }
+    const support = runtime.pluginSupport;
+    const overrides = resolveRuntimePluginOverrides(runtime, engine, sessionId);
+    const snapshot = support?.acquire?.(overrides);
+    try {
+        const catalog = normalizeWebRuntimePlugins(snapshot?.plugins ?? support?.resolveCatalog?.() ?? support?.catalog);
+        const tools = buildPluginRegistry(runtime, catalog, overrides);
+        return { tools, release: snapshot?.release ?? (() => { }),
+            ...(!main ? { promptSections: [...(support?.basePromptSections ?? []), ...activeWebRuntimePlugins(catalog, overrides).flatMap(plugin => plugin.promptSections ?? [])] } : {}) };
+    }
+    catch (error) {
+        snapshot?.release();
+        throw error;
+    }
+}
 function normalizeWebRuntimePlugins(value) {
     if (!Array.isArray(value))
         return [];
@@ -545,7 +639,7 @@ export class WebRepl {
         }
         return {
             lines: this.lines.map(line => line.toolError ? { ...line, toolError: this.runtime.engine.redactDisplayValue?.(line.toolError) ?? line.toolError } : line),
-            status: this.status,
+            status: this.timedStatus(),
             busy: this.busy,
             queuedInput: this.queuedInput,
             backgroundTaskCount: backgroundTasks.length,
@@ -567,6 +661,7 @@ export class WebRepl {
         return this.buildRuntimeContext(this.runtimeContextRevision);
     }
     sessionPlugins() {
+        this.runtime.engine.refreshToolsIfIdle();
         const support = this.runtime.pluginSupport;
         const sessionId = this.runtime.engine.snapshot().session?.sessionId;
         if (!support)
@@ -574,8 +669,9 @@ export class WebRepl {
         return {
             sessionId,
             busy: this.busy,
-            items: support.catalog.map((plugin) => {
-                const override = support.overrides[plugin.id];
+            pending: Boolean(support.pendingOverrides),
+            items: (support.resolveCatalog?.() ?? support.catalog).map((plugin) => {
+                const override = (support.pendingOverrides ?? support.overrides)[plugin.id];
                 return {
                     id: plugin.id,
                     name: plugin.name,
@@ -684,14 +780,12 @@ export class WebRepl {
         await this.applySessionToolOverrides(await support.resolveSession(sessionId), false);
     }
     async setSessionPlugins(value) {
-        if (this.busy)
-            return actionFailure("PLUGIN_UPDATE_BLOCKED", "cannot change session plugins while a response is running");
         if (!isRecord(value))
             return actionFailure("INVALID_REQUEST", "plugin overrides must be an object");
         const support = this.runtime.pluginSupport;
         if (!support)
             return actionFailure("PLUGIN_NOT_CONFIGURED", "web plugins are not configured");
-        const available = new Set(support.catalog.map((plugin) => plugin.id));
+        const available = new Set((support.resolveCatalog?.() ?? support.catalog).map((plugin) => plugin.id));
         const overrides = {};
         for (const [id, mode] of Object.entries(value)) {
             if (!available.has(id))
@@ -781,22 +875,18 @@ export class WebRepl {
         const support = this.runtime.pluginSupport;
         if (!support)
             return;
-        const normalized = normalizePluginOverrides(overrides, support.catalog);
-        for (const plugin of support.catalog)
-            for (const tool of plugin.tools)
-                this.runtime.tools.unregister(tool.name);
-        const activePlugins = activeWebRuntimePlugins(support.catalog, normalized);
-        for (const plugin of activePlugins)
-            for (const tool of plugin.tools)
-                this.runtime.tools.register(tool);
-        support.overrides = normalized;
-        const toolSupport = this.runtime.toolSupport;
-        if (toolSupport)
-            applyToolOverrides(this.runtime.tools, toolSupport.catalog, toolSupport.globalOverrides, toolSupport.sessionOverrides);
-        this.runtime.engine.setRuntimePlugins([...support.basePluginIds, ...activePlugins.map((plugin) => plugin.id)], [...support.basePromptSections, ...activePlugins.flatMap((plugin) => plugin.promptSections ?? [])]);
+        const catalog = normalizeWebRuntimePlugins(support.resolveCatalog?.() ?? support.catalog);
+        const normalized = normalizePluginOverrides(overrides, catalog);
+        buildPluginRegistry(this.runtime, catalog, normalized);
         const sessionId = this.runtime.engine.snapshot().session?.sessionId;
         if (persist && sessionId && support.persist)
             await support.persist(sessionId, normalized);
+        support.pendingOverrides = normalized;
+        if (this.busy) {
+            this.publishRuntimeContext();
+            return;
+        }
+        refreshRuntimePlugins(this.runtime);
         const metrics = await this.runtime.engine.contextMetrics();
         this.runtime.initialMetrics = metrics;
         this.setStatus({ ...this.status, metrics, activityTick: this.status.activityTick + 1 });
@@ -1406,6 +1496,14 @@ export class WebRepl {
         this.setBusy(true);
         this.setStatus({ ...this.status, phase: "running", detail: "working" });
     }
+    timedStatus() {
+        const records = this.runtime.engine.getTimingRecords?.() ?? [];
+        if (records.length === 0)
+            return this.status;
+        const queryTiming = records.filter(record => record.kind === "query").at(-1);
+        return { ...this.status, queryTiming,
+            toolTimings: records.filter(record => record.kind === "tool" && record.runId === queryTiming?.runId) };
+    }
     reduce(event) {
         this.status = reduceStatus(this.status, event);
         if (event.type === "usage")
@@ -1566,6 +1664,18 @@ export class WebRepl {
     }
     handleEvent(event) {
         this.reduce(event);
+        if (event.type === "timing.updated") {
+            if (event.timing.kind === "tool") {
+                const line = this.lines.find(item => item.timing?.id === event.timing.id)
+                    ?? this.lines.find(item => item.id === this.liveToolLineIds.get(event.timing.toolUseId));
+                if (line) {
+                    this.lines = this.lines.map(item => item.id === line.id ? { ...item, timing: event.timing } : item);
+                    this.queueDeltaOperation({ type: "line.patch", id: line.id, patch: { timing: event.timing } });
+                }
+            }
+            this.queueDeltaStatus();
+            return;
+        }
         if (event.type === "message" && this.matchesPendingUserImageEcho(event.message)) {
             const messageId = this.pendingUserImageEchoMessageId;
             this.pendingUserImageEchoIds = undefined;
@@ -1574,7 +1684,7 @@ export class WebRepl {
             this.broadcastSync();
             return;
         }
-        if (event.type === "tool_call.delta") {
+        if (event.type === "tool_call.started" || event.type === "tool_call.delta") {
             this.queueDeltaStatus();
             return;
         }
@@ -1819,7 +1929,7 @@ export class WebRepl {
         this.activeAbortController = abortController;
         this.interruptArmed = false;
         this.setBusy(true);
-        this.setStatus({ ...this.status, phase: "running", detail: "working", usage: undefined, streamedOutputTokens: 0, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined });
+        this.setStatus({ ...this.status, phase: "running", detail: "working", modelOutput: undefined, usage: undefined, streamedOutputTokens: 0, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined });
         const engine = this.runtime.engine;
         try {
             for await (const event of engine.sendUserText(promptPayload.text, {
@@ -1833,7 +1943,7 @@ export class WebRepl {
                 if (this.runtime.engine !== engine)
                     continue;
                 if (this.suppressReattachedStreaming.has(engine)) {
-                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage") {
+                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage" || event.type === "timing.updated") {
                         if (event.type === "message" || event.type === "terminal" || event.type === "error")
                             this.suppressReattachedStreaming.delete(engine);
                         this.handleEvent(event);
@@ -2003,7 +2113,7 @@ export class WebRepl {
             protocolVersion: 2,
             sessionId: this.runtime.engine.snapshot().session?.sessionId,
             operations,
-            status: this.status,
+            status: this.timedStatus(),
         };
         for (const subscriber of this.subscribers)
             this.send(subscriber, "delta", payload);
@@ -2377,6 +2487,14 @@ function restoredHistoryLines(runtime) {
             historyToolLineIndexes.set(line.toolUseId, lines.length - 1);
         return lines.length;
     };
+    const toolTimings = new Map();
+    for (const record of runtime.engine.getTimingRecords?.() ?? []) {
+        if (record.kind !== "tool" || !record.toolUseId)
+            continue;
+        const matches = toolTimings.get(record.toolUseId) ?? [];
+        matches.push(record);
+        toolTimings.set(record.toolUseId, matches);
+    }
     const entries = runtime.engine.getDisplayEntries();
     let lastCompactionIndex = -1;
     for (let index = entries.length - 1; index >= 0; index -= 1) {
@@ -2397,6 +2515,12 @@ function restoredHistoryLines(runtime) {
         const report = entry.report ?? legacyCompactionReport(entry.reason);
         append(compactionLine(report, entry.createdAt, entryIndex === lastCompactionIndex));
     }
+    // Legacy histories can reuse call IDs. Ambiguous associations stay unknown.
+    for (const line of lines) {
+        const matches = line.toolUseId ? toolTimings.get(line.toolUseId) : undefined;
+        if (matches?.length === 1)
+            line.timing = matches[0];
+    }
     return lines;
 }
 function initialStatus(runtime, metrics = runtime.initialMetrics) {
@@ -2544,7 +2668,7 @@ function toolStreamStepStatus(phase) {
 }
 function reduceStatus(status, event) {
     if (event.type === "state")
-        return { ...status, phase: event.phase, detail: event.detail, currentTool: event.phase === "running_tools" ? status.currentTool : undefined, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
+        return { ...status, phase: event.phase, detail: event.detail, modelOutput: undefined, currentTool: event.phase === "running_tools" ? status.currentTool : undefined, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
     if (event.type === "context.compacted")
         return { ...status, phase: "compacting", detail: formatCompactionReportSummary(event.compaction), activityTick: status.activityTick + 1 };
     if (event.type === "context.metrics")
@@ -2552,21 +2676,23 @@ function reduceStatus(status, event) {
     if (event.type === "usage")
         return { ...status, usage: event.usage, inputTokenUpdatedAt: event.usage.inputTokens !== undefined ? Date.now() : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.usage.outputTokens !== undefined ? Date.now() : status.outputTokenUpdatedAt, activityTick: status.activityTick + 1 };
     if (event.type === "assistant.delta")
-        return { ...status, phase: "calling_model", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: { kind: "text" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "thinking.delta")
-        return { ...status, phase: "thinking", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "thinking", modelOutput: undefined, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+    if (event.type === "tool_call.started")
+        return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name }, activityTick: status.activityTick + 1 };
     if (event.type === "tool_call.delta")
-        return { ...status, phase: "calling_model", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.argumentsDelta), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name ?? (status.modelOutput?.kind === "tool_call" && status.modelOutput.callId === event.callId ? status.modelOutput.name : undefined) }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.argumentsDelta), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "retrying")
-        return { ...status, phase: "calling_model", detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: undefined, detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
     if (event.type === "tool.started")
-        return { ...status, phase: "running_tools", currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: Date.now() }, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "running_tools", modelOutput: undefined, currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: Date.now() }, activityTick: status.activityTick + 1 };
     if (event.type === "tool.progress")
         return { ...status, phase: "running_tools", detail: event.progress.message || status.detail, currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: status.currentTool?.id === event.toolUse.id ? status.currentTool.startedAt : Date.now() }, activityTick: status.activityTick + 1 };
     if (event.type === "tool.result.available" || event.type === "tool.finished" || event.type === "tool.batch.completed")
         return { ...status, currentTool: "toolUse" in event && status.currentTool?.id === event.toolUse.id ? undefined : status.currentTool, activityTick: status.activityTick + 1 };
     if (event.type === "terminal")
-        return { ...status, phase: "stopped", detail: event.reason, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "stopped", modelOutput: undefined, detail: event.reason, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
     if (event.type === "message" || event.type === "error")
         return { ...status, activityTick: status.activityTick + 1 };
     return status;