minimal-agent 0.9.0 → 0.10.0

package/src/ui/AskQuestion.js

@@ -13,12 +13,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  *  每题选项列表末尾自动追加一个「✏️ 其他（自由输入）」伪选项，命中即切到文本
  *  输入子模式，让用户填选项之外的答案（自由输入按单值处理，覆盖多选集合）。
  *
- *  Ink 用法与风格对齐 cli/configWizard.tsx：useInput 手写键位、↑↓ 取模移动
+ *  Ink 用法与风格对齐 cli/wizards/providerWizard.tsx：useInput 手写键位、↑↓ 取模移动
  *  高亮、`> ` 前缀 + cyan 高亮、gray 操作提示、文本输入用累积 draft + backspace。
  * ============================================================
  */
-import { useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
+import { theme } from './theme.js';
 /** description 过长截断到此长度，防止 live 区被超长文本撑爆。 */
 const DESC_MAX = 80;
 /**
@@ -31,17 +32,18 @@ const MAX_QUESTIONS = 4;
 function clampDesc(s) {
     return s.length > DESC_MAX ? `${s.slice(0, DESC_MAX - 1)}…` : s;
 }
-export function AskQuestion({ questions, onAnswer, onCancel, }) {
-    // 硬限 4 题；超量截断并注记
-    const effectiveQuestions = questions.length > MAX_QUESTIONS
-        ? (() => {
-            try {
-                process.stderr.write(`[AskUserQuestion] 收到 ${questions.length} 题超过上限 ${MAX_QUESTIONS}，已截断\n`);
-            }
-            catch { /* ignore */ }
-            return questions.slice(0, MAX_QUESTIONS);
-        })()
-        : questions;
+export function AskQuestion({ questions, source, queuedCount = 0, onAnswer, onCancel, }) {
+    // 硬限 4 题；超量截断。注记走 useEffect（只发一次）：渲染期写 stderr 会随
+    // 每次按键重渲重复打行，且 Ink 渲染期间写 stdout/stderr 会撕裂终端画面。
+    const effectiveQuestions = useMemo(() => questions.slice(0, MAX_QUESTIONS), [questions]);
+    useEffect(() => {
+        if (questions.length <= MAX_QUESTIONS)
+            return;
+        try {
+            process.stderr.write(`[AskUserQuestion] 收到 ${questions.length} 题超过上限 ${MAX_QUESTIONS}，已截断\n`);
+        }
+        catch { /* ignore */ }
+    }, [questions]);
     // 当前进行到第几题
     const [questionIndex, setQuestionIndex] = useState(0);
     // 当前题高亮的选项下标（含末尾「其他」伪选项）
@@ -181,14 +183,14 @@ export function AskQuestion({ questions, onAnswer, onCancel, }) {
     });
     // 无题可问（空数组）→ 渲染占位（useInput 已处理取消，这里只防御渲染崩）
     if (!current) {
-        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "gray", children: "\uFF08\u65E0\u95EE\u9898\uFF09" }) }));
+        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: theme.subtle, children: "\uFF08\u65E0\u95EE\u9898\uFF09" }) }));
     }
     const progress = `提问 (${questionIndex + 1}/${effectiveQuestions.length}) · ${current.header}`;
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "cyan", bold: true, children: progress }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: current.question }) }), textMode ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "gray", children: "\u270F\uFE0F \u81EA\u7531\u8F93\u5165\uFF1A" }), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: draft || ' ' }) }), _jsx(Text, { color: "gray", children: "\u8F93\u5165\u540E Enter \u63D0\u4EA4 \u00B7 ESC \u8FD4\u56DE" })] })) : (_jsxs(Box, { flexDirection: "column", children: [options.map((opt, i) => {
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [source?.kind === 'subagent' && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: theme.subtle, dimColor: true, children: `⚡ 子任务：${source.description ?? '执行任务'}（其他子任务继续运行中）` }) })), queuedCount > 0 && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: theme.subtle, dimColor: true, children: `另有 ${queuedCount} 个问题排队` }) })), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: theme.user, bold: true, children: progress }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: current.question }) }), textMode ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, children: "\u270F\uFE0F \u81EA\u7531\u8F93\u5165\uFF1A" }), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: draft || ' ' }) }), _jsx(Text, { color: theme.subtle, children: "\u8F93\u5165\u540E Enter \u63D0\u4EA4 \u00B7 ESC \u8FD4\u56DE" })] })) : (_jsxs(Box, { flexDirection: "column", children: [options.map((opt, i) => {
                         const active = i === idx;
                         const box = multi ? (picked.has(i) ? '[x] ' : '[ ] ') : '';
-                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: active ? 'cyan' : undefined, children: [active ? '> ' : '  ', box, opt.label] }), opt.description ? (_jsxs(Text, { color: "gray", children: ['      ', clampDesc(opt.description)] })) : null] }, `${i}-${opt.label}`));
-                    }), _jsxs(Text, { color: idx === otherIndex ? 'cyan' : undefined, children: [idx === otherIndex ? '> ' : '  ', multi ? '    ' : '', "\u270F\uFE0F \u5176\u4ED6\uFF08\u81EA\u7531\u8F93\u5165\uFF09"] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: multi
+                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: active ? theme.user : undefined, children: [active ? '> ' : '  ', box, opt.label] }), opt.description ? (_jsxs(Text, { color: theme.subtle, children: ['      ', clampDesc(opt.description)] })) : null] }, `${i}-${opt.label}`));
+                    }), _jsxs(Text, { color: idx === otherIndex ? theme.user : undefined, children: [idx === otherIndex ? '> ' : '  ', multi ? '    ' : '', "\u270F\uFE0F \u5176\u4ED6\uFF08\u81EA\u7531\u8F93\u5165\uFF09"] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.subtle, children: multi
                                 ? '↑↓ 移动 · 空格 多选 · Enter 确认本题 · ESC 取消'
                                 : '↑↓ 选择 · Enter 确认 · ESC 取消' }) })] }))] }));
 }

