nou-cli 0.2.1 → 0.4.0

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 { wrap } from "./text.js";
+import { renderMarkdown, 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", "/undo", "/rewind", "/history", "/problems", "/version", "/clear", "/help"];
-export function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, onSubmit }) {
+export const COMMANDS = ["/model", "/models", "/settings", "/auto", "/engine", "/copy", "/undo", "/rewind", "/history", "/problems", "/version", "/clear", "/help"];
+export function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, onSubmit, onAnswer }) {
     const [input, setInput] = useState("");
     const [scrollBack, setScrollBack] = useState(0);
     const { frame } = useAnimation({ interval: 80, isActive: !!busy });
@@ -23,9 +23,9 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
             }
             else if (entry.kind === "assistant") {
                 out.push({ text: "◆ nou", color: C.accent2, bold: true, bar: C.accent2 });
-                for (const line of wrap(entry.text, inner - 3)) {
-                    const isCode = /^\s{2,}|^```|^\s*[{}();]/.test(line);
-                    out.push({ text: line, ...(isCode ? { color: C.yellow } : {}), bar: C.accent2 });
+                for (const line of renderMarkdown(entry.text, inner - 3)) {
+                    const color = line.kind === "heading" ? C.accent2 : line.kind === "quote" ? C.dim : undefined;
+                    out.push({ text: "", spans: line.spans, ...(color ? { color } : {}), bar: C.accent2 });
                 }
                 out.push({ text: "" });
             }
@@ -54,13 +54,13 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
         footer.push({ text: " [y] allow   [n] deny   [Esc] stop", color: C.yellow });
     }
     else if (approval?.kind === "change") {
-        footer.push({ text: `✎ Review ${approval.change.path} →`, color: C.yellow, bold: true });
+        footer.push({ text: `✎ Nou wants to ${approval.change.isNew ? "create" : "edit"} ${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 });
+        footer.push({ text: " [y] accept   [n] reject   [o] show it   [Esc] stop", color: C.yellow });
     }
     else if (busy) {
         footer.push({ text: `${SPINNER[frame % SPINNER.length]} ${busy}`, color: C.accent2 });
@@ -78,6 +78,13 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
         if (wheel)
             setScrollBack((b) => Math.max(0, Math.min(maxBack, b - wheel.dir * 3)));
     }, [wheel?.nonce]);
+    // While something waits for approval, y/n into an empty input answer it; any other key starts a message.
+    useInput((typed) => {
+        if (/^[yYnN]$/.test(typed))
+            onAnswer(/[yY]/.test(typed));
+        else if (typed && typed >= " ")
+            setInput(typed); // printable, not a control key
+    }, { isActive: focused && !!approval && !input });
     useInput((_input, key) => {
         if (key.pageUp || (key.upArrow && key.shift))
             setScrollBack((b) => Math.min(maxBack, b + Math.max(1, rows - 2)));
@@ -92,12 +99,14 @@ export function Chat({ width, height, focused, entries, streaming, busy, approva
         setInput("");
         onSubmit(command);
     };
-    const render = (line, key) => (_jsxs(Text, { wrap: "truncate-end", children: [line.bar ? _jsx(Text, { color: line.bar, children: "\u258C " }) : null, _jsx(Text, { bold: !!line.bold, dimColor: !!line.dim, ...(line.color ? { color: line.color } : {}), children: line.text || " " })] }, key));
+    const render = (line, key) => (_jsxs(Text, { wrap: "truncate-end", children: [line.bar ? _jsx(Text, { color: line.bar, children: "\u258C " }) : null, line.spans?.length
+                ? line.spans.map((span, i) => (_jsx(Text, { bold: !!span.bold || !!line.bold, italic: !!span.italic, dimColor: !!span.dim, ...(span.code ? { color: C.yellow } : line.color ? { color: line.color } : { color: C.text }), children: span.text }, i)))
+                : _jsx(Text, { bold: !!line.bold, dimColor: !!line.dim, ...(line.color ? { color: line.color } : {}), children: line.text || " " })] }, key));
     const empty = entries.length === 0 && !streaming;
     const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.accent2, children: "\u25C6" }), " Chat", back
                 ? _jsxs(Text, { color: C.yellow, children: ["  \u2191 scrolled ", back, " lines \u00B7 Shift+\u2193 / PgDn / wheel to go back"] })
                 : maxBack > 0 ? _jsx(Text, { color: C.dim, children: "  Shift+\u2191 / PgUp / wheel to scroll" }) : 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)) }), _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" })] }));
+                    : 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 && !input), width: inner, history: history, placeholder: busy ? "working… Esc to stop" : "Ask anything · / for commands · ↑ history" })] }));
 }

package/dist/src/ui/CodeView.js

