nou-cli 0.5.6 → 0.5.11

package/dist/src/ui/Chat.js

@@ -63,7 +63,7 @@ function entryLines(entry, inner, links = true) {
     else {
         const style = entry.kind === "tool"
             ? { icon: "⚙", color: C.dim }
-            : entry.kind === "error" ? { icon: "✖", color: C.red } : { icon: "ℹ", color: C.accent };
+            : entry.kind === "error" ? { icon: "✗", color: C.red } : { icon: "ℹ", color: C.accent };
         wrap(entry.text, inner - 4).forEach((line, i) => {
             const spans = links && entry.kind !== "user" ? linkFileRefs(linkUrls([{ text: ` ${line}` }]), isProjectFile) : [];
             out.push({ text: ` ${line}`, color: style.color, lead: i === 0 ? ` ${style.icon}` : "  ", leadColor: style.color, ...(spans.some((sp) => sp.link) ? { spans } : {}) });
@@ -100,8 +100,10 @@ export function chatTabZones(tabs) {
     return { zones, plus: x + 1, width: x + 3 };
 }
 const tabText = (t) => ` ${t.state === "busy" ? "● " : t.state === "waiting" ? "! " : ""}${t.label} `;
+/** Characters of a word for a double-click: paths and web addresses come whole (src/a.ts, https://x.io/y). */
+const WORD_CHAR = /[\p{L}\p{N}_.\-/@:~#%?=&+]/u;
 const lineText = (line) => (line.spans ? line.spans.map((s) => s.text).join("") : line.text ?? "");
-export const Chat = memo(function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, scrollTo, prefill, extraCommands, onMenu, onSubmit, onAnswer, click, onOpenRef, select, tabs, queued = [] }) {
+export const Chat = memo(function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, scrollTo, prefill, extraCommands, onMenu, onSubmit, onAnswer, click, onOpenRef, select, tabs, queued = [], sendNowFirst = false, onSendNow }) {
     const [input, setInputText] = useState("");
     // Whether the chat has the keyboard right now: a key handler from a render before focus moved away can
     // still be attached for a moment (on a busy machine), and its keys belong to the pane that has focus.
@@ -192,9 +194,11 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
     else if (busy) {
         footer.push({ text: `${SPINNER[frame % SPINNER.length]} ${busy}`, color: C.accent2 });
     }
-    for (const text of queued) {
-        footer.push({ text: `⏳ next: ${text.replace(/\s+/g, " ")}`, color: C.dim });
-    }
+    // Click what's queued (or /now) to stop Nou and send it right away.
+    for (const text of queued)
+        footer.push({ text: `⏳ next: ${text.replace(/\s+/g, " ")}`, color: C.dim, sendNow: true });
+    if (queued.length && busy)
+        footer.push({ text: "   ↳ click to send now, or /now", color: C.accent2, sendNow: true });
     // Typing "/" opens a menu of commands with what each does; ↑↓ pick one, Tab completes, Enter runs it.
     const menuOpen = focused && !approval && input.startsWith("/") && !input.includes(" ") && !input.includes("\n");
     const matches = useMemo(() => (menuOpen ? matchCommands(input, extraCommands) : []), [menuOpen, input, extraCommands]);
@@ -224,6 +228,12 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
     useEffect(() => {
         if (!click)
             return;
+        if (click.row >= rows) {
+            // Under the messages: a click on what's queued sends it now.
+            if (footer[click.row - rows]?.sendNow)
+                onSendNow?.();
+            return;
+        }
         const line = visible[click.row];
         const run = line?.toggle;
         if (run) {
@@ -252,6 +262,40 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         if (!select)
             return;
         const at = { line: Math.max(0, Math.min(lines.length - 1, firstShown + select.row)), col: Math.max(0, select.col) };
+        if (select.kind === "word" || select.kind === "block") {
+            anchor.current = null; // the button coming up doesn't change it
+            let range;
+            if (select.kind === "word") {
+                const chars = [...lineText(lines[at.line] ?? { text: "" })];
+                if (!WORD_CHAR.test(chars[at.col] ?? ""))
+                    return;
+                let start = at.col;
+                let end = at.col;
+                while (start > 0 && WORD_CHAR.test(chars[start - 1]))
+                    start--;
+                while (end < chars.length - 1 && WORD_CHAR.test(chars[end + 1]))
+                    end++;
+                // Punctuation that ends a sentence isn't part of the word.
+                while (end > start && /[.,:;?!]/.test(chars[end]))
+                    end--;
+                range = { from: { line: at.line, col: start }, to: { line: at.line, col: end } };
+            }
+            else {
+                const blank = (i) => !lineText(lines[i] ?? { text: "" }).trim();
+                if (blank(at.line))
+                    return;
+                let first = at.line;
+                let last = at.line;
+                while (first > 0 && !blank(first - 1))
+                    first--;
+                while (last < lines.length - 1 && !blank(last + 1))
+                    last++;
+                range = { from: { line: first, col: 0 }, to: { line: last, col: Infinity } };
+            }
+            setSelection(range);
+            copySelection(range);
+            return;
+        }
         if (select.kind === "press") {
             anchor.current = at;
             setSelection(null);
@@ -271,17 +315,22 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         if (select.kind !== "release")
             return;
         anchor.current = null;
-        if (!range)
-            return;
+        if (range)
+            copySelection(range);
+    }, [select?.nonce]);
+    /** Copies the selected text (and says so for a moment). Columns count characters, as the screen shows them. */
+    const copySelection = (range) => {
         const text = lines.slice(range.from.line, range.to.line + 1).map((line, i, all) => {
-            const t = lineText(line);
-            return t.slice(i === 0 ? range.from.col : 0, i === all.length - 1 ? range.to.col + 1 : undefined).trimEnd();
+            const t = [...lineText(line)];
+            return t.slice(i === 0 ? range.from.col : 0, i === all.length - 1 && Number.isFinite(range.to.col) ? range.to.col + 1 : undefined).join("").trimEnd();
         }).join("\n");
+        if (!text)
+            return;
         void copyToClipboard(text).then((ok) => {
             setFlash(ok ? `Copied ${text.split("\n").length > 1 ? `${text.split("\n").length} lines` : "it"} ✓` : "Can't copy: press m, then select");
             setTimeout(() => setFlash(null), 2000);
         });
-    }, [select?.nonce]);
+    };
     // Typing or new messages leave the selection be; a new conversation clears it.
     useEffect(() => {
         if (!entries.length)
@@ -360,5 +409,5 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
     return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: messages }), _jsx(Scrollbar, { total: lines.length, top: firstShown, rows: rows, focused: focused })] }), _jsx(Box, { flexDirection: "column", children: footer.map((line, i) => render(line, `f${i}`)) }), showMenu ? (_jsx(Box, { flexDirection: "column", children: matches.slice(menuStart, menuStart + menuRows).map((c, i) => {
                     const selected = menuStart + i === menuRow;
                     return (_jsxs(Text, { wrap: "truncate-end", ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸" : " " }), _jsxs(Text, { color: selected ? C.accent : C.text, bold: selected, children: ["/", c.name] }), c.args && inner >= 56 ? _jsxs(Text, { color: C.dim, children: [" ", c.args] }) : null /* narrow: the description matters more */, _jsxs(Text, { color: C.dim, children: ["  ", c.description] })] }, c.name));
-                }) })) : (_jsx(Text, { wrap: "truncate-end", color: C.dim, children: 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 + 1)) }), _jsx(ChatInput, { value: input, onChange: (text) => focusedNow.current && setInput(text), onSubmit: submit, focus: focused && !(approval && !input), width: inner + 1, history: sent, arrowsTaken: showMenu, placeholder: busy ? (inner >= 44 ? "Enter queues · Alt+Enter sends now · Esc stops" : "Enter queues · Esc stops") : showMenu ? "↑↓ choose · Tab complete · Enter run" : inner >= 44 ? "Ask anything · / for commands · ↑ history" : "Ask anything · / commands" })] }));
+                }) })) : (_jsx(Text, { wrap: "truncate-end", color: C.dim, children: 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 + 1)) }), _jsx(ChatInput, { value: input, onChange: (text) => focusedNow.current && setInput(text), onSubmit: submit, focus: focused && !(approval && !input), width: inner + 1, history: sent, arrowsTaken: showMenu, placeholder: busy ? (inner >= 44 ? (sendNowFirst ? "Enter sends now · Alt+Enter queues · Esc stops" : "Enter queues · Alt+Enter sends now · Esc stops") : sendNowFirst ? "Enter sends now · Esc stops" : "Enter queues · Esc stops") : showMenu ? "↑↓ choose · Tab complete · Enter run" : inner >= 44 ? "Ask anything · / for commands · ↑ history" : "Ask anything · / commands" })] }));
 });

