min-agent 0.3.0 → 0.4.0

package/dist/tui/ModelPicker.js

@@ -41,7 +41,9 @@ export function ModelPicker({ currentModel, onSelect, onCancel }) {
         else {
             setModels([]);
         }
-        return () => { cancelled = true; };
+        return () => {
+            cancelled = true;
+        };
     }, []);
     const terminalRows = stdout.rows || 24;
     const maxListRows = Math.max(4, terminalRows - 11); // chrome + status bar + safety
@@ -52,7 +54,9 @@ export function ModelPicker({ currentModel, onSelect, onCancel }) {
     const shown = filtered.slice(windowStart, windowStart + maxListRows);
     const extraAbove = windowStart;
     const extraBelow = filtered.length - (windowStart + shown.length);
-    useEffect(() => { setIndex(0); }, [q]);
+    useEffect(() => {
+        setIndex(0);
+    }, []);
     useInput((input, key) => {
         const cleanInput = input.replace(/[\r\n]+$/, "");
         const isEnter = key.return || /[\r\n]+$/.test(input);
@@ -104,5 +108,6 @@ export function ModelPicker({ currentModel, onSelect, onCancel }) {
     const empty = models !== null && filtered.length === 0 && q === "";
     // Debounce filter: avoid re-filtering on every keystroke burst
     const debouncedQ = q;
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.pickerBorder, paddingX: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: theme.pickerBorder, children: "\u9009\u62E9\u6A21\u578B" }), _jsx(Text, { color: theme.muted, children: currentModel ? ` (当前: ${currentModel})` : "" })] }), _jsxs(Box, { children: [_jsx(Text, { color: theme.muted, children: "\u7B5B\u9009: " }), _jsx(Text, { color: query ? theme.accent : theme.muted, children: query || "输入字符过滤，↑↓/PgUpDn 导航" })] }), loading && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u6B63\u5728\u83B7\u53D6\u6A21\u578B\u5217\u8868..." }) })), empty && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u65E0\u6CD5\u83B7\u53D6\u6A21\u578B\u5217\u8868\uFF08\u53EF\u8F93\u5165\u6A21\u578B\u540D\u540E\u6309 Enter\uFF09" }) })), models !== null && extraAbove > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0A\u65B9\u8FD8\u6709 ", extraAbove, " \u4E2A\u6A21\u578B"] }) })), models !== null && shown.map((m, i) => (_jsxs(Box, { children: [_jsx(Text, { color: i === shownIndex - windowStart ? theme.accent : theme.muted, children: i === shownIndex - windowStart ? "❯ " : "  " }), _jsx(Text, { bold: i === shownIndex - windowStart, color: i === shownIndex - windowStart ? theme.accent : undefined, children: m }), m === currentModel && _jsx(Text, { color: theme.success, children: "  \u2190 \u5F53\u524D" })] }, m))), extraBelow > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0B\u65B9\u8FD8\u6709 ", extraBelow, " \u4E2A\u6A21\u578B\uFF08\u8F93\u5165\u5B57\u7B26\u8FC7\u6EE4\uFF09"] }) })), models !== null && filtered.length === 0 && debouncedQ !== "" && (_jsxs(Box, { children: [_jsx(Text, { color: theme.accent, bold: true, children: "\u276F " }), _jsxs(Text, { color: theme.accent, bold: true, children: ["\u4F7F\u7528\u81EA\u5B9A\u4E49\u6A21\u578B: ", debouncedQ] })] })), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "\u2191\u2193/PgUpDn \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 Esc \u53D6\u6D88" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", borderStyle: "round", borderColor: theme.pickerBorder, paddingX: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: theme.pickerBorder, children: "\u9009\u62E9\u6A21\u578B" }), _jsx(Text, { color: theme.muted, children: currentModel ? ` (当前: ${currentModel})` : "" })] }), _jsxs(Box, { children: [_jsx(Text, { color: theme.muted, children: "\u7B5B\u9009: " }), _jsx(Text, { color: query ? theme.accent : theme.muted, children: query || "输入字符过滤，↑↓/PgUpDn 导航" })] }), loading && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u6B63\u5728\u83B7\u53D6\u6A21\u578B\u5217\u8868..." }) })), empty && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u65E0\u6CD5\u83B7\u53D6\u6A21\u578B\u5217\u8868\uFF08\u53EF\u8F93\u5165\u6A21\u578B\u540D\u540E\u6309 Enter\uFF09" }) })), models !== null && extraAbove > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0A\u65B9\u8FD8\u6709 ", extraAbove, " \u4E2A\u6A21\u578B"] }) })), models !== null &&
+                shown.map((m, i) => (_jsxs(Box, { children: [_jsx(Text, { color: i === shownIndex - windowStart ? theme.accent : theme.muted, children: i === shownIndex - windowStart ? "❯ " : "  " }), _jsx(Text, { bold: i === shownIndex - windowStart, color: i === shownIndex - windowStart ? theme.accent : undefined, children: m }), m === currentModel && _jsx(Text, { color: theme.success, children: " \u2190 \u5F53\u524D" })] }, m))), extraBelow > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0B\u65B9\u8FD8\u6709 ", extraBelow, " \u4E2A\u6A21\u578B\uFF08\u8F93\u5165\u5B57\u7B26\u8FC7\u6EE4\uFF09"] }) })), models !== null && filtered.length === 0 && debouncedQ !== "" && (_jsxs(Box, { children: [_jsxs(Text, { color: theme.accent, bold: true, children: ["\u276F", " "] }), _jsxs(Text, { color: theme.accent, bold: true, children: ["\u4F7F\u7528\u81EA\u5B9A\u4E49\u6A21\u578B: ", debouncedQ] })] })), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "\u2191\u2193/PgUpDn \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 Esc \u53D6\u6D88" }) })] }));
 }

