min-agent 0.3.0 → 0.4.0

package/dist/tools/write.js

@@ -2,7 +2,9 @@ import { tool, jsonSchema } from "ai";
 import { mkdir, writeFile } from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
-import { confirm, isAutoApprove } from "../confirm.js";
+import { confirm, isEditAutoApprove } from "../confirm.js";
+import { pathAccessError } from "../sandbox.js";
+import { atomicWriteFile } from "./atomic-file.js";
 const MAX_WRITE_BYTES = 10 * 1024 * 1024;
 export const writeTool = tool({
     description: "Write content to a file. Creates the file if it doesn't exist, overwrites if it does (unless `append` is true). Creates parent directories as needed.",
@@ -19,20 +21,35 @@ export const writeTool = tool({
         if (Buffer.byteLength(content, "utf-8") > MAX_WRITE_BYTES) {
             return `Error: content exceeds ${MAX_WRITE_BYTES} bytes. Write in smaller chunks or check the content size.`;
         }
+        const denied = pathAccessError(filePath, "write");
+        if (denied)
+            return `Error: ${denied}`;
         const resolved = path.resolve(process.cwd(), filePath);
-        // Confirm overwriting existing files
-        if (!append && !isAutoApprove() && existsSync(resolved)) {
-            const approved = await confirm(`Overwrite existing file: ${filePath}`);
+        // Same confirmation semantics as edit: in ask mode every mutation —
+        // create, overwrite or append — is confirmed; accept-edits skips them all.
+        if (!isEditAutoApprove()) {
+            const exists = existsSync(resolved);
+            const action = append
+                ? `Append to file: ${filePath}`
+                : exists
+                    ? `Overwrite existing file: ${filePath}`
+                    : `Create new file: ${filePath}`;
+            const approved = await confirm(action);
             if (!approved)
                 return "Write rejected by user.";
         }
         try {
             await mkdir(path.dirname(resolved), { recursive: true });
-            await writeFile(resolved, content, append ? { flag: "a", encoding: "utf-8" } : "utf-8");
+            if (append) {
+                await writeFile(resolved, content, { flag: "a", encoding: "utf-8" });
+            }
+            else {
+                await atomicWriteFile(resolved, content);
+            }
             return `Written ${Buffer.byteLength(content, "utf-8")} bytes to ${filePath}${append ? " (appended)" : ""}`;
         }
         catch (err) {
-            return `Error writing file: ${err.message}`;
+            return `Error writing file: ${err instanceof Error ? err.message : String(err)}`;
         }
     },
 });

package/dist/tui/App.js

@@ -8,9 +8,11 @@ import { ConfirmBar, confirmBarRows } from "./ConfirmBar.js";
 import { QuestionBar, questionBarRows } from "./QuestionBar.js";
 import { StatusBar } from "./StatusBar.js";
 import { ModelPicker, modelPickerRows } from "./ModelPicker.js";
+import { SessionPicker, sessionPickerRows } from "./SessionPicker.js";
 import { setCaretPosition } from "./caret.js";
-import { computeMessageMaxHeight } from "./layout.js";
-export function App({ initialState, onSubmit, onConfirm, onQuestionAnswer, onModelPick, onModelCancel, onExit, onCopyNotice }) {
+import { computeMessageMaxHeight, frameRows, INPUT_BAR_ROWS } from "./layout.js";
+import { isCtrlC } from "./input-history.js";
+export function App({ initialState, onSubmit, onConfirm, onQuestionAnswer, onModelPick, onModelCancel, onSessionPick, onSessionCancel, onToggleSelectionMode, onExitSelectionMode, onExit, onCopyNotice, }) {
     // Ink recalculates its own layout on resize without re-rendering React, so
     // track terminal size ourselves to keep heights/widths in sync.
     const { stdout } = useStdout();
@@ -18,32 +20,79 @@ export function App({ initialState, onSubmit, onConfirm, onQuestionAnswer, onMod
     useEffect(() => {
         const onResize = () => setTerminal({ columns: stdout.columns || 80, rows: stdout.rows || 0 });
         stdout.on("resize", onResize);
-        return () => { stdout.off("resize", onResize); };
+        return () => {
+            stdout.off("resize", onResize);
+        };
     }, [stdout]);
     useInput((input, key) => {
-        if (key.ctrl && input === "c") {
-            onExit();
+        if (isCtrlC(input, key)) {
+            if (initialState.confirmMessage) {
+                onConfirm(false);
+                return;
+            }
+            if (initialState.question) {
+                onQuestionAnswer(null);
+                return;
+            }
+            if (initialState.modelPicker) {
+                onModelCancel();
+                return;
+            }
+            if (initialState.sessionPicker) {
+                onSessionCancel();
+                return;
+            }
+            if (initialState.selectionMode) {
+                onExitSelectionMode();
+                return;
+            }
+            if (initialState.isRunning) {
+                onExit();
+            }
+            return;
+        }
+        if (key.ctrl && input === "b") {
+            if (initialState.confirmMessage ||
+                initialState.question ||
+                initialState.modelPicker ||
+                initialState.sessionPicker)
+                return;
+            if (initialState.isRunning)
+                return;
+            if (!initialState.selectionMode)
+                return;
+            onToggleSelectionMode();
             return;
         }
-        if (key.escape && initialState.isRunning && !initialState.confirmMessage && !initialState.question && !initialState.modelPicker) {
+        if (key.escape &&
+            initialState.isRunning &&
+            !initialState.confirmMessage &&
+            !initialState.question &&
+            !initialState.modelPicker &&
+            !initialState.sessionPicker) {
             onExit();
         }
     });
-    if (initialState.confirmMessage || initialState.question || initialState.modelPicker)
+    if (initialState.confirmMessage || initialState.question || initialState.modelPicker || initialState.sessionPicker)
         setCaretPosition(null);
     const columns = terminal.columns;
     const terminalRows = terminal.rows;
+    const layoutRows = frameRows(terminalRows);
     const confirmActive = Boolean(initialState.confirmMessage);
     const questionActive = Boolean(initialState.question);
     const modelPickerActive = Boolean(initialState.modelPicker);
+    const sessionPickerActive = Boolean(initialState.sessionPicker);
     const footerRows = confirmActive
-        ? confirmBarRows(initialState.confirmMessage ?? "", columns)
+        ? confirmBarRows(initialState.confirmMessage ?? "", columns, layoutRows)
         : questionActive
-            ? questionBarRows(initialState.question.prompt, initialState.question.options, columns)
+            ? questionBarRows(initialState.question.prompt, initialState.question.options, columns, layoutRows)
             : modelPickerActive
-                ? modelPickerRows(terminalRows)
-                : 3; // input bar: 2 borders + 1 content row
-    const spinnerRows = initialState.isRunning && !confirmActive && !questionActive && !modelPickerActive ? 1 : 0;
-    const messageMaxHeight = computeMessageMaxHeight(terminalRows, footerRows, spinnerRows);
-    return (_jsxs(Box, { flexDirection: "column", height: terminalRows || undefined, children: [!modelPickerActive && (_jsx(Box, { flexGrow: 1, minHeight: 0, children: _jsx(MessageList, { messages: initialState.messages, maxHeight: messageMaxHeight, columns: columns, onCopyNotice: onCopyNotice }) })), initialState.isRunning && !confirmActive && !questionActive && !modelPickerActive && (_jsx(Box, { paddingLeft: 1, children: _jsx(Spinner, { label: initialState.spinnerText || "思考中..." }) })), _jsx(StatusBar, { state: initialState, columns: columns }), initialState.confirmMessage ? (_jsx(ConfirmBar, { message: initialState.confirmMessage, onConfirm: onConfirm })) : initialState.question ? (_jsx(QuestionBar, { prompt: initialState.question.prompt, options: initialState.question.options, onAnswer: onQuestionAnswer })) : initialState.modelPicker ? (_jsx(ModelPicker, { currentModel: initialState.model, onSelect: onModelPick, onCancel: onModelCancel })) : (_jsx(InputBar, { onSubmit: onSubmit, disabled: initialState.isRunning, placeholder: initialState.isRunning ? "按 Esc 取消运行..." : "输入消息... (Ctrl+J 换行)", columns: columns, terminalRows: terminalRows }))] }));
+                ? modelPickerRows(layoutRows)
+                : sessionPickerActive
+                    ? sessionPickerRows(layoutRows)
+                    : INPUT_BAR_ROWS;
+    const spinnerVisible = initialState.isRunning && !confirmActive && !questionActive && !modelPickerActive && !sessionPickerActive;
+    const spinnerRows = spinnerVisible ? 1 : 0;
+    const messageMaxHeight = computeMessageMaxHeight(layoutRows, footerRows, spinnerRows);
+    return (_jsxs(Box, { flexDirection: "column", width: "100%", height: layoutRows || undefined, overflow: "hidden", children: [!modelPickerActive && (_jsx(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, minHeight: 0, overflow: "hidden", width: "100%", children: _jsx(MessageList, { messages: initialState.messages, maxHeight: messageMaxHeight, columns: columns, onCopyNotice: onCopyNotice, selectionMode: Boolean(initialState.selectionMode), onExitSelectionMode: onExitSelectionMode, interactive: !confirmActive && !questionActive }) })), spinnerVisible && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, width: "100%", children: _jsx(Spinner, { label: initialState.spinnerText || "思考中..." }) })), _jsx(StatusBar, { state: initialState, columns: columns }), initialState.confirmMessage ? (_jsx(ConfirmBar, { message: initialState.confirmMessage, onConfirm: onConfirm, columns: columns, maxRows: footerRows })) : initialState.question ? (_jsx(QuestionBar, { prompt: initialState.question.prompt, options: initialState.question.options, onAnswer: onQuestionAnswer, columns: columns, maxRows: footerRows })) : initialState.modelPicker ? (_jsx(ModelPicker, { currentModel: initialState.model, onSelect: onModelPick, onCancel: onModelCancel })) : initialState.sessionPicker ? (_jsx(SessionPicker, { currentId: initialState.sessionId, onSelect: onSessionPick, onCancel: onSessionCancel })) : (_jsx(InputBar, { onSubmit: onSubmit, disabled: initialState.isRunning || Boolean(initialState.selectionMode), placeholder: initialState.isRunning ? "按 Esc 取消运行..." : "输入消息... (Ctrl+J 换行)", columns: columns, terminalRows: layoutRows, onSelectionMode: onToggleSelectionMode, onExit: onExit }))] }));
 }

package/dist/tui/ConfirmBar.js

@@ -1,34 +1,66 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { wrapByWidth } from "./text-width.js";
-import { innerTextWidth } from "./layout.js";
+import { CONFIRM_CHROME_ROWS, footerMaxRows, innerTextWidth, sliceLineWindow } from "./layout.js";
 import { theme } from "./theme.js";
+export function confirmMessageLines(message, columns) {
+    const textWidth = innerTextWidth(columns);
+    return String(message ?? "")
+        .split("\n")
+        .flatMap((line) => wrapByWidth(line, textWidth));
+}
 /**
  * Terminal rows the confirm 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 permission payload cannot push [y]/[N] off the screen.
  */
-export function confirmBarRows(message, columns) {
-    const textWidth = innerTextWidth(columns);
-    let rows = 0;
-    for (const line of message.split("\n"))
-        rows += wrapByWidth(line, textWidth).length;
-    return rows + 5; /* borders2 + title1 + marginTop1 + prompt1 */
+export function confirmBarRows(message, columns, frameRowCount = 0) {
+    const natural = confirmMessageLines(message, columns).length + CONFIRM_CHROME_ROWS;
+    return Math.min(natural, footerMaxRows(frameRowCount, CONFIRM_CHROME_ROWS));
 }
-export function ConfirmBar({ message, onConfirm }) {
+export function ConfirmBar({ message, onConfirm, columns, maxRows }) {
+    const lines = useMemo(() => confirmMessageLines(message, columns), [message, columns]);
+    const bodyMax = Math.max(0, maxRows - CONFIRM_CHROME_ROWS);
+    const [top, setTop] = useState(0);
+    const window = useMemo(() => sliceLineWindow(lines, bodyMax, top), [lines, bodyMax, top]);
+    const scrollable = window.above > 0 || window.below > 0;
     useInput((input, key) => {
         if (key.escape) {
             onConfirm(false);
             return;
         }
         const hasEnter = key.return || /[\r\n]/.test(input);
-        const stripped = input.replace(/[\r\n]+/g, "").trim().toLowerCase();
+        const stripped = input
+            .replace(/[\r\n]+/g, "")
+            .trim()
+            .toLowerCase();
         if (stripped === "y") {
             onConfirm(true);
+            return;
         }
-        else if (stripped === "n" || (stripped === "" && hasEnter)) {
+        if (stripped === "n" || (stripped === "" && hasEnter)) {
             onConfirm(false);
+            return;
+        }
+        if (!scrollable)
+            return;
+        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;
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.confirmBorder, paddingX: 1, children: [_jsx(Box, { children: _jsx(Text, { bold: true, color: theme.confirmBorder, children: "\u26A0 \u8BF7\u6C42\u6267\u884C\u6743\u9650" }) }), _jsx(Box, { paddingLeft: 1, children: _jsx(Text, { children: message }) }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { bold: true, color: theme.confirmBorder, children: "? \u662F\u5426\u5141\u8BB8\u6267\u884C\uFF1F " }), _jsx(Text, { color: theme.success, children: "[y]" }), _jsx(Text, { color: theme.muted, children: " / " }), _jsx(Text, { color: theme.error, children: "[N]" })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", borderStyle: "round", borderColor: theme.confirmBorder, paddingX: 1, children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, color: theme.confirmBorder, wrap: "truncate-end", children: "\u26A0 \u8BF7\u6C42\u6267\u884C\u6743\u9650" }) }), bodyMax > 0 && (_jsxs(Box, { flexDirection: "column", height: bodyMax, overflow: "hidden", flexShrink: 0, width: "100%", children: [window.above > 0 && (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsxs(Text, { color: theme.muted, dimColor: true, children: ["\u2026 \u4EE5\u4E0A ", window.above, " \u884C"] }) })), window.lines.map((line, i) => (_jsx(Box, { paddingLeft: 1, flexShrink: 0, children: _jsx(Text, { wrap: "truncate-end", children: line }) }, i))), window.below > 0 && (_jsx(Box, { paddingLeft: 1, 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.confirmBorder, children: ["? \u662F\u5426\u5141\u8BB8\u6267\u884C\uFF1F", " "] }), _jsx(Text, { color: theme.success, children: "[y]" }), _jsx(Text, { color: theme.muted, children: " / " }), _jsx(Text, { color: theme.error, children: "[N]" })] })] }));
 }

package/dist/tui/InputBar.js

@@ -3,10 +3,9 @@ import { useState, useEffect, useMemo, useRef, useCallback } from "react";
 import { Box, Text, useInput, useStdin, useStdout } from "ink";
 import { setCaretPosition } from "./caret.js";
 import { displayWidth } from "./text-width.js";
-import { visualRows, moveCaretHorizontal, insertAt, backspaceAt, deleteAt, caretIndexFromClick, scanDeleteKeys, moveToLineStart, moveToLineEnd, deleteToLineStart, deleteToLineEnd, deleteWordBefore } from "./caret-pos.js";
-import { searchHistory } from "./input-history.js";
-import { createHistory, pushInput, browseHistory, resetHistory } from "./input-history.js";
-import { filterSlashCommands, getSlashArgOptions, applySlashArgCompletion } from "./slash-commands.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 { MOUSE_ENABLE, MOUSE_DISABLE } from "./mouse.js";
 import { scanSgrMouse } from "./mouse.js";
 import { TEXT_START_COLUMN, inputTextWidth } from "./layout.js";
@@ -51,7 +50,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 }) {
+export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRows, onSelectionMode, onExit, }) {
     const [editing, setEditing] = useState({ value: "", caretIndex: 0 });
     const { value, caretIndex } = editing;
     const [menuIndex, setMenuIndex] = useState(0);
@@ -61,15 +60,42 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     const kittyBuffer = useRef("");
     const mouseBuffer = useRef("");
     const deleteBuffer = useRef("");
+    const homeEndBuffer = useRef("");
     const width = columns || 80;
-    const [historyState, setHistoryState] = useState(() => createHistory());
+    const [historyState, setHistoryState] = useState(() => createHistory(loadInputHistory()));
     const historyRef = useRef(historyState);
+    const [exitHint, setExitHint] = useState(false);
+    const exitArmedAtRef = useRef(null);
+    const exitHintTimer = useRef(null);
+    const clearExitHint = useCallback(() => {
+        if (exitArmedAtRef.current === null && exitHintTimer.current === null)
+            return;
+        if (exitHintTimer.current !== null) {
+            clearTimeout(exitHintTimer.current);
+            exitHintTimer.current = null;
+        }
+        exitArmedAtRef.current = null;
+        setExitHint(false);
+    }, []);
+    const showExitHint = useCallback((armedAt) => {
+        exitArmedAtRef.current = armedAt;
+        setExitHint(true);
+        if (exitHintTimer.current !== null)
+            clearTimeout(exitHintTimer.current);
+        exitHintTimer.current = setTimeout(() => {
+            exitHintTimer.current = null;
+            exitArmedAtRef.current = null;
+            setExitHint(false);
+        }, EXIT_CTRL_C_WINDOW_MS);
+    }, []);
+    useEffect(() => () => clearExitHint(), [clearExitHint]);
     // The ref mirrors `editing` synchronously, so edits from separate stdin
     // listeners (Ink's useInput for text, the raw listener for delete keys)
     // always apply to the newest state, in arrival order, even when React has
     // not re-rendered yet (fast key repeats, text + delete in one chunk).
     const editingRef = useRef(editing);
     const applyEdit = useCallback((edit) => {
+        clearExitHint();
         const after = edit(editingRef.current.value, editingRef.current.caretIndex);
         editingRef.current = after;
         setEditing(after);
@@ -78,14 +104,15 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             historyRef.current = nextHistory;
             setHistoryState(nextHistory);
         }
-    }, []);
+    }, [clearExitHint]);
     const submit = (text) => {
         historyRef.current = pushInput(historyRef.current, text);
         setHistoryState(historyRef.current);
+        saveInputHistory(historyRef.current.entries);
         onSubmit(text);
     };
     const browseTo = (direction) => {
-        const { text, state } = browseHistory(historyRef.current, direction);
+        const { text, state } = browseHistory(historyRef.current, direction, isKnownSlashCommandInput);
         historyRef.current = state;
         setHistoryState(state);
         if (text !== editingRef.current.value) {
@@ -95,7 +122,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         }
     };
     // Release the caret when the input bar goes away (e.g. confirm prompt).
-    useEffect(() => () => { setCaretPosition(null); }, []);
+    useEffect(() => () => {
+        setCaretPosition(null);
+    }, []);
     // Slash command menu — closes once a space follows the command name so the
     // argument menu can take over immediately.
     const matches = useMemo(() => filterSlashCommands(value), [value]);
@@ -107,7 +136,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     const argMenuOpen = !menuOpen && !menuDismissed && argOptions.length > 0;
     const argIndex = argMenuOpen ? Math.min(menuIndex, argOptions.length - 1) : 0;
     const argSelected = argMenuOpen ? argOptions[argIndex] : undefined;
-    useEffect(() => { setMenuIndex(0); }, [value]);
+    useEffect(() => {
+        setMenuIndex(0);
+    }, []);
     const acceptCommand = (cmd) => {
         if (cmd.argHint) {
             applyEdit(() => ({ value: `/${cmd.name} `, caretIndex: cmd.name.length + 2 }));
@@ -123,9 +154,47 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             return { value: next, caretIndex: Array.from(next).length };
         });
     };
+    const acceptCommandRef = useRef(acceptCommand);
+    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;
     useInput((input, key) => {
         if (disabled)
             return;
+        if (isCtrlC(input, key)) {
+            const current = editingRef.current.value;
+            const result = clearInputOnCtrlC(historyRef.current, current, exitArmedAtRef.current, Date.now());
+            if (result.exit) {
+                clearExitHint();
+                onExit();
+                return;
+            }
+            if (result.state.entries !== historyRef.current.entries) {
+                saveInputHistory(result.state.entries);
+            }
+            historyRef.current = result.state;
+            setHistoryState(result.state);
+            if (result.armedAt !== null) {
+                showExitHint(result.armedAt);
+                return;
+            }
+            clearExitHint();
+            applyEdit(() => ({ value: "", caretIndex: 0 }));
+            return;
+        }
+        clearExitHint();
+        if (key.ctrl && input === "b") {
+            onSelectionMode?.();
+            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]+$/, "");
@@ -148,48 +217,60 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         }
         // Any other key re-opens the menu
         setMenuDismissed(false);
-        // Slash menu navigation
+        // Slash menu: Tab/Shift+Tab pick, Enter runs. ↑↓ always recall sent input.
         if (menuOpen) {
-            if (key.downArrow) {
-                setMenuIndex((i) => (i + 1) % matches.length);
-                return;
-            }
-            if (key.upArrow) {
-                setMenuIndex((i) => (i - 1 + matches.length) % matches.length);
+            if (key.tab) {
+                if (matches.length === 1 && selected) {
+                    acceptCommand(selected);
+                    return;
+                }
+                setMenuIndex((i) => (key.shift ? (i - 1 + matches.length) % matches.length : (i + 1) % matches.length));
                 return;
             }
-            if (pressedEnter || key.tab) {
+            if (pressedEnter) {
                 if (selected)
                     acceptCommand(selected);
                 return;
             }
-            // Left/right are ignored while the menu is open
             if (key.leftArrow || key.rightArrow)
                 return;
         }
-        // Argument menu: ↑↓ pick, Tab completes. Enter still submits the line so a
-        // fully typed command is never swallowed by the suggestion list.
+        // Argument menu: Tab completes the highlight. Enter still submits the line
+        // so a fully typed command is never swallowed by the suggestion list.
         if (argMenuOpen) {
-            if (key.downArrow) {
-                setMenuIndex((i) => (i + 1) % argOptions.length);
-                return;
-            }
-            if (key.upArrow) {
-                setMenuIndex((i) => (i - 1 + argOptions.length) % argOptions.length);
-                return;
-            }
             if (key.tab) {
                 if (argSelected)
                     acceptArg(argSelected);
                 return;
             }
         }
-        // Input history: ↑ older, ↓ newer (only when the slash menu is closed)
+        const inkKey = key;
+        if (inkKey.home) {
+            applyEdit((v, c) => ({ value: v, caretIndex: moveToLineStart(v, c) }));
+            return;
+        }
+        if (inkKey.end) {
+            applyEdit((v, c) => ({ value: v, caretIndex: moveToLineEnd(v, c) }));
+            return;
+        }
+        // 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));
+            if (next !== c) {
+                applyEdit(() => ({ value: v, caretIndex: next }));
+                return;
+            }
             browseTo(1);
             return;
         }
         if (key.downArrow) {
+            const { value: v, caretIndex: c } = editingRef.current;
+            const next = moveCaretVertical(v, c, 1, inputTextWidth(columns));
+            if (next !== c) {
+                applyEdit(() => ({ value: v, caretIndex: next }));
+                return;
+            }
             browseTo(-1);
             return;
         }
@@ -298,6 +379,7 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
         }
     }, { isActive: !disabled });
     const isEmpty = value === "";
+    const shownPlaceholder = exitHint ? "再按一次 Ctrl+C 退出" : placeholder;
     const logicalLines = value.split("\n");
     const isMultiline = logicalLines.length > 1;
     const borderColor = disabled ? theme.inputBorderDisabled : theme.inputBorder;
@@ -335,7 +417,8 @@ 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 menuRows = menuOpen ? matches.length + 5 /* margin + borders + header + footer */ : 0;
+    const argShown = argMenuOpen ? Math.min(8, argOptions.length) : 0;
+    const menuRows = menuOpen ? matches.length + 5 : argMenuOpen ? argShown + 4 : 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).
@@ -346,6 +429,8 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     rowsRef.current = rows;
     const inputTopRowRef = useRef(inputTopRow);
     inputTopRowRef.current = inputTopRow;
