nou-cli 0.5.3 → 0.5.6

package/dist/src/ui/Chat.js

@@ -3,13 +3,24 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
 import { statSync } from "fs";
 import path from "path";
-import { closeOpenMarkdown, linkAt, linkFileRefs, renderMarkdown, wrap } from "./text.js";
+import { closeOpenMarkdown, linkAt, linkFileRefs, linkUrls, renderMarkdown, wrap } from "./text.js";
 import { ChatInput, inputHeight } from "./ChatInput.js";
 import { copyToClipboard } from "./clipboard.js";
-import { C, SPINNER } from "./theme.js";
+import { C, SPINNER, ANIMATION_MS } from "./theme.js";
+import { useTerminalFocused } from "./focus.js";
 import { Pane } from "./Pane.js";
 import { matchCommands } from "./commands.js";
 import { Scrollbar, topFor } from "./scroll.js";
+/**
+ * What the agent did between replies (files read, commands run...) folds into one line, like Claude's
+ * "▸ 5 steps": click it (or Ctrl+O for all of them) to see each step. `open` holds the runs shown open.
+ */
+function stepLines(steps, open, live, inner) {
+    const last = steps[steps.length - 1].text.replace(/\s+/g, " ");
+    const summary = `${open ? "▾" : "▸"} ${steps.length} steps${open ? "" : ` · ${live ? "now: " : "last: "}${last}`}`;
+    const head = { text: ` ${summary.length > inner - 4 ? `${summary.slice(0, inner - 5)}…` : summary}`, color: open ? C.accent2 : C.dim, lead: " ⚙", leadColor: C.dim, toggle: steps[0] };
+    return open ? [head, ...steps.flatMap((e) => cachedLines(e, inner).map((l) => (l.lead === " ⚙" ? { ...l, lead: "  " } : l)))] : [head];
+}
 const BAR = "▌ ";
 // Whether a path in a message is a file in the project, remembered so each one is checked once.
 const knownFiles = new Map();
@@ -54,7 +65,7 @@ function entryLines(entry, inner, links = true) {
             ? { icon: "⚙", color: C.dim }
             : 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([{ text: ` ${line}` }], isProjectFile) : [];
+            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 } : {}) });
         });
     }
@@ -71,17 +82,69 @@ function cachedLines(entry, inner) {
     laidOut.set(entry, { inner, lines });
     return lines;
 }
+/**
+ * Where each tab sits in the chat's title row (columns from the pane's inner left edge), and the "+"
+ * that opens a new one: shared by the drawing and the clicks.
+ */
+export function chatTabZones(tabs) {
+    // One tab: just "Chat +", to leave the title row its room.
+    if (tabs.length === 1)
+        return { zones: [{ id: tabs[0].id, from: 3, to: 7 }], plus: 8, width: 9 };
+    let x = 3; // " ◆ "
+    const zones = tabs.map((t) => {
+        const w = tabText(t).length;
+        const zone = { id: t.id, from: x, to: x + w };
+        x += w + 1;
+        return zone;
+    });
+    return { zones, plus: x + 1, width: x + 3 };
+}
+const tabText = (t) => ` ${t.state === "busy" ? "● " : t.state === "waiting" ? "! " : ""}${t.label} `;
 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, queued = [] }) {
-    const [input, setInput] = useState("");
+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 = [] }) {
+    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.
+    const focusedNow = useRef(focused);
+    focusedNow.current = focused;
+    const [menuRow, setMenuRow] = useState(0);
+    /** A new input also puts the command menu back on its first row, in the same render. */
+    const setInput = (text) => {
+        setInputText(text);
+        setMenuRow(0);
+    };
     useEffect(() => {
         if (prefill)
             setInput(prefill.text);
     }, [prefill?.nonce]);
     const [scrollBack, setScrollBack] = useState(0);
-    const { frame } = useAnimation({ interval: 80, isActive: !!busy });
+    // Spinners stop while Nou's window is in the background: nobody sees them, and each frame is a redraw.
+    const windowFocused = useTerminalFocused();
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!busy && windowFocused });
     const inner = width - 3; // minus the borders and the scrollbar