package/dist/tui/QuestionBar.js

@@ -1,45 +1,71 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { wrapByWidth } from "./text-width.js";
-import { innerTextWidth } from "./layout.js";
+import { footerMaxRows, innerTextWidth, QUESTION_CHROME_ROWS, sliceLineWindow } from "./layout.js";
 import { theme } from "./theme.js";
+import { normalizeQuestionOptions, normalizeQuestionPrompt } from "../question-format.js";
+export function questionBodyLines(prompt, options, columns) {
+    const textWidth = innerTextWidth(columns);
+    const promptLines = `❓ ${normalizeQuestionPrompt(prompt)}`
+        .split("\n")
+        .flatMap((line) => wrapByWidth(line, textWidth));
+    const optionLines = normalizeQuestionOptions(options).flatMap((o, i) => `   ${i + 1}. ${o}`.split("\n").flatMap((l) => wrapByWidth(l, textWidth)));
+    return { lines: [...promptLines, ...optionLines], promptLineCount: promptLines.length };
+}
 /**
  * Terminal rows the question bar occupies, mirroring the JSX layout below.
- * Needed by App to bound the message area so the frame never exceeds the
- * terminal height while the prompt is up.
+ * Capped so a huge prompt cannot push the input row off the screen.
  */
-export function questionBarRows(prompt, options, columns) {
-    const textWidth = innerTextWidth(columns);
-    let rows = 0;
-    for (const line of prompt.split("\n"))
-        rows += wrapByWidth(line, textWidth).length;
-    if (options)
-        for (const o of options)
-            for (const l of o.split("\n"))
-                rows += wrapByWidth(l, textWidth).length;
-    return rows + 7; /* borders2 + title1 + marginTop1 + hint1 + inputRow1 + margin1 */
+export function questionBarRows(prompt, options, columns, frameRowCount = 0) {
+    const natural = questionBodyLines(prompt, options, columns).lines.length + QUESTION_CHROME_ROWS;
+    return Math.min(natural, footerMaxRows(frameRowCount, QUESTION_CHROME_ROWS));
 }
 /** Free-form question prompt: type an answer (or a number to pick an option), Enter to submit, Esc to cancel. */
-export function QuestionBar({ prompt, options, onAnswer }) {
+export function QuestionBar({ prompt, options, onAnswer, columns, maxRows }) {
     const [value, setValue] = useState("");
     const [caret, setCaret] = useState(0);
+    const [top, setTop] = useState(0);
+    const { lines, promptLineCount } = useMemo(() => questionBodyLines(prompt, options, columns), [prompt, options, columns]);
+    const bodyMax = Math.max(0, maxRows - QUESTION_CHROME_ROWS);
+    const window = useMemo(() => sliceLineWindow(lines, bodyMax, top), [lines, bodyMax, top]);
+    const scrollable = window.above > 0 || window.below > 0;
+    const choices = normalizeQuestionOptions(options);
     useInput((input, key) => {
         if (key.escape) {
             onAnswer(null);
             return;
         }
         if (key.return) {
-            if (/^\d+$/.test(value.trim()) && options?.length) {
+            if (/^\d+$/.test(value.trim()) && choices.length > 0) {
                 const n = parseInt(value.trim(), 10);
-                if (n >= 1 && n <= options.length) {
-                    onAnswer(options[n - 1]);
+                if (n >= 1 && n <= choices.length) {
+                    onAnswer(choices[n - 1]);
                     return;
                 }
             }
             onAnswer(value.trim());
             return;
         }
+        if (scrollable) {
+            const view = Math.max(1, window.lines.length);
+            if (key.upArrow) {
+                setTop((t) => sliceLineWindow(lines, bodyMax, t - 1).start);
+                return;
+            }
+            if (key.downArrow) {
+                setTop((t) => sliceLineWindow(lines, bodyMax, t + 1).start);
+                return;
+            }
+            if (key.pageUp) {
+                setTop((t) => sliceLineWindow(lines, bodyMax, t - view).start);
+                return;
+            }
+            if (key.pageDown) {
+                setTop((t) => sliceLineWindow(lines, bodyMax, t + view).start);
+                return;
+            }
+        }
         if (key.leftArrow) {
             setCaret((c) => Math.max(0, c - 1));
             return;
@@ -100,5 +126,11 @@ export function QuestionBar({ prompt, options, onAnswer }) {
             setCaret((c) => c + ins.length);
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.questionBorder, paddingX: 1, children: [_jsx(Box, { children: _jsxs(Text, { bold: true, color: theme.questionBorder, children: ["\u2753 ", prompt] }) }), options && options.length > 0 && (_jsx(Box, { paddingLeft: 1, flexDirection: "column", children: options.map((opt, i) => (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, children: ["   ", i + 1, ". ", opt] }) }, i))) })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { bold: true, color: theme.questionBorder, children: "\u2192 " }), _jsx(Text, { children: Array.from(value).slice(0, caret).join("") }), _jsx(Text, { color: theme.muted, inverse: true, children: " " }), _jsx(Text, { children: Array.from(value).slice(caret).join("") })] }), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "Enter \u63D0\u4EA4 \u00B7 Esc \u53D6\u6D88 \u00B7 \u2190\u2192 \u5149\u6807 \u00B7 \u6570\u5B57\u9009\u9009\u9879" }) })] }));
+    const hint = scrollable
+        ? "Enter 提交 · Esc 取消 · ↑↓ 滚动 · 数字选选项"
+        : "Enter 提交 · Esc 取消 · ←→ 光标 · 数字选选项";
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", borderStyle: "round", borderColor: theme.questionBorder, paddingX: 1, children: [bodyMax > 0 && (_jsxs(Box, { flexDirection: "column", height: bodyMax, overflow: "hidden", flexShrink: 0, width: "100%", children: [window.above > 0 && (_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4EE5\u4E0A ", window.above, " \u884C"] }) })), window.lines.map((line, i) => {
+                        const isPrompt = window.start + i < promptLineCount;
+                        return (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: isPrompt, color: isPrompt ? theme.questionBorder : theme.muted, wrap: "truncate-end", children: line }) }, i));
+                    }), window.below > 0 && (_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2193 \u8FD8\u6709 ", window.below, " \u884C"] }) }))] })), _jsxs(Box, { marginTop: 1, flexShrink: 0, height: 1, overflow: "hidden", width: "100%", children: [_jsxs(Text, { bold: true, color: theme.questionBorder, children: ["\u2192", " "] }), _jsx(Text, { children: Array.from(value).slice(0, caret).join("") }), _jsx(Text, { color: theme.muted, inverse: true, children: " " }), _jsx(Text, { children: Array.from(value).slice(caret).join("") })] }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: hint }) })] }));
 }

