neoctl 0.2.31 → 0.2.32

package/dist/web/index.js

@@ -14,6 +14,7 @@ import { findModelMetadata, loadModelCatalog, reasoningEffortsForModel, resolveC
 import { CommunicationLogger, LoggingModelGateway } from "../model/communication-logger.js";
 import { createModelGatewayFromConfig, createModelGatewayFromProcessEnv } from "../model/provider-factory.js";
 import { ToolRegistry } from "../tools/registry.js";
+import { builtinToolPresentation, toolPresentationForSource } from "../tools/tool-catalog.js";
 import { editTool, writeTool } from "../tools/builtins/edit-tool.js";
 import { createExecTool, createWriteStdinTool } from "../tools/builtins/exec-tool.js";
 import { ExecProcessManager } from "../tools/builtins/exec-process-manager.js";
@@ -24,7 +25,7 @@ import { planTool } from "../tools/builtins/plan-tool.js";
 import { createOpenAIImageGenerationTool } from "../tools/builtins/image-generation-tool.js";
 import { createLoadImageTool } from "../tools/builtins/image-loader-tool.js";
 import { createAgentTool, resumeAgentTask } from "../agents/agent-tool.js";
-import { createTaskTools } from "../tasks/task-tools.js";
+import { createSubagentTools } from "../tasks/subagent-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
 import { parseReplCommand, helpText, replCommandDefinitions } from "../repl/commands.js";
 import { writeSessionMarkdownExport } from "../session/session-export.js";
@@ -136,7 +137,7 @@ export async function createWebRuntime(options = {}) {
         if (catalogedToolNames.has(tool.name))
             return;
         catalogedToolNames.add(tool.name);
-        toolCatalog.push({ name: tool.name, ...item });
+        toolCatalog.push({ name: tool.name, presentation: toolPresentationForSource(tool.name, item.source), ...item });
     };
     const registerTool = (tool, item) => {
         tools.register(tool);
@@ -175,7 +176,7 @@ export async function createWebRuntime(options = {}) {
         };
         return resumeAgentTask(taskId, directive, agentRuntime, taskStore, dummyContext);
     };
-    for (const tool of createTaskTools(taskStore, resumeHandler))
+    for (const tool of createSubagentTools(taskStore, resumeHandler))
         registerTool(tool, { source: "builtin" });
     const globalToolOverrides = normalizeToolOverrides(options.globalToolOverrides, toolCatalog);
     const sessionToolOverrides = normalizeToolOverrides(options.sessionToolOverrides, toolCatalog);
@@ -290,7 +291,7 @@ function createTaskNotificationSource(taskStore) {
     };
 }
 function syncImageGenerationTool(runtime, provider) {
-    runtime.tools.unregister("image2");
+    runtime.tools.unregister("image_create");
     if (provider === "openai")
         runtime.tools.register(createOpenAIImageGenerationTool());
 }
