min-agent 0.2.1 → 0.4.0

package/dist/tui/App.js

@@ -1,15 +1,98 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, useInput } from "ink";
+import { useEffect, useState } from "react";
+import { Box, useInput, useStdout } from "ink";
 import { Spinner } from "./Spinner.js";
 import { InputBar } from "./InputBar.js";
 import { MessageList } from "./MessageList.js";
-import { ConfirmBar } from "./ConfirmBar.js";
+import { ConfirmBar, confirmBarRows } from "./ConfirmBar.js";
+import { QuestionBar, questionBarRows } from "./QuestionBar.js";
 import { StatusBar } from "./StatusBar.js";
-export function App({ initialState, onSubmit, onConfirm, onExit }) {
-    useInput((_input, key) => {
-        if (key.escape && initialState.isRunning) {
+import { ModelPicker, modelPickerRows } from "./ModelPicker.js";
+import { SessionPicker, sessionPickerRows } from "./SessionPicker.js";
+import { setCaretPosition } from "./caret.js";
+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();
+    const [terminal, setTerminal] = useState({ columns: stdout.columns || 80, rows: stdout.rows || 0 });
+    useEffect(() => {
+        const onResize = () => setTerminal({ columns: stdout.columns || 80, rows: stdout.rows || 0 });
+        stdout.on("resize", onResize);
+        return () => {
+            stdout.off("resize", onResize);
+        };
+    }, [stdout]);
+    useInput((input, key) => {
+        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 &&
+            !initialState.sessionPicker) {
             onExit();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { messages: initialState.messages }), initialState.isRunning && (_jsx(Box, { paddingLeft: 1, children: _jsx(Spinner, { label: initialState.spinnerText || "思考中..." }) })), _jsx(StatusBar, { state: initialState }), initialState.confirmMessage ? (_jsx(ConfirmBar, { message: initialState.confirmMessage, onConfirm: onConfirm })) : (_jsx(InputBar, { onSubmit: onSubmit, disabled: initialState.isRunning, placeholder: initialState.isRunning ? "按 Esc 取消运行..." : "输入消息... (Ctrl+J 换行)" }))] }));
+    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, layoutRows)
+        : questionActive
+            ? questionBarRows(initialState.question.prompt, initialState.question.options, columns, layoutRows)
+            : modelPickerActive
+                ? 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,13 +1,66 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from "react";
 import { Box, Text, useInput } from "ink";
-export function ConfirmBar({ message, onConfirm }) {
+import { wrapByWidth } from "./text-width.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.
+ * Capped so a huge permission payload cannot push [y]/[N] off the screen.
+ */
+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, 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 (input.toLowerCase() === "y") {
+        if (key.escape) {
+            onConfirm(false);
+            return;
+        }
+        const hasEnter = key.return || /[\r\n]/.test(input);
+        const stripped = input
+            .replace(/[\r\n]+/g, "")
+            .trim()
+            .toLowerCase();
+        if (stripped === "y") {
             onConfirm(true);
+            return;
         }
-        else if (input.toLowerCase() === "n" || key.escape || key.return) {
+        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: "blue", paddingX: 1, children: [_jsx(Box, { children: _jsx(Text, { color: "gray", children: "\u250C\u2500 \u5373\u5C06\u6267\u884C \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }) }), _jsx(Box, { paddingLeft: 1, children: _jsx(Text, { children: message }) }), _jsx(Box, { children: _jsx(Text, { color: "gray", children: "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }) }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { bold: true, color: "blue", children: "? \u662F\u5426\u5141\u8BB8\u6267\u884C\uFF1F " }), _jsx(Text, { color: "green", children: "[y]" }), _jsx(Text, { color: "gray", children: " / " }), _jsx(Text, { color: "red", 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]" })] })] }));
 }