package/dist/tui/SessionPicker.js

@@ -0,0 +1,79 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
+import { Box, Text, useInput, useStdout } from "ink";
+import { listSessions } from "../sessions.js";
+import { theme } from "./theme.js";
+export function sessionPickerRows(terminalRows) {
+    const maxListRows = Math.max(4, terminalRows - 11);
+    return Math.min(6 + maxListRows + 3, Math.max(6, terminalRows - 2));
+}
+function label(s) {
+    const date = s.updated.split("T")[0] ?? "";
+    return `${s.id}  ${date}  ${s.title} (${s.messageCount})`;
+}
+export function SessionPicker({ currentId, onSelect, onCancel }) {
+    const sessions = listSessions();
+    const [query, setQuery] = useState("");
+    const [index, setIndex] = useState(0);
+    const { stdout } = useStdout();
+    const terminalRows = stdout.rows || 24;
+    const maxListRows = Math.max(4, terminalRows - 11);
+    const q = query.trim().toLowerCase();
+    const filtered = sessions.filter((s) => s.id.toLowerCase().includes(q) || s.title.toLowerCase().includes(q));
+    const shownIndex = Math.min(index, Math.max(0, filtered.length - 1));
+    const windowStart = Math.min(shownIndex, Math.max(0, filtered.length - maxListRows));
+    const shown = filtered.slice(windowStart, windowStart + maxListRows);
+    const extraAbove = windowStart;
+    const extraBelow = filtered.length - (windowStart + shown.length);
+    useEffect(() => {
+        setIndex(0);
+    }, []);
+    useInput((input, key) => {
+        const cleanInput = input.replace(/[\r\n]+$/, "");
+        const isEnter = key.return || /[\r\n]+$/.test(input);
+        if (key.escape) {
+            onCancel();
+            return;
+        }
+        if (key.pageDown) {
+            if (filtered.length > 0)
+                setIndex((i) => Math.min(filtered.length - 1, i + maxListRows));
+            return;
+        }
+        if (key.pageUp) {
+            if (filtered.length > 0)
+                setIndex((i) => Math.max(0, i - maxListRows));
+            return;
+        }
+        if (filtered.length > 0) {
+            if (key.downArrow) {
+                setIndex((i) => (i + 1) % filtered.length);
+                return;
+            }
+            if (key.upArrow) {
+                setIndex((i) => (i - 1 + filtered.length) % filtered.length);
+                return;
+            }
+        }
+        if (isEnter) {
+            if (filtered.length > 0)
+                onSelect(filtered[shownIndex].id);
+            return;
+        }
+        if (key.backspace || key.delete) {
+            setQuery((v) => Array.from(v).slice(0, -1).join(""));
+            return;
+        }
+        if (key.ctrl && input === "u") {
+            setQuery("");
+            return;
+        }
+        if (key.ctrl || key.meta || key.tab)
+            return;
+        if (cleanInput)
+            setQuery((v) => v + cleanInput);
+    });
+    const empty = filtered.length === 0 && q === "";
+    const noMatch = filtered.length === 0 && q !== "";
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", borderStyle: "round", borderColor: theme.pickerBorder, paddingX: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: theme.pickerBorder, children: "\u9009\u62E9\u4F1A\u8BDD" }), _jsx(Text, { color: theme.muted, children: currentId ? ` (当前: ${currentId})` : "" })] }), _jsxs(Box, { children: [_jsx(Text, { color: theme.muted, children: "\u7B5B\u9009: " }), _jsx(Text, { color: query ? theme.accent : theme.muted, children: query || "输入字符过滤标题或 id" })] }), empty && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u65E0\u5DF2\u4FDD\u5B58\u7684\u4F1A\u8BDD" }) })), noMatch && (_jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, children: "\u6CA1\u6709\u5339\u914D\u7684\u4F1A\u8BDD" }) })), extraAbove > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0A\u65B9\u8FD8\u6709 ", extraAbove, " \u4E2A\u4F1A\u8BDD"] }) })), shown.map((s, i) => (_jsxs(Box, { children: [_jsx(Text, { color: i === shownIndex - windowStart ? theme.accent : theme.muted, children: i === shownIndex - windowStart ? "❯ " : "  " }), _jsx(Text, { bold: i === shownIndex - windowStart, color: i === shownIndex - windowStart ? theme.accent : undefined, wrap: "truncate-end", children: label(s) }), s.id === currentId && _jsx(Text, { color: theme.success, children: " \u2190" })] }, s.id))), extraBelow > 0 && (_jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4E0B\u65B9\u8FD8\u6709 ", extraBelow, " \u4E2A\u4F1A\u8BDD"] }) })), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "\u2191\u2193/PgUpDn \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 Esc \u53D6\u6D88" }) })] }));
+}

