nou-cli 0.1.0 → 0.2.0

package/dist/src/ui/App.js

@@ -8,8 +8,14 @@ import { describe, providers, resolveModel, saveModel } from "../providers/index
 import { loadSettings, saveSettings } from "../config/index.js";
 import { branch as gitBranch, diffAgainstHead, isRepo, status as gitStatus, summary as gitSummary } from "../git/index.js";
 import { gitTools } from "../git/tools.js";
-import { discoverPlugins, loadPlugin } from "../plugins/index.js";
+import { BUILTIN_PLUGINS, discoverPlugins, isEnabled, loadPlugin, trustPatch } from "../plugins/index.js";
+import { DiagnosticsManager, formatDiagnostic, newProblems } from "../diagnostics/index.js";
+import { Timeline } from "../history/index.js";
+import { lsp } from "../lsp/index.js";
+import { onGrammarLoaded, preload } from "../syntax/index.js";
+import { checkForUpdate } from "../update/index.js";
 import { changedLines } from "./text.js";
+import { ProblemsView } from "./ProblemsView.js";
 import { C } from "./theme.js";
 import { FileTree } from "./FileTree.js";
 import { CodeView } from "./CodeView.js";
@@ -26,10 +32,15 @@ const HELP = `Commands:
   /model <provider[:model]>  switch, e.g. /model anthropic  /model ollama:qwen3:8b
   /models [provider]   list models a provider offers
   /clear               start a fresh conversation
+  /undo                undo Nou's last change (also: u)
+  /rewind              undo everything from Nou's last turn
+  /history             recent changes
 Keys:
   Ctrl+P  find a file      Tab  switch pane      Esc  stop / back
   e  edit open file        v    diff (git / Nou)  f   follow mode
-  c  (in files) show only changed files            s   settings`;
+  p  problems              u    undo Nou's edit   s   settings
+  c  (in files) show only changed files            Ctrl+C twice  quit
+In the editor: Ctrl+S save · Ctrl+Z/Y undo/redo · Ctrl+K info · Ctrl+G go to definition`;
 function readText(filePath) {
     try {
         return readFileSync(path.resolve(process.cwd(), filePath), "utf-8");
@@ -65,6 +76,20 @@ export function App({ initialModel, permContext }) {
     const [editorState, setEditorState] = useState(null);
     // Unsaved editor text survives switching to a diff and back.
     const draft = useRef(null);
+    const [codePanel, setCodePanel] = useState("code");
+    const [, setDiagVersion] = useState(0);
+    const [syntaxVersion, setSyntaxVersion] = useState(0);
+    const [focusLine, setFocusLine] = useState(null);
+    const [editorStart, setEditorStart] = useState({ line: 1, nonce: 0 });
+    const [pendingNote, setPendingNote] = useState(null);
+    const [exitArmed, setExitArmed] = useState(false);
+    const [update, setUpdate] = useState(null);
+    const diagnosticsRef = useRef(null);
+    diagnosticsRef.current ??= new DiagnosticsManager();
+    const diagnostics = diagnosticsRef.current;
+    const timelineRef = useRef(null);
+    timelineRef.current ??= new Timeline();
+    const timeline = timelineRef.current;
     const followRef = useRef(follow);
     followRef.current = follow;
     const settingsRef = useRef(settings);
@@ -78,6 +103,9 @@ export function App({ initialModel, permContext }) {
         setContent(readText(filePath));
         setDiffMode("off");
         setEditing(false);
+        setCodePanel("code");
+        preload(filePath);
+        void diagnosticsRef.current.checkFile(filePath);
     }, []);
     const agentRef = useRef(null);
     if (!agentRef.current) {
@@ -91,7 +119,10 @@ export function App({ initialModel, permContext }) {
                 open(filePath);
                 setReveal(filePath);
             },
-            onChange: (change, status) => {
+            onChange: (change, status, turn) => {
+                if (status === "applied") {
+                    timelineRef.current.record({ path: change.path, before: change.isNew ? null : change.before, after: change.after, source: "nou", turn });
+                }
                 const lines = status === "applied" ? changedLines(change.before, change.after) : NO_LINES;
                 setChanges((prev) => new Map(prev).set(change.path, { change, status, lines }));
                 // Diffs awaiting approval are always shown, follow mode or not.
@@ -116,17 +147,36 @@ export function App({ initialModel, permContext }) {
                 }
                 return new Promise((resolve) => setApproval({ request, resolve }));
             },
+            checkChange: async (change) => {
+                const introduced = await diagnosticsRef.current.introducedBy(change.path, change.before, change.after);
+                return introduced.length ? introduced.slice(0, 15).map((d) => formatDiagnostic(d)).join("\n") : null;
+            },
         });
     }
+    useEffect(() => diagnostics.subscribe(() => setDiagVersion((v) => v + 1)), []);
+    useEffect(() => onGrammarLoaded(() => setSyntaxVersion((v) => v + 1)), []);
+    useEffect(() => {
+        void checkForUpdate().then(setUpdate);
+    }, []);
     // Discover plugins once and load the enabled ones.
     useEffect(() => {
         void (async () => {
             const found = discoverPlugins();
-            const enabled = loadSettings().plugins;
-            setPlugins(await Promise.all(found.map((p) => (enabled[p.id] ? loadPlugin(p) : p))));
+            const saved = loadSettings();
+            setPlugins(await Promise.all(found.map((p) => (isEnabled(p, saved) ? loadPlugin(p) : p))));
         })();
     }, []);
-    const activePlugins = useMemo(() => plugins.filter((p) => settings.plugins[p.id] && p.plugin), [plugins, settings.plugins]);
+    const allPlugins = useMemo(() => [...BUILTIN_PLUGINS, ...plugins], [plugins]);
+    const activePlugins = useMemo(() => allPlugins.filter((p) => isEnabled(p, settings) && p.plugin), [allPlugins, settings.plugins, settings.trustedPlugins]);
+    // Checkers come from enabled plugins (built-in ones included).
+    const firstCheck = useRef(true);
+    useEffect(() => {
+        diagnostics.setProviders(activePlugins.flatMap((p) => p.plugin.diagnostics ?? []));
+        if (firstCheck.current) {
+            firstCheck.current = false;
+            setTimeout(() => void diagnostics.checkProject(), 1500);
+        }
+    }, [activePlugins]);
     // Keep the agent's system prompt and tools in sync with settings and plugins.
     useEffect(() => {
         const extras = [];
@@ -149,6 +199,24 @@ export function App({ initialModel, permContext }) {
                 });
             }
         }
+        extraTools.push({
+            source: "problems",
+            readOnly: true,
+            definition: {
+                name: "get_diagnostics",
+                description: "Get errors and warnings from the project's linters, type checker and language servers, for one file or the whole project.",
+                parameters: { type: "object", properties: { path: { type: "string", description: "Optional file. Omit for the whole project." } }, required: [] },
+            },
+            run: async (args) => {
+                const file = typeof args.path === "string" ? args.path : null;
+                if (file)
+                    await diagnostics.checkFile(file);
+                else
+                    await diagnostics.checkProject();
+                const list = file ? diagnostics.get(file) : diagnostics.all();
+                return list.length ? list.slice(0, 100).map((d) => formatDiagnostic(d, true)).join("\n") : "No problems found.";
+            },
+        });
         agentRef.current.configure({ system: buildSystemPrompt(permContext, extras), extraTools, effort: settings.effort });
     }, [settings.gitContext, settings.effort, activePlugins]);
     // Pick up changes made outside Nou (other editors, git commands).
@@ -183,11 +251,13 @@ export function App({ initialModel, permContext }) {
         return true;
     };
     const togglePlugin = async (id, enabled) => {
-        updateSettings({ plugins: { ...settings.plugins, [id]: enabled } });
+        const entry = allPlugins.find((p) => p.id === id);
+        if (!entry)
+            return;
+        updateSettings(trustPatch(entry, enabled, settings));
         if (!enabled)
             return;
-        const entry = plugins.find((p) => p.id === id);
-        if (entry && !entry.plugin) {
+        if (!entry.plugin) {
             const loaded = await loadPlugin(entry);
             setPlugins((prev) => prev.map((p) => (p.id === id ? loaded : p)));
         }
@@ -201,12 +271,141 @@ export function App({ initialModel, permContext }) {
     const gitChange = useMemo(() => (diffMode === "git" && openFile ? diffAgainstHead(openFile, content) : null), [diffMode, openFile, content]);
     const diff = pendingChange ?? (diffMode === "git" ? gitChange : diffMode === "nou" && record ? record.change : null);
     const showEditor = editing && !!openFile && !pendingChange;
+    // Check Nou's proposed edit before you approve it: does it add problems?
+    useEffect(() => {
+        setPendingNote(null);
+        if (!pendingChange)
+            return;
+        let cancelled = false;
+        void (async () => {
+            const before = await diagnostics.checkText(pendingChange.path, pendingChange.before);
+            const after = await diagnostics.checkText(pendingChange.path, pendingChange.after);
+            if (cancelled)
+                return;
+            const added = newProblems(before, after);
+            setPendingNote(added.length
+                ? { short: `⚠ +${added.length} problem${added.length === 1 ? "" : "s"}`, detail: added.slice(0, 3).map((d) => formatDiagnostic(d)).join("\n") }
+                : { short: "✓ no new problems", detail: null });
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [pendingChange]);
+    // Live problems while you type (debounced).
+    useEffect(() => {
+        if (!showEditor || !openFile || !editorState)
+            return;
+        const timer = setTimeout(() => void diagnostics.checkFile(openFile, editorState.lines.join("\n")), 700);
+        return () => clearTimeout(timer);
+    }, [editorState?.lines]);
+    /** Quit, saving the editor's unsaved text first if auto-save is on. */
+    const quit = () => {
+        if (draft.current && settings.autoSave !== "off")
+            saveFromEditor(draft.current.text, draft.current.path);
+        exit();
+    };
+    /** Quitting always takes two presses (Ctrl+C or q) within 2 seconds, so a stray key never loses work. */
+    const requestQuit = () => {
+        if (exitArmed)
+            return quit();
+        setExitArmed(true);
+        setTimeout(() => setExitArmed(false), 2000);
+    };
+    // Ctrl+C: stop Nou if it's working; otherwise press twice to quit.
+    useInput((input, key) => {
+        if (!(key.ctrl && input === "c"))
+            return;
+        if (busy || approval) {
+            agentRef.current?.cancel();
+            approval?.resolve(false);
+            setApproval(null);
+            return;
+        }
+        requestQuit();
+    });
+    const info = (text, kind = "info") => setEntries((prev) => [...prev, { kind, text }]);
+    /** After a file changes outside the normal flow (undo), refresh everything that shows it. */
+    const reload = (file) => {
+        if (file === openFile)
+            setContent(readText(file));
+        setTreeVersion((v) => v + 1);
+        refreshGit();
+        void diagnostics.checkFile(file);
+    };
+    const undoCheckpoints = (list) => {
+        const done = [];
+        for (const cp of list) {
+            const result = timeline.undo(cp);
+            if (result.ok) {
+                done.push(cp.path);
+                info(`↶ Undid Nou's change to ${cp.path}${result.merged ? " (kept your later edits)" : ""}`);
+                reload(cp.path);
+            }
+            else {
+                info(`Couldn't undo ${cp.path}: ${result.reason}. Press v on the file to see the diff.`, "error");
+            }
+        }
+        if (done.length)
+            agentRef.current.note(`The user undid your changes to ${done.join(", ")}; those files are back to how they were before your edits.`);
+    };
+    const undoLast = () => {
+        const last = timeline.lastNouChange();
+        if (!last)
+            return info("Nothing of Nou's to undo.");
+        undoCheckpoints([last]);
+    };
+    const rewind = () => {
+        const turn = timeline.lastTurn();
+        if (!turn.length)
+            return info("Nothing of Nou's to rewind.");
+        undoCheckpoints(turn);
+    };
+    const showHistory = () => {
+        const items = timeline.all.slice(-15).reverse();
+        if (!items.length)
+            return info("No changes recorded yet.");
+        info(`Recent changes (newest first):\n${items.map((c) => {
+            const time = new Date(c.time).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+            return `  ${time}  ${c.source === "nou" ? "Nou" : "you"}  ${c.before === null ? "created " : ""}${c.path}${c.undone ? "  (undone)" : ""}`;
+        }).join("\n")}\nUndo with /undo (last) or /rewind (whole last turn).`);
+    };
+    /**
+     * Before editing another file: an unsaved draft of a different file is saved (auto-save on) or kept and
+     * the switch refused (auto-save off). Never silently dropped. Returns whether it's OK to continue.
+     */
+    const settleDraft = (target) => {
+        if (!draft.current || draft.current.path === target)
+            return true;
+        if (settings.autoSave !== "off") {
+            saveFromEditor(draft.current.text, draft.current.path);
+            return true;
+        }
+        info(`You have unsaved edits in ${draft.current.path}. Open it and save (Ctrl+S) first, or turn on auto-save in settings.`, "error");
+        return false;
+    };
+    /** Opens a file at a line, in the editor if `edit` (used by the Problems list and go-to-definition). */
+    const openAt = (file, line, edit = false) => {
+        if (!settleDraft(file))
+            return;
+        if (file !== openFile)
+            open(file);
+        setReveal(file);
+        setCodePanel("code");
+        if (edit) {
+            setEditorStart((s) => ({ line, nonce: s.nonce + 1 }));
+            setEditing(true);
+            setFocus("code");
+        }
+        else {
+            setFocusLine((f) => ({ line, nonce: (f?.nonce ?? 0) + 1 }));
+        }
+    };
     const startEditing = () => {
-        if (!openFile)
+        if (!openFile || !settleDraft(openFile))
             return;
-        if (draft.current && draft.current.path !== openFile)
-            draft.current = null;
         setDiffMode("off");
+        setCodePanel("code");
+        setEditorStart((s) => ({ line: viewport?.top ?? 1, nonce: s.nonce + 1 }));
         setEditing(true);
         setFocus("code");
     };
