minimal-agent 0.5.3 → 0.5.5

package/src/ui/ProgressPanel.js

@@ -0,0 +1,98 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+/**
+ * ============================================================
+ *  src/ui/ProgressPanel.tsx —— 工作过程显示面板（v2 瘦身版）
+ * ------------------------------------------------------------
+ *  贴在 InputBox 上方的一块"过程区"。
+ *  仅当 progressStage !== 'idle' 时渲染，turn 结束后整块消失。
+ *
+ *  v2 变化：
+ *    - 删除 streamingText 块（搬去 StreamingBlock 独立组件）
+ *    - 删除 reasoning preview 块（reasoning 留在 history 由 MessageList 渲染）
+ *    - spinner 行融合 friendly 工具描述：
+ *        `⠋ Reading src/foo.ts +2 more · 2.3s · ~890 tokens · step 6`
+ *    - 不再单独列每个 tool 一行（多个工具用 +N more 在 spinner 行末尾）
+ *
+ *  样式：
+ *    ⠋ Reading src/foo.ts +2 more · 2.3s · ~890 tokens · step 6
+ *    [plugin:ralph-wiggum] 3/10 验证中...
+ *
+ *  设计要点：
+ *  - braille spinner 用 useEffect + setInterval(120ms) 自驱动；unmount 时 clearInterval
+ *  - 最终高度：1 行 spinner / 0~1 行 plugin progress
+ * ============================================================
+ */
+import React from 'react';
+import { Box, Text } from 'ink';
+/** braille spinner 帧序列 */
+const SPINNER_FRAMES = [
+    '⠋',
+    '⠙',
+    '⠹',
+    '⠸',
+    '⠼',
+    '⠴',
+    '⠦',
+    '⠧',
+    '⠇',
+    '⠏',
+];
+const SPINNER_INTERVAL_MS = 120;
+/** 阶段标签中文映射 */
+const STAGE_LABELS = {
+    thinking: '思考中',
+    streaming: '回答中',
+    tool_executing: '调用工具',
+    compacting: '压缩历史',
+};
+/** 工具参数预览单行最大宽度（fallback 时用） */
+const TOOL_ARGS_MAX = 60;
+/** 按字符宽度截断，超长尾部加 …（按字符而非 byte，够用） */
+function truncateTail(s, max) {
+    if (s.length <= max)
+        return s;
+    return `${s.slice(0, max - 1)}…`;
+}
+/**
+ * 自驱动的 braille spinner hook。
+ * 组件 unmount 时自动 clearInterval，避免悬挂定时器。
+ */
+function useSpinnerFrame() {
+    const [frame, setFrame] = React.useState(0);
+    React.useEffect(() => {
+        const t = setInterval(() => {
+            setFrame((f) => (f + 1) % SPINNER_FRAMES.length);
+        }, SPINNER_INTERVAL_MS);
+        return () => clearInterval(t);
+    }, []);
+    return SPINNER_FRAMES[frame];
+}
+export function ProgressPanel({ progressStage, runningTools, turnTokens, turnElapsedMs, turnStep, pluginProgress, }) {
+    // spinner hook 必须无条件调用（React Hooks 规则），早 return 放在 hook 之后
+    const spinner = useSpinnerFrame();
+    // idle 时整个面板不渲染
+    if (progressStage === 'idle') {
+        return null;
+    }
+    const stageLabel = STAGE_LABELS[progressStage];
+    const elapsedSec = (turnElapsedMs / 1000).toFixed(1);
+    const tokensStr = turnTokens.toLocaleString();
+    // 头行的"主描述"：有工具用 friendly，无工具用 stage label
+    let mainDescription;
+    if (runningTools.length > 0) {
+        const first = runningTools[0];
+        mainDescription =
+            first.argsFriendly && first.argsFriendly.length > 0
+                ? first.argsFriendly
+                : `${first.toolName}(${truncateTail(first.argsPreview, TOOL_ARGS_MAX)})`;
+        if (runningTools.length > 1) {
+            mainDescription += ` +${runningTools.length - 1} more`;
+        }
+    }
+    else {
+        mainDescription = stageLabel;
+    }
+    // 头行尾部的附加信息：耗时 / token / step
+    const stepHint = typeof turnStep === 'number' && turnStep > 0 ? ` · step ${turnStep}` : '';
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { color: "cyan", children: [spinner, " "] }), _jsx(Text, { bold: true, children: mainDescription }), _jsx(Text, { color: "gray", children: ` · ${elapsedSec}s · ~${tokensStr} tokens${stepHint}` })] }), pluginProgress && (_jsx(Box, { children: _jsx(Text, { color: "magenta", children: `[plugin:${pluginProgress.pluginId}] ${pluginProgress.current}/${pluginProgress.max ?? '?'}${pluginProgress.message ? ` ${pluginProgress.message}` : ''}` }) }))] }));
+}