package/dist/tui/StatusBar.js

@@ -1,24 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text } from "ink";
+import { formatTokenStatusLabel } from "../token-display.js";
 import { displayWidth } from "./text-width.js";
 export function StatusBar({ state, columns = 80 }) {
     const model = state.model || "unknown";
-    const tokens = state.tokenInfo;
-    const fmtK = (n) => `${(n / 1000).toFixed(1)}k`;
-    const ctxPct = tokens && tokens.contextWindow > 0 ? Math.round((tokens.input / tokens.contextWindow) * 100) : null;
-    const tokensLabel = tokens && (tokens.input > 0 || tokens.output > 0)
-        ? [
-            tokens.input > 0 ? `${fmtK(tokens.input)} in` : null,
-            tokens.output > 0 ? `${fmtK(tokens.output)} out` : null,
-            ctxPct != null ? `${ctxPct}%` : null,
-        ].filter(Boolean).join(" · ")
-        : "";
+    const tokensLabel = state.tokenInfo ? formatTokenStatusLabel(state.tokenInfo) : "";
     // Transient copy feedback rides on the separator row itself (right end) so
     // it never adds a row and the layout does not jump while it is visible.
     const sepWidth = Math.max(8, columns - 2);
-    const notice = state.copyNotice ? `✓ ${state.copyNotice}` : null;
+    const notice = state.copyNotice
+        ? `✓ ${state.copyNotice}`
+        : state.selectionMode
+            ? "选择模式  ↑↓←→扩选  Enter复制  Esc退出"
+            : null;
     const noticeWidth = notice ? displayWidth(notice) : 0;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, wrap: "truncate-end", children: notice
-                    ? `${"─".repeat(Math.max(0, sepWidth - noticeWidth - 2))}  ${notice}`
-                    : "─".repeat(sepWidth) }), _jsxs(Box, { children: [_jsx(Text, { children: " \uD83E\uDD16 min-agent" }), _jsxs(Text, { color: "gray", wrap: "truncate-end", children: [" (", model, ")"] }), tokensLabel && (_jsxs(_Fragment, { children: [_jsx(Text, { children: "  " }), _jsx(Text, { color: "gray", wrap: "truncate-end", children: tokensLabel })] }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", children: [_jsx(Text, { dimColor: true, wrap: "truncate-end", children: notice ? `${"─".repeat(Math.max(0, sepWidth - noticeWidth - 2))}  ${notice}` : "─".repeat(sepWidth) }), _jsxs(Box, { children: [_jsx(Text, { children: " \uD83E\uDD16 min-agent" }), _jsxs(Text, { color: "gray", wrap: "truncate-end", children: [" ", "(", model, ")"] }), tokensLabel && (_jsxs(_Fragment, { children: [_jsx(Text, { children: "  " }), _jsx(Text, { color: "gray", wrap: "truncate-end", children: tokensLabel })] }))] })] }));
 }

package/dist/tui/agent-runner.js

@@ -18,10 +18,44 @@ export function createAgentRunner(deps) {
         abortController = new AbortController();
         deps.tui.setRunning(true, "思考中...");
         const { summarizeToolCall, summarizeToolResult, toolResultText } = await import("../tool-display.js");
-        const { getContextWindow } = await import("../context-window.js");
+        const { getContextWindowInfo } = await import("../context-window.js");
         const { getModelPrice, estimateCost, formatCost } = await import("../pricing.js");
-        const { runOnce, runOnceWithSystem } = await import("../agent.js");
+        const { runOnceWithSystem, emptyResponseMessage, WRAP_UP_MESSAGE } = await import("../agent.js");
         const { clearStack, pushTurn } = await import("./undo-stack.js");
+        const { setSubAgentListener } = await import("../tools/task.js");
+        const { LOOP_HALT_MESSAGE } = await import("../doom-loop.js");
+        const { createSaveThrottle } = await import("../save-throttle.js");
+        const { snapshotTokenInfo } = await import("./token-info.js");
+        // Persist while the run is in flight so a crash/kill does not lose the turn.
+        const saveThrottle = createSaveThrottle(() => deps.persist?.());
+        const billedInAtStart = deps.tracker.totalInputTokens;
+        const billedOutAtStart = deps.tracker.totalOutputTokens;
+        let tokenTimer = null;
+        let tokenPaintSeq = 0;
+        const applyTokenInfo = async () => {
+            const seq = ++tokenPaintSeq;
+            const info = await snapshotTokenInfo(deps.tracker, deps.getModel(), deps.messages);
+            if (seq !== tokenPaintSeq)
+                return;
+            deps.tui.setTokenInfo(info);
+        };
+        const scheduleTokenInfo = () => {
+            if (tokenTimer != null)
+                return;
+            tokenTimer = setTimeout(() => {
+                tokenTimer = null;
+                void applyTokenInfo();
+            }, 50);
+        };
+        const flushTokenInfo = async () => {
+            if (tokenTimer != null) {
+                clearTimeout(tokenTimer);
+                tokenTimer = null;
+            }
+            await applyTokenInfo();
+        };
+        const unsubscribeTokens = deps.tracker.subscribe(scheduleTokenInfo);
+        void applyTokenInfo();
         const callbacks = {
             onAssistantDisplayDelta: (delta) => deps.tui.appendToLast(delta),
             onThinkingDelta: (delta) => {
@@ -46,45 +80,123 @@ export function createAgentRunner(deps) {
             onStreamError: (msg) => {
                 deps.tui.addMessage({ id: `err-${Date.now()}`, role: "system", content: `错误: ${msg}`, timestamp: Date.now() });
             },
-            onCompaction: () => {
+            onCompaction: (line) => {
                 compactedDuringRun = true;
                 deps.setUndoStack(clearStack(deps.getUndoStack()));
+                if (line === "compacting_start") {
+                    deps.tui.addMessage({
+                        id: `compact-${Date.now()}`,
+                        role: "system",
+                        content: "正在整理过长的对话记录…",
+                        timestamp: Date.now(),
+                    });
+                }
+                else if (line.startsWith("compacted_ok")) {
+                    deps.tui.addMessage({
+                        id: `compact-ok-${Date.now()}`,
+                        role: "system",
+                        content: "✓ 已整理对话记录，继续执行",
+                        timestamp: Date.now(),
+                    });
+                }
+            },
+            onRetryNotice: (info) => {
+                deps.tui.addMessage({
+                    id: `retry-${Date.now()}`,
+                    role: "system",
+                    content: info.kind === "wrap_up"
+                        ? "⟳ 本轮预算用尽，正在收尾…"
+                        : `⟳ 模型返回空响应，重试 ${info.attempt}/${info.maxAttempts}…`,
+                    timestamp: Date.now(),
+                });
             },
             onRunFinish: async (info) => {
                 abortController = null;
                 deps.tui.setRunning(false);
+                await flushTokenInfo();
                 if (info.aborted)
                     return;
                 if (info.budgetExceeded)
-                    deps.tui.addMessage({ id: `budget-${Date.now()}`, role: "system", content: "⚠ 已达到预算上限。/budget 查看或调高", timestamp: Date.now() });
-                if (info.usage) {
-                    const input = info.usage.inputTokens ?? 0;
-                    const output = info.usage.outputTokens ?? 0;
-                    const total = input + output;
-                    const ctxWindow = await getContextWindow(deps.getModel());
-                    const pct = ctxWindow > 0 ? Math.round((input / ctxWindow) * 100) : 0;
-                    deps.tui.setTokenInfo(input, output, ctxWindow);
+                    deps.tui.addMessage({
+                        id: `budget-${Date.now()}`,
+                        role: "system",
+                        content: "⚠ 已达到预算上限。/budget 查看或调高",
+                        timestamp: Date.now(),
+                    });
+                const runInput = Math.max(0, deps.tracker.totalInputTokens - billedInAtStart);
+                const runOutput = Math.max(0, deps.tracker.totalOutputTokens - billedOutAtStart);
+                const occupied = deps.tracker.lastInputTokens;
+                if (runInput > 0 || runOutput > 0 || occupied > 0) {
+                    const ctx = await getContextWindowInfo(deps.getModel());
+                    const pct = ctx.tokens > 0 && occupied > 0 ? Math.round((occupied / ctx.tokens) * 100) : null;
                     const price = await getModelPrice(deps.getModel() ?? "");
-                    const cost = estimateCost({ inputTokens: input, outputTokens: output }, price);
-                    deps.tui.addMessage({ id: `done-${Date.now()}`, role: "system", content: `Done in ${info.stepCount} step(s) | Tokens: ${input} in / ${output} out / ${total} total | Context: ${pct}%${cost != null ? ` | 约 ${formatCost(cost)}` : ""}`, timestamp: Date.now() });
+                    const cost = estimateCost({ inputTokens: runInput, outputTokens: runOutput }, price);
+                    const parts = [
+                        `Done in ${info.stepCount} step(s)`,
+                        `Tokens: ${runInput} in / ${runOutput} out / ${runInput + runOutput} total`,
+                        ...(pct != null ? [`Context: ${pct}%`] : []),
+                        ...(cost != null ? [`约 ${formatCost(cost)}`] : []),
+                    ];
+                    deps.tui.addMessage({
+                        id: `done-${Date.now()}`,
+                        role: "system",
+                        content: parts.join(" | "),
+                        timestamp: Date.now(),
+                    });
                 }
                 if (info.maxStepsReached)
-                    deps.tui.addMessage({ id: `maxsteps-${Date.now()}`, role: "system", content: "⚠ 达到本轮 30 步上限，发送消息继续", timestamp: Date.now() });
+                    deps.tui.addMessage({
+                        id: `maxsteps-${Date.now()}`,
+                        role: "system",
+                        content: "⚠ 已达到自动续跑上限，发送消息继续",
+                        timestamp: Date.now(),
+                    });
+                if (info.stopped)
+                    deps.tui.addMessage({
+                        id: `stopped-${Date.now()}`,
+                        role: "system",
+                        content: `⚠ ${LOOP_HALT_MESSAGE}`,
+                        timestamp: Date.now(),
+                    });
+                else if (info.wrapUp)
+                    deps.tui.addMessage({
+                        id: `wrapup-${Date.now()}`,
+                        role: "system",
+                        content: `⚠ ${WRAP_UP_MESSAGE}`,
+                        timestamp: Date.now(),
+                    });
+                else if (info.emptyResponse)
+                    deps.tui.addMessage({
+                        id: `empty-${Date.now()}`,
+                        role: "system",
+                        content: `⚠ ${emptyResponseMessage(info.emptyAttempts ?? 0)}`,
+                        timestamp: Date.now(),
+                    });
+                else if (info.incomplete)
+                    deps.tui.addMessage({
+                        id: `incomplete-${Date.now()}`,
+                        role: "system",
+                        content: "还没有完整回复，发送消息可继续",
+                        timestamp: Date.now(),
+                    });
             },
         };
         try {
+            setSubAgentListener((ev) => {
+                if (ev.phase !== "call")
+                    return;
+                deps.tui.appendToolChild(ev.parentToolCallId, {
+                    name: ev.name,
+                    summary: summarizeToolCall(ev.name, ev.input),
+                });
+            });
             const runOptions = {
                 providerName: deps.getProvider(),
+                taskState: deps.getTaskState(),
+                onStepPersist: () => saveThrottle.request(),
                 ...(deps.getPlanMode() ? { planMode: true } : {}),
             };
-            if (deps.mode === "code" && deps.codeSystemPrompt) {
-                await runOnceWithSystem(deps.messages, deps.codeSystemPrompt, deps.getModel(), abortController?.signal, callbacks, deps.tracker, runOptions);
-            }
-            else {
-                const { loadInstructions } = await import("../instructions.js");
-                const instructions = await loadInstructions();
-                await runOnce(deps.messages, instructions, deps.getModel(), abortController?.signal, callbacks, deps.tracker, runOptions);
-            }
+            await runOnceWithSystem(deps.messages, deps.getSystemPrompt(), deps.getModel(), abortController?.signal, callbacks, deps.tracker, runOptions);
         }
         catch (err) {
             if (!abortController)
@@ -93,10 +205,18 @@ export function createAgentRunner(deps) {
             callbacks.onStreamError(msg);
         }
         finally {
+            unsubscribeTokens();
+            if (tokenTimer != null) {
+                clearTimeout(tokenTimer);
+                tokenTimer = null;
+            }
+            setSubAgentListener(null);
+            saveThrottle.cancel();
             if (!compactedDuringRun)
                 deps.setUndoStack(pushTurn(deps.getUndoStack(), turnStart, deps.messages.length, uiStart));
             abortController = null;
             deps.tui.setRunning(false);
+            await flushTokenInfo();
         }
     };
     return { run, abort, getController };

package/dist/tui/caret-pos.js

@@ -1,4 +1,4 @@
-import { charWidth, wrapByWidth } from "./text-width.js";
+import { displayWidth, wrapByWidth, clustersOf } from "./text-width.js";
 /** Split the value into visual rows, tracking each row's character start index (newlines count as one). */
 export function visualRows(value, maxWidth) {
     const rows = [];
@@ -32,13 +32,12 @@ export function caretIndexFromClick(rows, rowIndex, clickColumn, textStartColumn
         return row.startIndex;
     let width = 0;
     let idx = 0;
-    for (const char of row.text) {
-        const w = charWidth(char);
+    for (const { text: g, width: w } of clustersOf(row.text)) {
         if (width + w > target) {
-            return row.startIndex + idx + (target - width < w / 2 ? 0 : 1);
+            return row.startIndex + idx + (target - width < w / 2 ? 0 : Array.from(g).length);
         }
         width += w;
-        idx++;
+        idx += Array.from(g).length;
     }
     return row.startIndex + idx;
 }
@@ -64,6 +63,30 @@ export function deleteAt(value, caretIndex) {
     chars.splice(caretIndex, 1);
     return { value: chars.join(""), caretIndex };
 }
+/** Move the caret one visual row up (`-1`) or down (`1`), keeping the display column. */
+export function moveCaretVertical(value, caretIndex, direction, maxWidth) {
+    const rows = visualRows(value, maxWidth);
+    let rowIndex = 0;
+    let offset = 0;
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        const end = row.startIndex + Array.from(row.text).length;
+        if (caretIndex >= row.startIndex && caretIndex <= end) {
+            rowIndex = i;
+            offset = caretIndex - row.startIndex;
+            break;
+        }
+        if (i === rows.length - 1) {
+            rowIndex = i;
+            offset = Array.from(row.text).length;
+        }
+    }
+    const next = rowIndex + direction;
+    if (next < 0 || next >= rows.length)
+        return caretIndex;
+    const col = displayWidth(Array.from(rows[rowIndex].text).slice(0, offset).join(""));
+    return caretIndexFromClick(rows, next, col, 0);
+}
 export function moveToLineStart(value, caretIndex) {
     const chars = Array.from(value);
     let i = caretIndex - 1;
@@ -132,3 +155,23 @@ export function scanDeleteKeys(buffer, chunk) {
     const prefix = tail.slice(esc);
     return { buffer: prefix.length > MAX_DELETE_PREFIX ? "\x1b" : prefix, actions };
 }
+const HOME_END_RE = /\x1b\[(?:[HF]|[1478]~)/g;
+const MAX_HOME_END_PREFIX = 8;
+export function scanHomeEndKeys(buffer, chunk) {
+    const buf = buffer + chunk;
+    const actions = [];
+    let lastConsumedEnd = 0;
+    HOME_END_RE.lastIndex = 0;
+    let m;
+    while ((m = HOME_END_RE.exec(buf))) {
+        lastConsumedEnd = m.index + m[0].length;
+        const seq = m[0];
+        actions.push(seq.endsWith("H") || seq.endsWith("1~") || seq.endsWith("7~") ? { kind: "home" } : { kind: "end" });
+    }
+    const tail = buf.slice(lastConsumedEnd);
+    const esc = tail.lastIndexOf("\x1b");
+    if (esc === -1)
+        return { buffer: "", actions };
+    const prefix = tail.slice(esc);
+    return { buffer: prefix.length > MAX_HOME_END_PREFIX ? "\x1b" : prefix, actions };
+}

package/dist/tui/caret.js

@@ -26,7 +26,7 @@ export function setCaretPosition(position) {
 export function createCaretAwareStdout(base) {
     let pendingRowsUp = 0;
     const write = (chunk, encoding, callback) => {
-        const isBuf = typeof Buffer !== "undefined" && Buffer.isBuffer(chunk);
+        const isBuf = Buffer?.isBuffer(chunk);
         let chunkStr;
         if (typeof chunk === "string")
             chunkStr = chunk;

package/dist/tui/click-count.js

@@ -0,0 +1,13 @@
+export const DOUBLE_CLICK_MS = 400;
+export const DOUBLE_CLICK_COL_SLOP = 2;
+export function createClickCounter() {
+    return { row: -1, col: -1, at: Number.NEGATIVE_INFINITY, count: 0 };
+}
+export function noteClick(c, ev) {
+    const same = ev.row === c.row && Math.abs(ev.col - c.col) <= DOUBLE_CLICK_COL_SLOP && ev.at - c.at <= DOUBLE_CLICK_MS;
+    c.count = same ? c.count + 1 : 1;
+    c.row = ev.row;
+    c.col = ev.col;
+    c.at = ev.at;
+    return c.count;
+}

package/dist/tui/drag-state.js

@@ -23,7 +23,10 @@ export function stepDrag(machine, event, maxHeight) {
     const plain = (button & MOD_MASK) === 0;
     const dragging = machine.pending != null;
     if (plain && dragging && ((button & MOTION) !== 0 || (button === 0 && press))) {
-        machine.selection = { anchor: machine.pending, cur: { row, col } };
+        const origin = machine.pending;
+        if (row === origin.row && col === origin.col && machine.selection == null)
+            return null;
+        machine.selection = { anchor: origin, cur: { row, col } };
         return { type: "selection", selection: machine.selection };
     }
     if (button === 0 && press) {
@@ -35,10 +38,12 @@ export function stepDrag(machine, event, maxHeight) {
         const active = machine.selection;
         const pending = machine.pending;
         machine.pending = null;
-        if (active)
+        machine.selection = null;
+        if (active && (active.anchor.row !== active.cur.row || active.anchor.col !== active.cur.col)) {
             return { type: "copy", selection: active };
+        }
         if (pending)
-            return { type: "click", row };
+            return { type: "click", row: pending.row, col: pending.col };
     }
     return null;
 }