min-agent 0.4.1 → 0.5.0

package/dist/tui/InputBar.js

@@ -5,11 +5,14 @@ import { setCaretPosition } from "./caret.js";
 import { displayWidth } from "./text-width.js";
 import { visualRows, moveCaretHorizontal, moveCaretVertical, insertAt, backspaceAt, deleteAt, caretIndexFromClick, scanDeleteKeys, scanHomeEndKeys, moveToLineStart, moveToLineEnd, deleteToLineStart, deleteToLineEnd, deleteWordBefore, } from "./caret-pos.js";
 import { searchHistory, loadInputHistory, saveInputHistory, createHistory, pushInput, browseHistory, resetHistory, isCtrlC, clearInputOnCtrlC, EXIT_CTRL_C_WINDOW_MS, } from "./input-history.js";
-import { filterSlashCommands, getSlashArgOptions, applySlashArgCompletion, isKnownSlashCommandInput, } from "./slash-commands.js";
+import { filterSlashCommands, getSlashArgOptions, applySlashArgCompletion, isKnownSlashCommandInput, slashMenuWindow, } from "./slash-commands.js";
 import { MOUSE_ENABLE, MOUSE_DISABLE } from "./mouse.js";
 import { scanSgrMouse } from "./mouse.js";
-import { TEXT_START_COLUMN, inputTextWidth } from "./layout.js";
+import { TEXT_START_COLUMN, inputTextWidth, inputBarPaintRows, slashMenuMaxVisible, SLASH_COMMAND_MENU_CHROME, SLASH_ARG_MENU_CHROME, INPUT_BAR_ROWS, } from "./layout.js";
 import { theme } from "./theme.js";
+import { getClipboardImage } from "../clipboard.js";
+import { BRACKETED_PASTE_DISABLE, BRACKETED_PASTE_ENABLE, scanBracketedPaste, shouldIgnorePasteInput, } from "./bracketed-paste.js";
+import { applyClipboardImage, applyPastedText, buildSubmittedPrompt, chipClusterWidth, createPasteDraft, paintChar, pruneAttachments, resetPasteDraft, } from "./paste-draft.js";
 const GUTTER = "❯ ";
 const SHIFT_ENTER_SEQ = "\x1b[13;2u";
 /**
@@ -50,7 +53,7 @@ export function accumulateKittyInput(buffer, chunk) {
  * exactly; the hardware cursor is parked on that cell so IME composition
  * (Chinese, Japanese, Korean) shows up in the right place.
  */
-export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRows, onSelectionMode, onExit, }) {
+export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRows, onSelectionMode, onExit, onRowsChange, onNotice, }) {
     const [editing, setEditing] = useState({ value: "", caretIndex: 0 });
     const { value, caretIndex } = editing;
     const [menuIndex, setMenuIndex] = useState(0);
@@ -61,6 +64,11 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     const mouseBuffer = useRef("");
     const deleteBuffer = useRef("");
     const homeEndBuffer = useRef("");
+    const pasteBuffer = useRef("");
+    const pasteActiveRef = useRef(false);
+    const draftRef = useRef(createPasteDraft());
+    const onNoticeRef = useRef(onNotice);
+    onNoticeRef.current = onNotice;
     const width = columns || 80;
     const [historyState, setHistoryState] = useState(() => createHistory(loadInputHistory()));
     const historyRef = useRef(historyState);
@@ -99,18 +107,33 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         const after = edit(editingRef.current.value, editingRef.current.caretIndex);
         editingRef.current = after;
         setEditing(after);
+        draftRef.current = pruneAttachments(draftRef.current, after.value);
         const nextHistory = resetHistory(historyRef.current, after.value);
         if (nextHistory !== historyRef.current) {
             historyRef.current = nextHistory;
             setHistoryState(nextHistory);
         }
     }, [clearExitHint]);
-    const submit = (text) => {
-        historyRef.current = pushInput(historyRef.current, text);
+    const submit = (prompt) => {
+        historyRef.current = pushInput(historyRef.current, prompt.display);
         setHistoryState(historyRef.current);
         saveInputHistory(historyRef.current.entries);
-        onSubmit(text);
+        onSubmit(prompt);
     };
+    const applyIncomingPaste = useCallback((raw) => {
+        const result = applyPastedText(draftRef.current, raw);
+        if (result.kind === "text") {
+            if (result.text)
+                applyEdit((v, c) => insertAt(v, c, result.text));
+            return;
+        }
+        if (result.kind === "snippet") {
+            draftRef.current = result.draft;
+            applyEdit((v, c) => insertAt(v, c, result.char));
+            return;
+        }
+        onNoticeRef.current?.(result.notice);
+    }, [applyEdit]);
     const browseTo = (direction) => {
         const { text, state } = browseHistory(historyRef.current, direction, isKnownSlashCommandInput);
         historyRef.current = state;
@@ -144,7 +167,8 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             applyEdit(() => ({ value: `/${cmd.name} `, caretIndex: cmd.name.length + 2 }));
         }
         else {
-            submit(`/${cmd.name}`);
+            submit({ display: `/${cmd.name}`, content: `/${cmd.name}` });
+            draftRef.current = resetPasteDraft();
             applyEdit(() => ({ value: "", caretIndex: 0 }));
         }
     };