package/dist/src/ui/CodeView.js

@@ -5,6 +5,7 @@ import { SEVERITY_STYLE } from "./ProblemsView.js";
 import { artWork } from "../util/index.js";
 import { foldRanges, highlightLines, markAnsi, sideBySide, sliceAnsi, splitLines, unfoldedLines } from "./text.js";
 import { C, fileIcon, gradient } from "./theme.js";
+import { isFind } from "./keys.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
 /** The current match: a yellow background; the others are shown inverted. */
@@ -12,7 +13,7 @@ const CURRENT_MATCH = ["\x1b[43m\x1b[30m", "\x1b[49m\x1b[39m"];
 /** Columns ←/→ and Shift+wheel move sideways. */
 const SIDE_STEP = 8;
 const EDIT_HINT = "   double-click or e to edit · v diff";
-export const CodeView = memo(function CodeView({ width, height, focused, filePath, content, diff, diffLabel, pending, marked, problems, focusLine, syntaxVersion, diffNote, wheel, scrollTo, onViewport, defineAt, onDefine, tabs, onFinding, findRequest, foldClick, foldAll }) {
+export const CodeView = memo(function CodeView({ showing, width, height, focused, filePath, content, diff, diffLabel, pending, marked, problems, focusLine, syntaxVersion, diffNote, wheel, scrollTo, onViewport, defineAt, onDefine, tabs, onFinding, findRequest, foldClick, foldAll }) {
     const [top, setTop] = useState(0);
     // Columns scrolled sideways (colors are kept: see sliceAnsi).
     const [left, setLeft] = useState(0);
@@ -165,7 +166,7 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
             return setFind((f) => f && { ...f, index: f.index - 1 });
         if (key.backspace || key.delete)
             return setFind((f) => f && { query: f.query.slice(0, -1), index: 0 });
-        if (key.ctrl && input === "f")
+        if (isFind(input, key))
             return;
         if (input && !key.ctrl && !key.meta && input >= " ")
             setFind((f) => f && { query: f.query + input, index: 0 });
@@ -173,7 +174,7 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
     useInput((input, key) => {
         if (find)
             return;
-        if (key.ctrl && input === "f" && !diff)
+        if (isFind(input, key) && !diff)
             return setFind({ query: "", index: 0 });
         if (key.upArrow || input === "k")
             setTop((t) => Math.max(0, Math.min(t, maxTop) - 1));
@@ -216,7 +217,7 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
             return (_jsx(Box, { width: w, children: _jsxs(Text, { wrap: "truncate-end", ...(color ? { color } : { color: C.dim }), children: [String(c.n).padStart(gutter - 1), changed ? side : " ", c.text.slice(left) || " "] }) }));
         };
         const { icon, color } = fileIcon(diff.path);
-        const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", diff.path, "  ", _jsx(Text, { backgroundColor: pending ? C.yellow : C.accent2, color: "black", children: pending ? (diff.isNew ? " NEW FILE " : " PROPOSED ") : ` ${diffLabel.toUpperCase()} ` }), "  ", _jsxs(Text, { color: C.green, children: ["+", added] }), " ", _jsxs(Text, { color: C.red, children: ["-", removed] }), diffNote ? _jsxs(Text, { color: diffNote.startsWith("✓") ? C.green : C.red, children: ["  ", diffNote] }) : null, _jsxs(Text, { color: C.dim, children: [pending ? "   y accept · n reject" : "   n/N next/prev change", scroll] })] }));
+        const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", diff.path, "  ", _jsx(Text, { backgroundColor: pending ? C.yellow : C.accent2, color: C.onBadge, children: pending ? (diff.isNew ? " NEW FILE " : " PROPOSED ") : ` ${diffLabel.toUpperCase()} ` }), "  ", _jsxs(Text, { color: C.green, children: ["+", added] }), " ", _jsxs(Text, { color: C.red, children: ["-", removed] }), diffNote ? _jsxs(Text, { color: diffNote.startsWith("✓") ? C.green : C.red, children: ["  ", diffNote] }) : null, _jsxs(Text, { color: C.dim, children: [pending ? "   y accept · n reject" : "   n/N next/prev change", scroll] })] }));
         return (_jsx(Pane, { title: title, width: width, height: height, focused: focused, ...(pending ? { accent: C.yellow } : {}), children: _jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: diffRows.slice(start, start + rows).map((row, i) => (_jsxs(Box, { flexDirection: "row", children: [cell(row.left, "-", row.changed, half), _jsx(Text, { color: C.dim, children: "\u2502" }), cell(row.right, "+", row.changed, inner - half - 1)] }, start + i))) }), _jsx(Scrollbar, { total: total, top: start, rows: rows, focused: focused })] }) }));
     }
     if (!filePath) {
@@ -238,8 +239,8 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
     const warningCount = problems.filter((d) => d.severity === "warning").length;
     // The edit hint only when it fits: a cut-off hint reads as noise.
     const titleRoom = tabs ? 0 : width - 4 - (3 + filePath.length + (errorCount ? 5 + String(errorCount).length : 0) + (warningCount ? 5 + String(warningCount).length : 0) + scroll.length + (total > rows ? 7 : 0));
-    const title = (_jsxs(_Fragment, { children: [tabs ?? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath] }), errorCount > 0 && _jsxs(Text, { color: C.red, children: ["  \u2716 ", errorCount] }), warningCount > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", warningCount] }), _jsxs(Text, { color: C.dim, children: [scroll, total > rows ? ` (${percent}%)` : "", focused && titleRoom >= EDIT_HINT.length ? EDIT_HINT : ""] })] }));
-    return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: shown.slice(start, start + rows).map((n) => {
+    const title = (_jsxs(_Fragment, { children: [tabs ?? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath] }), showing && _jsxs(_Fragment, { children: ["  ", _jsx(Text, { backgroundColor: C.accent2, color: C.onBadge, bold: true, children: ` ◉ SHOWING ${showing} ` })] }), errorCount > 0 && _jsxs(Text, { color: C.red, children: ["  \u2717 ", errorCount] }), warningCount > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", warningCount] }), _jsxs(Text, { color: C.dim, children: [scroll, total > rows ? ` (${percent}%)` : "", focused && titleRoom >= EDIT_HINT.length ? EDIT_HINT : ""] })] }));
+    return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, ...(showing ? { accent: C.accent2 } : {}), children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: shown.slice(start, start + rows).map((n) => {
                             const line = lines[n - 1] ?? "";
                             const fold = ranges.get(n);
                             const isFolded = fold !== undefined && folded.has(n);

package/dist/src/ui/Editor.js

@@ -4,6 +4,7 @@ import path from "path";
 import { Box, Text, useInput, usePaste } from "ink";
 import { highlightLines, sliceAnsi } from "./text.js";
 import { C, fileIcon } from "./theme.js";
+import { FIND_KEY, isFind } from "./keys.js";
 import { SEVERITY_STYLE } from "./ProblemsView.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
@@ -401,7 +402,7 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                 return find(prompt.text, key.upArrow);
             if (key.backspace || key.delete)
                 return setPrompt({ ...prompt, text: prompt.text.slice(0, -1) });
-            if (key.ctrl && input === "f")
+            if (isFind(input, key))
                 return find(prompt.text);
             if (input && !key.ctrl && !key.meta && (prompt.kind === "find" || /^\d+$/.test(input))) {
                 const text = prompt.text + input;
@@ -433,7 +434,7 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
             return step(undo, redo);
         if (key.ctrl && input === "y")
             return step(redo, undo);
-        if (key.ctrl && input === "f") {
+        if (isFind(input, key)) {
             const word = selectedText(buf);
             return setPrompt({ kind: "find", text: word.includes("\n") ? "" : word });
         }
@@ -631,11 +632,11 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
             ? prompt.kind === "find" ? `Find: ${prompt.text}▏  Enter/↓ next · Shift+Enter/↑ previous · Esc close` : `Go to line: ${prompt.text}▏  Enter go · Esc cancel`
             : flash ?? (cursorProblem
                 ? `${SEVERITY_STYLE[cursorProblem.severity].icon} ${cursorProblem.message} (${cursorProblem.source})`
-                : `Ln ${buf.row + 1}, Col ${buf.col + 1}${sel ? `  (${selectedCount} selected · Ctrl+C copy · Ctrl+X cut)` : ""}${dirty ? "  ● modified" : ""}   Ctrl+F find · Ctrl+/ comment · Esc done`);
+                : `Ln ${buf.row + 1}, Col ${buf.col + 1}${sel ? `  (${selectedCount} selected · Ctrl+C copy · Ctrl+X cut)` : ""}${dirty ? "  ● modified" : ""}   ${FIND_KEY} find · Ctrl+/ comment · Esc done`);
     const statusColor = guideStatus && !confirmExit && !prompt ? (progress < 0 ? C.red : C.accent2) : confirmExit ? C.red : prompt ? C.accent : flash ? C.green : cursorProblem ? SEVERITY_STYLE[cursorProblem.severity].color : C.dim;
     const hoverLines = hover ? hover.split("\n").filter((l) => l.trim()).slice(0, 6) : [];
     const cursorVisible = buf.row >= v.top && buf.row < v.top + rows;
-    return (_jsxs(Pane, { title: _jsxs(_Fragment, { children: [tabs ?? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath, dirty ? _jsx(Text, { color: C.yellow, children: " \u25CF" }) : ""] }), "  ", _jsx(Text, { backgroundColor: C.green, color: "black", children: " \u270E EDITING " }), !cursorVisible ? _jsxs(Text, { color: C.dim, children: ["  cursor on line ", buf.row + 1, " \u00B7 \u2191\u2193 to go back"] }) : null] }), width: width, height: height, focused: focused, accent: C.green, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: width - 3, flexShrink: 0, children: visible.map((line, i) => {
+    return (_jsxs(Pane, { title: _jsxs(_Fragment, { children: [tabs ?? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath, dirty ? _jsx(Text, { color: C.yellow, children: " \u25CF" }) : ""] }), "  ", _jsx(Text, { backgroundColor: C.green, color: C.onBadge, children: " \u270E EDITING " }), !cursorVisible ? _jsxs(Text, { color: C.dim, children: ["  cursor on line ", buf.row + 1, " \u00B7 \u2191\u2193 to go back"] }) : null] }), width: width, height: height, focused: focused, accent: C.green, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: width - 3, flexShrink: 0, children: visible.map((line, i) => {
                             const n = v.top + i;
                             const isCursorLine = n === buf.row;
                             const problem = byLine.get(n + 1)?.[0];

package/dist/src/ui/FileTree.js

@@ -32,7 +32,7 @@ function flatten(expanded) {
     walk(".", 0);
     return nodes;
 }
-export const FileTree = memo(function FileTree({ width, height, focused, openFile, reveal, version, changed, working, git, problemCounts, wheel, scrollTo, click, onOpen, onHover }) {
+export const FileTree = memo(function FileTree({ width, height, focused, openFile, reveal, version, changed, working, showing, git, problemCounts, wheel, scrollTo, click, onOpen, onHover }) {
     const [expanded, setExpanded] = useState(() => new Set(["src"]));
     const [cursor, setCursor] = useState(0);
     // The first row shown. The wheel moves it on its own; the keyboard moves the cursor and the view follows.
@@ -182,11 +182,12 @@ export const FileTree = memo(function FileTree({ width, height, focused, openFil
                                 ? { icon: expanded.has(node.path) ? "▾" : "▸", color: C.accent }
                                 : fileIcon(node.path);
                             const counts = problemCounts.get(node.path);
-                            const problemMark = counts?.errors ? "✖" : counts?.warnings ? "▲" : "";
-                            const marker = problemMark || code || (changed.has(node.path) ? "●" : dirtyDirs.has(node.path) ? "•" : "");
-                            const markerColor = counts?.errors ? C.red : counts?.warnings ? C.yellow : code ? GIT_COLORS[code] ?? C.yellow : changed.has(node.path) ? C.green : C.yellow;
+                            const problemMark = counts?.errors ? "✗" : counts?.warnings ? "▲" : "";
+                            const stops = showing?.get(node.path);
+                            const marker = stops ? `◉${stops.join(",")}` : problemMark || code || (changed.has(node.path) ? "●" : dirtyDirs.has(node.path) ? "•" : "");
+                            const markerColor = stops ? C.accent2 : counts?.errors ? C.red : counts?.warnings ? C.yellow : code ? GIT_COLORS[code] ?? C.yellow : changed.has(node.path) ? C.green : C.yellow;
                             const label = `${"  ".repeat(node.depth)}${icon} ${node.name}`;
-                            const nameColor = isOpen ? C.cyan : counts?.errors ? C.red : code ? GIT_COLORS[code] : node.isDir ? C.text : undefined;
+                            const nameColor = stops ? C.accent2 : isOpen ? C.cyan : counts?.errors ? C.red : code ? GIT_COLORS[code] : node.isDir ? C.text : undefined;
                             const room = Math.max(1, inner - marker.length - 1);
                             const shown = label.length > room ? `${label.slice(0, room - 1)}…` : label.padEnd(room);
                             const iconAt = shown.indexOf(icon);

package/dist/src/ui/GamePanel.js

@@ -119,7 +119,7 @@ export const GamePanel = memo(function GamePanel({ width, height, focused, movin
                         if (view.over && i === Math.floor(FIELD.height / 2)) {
                             const msg = ` ${view.over}${newBest ? " New best!" : ""} `;
                             const left = Math.max(0, Math.floor((FIELD.width - msg.length) / 2));
-                            return _jsxs(Text, { children: [line.slice(0, left), _jsx(Text, { backgroundColor: C.yellow, color: "black", bold: true, children: msg }), line.slice(left + msg.length)] }, i);
+                            return _jsxs(Text, { children: [line.slice(0, left), _jsx(Text, { backgroundColor: C.yellow, color: C.onBadge, bold: true, children: msg }), line.slice(left + msg.length)] }, i);
                         }
                         return _jsx(Row, { line: line, colors: playing.game.colors }, i);
                     }), _jsx(Text, { color: C.dim, children: "─".repeat(FIELD.width) }), _jsx(Text, { color: C.text, wrap: "truncate-end", children: view.status })] })) : (_jsx(Box, { flexDirection: "column", paddingX: 1, height: FIELD.height + 2, children: games.length === 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: C.text, children: "No games yet." }), _jsxs(Text, { color: C.dim, wrap: "wrap", children: ["Add some in settings \u2192 Games", focused ? " (press s)" : "", ": ", GAMES.map((g) => g.title).join(", "), "."] })] })) : (_jsxs(_Fragment, { children: [games.map((g, i) => (_jsxs(Text, { wrap: "truncate-end", ...(i === row && focused ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: i === row ? C.accent2 : C.dim, children: i === row ? "▸ " : "  " }), _jsx(Text, { color: fits(g) ? C.text : C.dim, bold: i === row, children: g.title }), best[g.id] ? _jsxs(Text, { color: C.yellow, children: ["  best ", best[g.id]] }) : null, fits(g) ? null : _jsx(Text, { color: C.dim, children: "  (needs more room)" })] }, g.id))), games[row] ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: C.dim, wrap: "wrap", children: games[row].blurb }), _jsx(Text, { color: C.accent2, wrap: "truncate-end", children: games[row].controls })] })) : null] })) })), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: [" ", hint] })] }));