@@ -53,7 +53,7 @@ export function CodeView({ width, height, focused, filePath, content, diff, diff
             setTop(0);
         else if (input === "G")
             setTop(maxTop);
-        else if (diff && (input === "n" || input === "N")) {
+        else if (diff && !pending && (input === "n" || input === "N")) {
             // Jump between change hunks.
             const starts = diffRows.flatMap((r, i) => (r.changed && !diffRows[i - 1]?.changed ? [i] : []));
             const target = input === "n" ? starts.find((s) => s - 3 > start) : [...starts].reverse().find((s) => s - 3 < start);

package/dist/src/ui/Editor.js

@@ -234,5 +234,5 @@ export function Editor({ width, height, focused, filePath, initial, baseline, st
                     const shown = expand(line).slice(v.left, v.left + textWidth);
                     const at = cursorX - v.left;
                     return (_jsxs(Text, { wrap: "truncate-end", children: [num, _jsx(Text, { color: C.text, children: shown.slice(0, at) }), _jsx(Text, { inverse: true, color: C.green, children: shown[at] ?? " " }), _jsx(Text, { color: C.text, children: shown.slice(at + 1) })] }, n));
-                }) }), hoverLines.length > 0 && (_jsx(Box, { position: "absolute", top: Math.max(1, rows - hoverLines.length - 1), left: gutter + 1, flexDirection: "column", borderStyle: "round", borderColor: C.accent2, width: Math.min(width - gutter - 3, 2 + Math.max(...hoverLines.map((l) => l.length))), children: hoverLines.map((l, i) => _jsx(Text, { color: C.text, wrap: "truncate-end", children: l.padEnd(width) }, i)) })), _jsxs(Text, { wrap: "truncate-end", color: statusColor, children: [` ${status}`, _jsx(Text, { color: C.dim, children: confirmExit ? "" : `   Ctrl+S save${autoSave === "off" ? "" : " (auto)"} · Ctrl+Z/Y undo/redo · Ctrl+K info · Ctrl+G definition · Esc close` })] })] }));
+                }) }), hoverLines.length > 0 && (_jsx(Box, { position: "absolute", top: Math.max(1, rows - hoverLines.length - 1), left: gutter + 1, flexDirection: "column", borderStyle: "round", borderColor: C.accent2, width: Math.min(width - gutter - 3, 2 + Math.max(...hoverLines.map((l) => l.length))), children: hoverLines.map((l, i) => _jsx(Text, { color: C.text, wrap: "truncate-end", children: l.padEnd(width) }, i)) })), _jsx(Text, { wrap: "truncate-end", color: statusColor, children: ` ${status}` })] }));
 }

package/dist/src/ui/FileTree.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { readdirSync } from "fs";
 import path from "path";
 import { Box, Text, useInput } from "ink";
@@ -50,10 +50,13 @@ export function FileTree({ width, height, focused, openFile, reveal, version, ch
         }
         return dirs;
     }, [git]);
-    // Expand the folders leading to whatever the agent is touching and move to it.
+    // Expand the folders leading to whatever the agent is touching and move to it, once per reveal:
+    // later changes to the list (expanding folders, git refreshes) must not pull the cursor back.
+    const pendingReveal = useRef(null);
     useEffect(() => {
         if (!reveal)
             return;
+        pendingReveal.current = reveal;
         const parts = reveal.split("/");
         setExpanded((prev) => {
             const next = new Set(prev);
@@ -63,12 +66,14 @@ export function FileTree({ width, height, focused, openFile, reveal, version, ch
         });
     }, [reveal, version]);
     useEffect(() => {
-        if (!reveal)
+        if (!pendingReveal.current)
+            return;
+        const index = nodes.findIndex((n) => n.path === pendingReveal.current);
+        if (index < 0)
             return;
-        const index = nodes.findIndex((n) => n.path === reveal);
-        if (index >= 0)
-            setCursor(index);
-    }, [nodes, reveal]);
+        setCursor(index);
+        pendingReveal.current = null;
+    }, [nodes]);
     useEffect(() => {
         setCursor((c) => Math.min(c, Math.max(0, nodes.length - 1)));
     }, [nodes.length]);

package/dist/src/ui/Settings.js