@@ -158,14 +182,12 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     acceptCommandRef.current = acceptCommand;
     const acceptArgRef = useRef(acceptArg);
     acceptArgRef.current = acceptArg;
-    const matchesRef = useRef(matches);
-    matchesRef.current = matches;
-    const argOptionsRef = useRef(argOptions);
-    argOptionsRef.current = argOptions;
     const menuOpenRef = useRef(menuOpen);
     menuOpenRef.current = menuOpen;
     const argMenuOpenRef = useRef(argMenuOpen);
     argMenuOpenRef.current = argMenuOpen;
+    const applyIncomingPasteRef = useRef(applyIncomingPaste);
+    applyIncomingPasteRef.current = applyIncomingPaste;
     useInput((input, key) => {
         if (disabled)
             return;
@@ -187,6 +209,7 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                 return;
             }
             clearExitHint();
+            draftRef.current = resetPasteDraft();
             applyEdit(() => ({ value: "", caretIndex: 0 }));
             return;
         }
@@ -195,6 +218,19 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             onSelectionMode?.();
             return;
         }
+        if (key.ctrl && input === "v") {
+            const result = applyClipboardImage(draftRef.current, getClipboardImage());
+            if (result.kind === "image") {
+                draftRef.current = result.draft;
+                applyEdit((v, c) => insertAt(v, c, result.char));
+            }
+            else if (result.kind === "reject") {
+                onNoticeRef.current?.(result.notice);
+            }
+            return;
+        }
+        if (shouldIgnorePasteInput(input, pasteActiveRef.current))
+            return;
         // Fast typing or paste can deliver "text\r" as a single chunk — treat a
         // trailing Enter as Enter and strip it from the value.
         const cleanInput = input.replace(/[\r\n]+$/, "");