package/dist/src/ui/Header.js

@@ -2,14 +2,50 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { memo } from "react";
 import path from "path";
 import { Box, Text, useAnimation } from "ink";
-import { C, SPINNER, gradient, ANIMATION_MS } from "./theme.js";
+import { C, gradient, ANIMATION_MS } from "./theme.js";
 import { useTerminalFocused } from "./focus.js";
 import { currentVersion } from "../update/index.js";
 const VERSION = `v${currentVersion()}`;
-export const Header = memo(function Header({ width, branch, changes, model, local, busy, update }) {
+/** What comes before the project (or the workspace tabs): " ◆ NOU v1.2.3  │  ". */
+const LEAD = ` ◆ NOU ${VERSION}  │  `;
+const tabLabel = (t, i) => ` ${i + 1} ${t.name}${t.busy ? " ●" : ""} `;
+/**
+ * Where each workspace tab, and the + that opens one, sits in the header row: for clicks. With one workspace
+ * (not hosted) there's just the project's name and the +.
+ */
+export function headerZones(tabs) {
+    const zones = [];
+    let x = LEAD.length;
+    if (!tabs.length) {
+        x += path.basename(process.cwd()).length + 1;
+    }
+    else {
+        tabs.forEach((t, i) => {
+            const w = tabLabel(t, i).length;
+            zones.push({ from: x, to: x + w, tab: i });
+            x += w + 1;
+        });
+    }
+    zones.push({ from: x, to: x + 3, tab: "new" });
+    return zones;
+}
+/**
+ * The header's right side: the update notice (when there's room), where the model runs and which. Plain
+ * characters only: symbols that are also emoji (☁, ⬆) are drawn two columns wide by some terminals.
+ */
+const rightSide = (width, model, local, update) => ({
+    notice: update && width >= 110 ? `↑ v${update} available · run \`nou update\`  ` : "",
+    badge: ` ${local ? "LOCAL" : "CLOUD"} `,
+    model: ` ${model} `,
+});
+export const Header = memo(function Header({ width, branch, changes, model, local, busy, update, tabs = [] }) {
     // The spinner stops while Nou's window is in the background: nobody sees it, and each frame is a redraw.
     const windowFocused = useTerminalFocused();
     const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!busy && windowFocused });
     const project = path.basename(process.cwd());
-    return (_jsxs(Box, { width: width, justifyContent: "space-between", children: [_jsx(Box, { flexShrink: 1, flexGrow: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate-end", children: [" ", gradient("◆ NOU", busy ? frame : 0).map((g, i) => _jsx(Text, { bold: true, color: g.color, children: g.ch }, i)), _jsxs(Text, { color: C.dim, children: [" ", VERSION] }), _jsx(Text, { color: C.dim, children: "  \u2502  " }), _jsx(Text, { color: C.text, children: project }), branch && (_jsxs(_Fragment, { children: [_jsx(Text, { color: C.dim, children: "  \u2502  " }), _jsxs(Text, { color: C.accent2, children: ["\u2387 ", branch] }), changes > 0 && _jsxs(Text, { color: C.yellow, children: [" \u00B1", changes] })] })), busy && _jsxs(Text, { color: C.accent2, children: ["  ", SPINNER[frame % SPINNER.length], " ", busy] })] }) }), _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate-end", children: [update && width >= 110 && _jsxs(Text, { color: C.green, bold: true, children: ["\u2B06 v", update, " available \u00B7 run `nou update`  "] }), _jsx(Text, { backgroundColor: local ? C.green : C.accent2, color: "black", bold: true, children: ` ${local ? "⌂ LOCAL" : "☁ CLOUD"} ` }), _jsx(Text, { backgroundColor: C.panel, color: C.text, children: ` ${model} ` }), " "] }) })] }));
+    const right = rightSide(width, model, local, update);
+    const rightWidth = right.notice.length + right.badge.length + right.model.length + 1;
+    return (_jsxs(Box, { width: width, justifyContent: "space-between", children: [_jsx(Box, { width: Math.max(0, width - rightWidth - 4), flexShrink: 0, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate-end", children: [" ", gradient("◆ NOU", busy ? frame : 0).map((g, i) => _jsx(Text, { bold: true, color: g.color, children: g.ch }, i)), _jsxs(Text, { color: C.dim, children: [" ", VERSION] }), _jsx(Text, { color: C.dim, children: "  \u2502  " }), tabs.length
+                            ? tabs.map((t, i) => (_jsxs(Text, { children: [_jsx(Text, { ...(t.active ? { backgroundColor: C.panel } : {}), color: t.active ? C.accent : C.text, bold: t.active, children: tabLabel(t, i) }), " "] }, t.id)))
+                            : _jsxs(Text, { color: C.text, children: [project, " "] }), _jsx(Text, { color: C.accent2, children: " + " }), branch && (_jsxs(_Fragment, { children: [_jsx(Text, { color: C.dim, children: "  \u2502  " }), _jsxs(Text, { color: C.accent2, children: ["\u2387 ", branch] }), changes > 0 && _jsxs(Text, { color: C.yellow, children: [" \u00B1", changes] })] }))] }) }), _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate-end", children: [right.notice && _jsx(Text, { color: C.green, bold: true, children: right.notice }), _jsx(Text, { backgroundColor: local ? C.green : C.accent2, color: C.onBadge, bold: true, children: right.badge }), _jsx(Text, { backgroundColor: C.panel, color: C.text, children: right.model }), " "] }) })] }));
 });