@@ -261,6 +460,13 @@ export function App({ initialModel, permContext }) {
             return; // letters belong to the text box
         if (input === "f")
             setFollow((f) => !f);
+        else if (input === "p") {
+            setCodePanel((p) => (p === "problems" ? "code" : "problems"));
+            setEditing(false);
+            setFocus("code");
+        }
+        else if (input === "u")
+            undoLast();
         else if (input === "v")
             cycleDiff();
         else if (input === "e")
@@ -272,8 +478,8 @@ export function App({ initialModel, permContext }) {
             setTreeVersion((v) => v + 1);
         }
         else if (input === "q")
-            exit();
-    }, { isActive: view === "main" && !quickOpen });
+            requestQuit();
+    }, { isActive: view === "main" && !quickOpen && !(codePanel === "problems" && focus === "code") });
     /** What the user is looking at, attached to each message so "this file" / "here" make sense. */
     const editorContext = () => {
         if (!openFile)
@@ -305,8 +511,17 @@ ${snippet}
     const runCommand = async (input) => {
         const [command, ...rest] = input.slice(1).split(/\s+/);
         const arg = rest.join(" ").trim();
-        const info = (text, kind = "info") => setEntries((prev) => [...prev, { kind, text }]);
         switch (command) {
+            case "undo":
+                return undoLast();
+            case "rewind":
+                return rewind();
+            case "history":
+                return showHistory();
+            case "problems":
+                setCodePanel("problems");
+                setFocus("code");
+                return;
             case "settings":
                 setView("settings");
                 return;
@@ -372,22 +587,29 @@ ${snippet}
         setEntries((prev) => [...prev, { kind: "user", text }]);
         void agentRef.current.send(text, editorContext() ?? undefined);
     };
-    const saveFromEditor = (text) => {
-        if (!openFile)
+    function saveFromEditor(text, file = openFile) {
+        if (!file)
             return;
         try {
-            writeFileSync(path.resolve(process.cwd(), openFile), text, "utf-8");
-            setContent(text);
-            draft.current = null;
+            const full = path.resolve(process.cwd(), file);
+            const before = readText(file);
+            writeFileSync(full, text, "utf-8");
+            timeline.record({ path: file, before, after: text, source: "you", turn: agentRef.current.turnId });
+            if (file === openFile)
+                setContent(text);
+            if (draft.current?.path === file)
+                draft.current = null;
             setTreeVersion((v) => v + 1);
             refreshGit();
+            void diagnostics.checkFile(file);
+            diagnostics.scheduleProject();
         }
         catch (error) {
-            setEntries((prev) => [...prev, { kind: "error", text: `Couldn't save ${openFile}: ${error.message}` }]);
+            setEntries((prev) => [...prev, { kind: "error", text: `Couldn't save ${file}: ${error.message}` }]);
         }
-    };
+    }
     if (view === "settings") {
-        return (_jsx(Settings, { width: columns, height: rows, settings: settings, choice: choice, plugins: plugins, onModel: (next) => switchModel(next), onChange: updateSettings, onTogglePlugin: (id, enabled) => void togglePlugin(id, enabled), onRescanPlugins: () => {
+        return (_jsx(Settings, { width: columns, height: rows, settings: settings, choice: choice, plugins: allPlugins, onModel: (next) => switchModel(next), onChange: updateSettings, onTogglePlugin: (id, enabled) => void togglePlugin(id, enabled), onRescanPlugins: () => {
                 const found = discoverPlugins();
                 setPlugins((prev) => found.map((f) => prev.find((p) => p.id === f.id && p.plugin) ?? f));
             }, onClose: () => setView("main") }));
@@ -397,6 +619,10 @@ ${snippet}
     const chatWidth = Math.max(34, Math.floor(columns * 0.3));
     const codeWidth = Math.max(20, columns - treeWidth - chatWidth);
     const edited = new Set([...changes].filter(([, c]) => c.status === "applied").map(([p]) => p));
+    const fileProblems = openFile ? diagnostics.get(openFile) : [];
+    const totals = diagnostics.counts();
+    const checking = diagnostics.busy;
+    const lspEnabled = activePlugins.some((p) => p.id === "lsp");
     const mode = approval
         ? { label: "APPROVE", color: C.yellow }
         : showEditor ? { label: "EDIT", color: C.green }
@@ -406,16 +632,27 @@ ${snippet}
     const hints = approval
         ? "y accept · n reject · Esc stop"
         : showEditor && focus === "code"
-            ? "Ctrl+S save · Ctrl+Z undo · Esc close editor · Ctrl+P find file"
+            ? `Ctrl+S save${settings.autoSave === "off" ? "" : " (auto-save on)"} · Ctrl+Z/Y undo/redo · Ctrl+K info · Ctrl+G definition · Esc close`
             : focus === "chat"
                 ? busy ? "Esc stop · Tab switch pane" : "Enter send · / commands · Ctrl+P find file · Tab switch pane"
                 : focus === "tree"
-                    ? "↑↓ move · Enter open · c changes · e edit · Ctrl+P find · s settings · q quit"
-                    : diff ? "n/N next/prev change · v cycle diff · Esc close diff" : "↑↓ scroll · e edit · v diff · f follow · s settings · q quit";
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: describe(choice), local: choice.provider.local, busy: busy }), _jsxs(Box, { flexDirection: "row", height: height, children: [_jsx(FileTree, { width: treeWidth, height: height, focused: focus === "tree" && !approval, openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, git: git, onOpen: (filePath) => {
+                    ? "↑↓ move · Enter open · c changes · e edit · p problems · u undo · Ctrl+P find · s settings"
+                    : diff ? "n/N next/prev change · v cycle diff · Esc close diff" : "↑↓ scroll · e edit · v diff · p problems · u undo · s settings";
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: describe(choice), local: choice.provider.local, busy: busy, update: update }), _jsxs(Box, { flexDirection: "row", height: height, children: [_jsx(FileTree, { width: treeWidth, height: height, focused: focus === "tree" && !approval, openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, git: git, problemCounts: diagnostics.fileCounts(), onOpen: (filePath) => {
                             open(filePath);
                             setFocus("code");
-                        }, onHover: () => { } }), showEditor ? (_jsx(Editor, { width: codeWidth, height: height, focused: focus === "code", filePath: openFile, initial: draft.current?.path === openFile ? draft.current.text : content, baseline: draft.current?.path === openFile ? draft.current.baseline : content, onSave: saveFromEditor, onExit: () => {
+                        }, onHover: () => { } }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: height, focused: focus === "code" && !approval, problems: diagnostics.all(), checking: checking, onJump: (file, line) => openAt(file, line), onClose: () => setCodePanel("code") })) : showEditor ? (_jsx(Editor, { width: codeWidth, height: height, focused: focus === "code", filePath: openFile, initial: draft.current?.path === openFile ? draft.current.text : content, baseline: draft.current?.path === openFile ? draft.current.baseline : content, startLine: editorStart.line, problems: fileProblems, autoSave: settings.autoSave, syntaxVersion: syntaxVersion, onHover: (text, line, col) => (lspEnabled ? lsp.hover(openFile, text, line, col) : Promise.resolve(null)), onDefinition: (text, line, col) => {
+                            if (!lspEnabled)
+                                return info("Go to definition needs a language server (see /settings → Plugins).", "error");
+                            void lsp.definition(openFile, text, line, col).then((target) => {
+                                if (!target)
+                                    return info("No definition found here.");
+                                // Keep unsaved text when jumping within the same file.
+                                if (target.file === openFile && draft.current)
+                                    draft.current = { ...draft.current, text };
+                                openAt(target.file, target.line, true);
+                            });
+                        }, onSave: (text) => saveFromEditor(text), onExit: () => {
                             draft.current = null;
                             setEditing(false);
                         }, onState: (state) => {
@@ -423,7 +660,9 @@ ${snippet}
                             draft.current = state.dirty
                                 ? { path: openFile, text: state.lines.join("\n"), baseline: draft.current?.path === openFile ? draft.current.baseline : content }
                                 : null;
-                        } }, openFile)) : (_jsx(CodeView, { width: codeWidth, height: height, focused: focus === "code" && !approval, filePath: openFile, content: content, diff: diff, diffLabel: diffMode === "git" ? "vs HEAD" : "Nou's edit", pending: !!pendingChange, marked: record?.lines ?? NO_LINES, onViewport: (top, bottom) => setViewport((v) => (v?.top === top && v.bottom === bottom ? v : { top, bottom })) })), _jsx(Chat, { width: chatWidth, height: height, focused: focus === "chat", entries: entries, streaming: streaming, busy: busy, approval: approval?.request ?? null, contextChip: contextChip, onSubmit: send })] }), _jsx(Box, { children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: mode.color, color: "black", bold: true, children: ` ${mode.label} ` }), _jsx(Text, { backgroundColor: C.panel, color: follow ? C.green : C.dim, children: follow ? " ◉ follow " : " ○ follow " }), _jsxs(Text, { color: C.dim, children: ["  ", hints] })] }) }), quickOpen && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, onPick: (file) => {
+                        } }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { width: codeWidth, height: height, focused: focus === "code" && !approval, filePath: openFile, content: content, diff: diff, diffLabel: diffMode === "git" ? "vs HEAD" : "Nou's edit", pending: !!pendingChange, marked: record?.lines ?? NO_LINES, problems: fileProblems, focusLine: focusLine, syntaxVersion: syntaxVersion, diffNote: pendingChange ? pendingNote?.short ?? (checking.length ? "checking…" : null) : null, onViewport: (top, bottom) => setViewport((v) => (v?.top === top && v.bottom === bottom ? v : { top, bottom })) })), _jsx(Chat, { width: chatWidth, height: height, focused: focus === "chat", entries: entries, streaming: streaming, busy: busy, approval: approval?.request ?? null, approvalNote: pendingChange ? pendingNote?.detail ?? null : null, contextChip: contextChip, onSubmit: send })] }), _jsx(Box, { children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: mode.color, color: "black", bold: true, children: ` ${mode.label} ` }), _jsx(Text, { backgroundColor: C.panel, color: follow ? C.green : C.dim, children: follow ? " ◉ follow " : " ○ follow " }), _jsx(Text, { backgroundColor: C.panel, color: totals.errors ? C.red : C.dim, children: ` ✖ ${totals.errors}` }), _jsx(Text, { backgroundColor: C.panel, color: totals.warnings ? C.yellow : C.dim, children: ` ▲ ${totals.warnings} ` }), checking.length > 0 && _jsxs(Text, { color: C.accent2, children: [" \u27F3 ", checking.join(", ")] }), exitArmed
+                            ? _jsxs(Text, { color: C.yellow, bold: true, children: ["  ", "Press again to quit", draft.current && settings.autoSave === "off" ? ` (unsaved changes in ${draft.current.path} will be lost)` : ""] })
+                            : _jsxs(Text, { color: C.dim, children: ["  ", hints] })] }) }), quickOpen && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, onPick: (file) => {
                     setQuickOpen(false);
                     open(file);
                     setReveal(file);

package/dist/src/ui/Chat.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
-import TextInput from "ink-text-input";
 import { wrap } from "./text.js";
+import { ChatInput, inputHeight } from "./ChatInput.js";
 import { C, SPINNER } from "./theme.js";
 import { Pane } from "./Pane.js";
 export const COMMANDS = ["/model", "/models", "/settings", "/clear", "/help"];
-export function Chat({ width, height, focused, entries, streaming, busy, approval, contextChip, onSubmit }) {
+export function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, onSubmit }) {
     const [input, setInput] = useState("");
     const [scrollBack, setScrollBack] = useState(0);
     const { frame } = useAnimation({ interval: 80, isActive: !!busy });
@@ -55,6 +55,11 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
     }
     else if (approval?.kind === "change") {
         footer.push({ text: `✎ Review ${approval.change.path} →`, color: C.yellow, bold: true });
+        if (approvalNote) {
+            footer.push({ text: "⚠ This edit adds problems:", color: C.red, bold: true });
+            for (const line of wrap(approvalNote, inner - 2).slice(0, 6))
+                footer.push({ text: ` ${line}`, color: C.red });
+        }
         footer.push({ text: " [y] accept   [n] reject   [Esc] stop", color: C.yellow });
     }
     else if (busy) {
@@ -63,7 +68,9 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
     const suggestions = input.startsWith("/") && !input.includes(" ")
         ? COMMANDS.filter((c) => c.startsWith(input) && c !== input)
         : [];
-    const rows = Math.max(1, height - 3 - footer.length - 3);
+    const inputRows = inputHeight(input, inner);
+    const rows = Math.max(1, height - 3 - footer.length - 2 - inputRows);
+    const history = useMemo(() => entries.filter((e) => e.kind === "user").map((e) => e.text), [entries]);
     const maxBack = Math.max(0, lines.length - rows);
     const back = Math.min(scrollBack, maxBack);
     const visible = lines.slice(Math.max(0, lines.length - rows - back), lines.length - back);
@@ -86,5 +93,5 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
     const title = _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.accent2, children: "\u25C6" }), " Chat", back ? _jsxs(Text, { color: C.dim, children: [" \u2191", back, " more"] }) : null] });
     return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, children: [_jsx(Box, { flexDirection: "column", height: rows, children: empty ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: C.dim, children: "Try:" }), _jsx(Text, { color: C.text, children: "  \u201Cexplain this file\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cwhat changed since my last commit?\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cadd error handling here\u201D" }), _jsx(Text, { children: " " }), _jsx(Text, { color: C.dim, children: "I can see the file you have open." })] })) : visible.map((line, i) => render(line, i)) }), _jsx(Box, { flexDirection: "column", children: footer.map((line, i) => render(line, `f${i}`)) }), _jsx(Text, { wrap: "truncate-end", color: C.dim, children: suggestions.length
                     ? _jsxs(Text, { color: C.accent, children: [suggestions.join("  "), "  ", _jsx(Text, { color: C.dim, children: suggestions.length === 1 ? "Enter ↵" : "" })] })
-                    : contextChip ? _jsxs(_Fragment, { children: [_jsx(Text, { color: C.cyan, children: "@" }), " ", contextChip] }) : " " }), _jsx(Text, { color: focused ? C.accent : C.dim, children: "─".repeat(Math.max(0, inner)) }), _jsxs(Box, { height: 1, overflow: "hidden", children: [_jsx(Text, { color: focused ? C.accent2 : C.dim, bold: true, children: "❯ " }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: submit, focus: focused && !approval, placeholder: busy ? "working… Esc to stop" : "Ask anything · / for commands" })] })] }));
+                    : contextChip ? _jsxs(_Fragment, { children: [_jsx(Text, { color: C.cyan, children: "@" }), " ", contextChip] }) : " " }), _jsx(Text, { color: focused ? C.accent : C.dim, children: "─".repeat(Math.max(0, inner)) }), _jsx(ChatInput, { value: input, onChange: setInput, onSubmit: submit, focus: focused && !approval, width: inner, history: history, placeholder: busy ? "working… Esc to stop" : "Ask anything · / for commands · ↑ history" })] }));
 }