package/src/ui/InputBox.js

@@ -16,11 +16,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  *    - 保留强制刷新但精准控制时机
  * ============================================================
  */
-import React, { useRef, useState, useCallback } from 'react';
+import React, { useRef, useState, useCallback, useEffect } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import { useTextBuffer } from './hooks/useTextBuffer.js';
 import { usePasteHandler } from './hooks/usePasteHandler.js';
 import { useInputHistory } from './hooks/useInputHistory.js';
+import { theme } from './theme.js';
 // ============================================================
 //  IME 启发式（中文输入法防护）
 // ------------------------------------------------------------
@@ -41,12 +42,19 @@ import { useInputHistory } from './hooks/useInputHistory.js';
 const IME_BURST_GAP_MS = 200; // 字符间隔 < 此值视作 IME 连续输入
 const IME_BURST_MIN_COUNT = 3; // 连续 N 个字符才触发 IME 锁定
 const IME_LOCKOUT_MS = 500; // 触发后禁 Enter 提交的窗口
-function InputBoxImpl({ onSubmit, disabled, onAbort, onClear, onCompact }) {
+function InputBoxImpl({ onSubmit, disabled, onAbort, onClear, onCompact, onWorkspaces }) {
     const buf = useTextBuffer();
     const hist = useInputHistory();
     const ctrlCCountRef = useRef(0);
     const ctrlCTimerRef = useRef(null);
     const { exit } = useApp();
+    // 卸载清理：双击退出计数窗口的定时器（组件被 AskQuestion/ConfigMenu 顶替时）
+    useEffect(() => {
+        return () => {
+            if (ctrlCTimerRef.current)
+                clearTimeout(ctrlCTimerRef.current);
+        };
+    }, []);
     // 刷新触发器：值本身不读，只用 setter 触发 InputBoxImpl 重渲（→ BufferView 随父重渲）。
     const [, setRefreshCounter] = useState(0);
     // ✅ Ctrl+R 反向搜索模式（null 表示不在搜索）
@@ -91,6 +99,10 @@ function InputBoxImpl({ onSubmit, disabled, onAbort, onClear, onCompact }) {
         multiline: true,
     });
     useInput((input, key) => {
+        if (key.ctrl && input === 'p') {
+            onWorkspaces();
+            return;
+        }
         // ---- ✅ 粘贴检测（必须优先处理）----
         // 这会在粘贴期间忽略 Enter 键，防止多行内容被截断
         const pasteResult = handlePasteInput(input, key);
@@ -172,9 +184,9 @@ function InputBoxImpl({ onSubmit, disabled, onAbort, onClear, onCompact }) {
             }
             return;
         }
-        // ---- ✅ Ctrl+R 进入反向搜索（仅在空 buf + 非 disabled）----
+        // ---- ✅ Ctrl+R 进入反向搜索（仅在空 buf）----
         if (key.ctrl && input === 'r') {
-            if (!disabled && buf.state.text.length === 0) {
+            if (buf.state.text.length === 0) {
                 setSearchMode({ query: '', hit: null });
             }
             return;
@@ -194,6 +206,16 @@ function InputBoxImpl({ onSubmit, disabled, onAbort, onClear, onCompact }) {
                 catch (e) {
                     console.error('[InputBox] onAbort threw:', e);
                 }
+                // 强制退出安全阀（2026-07-02「Ctrl+C 退不出来」事故）：abort 收尾慢
+                // （长时子进程/网络挂起）时用户不能被困在程序里——1s 窗口内再按一次
+                // Ctrl+C 直接退出（复用下方双击退出的计数/窗口；工作流现场已由状态目录
+                // 持久化 halt 语义，强退不丢进度、可 resume）。ESC 保持只 abort 不退出。
+                ctrlCCountRef.current++;
+                if (ctrlCCountRef.current >= 2)
+                    exit();
+                if (ctrlCTimerRef.current)
+                    clearTimeout(ctrlCTimerRef.current);
+                ctrlCTimerRef.current = setTimeout(() => { ctrlCCountRef.current = 0; }, 1000);
                 return;
             }
             ctrlCCountRef.current++;
@@ -393,19 +415,22 @@ function ReverseSearchView({ query, hit, }) {
         : hit !== null && hit.includes('\n')
             ? `${hitFirstLine} …`
             : hitFirstLine;
-    return (_jsxs(Box, { borderStyle: "round", borderColor: "magenta", paddingX: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "magenta", bold: true, children: '(reverse-i-search)`' }), _jsx(Text, { color: "yellow", children: query }), _jsx(Text, { color: "magenta", bold: true, children: "': " }), _jsx(Text, { color: hitFirstLine === null ? 'gray' : 'white', children: hitDisplay })] }), _jsx(Box, { children: _jsx(Text, { color: "gray", dimColor: true, children: "Enter \u63D0\u4EA4 \u00B7 ESC \u53D6\u6D88 \u00B7 Backspace \u5220\u5B57\u7B26" }) })] }));
+    return (_jsxs(Box, { borderStyle: "round", borderColor: "magenta", paddingX: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.plugin, bold: true, children: '(reverse-i-search)`' }), _jsx(Text, { color: theme.warning, children: query }), _jsx(Text, { color: theme.plugin, bold: true, children: "': " }), _jsx(Text, { color: hitFirstLine === null ? theme.subtle : 'white', children: hitDisplay })] }), _jsx(Box, { children: _jsx(Text, { color: theme.subtle, dimColor: true, children: "Enter \u63D0\u4EA4 \u00B7 ESC \u53D6\u6D88 \u00B7 Backspace \u5220\u5B57\u7B26" }) })] }));
 }
 function BufferView({ buf, disabled }) {
     // buf.layout 由 useTextBuffer 的 useMemo([state]) 维护：父组件每次重渲传入的 buf
     // 都已带最新 layout，这里直接读即可（BufferView 故意不 memo，随父重渲）。
     const { lines, cursorRow, cursorCol } = buf.layout;
-    const promptColor = disabled ? 'gray' : 'cyan';
-    const prompt = disabled ? '⏳ ' : '> ';
+    const promptColor = disabled ? theme.warning : theme.user;
+    const prompt = disabled ? '📝 ' : '> ';
+    const hasContent = lines.some(l => l.length > 0);
     return (_jsx(Box, { borderStyle: "round", borderColor: promptColor, paddingX: 1, flexDirection: "column", children: lines.map((line, row) => {
             const isFirst = row === 0;
-            const isCursorRow = row === cursorRow && !disabled;
+            const isCursorRow = row === cursorRow;
             // key 只用 row：保持稳定，避免逐行重建（layout 变化由父级重渲带下来）
-            return (_jsxs(Box, { children: [_jsx(Text, { color: promptColor, bold: true, children: isFirst ? prompt : '  ' }), isCursorRow ? _jsx(CursorLine, { line: line, col: cursorCol }) : _jsx(Text, { children: line || ' ' })] }, row));
+            return (_jsxs(Box, { children: [_jsx(Text, { color: promptColor, bold: true, children: isFirst ? prompt : '  ' }), isCursorRow ? (_jsx(CursorLine, { line: line, col: cursorCol })) : disabled && isFirst && !hasContent ? (
+                    /* 执行中占位提示：告知可继续输入插话 */
+                    _jsx(Text, { color: theme.subtle, dimColor: true, children: "AI \u5DE5\u4F5C\u4E2D\uFF0C\u53EF\u7EE7\u7EED\u8F93\u5165\u8865\u5145\u6D88\u606F\uFF08Ctrl+C \u4E2D\u65AD\uFF0C\u53CC\u51FB Ctrl+C \u5F3A\u5236\u9000\u51FA\uFF09" })) : (_jsx(Text, { children: line || ' ' }))] }, row));
         }) }));
 }
 /** 光标行渲染（稳定，不会被重建） */