package/src/ui/StreamingBlock.js

@@ -0,0 +1,11 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+/** streaming text 显示尾部行数上限（超出截尾，老内容滚出窗口） */
+const STREAMING_TAIL_LINES = 20;
+export function StreamingBlock({ progressStage, streamingText, }) {
+    if (progressStage !== 'streaming' || streamingText.length === 0) {
+        return null;
+    }
+    const lines = streamingText.split('\n').slice(-STREAMING_TAIL_LINES);
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [lines.map((line, i) => (_jsx(Text, { children: line }, i))), _jsx(Text, { color: "gray", dimColor: true, children: "\u258D" })] }));
+}

package/src/ui/ToolStatus.js

@@ -2,10 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 export function ToolStatus({ status, compacting }) {
     if (compacting) {
-        return (_jsx(Box, { children: _jsx(Text, { color: "magenta", bold: true, children: "\uD83D\uDDDC  \u6B63\u5728\u538B\u7F29\u5BF9\u8BDD\u5386\u53F2..." }) }));
+        return (_jsx(Box, { children: _jsx(Text, { color: "magenta", bold: true, children: "\uD83D\uDF18 \u6B63\u5728\u538B\u7F29\u5BF9\u8BDD\u5386\u53F2..." }) }));
     }
     if (status) {
-        return (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: ['⏳ ', _jsx(Text, { bold: true, children: status.toolName }), `(${status.argsPreview})`] }) }));
+        return (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: ["\u23F3 ", _jsx(Text, { bold: true, children: status.toolName }), "(", status.argsPreview, ")"] }) }));
     }
     return null;
 }

package/src/ui/hooks/useChat.js

