@bolloon/bolloon-agent 0.3.22 → 0.3.23

package/dist/electron/window.js

@@ -1,25 +1,63 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMainWindow = getMainWindow;
+exports.createMainWindow = createMainWindow;
+exports.focusMainWindow = focusMainWindow;
 /**
  * 主窗口工厂 — preload 路径解析 + dev/prod loadURL + 外部链接走系统浏览器
  */
-import { BrowserWindow, shell } from 'electron';
-import * as path from 'path';
-import { log } from './logger';
-import { isDev, MAIN_WINDOW_DEFAULT, MAIN_WINDOW_MIN, preferredPort } from './config';
-import { startWebServer } from './server';
+const electron_1 = require("electron");
+const path = __importStar(require("path"));
+const logger_1 = require("./logger");
+const config_1 = require("./config");
+const server_1 = require("./server");
 const g = globalThis;
 const __basedir = g.__dirname
     ?? (g.__filename ? path.dirname(g.__filename) : process.cwd());
 let mainWindow = null;
-export function getMainWindow() {
+function getMainWindow() {
     return mainWindow;
 }
-export async function createMainWindow() {
-    log('创建主窗口...');
-    mainWindow = new BrowserWindow({
-        width: MAIN_WINDOW_DEFAULT.width,
-        height: MAIN_WINDOW_DEFAULT.height,
-        minWidth: MAIN_WINDOW_MIN.width,
-        minHeight: MAIN_WINDOW_MIN.height,
+async function createMainWindow() {
+    (0, logger_1.log)('创建主窗口...');
+    mainWindow = new electron_1.BrowserWindow({
+        width: config_1.MAIN_WINDOW_DEFAULT.width,
+        height: config_1.MAIN_WINDOW_DEFAULT.height,
+        minWidth: config_1.MAIN_WINDOW_MIN.width,
+        minHeight: config_1.MAIN_WINDOW_MIN.height,
         title: 'Bolloon Agent',
         webPreferences: {
             nodeIntegration: false,
@@ -29,40 +67,40 @@ export async function createMainWindow() {
         },
         show: false,
     });
-    if (isDev) {
+    if (config_1.isDev) {
         // dev:web 用 tsx 起 server, 端口固定 preferredPort, 不会 EADDRINUSE 自增
-        const port = preferredPort();
+        const port = (0, config_1.preferredPort)();
         mainWindow.loadURL(`http://localhost:${port}`);
         mainWindow.webContents.openDevTools();
     }
     else {
         try {
-            log('启动内置 Web 服务器...');
-            const { port: actualPort } = await startWebServer(preferredPort());
+            (0, logger_1.log)('启动内置 Web 服务器...');
+            const { port: actualPort } = await (0, server_1.startWebServer)((0, config_1.preferredPort)());
             mainWindow.loadURL(`http://localhost:${actualPort}`);
         }
         catch (err) {
-            log(`启动服务器失败: ${err.message}`, 'error');
+            (0, logger_1.log)(`启动服务器失败: ${err.message}`, 'error');
             console.error('启动服务器失败:', err);
         }
     }
     mainWindow.once('ready-to-show', () => {
         mainWindow?.show();
-        log('窗口已显示');
+        (0, logger_1.log)('窗口已显示');
     });
     // 外部链接走系统浏览器, 不在 app 内开新窗口
     mainWindow.webContents.setWindowOpenHandler(({ url }) => {
         if (url.startsWith('http://') || url.startsWith('https://')) {
-            shell.openExternal(url);
+            electron_1.shell.openExternal(url);
         }
         return { action: 'deny' };
     });
     mainWindow.on('closed', () => {
         mainWindow = null;
     });
-    log('窗口创建完成');
+    (0, logger_1.log)('窗口创建完成');
 }
-export function focusMainWindow() {
+function focusMainWindow() {
     if (!mainWindow)
         return;
     if (mainWindow.isMinimized())
@@ -70,3 +108,4 @@ export function focusMainWindow() {
     mainWindow.show();
     mainWindow.focus();
 }
+//# sourceMappingURL=window.js.map

package/dist/electron-preload.js

@@ -1,29 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Electron Preload 脚本
  * 在渲染进程和主进程之间建立安全的通信桥梁
  * contextIsolation: true, nodeIntegration: false — 只能通过这里暴露的 API 触达主进程
  */
-import { contextBridge, ipcRenderer } from 'electron';
-contextBridge.exposeInMainWorld('electronAPI', {
+const electron_1 = require("electron");
+electron_1.contextBridge.exposeInMainWorld('electronAPI', {
     // === 原有 (保留) ===
-    getVersion: () => ipcRenderer.invoke('get-version'),
-    getUserDataPath: () => ipcRenderer.invoke('get-user-data-path'),
-    openExternal: (url) => ipcRenderer.invoke('open-external', url),
+    getVersion: () => electron_1.ipcRenderer.invoke('get-version'),
+    getUserDataPath: () => electron_1.ipcRenderer.invoke('get-user-data-path'),
+    openExternal: (url) => electron_1.ipcRenderer.invoke('open-external', url),
     // === 新增: 数据目录 ===
-    getDataPath: () => ipcRenderer.invoke('get-data-path'),
+    getDataPath: () => electron_1.ipcRenderer.invoke('get-data-path'),
     // === 新增: 文件 dialog ===
-    openFile: (opts) => ipcRenderer.invoke('dialog:open-file', opts),
-    saveFile: (opts) => ipcRenderer.invoke('dialog:save-file', opts),
-    openDirectory: (opts) => ipcRenderer.invoke('dialog:open-directory', opts),
+    openFile: (opts) => electron_1.ipcRenderer.invoke('dialog:open-file', opts),
+    saveFile: (opts) => electron_1.ipcRenderer.invoke('dialog:save-file', opts),
+    openDirectory: (opts) => electron_1.ipcRenderer.invoke('dialog:open-directory', opts),
     // === 新增: 文件系统 (限大小, 主进程守卫) ===
-    readTextFile: (opts) => ipcRenderer.invoke('fs:read-text-file', opts),
-    writeTextFile: (opts) => ipcRenderer.invoke('fs:write-text-file', opts),
-    pathExists: (opts) => ipcRenderer.invoke('fs:path-exists', opts),
+    readTextFile: (opts) => electron_1.ipcRenderer.invoke('fs:read-text-file', opts),
+    writeTextFile: (opts) => electron_1.ipcRenderer.invoke('fs:write-text-file', opts),
+    pathExists: (opts) => electron_1.ipcRenderer.invoke('fs:path-exists', opts),
     // === 新增: 首启引导 ===
-    getFirstRunSeen: () => ipcRenderer.invoke('first-run:seen'),
-    markFirstRunSeen: () => ipcRenderer.invoke('first-run:mark-seen'),
-    getDataPathSync: () => ipcRenderer.invoke('first-run:data-dir'),
-    getLogsPathSync: () => ipcRenderer.invoke('first-run:logs-dir'),
+    getFirstRunSeen: () => electron_1.ipcRenderer.invoke('first-run:seen'),
+    markFirstRunSeen: () => electron_1.ipcRenderer.invoke('first-run:mark-seen'),
+    getDataPathSync: () => electron_1.ipcRenderer.invoke('first-run:data-dir'),
+    getLogsPathSync: () => electron_1.ipcRenderer.invoke('first-run:logs-dir'),
     // === 元数据 ===
     platform: process.platform,
 });
+//# sourceMappingURL=electron-preload.js.map

package/dist/electron.js

@@ -1,5 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Electron 入口 shim — 真正逻辑在 src/electron/main.ts
  * (保留 src/electron.ts 平铺入口, 不动 package.json 的 dist/electron.js 解析)
  */
-import './electron/main';
+require("./electron/main");
+//# sourceMappingURL=electron.js.map

package/dist/external-engines/delegate.js

@@ -10,6 +10,9 @@
  *   - experiment 引擎是 API 供应商不是 CLI, 不支持委派 (提示改用 import)
  */
 import { spawn } from 'child_process';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
 import { discoverEngines, buildDelegateArgs } from './discovery.js';
 function delegateTimeoutMs() {
     const env = Number(process.env.BOLLOON_ENGINE_DELEGATE_TIMEOUT_MS);
@@ -133,6 +136,22 @@ export async function delegateToEngine(id, prompt, opts = {}) {
                 catch { /* noop */ }
                 killTree();
                 const combined = (stdout + (stderr ? `\n[stderr]\n${stderr}` : '')).trim();
+                // 2026-07-29: Sidechain transcript — 保存委派完整记录
+                try {
+                    const sidechainDir = path.join(os.homedir(), '.bolloon', 'sidechains');
+                    fs.mkdir(sidechainDir, { recursive: true });
+                    const ts = Date.now();
+                    const filePath = path.join(sidechainDir, `${ts}-${trimmedId}.jsonl`);
+                    const entry = JSON.stringify({
+                        ts, engineId: trimmedId, prompt: trimmedPrompt,
+                        stdout: stdout.slice(0, 100_000),
+                        stderr: stderr.slice(0, 10_000),
+                        exitCode: code, duration: Date.now() - ts, model: opts.model || null,
+                    }) + '\n';
+                    // fire-and-forget, 不阻塞主流程
+                    fs.appendFile(filePath, entry, 'utf-8').catch(() => { });
+                }
+                catch { /* sidechain 写入失败静默 */ }
                 if (code === 0) {
                     resolve({ success: true, output: combined || '(无输出)', exitCode: code });
                 }

package/dist/hooks/hooks-engine.js

@@ -0,0 +1,329 @@
+/**
+ * hooks-engine.ts — Phase 4: Hook 机制 (2026-07-29)
+ *
+ * Claude Code 式 hook 系统: 在 agent 循环的关键点触发外部回调.
+ *
+ * 设计决策:
+ * - 事件驱动 (EventEmitter): 注册 → 触发 → 执行回调
+ * - 2 种执行模式: shell (同步/异步 command) + llm (LLM 评估)
+ * - 回调可以拒绝/修改/记录/中断流程
+ * - 配置从 ~/.bolloon/hooks.yaml 加载
+ * - Hook 是零 context 成本 — 不在 prompt 内, 不消耗 token
+ */
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import { spawn } from 'child_process';
+import { getMinimax } from '../constraints/index.js';
+// ============== 类型 ==============
+/** 支持的 hook 事件类型 */
+export const HOOK_EVENT_TYPES = [
+    'preToolUse', // 工具调用前 — 可返回 {deny, reason} 拒绝
+    'postToolUse', // 工具调用后 — 可注入系统提示
+    'onMessage', // 用户/助手消息后
+    'onSessionStart', // 会话开始
+    'onSessionEnd', // 会话结束
+    'onLoopStart', // ReAct 循环开始
+    'onLoopEnd', // ReAct 循环结束
+    'onError', // 发生 API/工具错误
+];
+// ============== Hook 引擎 ==============
+export class HooksEngine {
+    hooks = new Map();
+    configPath;
+    constructor(home) {
+        this.configPath = path.join(home || os.homedir(), '.bolloon', 'hooks.yaml');
+    }
+    /** 注册一个 hook */
+    register(config) {
+        if (!config.id)
+            throw new Error('Hook id 必填');
+        if (!HOOK_EVENT_TYPES.includes(config.event)) {
+            throw new Error(`未知 hook 事件: ${config.event}, 可用: ${HOOK_EVENT_TYPES.join(', ')}`);
+        }
+        this.hooks.set(config.id, { ...config, enabled: config.enabled ?? true });
+    }
+    /** 批量注册 */
+    registerMany(configs) {
+        for (const c of configs)
+            this.register(c);
+    }
+    /** 注销 hook */
+    unregister(id) {
+        return this.hooks.delete(id);
+    }
+    /** 获取指定事件的所有启用的 hook */
+    getHooks(event) {
+        return Array.from(this.hooks.values()).filter(h => h.enabled !== false && h.event === event);
+    }
+    /** 获取所有 hook */
+    listAll() {
+        return Array.from(this.hooks.values());
+    }
+    /** 启用/禁用 */
+    setEnabled(id, enabled) {
+        const h = this.hooks.get(id);
+        if (!h)
+            return false;
+        h.enabled = enabled;
+        return true;
+    }
+    /**
+     * 触发一个事件, 执行所有匹配的 hook.
+     * 返回 HookResult 数组.
+     *
+     * preToolUse 的 deny 结果: 如果任意 hook 返回 deny=true, 该工具被拒绝.
+     */
+    async fire(event, ctx) {
+        const matched = this.getHooks(event);
+        if (matched.length === 0)
+            return [];
+        const results = [];
+        for (const hook of matched) {
+            // preToolUse 工具过滤
+            if (event === 'preToolUse' && hook.toolFilter && ctx.toolName) {
+                if (!hook.toolFilter.includes(ctx.toolName))
+                    continue;
+            }
+            try {
+                const result = await this.executeHook(hook, ctx);
+                results.push(result);
+            }
+            catch (e) {
+                results.push({
+                    id: hook.id,
+                    error: String(e),
+                    elapsedMs: 0,
+                });
+            }
+        }
+        return results;
+    }
+    /**
+     * 检查 preToolUse hook 是否拒绝当前工具.
+     * 返回第一个 deny 的 HookResult, 或 null.
+     */
+    async checkToolUse(toolName, args) {
+        const results = await this.fire('preToolUse', {
+            event: 'preToolUse',
+            toolName,
+            toolArgs: args,
+        });
+        for (const r of results) {
+            if (r.deny)
+                return r;
+        }
+        return null;
+    }
+    /**
+     * 执行单个 hook.
+     */
+    async executeHook(hook, ctx) {
+        const start = Date.now();
+        const timeoutMs = hook.timeoutMs ?? 5000;
+        if (hook.mode === 'shell' && hook.command) {
+            return this.execShell(hook, ctx, start, timeoutMs);
+        }
+        if (hook.mode === 'llm' && hook.prompt) {
+            return this.execLlm(hook, ctx, start, timeoutMs);
+        }
+        return {
+            id: hook.id,
+            error: `不支持的执行模式: ${hook.mode}`,
+            elapsedMs: Date.now() - start,
+        };
+    }
+    /**
+     * shell 模式: spawn 子进程执行命令.
+     * 环境变量 HOOK_EVENT / HOOK_TOOL / HOOK_ARGS / HOOK_RESULT 传递上下文.
+     */
+    async execShell(hook, ctx, start, timeoutMs) {
+        return new Promise((resolve) => {
+            const env = {
+                ...process.env,
+                HOOK_EVENT: ctx.event,
+                HOOK_TOOL: ctx.toolName || '',
+                HOOK_ARGS: ctx.toolArgs ? JSON.stringify(ctx.toolArgs) : '',
+                HOOK_RESULT: ctx.toolResult ? JSON.stringify(ctx.toolResult).slice(0, 2000) : '',
+                HOOK_MESSAGE: ctx.messageContent || '',
+                HOOK_CHANNEL: ctx.channelId || '',
+                HOOK_SESSION: ctx.sessionId || '',
+                HOOK_ERROR: ctx.error || '',
+            };
+            const proc = spawn('sh', ['-c', hook.command], {
+                env,
+                stdio: ['ignore', 'pipe', 'pipe'],
+                timeout: timeoutMs,
+            });
+            let stdout = '';
+            let stderr = '';
+            proc.stdout.on('data', (d) => { stdout += d.toString(); });
+            proc.stderr.on('data', (d) => { stderr += d.toString(); });
+            const timer = setTimeout(() => {
+                proc.kill('SIGTERM');
+                resolve({
+                    id: hook.id,
+                    rawOutput: stdout.slice(0, 1000),
+                    timedOut: true,
+                    elapsedMs: Date.now() - start,
+                });
+            }, timeoutMs);
+            proc.on('close', (code) => {
+                clearTimeout(timer);
+                const elapsed = Date.now() - start;
+                // 解析 stdout: 如果是 JSON, 提取 deny/系统注入
+                let deny = false;
+                let reason = '';
+                let systemAddition = '';
+                try {
+                    const parsed = JSON.parse(stdout.trim());
+                    if (parsed.deny) {
+                        deny = true;
+                        reason = parsed.reason || 'Hook 拒绝';
+                    }
+                    if (parsed.systemAddition) {
+                        systemAddition = parsed.systemAddition;
+                    }
+                }
+                catch {
+                    // 不是 JSON, 当普通输出
+                }
+                resolve({
+                    id: hook.id,
+                    deny,
+                    reason,
+                    systemAddition,
+                    rawOutput: stdout.slice(0, 1000),
+                    elapsedMs: elapsed,
+                    error: code !== 0 ? `exit ${code}: ${stderr.slice(0, 200)}` : undefined,
+                });
+            });
+            proc.on('error', (err) => {
+                clearTimeout(timer);
+                resolve({
+                    id: hook.id,
+                    error: String(err),
+                    elapsedMs: Date.now() - start,
+                });
+            });
+        });
+    }
+    /**
+     * LLM 模式: 用当前 LLM 评估 hook prompt.
+     * 将上下文注入 prompt, 获取 LLM 的判断.
+     */
+    async execLlm(hook, ctx, start, timeoutMs) {
+        try {
+            const minimax = getMinimax();
+            if (!minimax) {
+                return { id: hook.id, error: 'LLM 不可用 (minimax 未初始化)', elapsedMs: Date.now() - start };
+            }
+            // 构建评估 prompt
+            const contextStr = [
+                `事件: ${ctx.event}`,
+                ctx.toolName ? `工具: ${ctx.toolName}` : '',
+                ctx.toolArgs ? `参数: ${JSON.stringify(ctx.toolArgs).slice(0, 500)}` : '',
+                ctx.toolResult ? `结果: ${JSON.stringify(ctx.toolResult).slice(0, 500)}` : '',
+                ctx.messageContent ? `消息: ${ctx.messageContent.slice(0, 500)}` : '',
+                ctx.error ? `错误: ${ctx.error}` : '',
+            ].filter(Boolean).join('\n');
+            const fullPrompt = `【Hook 评估】\n${contextStr}\n\n【规则】\n${hook.prompt}\n\n请以 JSON 格式回答, 包含字段: deny (boolean), reason (string), systemAddition (string, 可选).`;
+            const response = await minimax.chat(fullPrompt, '', undefined);
+            const reply = (response.reply || '').trim();
+            let parsed;
+            try {
+                // 尝试提取 JSON
+                const jsonMatch = reply.match(/\{[\s\S]*\}/);
+                parsed = jsonMatch ? JSON.parse(jsonMatch[0]) : { deny: false };
+            }
+            catch {
+                parsed = { deny: false };
+            }
+            return {
+                id: hook.id,
+                deny: parsed.deny === true,
+                reason: parsed.reason || '',
+                systemAddition: parsed.systemAddition || '',
+                rawOutput: reply.slice(0, 1000),
+                elapsedMs: Date.now() - start,
+            };
+        }
+        catch (e) {
+            return {
+                id: hook.id,
+                error: String(e),
+                elapsedMs: Date.now() - start,
+            };
+        }
+    }
+    /**
+     * 从 ~/.bolloon/hooks.yaml 加载配置.
+     * 失败静默 (没有 hook 配置也正常).
+     */
+    async loadFromConfig() {
+        try {
+            const raw = await fs.readFile(this.configPath, 'utf-8');
+            // 简单解析 YAML-like: id/event/mode/command/prompt/toolFilter
+            const lines = raw.split('\n');
+            let current = {};
+            for (const line of lines) {
+                const trimmed = line.trim();
+                if (!trimmed || trimmed.startsWith('#') || trimmed.startsWith('---'))
+                    continue;
+                // hook 分隔: 空行或 ---
+                if (trimmed === '---' || (trimmed.length === 0 && current.id)) {
+                    if (current.id && current.event) {
+                        this.register(current);
+                    }
+                    current = {};
+                    continue;
+                }
+                const sep = trimmed.indexOf(':');
+                if (sep < 0)
+                    continue;
+                const key = trimmed.slice(0, sep).trim();
+                const val = trimmed.slice(sep + 1).trim();
+                switch (key) {
+                    case 'id':
+                        current.id = val;
+                        break;
+                    case 'event':
+                        current.event = val;
+                        break;
+                    case 'mode':
+                        current.mode = val;
+                        break;
+                    case 'command':
+                        current.command = val;
+                        break;
+                    case 'prompt':
+                        current.prompt = val;
+                        break;
+                    case 'timeout_ms':
+                        current.timeoutMs = parseInt(val, 10) || 5000;
+                        break;
+                    case 'enabled':
+                        current.enabled = val === 'true';
+                        break;
+                    case 'description':
+                        current.description = val;
+                        break;
+                    case 'tool_filter':
+                        current.toolFilter = val.split(',').map(s => s.trim()).filter(Boolean);
+                        break;
+                }
+            }
+            // 最后一条
+            if (current.id && current.event) {
+                this.register(current);
+            }
+        }
+        catch {
+            // 文件不存在 / 无法解析 — 静默
+        }
+    }
+    /** 获取默认配置路径 */
+    getConfigPath() {
+        return this.configPath;
+    }
+}

package/dist/index.js

@@ -15,7 +15,7 @@ import { createSubAgentManager } from './agents/subagent-manager.js';
 import { getGlobalSharedContext } from './social/global-shared-context.js';
 import { createBollharnessIntegration } from './bollharness-integration/index.js';
 import * as readline from 'readline';
-import { printBanner, renderDialog, renderUserMessage, renderAgentMessage, renderToolCall, flowConnector, termWidth, brandArtLines, boxTop, boxRow, boxBottom, dispWidth } from './cli/loading-tui.js';
+import { printBanner, renderDialog, renderUserMessage, renderAgentMessage, renderToolCallListItem, renderToolCallBody, renderToolCallsFooter, termWidth, brandArtLines, boxTop, boxRow, boxBottom, dispWidth } from './cli/loading-tui.js';
 // 启动自动检查更新：后台、节流、检测到新版本自动安装（可被 --no-update / BOLLOON_SKIP_UPDATE 关闭）
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
@@ -90,15 +90,21 @@ const s = {
         console.log();
     },
     Thinking: () => {
-        const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+        const frames = ['(｀・ω・´)', '(´･_･`)', '(｡•́︿•̀｡)', 'ᕙ(▀̿̿Ĺ̯̿̿▀̿ ̿)ᕗ', '(◕‿◕)'];
         let i = 0;
+        let dots = 0;
+        const frame = frames[0];
+        process.stdout.write(`  ${frame} 思考...`);
         return setInterval(() => {
-            process.stdout.write(`\r  ${YELLOW}${frames[i++ % frames.length]} 思考中...${RESET}    `);
-        }, 80);
+            i = (i + 1) % frames.length;
+            dots = (dots + 1) % 4;
+            const dotStr = '.'.repeat(dots || 1);
+            process.stdout.write(`\r  ${frames[i]} 思考${dotStr}   `);
+        }, 600);
     },
     clearThinking: (interval) => {
         clearInterval(interval);
-        process.stdout.write('\r' + ' '.repeat(30) + '\r');
+        process.stdout.write('\r' + ' '.repeat(40) + '\r');
     },
     dialog: async (title, promptText) => {
         return new Promise((resolve) => {
@@ -423,6 +429,8 @@ async function replReadline(comm) {
         const prefix = queueMode ? `${C_WARN}▸${RST}` : `${C_ACCENT}❯${RST}`;
         const raw = await new Promise(resolve => rl.question(`\n${sepLine}\n${statusBarLine()}\n${sepLine}\n${prefix} `, resolve));
         const trimmed = raw.trim();
+        // 清除 readline echo 行, 避免与 renderUserMessage 重复
+        process.stdout.write('\r\x1b[K');
         process.stdout.write(`\n${sepLine}\n\n\n\n\n`);
         if (!trimmed)
             continue;
@@ -556,41 +564,51 @@ async function processInput(input, comm) {
     try {
         // 双横线分割
         process.stdout.write(`${C_DIM}${'─'.repeat(8)} · ${'─'.repeat(8)}${RESET}\n`);
-        // 已发送消息框
         process.stdout.write(renderUserMessage(trimmed) + '\n');
         const a = await getAgent();
         const boxW = Math.min(termWidth() - 2, 76);
-        const pending = [];
-        let firstEvent = true;
-        const clearThinking = () => {
-            if (firstEvent) {
-                process.stdout.write('\r' + ' '.repeat(30) + '\r');
-                firstEvent = false;
+        const toolCalls = [];
+        let toolCounter = 0;
+        // 启动 thinking 加载动画 (颜文字), 第一个工具事件或 prompt 完成后停止
+        let thinkingInterval = null;
+        const stopThinking = () => {
+            if (thinkingInterval) {
+                s.clearThinking(thinkingInterval);
+                thinkingInterval = null;
             }
         };
+        thinkingInterval = s.Thinking();
         const onStream = (e) => {
             if (e.type === 'step_start') {
-                pending.push({ tool: e.tool, args: e.args, t0: Date.now() });
+                toolCounter++;
+                toolCalls.push({ tool: e.tool, args: e.args, _t: Date.now() });
             }
             else if (e.type === 'step_done' || e.type === 'step_error') {
-                const p = pending.shift();
-                clearThinking();
-                // 连接线只在第 2 个及之后的工具框前出现
-                if (!firstEvent)
-                    process.stdout.write(flowConnector(boxW) + '\n');
-                process.stdout.write(renderToolCall({
+                stopThinking();
+                const p = toolCalls.shift();
+                const doneItem = {
                     tool: e.tool ?? p?.tool ?? '?',
                     args: p?.args,
                     status: e.type === 'step_done' ? 'ok' : 'error',
                     output: e.output,
                     error: e.error,
-                    durationMs: p ? Date.now() - p.t0 : undefined,
-                    width: boxW,
-                }) + '\n');
+                    durationMs: p ? Date.now() - p._t : undefined,
+                };
+                process.stdout.write(renderToolCallListItem(doneItem, toolCalls.length + 1, toolCounter) + '\n');
+                const bodyText = e.type === 'step_done' ? e.output : e.error;
+                if (bodyText && bodyText.length > 0) {
+                    const bodyRendered = renderToolCallBody(doneItem, boxW);
+                    if (bodyRendered)
+                        process.stdout.write(bodyRendered + '\n');
+                }
+                // 全部完成时打印 footer
+                if (toolCalls.length === 0 && toolCounter > 0) {
+                    process.stdout.write(renderToolCallsFooter(toolCounter) + '\n');
+                }
             }
         };
         const response = await a.prompt(trimmed, { onStream });
-        clearThinking();
+        stopThinking();
         // 智能体回复框 (圆角)
         process.stdout.write(renderAgentMessage(response) + '\n');
         // 更新底部状态栏: 上下文进度