+    const hintRowsRef = useRef(hintRows);
+    hintRowsRef.current = hintRows;
     // 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
@@ -375,6 +460,16 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                     applyEdit((v, c) => (action.kind === "backspace" ? backspaceAt(v, c) : deleteAt(v, c)));
                 }
             }
+            const { buffer: homeBuf, actions: homeActions } = scanHomeEndKeys(homeEndBuffer.current, chunk);
+            homeEndBuffer.current = homeBuf;
+            if (homeActions.length > 0) {
+                for (const action of homeActions) {
+                    applyEdit((v, c) => ({
+                        value: v,
+                        caretIndex: action.kind === "home" ? moveToLineStart(v, c) : moveToLineEnd(v, c),
+                    }));
+                }
+            }
             mouseBuffer.current += chunk;
             let sgr;
             while ((sgr = scanSgrMouse(mouseBuffer.current))) {
@@ -388,6 +483,22 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
                             caretIndex: caretIndexFromClick(rowsRef.current, contentRow, evCol, TEXT_START_COLUMN),
                         }));
                     }
+                    else {
+                        const chrome = 3;
+                        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];
+                            if (cmd)
+                                acceptCommandRef.current(cmd);
+                        }
+                        else if (argMenuOpenRef.current) {
+                            const shown = argOptionsRef.current.slice(0, 8);
+                            const opt = shown[optionIndex];
+                            if (opt)
+                                acceptArgRef.current(opt);
+                        }
+                    }
                 }
             }
             if (mouseBuffer.current.length > 64) {
@@ -396,7 +507,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             }
         };
         stdin.on("data", handleData);
