@hunterzhu/pulse-cli 0.4.4 → 0.4.5

package/dist/commands/resume.js

@@ -1,7 +1,8 @@
 import { createLocalHost } from '@hunterzhu/pulse-server';
+import { consumeToolEvent } from '../utils/tool-view.js';
 import { runInteractive } from './interactive.js';
 import { bindRunSignals } from './signals.js';
-function writeEvent(event, format) {
+function writeEvent(event, format, printed) {
     if (format === 'jsonl') {
         process.stdout.write(`${JSON.stringify(event)}\n`);
         return;
@@ -19,6 +20,9 @@ function writeEvent(event, format) {
     else if (event.type === 'error') {
         process.stderr.write(`\n[错误] ${String(event.data ?? '')}\n`);
     }
+    const toolLines = consumeToolEvent(event, printed, process.stderr.columns || 80);
+    if (toolLines.length)
+        process.stderr.write(`${toolLines.join('\n')}\n`);
 }
 export async function runResume(options, conversationId, task, format = 'text', version = '0.4.1') {
     // 交互式终端进入 Ink 界面；jsonl 保持非交互输出
@@ -36,10 +40,11 @@ export async function runResume(options, conversationId, task, format = 'text',
         activeRun = run;
         let streamedText = false;
         let approvalCancelled = false;
+        const printedTools = new Set();
         for await (const event of run.events) {
             if (event.type === 'text')
                 streamedText = true;
-            writeEvent(event, format);
+            writeEvent(event, format, printedTools);
             if (event.type === 'waiting' && !approvalCancelled) {
                 approvalCancelled = true;
                 process.stderr.write('\n[错误] 此运行处于非交互模式，无法请求工具审批；运行已取消。\n');

package/dist/commands/run.js

@@ -1,6 +1,7 @@
 import { createLocalHost } from '@hunterzhu/pulse-server';
+import { consumeToolEvent } from '../utils/tool-view.js';
 import { bindRunSignals } from './signals.js';
-function writeEvent(event, format) {
+function writeEvent(event, format, printed) {
     if (format === 'jsonl') {
         process.stdout.write(`${JSON.stringify(event)}\n`);
         return;
@@ -18,6 +19,9 @@ function writeEvent(event, format) {
     else if (event.type === 'error') {
         process.stderr.write(`\n[错误] ${String(event.data ?? '')}\n`);
     }
+    const toolLines = consumeToolEvent(event, printed, process.stderr.columns || 80);
+    if (toolLines.length)
+        process.stderr.write(`${toolLines.join('\n')}\n`);
 }
 export async function runOneShot(options, task, format = 'text', version = '0.4.1') {
     const host = createLocalHost(options);
@@ -33,10 +37,11 @@ export async function runOneShot(options, task, format = 'text', version = '0.4.
         activeRun = run;
         let streamedText = false;
         let approvalCancelled = false;
+        const printedTools = new Set();
         for await (const event of run.events) {
             if (event.type === 'text')
                 streamedText = true;
-            writeEvent(event, format);
+            writeEvent(event, format, printedTools);
             if (event.type === 'waiting' && !approvalCancelled) {
                 approvalCancelled = true;
                 process.stderr.write('\n[错误] 此运行处于非交互模式，无法请求工具审批；运行已取消。\n');

package/dist/components/ApprovalPrompt.js

@@ -7,7 +7,7 @@ export function ApprovalPrompt({ request, isFocused = false, inputMode = false,
     const tools = request.tools ?? [{ name: request.toolName, input: request.toolArgs }];
     const previews = tools.map((tool) => describeApprovalTool(tool));
     const truncated = previews.some((preview) => preview.truncated);
-    return (_jsxs(Box, { borderStyle: "double", borderColor: theme.warning, flexDirection: "column", paddingX: 1, marginTop: 1, children: [_jsxs(Box, { marginBottom: 1, gap: 1, children: [_jsx(Text, { color: theme.warning, bold: true, children: "\u26A0 \u5BA1\u6279\u8BF7\u6C42" }), _jsx(Text, { color: theme.tool, children: request.toolName })] }), _jsx(Box, { flexDirection: "column", marginBottom: 1, children: previews.map((preview, index) => (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, children: [_jsx(Text, { color: theme.tool, bold: true, children: preview.name }), _jsx(Text, { color: theme.dim, children: preview.body })] }, `${preview.name}-${index}`))) }), truncated && (_jsx(Text, { color: theme.warning, children: "\u9884\u89C8\u5DF2\u622A\u65AD\u3002\u9009\u62E9\u201C\u540C\u610F\u201D\u4F1A\u6267\u884C\u4E0A\u9762\u5217\u51FA\u7684\u5B8C\u6574\u64CD\u4F5C\uFF0C\u800C\u4E0D\u53EA\u662F\u53EF\u89C1\u7247\u6BB5\u3002" })), request.prompt && (_jsx(Box, { children: _jsx(Text, { children: request.prompt }) })), request.digest && _jsxs(Text, { color: theme.dim, children: ["\u6458\u8981\u6821\u9A8C\uFF1A", request.digest] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { bold: true, children: isFocused
+    return (_jsxs(Box, { borderStyle: "double", borderColor: theme.warning, flexDirection: "column", paddingX: 1, marginTop: 1, children: [_jsxs(Box, { marginBottom: 1, gap: 1, children: [_jsx(Text, { color: theme.warning, bold: true, children: "\u26A0 \u5BA1\u6279\u8BF7\u6C42" }), _jsx(Text, { color: theme.tool, children: request.toolName })] }), _jsx(Box, { flexDirection: "column", marginBottom: 1, children: previews.map((preview, index) => (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, children: [_jsx(Text, { color: theme.tool, bold: true, children: preview.name }), _jsx(Text, { children: preview.body })] }, `${preview.name}-${index}`))) }), truncated && (_jsx(Text, { color: theme.warning, children: "\u9884\u89C8\u5DF2\u622A\u65AD\u3002\u9009\u62E9\u201C\u540C\u610F\u201D\u4F1A\u6267\u884C\u4E0A\u9762\u5217\u51FA\u7684\u5B8C\u6574\u64CD\u4F5C\uFF0C\u800C\u4E0D\u53EA\u662F\u53EF\u89C1\u7247\u6BB5\u3002" })), request.prompt && (_jsx(Box, { children: _jsx(Text, { children: request.prompt }) })), request.digest && _jsxs(Text, { color: theme.dim, children: ["\u6458\u8981\u6821\u9A8C\uFF1A", request.digest] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { bold: true, children: isFocused
                         ? '审批选择已聚焦（↑↓ 选择，Enter 确认；Tab 切换到输入；默认拒绝）'
                         : inputMode
                             ? '输入模式：可发送补充信息；按 Tab 返回审批选择'

package/dist/hooks/useRun.d.ts

@@ -1,5 +1,7 @@
 import type { LocalHost } from '@hunterzhu/pulse-server';
-import type { ApprovalRequest, AskRequest, DisplayMessage, LaneDisplay } from '../types.js';
+import type { ApprovalRequest, AskRequest, DisplayMessage, LaneDisplay, ToolCallDisplay } from '../types.js';
+/** Running snapshots must not erase a settled call or replace known arguments with an empty object. */
+export declare function mergeToolCall(current: ToolCallDisplay | undefined, next: ToolCallDisplay, source: 'running' | 'settled'): ToolCallDisplay;
 export declare function describeFactStatus(data: unknown): string;
 export declare function useRun({ host, conversationId, addAssistantMessage, }: {
     host: LocalHost | null;

package/dist/hooks/useRun.js

@@ -1,8 +1,20 @@
 import { useState, useRef, useCallback, useEffect } from 'react';
-function toolStatus(value) {
-    if (value === 'succeeded' || value === 'failed' || value === 'running' || value === 'cancelled')
-        return value;
-    return 'running';
+import { runningToolCalls, toolCallFromObservation } from '../utils/tool-view.js';
+/** Running snapshots must not erase a settled call or replace known arguments with an empty object. */
+export function mergeToolCall(current, next, source) {
+    if (!current)
+        return next;
+    if (source === 'running' && current.status !== 'running')
+        return current;
+    const hasNextArgs = next.arguments !== undefined && Object.keys(next.arguments).length > 0;
+    return {
+        ...current,
+        ...next,
+        arguments: hasNextArgs ? next.arguments : current.arguments,
+        ...(next.preview === undefined && current.preview !== undefined ? { preview: current.preview } : {}),
+        ...(next.result === undefined && current.result !== undefined ? { result: current.result } : {}),
+        status: source === 'running' ? 'running' : next.status,
+    };
 }
 export function describeFactStatus(data) {
     if (typeof data === 'string') {
@@ -146,26 +158,17 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
                     addAssistantMessage({ ...assistantMessage, toolCalls: assistantMessage.toolCalls?.map((call) => ({ ...call })) });
                     break;
                 case 'observation': {
-                    const obs = event.data;
-                    if (obs && typeof obs === 'object' && typeof obs.tool === 'string') {
-                        const id = String(obs.toolCallId ?? obs.tool);
-                        const nextCall = {
-                            id,
-                            name: obs.tool,
-                            arguments: obs.args && typeof obs.args === 'object' && !Array.isArray(obs.args)
-                                ? obs.args
-                                : {},
-                            status: toolStatus(obs.status),
-                            ...(obs.result === undefined ? {} : { result: obs.result }),
-                        };
+                    const nextCall = toolCallFromObservation(event.data);
+                    if (nextCall) {
                         const calls = assistantMessage.toolCalls ?? [];
-                        const index = calls.findIndex((call) => call.id === id);
+                        const index = calls.findIndex((call) => call.id === nextCall.id);
+                        const merged = mergeToolCall(index >= 0 ? calls[index] : undefined, nextCall, 'settled');
                         assistantMessage.toolCalls = index >= 0
-                            ? calls.map((call, callIndex) => callIndex === index ? { ...call, ...nextCall } : call)
-                            : [...calls, nextCall];
+                            ? calls.map((call, callIndex) => callIndex === index ? merged : call)
+                            : [...calls, merged];
                         addAssistantMessage({ ...assistantMessage, toolCalls: assistantMessage.toolCalls.map((call) => ({ ...call })) });
-                        setCurrentStep(nextCall.status === 'succeeded' ? `已完成 ${nextCall.name}，正在整理结果…` : nextCall.status === 'failed' ? `${nextCall.name} 未成功，正在处理错误…` : `正在执行 ${nextCall.name}…`);
-                        addProgress(`tool-result:${id}:${nextCall.status}`, `${nextCall.status === 'succeeded' ? '已完成' : nextCall.status === 'cancelled' ? '已取消' : '执行失败'} · ${nextCall.name}`);
+                        setCurrentStep(merged.status === 'succeeded' ? `已完成 ${merged.name}，正在整理结果…` : merged.status === 'failed' ? `${merged.name} 未成功，正在处理错误…` : `正在执行 ${merged.name}…`);
+                        addProgress(`tool-result:${merged.id}:${merged.status}`, `${merged.status === 'succeeded' ? '已完成' : merged.status === 'cancelled' ? '已取消' : '执行失败'} · ${merged.name}`);
                     }
                     break;
                 }
@@ -247,26 +250,30 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
                             }));
                             const activeLanes = fact.lanes.filter((lane) => typeof lane.status === 'string' && !['succeeded', 'failed', 'cancelled'].includes(lane.status));
                             const active = activeLanes.find((lane) => lane.activityKind === 'tool') ?? activeLanes[0];
+                            const running = runningToolCalls(fact);
+                            if (running.length) {
+                                let calls = assistantMessage.toolCalls ?? [];
+                                for (const nextCall of running) {
+                                    const index = calls.findIndex((call) => call.id === nextCall.id);
+                                    const merged = mergeToolCall(index >= 0 ? calls[index] : undefined, nextCall, 'running');
+                                    calls = index >= 0
+                                        ? calls.map((call, callIndex) => callIndex === index ? merged : call)
+                                        : [...calls, merged];
+                                }
+                                assistantMessage.toolCalls = calls;
+                                addAssistantMessage({ ...assistantMessage, toolCalls: calls.map((call) => ({ ...call })) });
+                            }
                             if (active && typeof active.goal === 'string') {
-                                const toolName = active.activityKind === 'tool' && typeof active.activity === 'string' ? active.activity : undefined;
+                                const latest = running.at(-1);
+                                const toolName = latest?.name ?? (active.activityKind === 'tool' && typeof active.activity === 'string' ? active.activity : undefined);
                                 const activity = toolName ? `正在调用工具 · ${toolName}` : typeof active.activity === 'string'
                                     ? active.activity === 'llm' ? '正在分析需求和已有证据…' : '正在处理任务…'
                                     : '正在处理任务…';
                                 setCurrentStep(`${activity}：${active.goal}`);
                                 const activityId = toolName
-                                    ? (typeof active.activityEffectId === 'string' ? active.activityEffectId : active.id)
+                                    ? (typeof active.activityEffectId === 'string' ? active.activityEffectId : latest?.id ?? active.id)
                                     : active.activity === 'llm' ? 'analysis' : `${active.id}:${active.status}`;
                                 addProgress(`activity:${activityId}`, activity);
-                                if (toolName && typeof active.activityToolCallId === 'string') {
-                                    const id = active.activityToolCallId;
-                                    const calls = assistantMessage.toolCalls ?? [];
-                                    const index = calls.findIndex((call) => call.id === id);
-                                    const nextCall = { id, name: toolName, status: 'running', arguments: {} };
-                                    assistantMessage.toolCalls = index >= 0
-                                        ? calls.map((call, callIndex) => callIndex === index ? { ...call, ...nextCall } : call)
-                                        : [...calls, nextCall];
-                                    addAssistantMessage({ ...assistantMessage, toolCalls: assistantMessage.toolCalls.map((call) => ({ ...call })) });
-                                }
                             }
                             break;
                         }

package/dist/release-highlights.generated.js

@@ -1,5 +1,31 @@
 // Generated from CHANGELOG.md and CHANGELOG.en.md by scripts/release/sync-cli-highlights.mjs. Do not edit manually.
 export const releaseHighlights = {
+    "0.4.5": [
+        {
+            "zh": "复杂任务不再受全局模型调用次数上限截断，继续通过阶段、运行时限和循环检测控制执行；旧会话保持原有预算语义。",
+            "en": "Complex tasks are no longer cut off by a run-wide model-call ceiling; stage limits, runtime limits, and loop detection still bound execution, while older sessions retain their original budget semantics."
+        },
+        {
+            "zh": "大任务上下文从当前目标和阶段出发，沿依赖、证据和文件路径按需展开，同时保留用户要求及最近对话。",
+            "en": "Large-task context expands on demand from the current objective and stage along dependencies, evidence, and file paths, while preserving user requirements and the latest exchange."
+        },
+        {
+            "zh": "CLI 展示每次工具调用的状态、文件修改 diff 和命令或读取预览，便于查看并行执行与审批内容。",
+            "en": "The CLI displays each tool call's status, file-edit diff, and command or read preview to make parallel execution and approval contents easier to inspect."
+        },
+        {
+            "zh": "上下文展开支持继续访问此前已到达的节点，并在恢复会话后保留展开范围；剩余消息和目标中的文件路径可以正确检索。",
+            "en": "Context expansion can continue from previously reached nodes after session restoration; remaining messages and file paths in the objective can be retrieved correctly."
+        },
+        {
+            "zh": "最终验收引用无效证据时，将具体错误反馈给重试，避免重复提交相同结果。",
+            "en": "Final acceptance feeds invalid evidence-reference errors back into retries to avoid repeatedly submitting the same result."
+        },
+        {
+            "zh": "暂存写入和追加内容可在审批中预览；长 diff 保留尾部修改，隐藏内容和空行正确标记为截断。",
+            "en": "Staged writes and appends include approval previews; long diffs retain tail edits, and hidden content and blank lines are correctly marked as truncated."
+        }
+    ],
     "0.4.4": [
         {
             "zh": "多阶段任务获得完整工具定义，并保留重试和依赖阶段的验收证据；补验证或补报告不再强制重复修改文件。",

package/dist/types.d.ts

@@ -26,12 +26,24 @@ export interface DisplayMessage {
     /** Token 统计 */
     tokenStats?: TokenStatsData | undefined;
 }
+/** Bounded settlement summary. File bodies stay out of this object. */
+export interface ToolCallPreview {
+    bytes?: number | undefined;
+    lines?: number | undefined;
+    truncated?: boolean | undefined;
+    matched?: number | undefined;
+    locations?: string[] | undefined;
+    exitCode?: number | null | undefined;
+    output?: string | undefined;
+    replacements?: number | undefined;
+}
 /** 工具调用展示数据 */
 export interface ToolCallDisplay {
     id: string;
     name: string;
     arguments?: Record<string, unknown> | undefined;
     result?: unknown;
+    preview?: ToolCallPreview | undefined;
     status: 'running' | 'succeeded' | 'failed' | 'cancelled';
     durationMs?: number | undefined;
 }

package/dist/utils/approval.js

@@ -1,50 +1,14 @@
-import { stripTerminalControls } from './ansi.js';
-const previewLimit = 1_000;
-function clip(value) {
-    const clean = stripTerminalControls(value);
-    if (clean.length <= previewLimit)
-        return { text: clean, truncated: false };
-    const hidden = clean.length - previewLimit;
-    return {
-        truncated: true,
-        text: `${clean.slice(0, previewLimit)}\n… 还有 ${hidden} 个字符未显示。批准会执行完整内容（共 ${clean.length} 个字符）。`,
-    };
-}
-function textField(input, key) {
-    const value = input[key];
-    return typeof value === 'string' ? value : value === undefined ? '' : JSON.stringify(value);
-}
+import { renderToolCalls } from './tool-view.js';
 export function describeApprovalTool(tool) {
-    if (tool.name === 'fs.write') {
-        const content = clip(textField(tool.input, 'content'));
-        const path = stripTerminalControls(textField(tool.input, 'path'));
-        return {
-            name: tool.name,
-            truncated: content.truncated,
-            body: `路径: ${path}\n内容（${textField(tool.input, 'content').length} 个字符）:\n${content.text}`,
-        };
-    }
-    if (tool.name === 'fs.apply_patch') {
-        const find = clip(textField(tool.input, 'find'));
-        const replace = clip(textField(tool.input, 'replace'));
-        const path = stripTerminalControls(textField(tool.input, 'path'));
-        const all = tool.input.all === true ? '全部匹配' : '第一处匹配';
-        return {
-            name: tool.name,
-            truncated: find.truncated || replace.truncated,
-            body: `路径: ${path}\n范围: ${all}\n- ${find.text}\n+ ${replace.text}`,
-        };
-    }
-    if (tool.name === 'shell.exec') {
-        const command = stripTerminalControls(textField(tool.input, 'command'));
-        const args = Array.isArray(tool.input.args) ? tool.input.args.map((arg) => stripTerminalControls(String(arg))) : [];
-        const cwd = stripTerminalControls(textField(tool.input, 'cwd') || '.');
-        return {
+    const view = renderToolCalls([{
+            id: 'approval',
             name: tool.name,
-            truncated: false,
-            body: `命令: ${command}\n参数: ${args.join(' ') || '（无）'}\n目录: ${cwd}`,
-        };
-    }
-    const serialized = clip(JSON.stringify(tool.input, null, 2));
-    return { name: tool.name, truncated: serialized.truncated, body: serialized.text };
+            arguments: tool.input,
+            status: 'running',
+        }], { width: 100 });
+    const hidden = Math.max(0, view.totalChars - view.shownChars);
+    const notice = view.truncated
+        ? `\n… 还有 ${hidden} 个字符未显示。批准会执行完整内容（共 ${view.totalChars} 个字符）。`
+        : '';
+    return { name: tool.name, truncated: view.truncated, body: `${view.lines.join('\n')}${notice}` };
 }

package/dist/utils/tool-view.d.ts

@@ -0,0 +1,17 @@
+import type { ToolCallDisplay, Verbosity } from '../types.js';
+export interface ToolView {
+    lines: string[];
+    truncated: boolean;
+    totalChars: number;
+    shownChars: number;
+}
+export declare function renderToolCalls(calls: ToolCallDisplay[], options?: {
+    verbosity?: Verbosity;
+    width?: number;
+}): ToolView;
+export declare function toolCallFromObservation(data: unknown): ToolCallDisplay | undefined;
+export declare function runningToolCalls(data: unknown): ToolCallDisplay[];
+export declare function consumeToolEvent(event: {
+    type: string;
+    data?: unknown;
+}, printed: Set<string>, width: number): string[];

package/dist/utils/tool-view.js

@@ -0,0 +1,471 @@
+import chalk from 'chalk';
+import wrapAnsi from 'wrap-ansi';
+import { theme } from '../theme.js';
+import { stripAnsi, stripTerminalControls } from './ansi.js';
+const verbs = {
+    'fs.read': '读取',
+    'fs.search': '搜索',
+    'fs.list': '列出',
+    'fs.write': '新建',
+    'fs.apply_patch': '编辑',
+    'fs.apply_patches': '编辑',
+    'fs.stage': '写入',
+    'fs.move': '移动',
+    'shell.exec': '运行',
+    'web.fetch': '获取',
+    'web.search': '检索',
+};
+const lineCap = 24;
+const lineWidth = 160;
+const contextLines = 2;
+export function renderToolCalls(calls, options = {}) {
+    const width = Math.max(8, options.width ?? 80);
+    const views = calls.map((call) => renderToolCall(call, { ...options, width }));
+    return {
+        lines: views.flatMap((view) => view.lines),
+        truncated: views.some((view) => view.truncated),
+        totalChars: views.reduce((sum, view) => sum + view.totalChars, 0),
+        shownChars: views.reduce((sum, view) => sum + view.shownChars, 0),
+    };
+}
+export function toolCallFromObservation(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data))
+        return undefined;
+    const obs = data;
+    if (typeof obs.tool !== 'string')
+        return undefined;
+    const preview = parsePreview(obs.preview);
+    return {
+        id: String(obs.toolCallId ?? obs.tool),
+        name: obs.tool,
+        arguments: record(obs.args),
+        status: toolStatus(obs.status),
+        ...(obs.result === undefined ? {} : { result: obs.result }),
+        ...(preview === undefined ? {} : { preview }),
+    };
+}
+export function runningToolCalls(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data))
+        return [];
+    const fact = data;
+    if (fact.type !== 'lane.snapshot' || !Array.isArray(fact.lanes))
+        return [];
+    const calls = [];
+    for (const lane of fact.lanes) {
+        if (!lane || typeof lane !== 'object' || Array.isArray(lane))
+            continue;
+        const item = lane;
+        const activities = Array.isArray(item.activities) ? item.activities : [item];
+        for (const activity of activities) {
+            if (!activity || typeof activity !== 'object' || Array.isArray(activity))
+                continue;
+            const row = activity;
+            if (row.activityKind !== 'tool' || typeof row.activity !== 'string' || typeof row.activityToolCallId !== 'string')
+                continue;
+            calls.push({
+                id: row.activityToolCallId,
+                name: row.activity,
+                status: 'running',
+                arguments: record(row.activityArguments),
+            });
+        }
+    }
+    return calls;
+}
+export function consumeToolEvent(event, printed, width) {
+    const calls = event.type === 'observation'
+        ? [toolCallFromObservation(event.data)].filter((call) => call !== undefined)
+        : event.type === 'fact'
+            ? runningToolCalls(event.data)
+            : [];
+    const lines = [];
+    for (const call of calls) {
+        const key = `${call.id}\0${call.status}\0${JSON.stringify(call.arguments ?? {})}\0${call.preview?.output ?? ''}`;
+        if (printed.has(key))
+            continue;
+        printed.add(key);
+        lines.push(...renderToolCalls([call], { width }).lines);
+    }
+    return lines;
+}
+function renderToolCall(call, options) {
+    const args = call.arguments ?? {};
+    const source = editableText(args);
+    const width = options.width;
+    const header = fit(headerLine(call), width);
+    const detail = detailLines(call, width);
+    const extra = options.verbosity === 'verbose' && call.result !== undefined ? resultLines(call.result, width) : [];
+    const lines = [...header, ...detail.lines, ...extra];
+    const truncated = detail.truncated;
+    return {
+        lines,
+        truncated: detail.shownChars < source.length || truncated,
+        totalChars: source.length,
+        shownChars: detail.shownChars,
+    };
+}
+function headerLine(call) {
+    const glyph = call.status === 'running'
+        ? chalk.yellow('◐')
+        : call.status === 'failed'
+            ? chalk.red('✗')
+            : call.status === 'cancelled'
+                ? chalk.dim('⊘')
+                : chalk.green('●');
+    const verb = chalk.hex(theme.tool)(verbs[call.name] ?? call.name);
+    const target = targetText(call);
+    const stat = diffStat(call);
+    return `${glyph} ${verb}${target ? `  ${chalk.dim(target)}` : ''}${stat ? `  ${stat}` : ''}`;
+}
+function targetText(call) {
+    const args = call.arguments ?? {};
+    if (call.name === 'shell.exec')
+        return shellCommand(args);
+    if (call.name === 'fs.move')
+        return joinPair(text(args, 'source'), text(args, 'destination'), ' → ');
+    if (call.name === 'fs.stage')
+        return stageTarget(args);
+    if (call.name === 'web.fetch')
+        return text(args, 'url');
+    if (call.name === 'web.search' || call.name === 'fs.search')
+        return text(args, 'query');
+    return text(args, 'path');
+}
+function detailLines(call, width) {
+    const args = call.arguments ?? {};
+    const failure = failureText(call);
+    const failed = failure ? fit(`  └ ${failure}`, width) : [];
+    if (call.name === 'fs.apply_patch' || call.name === 'fs.apply_patches' || isContentWrite(call)) {
+        const diff = editLines(call, width);
+        return { lines: [...diff.lines, ...failed], shownChars: diff.shownChars, truncated: diff.truncated };
+    }
+    const lines = [];
+    if (call.name === 'shell.exec') {
+        const cwd = text(args, 'cwd');
+        if (cwd && cwd !== '.')
+            lines.push(...fit(`  └ 目录 ${cwd}`, width));
+        const output = call.preview?.output ? stripTerminalControls(call.preview.output) : '';
+        if (output)
+            lines.push(...prefixBlock(output, width));
+        if (failed.length)
+            lines.push(...failed);
+        else if (call.status === 'succeeded' && !output)
+            lines.push(...fit('  └ 已完成', width));
+        if (call.preview?.truncated)
+            lines.push(...fit(chalk.dim('  └ 输出已截断'), width));
+        return { lines, shownChars: editableText(args).length, truncated: false };
+    }
+    if (failed.length)
+        return { lines: failed, shownChars: editableText(args).length, truncated: false };
+    const summary = summaryLine(call);
+    if (summary)
+        lines.push(...fit(`  └ ${summary}`, width));
+    for (const location of call.preview?.locations ?? [])
+        lines.push(...fit(chalk.dim(`    ${stripTerminalControls(location)}`), width));
+    if (!lines.length && call.name !== 'fs.read' && call.name !== 'fs.search' && call.name !== 'fs.list' && call.name !== 'fs.stage' && call.name !== 'fs.move' && call.name !== 'web.fetch' && call.name !== 'web.search') {
+        const dumped = dumpArgs(args);
+        if (dumped.clipped)
+            return { lines: fit(chalk.dim(dumped.text), width), shownChars: 0, truncated: true };
+        if (dumped.text && dumped.text !== '{}')
+            return { lines: fit(chalk.dim(dumped.text), width), shownChars: editableText(args).length, truncated: false };
+    }
+    return { lines, shownChars: editableText(args).length, truncated: false };
+}
+function isContentWrite(call) {
+    return call.name === 'fs.write' || call.name === 'fs.stage' && typeof call.arguments?.content === 'string';
+}
+function editLines(call, width) {
+    const args = call.arguments ?? {};
+    const hunks = isContentWrite(call)
+        ? [{ find: '', replace: text(args, 'content') }]
+        : call.name === 'fs.apply_patches'
+            ? patches(args)
+            : [{ find: text(args, 'find'), replace: text(args, 'replace') }];
+    const source = editableText(args);
+    const rendered = [];
+    let hidden = 0;
+    let omittedChars = 0;
+    if (args.all === true)
+        rendered.push(...fit(chalk.dim('  └ 全部匹配'), width));
+    for (const [index, hunk] of hunks.entries()) {
+        if (index > 0)
+            rendered.push(chalk.dim('    @@'));
+        const ops = hunk.find === '' && isContentWrite(call)
+            ? hunk.replace.split('\n').map((line, lineIndex) => ({ op: '+', text: line, line: lineIndex + 1 }))
+            : diffLines(hunk.find, hunk.replace);
+        const window = windowOps(ops);
+        hidden += window.hidden;
+        for (const op of ops)
+            if (!window.shown.includes(op))
+                omittedChars += op.text.length + 1;
+        for (const op of window.shown) {
+            const visible = clipLine(stripTerminalControls(op.text));
+            if (visible.clipped)
+                omittedChars += Math.max(0, stripTerminalControls(op.text).length - lineWidth);
+            const sign = op.op === ' ' ? ' ' : op.op;
+            const body = `${String(op.line).padStart(4)} │${sign} ${visible.text}`;
+            const colored = op.op === '+' ? chalk.green(body) : op.op === '-' ? chalk.red(body) : chalk.dim(body);
+            rendered.push(...fit(`    ${colored}`, width));
+        }
+    }
+    if (hidden > 0)
+        rendered.push(...fit(chalk.dim(`    … 还有 ${hidden} 行`), width));
+    return { lines: rendered, shownChars: Math.max(0, source.length - omittedChars), truncated: hidden > 0 || omittedChars > 0 };
+}
+function summaryLine(call) {
+    const preview = call.preview;
+    if (!preview)
+        return call.status === 'succeeded' && call.name === 'fs.stage' ? '已完成' : '';
+    if (call.name === 'fs.read' || call.name === 'web.fetch') {
+        const size = typeof preview.bytes === 'number' ? formatBytes(preview.bytes) : '';
+        const lines = typeof preview.lines === 'number' ? `${preview.lines} 行` : '';
+        return [lines, size, preview.truncated ? '未读完' : ''].filter(Boolean).join(' · ');
+    }
+    if (call.name === 'fs.search' || call.name === 'web.search')
+        return `${preview.matched ?? preview.locations?.length ?? 0} 处`;
+    if (call.name === 'fs.list')
+        return `${preview.matched ?? preview.locations?.length ?? 0} 项`;
+    if (typeof preview.replacements === 'number' && preview.replacements > 1)
+        return `${preview.replacements} 处`;
+    return '';
+}
+function failureText(call) {
+    if (call.status !== 'failed' && call.status !== 'cancelled')
+        return '';
+    const label = call.status === 'cancelled' ? '已取消' : '失败';
+    const result = call.result;
+    if (typeof result === 'string' && result)
+        return `${label} · ${stripTerminalControls(result)}`;
+    if (result && typeof result === 'object' && !Array.isArray(result)) {
+        const record = result;
+        const message = typeof record.message === 'string' ? record.message : undefined;
+        const code = typeof record.code === 'string' ? record.code : undefined;
+        const detail = message ?? code;
+        if (detail)
+            return `${label} · ${stripTerminalControls(detail)}`;
+    }
+    return label;
+}
+function resultLines(result, width) {
+    const text = stripTerminalControls(typeof result === 'string' ? result : safeJson(result));
+    const clipped = text.length > 500 ? `${text.slice(0, 500)}…` : text;
+    return fit(chalk.dim(clipped), width);
+}
+function diffStat(call) {
+    if (call.name !== 'fs.apply_patch' && call.name !== 'fs.apply_patches' && !isContentWrite(call))
+        return '';
+    const counts = countEdits(call);
+    if (counts.add === 0 && counts.del === 0)
+        return '';
+    return `${chalk.green(`+${counts.add}`)} ${chalk.red(`−${counts.del}`)}`;
+}
+function countEdits(call) {
+    const args = call.arguments ?? {};
+    const hunks = isContentWrite(call)
+        ? [{ find: '', replace: text(args, 'content') }]
+        : call.name === 'fs.apply_patches' ? patches(args) : [{ find: text(args, 'find'), replace: text(args, 'replace') }];
+    return hunks.reduce((sum, hunk) => {
+        if (isContentWrite(call))
+            return { add: sum.add + hunk.replace.split('\n').filter((line) => line.length > 0).length, del: sum.del };
+        for (const op of diffLines(hunk.find, hunk.replace)) {
+            if (op.op === '+')
+                sum.add += 1;
+            if (op.op === '-')
+                sum.del += 1;
+        }
+        return sum;
+    }, { add: 0, del: 0 });
+}
+function diffLines(before, after) {
+    return diffLineArrays(before.split('\n'), after.split('\n'));
+}
+function diffLineArrays(left, right) {
+    if (left.length * right.length > 20_000) {
+        // Trim shared edges before the quadratic diff so a long fragment with one
+        // tail edit still displays that edit, rather than an unrelated prefix.
+        let prefix = 0;
+        while (prefix < left.length && prefix < right.length && left[prefix] === right[prefix])
+            prefix++;
+        let suffix = 0;
+        while (suffix < left.length - prefix && suffix < right.length - prefix && left[left.length - suffix - 1] === right[right.length - suffix - 1])
+            suffix++;
+        if (prefix || suffix)
+            return [
+                ...left.slice(0, prefix).map((text, index) => ({ op: ' ', text, line: index + 1 })),
+                ...diffLineArrays(left.slice(prefix, left.length - suffix), right.slice(prefix, right.length - suffix)).map((op) => ({ ...op, line: op.line + prefix })),
+                ...left.slice(left.length - suffix).map((text, index) => ({ op: ' ', text, line: left.length - suffix + index + 1 })),
+            ];
+        // A linear fallback retains every operation; only the display window clips
+        // them, so hidden lines and the approval truncation warning stay accurate.
+        return [
+            ...left.map((text, index) => ({ op: '-', text, line: index + 1 })),
+            ...right.map((text, index) => ({ op: '+', text, line: index + 1 })),
+        ];
+    }
+    const scores = Array.from({ length: left.length + 1 }, () => Array(right.length + 1).fill(0));
+    for (let i = left.length - 1; i >= 0; i -= 1) {
+        for (let j = right.length - 1; j >= 0; j -= 1) {
+            scores[i][j] = left[i] === right[j] ? scores[i + 1][j + 1] + 1 : Math.max(scores[i + 1][j], scores[i][j + 1]);
+        }
+    }
+    const ops = [];
+    let i = 0;
+    let j = 0;
+    while (i < left.length && j < right.length) {
+        if (left[i] === right[j]) {
+            ops.push({ op: ' ', text: left[i], line: i + 1 });
+            i += 1;
+            j += 1;
+        }
+        else if (scores[i + 1][j] >= scores[i][j + 1]) {
+            ops.push({ op: '-', text: left[i], line: i + 1 });
+            i += 1;
+        }
+        else {
+            ops.push({ op: '+', text: right[j], line: j + 1 });
+            j += 1;
+        }
+    }
+    while (i < left.length) {
+        ops.push({ op: '-', text: left[i], line: i + 1 });
+        i += 1;
+    }
+    while (j < right.length) {
+        ops.push({ op: '+', text: right[j], line: j + 1 });
+        j += 1;
+    }
+    return ops;
+}
+function windowOps(ops) {
+    const keep = new Set();
+    ops.forEach((op, index) => {
+        if (op.op === ' ')
+            return;
+        for (let cursor = index - contextLines; cursor <= index + contextLines; cursor += 1)
+            if (cursor >= 0 && cursor < ops.length)
+                keep.add(cursor);
+    });
+    const interesting = keep.size ? ops.filter((_, index) => keep.has(index)) : ops.slice(0, contextLines);
+    if (interesting.length <= lineCap)
+        return { shown: interesting, hidden: ops.length - interesting.length };
+    return { shown: interesting.slice(0, lineCap), hidden: ops.length - lineCap };
+}
+function patches(args) {
+    if (!Array.isArray(args.patches))
+        return [];
+    return args.patches.flatMap((patch) => {
+        if (!patch || typeof patch !== 'object' || Array.isArray(patch))
+            return [];
+        const row = patch;
+        return [{ find: text(row, 'find'), replace: text(row, 'replace') }];
+    });
+}
+function shellCommand(args) {
+    const command = text(args, 'command');
+    const values = Array.isArray(args.args) ? args.args.map((arg) => shellToken(stripTerminalControls(String(arg)))) : [];
+    return [command, ...values].filter(Boolean).join(' ');
+}
+function stageTarget(args) {
+    const operation = text(args, 'operation') || text(args, 'op');
+    const path = text(args, 'path');
+    const draft = text(args, 'draftId');
+    if (operation && path)
+        return `${operation} ${path}`;
+    if (operation)
+        return draft ? `${operation} ${draft.slice(0, 8)}` : operation;
+    return path;
+}
+function prefixBlock(output, width) {
+    const rows = output.split('\n');
+    return rows.flatMap((row, index) => fit(`${index === 0 ? '  └ ' : '    '}${row}`, width));
+}
+function formatBytes(bytes) {
+    if (bytes < 1024)
+        return `${bytes} B`;
+    const kilobytes = bytes / 1024;
+    return kilobytes < 10 ? `${kilobytes.toFixed(1)} KB` : `${Math.round(kilobytes)} KB`;
+}
+function editableText(args) {
+    const parts = [];
+    if (typeof args.content === 'string')
+        parts.push(args.content);
+    if (typeof args.find === 'string')
+        parts.push(args.find);
+    if (typeof args.replace === 'string')
+        parts.push(args.replace);
+    for (const hunk of patches(args))
+        parts.push(hunk.find, hunk.replace);
+    return parts.join('');
+}
+function dumpArgs(args) {
+    const visible = Object.fromEntries(Object.entries(args).filter(([key]) => key !== 'expectedHash' && key !== 'hash'));
+    const text = safeJson(visible);
+    if (text.length <= 1_000)
+        return { text, clipped: false };
+    return { text: `${text.slice(0, 1_000)}\n…`, clipped: true };
+}
+function clipLine(value) {
+    if (value.length <= lineWidth)
+        return { text: value, clipped: false };
+    return { text: `${value.slice(0, lineWidth)}…`, clipped: true };
+}
+function text(args, key) {
+    const value = args[key];
+    return typeof value === 'string' ? stripTerminalControls(value) : '';
+}
+function joinPair(left, right, separator) {
+    return [left, right].filter(Boolean).join(separator);
+}
+function shellToken(value) {
+    if (value.length === 0)
+        return "''";
+    if (/^[\w./:@%+=,~-]+$/.test(value))
+        return value;
+    return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+function fit(line, width) {
+    if (stripAnsi(line).length <= width)
+        return [line];
+    return wrapAnsi(line, width, { hard: true, trim: false }).split('\n');
+}
+function record(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    return value;
+}
+function toolStatus(value) {
+    if (value === 'succeeded' || value === 'failed' || value === 'running' || value === 'cancelled')
+        return value;
+    return 'running';
+}
+function parsePreview(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    const row = value;
+    const preview = {};
+    if (typeof row.bytes === 'number')
+        preview.bytes = row.bytes;
+    if (typeof row.lines === 'number')
+        preview.lines = row.lines;
+    if (row.truncated === true)
+        preview.truncated = true;
+    if (typeof row.matched === 'number')
+        preview.matched = row.matched;
+    if (Array.isArray(row.locations))
+        preview.locations = row.locations.filter((item) => typeof item === 'string').slice(0, 5);
+    if (typeof row.exitCode === 'number' || row.exitCode === null)
+        preview.exitCode = row.exitCode;
+    if (typeof row.output === 'string')
+        preview.output = row.output;
+    if (typeof row.replacements === 'number')
+        preview.replacements = row.replacements;
+    return Object.keys(preview).length ? preview : undefined;
+}
+function safeJson(value) {
+    try {
+        return JSON.stringify(value, null, 2) ?? '';
+    }
+    catch {
+        return String(value);
+    }
+}

package/dist/utils/transcript.js

@@ -2,6 +2,7 @@ import wrapAnsi from 'wrap-ansi';
 import chalk from 'chalk';
 import { stripTerminalControls } from './ansi.js';
 import { renderMarkdownToAnsi } from './markdown.js';
+import { renderToolCalls } from './tool-view.js';
 /** One shared rendering and wrapping path; scroll offsets are actual terminal rows. */
 export function transcriptLines(messages, width, verbosity = 'normal') {
     const blocks = messages.map((message) => {
@@ -13,40 +14,10 @@ export function transcriptLines(messages, width, verbosity = 'normal') {
             const body = wrapAnsi(text, contentWidth, { hard: true, trim: false }).split('\n');
             return { id: message.id, role: message.role, lines: [chalk.blue.bold('❯ 你发来'), ...body.map((line) => `  ${line}`)] };
         }
-        const parts = [];
         const tools = message.toolCalls ?? [];
-        if (verbosity !== 'quiet' && tools.length) {
-            const failed = tools.filter((tool) => tool.status === 'failed' || tool.status === 'cancelled');
-            parts.push(chalk.dim(`工具 · ${tools.filter((tool) => tool.status === 'succeeded').length}/${tools.length} 已完成${failed.length ? ` · ${failed.length} 未成功` : ''}`));
-            const statusLabel = { running: '正在调用', succeeded: '已完成', failed: '失败', cancelled: '已取消' };
-            if (verbosity === 'verbose') {
-                for (const tool of tools) {
-                    const detail = `${tool.name} · ${statusLabel[tool.status]}\n${JSON.stringify(tool.arguments ?? {}, null, 2)}${tool.result === undefined ? '' : `\n${typeof tool.result === 'string' ? tool.result : JSON.stringify(tool.result, null, 2)}`}`;
-                    parts.push(chalk.dim(stripTerminalControls(detail)));
-                }
-            }
-            else {
-                const groups = new Map();
-                for (const tool of tools) {
-                    const result = tool.result && typeof tool.result === 'object' && !Array.isArray(tool.result) ? tool.result : undefined;
-                    const error = tool.status === 'failed' || tool.status === 'cancelled'
-                        ? [result?.code, result?.message].filter((value) => typeof value === 'string').at(-1)
-                        : undefined;
-                    const key = `${tool.name}\0${tool.status}\0${error ?? ''}`;
-                    const group = groups.get(key);
-                    if (group)
-                        group.count++;
-                    else
-                        groups.set(key, { name: tool.name, status: tool.status, count: 1, ...(error ? { error } : {}) });
-                }
-                for (const group of groups.values()) {
-                    parts.push(chalk.dim(`${group.name}${group.count > 1 ? ` × ${group.count}` : ''} · ${statusLabel[group.status]}${group.error ? ` · ${group.error}` : ''}`));
-                }
-            }
-        }
-        if (text)
-            parts.push(renderMarkdownToAnsi(text));
-        const body = wrapAnsi(parts.join('\n'), contentWidth, { hard: true, trim: false }).split('\n');
+        const toolLines = tools.length ? toolSummary(tools, verbosity, contentWidth) : [];
+        const textLines = text ? wrapAnsi(renderMarkdownToAnsi(text), contentWidth, { hard: true, trim: false }).split('\n') : [];
+        const body = [...toolLines, ...(toolLines.length && textLines.length ? [''] : []), ...textLines];
         const streamLabel = message.streamStatus === 'streaming' ? chalk.yellow(' · 正在生成') : message.streamStatus === 'incomplete' ? chalk.red(' · 未完成') : '';
         return { id: message.id, role: message.role, lines: [chalk.cyan.bold('Pulse') + streamLabel, ...body.map((line) => `  ${line}`)] };
     }).filter((block) => block.lines.length > 0);
@@ -59,6 +30,14 @@ export function transcriptLines(messages, width, verbosity = 'normal') {
         return [...block.lines, ...separator];
     });
 }
+function toolSummary(tools, verbosity, width) {
+    if (verbosity === 'quiet') {
+        const failed = tools.filter((tool) => tool.status === 'failed' || tool.status === 'cancelled').length;
+        const done = tools.filter((tool) => tool.status === 'succeeded').length;
+        return [chalk.dim(`工具 · ${done}/${tools.length} 已完成${failed ? ` · ${failed} 未成功` : ''}`)];
+    }
+    return renderToolCalls(tools, { verbosity, width }).lines;
+}
 export function scrollAction(input, key) {
     if (key.pageUp || (key.ctrl && input === 'p'))
         return 'up';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunterzhu/pulse-cli",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A local-first AI task assistant for coding, research, and file workflows.",
   "license": "PolyForm-Noncommercial-1.0.0",
   "keywords": [
@@ -36,7 +36,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@hunterzhu/pulse-server": "0.4.4",
+    "@hunterzhu/pulse-server": "0.4.5",
     "chalk": "^5.4.1",
     "highlight.js": "^11.10.0",
     "ink": "^7.1.1",