@@ -3,43 +3,82 @@ import { useEffect, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
 import TextInput from "ink-text-input";
 import { AUTO_SAVE, EFFORTS } from "../config/index.js";
+import { saveCredentials } from "../config/credentials.js";
+import { originOf, setOutsideNou } from "../config/origins.js";
 import { PLUGIN_DIRS, isEnabled, trustState } from "../plugins/index.js";
 import { currentVersion } from "../update/index.js";
-import { describe, providers } from "../providers/index.js";
+import { describe, providers, rejectedKey } from "../providers/index.js";
+import { ENGINES, isInstalled } from "../engines/index.js";
 import { C, SPINNER } from "./theme.js";
-const TABS = ["Model", "Preferences", "Plugins"];
+const TABS = ["Model", "Engine", "Preferences", "Plugins"];
 const PREFS = [
     { key: "effort", label: "Reasoning effort", help: "How hard Claude thinks (low → max). Higher is smarter but slower and pricier." },
     { key: "autoSave", label: "Auto-save", help: "delay: a second after you stop typing · focus: when you leave the editor · off: only Ctrl+S." },
     { key: "mouse", label: "Mouse", help: "Wheel scrolls the pane under the pointer; click to focus or open files. Hold Shift to select text." },
     { key: "followMode", label: "Follow mode on start", help: "The code view jumps to files Nou reads and edits." },
+    { key: "reuseToolConfig", label: "Use Claude Code / Codex keys", help: "Use the API keys from Claude Code's or Codex's settings when you haven't set one. Applies on restart." },
     { key: "gitContext", label: "Git context", help: "Give the model your branch, changes and commits, plus git tools." },
     { key: "autoApproveEdits", label: "Auto-approve edits", help: "Apply file edits without asking (diffs are still shown).", warn: true },
     { key: "autoApproveCommands", label: "Auto-approve commands", help: "Run shell commands without asking. Only turn on if you trust the model.", warn: true },
 ];
-export function Settings({ width, height, settings, choice, plugins, onModel, onChange, onTogglePlugin, onRescanPlugins, onClose }) {
+export function Settings({ width, height, settings, choice, plugins, connectTo, onModel, onEngine, onChange, onTogglePlugin, onRescanPlugins, onClose }) {
     const [tab, setTab] = useState("Model");
-    const [row, setRow] = useState(0);
+    const [row, setRow] = useState(() => Math.max(0, providers.indexOf(connectTo ?? choice.provider)));
     const [column, setColumn] = useState("providers");
     const [modelRow, setModelRow] = useState(0);
     const [typing, setTyping] = useState(false);
     const [custom, setCustom] = useState("");
     const [models, setModels] = useState({});
+    const [connecting, setConnecting] = useState(connectTo?.connect ? { step: 0, values: {} } : null);
+    const [field, setField] = useState(() => (connectTo?.connect ? initialValue(connectTo.connect[0]) : ""));
     const { frame } = useAnimation({ interval: 80 });
     const provider = providers[row] ?? providers[0];
     const listed = models[provider.id];
     // Load the model list for the highlighted provider.
     useEffect(() => {
-        if (tab !== "Model" || provider.unavailable() || models[provider.id])
+        if (tab !== "Model" || connecting || provider.unavailable() || models[provider.id])
             return;
         setModels((m) => ({ ...m, [provider.id]: "loading" }));
         provider.listModels()
             .then((list) => setModels((m) => ({ ...m, [provider.id]: list })))
             .catch((error) => setModels((m) => ({ ...m, [provider.id]: { error: String(error.message ?? error) } })));
-    }, [tab, provider.id]);
+    }, [tab, provider.id, connecting]);
+    const startConnect = () => {
+        if (!provider.connect)
+            return;
+        setConnecting({ step: 0, values: {} });
+        setField(initialValue(provider.connect[0]));
+    };
+    /** Takes the current field's answer; after the last one, saves everything and shows the provider's models. */
+    const submitField = (value) => {
+        const fields = provider.connect;
+        const current = fields[connecting.step];
+        // Required, and nothing set yet: ask again.
+        if (!value.trim() && !current.optional && !process.env[current.env])
+            return;
+        const values = { ...connecting.values, [current.env]: value };
+        const next = connecting.step + 1;
+        if (next < fields.length) {
+            setConnecting({ step: next, values });
+            setField(initialValue(fields[next]));
+            return;
+        }
+        saveCredentials(values);
+        setConnecting(null);
+        setModels((m) => Object.fromEntries(Object.entries(m).filter(([id]) => id !== provider.id)));
+        if (!provider.unavailable()) {
+            setColumn("models");
+            setModelRow(0);
+        }
+    };
     const modelItems = Array.isArray(listed) ? listed : [];
-    const rowsFor = (t) => (t === "Model" ? providers.length : t === "Preferences" ? PREFS.length : plugins.length);
+    const rowsFor = (t) => (t === "Model" ? providers.length : t === "Engine" ? ENGINES.length : t === "Preferences" ? PREFS.length : plugins.length);
     useInput((input, key) => {
+        if (connecting) {
+            if (key.escape)
+                setConnecting(null);
+            return;
+        }
         if (typing) {
             if (key.escape)
                 setTyping(false);
@@ -48,7 +87,7 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
         if (key.tab) {
             const next = TABS[(TABS.indexOf(tab) + (key.shift ? TABS.length - 1 : 1)) % TABS.length];
             setTab(next);
-            setRow(next === "Model" ? Math.max(0, providers.indexOf(choice.provider)) : 0);
+            setRow(next === "Model" ? Math.max(0, providers.indexOf(choice.provider)) : next === "Engine" ? Math.max(0, ENGINES.findIndex((e) => e.id === settings.engine)) : 0);
             setColumn("providers");
             return;
         }
@@ -67,6 +106,8 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
                 setModelRow((r) => Math.min(count - 1, r + 1));
             else if (key.leftArrow)
                 setColumn("providers");
+            else if (input === "k")
+                startConnect();
             else if (key.return) {
                 if (modelRow === 0) {
                     setCustom("");
@@ -86,6 +127,14 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
                 setColumn("models");
                 setModelRow(0);
             }
+            else
+                startConnect();
+        }
+        else if (tab === "Model" && input === "k") {
+            startConnect();
+        }
+        else if (tab === "Engine" && (key.return || input === " ")) {
+            onEngine(ENGINES[row].id);
         }
         else if (tab === "Preferences" && (key.return || input === " " || key.leftArrow || key.rightArrow)) {
             const pref = PREFS[row];
@@ -112,16 +161,32 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
     const body = () => {
         if (tab === "Model") {
             const leftWidth = Math.min(46, Math.floor(width * 0.45));
+            // Room for the label next to the marker, "local"/"cloud" and the lock (plus the border).
+            const labelWidth = Math.max(10, leftWidth - 14);
             return (_jsxs(Box, { flexDirection: "row", height: boxHeight, children: [_jsxs(Box, { flexDirection: "column", width: leftWidth, borderStyle: "round", borderColor: column === "providers" ? C.accent : C.dim, children: [_jsx(Text, { color: C.dim, bold: true, children: " PROVIDER" }), providers.map((p, i) => {
                                 const problem = p.unavailable();
                                 const selected = i === row;
                                 const current = p.id === choice.provider.id;
-                                return (_jsxs(Text, { wrap: "truncate-end", ...(selected && column === "providers" ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: current ? C.green : C.dim, children: current ? " ● " : "   " }), _jsx(Text, { color: problem ? C.dim : C.text, bold: selected, children: p.label.padEnd(26).slice(0, 26) }), _jsx(Text, { color: p.local ? C.green : C.accent2, children: p.local ? " local" : " cloud" }), problem ? _jsx(Text, { color: C.dim, children: " \uD83D\uDD12" }) : null] }, p.id));
-                            })] }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, borderStyle: "round", borderColor: column === "models" ? C.accent : C.dim, paddingX: 1, children: [_jsxs(Text, { color: C.dim, bold: true, children: ["MODELS \u00B7 ", provider.label] }), provider.unavailable() ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: C.yellow, children: ["Not set up: ", provider.unavailable()] }), _jsx(Text, { color: C.dim, children: "Add it to a .env file in your project (see .env.example) or your environment, then restart Nou." })] })) : (_jsxs(_Fragment, { children: [typing ? (_jsxs(Text, { children: [_jsx(Text, { color: C.accent2, children: "\u270E " }), _jsx(TextInput, { value: custom, onChange: setCustom, onSubmit: (v) => {
+                                return (_jsxs(Text, { wrap: "truncate-end", ...(selected && column === "providers" ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: current ? C.green : C.dim, children: current ? " ● " : "   " }), _jsx(Text, { color: problem ? C.dim : C.text, bold: selected, children: p.label.padEnd(labelWidth).slice(0, labelWidth) }), _jsx(Text, { color: p.local ? C.green : C.accent2, children: p.local ? " local" : " cloud" }), problem ? _jsx(Text, { color: C.dim, children: " \uD83D\uDD12" }) : null] }, p.id));
+                            })] }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, borderStyle: "round", borderColor: column === "models" ? C.accent : C.dim, paddingX: 1, children: [_jsxs(Text, { color: C.dim, bold: true, children: ["MODELS \u00B7 ", provider.label] }), connecting && provider.connect ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: C.accent2, bold: true, children: ["Connect ", provider.label] }), provider.connect.map((f, i) => {
+                                        const entered = connecting.values[f.env];
+                                        const shown = (v) => (f.secret ? "•".repeat(Math.min(v.length, 12)) : v);
+                                        if (i < connecting.step) {
+                                            return _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["\u2713 ", f.label, ": ", entered ? shown(entered) : "unchanged"] }, f.env);
+                                        }
+                                        if (i > connecting.step)
+                                            return _jsxs(Text, { color: C.dim, children: ["  ", f.label, f.optional ? " (optional)" : ""] }, f.env);
+                                        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsxs(Text, { color: C.accent2, children: ["\u270E ", f.label, f.optional ? " (optional)" : "", ": "] }), _jsx(TextInput, { value: field, onChange: setField, onSubmit: submitField, ...(f.secret ? { mask: "•" } : {}), ...(f.placeholder ? { placeholder: f.placeholder } : {}) })] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["  ", f.env, process.env[f.env] ? (f.secret ? ` is set (from ${originOf(f.env)}); Enter keeps it` : "") : f.optional ? "; Enter skips" : ""] }), setOutsideNou(f.env) && (_jsxs(Text, { color: C.yellow, wrap: "wrap", children: ["  A new one works now, but ", originOf(f.env), " sets ", f.env, " too and wins when Nou restarts: change or remove it there."] }))] }, f.env));
+                                    }), _jsx(Text, { children: " " }), _jsx(Text, { color: C.dim, wrap: "truncate-end", children: "Saved to ~/.nou/credentials.json (only you can read it). Your environment and .env still win." })] })) : provider.unavailable() ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: C.yellow, children: ["Not set up: ", provider.unavailable()] }), provider.connect
+                                        ? _jsx(Text, { color: C.accent2, children: "Press Enter to connect it: paste your key here, no restart needed." })
+                                        : null, _jsx(Text, { color: C.dim, children: "Or add it to a .env file in your project (see .env.example) or your environment." })] })) : (_jsxs(_Fragment, { children: [typing ? (_jsxs(Text, { children: [_jsx(Text, { color: C.accent2, children: "\u270E " }), _jsx(TextInput, { value: custom, onChange: setCustom, onSubmit: (v) => {
                                                     setTyping(false);
                                                     if (v.trim())
                                                         onModel({ provider, model: v.trim() });
-                                                }, placeholder: `e.g. ${provider.defaultModel}` })] })) : (_jsx(Text, { ...(column === "models" && modelRow === 0 ? { backgroundColor: C.panel } : {}), color: C.accent2, children: "\u270E Type a model name\u2026" })), listed === "loading" && _jsxs(Text, { color: C.accent2, children: [SPINNER[frame % SPINNER.length], " loading models\u2026"] }), listed && typeof listed === "object" && !Array.isArray(listed) && _jsxs(Text, { color: C.red, children: ["Couldn't list models: ", listed.error] }), (() => {
+                                                }, placeholder: `e.g. ${provider.defaultModel}` })] })) : (_jsx(Text, { ...(column === "models" && modelRow === 0 ? { backgroundColor: C.panel } : {}), color: C.accent2, children: "\u270E Type a model name\u2026" })), listed === "loading" && _jsxs(Text, { color: C.accent2, children: [SPINNER[frame % SPINNER.length], " loading models\u2026"] }), listed && typeof listed === "object" && !Array.isArray(listed) && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: C.red, children: ["Couldn't list models: ", listed.error] }), rejectedKey(listed.error) && provider.connect?.some((f) => f.secret) && (() => {
+                                                const key = provider.connect.find((f) => f.secret).env;
+                                                return _jsxs(Text, { color: C.yellow, wrap: "wrap", children: ["The ", key, " ", originOf(key) ? `from ${originOf(key)} ` : "", "was rejected. Press k to enter a different key."] });
+                                            })()] })), (() => {
                                         const visibleCount = Math.max(1, boxHeight - 6);
                                         const offset = Math.max(0, Math.min(modelRow - 1 - Math.floor(visibleCount / 2), modelItems.length - visibleCount));
                                         return modelItems.slice(offset, offset + visibleCount).map((m, i) => {
@@ -132,6 +197,13 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
                                         });
                                     })()] }))] })] }));
         }