-    const history = useMemo(() => entries.flatMap((e) => cachedLines(e, inner)), [entries, inner]);
+    const [openSteps, setOpenSteps] = useState(new Set());
+    const [allOpen, setAllOpen] = useState(false);
+    const history = useMemo(() => {
+        const out = [];
+        for (let i = 0; i < entries.length;) {
+            if (entries[i].kind !== "tool") {
+                out.push(...cachedLines(entries[i], inner));
+                i++;
+                continue;
+            }
+            // A run of steps: one alone is shown as is, two or more fold into a line.
+            let j = i;
+            while (j < entries.length && entries[j].kind === "tool")
+                j++;
+            const steps = entries.slice(i, j);
+            if (steps.length === 1)
+                out.push(...cachedLines(steps[0], inner));
+            else
+                out.push(...stepLines(steps, allOpen || openSteps.has(steps[0]), !!busy && j === entries.length, inner));
+            i = j;
+        }
+        return out;
+    }, [entries, inner, openSteps, allOpen, !!busy]);
     const lines = useMemo(() => (streaming ? [...history, ...entryLines({ kind: "assistant", text: closeOpenMarkdown(streaming) }, inner, false)] : history), [history, streaming, inner]);
     // At the bottom, new output scrolls into view. Scrolled up to read, the view stays where it is
     // (counted from the bottom, so it moves up by however many lines arrived) until you scroll back down.
@@ -135,8 +198,6 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
     // 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]);
-    const [menuRow, setMenuRow] = useState(0);
-    useEffect(() => setMenuRow(0), [input]);
     const showMenu = matches.length > 0;
     useEffect(() => onMenu?.(showMenu), [showMenu]);
     const menuRows = Math.min(matches.length, Math.max(1, Math.min(7, height - 12)));
@@ -164,6 +225,20 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         if (!click)
             return;
         const line = visible[click.row];
+        const run = line?.toggle;
+        if (run) {
+            setOpenSteps((open) => {
+                const next = new Set(open);
+                if (next.has(run) || allOpen)
+                    next.delete(run);
+                else
+                    next.add(run);
+                return next;
+            });
+            if (allOpen)
+                setAllOpen(false);
+            return;
+        }
         const ref = line?.spans ? linkAt(line.spans, click.col) : null;
         if (ref)
             onOpenRef?.(ref);
@@ -225,13 +300,19 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         else if (typed && typed >= " ")
             setInput(typed); // printable, not a control key
     }, { isActive: focused && !!approval && !input });
-    useInput((_input, key) => {
+    useInput((input, key) => {
         if (key.pageUp || (key.upArrow && key.shift))
             setScrollBack((b) => Math.min(maxBack, Math.min(b, maxBack) + Math.max(1, rows - 2)));
         else if (key.pageDown || (key.downArrow && key.shift))
             setScrollBack((b) => Math.max(0, Math.min(b, maxBack) - Math.max(1, rows - 2)));
         else if (key.ctrl && key.home)
             setScrollBack(maxBack);
+        else if (key.ctrl && input === "o") {
+            // Open every run of steps, or fold them all (the ones opened by a click too).
+            setAllOpen(!allOpen);
+            if (allOpen)
+                setOpenSteps(new Set());
+        }
         else if (key.ctrl && key.end)
             setScrollBack(0);
     }, { isActive: focused });
@@ -262,19 +343,22 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
                 ? line.spans.map((span, i) => (_jsx(Text, { bold: !!span.bold || !!line.bold, italic: !!span.italic, dimColor: !!span.dim && !span.link, underline: !!span.link, ...(span.link ? { color: C.cyan } : 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", flash ? _jsxs(Text, { color: C.green, bold: true, children: ["  ", flash] }) : back
+    const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.accent2, children: "\u25C6" }), " ", tabs && tabs.items.length > 1 ? (_jsxs(_Fragment, { children: [tabs.items.map((t) => (_jsxs(Text, { children: [_jsx(Text, { ...(t.id === tabs.active ? { backgroundColor: C.panel, color: C.text, bold: true } : { color: t.state === "waiting" ? C.yellow : C.dim }), children: tabText(t) }), " "] }, t.id))), _jsx(Text, { color: C.accent2, bold: true, children: " + " })] })) : _jsxs(_Fragment, { children: ["Chat", tabs ? _jsx(Text, { color: C.accent2, bold: true, children: " +" }) : null] }), flash ? _jsxs(Text, { color: C.green, bold: true, children: ["  ", flash] }) : back
                 ? unread
                     ? _jsxs(Text, { color: C.green, bold: true, children: ["  \u2193 ", unread, " new lines below", _jsx(Text, { color: C.dim, children: " \u00B7 PgDn / wheel / Ctrl+End" })] })
                     : _jsxs(Text, { color: C.yellow, children: ["  \u2191 scrolled ", back, " lines", _jsx(Text, { color: C.dim, children: " \u00B7 PgDn / wheel / Ctrl+End" })] })
                 : maxBack > 0 ? _jsx(Text, { color: C.dim, children: "  PgUp / wheel to scroll" }) : null] }));
-    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: 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." })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { children: visible.map((line, i) => _jsx(Text, { color: line.leadColor ?? C.dim, children: `${line.lead ?? "  "}${i < visible.length - 1 ? "\n" : ""}` }, i)) }) }), _jsx(Box, { flexDirection: "column", width: inner - 2, flexShrink: 0, children: visible.map((line, i) => {
-                                        const range = selectedIn(firstShown + i);
-                                        if (!range)
-                                            return render(line, firstShown + i, false);
-                                        const t = lineText(line) || " ";
-                                        return (_jsxs(Text, { wrap: "truncate-end", color: C.text, children: [t.slice(0, range[0]), _jsx(Text, { inverse: true, children: t.slice(range[0], range[1]) || " " }), t.slice(range[1])] }, firstShown + i));
-                                    }) })] })) }), _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) => {
+    // The messages, rebuilt only when they or the scroll position change: typing, the context chip and the
+    // spinner re-render the chat without touching its (often hundreds of) lines.
+    const messages = useMemo(() => (_jsx(_Fragment, { 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." })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { children: visible.map((line, i) => _jsx(Text, { color: line.leadColor ?? C.dim, children: `${line.lead ?? "  "}${i < visible.length - 1 ? "\n" : ""}` }, i)) }) }), _jsx(Box, { flexDirection: "column", width: inner - 2, flexShrink: 0, children: visible.map((line, i) => {
+                        const range = selectedIn(firstShown + i);
+                        if (!range)
+                            return render(line, firstShown + i, false);
+                        const t = lineText(line) || " ";
+                        return (_jsxs(Text, { wrap: "truncate-end", color: C.text, children: [t.slice(0, range[0]), _jsx(Text, { inverse: true, children: t.slice(range[0], range[1]) || " " }), t.slice(range[1])] }, firstShown + i));
+                    }) })] })) })), [lines, firstShown, visible.length, selection, inner, empty]);
+    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: setInput, 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 ? "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" })] }));
 });