package/src/ui/LiveArea.js

@@ -11,6 +11,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  *        tool_executing → runningTools 逐行人话描述（gray dim）
  *        compacting/idle→ 无内容行
  *
+ *  ★ 暂态错误行（transientError）：工作流步执行中 LLM 调用失败（会被该步重试）时，
+ *    不把它当永久红字提交进 scrollback，而是作为**状态行下方的一条黄色暂态行**显示。
+ *    它随状态行每帧刷新而被覆盖（不 strand），重试成功后由 useChat 丢弃 → 自然消失。
+ *    彻底失败（步 ok:false / 顶层 halt）才由 useChat 改走永久红字（chat.error）。
+ *    这条行同样走 INV-1 宽度钳制（clampWidthStart），不破坏防刷屏不变量。
+ *
  *  ★ 为什么这样能既"多行打字机 + 流式答案"又**不刷屏**（详见 liveViewport.ts 头部）：
  *    - INV-1：每行都用 wrapToDisplayLines / clampWidthStart 按 CJK/emoji=2 钳到
  *      ≤ cols - LIVE_RIGHT_MARGIN → 终端永不自动折行 → ink eraseLines 每帧精确。
@@ -26,6 +32,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useEffect, useRef, useState } from 'react';
 import { Box, Text } from 'ink';
 import { LIVE_RIGHT_MARGIN, clampWidthStart, wrapToDisplayLines, } from './liveViewport.js';