+        if (tab === "Engine") {
+            return (_jsxs(Box, { flexDirection: "column", height: boxHeight, borderStyle: "round", borderColor: C.accent, paddingX: 1, children: [ENGINES.map((engine, i) => {
+                        const selected = i === row;
+                        const active = engine.id === settings.engine;
+                        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸ " : "  " }), _jsx(Text, { color: active ? C.green : C.dim, bold: true, children: active ? "● " : "○ " }), _jsx(Text, { color: C.text, bold: selected, children: engine.label.padEnd(14) }), _jsxs(Text, { color: C.dim, children: [active ? "in use · " : "", "model: ", engine.model(choice)] })] }), !isInstalled(engine) && _jsxs(Text, { color: C.orange, wrap: "truncate-end", children: ["    Not installed. Enter installs it with npm (", engine.package, ") into ~/.nou/engines."] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", engine.description] }), engine.approvals === "after" && _jsx(Text, { color: C.orange, wrap: "truncate-end", children: "    Nou can't ask before its edits; it shows them afterwards so you can undo them." })] }, engine.id));
+                    }), _jsx(Text, { color: C.dim, wrap: "truncate-end", children: "The engine is the agent that answers in the chat. Diffs, approvals, undo and problems work with each one." })] }));
+        }
         if (tab === "Preferences") {
             return (_jsx(Box, { flexDirection: "column", height: boxHeight, borderStyle: "round", borderColor: C.accent, paddingX: 1, children: PREFS.map((pref, i) => {
                     const selected = i === row;
@@ -152,15 +224,19 @@ export function Settings({ width, height, settings, choice, plugins, onModel, on
                             (p.plugin.diagnostics ?? []).length && "checker",
                         ].filter(Boolean)
                         : [];
-                    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸ " : "  " }), toggle(enabled), _jsxs(Text, { color: C.text, bold: true, children: [" ", p.plugin?.name ?? p.id] }), _jsxs(Text, { color: C.dim, children: [" ", p.plugin?.version ? `v${p.plugin.version} · ` : "", p.scope, parts.length ? ` · ${parts.join(", ")}` : ""] })] }), state === "changed"
+                    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸ " : "  " }), p.scope === "starter" ? _jsx(Text, { color: C.accent2, bold: true, children: "+ ADD" }) : toggle(enabled), _jsxs(Text, { color: C.text, bold: true, children: [" ", p.plugin?.name ?? p.id] }), _jsxs(Text, { color: C.dim, children: [" ", p.plugin?.version ? `v${p.plugin.version} · ` : "", p.scope === "starter" ? "starter, optional" : p.scope, parts.length ? ` · ${parts.join(", ")}` : ""] })] }), state === "changed"
                                 ? _jsx(Text, { color: C.yellow, wrap: "truncate-end", children: "    \u26A0 Changed since you enabled it. Review the code, then press Enter to enable again." })
                                 : p.error
                                     ? _jsxs(Text, { color: C.red, wrap: "truncate-end", children: ["    \u2716 ", p.error] })
                                     : _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", p.plugin?.description ?? (enabled ? "" : "Enable to load it.")] })] }, p.id));
-                }), _jsx(Text, { children: " " }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["Add your own: drop a .js/.mjs file into ", PLUGIN_DIRS.map((d) => d.dir).join(" or "), ", then press r."] }), _jsx(Text, { color: C.dim, wrap: "truncate-end", children: "Example: examples/plugins/word-count.mjs in the Nou repo." })] }));
+                }), _jsx(Text, { children: " " }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["Starters: Enter adds one to ", PLUGIN_DIRS.find((d) => d.scope === "user").dir, ", where you can edit it."] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["Write your own: /plugins new <name>, or drop a .js/.mjs file into ", PLUGIN_DIRS.map((d) => d.dir).join(" or "), ", then press r."] })] }));
     };
     const hints = tab === "Model"