-        return () => { stdin.off("data", handleData); };
+        return () => {
+            stdin.off("data", handleData);
+        };
     }, [stdin, disabled, applyEdit]);
     // Enable the SGR mouse protocol so clicks on the input bar can position the
     // caret. Events arrive on raw stdin; parseSgrMouse picks them out of the
@@ -404,7 +517,9 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
     // simply never send events — keyboard navigation still works.
     useEffect(() => {
         stdout.write(MOUSE_ENABLE);
-        return () => { stdout.write(MOUSE_DISABLE); };
+        return () => {
+            stdout.write(MOUSE_DISABLE);
+        };
     }, [stdout]);
     // Must publish during render (not in effect) — Ink writes the frame in
     // resetAfterCommit before effects run. If delayed to useEffect, the
@@ -417,12 +532,12 @@ export function InputBar({ onSubmit, disabled, placeholder, columns, terminalRow
             column: TEXT_START_COLUMN + caretColumnOffset,
         });
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColor, paddingX: 1, children: [isEmpty && placeholder ? (_jsxs(Box, { children: [_jsx(Text, { color: disabled ? theme.inputBorderDisabled : theme.inputBorder, children: GUTTER }), _jsx(Text, { inverse: true, children: " " }), _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: placeholder })] })) : (rows.map((row, i) => {
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: "100%", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColor, paddingX: 1, width: "100%", children: [isEmpty && shownPlaceholder ? (_jsxs(Box, { children: [_jsx(Text, { color: disabled ? theme.inputBorderDisabled : theme.inputBorder, children: GUTTER }), _jsx(Text, { inverse: true, children: " " }), _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: shownPlaceholder })] })) : (rows.map((row, i) => {
                         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("");
                         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, 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: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u6267\u884C \u00B7 Esc \u5173\u95ED" }) })] })), argMenuOpen && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.inputBorder, paddingX: 1, marginTop: 1, 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} 项 · ` : "", "\u2191\u2193 \u9009\u62E9 \u00B7 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)} 命令` }) }), 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"] }) })] }))] }));
 }