@@ -256,7 +292,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         // Move one visual row first; only browse history when already at the edge.
         if (key.upArrow) {
             const { value: v, caretIndex: c } = editingRef.current;
-            const next = moveCaretVertical(v, c, -1, inputTextWidth(columns));
+            const maxW = inputTextWidth(columns);
+            const lookup = (ch) => chipClusterWidth(ch, draftRef.current, maxW);
+            const next = moveCaretVertical(v, c, -1, maxW, lookup);
             if (next !== c) {
                 applyEdit(() => ({ value: v, caretIndex: next }));
                 return;
@@ -266,7 +304,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         }
         if (key.downArrow) {
             const { value: v, caretIndex: c } = editingRef.current;
-            const next = moveCaretVertical(v, c, 1, inputTextWidth(columns));
+            const maxW = inputTextWidth(columns);
+            const lookup = (ch) => chipClusterWidth(ch, draftRef.current, maxW);
+            const next = moveCaretVertical(v, c, 1, maxW, lookup);
             if (next !== c) {
                 applyEdit(() => ({ value: v, caretIndex: next }));
                 return;
@@ -288,9 +328,10 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                 applyEdit((cv, cc) => insertAt(cv.slice(0, -1), cc, "\n"));
                 return;
             }
-            const text = v.trim();
-            if (text)
-                submit(text);
+            const prompt = buildSubmittedPrompt(v, draftRef.current);
+            if (prompt.display.trim() || draftRef.current.attachments.size > 0)
+                submit(prompt);
+            draftRef.current = resetPasteDraft();
             applyEdit(() => ({ value: "", caretIndex: 0 }));
             return;
         }
@@ -361,13 +402,6 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             return;
         if (/^\[<.*[Mm]$/.test(input) || input.startsWith("[<") || /^[\d;,]+[Mm]$/.test(input))
             return;
-        // Bracketed paste: ESC[200~ ... ESC[200~ — Ink may deliver without ESC, treat as bulk insert
-        if (input.includes("\x1b[200~") || input.includes("[200~")) {
-            const cleaned = input.replace(/\x1b?\[200~|\x1b?\[201~/g, "");
-            if (cleaned)
-                applyEdit((v, c) => insertAt(v, c, cleaned));
-            return;
-        }
         // Tab → 2 spaces
         if (key.tab) {
             applyEdit((v, c) => insertAt(v, c, "  "));
@@ -384,8 +418,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     const isMultiline = logicalLines.length > 1;
     const borderColor = disabled ? theme.inputBorderDisabled : theme.inputBorder;
     const textWidth = inputTextWidth(width);
+    const chipLookup = (ch) => chipClusterWidth(ch, draftRef.current, textWidth);
     // Visual rows of the value, plus the caret position inside them.
-    const rows = visualRows(value, textWidth);
+    const rows = visualRows(value, textWidth, chipLookup);
     const clampedCaret = Math.min(caretIndex, Array.from(value).length);
     // Locate the caret's visual row and its character offset inside that row.
     let caretRowIndex = rows.length - 1;
@@ -401,7 +436,7 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     }
     // A caret at the end of a full row has no cell left — move it to the start
     // of the next visual row (pushing an empty one when it is the last row).
-    let caretColumnOffset = displayWidth(Array.from(rows[caretRowIndex].text).slice(0, caretCharOffset).join(""));
+    let caretColumnOffset = displayWidth(Array.from(rows[caretRowIndex].text).slice(0, caretCharOffset).join(""), chipLookup);
     if (caretColumnOffset >= textWidth) {
         if (caretRowIndex === rows.length - 1) {
             rows.push({
@@ -417,8 +452,16 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     // (single-row) multi-line hint — plus the slash menu when it floats below
     // the input bar.
     const hintRows = isMultiline ? 1 : 0;
-    const argShown = argMenuOpen ? Math.min(8, argOptions.length) : 0;
-    const menuRows = menuOpen ? matches.length + 5 : argMenuOpen ? argShown + 4 : 0;
+    const commandMax = slashMenuMaxVisible(terminalRows, rows.length, hintRows, SLASH_COMMAND_MENU_CHROME);
+    const argMax = slashMenuMaxVisible(terminalRows, rows.length, hintRows, SLASH_ARG_MENU_CHROME);
+    const commandWindow = menuOpen ? slashMenuWindow(matches, shownIndex, commandMax) : null;
+    const argWindow = argMenuOpen ? slashMenuWindow(argOptions, argIndex, argMax) : null;
+    const menuRows = commandWindow
+        ? commandWindow.shown.length + SLASH_COMMAND_MENU_CHROME
+        : argWindow
+            ? argWindow.shown.length + SLASH_ARG_MENU_CHROME
+            : 0;
+    const paintedRows = inputBarPaintRows(rows.length, hintRows, commandWindow?.shown.length ?? 0, argWindow?.shown.length ?? 0);
     // Input bar sits at the bottom of App's footer: its content area starts
     // `terminalRows` rows up minus the bar's own height (menu + bottom border +
     // hint above it in screen order, from the bottom of the terminal up).
@@ -431,6 +474,16 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     inputTopRowRef.current = inputTopRow;
     const hintRowsRef = useRef(hintRows);
     hintRowsRef.current = hintRows;
+    const commandWindowRef = useRef(commandWindow);
+    commandWindowRef.current = commandWindow;
+    const argWindowRef = useRef(argWindow);
+    argWindowRef.current = argWindow;
+    const chipLookupRef = useRef(chipLookup);
+    chipLookupRef.current = chipLookup;
+    useEffect(() => {
+        onRowsChange?.(paintedRows);
+    }, [paintedRows, onRowsChange]);
+    useEffect(() => () => onRowsChange?.(INPUT_BAR_ROWS), [onRowsChange]);
     // Listen for Kitty protocol Shift+Enter: ESC[13;2u, which may arrive split
     // across stdin chunks — accumulate and reassemble here. Ink's useInput gets
     // each raw chunk and would append fragments to the value, so isKittySequenceFragment
@@ -445,6 +498,11 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             return;
         const handleData = (data) => {
             const chunk = data.toString("utf-8");
+            const pasteScan = scanBracketedPaste(pasteBuffer.current, chunk);
+            pasteBuffer.current = pasteScan.buffer;
+            pasteActiveRef.current = pasteScan.active;
+            for (const raw of pasteScan.pastes)
+                applyIncomingPasteRef.current(raw);
             // Kitty Shift+Enter accumulation
             const { buffer: kittyBuf, shiftEnter } = accumulateKittyInput(kittyBuffer.current, chunk);
             kittyBuffer.current = kittyBuf;
@@ -480,7 +538,7 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                         const evCol = sgr.event.col;
                         applyEdit((v) => ({
                             value: v,
-                            caretIndex: caretIndexFromClick(rowsRef.current, contentRow, evCol, TEXT_START_COLUMN),
+                            caretIndex: caretIndexFromClick(rowsRef.current, contentRow, evCol, TEXT_START_COLUMN, chipLookupRef.current),
                         }));
                     }
                     else {
@@ -488,13 +546,12 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                         const header = menuOpenRef.current ? 1 : 0;
                         const optionIndex = sgr.event.row - (inputTopRowRef.current + rowsRef.current.length + hintRowsRef.current + chrome + header);
                         if (menuOpenRef.current) {
-                            const cmd = matchesRef.current[optionIndex];
+                            const cmd = commandWindowRef.current?.shown[optionIndex];
                             if (cmd)
                                 acceptCommandRef.current(cmd);
                         }
                         else if (argMenuOpenRef.current) {
-                            const shown = argOptionsRef.current.slice(0, 8);
-                            const opt = shown[optionIndex];
+                            const opt = argWindowRef.current?.shown[optionIndex];
                             if (opt)
                                 acceptArgRef.current(opt);
                         }
@@ -516,9 +573,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     // same chunk stream as the Kitty sequence. Terminals without mouse support
     // simply never send events — keyboard navigation still works.
     useEffect(() => {
-        stdout.write(MOUSE_ENABLE);
+        stdout.write(`${BRACKETED_PASTE_ENABLE}${MOUSE_ENABLE}`);
         return () => {
-            stdout.write(MOUSE_DISABLE);
+            stdout.write(`${MOUSE_DISABLE}${BRACKETED_PASTE_DISABLE}`);
         };
     }, [stdout]);
     // Must publish during render (not in effect) — Ink writes the frame in
@@ -536,8 +593,24 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                         const chars = Array.from(row.text);
                         const caretHere = i === caretRowIndex;
                         const offset = caretHere ? caretCharOffset : chars.length;
-                        const before = chars.slice(0, offset).join("");
-                        const after = chars.slice(offset).join("");
+                        const before = chars
+                            .slice(0, offset)
+                            .map((c) => paintChar(c, draftRef.current, textWidth))
+                            .join("");
+                        const after = chars
+                            .slice(offset)
+                            .map((c) => paintChar(c, draftRef.current, textWidth))
+                            .join("");
                         return (_jsxs(Box, { children: [_jsx(Text, { color: disabled ? theme.inputBorderDisabled : theme.inputBorder, children: i === 0 ? GUTTER : "  " }), _jsxs(Text, { wrap: "truncate-end", children: [before, caretHere && _jsx(Text, { inverse: true, children: " " }), after] })] }, i));
-                    })), isMultiline && (_jsx(Box, { justifyContent: "flex-end", children: _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: [logicalLines.length, " \u884C | Shift+Enter/Ctrl+J \u6362\u884C | Enter \u53D1\u9001"] }) }))] }), menuOpen && selected && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.inputBorder, paddingX: 1, marginTop: 1, width: "100%", children: [_jsx(Box, { children: _jsx(Text, { color: theme.muted, children: value.trim() === "/" ? "命令" : `/${value.slice(1)} 命令` }) }), matches.map((c, i) => (_jsxs(Box, { children: [_jsx(Text, { color: i === shownIndex ? theme.accent : theme.muted, children: i === shownIndex ? "❯ " : "  " }), _jsxs(Text, { bold: i === shownIndex, color: i === shownIndex ? theme.accent : undefined, children: ["/", c.name, c.argHint ? ` ${c.argHint}` : ""] }), _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: ["  ", c.description] })] }, c.name))), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "Tab \u9009\u62E9 \u00B7 Enter \u6267\u884C \u00B7 Esc \u5173\u95ED" }) })] })), argMenuOpen && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.inputBorder, paddingX: 1, marginTop: 1, width: "100%", children: [argOptions.slice(0, 8).map((o, i) => (_jsxs(Box, { children: [_jsx(Text, { color: i === argIndex ? theme.accent : theme.muted, children: i === argIndex ? "❯ " : "  " }), _jsx(Text, { bold: i === argIndex, color: i === argIndex ? theme.accent : undefined, children: o.value }), o.description && (_jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: ["  ", o.description] }))] }, o.value))), _jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: [argOptions.length > 8 ? `还有 ${argOptions.length - 8} 项 · ` : "", "Tab \u8865\u5168 \u00B7 Enter \u6267\u884C \u00B7 Esc \u5173\u95ED"] }) })] }))] }));
+                    })), isMultiline && (_jsx(Box, { justifyContent: "flex-end", children: _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: [logicalLines.length, " \u884C | Shift+Enter/Ctrl+J \u6362\u884C | Enter \u53D1\u9001"] }) }))] }), menuOpen && selected && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.inputBorder, paddingX: 1, marginTop: 1, width: "100%", children: [_jsx(Box, { children: _jsx(Text, { color: theme.muted, children: value.trim() === "/" ? "命令" : `/${value.slice(1)} 命令` }) }), commandWindow?.shown.map((c, i) => {
+                        const active = commandWindow.start + i === shownIndex;
+                        return (_jsxs(Box, { children: [_jsx(Text, { color: active ? theme.accent : theme.muted, children: active ? "❯ " : "  " }), _jsxs(Text, { bold: active, color: active ? theme.accent : undefined, children: ["/", c.name, c.argHint ? ` ${c.argHint}` : ""] }), _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: ["  ", c.description] })] }, c.name));
+                    }), _jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: [commandWindow && commandWindow.extraAbove + commandWindow.extraBelow > 0
+                                    ? `还有 ${commandWindow.extraAbove + commandWindow.extraBelow} 项 · `
+                                    : "", "Tab \u9009\u62E9 \u00B7 Enter \u6267\u884C \u00B7 Esc \u5173\u95ED"] }) })] })), argMenuOpen && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.inputBorder, paddingX: 1, marginTop: 1, width: "100%", children: [argWindow?.shown.map((o, i) => {
+                        const active = argWindow.start + i === argIndex;
+                        return (_jsxs(Box, { children: [_jsx(Text, { color: active ? theme.accent : theme.muted, children: active ? "❯ " : "  " }), _jsx(Text, { bold: active, color: active ? theme.accent : undefined, children: o.value }), o.description && (_jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: ["  ", o.description] }))] }, o.value));
+                    }), _jsx(Box, { children: _jsxs(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: [argWindow && argWindow.extraAbove + argWindow.extraBelow > 0
+                                    ? `还有 ${argWindow.extraAbove + argWindow.extraBelow} 项 · `
+                                    : "", "Tab \u8865\u5168 \u00B7 Enter \u6267\u884C \u00B7 Esc \u5173\u95ED"] }) })] }))] }));
 }