-        ? column === "models" ? "↑↓ choose · Enter use model · ← providers" : "↑↓ provider · Enter/→ pick a model"
-        : tab === "Preferences" ? "↑↓ move · Enter/Space toggle · ←→ change option" : "↑↓ move · Enter toggle · r rescan";
+        ? connecting ? "Enter next · Esc cancel" : column === "models" ? `↑↓ choose · Enter use model · ← providers${provider.connect ? " · k change key" : ""}` : `↑↓ provider · Enter/→ ${provider.unavailable() ? "connect" : "pick a model"}${provider.connect ? " · k change key" : ""}`
+        : tab === "Engine" ? "↑↓ move · Enter use this engine" : tab === "Preferences" ? "↑↓ move · Enter/Space toggle · ←→ change option" : "↑↓ move · Enter toggle · r rescan";
     return (_jsxs(Box, { flexDirection: "column", width: width, height: height, paddingX: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: C.accent2, bold: true, children: "\u2699 Settings  " }), TABS.map((t) => (_jsx(Text, { ...(t === tab ? { backgroundColor: C.accent2, color: "black" } : { color: C.dim }), bold: t === tab, children: ` ${t} ` }, t))), _jsx(Text, { color: C.dim, children: "   current: " }), _jsx(Text, { color: C.green, children: describe(choice) }), _jsxs(Text, { color: C.dim, children: ["   nou v", currentVersion()] })] }), _jsx(Text, { children: " " }), body(), _jsxs(Text, { color: C.dim, children: [" Tab next section \u00B7 ", hints, " \u00B7 Esc close   ", _jsx(Text, { color: C.dim, children: "saved to ~/.nou/config.json" })] })] }));
 }