package/dist/src/ui/Pane.js

@@ -3,6 +3,6 @@ import { Box, Text } from "ink";
 import { C } from "./theme.js";
 /** A bordered panel with a title row. Content gets `width - 2` columns and `height - 3` rows. */
 export function Pane({ title, width, height, focused, accent, children }) {
-    const color = accent ?? (focused ? C.accent : C.dim);
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, borderStyle: focused || accent ? "round" : "single", borderColor: color, overflow: "hidden", children: [_jsx(Text, { bold: true, color: focused || accent ? color : C.dim, wrap: "truncate-end", children: title }), children] }));
+    const color = accent ?? (focused ? C.accent : C.border);
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, borderStyle: focused || accent ? "round" : "single", borderColor: color, overflow: "hidden", children: [_jsx(Text, { bold: true, color: focused || accent ? color : C.text, wrap: "truncate-end", children: title }), children] }));
 }

package/dist/src/ui/ProblemsView.js

@@ -5,7 +5,7 @@ import { C, SPINNER, fileIcon, ANIMATION_MS } from "./theme.js";
 import { useTerminalFocused } from "./focus.js";
 import { Pane } from "./Pane.js";
 export const SEVERITY_STYLE = {
-    error: { icon: "✖", color: C.red },
+    error: { icon: "✗", color: C.red },
     warning: { icon: "▲", color: C.yellow },
     info: { icon: "ℹ", color: C.accent },
 };