@@ -29,6 +29,7 @@ export function useChat(args) {
     const [version, setVersion] = useState(0);
     const bump = useCallback(() => setVersion((v) => v + 1), []);
     const [streamingText, setStreamingText] = useState('');
+    const [streamingReasoning, setStreamingReasoning] = useState('');
     const [toolStatus, setToolStatus] = useState(null);
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
@@ -55,6 +56,49 @@ export function useChat(args) {
         setPluginProgress(null);
         const ac = new AbortController();
         abortRef.current = ac;
+        let streamBuf = '';
+        let reasoningBuf = '';
+        let streamTimer = null;
+        const throttledSetStreamingText = (value) => {
+            streamBuf = typeof value === 'function' ? value(streamBuf) : value;
+            if (!streamTimer) {
+                streamTimer = setInterval(() => {
+                    if (streamBuf.length > 0) {
+                        setStreamingText(streamBuf);
+                    }
+                    if (reasoningBuf.length > 0) {
+                        setStreamingReasoning(reasoningBuf);
+                    }
+                }, 200);
+            }
+        };
+        const throttledSetStreamingReasoning = (value) => {
+            reasoningBuf = typeof value === 'function' ? value(reasoningBuf) : value;
+            if (!streamTimer) {
+                streamTimer = setInterval(() => {
+                    if (streamBuf.length > 0) {
+                        setStreamingText(streamBuf);
+                    }
+                    if (reasoningBuf.length > 0) {
+                        setStreamingReasoning(reasoningBuf);
+                    }
+                }, 200);
+            }
+        };
+        const flushStream = () => {
+            if (streamTimer) {
+                clearInterval(streamTimer);
+                streamTimer = null;
+            }
+            if (streamBuf.length > 0) {
+                setStreamingText(streamBuf);
+                streamBuf = '';
+            }
+            if (reasoningBuf.length > 0) {
+                setStreamingReasoning(reasoningBuf);
+                reasoningBuf = '';
+            }
+        };
         try {
             for await (const ev of runWithPlugins(trimmed, {
                 provider: args.provider,
@@ -62,7 +106,8 @@ export function useChat(args) {
                 signal: ac.signal,
             })) {
                 handleEvent(ev, {
-                    setStreamingText,
+                    setStreamingText: throttledSetStreamingText,
+                    setStreamingReasoning: throttledSetStreamingReasoning,
                     setToolStatus,
                     setCompacting,
                     setError,
@@ -76,8 +121,10 @@ export function useChat(args) {
             setError(`未捕获异常：${e.message}`);
         }
         finally {
+            flushStream();
             setIsLoading(false);
             setStreamingText('');
+            setStreamingReasoning('');
             setToolStatus(null);
             setCompacting(false);
             setPluginProgress(null);
@@ -104,6 +151,7 @@ export function useChat(args) {
         // 允许新 session 再次触发反应式压缩自救
         resetReactiveCompactState();
         setStreamingText('');
+        setStreamingReasoning('');
         setToolStatus(null);
         setError(null);
         setInterrupted(false);
@@ -156,6 +204,7 @@ export function useChat(args) {
     return {
         history,
         streamingText,
+        streamingReasoning,
         toolStatus,
         isLoading,
         error,
@@ -179,11 +228,16 @@ function handleEvent(ev, setters) {
     const e = ev;
     switch (e.type) {
         case 'text':
-            setters.setStreamingText((prev) => prev + e.delta);
+            setters.setStreamingText(prev => prev + e.delta);
+            break;
+        case 'reasoning_delta':
+            if (e.delta) {
+                setters.setStreamingReasoning(prev => prev + e.delta);
+            }
             break;
         case 'assistant_message':
-            // history 已被 runQuery 直接 push，这里只刷一下视图 + 清流式 buffer
-            setters.setStreamingText(() => '');
+            setters.setStreamingText('');
+            setters.setStreamingReasoning('');
             setters.bump();
             break;
         case 'tool_start':
@@ -199,10 +253,8 @@ function handleEvent(ev, setters) {
             setters.bump();
             break;
         case 'compact_start':
-            // reactive 自救场景：LLM 失败前可能已经 yield 过部分 text delta，
-            // 压缩前清掉残留 streamingText，避免重发后新文本追加在旧 buffer 后面。
-            // autoCompact 场景下 streamingText 本来就是空，这里 no-op。
-            setters.setStreamingText(() => '');
+            setters.setStreamingText('');
+            setters.setStreamingReasoning('');
             setters.setCompacting(true);
             setters.bump();
             break;
@@ -215,10 +267,14 @@ function handleEvent(ev, setters) {
             break;
         case 'interrupted':
             setters.setInterrupted(true);
+            setters.setStreamingText('');
+            setters.setStreamingReasoning('');
             setters.bump();
             break;
         case 'error':
             setters.setError(e.error);
+            setters.setStreamingText('');
+            setters.setStreamingReasoning('');
             setters.bump();
             break;
         case 'plugin_progress':

package/src/ui/hooks/useInputHistory.js

@@ -0,0 +1,186 @@
+/**
+ * ============================================================
+ *  src/ui/hooks/useInputHistory.ts —— 输入历史 ring buffer + 持久化
+ * ------------------------------------------------------------
+ *  - ring buffer 上限 50 条
+ *  - 持久化 ~/.minimal-agent/input-history.txt（一行一条 UTF-8）
+ *    转义 `\\` → `\\\\`，`\n` → `\\n`，避免多行输入被换行符撕碎
+ *  - API：push / prev / next / search / resetCursor
+ *  - 核心逻辑抽到 createInputHistoryStore，方便测试 DI 注入 fs
+ *    hook 自身只是 useRef + useEffect 包一下，渲染零依赖
+ * ============================================================
+ */
+import { useEffect, useMemo, useRef } from 'react';
+import { mkdir as fsMkdir, readFile as fsReadFile, writeFile as fsWriteFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+const MAX_ITEMS = 50;
+const WRITE_DEBOUNCE_MS = 500;
+/* ------------------------------------------------------------ *
+ *  转义：换行 + 反斜杠
+ * ------------------------------------------------------------ */
+export function encodeHistoryLine(text) {
+    return text.replace(/\\/g, '\\\\').replace(/\n/g, '\\n');
+}
+export function decodeHistoryLine(line) {
+    // 状态机：遇到 \ 看下一个字符决定 \\ → \  或  \n → 真换行
+    let out = '';
+    let i = 0;
+    while (i < line.length) {
+        const ch = line[i];
+        if (ch === '\\' && i + 1 < line.length) {
+            const nxt = line[i + 1];
+            if (nxt === '\\') {
+                out += '\\';
+                i += 2;
+                continue;
+            }
+            if (nxt === 'n') {
+                out += '\n';
+                i += 2;
+                continue;
+            }
+        }
+        out += ch;
+        i += 1;
+    }
+    return out;
+}
+export function createInputHistoryStore(opts = {}) {
+    const fs = opts.fs ?? {
+        readFile: (p) => fsReadFile(p, 'utf8'),
+        writeFile: (p, d) => fsWriteFile(p, d, 'utf8'),
+        mkdir: (p, o) => fsMkdir(p, o).then(() => undefined),
+    };
+    const historyPath = opts.historyPath ?? join(homedir(), '.minimal-agent', 'input-history.txt');
+    const debounceMs = opts.writeDebounceMs ?? WRITE_DEBOUNCE_MS;
+    let buffer = [];
+    let cursor = 0;
+    let writeTimer = null;
+    let pendingWrite = null;
+    async function doWrite() {
+        try {
+            await fs.mkdir(dirname(historyPath), { recursive: true });
+            const data = buffer.map(encodeHistoryLine).join('\n');
+            await fs.writeFile(historyPath, data);
+        }
+        catch {
+            // 持久化失败不影响 UI；下次 push 还会再试
+        }
+    }
+    function scheduleWrite() {
+        if (debounceMs <= 0) {
+            pendingWrite = doWrite();
+            return;
+        }
+        if (writeTimer)
+            clearTimeout(writeTimer);
+        writeTimer = setTimeout(() => {
+            writeTimer = null;
+            pendingWrite = doWrite();
+        }, debounceMs);
+    }
+    return {
+        async load() {
+            try {
+                const raw = await fs.readFile(historyPath);
+                if (!raw)
+                    return;
+                const lines = raw.split('\n').filter((l) => l.length > 0);
+                buffer = lines.slice(-MAX_ITEMS).map(decodeHistoryLine);
+                cursor = buffer.length;
+            }
+            catch {
+                // 文件不存在 / 读不出 → 用空 buffer 起步
+            }
+        },
+        push(text) {
+            if (!text)
+                return;
+            // 连续重复去重：跟最后一条相同就忽略
+            if (buffer.length > 0 && buffer[buffer.length - 1] === text) {
+                cursor = buffer.length;
+                return;
+            }
+            buffer.push(text);
+            while (buffer.length > MAX_ITEMS)
+                buffer.shift();
+            cursor = buffer.length;
+            scheduleWrite();
+        },
+        prev() {
+            if (buffer.length === 0)
+                return null;
+            if (cursor <= 0)
+                return null;
+            cursor -= 1;
+            return buffer[cursor] ?? null;
+        },
+        next() {
+            if (buffer.length === 0)
+                return null;
+            if (cursor >= buffer.length)
+                return null;
+            cursor += 1;
+            if (cursor >= buffer.length) {
+                // 已走到 "新输入" 位（buffer 之后），返 null 让 UI 清空
+                return null;
+            }
+            return buffer[cursor] ?? null;
+        },
+        search(query) {
+            if (!query)
+                return [];
+            const hits = [];
+            // 反向遍历，最近优先；同字符串只收一次
+            const seen = new Set();
+            for (let i = buffer.length - 1; i >= 0; i -= 1) {
+                const item = buffer[i];
+                if (item.includes(query) && !seen.has(item)) {
+                    hits.push(item);
+                    seen.add(item);
+                }
+            }
+            return hits;
+        },
+        resetCursor() {
+            cursor = buffer.length;
+        },
+        async flush() {
+            if (writeTimer) {
+                clearTimeout(writeTimer);
+                writeTimer = null;
+                pendingWrite = doWrite();
+            }
+            if (pendingWrite)
+                await pendingWrite;
+        },
+        _snapshot() {
+            return { buffer: [...buffer], cursor };
+        },
+    };
+}
+/* ------------------------------------------------------------ *
+ *  React hook 门面：store 用 useRef 持有，启动时 useEffect 拉盘
+ * ------------------------------------------------------------ */
+export function useInputHistory(opts) {
+    // 同一组件实例共享同一 store；options 变化不重建（输入历史 hook 不需要重建语义）
+    const storeRef = useRef(null);
+    if (storeRef.current === null) {
+        storeRef.current = createInputHistoryStore(opts);
+    }
+    useEffect(() => {
+        // 异步拉盘，不 await；UI 在拉盘前按 ↑ 只是空操作
+        storeRef.current?.load();
+    }, []);
+    // 暴露稳定门面，绑定到内部 store
+    return useMemo(() => {
+        return {
+            push: (t) => storeRef.current.push(t),
+            prev: () => storeRef.current.prev(),
+            next: () => storeRef.current.next(),
+            search: (q) => storeRef.current.search(q),
+            resetCursor: () => storeRef.current.resetCursor(),
+        };
+    }, []);
+}

package/src/ui/hooks/useTerminalSize.js

@@ -0,0 +1,31 @@
+/**
+ * ============================================================
+ *  src/ui/hooks/useTerminalSize.ts —— 终端尺寸感知
+ * ------------------------------------------------------------
+ *  返回当前终端的 rows / cols；监听 process.stdout 'resize' 事件，
+ *  resize 时刷新 state，触发依赖此 hook 的组件 re-render（如 MessageList
+ *  根据 rows < 28 决定是否折叠 reasoning）。
+ *
+ *  fallback 值：rows=24, cols=80（POSIX 终端历史默认）。
+ *  非 TTY 场景（pipe / 测试环境）下 process.stdout.rows 可能 undefined，
+ *  fallback 兜底保证 UI 不崩。
+ * ============================================================
+ */
+import { useEffect, useState } from 'react';
+function readSize() {
+    return {
+        rows: process.stdout.rows ?? 24,
+        cols: process.stdout.columns ?? 80,
+    };
+}
+export function useTerminalSize() {
+    const [size, setSize] = useState(readSize);
+    useEffect(() => {
+        const update = () => setSize(readSize());
+        process.stdout.on('resize', update);
+        return () => {
+            process.stdout.off('resize', update);
+        };
+    }, []);
+    return size;
+}