+/** What a connect field starts with: the current URL to edit (keys stay hidden, so they start empty). */
+function initialValue(f) {
+    return f.secret ? "" : process.env[f.env] ?? "";
+}

package/dist/src/ui/clipboard.js

@@ -0,0 +1,29 @@
+import { spawn } from "child_process";
+/** Native clipboard commands to try, in order, for this platform. */
+function commands() {
+    if (process.platform === "win32")
+        return [["powershell", ["-NoProfile", "-Command", "Set-Clipboard -Value ([Console]::In.ReadToEnd())"]]];
+    if (process.platform === "darwin")
+        return [["pbcopy", []]];
+    return [["wl-copy", []], ["xclip", ["-selection", "clipboard"]], ["xsel", ["--clipboard", "--input"]]];
+}
+function run(cmd, args, text) {
+    return new Promise((resolve) => {
+        const child = spawn(cmd, args, { stdio: ["pipe", "ignore", "ignore"] });
+        child.on("error", () => resolve(false));
+        child.on("close", (code) => resolve(code === 0));
+        child.stdin.end(text);
+    });
+}
+/**
+ * Copies text to the system clipboard. Also sends it as an OSC 52 escape, which terminals that
+ * support it (Windows Terminal, iTerm2, kitty, WezTerm...) put on the clipboard even over SSH.
+ */
+export async function copyToClipboard(text) {
+    if (process.stdout.isTTY)
+        process.stdout.write(`\x1b]52;c;${Buffer.from(text).toString("base64")}\x07`);
+    for (const [cmd, args] of commands())
+        if (await run(cmd, args, text))
+            return true;
+    return process.stdout.isTTY === true;
+}