package/dist/src/ui/CodeView.js

@@ -3,7 +3,7 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { SEVERITY_STYLE } from "./ProblemsView.js";
 import { artWork } from "../util/index.js";
-import { highlightLines, markAnsi, sideBySide, sliceAnsi, splitLines } from "./text.js";
+import { foldRanges, highlightLines, markAnsi, sideBySide, sliceAnsi, splitLines, unfoldedLines } from "./text.js";
 import { C, fileIcon, gradient } from "./theme.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
@@ -12,7 +12,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 }) {
+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 }) {
     const [top, setTop] = useState(0);
     // Columns scrolled sideways (colors are kept: see sliceAnsi).
     const [left, setLeft] = useState(0);
@@ -37,18 +37,39 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
         return map;
     }, [problems]);
     const diffRows = useMemo(() => (diff ? sideBySide(diff.before, diff.after) : []), [diff]);
-    const total = diff ? diffRows.length : lines.length;
+    // Folding: regions from indentation, the ones folded, and the file lines left showing (rows map to these).
+    const ranges = useMemo(() => (filePath && !diff ? foldRanges(content) : new Map()), [filePath, content, !!diff]);
+    const [folded, setFolded] = useState(new Set());
+    useEffect(() => setFolded(new Set()), [filePath]);
+    const shown = useMemo(() => unfoldedLines(lines.length, ranges, folded), [lines.length, ranges, folded]);
+    /** The row a file line is on (a folded-away line: its fold's row). */
+    const rowOf = (line, list = shown) => {
+        let row = 0;
+        while (row + 1 < list.length && list[row + 1] <= line)
+            row++;
+        return row;
+    };
+    /** Opens any fold hiding `line`, and returns the rows with it open. */
+    const reveal = (line) => {
+        const hiding = [...folded].filter((s) => s < line && (ranges.get(s) ?? 0) >= line);
+        if (!hiding.length)
+            return shown;
+        const next = new Set([...folded].filter((s) => !hiding.includes(s)));
+        setFolded(next);
+        return unfoldedLines(lines.length, ranges, next);
+    };
+    const total = diff ? diffRows.length : shown.length;
     // Jump to the first change whenever a new file or diff is shown.
     useEffect(() => {
         const first = diff
             ? diffRows.findIndex((r) => r.changed)
-            : marked.size ? Math.min(...marked) - 1 : 0;
+            : marked.size ? rowOf(Math.min(...marked)) : 0;
         setTop(Math.max(0, first - 3));
         setLeft(0);
     }, [filePath, diff, diffRows, marked]);
     useEffect(() => {
         if (focusLine && !diff)
-            setTop(Math.max(0, focusLine.line - Math.floor(rows / 3)));
+            setTop(Math.max(0, rowOf(focusLine.line, reveal(focusLine.line)) + 1 - Math.floor(rows / 3)));
     }, [focusLine]);
     const maxTop = Math.max(0, total - rows);
     const start = Math.min(top, maxTop);