+import { theme } from './theme.js';
+import { figures } from './figures.js';
 const STAGE_LABELS = {
     thinking: '思考中',
     streaming: '回答中',
@@ -37,7 +45,7 @@ const SPINNER_FRAMES = ['✶', '✸', '✹', '✺', '✹', '✷'];
 /** spinner 推进 + 强制 re-render 间隔（ms）。~7Hz，远低于 ink 31Hz throttle，Windows 安全。 */
 const SPINNER_INTERVAL_MS = 150;
 /** 内容区行数硬顶（大终端也不铺满，保持清爽）。 */
-const CONTENT_HARD_CAP = 8;
+const CONTENT_HARD_CAP = 16;
 /** 终端高度里预留给 status(1) + 输入框(3) + StatusLine(1) + error/interrupt + 安全余量。 */
 const RESERVED_ROWS = 9;
 /** reasoning 行 💭 前缀 / 续行缩进的预留宽度（💭=2 + 空格；上界 4 更稳）。 */
@@ -53,28 +61,108 @@ function lastN(arr, n) {
     return arr.length <= n ? arr : arr.slice(arr.length - n);
 }
 function toolDesc(t) {
-    if (t.argsFriendly && t.argsFriendly.length > 0)
-        return t.argsFriendly;
-    const a = t.argsPreview.length > TOOL_ARGS_MAX
-        ? `${t.argsPreview.slice(0, TOOL_ARGS_MAX - 1)}…`
-        : t.argsPreview;
-    return `${t.toolName}(${a})`;
+    // 长时工具的步内实时进度（LoopEvent.tool_progress）追加在描述后——
+    // 比静态 args 信息量大得多（如生图 "[ai-image-plan] round 1/1 15/31 t2i → ai_p11.png"）。
+    // 宽度钳制由调用方 clampWidthStart 统一负责（INV-1），这里只拼内容。
+    const base = t.argsFriendly && t.argsFriendly.length > 0
+        ? t.argsFriendly
+        : `${t.toolName}(${t.argsPreview.length > TOOL_ARGS_MAX
+            ? `${t.argsPreview.slice(0, TOOL_ARGS_MAX - 1)}…`
+            : t.argsPreview})`;
+    return t.progress && t.progress.length > 0 ? `${base} · ${t.progress}` : base;
+}
+/** 不带 progress 的静态描述（蜂群树的描述行用；进度另起 ⎿ 行）。 */
+function toolDescStatic(t) {
+    return t.argsFriendly && t.argsFriendly.length > 0
+        ? t.argsFriendly
+        : `${t.toolName}(${t.argsPreview.length > TOOL_ARGS_MAX
+            ? `${t.argsPreview.slice(0, TOOL_ARGS_MAX - 1)}…`
+            : t.argsPreview})`;
+}
+/**
+ * 蜂群树：runningTools 里有 ≥2 个并行的 Agent 子任务时，把 tool_executing
+ * 内容区渲染成树形（借鉴 Claude Code 的 AgentProgressLine 语汇）：
+ *
+ *   ⚡ 3 个子任务并行中（另有 1 个工具）
+ *   ├─ 子任务[explore] 检索路由实现
+ *   │  ⎿ 第 2 轮 · Reading src/router.ts
+ *   └─ 子任务[explore] 调研配置系统
+ *      ⎿ 正在撰写报告…（已输出 850 字）
+ *
+ *  - <2 个 Agent → 返回 null，调用方走既有扁平路径（单 Agent 行为不变）。
+ *  - 行预算：两行模式（描述行 + ⎿ 进度行）放不下 maxLines 时降级单行模式
+ *    （进度拼在描述后），仍超则 lastN 截尾——INV-2 恒成立。
+ *  - 每行经 clampWidthStart 钳宽（INV-1；树形字形 ├└│⎿ 已入 charWidth=2 上界）。
+ *  - Agent 的 progress 行（agent.ts publish 的「label」第 N 轮 · …）剥掉与
+ *    描述行重复的「label」前缀，树里不重复念名字。
+ *  导出供单测断言（liveArea.test.ts 蜂群树 describe）。
+ */
+export function buildSwarmLines(runningTools, maxWidth, maxLines) {
+    const agents = runningTools.filter((t) => t.toolName === 'Agent');
+    if (agents.length < 2)
+        return null;
+    const others = runningTools.filter((t) => t.toolName !== 'Agent');
+    const queued = agents.filter((agent) => agent.progressDetail?.kind === 'subagent' && agent.progressDetail.phase === 'queued').length;
+    const activeCount = agents.length - queued;
+    const header = `${figures.swarm} ${activeCount} 运行${queued > 0 ? ` · ${queued} 排队` : ''}${others.length > 0 ? `（另有 ${others.length} 个工具）` : ''}`;
+    // 进度文案剥冗余 label 前缀（描述行已含「子任务[type] label」）
+    const stripLabel = (p) => p.replace(/^「[^」]*」\s*/, '');
+    const twoLine = 1 + agents.length * 2 + others.length <= maxLines;
+    const lines = [header];
+    agents.forEach((t, i) => {
+        const isLast = i === agents.length - 1 && others.length === 0;
+        const branch = isLast ? figures.corner : figures.branch;
+        const progress = t.progress ? stripLabel(t.progress) : '';
+        if (twoLine) {
+            lines.push(`${branch} ${toolDescStatic(t)}`);
+            lines.push(`${isLast ? '   ' : `${figures.pipe}  `}${figures.elbow} ${progress || '启动中…'}`);
+        }
+        else {
+            lines.push(`${branch} ${toolDescStatic(t)}${progress ? ` · ${progress}` : ''}`);
+        }
+    });
+    for (const t of others)
+        lines.push(`  ${toolDesc(t)}`);
+    return lastN(lines, maxLines).map((l) => clampWidthStart(l, maxWidth));
 }
 /**
  * 纯函数：把一帧的 props（+ 动画 frame / 已耗时秒数）算成 LiveView。
- * idle 返回 null。导出供单测断言 INV-1（每行宽）/ INV-2（行数）/ 颜色层次。
+ * idle 且无暂态错误时返回 null（live 区隐藏）；idle 但有暂态错误时仅渲染该黄色行
+ * （让"重试中/已恢复"提示在步间隙 stage 短暂回 idle 时也不闪没）。
+ * 导出供单测断言 INV-1（每行宽）/ INV-2（行数）/ 颜色层次。
  */
 export function buildLiveView(props) {
-    const { progressStage, reasoningPreview, streamingText, runningTools, pluginProgress, terminalCols, terminalRows, frame, elapsedSec, } = props;
-    if (progressStage === 'idle')
-        return null;
-    const stage = progressStage;
+    const { progressStage, reasoningPreview, streamingText, runningTools, pluginProgress, transientError, terminalCols, terminalRows, frame, elapsedSec, } = props;
     const maxWidth = Math.max(8, terminalCols - LIVE_RIGHT_MARGIN);
     const maxLines = contentMaxLines(terminalRows);
+    // 暂态错误行：单行、钳宽（满足 INV-1）。空串视为无。
+    const transientErrorLine = transientError && transientError.length > 0
+        ? clampWidthStart(transientError, maxWidth)
+        : null;
+    // idle 且无暂态错误 → 整个 live 区隐藏（保持既有行为）。
+    // idle 但有暂态错误 → 只渲染那一行黄字，无状态行 / 无 spinner（避免 idle 还转圈）。
+    if (progressStage === 'idle') {
+        if (transientErrorLine === null)
+            return null;
+        return {
+            statusLine: '',
+            statusColor: theme.user,
+            contentLines: [],
+            contentDim: true,
+            transientErrorLine,
+        };
+    }
+    const stage = progressStage;
     // ---- 状态行 ----
     let status = `${frame} ${STAGE_LABELS[stage]} (${elapsedSec}s)`;
     if (pluginProgress) {
-        status += `  ·  [plugin:${pluginProgress.pluginId}] ${pluginProgress.current}/${pluginProgress.max ?? '?'}${pluginProgress.message ? ` ${pluginProgress.message}` : ''}`;
+        // current 缺省 = 纯文案进度（工作流步骤 title），不渲染数字
+        const num = pluginProgress.current !== undefined
+            ? `${pluginProgress.current}/${pluginProgress.max ?? '?'}`
+            : '';
+        const msg = pluginProgress.message ?? '';
+        const body = [num, msg].filter(Boolean).join(' ');
+        status += `  ·  [plugin:${pluginProgress.pluginId}]${body ? ` ${body}` : ''}`;
     }
     status = clampWidthStart(status, maxWidth);
     // ---- 内容区 ----
@@ -82,7 +170,7 @@ export function buildLiveView(props) {
     let contentDim = true;
     if (stage === 'thinking' && reasoningPreview.length > 0) {
         const wrapped = wrapToDisplayLines(reasoningPreview, maxWidth - REASONING_PREFIX_RESERVE);
-        contentLines = lastN(wrapped, maxLines).map((line, i) => i === 0 ? `💭 ${line}` : `   ${line}`);
+        contentLines = lastN(wrapped, maxLines).map((line, i) => i === 0 ? `${figures.thought} ${line}` : `   ${line}`);
         contentDim = true;
     }
     else if (stage === 'streaming' && streamingText.length > 0) {
@@ -90,14 +178,19 @@ export function buildLiveView(props) {
         contentDim = false; // 答案 = 主角，默认亮色
     }
     else if (stage === 'tool_executing' && runningTools.length > 0) {
-        contentLines = lastN(runningTools, maxLines).map((t) => clampWidthStart(`  ${toolDesc(t)}`, maxWidth));
+        // ≥2 个并行 Agent 子任务 → 蜂群树；否则既有扁平路径（单工具/单 Agent 不变）
+        const swarm = buildSwarmLines(runningTools, maxWidth, maxLines);
+        contentLines =
+            swarm ??
+                lastN(runningTools, maxLines).map((t) => clampWidthStart(`  ${toolDesc(t)}`, maxWidth));
         contentDim = true;
     }
     return {
         statusLine: status,
-        statusColor: stage === 'compacting' ? 'magenta' : 'cyan',
+        statusColor: stage === 'compacting' ? theme.plugin : theme.user,
         contentLines,
         contentDim,
+        transientErrorLine,
     };
 }
 export const LiveArea = React.memo(function LiveArea(props) {
@@ -118,8 +211,8 @@ export const LiveArea = React.memo(function LiveArea(props) {
         const timer = setInterval(() => setTick((t) => (t + 1) % 1_000_000), SPINNER_INTERVAL_MS);
         return () => clearInterval(timer);
     }, [progressStage]);
-    if (progressStage === 'idle')
-        return null;
+    // 不在 idle 直接 return：idle 但存在暂态错误时 buildLiveView 仍会返回一个
+    // 只含 transientErrorLine 的 view（让"已恢复/重试中"提示在步间隙也不闪没）。
     const now = Date.now();
     const elapsedSec = startRef.current
         ? Math.max(0, Math.floor((now - startRef.current) / 1000))
@@ -128,5 +221,5 @@ export const LiveArea = React.memo(function LiveArea(props) {
     const view = buildLiveView({ ...props, frame, elapsedSec });
     if (!view)
         return null;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: view.statusColor, bold: true, wrap: "truncate", children: view.statusLine }), view.contentLines.map((line, i) => (_jsx(Text, { color: view.contentDim ? 'gray' : undefined, dimColor: view.contentDim, wrap: "truncate", children: line.length > 0 ? line : ' ' }, `live-${i}`)))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [view.statusLine.length > 0 && (_jsx(Text, { color: view.statusColor, bold: true, wrap: "truncate", children: view.statusLine })), view.contentLines.map((line, i) => (_jsx(Text, { color: view.contentDim ? theme.subtle : theme.answer, dimColor: view.contentDim, wrap: "truncate", children: line.length > 0 ? line : ' ' }, `live-${i}`))), view.transientErrorLine !== null && (_jsx(Text, { color: theme.warning, wrap: "truncate", children: view.transientErrorLine }))] }));
 });