package/dist/src/ui/mouse.js

@@ -14,8 +14,10 @@ export function parseMouse(chunk) {
         const button = code & 0b11000011; // drop the shift/alt/ctrl bits
         if (button === 64 || button === 65)
             events.push({ kind: "wheel", dir: button === 64 ? -1 : 1, x, y });
-        else if (button === 0 && m[4] === "M")
-            events.push({ kind: "click", x, y });
+        else if (button === 0 && code & 32)
+            events.push({ kind: "drag", x, y }); // 32: moved with the left button held
+        else if (button === 0)
+            events.push({ kind: m[4] === "M" ? "click" : "release", x, y });
     }
     return events;
 }

package/dist/src/ui/text.js

@@ -98,3 +98,170 @@ export function changedLines(before, after) {
     }
     return lines;
 }
+/** Lines added and removed, for summaries like "+12 -3". */
+export function lineCounts(before, after) {
+    let added = 0;
+    let removed = 0;
+    for (const part of diffLines(before.replace(/\r\n/g, "\n"), after.replace(/\r\n/g, "\n"))) {
+        if (part.added)
+            added += part.count ?? 0;
+        else if (part.removed)
+            removed += part.count ?? 0;
+    }
+    return { added, removed };
+}
+const INLINE = /(`+)([^`]+?)\1|\*\*(.+?)\*\*|__(.+?)__|(?<![\w*])\*(?!\s)(.+?)(?<!\s)\*(?![\w*])|(?<!\w)_(?!\s)(.+?)(?<!\s)_(?!\w)|\[([^\]]+)\]\(([^)\s]+)\)/g;
+/** Splits a line of markdown into styled spans: `code`, **bold**, *italic*, [links](url). */
+export function inlineSpans(text, base = { text: "" }) {
+    const out = [];
+    let pos = 0;
+    for (const m of text.matchAll(INLINE)) {
+        if (m.index > pos)
+            out.push({ ...base, text: text.slice(pos, m.index) });
+        if (m[2] !== undefined)
+            out.push({ ...base, text: m[2], code: true });
+        else if (m[3] !== undefined || m[4] !== undefined)
+            out.push(...inlineSpans(m[3] ?? m[4], { ...base, bold: true }));
+        else if (m[5] !== undefined || m[6] !== undefined)
+            out.push(...inlineSpans(m[5] ?? m[6], { ...base, italic: true }));
+        else {
+            out.push(...inlineSpans(m[7], base));
+            if (m[8] !== m[7])
+                out.push({ ...base, text: ` (${m[8]})`, dim: true });
+        }
+        pos = m.index + m[0].length;
+    }
+    if (pos < text.length)
+        out.push({ ...base, text: text.slice(pos) });
+    return out.filter((s) => s.text);
+}
+const sameStyle = (a, b) => !!a.bold === !!b.bold && !!a.italic === !!b.italic && !!a.code === !!b.code && !!a.dim === !!b.dim;
+/** Word-wraps styled spans; continuation lines start with `indent` spaces. */
+function wrapSpans(spans, width, indent = 0) {
+    const max = Math.max(1, width);
+    const lines = [[]];
+    let len = 0;
+    const push = (span) => {
+        const line = lines[lines.length - 1];
+        const last = line[line.length - 1];
+        if (last && sameStyle(last, span))
+            last.text += span.text;
+        else
+            line.push({ ...span });
+        len += span.text.length;
+    };
+    const newLine = () => {
+        const line = lines[lines.length - 1];
+        const last = line[line.length - 1];
+        if (last)
+            last.text = last.text.trimEnd();
+        lines.push(indent ? [{ text: " ".repeat(indent) }] : []);
+        len = indent;
+    };
+    for (const span of spans) {
+        for (const word of span.text.split(/(\s+)/)) {
+            if (!word)
+                continue;
+            if (len + word.length <= max) {
+                push({ ...span, text: word });
+                continue;
+            }
+            if (/^\s+$/.test(word)) {
+                newLine();
+                continue;
+            }
+            if (len > indent)
+                newLine();
+            let rest = word;
+            while (len + rest.length > max) {
+                const room = Math.max(1, max - len);
+                push({ ...span, text: rest.slice(0, room) });
+                rest = rest.slice(room);
+                newLine();
+            }
+            push({ ...span, text: rest });
+        }
+    }
+    return lines;
+}
+const cells = (row) => row.trim().replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim());
+/** Renders markdown for the terminal: headings, lists, quotes, code blocks, tables and inline styles, wrapped to `width`. */
+export function renderMarkdown(text, width) {
+    const out = [];
+    const src = splitLines(text);
+    let fence = null;
+    for (let i = 0; i < src.length; i++) {
+        const raw = src[i];
+        const opener = raw.match(/^\s*(`{3,}|~{3,})\s*(\S*)/);
+        if (fence !== null) {
+            if (opener && raw.trim().startsWith(fence)) {
+                fence = null;
+                continue;
+            }
+            for (const line of wrap(raw, width))
+                out.push({ kind: "code", spans: [{ text: line, code: true }] });
+            continue;
+        }
+        if (opener) {
+            fence = opener[1];
+            if (opener[2])
+                out.push({ kind: "code", spans: [{ text: opener[2], dim: true }] });
+            continue;
+        }
+        // Tables: a header row, a |---| row, then body rows.
+        if (/^\s*\|/.test(raw) && /^\s*\|?\s*:?-{2,}/.test(src[i + 1] ?? "")) {
+            const rows = [cells(raw)];
+            let j = i + 2;
+            for (; j < src.length && /^\s*\|/.test(src[j]); j++)
+                rows.push(cells(src[j]));
+            i = j - 1;
+            const plain = rows.map((r) => r.map((c) => inlineSpans(c).map((s) => s.text).join("")));
+            const columns = Math.max(...plain.map((r) => r.length));
+            const widths = Array.from({ length: columns }, (_, c) => Math.max(...plain.map((r) => (r[c] ?? "").length)));
+            const fits = widths.reduce((a, b) => a + b, 0) + 3 * (columns - 1) <= width;
+            rows.forEach((row, r) => {
+                const spans = [];
+                row.forEach((cell, c) => {
+                    if (c > 0)
+                        spans.push({ text: " │ ", dim: true });
+                    spans.push(...inlineSpans(cell, r === 0 ? { text: "", bold: true } : { text: "" }));
+                    if (fits && c < columns - 1)
+                        spans.push({ text: " ".repeat(widths[c] - plain[r][c].length) });
+                });
+                for (const line of wrapSpans(spans, width, 2))
+                    out.push({ kind: "text", spans: line });
+                if (r === 0)
+                    out.push({ kind: "rule", spans: [{ text: fits ? widths.map((w) => "─".repeat(w)).join("─┼─") : "─".repeat(Math.min(width, 40)), dim: true }] });
+            });
+            continue;
+        }
+        const heading = raw.match(/^\s{0,3}(#{1,6})\s+(.*?)\s*#*\s*$/);
+        if (heading) {
+            for (const line of wrapSpans(inlineSpans(heading[2], { text: "", bold: true }), width))
+                out.push({ kind: "heading", spans: line });
+            continue;
+        }
+        if (/^\s{0,3}([-*_])(\s*\1){2,}\s*$/.test(raw)) {
+            out.push({ kind: "rule", spans: [{ text: "─".repeat(Math.min(width, 40)), dim: true }] });
+            continue;
+        }
+        const quote = raw.match(/^\s*>\s?(.*)/);
+        if (quote) {
+            for (const line of wrapSpans(inlineSpans(quote[1], { text: "", italic: true }), width - 2))
+                out.push({ kind: "quote", spans: [{ text: "│ ", dim: true }, ...line] });
+            continue;
+        }
+        const item = raw.match(/^(\s*)([-*+]|\d+[.)])\s+(\[[ xX]\]\s+)?(.*)/);
+        if (item) {
+            const depth = Math.floor(item[1].length / 2) * 2;
+            const task = item[3] ? (/x/i.test(item[3]) ? "☑ " : "☐ ") : "";
+            const bullet = `${" ".repeat(depth)}${/\d/.test(item[2]) ? item[2] : "•"} ${task}`;
+            for (const line of wrapSpans([{ text: bullet }, ...inlineSpans(item[4])], width, bullet.length))
+                out.push({ kind: "text", spans: line });
+            continue;
+        }
+        for (const line of wrapSpans(inlineSpans(raw), width))
+            out.push({ kind: "text", spans: line });
+    }
+    return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Nou: an IDE-style AI coding assistant for your terminal. Local (Ollama, LM Studio) and cloud (Claude, OpenAI, Gemini...) models, live diffs, git-aware, built-in editor.",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "files": [
     "dist",
+    "plugins",
     ".env.example",
     "README.md"
   ],
@@ -19,7 +20,8 @@
     "build": "tsc -p tsconfig.build.json && node scripts/copy-grammars.mjs",
     "start": "node dist/index.js",
     "typecheck": "tsc --noEmit -p .",
-    "lint": "eslint index.ts src",
+    "lint": "eslint index.ts src evals plugins",
+    "eval": "tsx evals/run.ts",
     "prepublishOnly": "npm run build",
     "screenshot": "node -e \"process.env.FORCE_COLOR='3';require('child_process').execSync('npx tsx scripts/screenshot.tsx',{stdio:'inherit'})\"",
     "test": "tsx tests/unit.ts && tsx tests/e2e.tsx"