@@ -70,8 +91,10 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
     useEffect(() => {
         if (!current)
             return;
-        if (current.line < start || current.line >= start + rows)
-            setTop(Math.max(0, current.line - Math.floor(rows / 3)));
+        const list = reveal(current.line + 1);
+        const at = rowOf(current.line + 1, list);
+        if (at < start || at >= start + rows)
+            setTop(Math.max(0, at - Math.floor(rows / 3)));
         const room = inner - String(lines.length).length - 2;
         if (current.col < left || current.col + (find?.query.length ?? 0) > left + room)
             setLeft(Math.max(0, current.col - Math.floor(room / 3)));
@@ -90,22 +113,45 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
             setTop(topFor(scrollTo.fraction, total, rows));
     }, [scrollTo?.nonce]);
     useEffect(() => {
-        if (filePath && !diff)
-            onViewport(start + 1, Math.min(total, start + rows));
-    }, [filePath, diff, start, rows, total]);
+        if (filePath && !diff) {
+            const onScreen = shown.slice(start, start + rows);
+            onViewport(onScreen[0] ?? 1, onScreen[onScreen.length - 1] ?? 1, onScreen);
+        }
+    }, [filePath, diff, start, rows, total, shown]);
+    useEffect(() => {
+        if (!foldClick || diff)
+            return;
+        const n = shown[start + foldClick.row];
+        if (n === undefined || !ranges.has(n))
+            return;
+        setFolded((f) => {
+            const next = new Set(f);
+            if (next.has(n))
+                next.delete(n);
+            else
+                next.add(n);
+            return next;
+        });
+    }, [foldClick?.nonce]);
+    useEffect(() => {
+        if (foldAll && !diff)
+            setFolded(foldAll.fold ? new Set(ranges.keys()) : new Set());
+    }, [foldAll?.nonce]);
     useEffect(() => {
         if (!defineAt || diff || !filePath)
             return;
-        const n = start + defineAt.row + 1;
+        const n = shown[start + defineAt.row];
+        if (n === undefined)
+            return;
         const raw = content.replace(/\r\n/g, "\n").split("\n")[n - 1];
         if (raw === undefined)
             return;
         // Screen column to the file's own column: tabs are shown as two spaces.
-        const want = defineAt.x - (String(lines.length).length + 1) + left;
-        let shown = 0;
+        const want = defineAt.x - (String(lines.length).length + 2) + left;
+        let cells = 0;
         let col = 0;
-        while (col < raw.length && shown + (raw[col] === "\t" ? 2 : 1) <= want)
-            shown += raw[col++] === "\t" ? 2 : 1;
+        while (col < raw.length && cells + (raw[col] === "\t" ? 2 : 1) <= want)
+            cells += raw[col++] === "\t" ? 2 : 1;
         onDefine?.(n, col + 1);
     }, [defineAt?.nonce]);
     useInput((input, key) => {
@@ -141,6 +187,9 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
             setTop(0);
         else if (input === "G" || key.end)
             setTop(maxTop);
+        // z: fold everything, or (when it already is) open everything.
+        else if (input === "z" && !diff && ranges.size)
+            setFolded([...ranges.keys()].every((k) => folded.has(k)) ? new Set() : new Set(ranges.keys()));
         else if (key.leftArrow || input === "h")
             setLeft((l) => Math.max(0, l - SIDE_STEP));
         else if (key.rightArrow || input === "l")
@@ -190,14 +239,16 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
     // 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: lines.slice(start, start + rows).map((line, i) => {
-                            const n = start + i + 1;
+    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 line = lines[n - 1] ?? "";
+                            const fold = ranges.get(n);
+                            const isFolded = fold !== undefined && folded.has(n);
                             const isFound = !!found && n >= found.from && n <= found.to;
                             const isMarked = marked.has(n);
                             const here = problemsByLine.get(n);
                             const worst = here?.[0];
                             const style = worst ? SEVERITY_STYLE[worst.severity] : null;
-                            return (_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: style?.color ?? (isMarked ? C.green : C.dim), children: String(n).padStart(gutter) }), style ? _jsx(Text, { color: style.color, children: style.icon }) : isFound ? _jsx(Text, { color: C.cyan, bold: true, children: "\u258C" }) : _jsx(Text, { color: isMarked ? C.green : C.dim, children: isMarked ? "▎" : " " }), (() => {
+                            return (_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: style?.color ?? (isMarked ? C.green : C.dim), children: String(n).padStart(gutter) }), style ? _jsx(Text, { color: style.color, children: style.icon }) : isFound ? _jsx(Text, { color: C.cyan, bold: true, children: "\u258C" }) : _jsx(Text, { color: isMarked ? C.green : C.dim, children: isMarked ? "▎" : " " }), _jsx(Text, { color: isFolded ? C.accent2 : C.dim, children: fold === undefined ? " " : isFolded ? "▸" : "▾" }), (() => {
                                         let text = line;
                                         if (find?.query) {
                                             for (const m of matches) {
@@ -209,6 +260,6 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
                                         }
                                         text = (left ? sliceAnsi(text, left) : text) || " ";
                                         return isFound ? _jsx(Text, { backgroundColor: C.panel, children: text }) : text;
-                                    })(), worst && style ? _jsxs(Text, { color: style.color, dimColor: true, children: ["   ", style.icon, " ", worst.message, here.length > 1 ? ` (+${here.length - 1})` : ""] }) : null] }, n));
+                                    })(), isFolded ? _jsx(Text, { color: C.accent2, backgroundColor: C.panel, children: ` ⋯ ${fold - n} lines ` }) : null, worst && style ? _jsxs(Text, { color: style.color, dimColor: true, children: ["   ", style.icon, " ", worst.message, here.length > 1 ? ` (+${here.length - 1})` : ""] }) : null] }, n));
                         }) }), _jsx(Scrollbar, { total: total, top: start, rows: rows, focused: focused })] }), find ? (_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: C.accent2, bold: true, children: " \u2315 " }), _jsx(Text, { backgroundColor: C.panel, children: find.query }), _jsx(Text, { inverse: true, children: " " }), _jsxs(Text, { color: find.query && !matches.length ? C.red : C.dim, children: ["  ", find.query ? (matches.length ? `${matches.indexOf(current) + 1}/${matches.length}${matches.length >= 10_000 ? "+" : ""}` : "no matches") : "type to find", "  ", "Enter/\u2193 next \u00B7 \u2191 previous \u00B7 Esc close"] })] })) : null] }));
 });