@@ -63,13 +63,13 @@ export function ProblemsView({ width, height, focused, problems, checking, wheel
     const errors = problems.filter((d) => d.severity === "error").length;
     const warnings = problems.filter((d) => d.severity === "warning").length;
     const start = Math.max(0, Math.min(cursor - Math.floor(visibleRows / 2), rows.length - visibleRows));
-    const title = (_jsxs(_Fragment, { children: [" ", _jsxs(Text, { color: C.red, children: ["\u2716 ", errors] }), "  ", _jsxs(Text, { color: C.yellow, children: ["\u25B2 ", warnings] }), "  Problems", checking.length > 0 && _jsxs(Text, { color: C.accent2, children: ["  ", SPINNER[frame % SPINNER.length], " checking ", checking.join(", ")] }), _jsx(Text, { color: C.dim, children: onlyErrors ? "  (errors only)" : "" })] }));
+    const title = (_jsxs(_Fragment, { children: [" ", _jsxs(Text, { color: C.red, children: ["\u2717 ", errors] }), "  ", _jsxs(Text, { color: C.yellow, children: ["\u25B2 ", warnings] }), "  Problems", checking.length > 0 && _jsxs(Text, { color: C.accent2, children: ["  ", SPINNER[frame % SPINNER.length], " checking ", checking.join(", ")] }), _jsx(Text, { color: C.dim, children: onlyErrors ? "  (errors only)" : "" })] }));
     return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, ...(focused ? { accent: C.red } : {}), children: [_jsxs(Box, { flexDirection: "column", height: visibleRows, children: [rows.length === 0 && (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: C.green, children: checking.length ? "Checking…" : "✓ No problems found" }), _jsx(Text, { color: C.dim, children: "Checked by the syntax parser, plus ESLint, TypeScript, Ruff and language servers when your project has them." })] })), rows.slice(start, start + visibleRows).map((row, i) => {
                         const selected = focused && start + i === cursor;
                         const bg = selected ? { backgroundColor: C.panel } : {};
                         if (row.kind === "file") {
                             const { icon, color } = fileIcon(row.file);
-                            return (_jsxs(Text, { wrap: "truncate-end", ...bg, children: [_jsx(Text, { color: color, children: icon }), " ", _jsx(Text, { bold: true, color: C.text, children: row.file }), row.errors > 0 && _jsxs(Text, { color: C.red, children: ["  \u2716 ", row.errors] }), row.warnings > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", row.warnings] })] }, `f${row.file}`));
+                            return (_jsxs(Text, { wrap: "truncate-end", ...bg, children: [_jsx(Text, { color: color, children: icon }), " ", _jsx(Text, { bold: true, color: C.text, children: row.file }), row.errors > 0 && _jsxs(Text, { color: C.red, children: ["  \u2717 ", row.errors] }), row.warnings > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", row.warnings] })] }, `f${row.file}`));
                         }
                         const style = SEVERITY_STYLE[row.d.severity];
                         return (_jsxs(Text, { wrap: "truncate-end", ...bg, children: ["  ", _jsx(Text, { color: style.color, children: style.icon }), _jsxs(Text, { color: C.dim, children: [" ", String(row.d.line).padStart(4), ":", String(row.d.col).padEnd(3), " "] }), _jsx(Text, { ...(selected ? { color: C.text } : {}), children: row.d.message }), _jsxs(Text, { color: C.dim, children: ["  ", row.d.source, row.d.code ? ` ${row.d.code}` : ""] })] }, `${row.d.file}:${row.d.line}:${row.d.col}:${i}`));

package/dist/src/ui/QuickOpen.js

@@ -58,7 +58,7 @@ export function score(file, query) {
     return { score: total - file.length * 0.05, hits };
 }
 /** Ctrl+P: find a file. Start with ">" (or press ?) for every action Nou has, with its shortcut. */
-export function QuickOpen({ width, top, files, recent = [], actions, initialQuery = "", onPick, onRun, onClose }) {
+export function QuickOpen({ width, top, files, recent = [], actions, initialQuery = "", placeholder = "Go to file…  (> for commands)", onPick, onRun, onClose }) {
     const [query, setQuery] = useState(initialQuery);
     const [cursor, setCursor] = useState(0);
     const boxWidth = Math.min(80, Math.max(40, width - 10));
@@ -107,12 +107,17 @@ export function QuickOpen({ width, top, files, recent = [], actions, initialQuer
                             setCursor(0);
                         }, onSubmit: () => {
                             if (commandMode) {
-                                if (found[cursor])
+                                // A number picks that row of a numbered list (/resume's: "1. ...", "2. ...").
+                                const n = /^\s*(\d+)\s*$/.exec(query.slice(1))?.[1];
+                                const numbered = n ? actions.find((a) => a.title.startsWith(`${n}. `)) : undefined;
+                                if (numbered)
+                                    onRun(numbered);
+                                else if (found[cursor])
                                     onRun(found[cursor].action);
                             }
                             else if (results[cursor])
                                 onPick(results[cursor].file);
-                        }, placeholder: "Go to file\u2026  (> for commands)" }), _jsx(Text, { children: " ".repeat(Math.max(0, inner - 4 - Math.max(query.length, 29))) })] }), _jsx(Text, { color: C.dim, children: "─".repeat(inner) }), commandMode && found.length === 0 && _jsx(Text, { color: C.dim, children: pad("  No matching commands") }), commandMode && found.slice(first, first + rowsShown).map((r, i) => {
+                        }, placeholder: placeholder }), _jsx(Text, { children: " ".repeat(Math.max(0, inner - 4 - Math.max(query.length, 29))) })] }), _jsx(Text, { color: C.dim, children: "─".repeat(inner) }), commandMode && found.length === 0 && _jsx(Text, { color: C.dim, children: pad("  No matching commands") }), commandMode && found.slice(first, first + rowsShown).map((r, i) => {
                 const selected = first + i === cursor;
                 const keys = r.action.keys ?? "";
                 const room = inner - 3 - keys.length - 1;

package/dist/src/ui/Settings.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useEffect, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
 import TextInput from "ink-text-input";
-import { AUTO_SAVE, CODE_THEMES, EFFORTS, FOLLOW_SPEEDS } from "../config/index.js";
+import { AUTO_SAVE, CODE_THEMES, UI_THEMES, EFFORT_LABELS, EFFORTS, FOLLOW_SPEEDS } from "../config/index.js";
 import { highlightLines } from "./text.js";
 import { GAMES } from "../games/index.js";
 import { saveCredentials } from "../config/credentials.js";
@@ -19,13 +19,15 @@ export function greet(name: string, times = 2): string {
 }`;
 const TABS = ["Model", "Engine", "Preferences", "Plugins", "Games"];
 const PREFS = [
-    { key: "effort", label: "Reasoning effort", help: "How hard Claude thinks (low → max). Higher is smarter but slower and pricier." },
+    { key: "effort", label: "Speed vs smarts", help: "How hard the model thinks before it answers (Claude, Codex, pi and Nou's engine with Claude)." },
     { key: "followSpeed", label: "Follow mode speed", help: "How long each file Nou reads stays on screen in follow mode (f): slow, normal, fast, or as it happens." },
+    { key: "uiTheme", label: "Nou's colors", help: "For a dark or a light terminal; auto asks the terminal which it is. Applies when Nou next starts." },
     { key: "codeTheme", label: "Code colors", help: "The theme for code. ←/→ to try them; github-light is for light terminals." },
     { 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: "sendNowWhileBusy", label: "Send while Nou works", help: "On: Enter stops Nou and sends your message now (Alt+Enter queues it). Off: Enter queues it for when Nou finishes." },
     { 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 },
@@ -159,6 +161,9 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
             else if (pref.key === "codeTheme") {
                 onChange({ codeTheme: CODE_THEMES[(CODE_THEMES.indexOf(settings.codeTheme) + step + CODE_THEMES.length) % CODE_THEMES.length] });
             }
+            else if (pref.key === "uiTheme") {
+                onChange({ uiTheme: UI_THEMES[(UI_THEMES.indexOf(settings.uiTheme) + step + UI_THEMES.length) % UI_THEMES.length] });
+            }
             else if (pref.key === "autoSave") {
                 onChange({ autoSave: AUTO_SAVE[(AUTO_SAVE.indexOf(settings.autoSave) + step + AUTO_SAVE.length) % AUTO_SAVE.length] });
             }
@@ -208,7 +213,7 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
                                 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(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] }), reason ? _jsxs(Text, { color: C.red, wrap: "wrap", children: ["\u2716 ", reason] }) : null, connecting && provider.connect ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: C.accent2, bold: true, children: ["Connect ", provider.label] }), provider.connect.map((f, i) => {
+                            })] }), _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] }), reason ? _jsxs(Text, { color: C.red, wrap: "wrap", children: ["\u2717 ", reason] }) : null, 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) {
@@ -251,9 +256,11 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
                         const value = settings[pref.key];
                         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: C.text, bold: selected, children: pref.label.padEnd(26) }), pref.key === "codeTheme"
                                             ? _jsxs(Text, { children: [_jsx(Text, { color: C.dim, children: "\u2039 " }), _jsx(Text, { color: C.accent2, bold: true, children: String(value) }), _jsxs(Text, { color: C.dim, children: [" \u203A  ", CODE_THEMES.indexOf(value) + 1, "/", CODE_THEMES.length] })] })
-                                            : pref.key === "effort" || pref.key === "autoSave" || pref.key === "followSpeed"
-                                                ? _jsx(Text, { children: (pref.key === "effort" ? EFFORTS : pref.key === "autoSave" ? AUTO_SAVE : FOLLOW_SPEEDS).map((e) => _jsx(Text, { color: e === value ? C.accent2 : C.dim, bold: e === value, children: e === value ? `[${e}]` : ` ${e} ` }, e)) })
-                                                : toggle(value, pref.warn)] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", pref.help] }), pref.key === "codeTheme" && selected
+                                            : pref.key === "effort"
+                                                ? _jsx(Text, { children: EFFORTS.map((e) => _jsx(Text, { color: e === value ? C.accent2 : C.dim, bold: e === value, children: e === value ? `[${EFFORT_LABELS[e].name}]` : ` ${EFFORT_LABELS[e].name} ` }, e)) })
+                                                : pref.key === "autoSave" || pref.key === "followSpeed" || pref.key === "uiTheme"
+                                                    ? _jsx(Text, { children: (pref.key === "autoSave" ? AUTO_SAVE : pref.key === "uiTheme" ? UI_THEMES : FOLLOW_SPEEDS).map((e) => _jsx(Text, { color: e === value ? C.accent2 : C.dim, bold: e === value, children: e === value ? `[${e}]` : ` ${e} ` }, e)) })
+                                                    : toggle(value, pref.warn)] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", pref.key === "effort" ? `${EFFORT_LABELS[settings.effort].tradeoff}` : pref.help] }), pref.key === "codeTheme" && selected
                                     ? highlightLines("preview.ts", THEME_PREVIEW).map((line, n) => _jsxs(Text, { wrap: "truncate-end", children: ["    ", line] }, n))
                                     : null] }, pref.key));
                     }), prefWindow.last < PREFS.length ? _jsxs(Text, { color: C.dim, children: ["  \u2193 ", PREFS.length - prefWindow.last, " more"] }) : null] }));
@@ -279,7 +286,7 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
                     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.red, wrap: "truncate-end", children: ["    \u2717 ", 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: ["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."] })] }));
     };

package/dist/src/ui/Terminal.js

@@ -8,7 +8,7 @@ const COLORS = { out: C.text, command: C.accent, info: C.dim, error: C.red };
  * what you type goes to it; Ctrl+C stops it. ↑↓ go through what you ran, Ctrl+L clears, Esc leaves.
  * Drag its top border (or Alt+↑/↓) to make it taller or shorter.
  */
-export const Terminal = memo(function Terminal({ shell, version, width, height, focused, wheel, onLeave, onResize }) {
+export const Terminal = memo(function Terminal({ shell, version, width, height, focused, wheel, onLeave, onClose, onResize }) {
     const [input, setInput] = useState("");
     const [history, setHistory] = useState([]);
     const [back, setBack] = useState(-1);
@@ -48,6 +48,12 @@ export const Terminal = memo(function Terminal({ shell, version, width, height,
         if (key.ctrl && typed === "l")
             return shell.clear();
         if (key.return) {
+            // Each command runs in its own shell, so `exit` would end only that one and nothing would seem to
+            // happen: at the prompt it closes the terminal instead.
+            if (!shell.running && /^\s*(exit|logout)(\s+\d+)?\s*$/.test(input)) {
+                setInput("");
+                return onClose();
+            }
             if (!shell.running && input.trim())
                 setHistory((h) => [...h.filter((c) => c !== input.trim()), input.trim()].slice(-100));
             if (shell.running)

package/dist/src/ui/background.js

@@ -0,0 +1,58 @@
+/**
+ * Whether the terminal's background is light or dark, so Nou can pick colors that are readable on it.
+ *
+ * COLORFGBG (set by rxvt, Konsole and others: "foreground;background" as color numbers) answers at once.
+ * Otherwise Nou asks the terminal for its background color (OSC 11, answered by iTerm2, Terminal.app,
+ * kitty, Ghostty, WezTerm, Alacritty, foot, GNOME's and VS Code's terminals and recent Windows Terminal).
+ * A terminal that doesn't answer within `timeoutMs` gets null, and Nou keeps its dark colors.
+ */
+export async function detectBackground(timeoutMs = 150) {
+    const fromEnv = paletteFromColorFgBg(process.env.COLORFGBG);
+    if (fromEnv)
+        return fromEnv;
+    const stdin = process.stdin;
+    if (!stdin.isTTY || !process.stdout.isTTY || typeof stdin.setRawMode !== "function")
+        return null;
+    return new Promise((resolve) => {
+        let reply = "";
+        const wasRaw = stdin.isRaw;
+        const finish = (result) => {
+            clearTimeout(timer);
+            stdin.off("data", onData);
+            stdin.setRawMode(wasRaw);
+            stdin.pause();
+            resolve(result);
+        };
+        const onData = (data) => {
+            reply += data.toString("latin1");
+            const palette = paletteFromOsc11(reply);
+            if (palette)
+                finish(palette);
+        };
+        const timer = setTimeout(() => finish(null), timeoutMs);
+        stdin.setRawMode(true);
+        stdin.resume();
+        stdin.on("data", onData);
+        // ST-terminated (ESC \): the form most terminals answer in kind.
+        process.stdout.write("\x1b]11;?\x1b\\");
+    });
+}
+/** "15;0" (light text on black) → dark; "0;15" → light. The last number is the background's color index. */
+export function paletteFromColorFgBg(value) {
+    const bg = Number(value?.split(";").at(-1));
+    if (!value || !Number.isInteger(bg))
+        return null;
+    // 7 (light gray) and 9-15 (bright colors, white) are light backgrounds; 0-6 and 8 are dark.
+    return bg === 7 || (bg >= 9 && bg <= 15) ? "light" : "dark";
+}
+/** The terminal's answer to OSC 11: ESC ] 11 ; rgb:RRRR/GGGG/BBBB (1-4 hex digits a channel), then BEL or ESC \. */
+export function paletteFromOsc11(reply) {
+    // eslint-disable-next-line no-control-regex -- the reply starts with ESC
+    const m = reply.match(/\x1b\]11;rgba?:([0-9a-f]{1,4})\/([0-9a-f]{1,4})\/([0-9a-f]{1,4})/i);
+    if (!m)
+        return null;
+    const channel = (hex) => parseInt(hex, 16) / (16 ** hex.length - 1);
+    const [r, g, b] = [channel(m[1]), channel(m[2]), channel(m[3])];
+    // Perceived brightness (Rec. 709 weights); above half is a light background.
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b > 0.5 ? "light" : "dark";
+}