package/dist/tui/MessageList.js

@@ -67,12 +67,27 @@ function resultPreviewLines(result) {
     const hidden = lines.length - TOOL_RESULT_MAX_LINES;
     return [...lines.slice(0, TOOL_RESULT_MAX_LINES), `… 结果还有 ${hidden} 行未显示`];
 }
-/** Physical rows for one message. The leading marker ("> " / "⚡ name ") lives
+function isExpandable(msg) {
+    return msg.role === "tool" || msg.role === "thinking";
+}
+/** Thinking rows start expanded so the chain is visible; tools start collapsed.
+ * `toggled` records the ids the user has clicked, which inverts that default. */
+function rowExpanded(msg, toggled) {
+    return msg.role === "thinking" ? !toggled.has(msg.id) : toggled.has(msg.id);
+}
+function packCollapsedRow(label, preview, tail, textWidth) {
+    const contentWidth = Math.max(1, textWidth - displayWidth(label));
+    const packed = displayWidth(preview + tail) <= contentWidth
+        ? `${label}${preview}${tail}`
+        : `${label}${clipToWidth(preview, Math.max(1, contentWidth - displayWidth(tail) - 1))}…${tail}`;
+    return [clipToWidth(packed, textWidth)];
+}
+/** Physical rows for one message. The leading marker ("> " / "⚡ name " / "💭 思考 ") lives
  * in the first row only, mirroring the JSX layout below.
  *
  * Tool calls render as a single row (arguments plus a result summary) by
- * default; clicking the row (see MessageList) toggles `expanded` to reveal the
- * full tool result. */
+ * default; thinking rows start expanded so the full chain is visible. Clicking
+ * either row (see MessageList) toggles `expanded`. */
 export function messageLines(msg, columns, expanded) {
     const textWidth = messageTextWidth(columns);
     switch (msg.role) {
@@ -103,21 +118,32 @@ export function messageLines(msg, columns, expanded) {
                 return wrapByWidth(typeof msg.content === "string" ? msg.content : String(msg.content ?? ""), textWidth);
             }
         }
-        case "thinking":
-            return msg.content?.trim() ? wrapByWidth(msg.content, textWidth) : [];
+        case "thinking": {
+            const body = msg.content.trim();
+            if (!body)
+                return [];
+            const preview = body.replace(/\s+/g, " ");
+            const label = `💭 思考 ${expanded ? "▾" : "▸"} `;
+            if (!expanded) {
+                const lineCount = body.split("\n").length;
+                const tail = lineCount > 1 ? ` → ${lineCount} 行` : "";
+                return packCollapsedRow(label, preview, tail, textWidth);
+            }
+            const rows = wrapByWidth(label, textWidth);
+            for (const line of body.replace(/\s+$/, "").split("\n")) {
+                rows.push(...wrapByWidth(`  ${line}`, textWidth));
+            }
+            return rows;
+        }
         case "tool": {
             const name = msg.toolName ?? "";
             // The call summary is a single logical line; collapse any stray newlines
             // so it cannot push the row layout around.
             const call = msg.content.replace(/\s+/g, " ").trim();
             const label = `⚡ ${name} ${expanded ? "▾" : "▸"} `;
-            const contentWidth = Math.max(1, textWidth - displayWidth(label));
             if (!expanded) {
                 const tail = msg.toolResultSummary ? ` → ${msg.toolResultSummary}` : "";
-                const packed = displayWidth(call + tail) <= contentWidth
-                    ? `${label}${call}${tail}`
-                    : `${label}${clipToWidth(call, Math.max(1, contentWidth - displayWidth(tail) - 1))}…${tail}`;
-                return [clipToWidth(packed, textWidth)];
+                return packCollapsedRow(label, call, tail, textWidth);
             }
             const rows = wrapByWidth(`${label}${call}`, textWidth);
             if (msg.toolChildren && msg.toolChildren.length > 0) {
@@ -246,9 +272,11 @@ export function sliceWindow(messages, rowCounts, maxHeight, top) {
  */
 export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, selectionMode, onExitSelectionMode, interactive = true, }) {
     const [windowTop, setWindowTop] = useState(null);
+    // Ids the user has clicked. Tools start collapsed; thinking starts expanded,
+    // so membership here inverts that default (see rowExpanded).
     const [expanded, setExpanded] = useState(new Set());
     const [selection, setSelection] = useState(null);
-    const rowCounts = useMemo(() => messages.map((m) => messageRowCount(m, columns, expanded.has(m.id))), [messages, columns, expanded]);
+    const rowCounts = useMemo(() => messages.map((m) => messageRowCount(m, columns, rowExpanded(m, expanded))), [messages, columns, expanded]);
     const slice = useMemo(() => sliceWindow(messages, rowCounts, maxHeight ?? 0, windowTop), [messages, rowCounts, maxHeight, windowTop]);
     // Mouse wheel needs the current window geometry in the raw stdin listener,
     // which subscribes once per maxHeight change.
@@ -432,7 +460,7 @@ export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, s
             let cursor = 0;
             for (let i = 0; i < messages.length; i++) {
                 const len = rowCounts[i] ?? 0;
-                if (center >= cursor && center < cursor + len && messages[i].role === "tool") {
+                if (center >= cursor && center < cursor + len && isExpandable(messages[i])) {
                     toggleRef.current(messages[i].id);
                     break;
                 }
@@ -449,8 +477,8 @@ export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, s
         prevMessageCount.current = messages.length;
     }, [messages]);
     // Map a terminal row (1-based) to the visible message row it lands on and
-    // toggle its expansion. Only tool rows are clickable; the top indicator row
-    // and anything below the window are ignored.
+    // toggle its expansion. Tool and thinking rows are clickable; the top
+    // indicator row and anything below the window are ignored.
     const handleClick = (row) => {
         const { above, parts } = sliceRef.current;
         let offset = row - 1;
@@ -463,7 +491,7 @@ export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, s
         }
         for (const part of parts) {
             if (offset < part.count) {
-                if (part.msg.role === "tool")
+                if (isExpandable(part.msg))
                     toggleRef.current(part.msg.id);
                 return;
             }
@@ -508,7 +536,7 @@ export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, s
     };
     // Mouse handling in the message area: drag with the left button selects text
     // and auto-copies on release; a click (press+release without motion) still
-    // toggles tool rows; the wheel scrolls. The drag state machine (drag-state)
+    // toggles tool and thinking rows; the wheel scrolls. The drag state machine (drag-state)
     // is fed every non-wheel SGR event; presses are accepted anywhere inside the
     // allocated message region (maxHeight), so a drag that starts on the blank
     // gap below a short conversation still works. A drag/release may land
@@ -571,9 +599,9 @@ export function MessageList({ messages, maxHeight, columns = 80, onCopyNotice, s
         };
     }, [stdin, maxHeight, clampSelection, handleClick, scrollDown, scrollUp, selectMessage, selectWord]);
     if (!maxHeight || maxHeight <= 0) {
-        return (_jsxs(Box, { flexDirection: "column", children: [messages.length === 0 && (_jsx(Box, { paddingLeft: 1, paddingTop: 1, children: _jsx(Text, { color: "gray", children: "\u8F93\u5165\u6D88\u606F\u5F00\u59CB\u5BF9\u8BDD\uFF0C\u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\uFF0CEsc \u53D6\u6D88\u8FD0\u884C" }) })), messages.map((msg) => (_jsx(MessageRow, { message: msg, lines: cachedMessageLines(msg, columns, expanded.has(msg.id)) }, msg.id)))] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [messages.length === 0 && (_jsx(Box, { paddingLeft: 1, paddingTop: 1, children: _jsx(Text, { color: "gray", children: "\u8F93\u5165\u6D88\u606F\u5F00\u59CB\u5BF9\u8BDD\uFF0C\u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\uFF0CEsc \u53D6\u6D88\u8FD0\u884C" }) })), messages.map((msg) => (_jsx(MessageRow, { message: msg, lines: cachedMessageLines(msg, columns, rowExpanded(msg, expanded)) }, msg.id)))] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", height: maxHeight, overflow: "hidden", width: "100%", children: [messages.length === 0 && (_jsx(Box, { paddingLeft: 1, paddingTop: 1, children: _jsx(Text, { color: "gray", children: "\u8F93\u5165\u6D88\u606F\u5F00\u59CB\u5BF9\u8BDD\uFF0C\u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\uFF0CEsc \u53D6\u6D88\u8FD0\u884C" }) })), slice.above > 0 && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsxs(Text, { color: "gray", dimColor: true, children: ["\u2026 \u4EE5\u4E0A ", slice.above, " \u884C"] }) })), slice.parts.map(({ msg, start, count }, p) => (_jsx(MessageRow, { message: msg, lines: cachedMessageLines(msg, columns, expanded.has(msg.id)), start: start, count: count, selection: partSelections?.get(p) }, msg.id))), slice.below > 0 && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsx(Text, { color: "gray", dimColor: true, children: "\u2193 \u6309 PageDown \u56DE\u5230\u5E95\u90E8" }) }))] }));
+    return (_jsxs(Box, { flexDirection: "column", height: maxHeight, overflow: "hidden", width: "100%", children: [messages.length === 0 && (_jsx(Box, { paddingLeft: 1, paddingTop: 1, children: _jsx(Text, { color: "gray", children: "\u8F93\u5165\u6D88\u606F\u5F00\u59CB\u5BF9\u8BDD\uFF0C\u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\uFF0CEsc \u53D6\u6D88\u8FD0\u884C" }) })), slice.above > 0 && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsxs(Text, { color: "gray", dimColor: true, children: ["\u2026 \u4EE5\u4E0A ", slice.above, " \u884C"] }) })), slice.parts.map(({ msg, start, count }, p) => (_jsx(MessageRow, { message: msg, lines: cachedMessageLines(msg, columns, rowExpanded(msg, expanded)), start: start, count: count, selection: partSelections?.get(p) }, msg.id))), slice.below > 0 && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsx(Text, { color: "gray", dimColor: true, children: "\u2193 \u6309 PageDown \u56DE\u5230\u5E95\u90E8" }) }))] }));
 }
 /** Map a window slice (rows incl. margin) to renderable lines. */
 function sliceLines(msg, lines, start, count = lines.length) {
@@ -591,6 +619,8 @@ function copyKindFor(msg, lineIndex) {
         return lineIndex === 0 ? "user-head" : "plain";
     if (msg.role === "tool")
         return lineIndex === 0 ? "tool-head" : "tool-body";
+    if (msg.role === "thinking")
+        return lineIndex === 0 ? "thinking-head" : "thinking-body";
     return "plain";
 }
 /**
@@ -610,7 +640,7 @@ function buildArea(slice, columns, expanded) {
     }
     for (let p = 0; p < slice.parts.length; p++) {
         const part = slice.parts[p];
-        const lines = cachedMessageLines(part.msg, columns, expanded.has(part.msg.id));
+        const lines = cachedMessageLines(part.msg, columns, rowExpanded(part.msg, expanded));
         const { lines: shown, marginTop, lineOffset } = sliceLines(part.msg, lines, part.start, part.count);
         if (marginTop) {
             rows.push(null);
@@ -666,14 +696,15 @@ const MessageRow = React.memo(function MessageRow({ message, lines, start = 0, c
         case "assistant":
             return (_jsx(Box, { flexDirection: "column", paddingLeft: 1, flexShrink: 0, children: shown.map((l, i) => (_jsx(Text, { wrap: "truncate-end", children: apply(i, l) }, i))) }));
         case "thinking":
-            return (_jsx(Box, { flexDirection: "column", paddingLeft: 1, flexShrink: 0, children: shown.map((l, i) => (_jsx(Text, { dimColor: true, wrap: "truncate-end", children: apply(i, l) }, i))) }));
         case "tool": {
             const first = shown[0] ?? "";
             const rest = shown.slice(1);
-            const prefix = visualPrefix(first, "tool");
+            const thinking = message.role === "thinking";
+            const prefix = visualPrefix(first, thinking ? "thinking" : "tool");
             const split = prefix ? splitFirst(prefix) : null;
             const headBody = prefix ? paintBody(first.slice(prefix.length), split.tail) : apply(0, first);
-            return (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, flexShrink: 0, children: [_jsxs(Box, { flexWrap: "nowrap", children: [prefix !== "" && (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: "yellow", children: paintPrefix(prefix, split.head) }) })), _jsx(Text, { color: prefix ? (message.toolIsError ? "red" : "gray") : undefined, wrap: "truncate-end", children: headBody })] }), rest.map((l, k) => (_jsx(Text, { color: message.toolIsError ? "red" : undefined, wrap: "truncate-end", children: apply(k + 1, l) }, k)))] }));
+            const bodyColor = thinking ? undefined : message.toolIsError ? "red" : prefix ? "gray" : undefined;
+            return (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, flexShrink: 0, children: [_jsxs(Box, { flexWrap: "nowrap", children: [prefix !== "" && (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: thinking ? "gray" : "yellow", dimColor: thinking, children: paintPrefix(prefix, split.head) }) })), _jsx(Text, { color: bodyColor, dimColor: thinking, wrap: "truncate-end", children: headBody })] }), rest.map((l, k) => (_jsx(Text, { color: bodyColor, dimColor: thinking, wrap: "truncate-end", children: apply(k + 1, l) }, k)))] }));
         }
         case "system":
             return (_jsx(Box, { flexDirection: "column", paddingLeft: 1, flexShrink: 0, children: shown.map((l, i) => (_jsx(Text, { wrap: "truncate-end", children: apply(i, l) }, i))) }));

package/dist/tui/StatusBar.js

@@ -1,9 +1,13 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
-import { formatTokenStatusLabel } from "../token-display.js";
+import { formatModelStatusMeta, formatTokenStatusLabel } from "../token-display.js";
+import { resolveThinkingEffort, thinkingEffortLabel } from "../thinking.js";
+import { isMemoryEnabled } from "../memory.js";
 import { displayWidth } from "./text-width.js";
 export function StatusBar({ state, columns = 80 }) {
     const model = state.model || "unknown";
+    const thinking = thinkingEffortLabel(resolveThinkingEffort(undefined, state.model).thinking);
+    const modelMeta = formatModelStatusMeta(thinking, state.tokenInfo?.contextWindow, isMemoryEnabled());
     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.
@@ -14,5 +18,5 @@ export function StatusBar({ state, columns = 80 }) {
             ? "选择模式  ↑↓←→扩选  Enter复制  Esc退出"
             : null;
     const noticeWidth = notice ? displayWidth(notice) : 0;
-    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 })] }))] })] }));
+    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, " \u00B7 ", modelMeta, ")", tokensLabel ? `  ${tokensLabel}` : ""] })] })] }));
 }

package/dist/tui/ThinkPicker.js

@@ -0,0 +1,77 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useRef, useState } from "react";
+import { Box, Text, useInput } from "ink";
+import { getActiveProvider, getEffectiveConfig } from "../config.js";
+import { getModelCatalog } from "../model-catalog.js";
+import { resolveThinkingEffort, thinkingChoiceIndex, thinkingChoicesForModel, thinkingChoicesFromReasoning, thinkingEffortLabel, thinkingSourceLabel, } from "../thinking.js";
+import { shouldAcceptOverlayConfirm } from "./overlay-input.js";
+import { theme } from "./theme.js";
+export function thinkPickerRows() {
+    return 2 + 1 + 5 + 1 + 2;
+}
+export function ThinkPicker({ scope, modelId, onSelect, onCancel }) {
+    const provider = getActiveProvider(getEffectiveConfig());
+    const id = modelId ?? provider?.defaultModel;
+    const current = resolveThinkingEffort(undefined, id);
+    const [choices, setChoices] = useState(() => thinkingChoicesForModel(id));
+    const [index, setIndex] = useState(() => thinkingChoiceIndex(current.thinking, thinkingChoicesForModel(id)));
+    const armed = useRef(false);
+    const moved = useRef(false);
+    const indexRef = useRef(index);
+    const choicesRef = useRef(choices);
+    indexRef.current = index;
+    choicesRef.current = choices;
+    useEffect(() => {
+        const timer = setTimeout(() => {
+            armed.current = true;
+        }, 0);
+        return () => clearTimeout(timer);
+    }, []);
+    useEffect(() => {
+        if (!id)
+            return;
+        let cancelled = false;
+        void getModelCatalog(id, provider?.baseURL).then((entry) => {
+            if (cancelled || !entry)
+                return;
+            const next = thinkingChoicesFromReasoning(entry.reasoning);
+            setChoices(next);
+            if (moved.current) {
+                setIndex((i) => Math.min(i, Math.max(0, next.length - 1)));
+                return;
+            }
+            setIndex(thinkingChoiceIndex(resolveThinkingEffort(undefined, id).thinking, next));
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [id, provider?.baseURL]);
+    useInput((input, key) => {
+        if (key.escape) {
+            onCancel();
+            return;
+        }
+        const list = choicesRef.current;
+        if (list.length === 0)
+            return;
+        if (key.downArrow) {
+            moved.current = true;
+            setIndex((i) => (i + 1) % list.length);
+            return;
+        }
+        if (key.upArrow) {
+            moved.current = true;
+            setIndex((i) => (i - 1 + list.length) % list.length);
+            return;
+        }
+        if (shouldAcceptOverlayConfirm(armed.current, key, input)) {
+            const picked = list[indexRef.current];
+            if (picked)
+                onSelect(picked);
+        }
+    });
+    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\u601D\u8003\u5F3A\u5EA6" }), scope === "project" && _jsx(Text, { color: theme.muted, children: "\uFF08\u5199\u5165\u5F53\u524D\u9879\u76EE\uFF09" })] }), _jsx(Box, { children: _jsxs(Text, { color: theme.muted, children: ["\u5F53\u524D: ", thinkingEffortLabel(current.thinking), "\uFF08", thinkingSourceLabel(current.source), "\uFF09"] }) }), choices.map((effort, i) => {
+                const active = i === index;
+                return (_jsxs(Box, { children: [_jsx(Text, { color: active ? theme.accent : theme.muted, children: active ? "❯ " : "  " }), _jsx(Text, { bold: active, color: active ? theme.accent : undefined, children: thinkingEffortLabel(effort) }), effort === current.thinking && _jsx(Text, { color: theme.success, children: " \u2190 \u5F53\u524D" })] }, effort));
+            }), _jsx(Box, { children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 Esc \u53D6\u6D88" }) })] }));
+}

package/dist/tui/bracketed-paste.js

@@ -0,0 +1,37 @@
+export const BRACKETED_PASTE_ENABLE = "\x1b[?2004h";
+export const BRACKETED_PASTE_DISABLE = "\x1b[?2004l";
+const PASTE_START = "\x1b[200~";
+const PASTE_END = "\x1b[201~";
+export function scanBracketedPaste(buffer, chunk) {
+    const pastes = [];
+    let buf = buffer + chunk;
+    while (true) {
+        const start = buf.indexOf(PASTE_START);
+        if (start === -1) {
+            return {
+                buffer: pastes.length > 0 ? buf : incompleteStartPrefix(buf),
+                pastes,
+                active: false,
+            };
+        }
+        const body = buf.slice(start + PASTE_START.length);
+        const end = body.indexOf(PASTE_END);
+        if (end === -1) {
+            return { buffer: PASTE_START + body, pastes, active: true };
+        }
+        pastes.push(body.slice(0, end));
+        buf = body.slice(end + PASTE_END.length);
+    }
+}
+export function shouldIgnorePasteInput(input, active) {
+    if (active)
+        return true;
+    return input.includes(PASTE_START) || input.includes(PASTE_END) || input.includes("[200~") || input.includes("[201~");
+}
+function incompleteStartPrefix(buf) {
+    const esc = buf.lastIndexOf("\x1b");
+    if (esc === -1)
+        return "";
+    const prefix = buf.slice(esc);
+    return PASTE_START.startsWith(prefix) ? prefix : "";
+}