package/dist/src/ui/Editor.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo, useEffect, useMemo, useRef, useState } from "react";
 import path from "path";
 import { Box, Text, useInput, usePaste } from "ink";
@@ -8,6 +8,7 @@ import { SEVERITY_STYLE } from "./ProblemsView.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
 import { copyToClipboard, readClipboard } from "./clipboard.js";
+import { guideProgress } from "../guide/index.js";
 const TAB = "  ";
 const expand = (s) => s.replace(/\t/g, TAB);
 /** Screen column of buffer column `col` on `line` (tabs take two cells). */
@@ -87,13 +88,24 @@ const LINE_COMMENTS = {
     ".toml": "#", ".r": "#", ".pl": "#", ".ex": "#", ".exs": "#", ".dockerfile": "#", ".sql": "--", ".lua": "--", ".hs": "--",
 };
 const commentFor = (file) => LINE_COMMENTS[path.extname(file).toLowerCase()] ?? (path.basename(file).toLowerCase() === "dockerfile" ? "#" : null);
+/** A line without the cursor or a selection: kept as is while you type on other lines. */
+const PlainRow = memo(function PlainRow({ num, numColor, text }) {
+    return _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: numColor, children: num }), text || " "] });
+});
 /** A text editor: arrows and the mouse to move, Shift to select, Ctrl+C/X/V clipboard, Ctrl+S save, Ctrl+Z undo, Esc leave. */