package/src/ui/MessageList.js

@@ -34,6 +34,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import React from 'react';
 import { Box, Static, Text } from 'ink';
+import { friendlyToolDescription } from '../loop.js';
+import { contentToDisplayText, contentToPlainText } from '../multimodal.js';
+import { splitThinkBlocks } from '../utils/stripThink.js';
+import { figures } from './figures.js';
+import { renderMarkdownLines } from './markdown.js';
+import { theme } from './theme.js';
 /** 中断标记 user message 的固定内容（loop.ts 写入） */
 const INTERRUPT_USER_CONTENT = '(用户按下了 ESC/Ctrl+C 中断了任务)';
 const MAX_TOOL_PREVIEW_LINES = 3;
@@ -41,6 +47,58 @@ const MAX_TOOL_PREVIEW_LINES = 3;
 const NARROW_TERMINAL_ROWS = 28;
 /** reasoning 超过此字符数截尾 —— 防撑爆历史 */
 const REASONING_MAX_CHARS = 2000;
+/**
+ * 把 assistant 最终正文拆成展示行：markdown 管线（src/ui/markdown.ts）产出
+ * prose/code/fence 三类行，⏺ 锚点落在**第一条非空 prose 行**——答案以代码块
+ * 开头时代码顶格在前、⏺ 顺延；全代码答案无 ⏺（代码纯净优先）。
+ * 纯文本无 markdown 特征时走快路径，与旧「按 \n 切 + wrap='end'」逐行一致。
+ */
+export function buildAssistantDisplayLines(text) {
+    if (text.length === 0)
+        return [];
+    let anchorPlaced = false;
+    return renderMarkdownLines(text).map((line) => {
+        if (line.kind !== 'prose') {
+            return { content: line.text, prefix: '', kind: line.kind, wrap: 'end' };
+        }
+        if (!anchorPlaced && line.text.trim() !== '') {
+            anchorPlaced = true;
+            return { content: line.text, prefix: '⏺ ', kind: line.kind, wrap: 'end' };
+        }
+        return { content: line.text, prefix: '  ', kind: line.kind, wrap: 'end' };
+    });
+}
+/**
+ * 扫 history 里全部 assistant.tool_calls，建 tool_call_id → 人话描述 索引。
+ * tool 消息本身只有 content + tool_call_id（不动 history 字节的前提下，
+ * 头行要显示「哪个工具在干什么」只能反查发起方）。<Static> 提交时序保证
+ * assistant(tool_calls) 恒先于对应 tool 消息入 history，索引命中无竞态。
+ */
+export function buildToolCallIndex(history) {
+    const map = new Map();
+    for (const m of history) {
+        if (m.role !== 'assistant' || !m.tool_calls)
+            continue;
+        for (const tc of m.tool_calls) {
+            map.set(tc.id, {
+                toolName: tc.function.name,
+                friendly: friendlyToolDescription(tc.function.name, tc.function.arguments),
+            });
+        }
+    }
+    return map;
+}
+/**
+ * 从 Agent 子任务报告的统计尾巴（agent.ts 固定格式
+ * 「（子任务「x」[type]：N 轮 · M 次工具调用，K 次失败）」）解析统计数。
+ * 失败结果（错误文案）不匹配 → null，头行只显示描述不显示 ✓ 统计。
+ */
+export function agentResultStats(content) {
+    const m = /（子任务「[^」]*」\[[^\]]+\]：(\d+) 轮 · (\d+) 次工具调用(?:，(\d+) 次失败)?）/.exec(content);
+    if (!m)
+        return null;
+    return { turns: Number(m[1]), tools: Number(m[2]), failed: m[3] ? Number(m[3]) : 0 };
+}
 /**
  * 把 assistant message 的两个字符串型 reasoning 字段拼成单字符串。
  * `reasoning_details` 是结构化数组，本期不展开。两个字段任一非空即返回拼接结果；
@@ -80,7 +138,8 @@ export function summarizeTurn(history) {
     const turnStartIndices = [];
     for (let i = 0; i < history.length; i++) {
         const m = history[i];
-        if (m.role === 'user' && m.content !== INTERRUPT_USER_CONTENT) {
+        if (m.role === 'user' &&
+            contentToPlainText(m.content) !== INTERRUPT_USER_CONTENT) {
             turnStartIndices.push(i);
         }
     }
@@ -144,6 +203,7 @@ function formatDuration(ms) {
 export const MessageList = React.memo(function MessageList({ history, compactGeneration, bannerText, terminalRows, }) {
     const items = React.useMemo(() => {
         const turnMetas = summarizeTurn(history);
+        const toolIndex = buildToolCallIndex(history);
         return [
             ...(bannerText
                 ? [
@@ -158,6 +218,7 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
                 kind: 'message',
                 msg: m,
                 turnMeta: turnMetas[idx],
+                toolMeta: m.role === 'tool' ? (toolIndex.get(m.tool_call_id) ?? null) : null,
                 // 纯派生 key：有 id 用 id，没有就用 idx 兜底。绝不在 render 期 mutate 消息对象
                 // （<Static> 已 commit 的行永不重绘，key 仅在 append 对账时用，idx 已足够稳定）。
                 key: m.id ?? `message-${idx}`,
@@ -170,7 +231,7 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
             if (item.kind === 'banner') {
                 return _jsx(BannerRow, { text: item.text }, item.key);
             }
-            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, foldReasoning: foldReasoning }, item.key));
+            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, toolMeta: item.toolMeta, foldReasoning: foldReasoning }, item.key));
         } }, compactGeneration));
 });
 function BannerRow({ text }) {
@@ -179,9 +240,9 @@ function BannerRow({ text }) {
     const splitAt = text.indexOf('  ·');
     const head = splitAt >= 0 ? text.slice(0, splitAt) : text;
     const tail = splitAt >= 0 ? text.slice(splitAt) : '';
-    return (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: "cyan", bold: true, children: head }), tail.length > 0 && _jsx(Text, { color: "gray", children: tail })] }));
+    return (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.user, bold: true, children: head }), tail.length > 0 && _jsx(Text, { color: theme.subtle, children: tail })] }));
 }
-function MessageRow({ message, turnMeta, foldReasoning, }) {
+function MessageRow({ message, turnMeta, toolMeta, foldReasoning, }) {
     switch (message.role) {
         case 'system': {
             // v2.x：ephemeral system message 是 UI 临时提示（slash 命令输出等），
@@ -190,20 +251,27 @@ function MessageRow({ message, turnMeta, foldReasoning, }) {
             if (!ephemeral)
                 return null;
             const lines = message.content.split('\n');
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: "gray", dimColor: true, children: line }, `eph-${i}`))) }) }));
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: line }, `eph-${i}`))) }) }));
         }
         case 'user': {
+            const rule = figures.hr.repeat(6);
             const headerLine = turnMeta !== null
-                ? `────── Turn ${turnMeta.turnN} · ${formatTime(turnMeta.timestamp)} · ${formatDuration(turnMeta.durationMs)} · ${turnMeta.toolsCount} tools ──────`
+                ? `${rule} Turn ${turnMeta.turnN} · ${formatTime(turnMeta.timestamp)} · ${formatDuration(turnMeta.durationMs)} · ${turnMeta.toolsCount} tools ${rule}`
                 : null;
-            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [headerLine !== null && (_jsx(Text, { color: "gray", dimColor: true, children: headerLine })), _jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: '> ' }), _jsx(Text, { color: "cyan", children: message.content })] })] }));
+            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [headerLine !== null && (_jsx(Text, { color: theme.subtle, dimColor: true, children: headerLine })), _jsxs(Box, { children: [_jsx(Text, { color: theme.user, bold: true, children: '> ' }), _jsx(Text, { color: theme.user, wrap: "end", children: contentToDisplayText(message.content) })] })] }));
         }
         case 'assistant': {
             // assistant 可能只有 tool_calls 没有 content（content 为 null）
-            const text = message.content ?? '';
+            const raw = message.content ?? '';
+            // 展示层切分内联 <think>（MiniMax 等把思维链写进 content，内核有意不剥）：
+            // thought 并入 💭 块（灰 dim + 折叠，与结构化 reasoning 同款待遇），
+            // 正文只显示净化后的部分。纯展示层——history 字节零改动（KV 缓存约束）。
+            const { thought, answer } = splitThinkBlocks(raw);
             const tcCount = message.tool_calls?.length ?? 0;
-            // reasoning 拼接
-            let reasoningText = combineReasoning(message);
+            // reasoning 拼接：结构化字段在前，内联 <think> 在后
+            let reasoningText = [combineReasoning(message), thought]
+                .filter(Boolean)
+                .join('\n');
             let truncatedCharsHint = '';
             if (reasoningText.length > REASONING_MAX_CHARS) {
                 const omitted = reasoningText.length - REASONING_MAX_CHARS;
@@ -215,17 +283,35 @@ function MessageRow({ message, turnMeta, foldReasoning, }) {
                 ? reasoningLines.slice(0, 2)
                 : reasoningLines;
             const hiddenReasoningCount = reasoningLines.length - visibleReasoningLines.length;
-            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: "gray", dimColor: true, children: i === 0 ? `💭 ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `   ▾ ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `   ${truncatedCharsHint}` }))] })), text.length > 0 &&
-                        text.split('\n').map((line, i) => i === 0 ? (_jsxs(Box, { children: [_jsx(Text, { color: "green", bold: true, children: '⏺ ' }), _jsx(Text, { children: line.length > 0 ? line : ' ' })] }, `a-${i}`)) : (_jsx(Text, { children: `  ${line}` }, `a-${i}`))), tcCount > 0 && (_jsx(Text, { color: "yellow", dimColor: true, children: `  └─ 调用了 ${tcCount} 个工具：${(message.tool_calls ?? [])
+            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: i === 0 ? `${figures.thought} ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${figures.fold} ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${truncatedCharsHint}` }))] })), buildAssistantDisplayLines(answer).map((line, i) => {
+                        if (line.kind === 'fence') {
+                            return (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: line.wrap, children: line.content }, `a-${i}`));
+                        }
+                        if (line.kind === 'code') {
+                            return (_jsx(Text, { wrap: line.wrap, children: line.content.length > 0 ? line.content : ' ' }, `a-${i}`));
+                        }
+                        return line.prefix === '⏺ ' ? (_jsxs(Box, { children: [_jsx(Text, { color: theme.anchor, bold: true, wrap: line.wrap, children: line.prefix }), _jsx(Text, { wrap: line.wrap, children: line.content.length > 0 ? line.content : ' ' })] }, `a-${i}`)) : (_jsx(Text, { wrap: line.wrap, children: `${line.prefix}${line.content}`.length > 0
+                                ? `${line.prefix}${line.content}`
+                                : ' ' }, `a-${i}`));
+                    }), tcCount > 0 && (_jsx(Text, { color: theme.warning, dimColor: true, wrap: "end", children: `  ${figures.corner} 调用了 ${tcCount} 个工具：${(message.tool_calls ?? [])
                             .map((tc) => tc.function.name)
                             .join(', ')}` }))] }));
         }
         case 'tool': {
             const lines = message.content.split('\n');
-            const preview = lines.slice(0, MAX_TOOL_PREVIEW_LINES).join('\n');
+            const previewLines = lines.slice(0, MAX_TOOL_PREVIEW_LINES);
             const hidden = Math.max(0, lines.length - MAX_TOOL_PREVIEW_LINES);
             const shortId = message.tool_call_id.slice(-8);
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "gray", dimColor: true, children: `[tool result · #${shortId}]` }), _jsx(Text, { color: "gray", children: preview }), hidden > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: `... ▾ 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
+            // 头行升级：有 toolMeta（发起方反查命中）显示人话描述；Agent 子任务
+            // 再解析统计尾巴显示 ✓ N 轮 · M 次工具。无 meta（历史重载等）兜底旧格式。
+            const stats = toolMeta?.toolName === 'Agent' ? agentResultStats(message.content) : null;
+            const statsTail = stats
+                ? ` ${figures.ok} ${stats.turns} 轮 · ${stats.tools} 次工具${stats.failed > 0 ? `（${stats.failed} 次失败）` : ''}`
+                : '';
+            const headText = toolMeta
+                ? `[${toolMeta.friendly} · #${shortId}]${statsTail}`
+                : `[tool result · #${shortId}]`;
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: headText }), previewLines.map((line, i) => (_jsx(Text, { color: theme.subtle, wrap: "end", children: line.length > 0 ? line : ' ' }, `p-${i}`))), hidden > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `... ${figures.fold} 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
         }
     }
 }

package/src/ui/ModelPicker.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { theme } from './theme.js';
+export function ModelPicker({ models, currentModelId, title, nullOptionLabel, onSelect, onCancel, }) {
+    const enabledModels = models.filter((m) => m.enabled && m.apiKey);
+    const hasNullOption = Boolean(nullOptionLabel);
+    const nullIndex = hasNullOption ? enabledModels.length : -1;
+    const listLength = enabledModels.length + (hasNullOption ? 1 : 0);
+    const initialIdx = (() => {
+        const idx = enabledModels.findIndex((m) => m.id === currentModelId);
+        if (idx >= 0)
+            return idx;
+        if (hasNullOption && !currentModelId)
+            return nullIndex;
+        return 0;
+    })();
+    const [idx, setIdx] = useState(Math.max(0, Math.min(initialIdx, listLength - 1)));
+    useInput((input, key) => {
+        if (key.escape || (key.ctrl && input === 'c')) {
+            onCancel();
+            return;
+        }
+        if (key.upArrow) {
+            setIdx((i) => (i - 1 + listLength) % listLength);
+            return;
+        }
+        if (key.downArrow) {
+            setIdx((i) => (i + 1) % listLength);
+            return;
+        }
+        if (key.return) {
+            if (hasNullOption && idx === nullIndex) {
+                onSelect(null);
+            }
+            else {
+                const target = enabledModels[idx];
+                if (target)
+                    onSelect(target.id);
+            }
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: theme.user, bold: true, children: title }) }), _jsx(Text, { color: theme.subtle, children: "\u5728\u5DF2\u914D\u7F6E\u7684\u6A21\u578B\u4E2D\u9009\u62E9\uFF1B\u9009\u62E9\u540E\u7ACB\u5373\u751F\u6548\uFF0C\u540E\u7EED\u8BF7\u6C42\u4F7F\u7528\u65B0\u6A21\u578B\u3002" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [enabledModels.map((m, i) => {
+                        const active = i === idx;
+                        const isCurrent = m.id === currentModelId;
+                        const displayName = m.displayName || m.model;
+                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: active ? theme.user : undefined, children: [active ? '> ' : '  ', isCurrent ? '✓ ' : '  ', _jsx(Text, { color: active ? theme.user : undefined, bold: isCurrent, children: displayName }), isCurrent ? _jsx(Text, { color: theme.subtle, children: " \uFF08\u5F53\u524D\uFF09" }) : null] }), _jsxs(Text, { color: theme.subtle, children: ['        ', m.model, " \u00B7 ", formatContextWindow(m.contextWindow)] })] }, m.id));
+                    }), hasNullOption && (_jsxs(Text, { color: idx === nullIndex ? theme.user : theme.subtle, children: [idx === nullIndex ? '> ' : '  ', !currentModelId ? '✓ ' : '  ', nullOptionLabel] }))] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.subtle, children: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 ESC \u53D6\u6D88" }) })] }));
+}
+function formatContextWindow(tokens) {
+    if (tokens >= 1_000_000)
+        return `${(tokens / 1_000_000).toFixed(1)}M context`;
+    if (tokens >= 1_000)
+        return `${Math.round(tokens / 1_000)}K context`;
+    return `${tokens} context`;
+}