package/dist/src/ui/ChatInput.js

@@ -0,0 +1,128 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useRef, useState } from "react";
+import { Box, Text, useInput, usePaste } from "ink";
+import { C } from "./theme.js";
+/** Word-wraps `text` into segments of at most `width` characters, honoring newlines. */
+export function layout(text, width) {
+    const w = Math.max(1, width);
+    const segments = [];
+    let pos = 0;
+    while (pos <= text.length) {
+        const newline = text.indexOf("\n", pos);
+        const lineEnd = newline === -1 ? text.length : newline;
+        if (lineEnd - pos <= w) {
+            segments.push({ start: pos, end: lineEnd });
+            if (newline === -1)
+                break;
+            pos = newline + 1;
+            continue;
+        }
+        // Break after the last space that fits, or hard-break a long word.
+        const space = text.lastIndexOf(" ", pos + w - 1);
+        const end = space >= pos ? space + 1 : pos + w;
+        segments.push({ start: pos, end });
+        pos = end;
+    }
+    return segments;
+}
+/** The segment the cursor sits in; a cursor at a wrap boundary belongs to the next line. */
+function cursorLine(segments, cursor) {
+    for (let i = 0; i < segments.length; i++) {
+        const s = segments[i];
+        const next = segments[i + 1];
+        if (cursor >= s.start && (cursor < s.end || (cursor === s.end && (!next || next.start > s.end))))
+            return i;
+    }
+    return segments.length - 1;
+}
+export function ChatInput({ value, onChange, onSubmit, focus, width, placeholder, history, maxLines = 6 }) {
+    const [cursor, setCursor] = useState(value.length);
+    const [recall, setRecall] = useState(null);
+    const stash = useRef("");
+    const textWidth = Math.max(4, width - 2);
+    const pos = Math.min(cursor, value.length);
+    const segments = layout(value, textWidth);
+    const line = cursorLine(segments, pos);
+    const set = (next, nextCursor) => {
+        onChange(next);
+        setCursor(Math.max(0, Math.min(next.length, nextCursor)));
+    };
+    const insert = (text) => set(value.slice(0, pos) + text + value.slice(pos), pos + text.length);
+    const recallHistory = (step) => {
+        if (!history.length)
+            return false;
+        const current = recall ?? history.length;
+        const next = current + step;
+        if (next < 0 || next > history.length)
+            return false;
+        if (recall === null)
+            stash.current = value;
+        const text = next === history.length ? stash.current : history[next];
+        setRecall(next === history.length ? null : next);
+        set(text, text.length);
+        return true;
+    };
+    usePaste((text) => insert(text.replace(/\r\n?/g, "\n")), { isActive: focus });
+    useInput((input, key) => {
+        if (key.tab || key.escape || key.pageUp || key.pageDown || (key.shift && (key.upArrow || key.downArrow)))
+            return;
+        if (key.return) {
+            setRecall(null);
+            onSubmit(value);
+            return;
+        }
+        if (key.backspace)
+            return pos > 0 && set(value.slice(0, pos - 1) + value.slice(pos), pos - 1);
+        if (key.delete)
+            return pos < value.length && set(value.slice(0, pos) + value.slice(pos + 1), pos);
+        if (key.leftArrow)
+            return setCursor(key.ctrl || key.meta ? value.lastIndexOf(" ", pos - 2) + 1 : pos - 1 < 0 ? 0 : pos - 1);
+        if (key.rightArrow) {
+            if (key.ctrl || key.meta) {
+                const next = value.indexOf(" ", pos + 1);
+                return setCursor(next === -1 ? value.length : next);
+            }
+            return setCursor(Math.min(value.length, pos + 1));
+        }
+        if (key.home || (key.ctrl && input === "a"))
+            return setCursor(segments[line].start);
+        if (key.end || (key.ctrl && input === "e"))
+            return setCursor(segments[line].end);
+        if (key.ctrl && input === "u")
+            return set("", 0);
+        if (key.upArrow || key.downArrow) {
+            const target = line + (key.upArrow ? -1 : 1);
+            if (target >= 0 && target < segments.length) {
+                // Move between wrapped lines, keeping the column.
+                const col = pos - segments[line].start;
+                const s = segments[target];
+                return setCursor(Math.min(s.start + col, s.end));
+            }
+            recallHistory(key.upArrow ? -1 : 1);
+            return;
+        }
+        if (key.ctrl || key.meta || !input)
+            return;
+        insert(input.replace(/\r\n?/g, "\n"));
+    }, { isActive: focus });
+    // Show a window of lines around the cursor once the message gets long.
+    const first = Math.max(0, Math.min(line - maxLines + 1, segments.length - maxLines));
+    const shown = segments.slice(first, first + maxLines);
+    const prompt = (i) => (_jsx(Text, { color: focus ? C.accent2 : C.dim, bold: true, children: first + i === 0 ? "❯ " : first > 0 && i === 0 ? "↑ " : "  " }));
+    if (!value) {
+        return (_jsxs(Box, { children: [prompt(0), focus ? _jsx(Text, { inverse: true, children: " " }) : null, _jsx(Text, { color: C.dim, wrap: "truncate-end", children: placeholder })] }));
+    }
+    return (_jsx(Box, { flexDirection: "column", children: shown.map((s, i) => {
+            const text = value.slice(s.start, s.end).replace(/\n/g, "");
+            const isCursor = focus && first + i === line;
+            if (!isCursor) {
+                return _jsxs(Text, { children: [prompt(i), _jsx(Text, { color: C.text, children: text || " " })] }, first + i);
+            }
+            const at = pos - s.start;
+            return (_jsxs(Text, { children: [prompt(i), _jsx(Text, { color: C.text, children: text.slice(0, at) }), _jsx(Text, { inverse: true, children: text[at] ?? " " }), _jsx(Text, { color: C.text, children: text.slice(at + 1) })] }, first + i));
+        }) }));
+}
+/** How many rows the input will take, so the chat can size its history above it. */
+export function inputHeight(value, width, maxLines = 6) {
+    return value ? Math.min(maxLines, layout(value, Math.max(4, width - 2)).length) : 1;
+}