-export const Editor = memo(function Editor({ width, height, focused, filePath, initial, baseline, startLine, startCol, problems, autoSave, syntaxVersion, wheel, scrollTo, mouse, onSave, onExit, onState, onHover, onDefinition, tabs }) {
+export const Editor = memo(function Editor({ width, height, focused, filePath, initial, baseline, startLine, startCol, problems, autoSave, syntaxVersion, wheel, scrollTo, mouse, onSave, onExit, onState, onHover, onDefinition, tabs, guide, onGuideDone }) {
     const eol = useMemo(() => (baseline.includes("\r\n") ? "\r\n" : "\n"), [baseline]);
     const indentUnit = useMemo(() => (/^\t/m.test(initial) ? "\t" : "  "), [initial]);
     const comment = useMemo(() => commentFor(filePath), [filePath]);
     const [buf, setBuf] = useState(() => {
         const lines = initial.replace(/\r\n/g, "\n").split("\n");
+        if (guide) {
+            // A fresh line for the guided code, indented like its first line.
+            const row = Math.max(0, Math.min(lines.length, guide.row));
+            const indent = guide.code.match(/^[ \t]*/)[0];
+            lines.splice(row, 0, indent);
+            return { lines, row, col: indent.length, anchor: null };
+        }
         const row = Math.max(0, Math.min(lines.length - 1, (startLine ?? 1) - 1));
         const col = startCol ? Math.min(lines[row].length, startCol - 1) : lines[row].match(/^\s*/)[0].length;
         return { lines, row, col, anchor: null };
@@ -517,6 +529,12 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
             }
             return insert(`\n${indent}${opens ? indentUnit : ""}`);
         }
+        if (key.tab && !key.shift && !hasSelection && guide && ghost) {
+            // Guided: Tab types the rest of the line for you (and the next line's indentation).
+            const end = ghost.indexOf("\n");
+            const chunk = end < 0 ? ghost : ghost.slice(0, end + 1) + ghost.slice(end + 1).match(/^[ \t]*/)[0];
+            return insert(chunk);
+        }
         if (key.tab) {
             // With a selection, or Shift+Tab: indent or outdent whole lines.
             if (key.shift)
@@ -589,16 +607,32 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
         return map;
     }, [problems]);
     const sel = selection(buf);
+    // Guided typing: how much of the step's code is typed (from its line's start to the cursor).
+    const guideRow = guide ? Math.max(0, Math.min(buf.lines.length - 1, guide.row)) : -1;
+    const typed = guide && (buf.row > guideRow || (buf.row === guideRow)) ? [...buf.lines.slice(guideRow, buf.row), buf.lines[buf.row].slice(0, buf.col)].join("\n") : null;
+    const progress = guide && typed !== null ? guideProgress(typed, guide.code) : -1;
+    const ghost = guide && progress >= 0 ? guide.code.slice(progress) : "";
+    const guideDone = useRef(false);
+    useEffect(() => {
+        if (guide && progress === guide.code.length && !guideDone.current) {
+            guideDone.current = true;
+            onGuideDone?.();
+        }
+    }, [progress]);
     const cursorProblem = byLine.get(buf.row + 1)?.[0];
     const selectedCount = sel ? selectedText(buf).length : 0;
-    const status = confirmExit
+    const guideStatus = !guide ? null
+        : progress < 0 ? "Not quite: that doesn't match the step's code. Backspace and try again (the dim text shows what goes here)."
+            : ghost ? `Type the dim text${ghost.includes("\n") ? ` (${ghost.split("\n").length} lines to go)` : ""} · Tab fills in the rest of the line · Esc stop`
+                : "✓ Step done";
+    const status = guideStatus && !confirmExit && !prompt ? guideStatus : confirmExit
         ? "Unsaved changes! Ctrl+S save & close · Esc discard · any key keep editing"
         : prompt
             ? 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`);
-    const statusColor = confirmExit ? C.red : prompt ? C.accent : flash ? C.green : cursorProblem ? SEVERITY_STYLE[cursorProblem.severity].color : C.dim;
+    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) => {
@@ -609,7 +643,7 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                             const num = (_jsxs(Text, { color: mark?.color ?? (isCursorLine ? C.green : C.dim), children: [String(n + 1).padStart(gutter - 2), mark ? ` ${mark.icon}` : isCursorLine ? " ▸" : "  "] }));
                             const inSelection = sel && n >= sel.start.row && n <= sel.end.row;
                             if (!isCursorLine && !inSelection) {
-                                return _jsxs(Text, { wrap: "truncate-end", children: [num, colored[i] || " "] }, n);
+                                return _jsx(PlainRow, { num: `${String(n + 1).padStart(gutter - 2)}${mark ? ` ${mark.icon}` : "  "}`, numColor: mark?.color ?? C.dim, text: colored[i] ?? "" }, n);
                             }
                             // Lines with the cursor or a selection show plain text, so both can be drawn exactly.
                             const shown = expand(line).slice(v.left, v.left + textWidth);
@@ -626,8 +660,11 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                                 else
                                     cells.push(cell);
                             }
+                            // The code still to type, dim, from the cursor to the end of its line (only past the line's text).
+                            const ghostLine = isCursorLine && ghost && buf.col >= line.length ? ghost.split("\n")[0] : "";
+                            const ghostMore = isCursorLine && ghost && buf.col >= line.length ? ghost.split("\n").length - 1 : 0;
                             return (_jsxs(Text, { wrap: "truncate-end", children: [num, cells.map((c, j) => c.cursor
-                                        ? _jsx(Text, { inverse: true, color: C.green, children: c.text }, j)
-                                        : _jsx(Text, { color: C.text, ...(c.selected ? { backgroundColor: "#364a82" } : {}), children: c.text }, j))] }, n));
+                                        ? _jsx(Text, { inverse: true, color: C.green, children: ghostLine ? ghostLine[0] : c.text }, j)
+                                        : _jsx(Text, { color: C.text, ...(c.selected ? { backgroundColor: "#364a82" } : {}), children: c.text }, j)), ghostLine.length > 1 ? _jsx(Text, { color: C.dim, italic: true, children: expand(ghostLine.slice(1)) }) : null, ghostMore ? _jsxs(Text, { color: C.accent2, children: [ghostLine ? "  " : "", "\u23CE", ghostMore > 1 ? ` +${ghostMore - 1} line${ghostMore > 2 ? "s" : ""}` : ""] }) : null] }, n));
                         }) }), _jsx(Scrollbar, { total: buf.lines.length, top: v.top, rows: rows, focused: focused })] }), 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

@@ -4,7 +4,8 @@ import { readdirSync } from "fs";
 import path from "path";
 import { Box, Text, useAnimation, useInput } from "ink";
 import { IGNORED } from "../commands/index.js";
-import { C, GIT_COLORS, fileIcon, gradient } from "./theme.js";
+import { C, GIT_COLORS, fileIcon, gradient, ANIMATION_MS } from "./theme.js";
+import { useTerminalFocused } from "./focus.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
 function listDir(dir) {
@@ -167,7 +168,8 @@ export const FileTree = memo(function FileTree({ width, height, focused, openFil
         else
             onOpen(node.path);
     }, [click?.nonce]);
-    const { frame } = useAnimation({ interval: 120, isActive: !!working?.size });
+    const windowFocused = useTerminalFocused();
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!working?.size && windowFocused });
     const inner = width - 3; // minus the borders and the scrollbar
     const title = changesOnly
         ? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.yellow, children: "\u00B1" }), " Changes ", _jsxs(Text, { color: C.dim, children: ["(", nodes.length, ")  c: all files"] })] })

package/dist/src/ui/GamePanel.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { memo, useEffect, useRef, useState } from "react";
+import { Component, memo, useEffect, useRef, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { GAMES, gameById } from "../games/index.js";
 import { C } from "./theme.js";
@@ -23,15 +23,33 @@ function Row({ line, colors }) {
  * A panel for little games, docked under a pane (drag its title to another pane; × closes it). The app gives it
  * the keyboard while it's focused; a game only runs while it has the keyboard, so it pauses as you leave.
  */
-export const GamePanel = memo(function GamePanel({ width, height, focused, moving, installed, onLeave, onOpenSettings }) {
-    const FIELD = { width: Math.max(10, width - 4), height: Math.max(3, height - 6) };
+/**
+ * Keeps a game that throws from taking Nou down with it: the panel says so, and you can pick another.
+ */
+export class GameGuard extends Component {
+    state = { error: null };
+    static getDerivedStateFromError(error) {
+        return { error: error instanceof Error ? error.message : String(error) };
+    }
+    render() {
+        if (!this.state.error)
+            return this.props.children;
+        return (_jsxs(Box, { borderStyle: "round", borderColor: C.red, flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: C.red, children: ["The game stopped: ", this.state.error.slice(0, 80)] }), _jsx(Text, { color: C.dim, children: "Close the panel (\u00D7) and open it again with /games." })] }));
+    }
+}
+export const GamePanel = memo(function GamePanel({ width, height, focused, moving, installed, best = {}, onScore, onLeave, onOpenSettings }) {
+    const FIELD = { width: Math.max(0, width - 4), height: Math.max(0, height - 6) };
+    const fits = (g) => FIELD.width >= g.minWidth && FIELD.height >= g.minHeight;
     const games = installed.map(gameById).filter((g) => !!g);
     const [row, setRow] = useState(0);
     const [playing, setPlaying] = useState(null);
     const [paused, setPaused] = useState(false);
     const inputs = useRef([]);
-    const view = playing ? playing.game.view(playing.state) : null;
-    const running = !!playing && focused && !paused && !view?.over;
+    // A game that doesn't fit the panel any more (it was made smaller) waits, saying how much room it needs.
+    const tooSmall = !!playing && !fits(playing.game);
+    const view = playing && !tooSmall ? playing.game.view(playing.state) : null;
+    const running = !!playing && !tooSmall && focused && !paused && !view?.over;
+    const tickMs = playing ? playing.game.speed?.(playing.state) ?? playing.game.tickMs : 100;
     useEffect(() => {
         if (!running)
             return;
@@ -39,15 +57,25 @@ export const GamePanel = memo(function GamePanel({ width, height, focused, movin
             const pressed = inputs.current;
             inputs.current = [];
             setPlaying((p) => (p ? { ...p, state: p.game.tick(p.state, pressed) } : p));
-        }, playing.game.tickMs);
+        }, tickMs);
         return () => clearInterval(timer);
-    }, [running, playing?.game]);
-    // A different size (moved to another pane, or the window changed) starts the game over at that size.
+    }, [running, playing?.game, tickMs]);
+    // A different size (moved to another pane, or the window changed) starts the game over at that size,
+    // once it fits.
     useEffect(() => {
-        if (playing)
+        if (playing && fits(playing.game))
             setPlaying({ game: playing.game, state: playing.game.create(FIELD.width, FIELD.height) });
     }, [FIELD.width, FIELD.height]);
+    // A finished game's score goes into the best scores.
+    const final = view?.over ? view.score ?? 0 : null;
+    const newBest = final !== null && playing !== null && final > (best[playing.game.id] ?? 0);
+    useEffect(() => {
+        if (newBest && playing)
+            onScore?.(playing.game.id, final);
+    }, [newBest]);
     const start = (game) => {
+        if (!fits(game))
+            return;
         inputs.current = [];
         setPaused(false);
         setPlaying({ game, state: game.create(FIELD.width, FIELD.height) });
@@ -75,25 +103,25 @@ export const GamePanel = memo(function GamePanel({ width, height, focused, movin
         }
         if (input === " " || input === "p")
             return setPaused((p) => !p);
-        const pressed = key.upArrow ? "up" : key.downArrow ? "down" : key.leftArrow ? "left" : key.rightArrow ? "right" : KEYS[input];
+        const pressed = key.return ? "action" : key.upArrow ? "up" : key.downArrow ? "down" : key.leftArrow ? "left" : key.rightArrow ? "right" : KEYS[input];
         if (pressed)
             inputs.current.push(pressed);
     }, { isActive: focused });
     const color = focused || moving ? C.accent2 : C.dim;
     const inner = width - 2;
-    const title = moving ? " ✦ Drop it on a pane: files, code or chat" : playing ? ` ✦ ${playing.game.title}  ⠿ drag to move` : " ✦ Games  ⠿ drag to move";
+    const title = moving ? " ✦ Drop it on a pane: files, code or chat" : `${playing ? ` ✦ ${playing.game.title}` : " ✦ Games"}  ⠿ drag to move · top edge resizes`;
     // The title row: the name and the drag handle, and × (close) at the right.
     const head = title.length > inner - 3 ? `${title.slice(0, inner - 4)}…` : title.padEnd(inner - 3);
     const hint = !focused ? "click to play" : playing ? (view?.over ? "Enter again · q games · Esc leave" : `${paused ? "PAUSED · " : ""}Space pause · q games · Esc leave`) : "↑↓ choose · Enter play · Esc leave";
     const small = width < GAME_PANEL.minWidth || height < GAME_PANEL.minHeight;
-    return (_jsxs(Box, { width: width, height: height, flexDirection: "column", borderStyle: "round", borderColor: color, overflow: "hidden", children: [_jsxs(Text, { backgroundColor: C.panel, wrap: "truncate-end", children: [_jsx(Text, { color: color, bold: true, children: head }), _jsx(Text, { color: C.text, bold: true, children: " \u00D7 " })] }), small ? (_jsx(Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: _jsx(Text, { color: C.dim, wrap: "wrap", children: "Too small here: drag me to a bigger pane, or make this one wider." }) })) : null, small ? null : playing && view ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: FIELD.height + 2, children: [view.lines.map((line, i) => {
+    return (_jsxs(Box, { width: width, height: height, flexDirection: "column", borderStyle: "round", borderColor: color, overflow: "hidden", children: [_jsxs(Text, { backgroundColor: C.panel, wrap: "truncate-end", children: [_jsx(Text, { color: color, bold: true, children: head }), _jsx(Text, { color: C.text, bold: true, children: " \u00D7 " })] }), small ? (_jsx(Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: _jsx(Text, { color: C.dim, wrap: "wrap", children: "Too small here: drag me to a bigger pane, or make this one wider." }) })) : null, small ? null : playing && tooSmall ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [_jsxs(Text, { color: C.yellow, wrap: "wrap", children: [playing.game.title, " needs more room: a field of ", playing.game.minWidth, "\u00D7", playing.game.minHeight, ", and this one is ", FIELD.width, "\u00D7", FIELD.height, "."] }), _jsx(Text, { color: C.dim, wrap: "wrap", children: "Drag the top edge up, move the panel to a wider pane, or q for another game." })] })) : playing && view ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: FIELD.height + 2, children: [view.lines.map((line, i) => {
                         // The end-of-game message goes over the middle of the field.
                         if (view.over && i === Math.floor(FIELD.height / 2)) {
-                            const msg = ` ${view.over} `;
+                            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 _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)" : "", ": Pong, Snake and Breakout."] })] })) : games.map((g, i) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { ...(i === row && focused ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: i === row ? C.accent2 : C.dim, children: i === row ? "▸ " : "  " }), _jsx(Text, { color: C.text, bold: i === row, children: g.title }), _jsxs(Text, { color: C.dim, children: ["  ", g.controls] })] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", g.blurb] })] }, g.id))) })), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: [" ", hint] })] }));
+                    }), _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] })] }));
 });
 export { GAMES };