@bolloon/bolloon-agent 0.4.4 → 0.4.6

package/dist/agents/pi-sdk-tools.js

@@ -34,6 +34,43 @@ export const SIDE_EFFECT_TOOLS = new Set([
     'write_file', 'edit_file', 'shell_exec', 'git_commit', 'git_push', 'git_branch',
     'create_task', 'update_task',
 ]);
+export async function runTerminalCommand(raw, opts = {}) {
+    const { checkTerminalCommand } = await import('./shell-guard.js');
+    const timeoutMs = opts.timeoutMs ?? 30000;
+    const list = (opts.commands && opts.commands.length > 0) ? opts.commands : [raw];
+    for (const c of list) {
+        const guard = checkTerminalCommand(String(c || '').trim());
+        if (!guard.allowed) {
+            return { success: false, error: `[terminal-guard] ${guard.reason}`, deniedByGuard: true };
+        }
+    }
+    const { exec } = await import('child_process');
+    const runOne = (cmdStr) => new Promise((resolve) => {
+        exec(cmdStr, {
+            cwd: opts.cwd ?? process.cwd(),
+            timeout: timeoutMs,
+            maxBuffer: 8 * 1024 * 1024,
+            env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        }, (err, stdout, stderr) => {
+            const output = ((stdout || '') + (stderr ? `\n[stderr]\n${stderr}` : '')).trim().slice(0, 8000);
+            if (err) {
+                resolve({ success: false, cmd: cmdStr.slice(0, 120), error: `exit ${err.code ?? '?'}: ${String(err.message || '').slice(0, 200)}`, output: output || undefined });
+            }
+            else {
+                resolve({ success: true, cmd: cmdStr.slice(0, 120), output: output || '(无输出)' });
+            }
+        });
+    });
+    if (list.length === 1)
+        return runOne(list[0]);
+    const results = await Promise.all(list.map((c) => runOne(c)));
+    const failed = results.filter((r) => !r.success);
+    const allOutput = results.map((r) => `${r.cmd}\n${r.output || r.error || ''}`).join('\n\n---\n\n');
+    if (failed.length > 0) {
+        return { success: false, error: `${failed.length}/${list.length} 条命令失败: ${failed[0].error}`, output: allOutput, partial: results };
+    }
+    return { success: true, output: allOutput, count: list.length, parallel: true };
+}
 export function registerBuiltinTools(ctx) {
     ctx.tools.set('read_document', {
         name: 'read_document',
@@ -621,17 +658,22 @@ export function registerBuiltinTools(ctx) {
     for (const tool of p2pDocumentTools) {
         ctx.tools.set(tool.name, tool);
     }
-    // shell_exec
+    // 2026-08-12 (Task2): shell_exec / terminal 统一走模块级 runTerminalCommand (宽松护栏 + 多命令并行).
+    // shell_exec — 2026-08-12 (Task2): 与 terminal 统一走宽松护栏 (denylist-only).
+    //   兼容旧格式 (command + args 数组), 内部转成完整命令字符串交给 runTerminal,
+    //   不再用窄白名单 → 模型不会因 "command 不在白名单" 报错.
     ctx.tools.set('shell_exec', {
         name: 'shell_exec',
-        description: '在 cwd 跑 shell 命令. 仅支持白名单内命令: git, npm, npx, tsx, tsc, vitest, cat, head, tail, ls, wc, echo, pwd, date, mkdir, touch. 禁止管道/重定向/rm -rf/sudo. 命中护栏黑名单会被拒.',
-        parameters: { command: '可执行文件 (必填, 必须在白名单)', args: '参数数组, 逗号分隔', timeoutMs: '超时毫秒, 默认 30000' },
+        description: '执行 shell 命令 (兼容模式, 参数数组或命令字符串均可). 护栏只挡高危破坏操作 (sudo/格式化/rm -rf 根目录/写 ~/.bolloon 数据). 推荐直接用 terminal 传完整命令字符串.',
+        parameters: { command: '可执行文件 或 完整命令 (必填)', args: '参数数组, 逗号分隔 (可选)', timeoutMs: '超时毫秒, 默认 30000' },
         execute: async (args) => {
             const cmd = String(args.command || '').trim();
             if (!cmd)
                 return { success: false, error: 'command 必填' };
-            let argList = [];
+            // 兼容参数数组 → 拼成命令字符串
+            let full = cmd;
             const rawArgs = args.args;
+            let argList = [];
             if (Array.isArray(rawArgs)) {
                 argList = rawArgs.map((s) => String(s).trim()).filter(Boolean);
             }
@@ -640,61 +682,36 @@ export function registerBuiltinTools(ctx) {
                 if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
                     try {
                         const parsed = JSON.parse(trimmed);
-                        if (Array.isArray(parsed)) {
+                        if (Array.isArray(parsed))
                             argList = parsed.map((s) => String(s).trim()).filter(Boolean);
-                        }
                     }
-                    catch { /* fall through to comma split */ }
+                    catch { /* 非 JSON 数组 */ }
                 }
-                if (argList.length === 0) {
+                if (argList.length === 0)
                     argList = trimmed.split(',').map(s => s.trim()).filter(Boolean);
-                }
-            }
-            const timeoutMs = Number(args.timeoutMs) || 30000;
-            const result = await shellExec(cmd, argList, { timeoutMs });
-            if (result.deniedByGuard) {
-                return { success: false, error: result.error };
             }
-            if (!result.success) {
-                return { success: false, error: result.error, output: result.output };
+            // 若 command 只是可执行文件名且带 args → 拼成 "cmd arg1 arg2"; 否则原样
+            if (argList.length > 0 && !/\s/.test(cmd) && !cmd.includes('&&') && !cmd.includes(';') && !cmd.includes('|')) {
+                full = `${cmd} ${argList.map(a => (/[\s"&|<>^()%!`]/.test(a) ? `"${a.replace(/"/g, '""')}"` : a)).join(' ')}`;
             }
-            return { success: true, output: result.output };
+            const timeoutMs = Number(args.timeoutMs) || 30000;
+            return await runTerminalCommand(full, { timeoutMs, cwd: ctx.cwd });
         }
     });
     // 2026-08-10: terminal — 灵活终端写命令 (用户要求: bolloon 自己写命令进 terminal, 少围栏).
-    //   与 shell_exec 的区别: 接受**完整 shell 命令字符串** (管道/重定向/写文件都行),
-    //   护栏只挡高危破坏模式 (checkTerminalCommand: 提权/格式化/删根/.bolloon 数据), 其余放行.
+    //   2026-08-12 (Task2): 支持 commands 数组并行执行; 与 shell_exec 统一走 runTerminalCommand.
+    //   与 shell_exec 的区别: 直接接受完整 shell 命令字符串, 更适合模型自主写命令.
     ctx.tools.set('terminal', {
         name: 'terminal',
-        description: '执行完整 shell 命令 (支持管道/重定向/写文件/跑脚本). 护栏只挡高危破坏操作 (sudo/格式化/rm -rf 根目录/写 ~/.bolloon 数据), 其余灵活放行. 适合: 写 HTML 文件、跑 python/node 脚本、查系统状态、装依赖.',
-        parameters: { command: '完整 shell 命令 (必填, 如: echo "<html>" > /tmp/site/index.html && ls /tmp/site)', timeoutMs: '超时毫秒, 默认 30000' },
+        description: '执行完整 shell 命令 (支持管道/重定向/写文件/跑脚本). 护栏只挡高危破坏操作 (sudo/格式化/rm -rf 根目录/写 ~/.bolloon 数据), 其余灵活放行. 适合: 写 HTML 文件、跑 python/node 脚本、查系统状态、装依赖. 多条命令用 commands 数组并行执行.',
+        parameters: { command: '完整 shell 命令 (必填, 如: echo "<html>" > /tmp/site/index.html && ls /tmp/site)', commands: '可选: 多条命令数组 (并行执行), 每条独立字符串', timeoutMs: '超时毫秒, 默认 30000' },
         execute: async (args) => {
             const raw = String(args.command || '').trim();
-            if (!raw)
-                return { success: false, error: 'command 必填' };
-            const { checkTerminalCommand } = await import('./shell-guard.js');
-            const guard = checkTerminalCommand(raw);
-            if (!guard.allowed) {
-                return { success: false, error: `[terminal-guard] ${guard.reason}`, deniedByGuard: true };
-            }
-            const { exec } = await import('child_process');
+            const commands = Array.isArray(args.commands) ? args.commands.map((c) => String(c || '').trim()).filter(Boolean) : [];
+            if (!raw && commands.length === 0)
+                return { success: false, error: 'command 或 commands 必填' };
             const timeoutMs = Number(args.timeoutMs) || 30000;
-            return new Promise((resolve) => {
-                exec(raw, {
-                    cwd: process.cwd(),
-                    timeout: timeoutMs,
-                    maxBuffer: 8 * 1024 * 1024,
-                    env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
-                }, (err, stdout, stderr) => {
-                    const output = ((stdout || '') + (stderr ? `\n[stderr]\n${stderr}` : '')).trim().slice(0, 8000);
-                    if (err) {
-                        resolve({ success: false, error: `exit ${err.code ?? '?'}: ${String(err.message || '').slice(0, 200)}`, output: output || undefined });
-                    }
-                    else {
-                        resolve({ success: true, output: output || '(无输出)' });
-                    }
-                });
-            });
+            return await runTerminalCommand(raw, { timeoutMs, cwd: ctx.cwd, commands: commands.length > 0 ? commands : undefined });
         }
     });
     // self_improve

package/dist/agents/pi-sdk.js

@@ -201,6 +201,15 @@ export class PiAgentSession {
     currentSignal = null;
     /** Bootstrap SessionStart 拼的 system prompt 片段 (用完即清) */
     bootstrapAddition = '';
+    /** 2026-08-12 (Task3 认知卸载): 工具选择与认知卸载指南 — 注入 system prompt, 降低"模型不触发 write/edit/read"率. */
+    static TOOL_SELECTION_GUIDE = `【工具选择与认知卸载指南 (严格遵循)】
+- 写/改文件: 必须用 write_file / edit_file (不要用 terminal 拼字符串写文件).
+- 读文件: 用 read_file / read_directory / list_files.
+- 跑命令/查状态/装依赖/跑脚本: 用 terminal.
+- 执行 git 操作: 用 git_* 专用工具 (git_diff/git_commit/git_push/git_branch/git_log).
+- 查看/调用技能: 用 list_skills / use_skill.
+- 认知卸载: 当任务对你过大或反复失败时, 不要死磕 — 用 delegate_to_engine 把编码/复杂任务委派给外部引擎 (codex/claude-code/opencode), 或把目标拆小分步完成.
+- 每步只选一个最合适的工具, 先读后写, 写完验证 (跑 tsc/vitest 或读回文件).`;
     /** 当前 prompt 开始时间 (供 Stop hook 计算 durationMs) */
     promptStartTime = 0;
     /** 当前 channel id (由 getAgentForChannel / prompt 4 参注入, 供 hook / log 使用) */
@@ -1055,6 +1064,8 @@ ${this.currentIntentHint}
 
 ${this.getToolDefinitions()}
 
+${PiAgentSession.TOOL_SELECTION_GUIDE}
+
 工作模式:
 1. 理解用户自然语言请求
 2. 分析需要哪些工具来完成
@@ -1295,6 +1306,8 @@ ${loopProgressSection}
 
 ${toolDefs}
 
+${PiAgentSession.TOOL_SELECTION_GUIDE}
+
 工作模式:
 1. 理解用户自然语言请求
 2. 分析需要哪些工具来完成

package/dist/agents/skill-writer.js

@@ -266,9 +266,21 @@ export async function writeRunEndSkillCandidates(steps, source, minOk = 2) {
         return { wrote: false, reason: `成功工具不足 (${okSteps.length} < ${minOk})` };
     }
     const toolNames = okSteps.map((s) => s.name).slice(0, 5).join(', ');
-    const body = `## 背景\n本轮对话连续成功调用了 ${okSteps.length} 个工具: ${toolNames}.\n\n` +
-        `## 流程\n${okSteps.map((s) => `1. 调用 ${s.name}${s.output ? ': ' + String(s.output).slice(0, 120) : ''}`).join('\n')}\n\n` +
-        `## 注意事项\n- 工具名以 list_skills / get_operation_logs 的实际注册名为准\n- 沉淀为正式 skill 前请人工确认流程可复用\n`;
+    // 2026-08-12 (Task5): 让 run-end 候选 body 更可复用 — 结构化呈现调用链 + 每步作用 + 适用场景.
+    const stepLines = okSteps.map((s, i) => {
+        const out = s.output ? String(s.output).replace(/\s+/g, ' ').slice(0, 140) : '';
+        return `${i + 1}. **${s.name}**${out ? ` — ${out}` : ''}`;
+    }).join('\n');
+    const body = `## 适用场景\n用户请求需要连续执行工具序列: ${toolNames}.\n\n` +
+        `## 调用链\n${stepLines}\n\n` +
+        `## 流程要点\n${okSteps.map((s, i) => {
+            // 2026-08-12 (Task5 优化): 用真实输出提炼每步作用, 避免千篇一律的"调用 X 获取下一步输入".
+            const out = s.output ? String(s.output).replace(/\s+/g, ' ').trim() : '';
+            const clue = out && out.length > 30 ? out.slice(0, 60) + '…' : (out || '完成');
+            return `- 第 ${i + 1} 步 ${s.name}: ${clue}`;
+        }).join('\n')}\n\n` +
+        `## 如何验证\n- 涉及改代码: 跑 tsc + vitest 确认无错; 涉及写文件: read_file 读回校验.\n` +
+        `- 沉淀为正式 skill 前请人工确认流程可复用, 再 list_skill_candidates / promote_skill 转正\n`;
     // 2026-08-08: 稳定签名 + 固定文件名 → 同一套工具反复跑时合并更新到同一个候选 (runs++)
     const signature = toolSignature(okSteps);
     const candName = `auto-${signature}`;

package/dist/agents/workflow-pivot-loop.js

@@ -193,6 +193,16 @@ export class WorkflowPivotLoop {
      *   传原生 tools + tool_choice auto → LLM 返回结构化 tool_calls.
      */
     buildOpenAITools() {
+        // 2026-08-12 (Task3 认知卸载): 核心编码工具加强 description, 提升模型触发率.
+        const USAGE_HINT = {
+            write_file: '写/创建文件用此工具 (改代码首选). ',
+            edit_file: '修改文件指定内容用此工具 (改代码首选). ',
+            read_file: '读取文件内容用此工具. ',
+            read_directory: '列目录用此工具. ',
+            list_files: '列出文件用此工具. ',
+            terminal: '跑 shell 命令/脚本/装依赖/查状态用此工具 (不要用它写文件). ',
+            delegate_to_engine: '任务过大或复杂时委派给外部编码引擎 (认知卸载). ',
+        };
         const out = [];
         for (const [name, tool] of this.tools) {
             const params = tool.parameters || {};
@@ -207,7 +217,7 @@ export class WorkflowPivotLoop {
                 type: 'function',
                 function: {
                     name,
-                    description: tool.description || name,
+                    description: (USAGE_HINT[name] || '') + (tool.description || name),
                     parameters: { type: 'object', properties, required },
                 },
             });

package/dist/bootstrap/memory-compressor.js

@@ -54,7 +54,7 @@ export function getSessionCursorPath(agentId, channelId, sessionId, home) {
 /**
  * Session 缓存文件路径 (跟 server.ts:1806 sessionKey 规则一致)
  */
-function getSessionCacheFile(channelId, sessionId, home) {
+export function getSessionCacheFile(channelId, sessionId, home) {
     const root = path.join(home || os.homedir(), '.bolloon', 'sessions', 'cache');
     const safeChannel = sanitizeKey(channelId);
     const safeSession = sanitizeKey(sessionId).replace(/:/g, '__');

package/dist/cli/ink-app.js

@@ -293,11 +293,23 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
         globalThis.__inkSetTransient = (v) => {
             setTransient(v === undefined ? null : v);
         };
+        // 2026-08-12 (Task4): 原地替换最后一条消息 (命令加载态 → 完成态用).
+        //   不命中则追加 (兼容旧逻辑).
+        globalThis.__inkReplaceLast = (line) => {
+            setMsgs(prev => {
+                if (prev.length === 0)
+                    return [...prev, line];
+                const next = prev.slice();
+                next[next.length - 1] = line;
+                return next;
+            });
+        };
         return () => {
             delete globalThis.__inkAppend;
             delete globalThis.__inkSetStatus;
             delete globalThis.__inkSetThinking;
             delete globalThis.__inkSetTransient;
+            delete globalThis.__inkReplaceLast;
         };
     }, []);
     const onSubmit = useCallback((value) => {
@@ -574,6 +586,12 @@ export function inkAppendLine(line) {
     if (fn)
         fn(line);
 }
+/** 2026-08-12 (Task4): 原地替换最后一条消息 (命令加载态 → 完成态). 无消息时追加. */
+export function inkReplaceLastLine(line) {
+    const fn = globalThis.__inkReplaceLast;
+    if (fn)
+        fn(line);
+}
 export function inkSetStatus(s) {
     const fn = globalThis.__inkSetStatus;
     if (fn)

package/dist/index.js

@@ -16,7 +16,7 @@ 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, renderMessageBox, renderToolCallListItem, termWidth } from './cli/loading-tui.js';
-import { startInk, stopInk, inkAppendLine as appendLine, inkSetStatus, inkSetThinking, inkSetTransient } from './cli/ink-app.js';
+import { startInk, stopInk, inkAppendLine as appendLine, inkReplaceLastLine as replaceLastLine, inkSetStatus, inkSetThinking, inkSetTransient } from './cli/ink-app.js';
 // 启动自动检查更新：后台、节流、检测到新版本自动安装（可被 --no-update / BOLLOON_SKIP_UPDATE 关闭）
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
@@ -423,6 +423,9 @@ let cliStartTime = 0;
 let cliModelName = '…';
 let cliAgentName = '…';
 let cliActiveChannelId = null;
+// 2026-08-12: 当前 active channel 的 agentId (如 agent-alice). memory 落盘按 agentId 存,
+//   /memory /resume /did 读路径必须用 agentId 而非 display name (cliAgentName), 否则路径不一致读不到.
+let cliAgentId = null;
 // 2026-08-10: CLI 自动整理心跳 (与社交心跳并列, 独立于 server) — 退出时 stop
 let cliOrganizeHeartbeat = null;
 function fmtDuration(ms) {
@@ -435,6 +438,13 @@ function fmtDuration(ms) {
     const h = Math.floor(m / 60);
     return `${h}h ${m % 60}m`;
 }
+/** 2026-08-12: 返回当前 agentId (memory 路径用). 优先 cliAgentId, fallback cliAgentName. */
+function getCliAgentId() {
+    if (cliAgentId)
+        return cliAgentId;
+    // 无显式 agentId 时退到 cliAgentName (harness 默认 'agent', 其余用名字)
+    return cliAgentName === 'bolloon' ? 'agent' : (cliAgentName || 'agent');
+}
 /** 2026-08-06: 从 ContextManager 读上下文用量 (CLI 状态栏数据源, 失败退化 0/1M) */
 // 2026-08-07: 不能用 require 加载 ESM 模块 (ERR_REQUIRE_ESM) → startCLI 里 await import 一次缓存引用,
 //   同步函数 getCliCtxUsage/getStatus 复用 — 之前裸 require 与 _require 都抛错被 catch → 状态栏恒 0/1M
@@ -563,6 +573,9 @@ async function startCLI(comm) {
         if (active) {
             cliAgentName = active.name;
             cliActiveChannelId = active.channelId ?? null;
+            // 2026-08-12: 同步 agentId (memory 路径一致) — 从 rawChannels 按 channelId 取 agentId
+            const raw = active.channelId ? store.rawChannels.find((c) => c.id === active.channelId) : undefined;
+            cliAgentId = raw?.agentId || null;
         }
     }
     catch {
@@ -692,23 +705,36 @@ async function processInput(input, comm) {
     const runEndOkSteps = [];
     // each iteration
     let lastToolEvent = null;
-    // !command — 直接执行终端命令
+    // !command — 直接执行终端命令. 2026-08-12 (Task4): 支持多命令 (&& / ;) 逐段顺序执行 + 加载显示.
     if (trimmed.startsWith('!')) {
         const cmd = trimmed.slice(1).trim();
         if (!cmd) {
-            appendLine(`${C_DIM}!<命令> 执行终端命令, 如 !ls -la${RESET}`);
+            appendLine(`${C_DIM}!<命令> 执行终端命令 (支持 && 串联多命令), 如 !ls -la${RESET}`);
             return;
         }
-        appendLine(`${C_DIM}── $ ${cmd}${RESET}`);
+        const { execSync } = await import('child_process');
+        // 拆成多段: && 逻辑与 (前失败则停) / ; 无条件顺序. 保留每段顺序执行, 显示加载态.
+        const segments = cmd.split(/\s*;\s*/).filter(Boolean);
         try {
-            const { execSync } = await import('child_process');
-            const out = execSync(cmd, { timeout: 30000, encoding: 'utf-8', cwd: process.cwd() });
-            appendLine(`${C_DIM}${out || '(无输出)'}${RESET}`);
+            for (const seg of segments) {
+                const segCmds = seg.split(/\s*&&\s*/).filter(Boolean);
+                for (const c of segCmds) {
+                    appendLine(`${C_DIM}── $ ${c}${RESET}`);
+                    try {
+                        const out = execSync(c, { timeout: 30000, encoding: 'utf-8', cwd: process.cwd() });
+                        appendLine(`${C_DIM}${out || '(无输出)'}${RESET}`);
+                    }
+                    catch (e) {
+                        appendLine(`${C_ERROR}${e.stderr || e.message}${RESET}`);
+                        // && 逻辑与: 某段失败则中止后续 && 段
+                        break;
+                    }
+                }
+            }
         }
-        catch (e) {
-            appendLine(`${C_ERROR}${e.stderr || e.message}${RESET}`);
+        finally {
+            appendLine(`${C_DIM}──${RESET}`);
         }
-        appendLine(`${C_DIM}──${RESET}`);
         return;
     }
     // /channel — 切换当前智能体 (agent channel), 参数 name/id/number 自动解析
@@ -743,6 +769,7 @@ async function processInput(input, comm) {
             await store.setActive(r.channel.id);
             cliAgentName = r.identity.name;
             cliActiveChannelId = r.channel.id;
+            cliAgentId = r.channel.agentId || null; // 2026-08-12: memory 路径一致
             // 2026-08-09: 切 channel 必须重建 agent session — 否则身份/记忆停留在旧 channel (bug 修复)
             invalidateAgent();
             // 立即重建 (提前建好, 避免下次输入才卡顿; 失败不阻塞切换)
@@ -809,6 +836,7 @@ async function processInput(input, comm) {
             await store.setActive(id);
             cliAgentName = name.trim();
             cliActiveChannelId = id;
+            cliAgentId = agentId; // 2026-08-12: memory 路径一致
             // 2026-08-09: 新建 agent 后立即重建 session — 否则新 agent 身份不加载 (bug 修复)
             invalidateAgent();
             try {
@@ -1107,7 +1135,7 @@ async function processInput(input, comm) {
             const { getMemoryDir } = await import('./bootstrap/memory-compressor.js');
             const { readdir, readFile } = await import('fs/promises');
             const { join } = await import('path');
-            const dir = getMemoryDir(cliAgentName === 'bolloon' ? 'agent' : cliAgentName);
+            const dir = getMemoryDir(getCliAgentId());
             const files = (await readdir(join(dir, 'sessions')).catch(() => [])).filter((f) => f.endsWith('.summary.md'));
             appendLine(`${C_ACCENT}记忆摘要 (${files.length} 个 session):${RESET}`);
             for (const f of files.slice(-5)) {
@@ -1126,10 +1154,10 @@ async function processInput(input, comm) {
     // /resume — 恢复: 最近记忆摘要 + 进行中计划
     if (cmd === '/resume' || cmd.startsWith('/resume ')) {
         try {
-            const { getMemoryDir, getSessionSummaryPath } = await import('./bootstrap/memory-compressor.js');
+            const { getMemoryDir } = await import('./bootstrap/memory-compressor.js');
             const { readFile, readdir } = await import('fs/promises');
             const { join } = await import('path');
-            const dir = getMemoryDir(cliAgentName === 'bolloon' ? 'agent' : cliAgentName);
+            const dir = getMemoryDir(getCliAgentId());
             const files = (await readdir(join(dir, 'sessions')).catch(() => [])).filter((f) => f.endsWith('.summary.md'));
             appendLine(`${C_ACCENT}↻ 恢复上下文:${RESET}`);
             if (files.length > 0) {
@@ -1286,6 +1314,50 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
+    // /skills [名] — 查看正式技能 (2026-08-12 Task5): 无参列全部, 带名看详情. 运行时开始前的技能 view.
+    if (cmd === '/skills' || cmd.startsWith('/skills ')) {
+        try {
+            const { defaultSkillPaths, loadSkillsDir } = await import('./agents/skill-loader.js');
+            const dirs = defaultSkillPaths();
+            const metas = [];
+            for (const d of dirs) {
+                const m = await loadSkillsDir(d);
+                for (const s of m)
+                    if (s.status === 'active' && !metas.some(x => x.name === s.name))
+                        metas.push(s);
+            }
+            const q = cmd.startsWith('/skills ') ? cmd.slice('/skills '.length).trim().toLowerCase() : '';
+            if (!q) {
+                appendLine(`${C_ACCENT}技能 (${metas.length}):${RESET}`);
+                if (metas.length === 0)
+                    appendLine(`  ${C_DIM}暂无正式技能 — run-end 经验可沉淀为 skill${RESET}`);
+                for (const s of metas.slice(0, 20)) {
+                    const desc = (s.description || '').slice(0, 60);
+                    appendLine(`  ${C_DIM}·${RESET} ${C_ACCENT}${s.name}${RESET}${desc ? `  ${C_DIM}${desc}${RESET}` : ''}`);
+                }
+                appendLine(`${C_DIM}用法: /skills <名> 查看详情${RESET}`);
+            }
+            else {
+                const hit = metas.find(s => s.name.toLowerCase() === q || s.name.toLowerCase().includes(q));
+                if (!hit) {
+                    appendLine(`${C_WARN}未找到技能: '${q}'${RESET}`);
+                    return;
+                }
+                appendLine(`${C_ACCENT}═ ${hit.name} ═${RESET}`);
+                if (hit.description)
+                    appendLine(`  ${C_DIM}描述:${RESET} ${hit.description}`);
+                if (hit.triggers && hit.triggers.length > 0)
+                    appendLine(`  ${C_DIM}触发:${RESET} ${hit.triggers.join(', ')}`);
+                const body = (hit.body || '').trim().slice(0, 1200);
+                if (body)
+                    appendLine(`  ${C_DIM}---${RESET}\n${body}`);
+            }
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/skills 失败: ${String(e?.message || e).slice(0, 120)}${RESET}`);
+        }
+        return;
+    }
     // /mcp — MCP 插件/工具列表
     if (cmd === '/mcp') {
         try {
@@ -1324,7 +1396,7 @@ async function processInput(input, comm) {
     if (cmd === '/did') {
         try {
             const { loadOrCreateAgentIdentity } = await import('./agents/agent-identity.js');
-            const identity = loadOrCreateAgentIdentity(cliAgentName === 'bolloon' ? 'default-agent' : cliAgentName);
+            const identity = loadOrCreateAgentIdentity(getCliAgentId());
             appendLine(`${C_ACCENT}DID 身份:${RESET}`);
             appendLine(`  ${C_DIM}did:${RESET} ${identity.did}`);
             appendLine(`  ${C_DIM}publicKey:${RESET} ${identity.publicKey?.slice(0, 32) || '—'}...`);
@@ -1649,6 +1721,7 @@ async function processInput(input, comm) {
         appendLine(`  ${C_ACCENT}/todo${RESET}   查看/勾选循环步骤  ${C_DIM}/todo <planId> <序号>${RESET}`);
         appendLine(`  ${C_ACCENT}/tools${RESET}  可用工具列表 (名/参数/简介)`);
         appendLine(`  ${C_ACCENT}/skill${RESET}  技能候选  ${C_DIM}skill-writer 沉淀候选${RESET}`);
+        appendLine(`  ${C_ACCENT}/skills${RESET} 查看正式技能  ${C_DIM}/skills <名> 看详情 (运行时开始前 view)${RESET}`);
         appendLine(`  ${C_ACCENT}/mcp${RESET}    MCP 服务器列表`);
         appendLine(`  ${C_ACCENT}/agent${RESET}  当前智能体身份`);
         appendLine(`  ${C_ACCENT}/did${RESET}    DID 身份`);
@@ -1753,15 +1826,8 @@ async function processInput(input, comm) {
                     //   真正思考内容在 status 的 Reflection/💡 事件 → 下方框渲染
                 }
                 else if (e.phase && !e.type) {
-                    const ph = String(e.phase);
-                    const detail = e.detail ? ` (${String(e.detail).slice(0, 60)})` : '';
-                    const phLabel = {
-                        intent_classified: '意图识别',
-                        tool_selected: '工具选择',
-                        reflection: '反思',
-                        planning: '规划',
-                    };
-                    appendLine(`${C_WARN}◈ ${phLabel[ph] || ph}${detail}${RESET}`);
+                    // 2026-08-12 (Task4): phase (意图识别/工具选择/规划) 是模型内部规划过程,
+                    //   用户偏好"中间过程不显示" → 静默丢弃, 不污染终端. (仅 Reflection 框保留, 走 status 分支)
                 }
                 else if (e.type === 'status' && e.content) {
                     const content = String(e.content);
@@ -1771,13 +1837,24 @@ async function processInput(input, comm) {
                         if (body.trim())
                             appendLine(renderMessageBox({ title: '💡 反思', body, color: C_WARN }));
                     }
-                    else if (!content.includes('🔄 循环') && !content.includes('📋 参数')) {
+                    else if (!content.includes('🔄 循环') && !content.includes('📋 参数')
+                        && !content.includes('🔍 任务复杂度') && !content.includes('⚙️ 动态配置')
+                        && !content.includes('⏹️ pivot loop')
+                        // 2026-08-12 (Task4): 循环过渡噪音 — "工具执行完成继续循环"/"继续总结" 是内部推进过程,
+                        //   不是给用户看的内容, 一律静默丢弃 (用户抱怨"每次显示触发下一轮循环"的真凶).
+                        && !content.includes('继续循环') && !content.includes('继续总结')) {
                         appendLine(`${C_DIM}${content}${RESET}`);
                     }
                 }
                 else if (e.type === 'step_start') {
                     tuiToolCounter++;
-                    tuiToolCalls.push({ tool: e.tool || '?', args: e.args, _t: Date.now() });
+                    const toolName = e.tool || '?';
+                    tuiToolCalls.push({ tool: toolName, args: e.args, _t: Date.now() });
+                    // 2026-08-12 (Task4): 命令/工具调用显示加载态 — 追加一行 "运行中", done 时原地替换.
+                    //   system/loop 这类内部步骤不显示, 只显示真实工具/命令调用.
+                    if (toolName !== 'system' && toolName !== 'loop' && toolName !== '?') {
+                        appendLine(`  ${C_DIM}🔧 ${toolName} 运行中...${RESET}`);
+                    }
                 }
                 else if (e.type === 'step_done' || e.type === 'step_error') {
                     const p = tuiToolCalls.shift();
@@ -1795,7 +1872,14 @@ async function processInput(input, comm) {
                             runEndOkSteps.push({ status: 'ok', name: t, output: e.output });
                         }
                     }
-                    appendLine(renderToolCallListItem(doneItem, tuiToolCalls.length + 1, tuiToolCounter));
+                    // 2026-08-12 (Task4): done/error 原地替换 step_start 的加载行 (若 tool 非内部).
+                    const doneTool = e.tool ?? p?.tool;
+                    if (doneTool !== 'system' && doneTool !== 'loop' && doneTool !== '?') {
+                        replaceLastLine(renderToolCallListItem(doneItem, tuiToolCalls.length + 1, tuiToolCounter));
+                    }
+                    else {
+                        appendLine(renderToolCallListItem(doneItem, tuiToolCalls.length + 1, tuiToolCounter));
+                    }
                 }
             }
         });