@@ -1004,7 +1005,7 @@ export class WebRepl {
         this.pendingUserImageEchoIds = undefined;
         this.pendingUserImageEchoMessageId = undefined;
         this.finalizeForegroundView();
-        this.finalizeLiveToolLines();
+        this.cancelLiveToolLines(reason);
         this.busy = false;
         this.status = { ...this.status, phase: "ready", detail: undefined, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined };
         this.broadcastSync();
@@ -1133,6 +1134,140 @@ export class WebRepl {
             this.finalizeLiveLine(id);
         this.liveToolLineIds.clear();
     }
+    cancelLiveToolLines(reason) {
+        for (const id of this.liveToolLineIds.values()) {
+            const line = this.lines.find((item) => item.id === id);
+            const steps = (line?.toolStream?.steps ?? []).map((step) => step.status === "running" ? { ...step, status: "failed", phase: "cancelled" } : step);
+            this.lines = this.lines.map((item) => item.id === id ? { ...item, live: false, kind: "error", titleStatus: "failure", bodyTitle: reason, toolStream: { ...item.toolStream, phase: "cancelled", message: reason, steps } } : item);
+            this.queueDeltaOperation({ type: "line.patch", id, patch: { live: false, kind: "error", titleStatus: "failure", bodyTitle: reason, toolStream: { ...line?.toolStream, phase: "cancelled", message: reason, steps } } });
+        }
+        this.liveToolLineIds.clear();
+    }
+    patchLiveToolLine(toolUseId, patch) {
+        const id = this.liveToolLineIds.get(toolUseId);
+        if (id === undefined)
+            return;
+        const line = this.lines.find((item) => item.id === id);
+        if (!line)
+            return;
+        this.lines = this.lines.map((item) => item.id === id ? { ...item, ...patch } : item);
+        this.queueDeltaOperation({ type: "line.patch", id, patch });
+    }
+    applyToolProgress(event) {
+        const id = this.liveToolLineIds.get(event.toolUse.id);
+        if (id === undefined)
+            return;
+        const line = this.lines.find((item) => item.id === id);
+        if (!line)
+            return;
+        const progress = event.progress;
+        const previousStream = line.toolStream ?? {};
+        if (progress.sequence !== undefined && previousStream.sequence !== undefined && progress.sequence <= previousStream.sequence)
+            return;
+        const channel = progress.channel ?? inferToolStreamChannel(progress.data);
+        const operation = progress.operation ?? (channel === "stdout" || channel === "stderr" ? "append" : "replace");
+        const stream = { ...previousStream };
+        stream.channel = channel;
+        stream.phase = progress.phase;
+        stream.sequence = progress.sequence ?? stream.sequence;
+        if (progress.progress) {
+            stream.current = progress.progress.current;
+            stream.total = progress.progress.total;
+            stream.unit = progress.progress.unit;
+        }
+        const terminalDelta = terminalOutputDelta(progress.data);
+        const textDelta = toolStreamTextDelta(progress.data);
+        if (terminalDelta) {
+            const key = terminalDelta.stream === "stderr" ? "stderr" : "stdout";
+            stream[key] = operation === "replace"
+                ? trimToolStreamText(terminalDelta.text, 40_000)
+                : appendToolStreamText(stream[key], terminalDelta.text, 40_000);
+            stream.chunks = appendToolStreamChunk(stream.chunks, progress.sequence, key, terminalDelta.text, operation);
+        }
+        else if ((channel === "stdout" || channel === "stderr") && textDelta !== undefined) {
+            stream[channel] = operation === "replace"
+                ? trimToolStreamText(textDelta, 40_000)
+                : appendToolStreamText(stream[channel], textDelta, 40_000);
+            stream.chunks = appendToolStreamChunk(stream.chunks, progress.sequence, channel, textDelta, operation);
+        }
+        else if ((channel === "patch" || channel === "artifact") && textDelta !== undefined) {
+            stream.output = operation === "replace"
+                ? trimToolStreamText(textDelta, 40_000)
+                : appendToolStreamText(stream.output, textDelta, 40_000);
+            stream.chunks = appendToolStreamChunk(stream.chunks, progress.sequence, "output", textDelta, operation);
+            stream.message = progress.message;
+        }
+        else if (channel === "item") {
+            const key = progress.key || progress.phase || `step-${progress.sequence ?? Date.now()}`;
+            const steps = [...(stream.steps ?? [])];
+            const index = steps.findIndex((step) => step.key === key);
+            if (operation === "remove") {
+                if (index >= 0)
+                    steps.splice(index, 1);
+            }
+            else {
+                const status = toolStreamStepStatus(progress.phase);
+                const message = operation === "append" && index >= 0
+                    ? `${steps[index].message}${progress.message}`
+                    : progress.message;
+                const stepToolName = childToolName(progress.data) ?? steps[index]?.toolName;
+                const step = {
+                    key,
+                    message,
+                    toolName: stepToolName,
+                    toolLabel: stepToolName ? toolTitle(stepToolName, "running") : steps[index]?.toolLabel,
+                    status,
+                    phase: progress.phase,
+                    sequence: progress.sequence,
+                };
+                if (index >= 0)
+                    steps[index] = step;
+                else
+                    steps.push(step);
+            }
+            stream.steps = steps.slice(-24);
+            stream.message = progress.message;
+        }
+        else if (operation === "append") {
+            stream.message = `${stream.message ?? ""}${progress.message}`;
+        }
+        else if (operation === "remove") {
+            stream.message = undefined;
+        }
+        else {
+            stream.message = progress.message;
+        }
+        this.patchLiveToolLine(event.toolUse.id, { toolStream: stream });
+    }
+    applyAvailableToolResult(event) {
+        const liveLineId = this.liveToolLineIds.get(event.toolUse.id);
+        if (liveLineId === undefined)
+            return;
+        const liveLine = this.lines.find((item) => item.id === liveLineId);
+        if (!liveLine)
+            return;
+        let replacement;
+        for (const message of event.messages) {
+            renderToolResultMessage(message, (line, toolUseId) => {
+                if (toolUseId === event.toolUse.id)
+                    replacement = line;
+                return liveLineId;
+            }, runtimeToolResultPresenter(this.runtime));
+        }
+        const steps = (liveLine.toolStream?.steps ?? []).map((step) => step.status === "running" ? { ...step, status: event.ok ? "completed" : "failed" } : step);
+        if (replacement) {
+            this.replaceLine(liveLineId, {
+                ...replacement,
+                live: false,
+                presentationLevel: mergePresentationLevel(replacement.presentationLevel, liveLine.presentationLevel),
+                toolDisplay: mergeToolDisplays(replacement.toolDisplay, liveLine.toolDisplay),
+                toolStream: { ...liveLine.toolStream, steps, message: liveLine.toolStream?.message },
+            });
+        }
+        else {
+            this.replaceLine(liveLineId, { live: false, titleStatus: event.ok ? "success" : "failure", toolStream: { ...liveLine.toolStream, steps } });
+        }
+    }
     handleEvent(event) {
         this.reduce(event);
         if (event.type === "message" && this.matchesPendingUserImageEcho(event.message)) {
@@ -1169,6 +1304,18 @@ export class WebRepl {
             this.appendLineText(id, event.text);
             return;
         }
+        if (event.type === "tool.progress") {
+            this.applyToolProgress(event);
+            return;
+        }
+        if (event.type === "tool.result.available") {
+            this.applyAvailableToolResult(event);
+            return;
+        }
+        if (event.type === "tool.batch.completed") {
+            this.broadcastSync();
+            return;
+        }
         if (event.type === "message") {
             let replacedStreamingContent = false;
             if (event.message.role === "assistant" && this.assistantLineId !== undefined) {
@@ -1199,10 +1346,16 @@ export class WebRepl {
             if (event.message.role === "tool_result") {
                 renderToolResultMessage(event.message, (line, toolUseId) => {
                     const liveLineId = this.liveToolLineIds.get(toolUseId);
-                    if (liveLineId === undefined)
+                    if (liveLineId === undefined) {
+                        const existing = this.lines.find((item) => item.toolUseId === toolUseId);
+                        if (existing) {
+                            this.replaceLine(existing.id, { ...line, toolStream: existing.toolStream, presentationLevel: mergePresentationLevel(line.presentationLevel, existing.presentationLevel), toolDisplay: mergeToolDisplays(line.toolDisplay, existing.toolDisplay) });
+                            return existing.id;
+                        }
                         return this.append(line);
+                    }
                     const liveLine = this.lines.find((item) => item.id === liveLineId);
-                    this.replaceLine(liveLineId, { ...line, presentationLevel: mergePresentationLevel(line.presentationLevel, liveLine?.presentationLevel), toolDisplay: mergeToolDisplays(line.toolDisplay, liveLine?.toolDisplay) });
+                    this.replaceLine(liveLineId, { ...line, toolStream: liveLine?.toolStream, presentationLevel: mergePresentationLevel(line.presentationLevel, liveLine?.presentationLevel), toolDisplay: mergeToolDisplays(line.toolDisplay, liveLine?.toolDisplay) });
                     this.liveToolLineIds.delete(toolUseId);
                     return liveLineId;
                 }, runtimeToolResultPresenter(this.runtime));
@@ -1233,10 +1386,8 @@ export class WebRepl {
         }
         if (event.type === "tool.finished") {
             const id = this.liveToolLineIds.get(event.toolUse.id);
-            if (id !== undefined) {
+            if (id !== undefined)
                 this.finalizeLiveLine(id);
-                this.liveToolLineIds.delete(event.toolUse.id);
-            }
             return;
         }
         if (event.type === "terminal") {
@@ -1500,6 +1651,7 @@ export class WebRepl {
         return createWebRuntimeContextPayload(snapshot, {
             revision,
             sessionId: this.runtime.engine.snapshot().session?.sessionId,
+            toolPresentations: Object.fromEntries((this.runtime.toolSupport?.catalog ?? []).map((tool) => [tool.name, tool.presentation])),
         });
     }
     publishRuntimeContext(targets) {
@@ -1971,6 +2123,71 @@ function pushTextBlock(blocks, text) {
     else
         blocks.push({ type: "text", text });
 }
+function inferToolStreamChannel(data) {
+    if (data && typeof data === "object" && !Array.isArray(data) && data.type === "terminal.output.delta") {
+        return data.stream === "stderr" ? "stderr" : "stdout";
+    }
+    return "state";
+}
+function terminalOutputDelta(data) {
+    if (!data || typeof data !== "object" || Array.isArray(data))
+        return undefined;
+    const record = data;
+    if (record.type !== "terminal.output.delta" || typeof record.text !== "string")
+        return undefined;
+    return { stream: record.stream === "stderr" ? "stderr" : "stdout", text: record.text };
+}
+function toolStreamTextDelta(data) {
+    if (typeof data === "string")
+        return data;
+    if (!data || typeof data !== "object" || Array.isArray(data))
+        return undefined;
+    const record = data;
+    for (const value of [record.text, record.delta, record.patch, record.content]) {
+        if (typeof value === "string")
+            return value;
+    }
+    return undefined;
+}
+function childToolName(data) {
+    if (!data || typeof data !== "object" || Array.isArray(data))
+        return undefined;
+    const childEvent = data.child_event;
+    if (!childEvent || typeof childEvent !== "object" || Array.isArray(childEvent))
+        return undefined;
+    const toolUse = childEvent.toolUse;
+    if (!toolUse || typeof toolUse !== "object" || Array.isArray(toolUse))
+        return undefined;
+    return stringValue(toolUse.name);
+}
+function appendToolStreamChunk(chunks, sequence, stream, text, operation) {
+    const next = operation === "replace" ? [] : [...(chunks ?? [])];
+    next.push({ sequence: sequence ?? (next.at(-1)?.sequence ?? 0) + 1, stream, text });
+    let total = 0;
+    const retained = [];
+    for (let index = next.length - 1; index >= 0; index -= 1) {
+        const chunk = next[index];
+        if (total >= 40_000)
+            break;
+        retained.push(chunk);
+        total += chunk.text.length;
+    }
+    return retained.reverse();
+}
+function trimToolStreamText(value, maxChars) {
+    return value.length <= maxChars ? value : value.slice(value.length - maxChars);
+}
+function appendToolStreamText(current, delta, maxChars) {
+    return trimToolStreamText(`${current ?? ""}${delta}`, maxChars);
+}
+function toolStreamStepStatus(phase) {
+    const normalized = phase?.toLowerCase() ?? "";
+    if (normalized.includes("fail") || normalized.includes("error") || normalized.includes("cancel") || normalized.includes("abort"))
+        return "failed";
+    if (normalized.includes("complete") || normalized.includes("finish") || normalized.includes("done") || normalized.includes("success"))
+        return "completed";
+    return "running";
+}
 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 };
@@ -1990,8 +2207,10 @@ function reduceStatus(status, event) {
         return { ...status, phase: "calling_model", 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 };
-    if (event.type === "tool.finished")
-        return { ...status, currentTool: status.currentTool?.id === event.toolUse.id ? undefined : status.currentTool, 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 };
     if (event.type === "message" || event.type === "error")
@@ -2490,13 +2709,14 @@ function thinkingLine(text, live = false) {
     return { kind: "thinking", title: titleForKind("thinking"), text, previewStyle: "summary", summaryMaxLines: THINKING_SUMMARY_MAX_LINES, live };
 }
 function formatToolUse(toolUse) {
+    const toolPresentation = toolPresentationForSource(toolUse.name);
     const presentationLevel = toolPresentationLevel(toolUse.name, toolUse.input);
-    if (toolUse.name === "plan" && isWebPlanPayload(toolUse.input))
-        return { kind: "tool", toolName: toolUse.name, title: toolTitle(toolUse.name, "running"), bodyTitle: webPlanBodyTitle(toolUse.input), text: serializeWebPlanPayload(toolUse.input), presentationLevel, collapsible: true };
-    if (toolUse.name === "image2")
-        return { kind: "tool", toolName: toolUse.name, toolUseId: toolUse.id, title: toolTitle(toolUse.name, "running"), bodyTitle: "图片模型处理中", text: JSON.stringify(toolUse.input ?? {}, null, 2), format: "plain", previewStyle: "summary", presentationLevel: "primary", collapsible: true };
+    if (toolUse.name === "plan_update" && isWebPlanPayload(toolUse.input))
+        return { kind: "tool", toolName: toolUse.name, toolPresentation, title: toolPresentation.label, bodyTitle: webPlanBodyTitle(toolUse.input), text: serializeWebPlanPayload(toolUse.input), presentationLevel, collapsible: true };
+    if (toolUse.name === "image_create")
+        return { kind: "tool", toolName: toolUse.name, toolPresentation, toolUseId: toolUse.id, title: toolPresentation.label, bodyTitle: "图片模型处理中", text: JSON.stringify(toolUse.input ?? {}, null, 2), format: "plain", previewStyle: "summary", presentationLevel: "primary", collapsible: true };
     const summary = summarizeToolUse(toolUse.name, toolUse.input);
-    return { kind: "tool", toolName: toolUse.name, toolUseId: toolUse.id, title: toolTitle(toolUse.name, "running"), bodyTitle: summary.bodyTitle, text: summary.text, toolDisplay: buildToolUseDisplay(toolUse.name, toolUse.input), previewStyle: "summary", presentationLevel, collapsible: true };
+    return { kind: "tool", toolName: toolUse.name, toolPresentation, toolUseId: toolUse.id, title: toolPresentation.label, bodyTitle: summary.bodyTitle, text: summary.text, toolDisplay: buildToolUseDisplay(toolUse.name, toolUse.input), previewStyle: "summary", presentationLevel, collapsible: true };
 }
 function formatToolResultLine(toolName, output, ok, presentToolResult) {
     const presentation = normalizeToolResultPresentation(presentToolResult?.(toolName, output, ok));
@@ -2507,6 +2727,7 @@ function formatToolResultLine(toolName, output, ok, presentToolResult) {
     return {
         kind: ok ? "tool" : "error",
         toolName,
+        toolPresentation: toolPresentationForSource(toolName),
         title: presentation?.title ?? toolTitle(toolName, "finished"),
         bodyTitle: presentation?.bodyTitle ?? formatted.bodyTitle,
         titleStatus: ok ? "success" : "failure",
@@ -2522,7 +2743,7 @@ function formatToolResultLine(toolName, output, ok, presentToolResult) {
     };
 }
 function toolPresentationLevel(toolName, payload) {
-    if (toolName === "image2")
+    if (toolName === "image_create")
         return "primary";
     if (!isRecord(payload))
         return "process";
@@ -2616,40 +2837,7 @@ function safeResourceUrl(value) {
     return /^(?:https?:\/\/|\/)/i.test(value) && !/^\/\//.test(value);
 }
 function toolTitle(toolName, _phase) {
-    const labels = {
-        agent: "子任务",
-        edit: "编辑文件",
-        exec_command: "执行命令",
-        write_stdin: "终端交互",
-        expose_downloads: "文件下载",
-        grep: "搜索文本",
-        image2: "图片生成",
-        image_note: "记录图片",
-        list: "列出文件",
-        load_image: "读取图片",
-        plan: "任务计划",
-        read: "读取文件",
-        search: "网络搜索",
-        write: "写入文件",
-        SendMessage: "发送协作消息",
-        sendmessage: "发送协作消息",
-        TaskGet: "读取后台任务",
-        taskget: "读取后台任务",
-        TaskList: "后台任务列表",
-        tasklist: "后台任务列表",
-        TaskOutput: "读取任务输出",
-        taskoutput: "读取任务输出",
-        TaskResume: "继续后台任务",
-        taskresume: "继续后台任务",
-        TaskStop: "停止后台任务",
-        taskstop: "停止后台任务",
-        multi_tool_use: "并行执行工具",
-        secret_list: "密钥列表",
-        secret_info: "查看密钥",
-        secret_request: "申请密钥",
-        agent_report: "子任务报告",
-    };
-    return labels[toolName] ?? toolName;
+    return builtinToolPresentation(toolName)?.label ?? toolName;
 }
 function summarizeToolUse(toolName, input) {
     const purpose = toolUsePurpose(toolName, input);
@@ -2664,17 +2852,30 @@ function toolUsePurpose(toolName, input) {
     const description = typeof input.description === "string" ? input.description.trim() : "";
     if (description)
         return description;
+    const taskId = stringValue(input.task_id);
+    if (toolName === "subagent_output")
+        return taskId ? `读取子任务 ${taskId} 的输出` : "读取子任务输出";
+    if (toolName === "subagent_list")
+        return "查看子任务状态";
+    if (toolName === "subagent_get")
+        return taskId ? `查看子任务 ${taskId}` : "查看子任务";
+    if (toolName === "subagent_stop")
+        return taskId ? `停止子任务 ${taskId}` : "停止子任务";
+    if (toolName === "subagent_resume")
+        return taskId ? `恢复子任务 ${taskId}` : "恢复子任务";
+    if (toolName === "subagent_message")
+        return stringValue(input.target) ? `向 ${stringValue(input.target)} 发送消息` : "发送子任务消息";
     if (toolName === "expose_downloads")
         return "准备网页下载链接";
-    if (toolName === "read" && typeof input.path === "string")
+    if (toolName === "file_read" && typeof input.path === "string")
         return `读取 ${path.basename(input.path)}`;
-    if (toolName === "list" && typeof input.path === "string")
+    if (toolName === "file_list" && typeof input.path === "string")
         return `查看 ${input.path}`;
-    if (toolName === "grep" && typeof input.query === "string")
+    if (toolName === "file_search" && typeof input.query === "string")
         return `搜索 ${input.query}`;
-    if (toolName === "write" && typeof input.path === "string")
+    if (toolName === "file_write" && typeof input.path === "string")
         return `写入 ${path.basename(input.path)}`;
-    if (toolName === "edit" && typeof input.path === "string")
+    if (toolName === "file_edit" && typeof input.path === "string")
         return `修改 ${path.basename(input.path)}`;
     return undefined;
 }
@@ -2730,35 +2931,35 @@ function normalizeDisplayText(value) {
 }
 function buildToolUseDisplay(toolName, input) {
     const data = isRecord(input) ? input : {};
-    const purpose = stringValue(data.description);
-    const subject = toolName === "exec_command" ? undefined : toolDisplaySubject(toolName, data);
+    const purpose = toolUsePurpose(toolName, input);
+    const subject = toolName === "terminal_run" ? undefined : toolDisplaySubject(toolName, data);
     const facts = [];
     const previews = [];
-    if (toolName === "exec_command")
+    if (toolName === "terminal_run")
         pushToolPreview(previews, "命令", "code", data.cmd);
-    else if (toolName === "write_stdin") {
+    else if (toolName === "terminal_control") {
         pushToolFact(facts, "会话", data.session_id, true);
         pushToolFact(facts, "输入", data.chars, true);
     }
-    else if (toolName === "grep")
+    else if (toolName === "file_search")
         pushToolFact(facts, "范围", data.path, true);
-    else if (toolName === "load_image")
+    else if (toolName === "image_inspect")
         pushToolFact(facts, "图片", arrayLabel(data.imageRefs), true);
-    else if (toolName === "image2") {
+    else if (toolName === "image_create") {
         pushToolFact(facts, "模式", data.mode === "edit" ? "编辑" : "生成");
         pushToolFact(facts, "名称", data.semanticName);
     }
     else if (toolName === "expose_downloads")
         pushToolFact(facts, "文件", arrayLabel(data.paths), true);
-    else if (toolName === "SendMessage" || toolName.toLowerCase() === "sendmessage")
+    else if (toolName === "subagent_message")
         pushToolFact(facts, "接收方", data.target);
-    else if (toolName.toLowerCase().startsWith("task"))
+    else if (toolName.startsWith("subagent_"))
         pushToolFact(facts, "任务", data.task_id, true);
     else if (toolName.startsWith("secret_")) {
         pushToolFact(facts, "密钥", data.key, true);
         pushToolFact(facts, "用途", data.reason);
     }
-    else if (toolName === "agent") {
+    else if (toolName === "subagent_run") {
         pushToolFact(facts, "任务", data.description ?? data.prompt);
         pushToolFact(facts, "类型", data.subagent_type ?? data.mode);
     }
@@ -2770,7 +2971,7 @@ function buildToolResultDisplay(toolName, output, ok) {
     const previews = [];
     let subject = toolDisplaySubject(toolName, data);
     let purpose = stringValue(data.description);
-    if ((toolName === "edit" || toolName === "write") && isEditToolOutput(data)) {
+    if ((toolName === "file_edit" || toolName === "file_write") && isEditToolOutput(data)) {
         subject = data.path;
         pushToolPreview(previews, undefined, "diff", compactEditDiff(data));
     }
@@ -2782,43 +2983,43 @@ function buildToolResultDisplay(toolName, output, ok) {
         if (outputText)
             pushToolPreview(previews, data.stderr ? "输出 / 错误" : "输出", "code", outputText);
         if (data.timed_out && !outputText)
-            pushToolPreview(previews, undefined, "text", "命令执行超时");
+            pushToolFact(facts, "状态", "命令执行超时", false, "warning");
         else if ((!ok || (typeof data.exit_code === "number" && data.exit_code !== 0)) && !outputText)
-            pushToolPreview(previews, undefined, "text", `命令退出码：${data.exit_code ?? "未知"}`);
+            pushToolFact(facts, "状态", `退出码 ${data.exit_code ?? "未知"}`, false, "danger");
     }
-    else if (toolName === "grep") {
+    else if (toolName === "file_search") {
         subject = stringValue(data.query) || stringValue(data.grepPath) || stringValue(data.path);
         pushToolPreview(previews, undefined, "list", grepPreview(data));
     }
-    else if (toolName === "search") {
+    else if (toolName === "web_search") {
         subject = stringValue(data.query);
         pushToolPreview(previews, undefined, "list", searchPreview(data));
     }
-    else if (toolName === "read") {
+    else if (toolName === "file_read") {
         subject = stringValue(data.path);
         if (numberValue(data.startLine) !== undefined && numberValue(data.endLine) !== undefined)
             pushToolFact(facts, "范围", `${data.startLine}–${data.endLine} 行`);
         pushToolPreview(previews, undefined, "code", data.content);
     }
-    else if (toolName === "list") {
+    else if (toolName === "file_list") {
         subject = stringValue(data.path);
         pushToolPreview(previews, undefined, "list", listPreview(data));
     }
-    else if (toolName === "image2") {
+    else if (toolName === "image_create") {
         subject = stringValue(data.semanticName);
         pushToolFact(facts, "图片", `${numberValue(data.returnedImages) ?? arrayLength(data.images)} 张`);
         pushToolFact(facts, "尺寸", data.size);
     }
-    else if (toolName === "load_image") {
+    else if (toolName === "image_inspect") {
         subject = arrayLabel(data.imageRefs);
     }
     else if (toolResources(output)?.length) {
         subject = toolResources(output)?.map((item) => item.label || item.downloadName).filter(Boolean).join("、");
     }
-    else if (toolName.toLowerCase().startsWith("task") || toolName === "agent") {
+    else if (toolName.startsWith("subagent_") || toolName === "subagent_run") {
         subject = stringValue(data.description) || stringValue(data.task_id) || stringValue(data.agent_id);
     }
-    else if (toolName === "SendMessage" || toolName.toLowerCase() === "sendmessage") {
+    else if (toolName === "subagent_message") {
         subject = stringValue(data.target);
     }
     else if (toolName.startsWith("secret_")) {
@@ -2827,7 +3028,7 @@ function buildToolResultDisplay(toolName, output, ok) {
         if (toolName === "secret_list")
             pushToolFact(facts, "数量", `${arrayLength(data.secrets)} 项`);
     }
-    else if (toolName === "agent_report") {
+    else if (toolName === "subagent_report") {
     }
     else {
         subject = subject || stringValue(data.path) || stringValue(data.id) || stringValue(data.name);
@@ -2835,17 +3036,17 @@ function buildToolResultDisplay(toolName, output, ok) {
     return normalizeToolDisplay({ subject, purpose, facts, previews });
 }
 function toolDisplaySubject(toolName, data) {
-    if (["read", "write", "edit", "list"].includes(toolName))
+    if (["file_read", "file_write", "file_edit", "file_list"].includes(toolName))
         return stringValue(data.path);
-    if (toolName === "exec_command")
+    if (toolName === "terminal_run")
         return stringValue(data.cmd) || stringValue(data.command);
-    if (toolName === "grep" || toolName === "search")
+    if (toolName === "file_search" || toolName === "web_search")
         return stringValue(data.query);
-    if (toolName === "image2")
+    if (toolName === "image_create")
         return stringValue(data.semanticName);
-    if (toolName === "SendMessage" || toolName.toLowerCase() === "sendmessage")
+    if (toolName === "subagent_message")
         return stringValue(data.target);
-    if (toolName.toLowerCase().startsWith("task"))
+    if (toolName.startsWith("subagent_"))
         return stringValue(data.task_id);
     return undefined;
 }
@@ -2926,24 +3127,24 @@ function taskStatusDisplay(value, ok) {
     return status ? labels[status] ?? status : ok ? "已完成" : "失败";
 }
 function formatToolResult(toolName, output, ok) {
-    if ((toolName === "edit" || toolName === "write") && isRecord(output) && isEditToolOutput(output))
+    if ((toolName === "file_edit" || toolName === "file_write") && isRecord(output) && isEditToolOutput(output))
         return { text: formatEditToolDiff(output, ok), format: "diff", summaryMaxLines: EDIT_TOOL_SUMMARY_MAX_LINES };
     if (isExecOutput(output))
         return { text: formatExecToolResult(output, ok), format: "plain", summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
-    if (toolName === "list" && isRecord(output))
+    if (toolName === "file_list" && isRecord(output))
         return { text: formatListToolResult(output, ok) };
-    if (toolName === "read" && isRecord(output))
+    if (toolName === "file_read" && isRecord(output))
         return { text: formatReadToolResult(output, ok) };
-    if (toolName === "grep" && isRecord(output))
+    if (toolName === "file_search" && isRecord(output))
         return { text: formatGrepToolResult(output, ok) };
-    if (toolName === "search" && isRecord(output))
+    if (toolName === "web_search" && isRecord(output))
         return { text: formatWebSearchToolResult(output, ok), summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
-    if (toolName === "image2" && isRecord(output))
+    if (toolName === "image_create" && isRecord(output))
         return { text: formatImageGenerationToolResult(output, ok), format: "plain", summaryMaxLines: 4 };
     const resources = toolResources(output);
     if (resources?.length)
         return { text: ok ? "资源已准备好。" : "资源准备失败。", full: true, bodyTitle: ok ? "资源已就绪" : "资源准备失败" };
-    if (toolName === "plan" && isWebPlanPayload(output))
+    if (toolName === "plan_update" && isWebPlanPayload(output))
         return { text: serializeWebPlanPayload(output), full: true, bodyTitle: webPlanBodyTitle(output) };
     if (typeof output === "string")
         return { text: output, format: hasAnsi(output) ? "ansi" : undefined, summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };