nou-cli 0.5.6 → 0.5.10

package/dist/src/ui/App.js

@@ -13,7 +13,7 @@ import { ENGINES, createEngine, engineInfo, installEngine, isEngineId, isInstall
 import { harness, problemsIntroduced } from "../agent/harness.js";
 import { describe, providers, resolveModel, saveModel, setupProblem } from "../providers/index.js";
 import { sameModel } from "../providers/ollama.js";
-import { FOLLOW_SPEEDS, isTrustedFolder, loadSettings, saveSettings } from "../config/index.js";
+import { EFFORT_LABELS, EFFORTS, FOLLOW_SPEEDS, effortFrom, isTrustedFolder, loadSettings, saveSettings } from "../config/index.js";
 import { branch as gitBranch, diffAgainstHead, isRepo, sameStatus, status as gitStatus, statusAsync as gitStatusAsync } from "../git/index.js";
 import { BUILTIN_PLUGINS, addStarter, discoverPlugins, isEnabled, loadPlugin, scaffoldPlugin, starterPlugins, trustPatch, trustState } from "../plugins/index.js";
 import { DiagnosticsManager, formatDiagnostic, newProblems } from "../diagnostics/index.js";
@@ -26,21 +26,23 @@ import { changedLines, lineCounts, loadFallbackHighlighter, splitLines } from ".
 import { findDefinition, wordAt } from "./definition.js";
 import { ProblemsView } from "./ProblemsView.js";
 import { useFocusReporting, useTerminalFocused } from "./focus.js";
-import { useMouse } from "./mouse.js";
-import { C } from "./theme.js";
+import { ENABLE as MOUSE_ON, useMouse } from "./mouse.js";
+import { connectToHost, isHosted, reopenAsWorkspaces, sendToHost, useWorkspaceTabs, workspaceTabs } from "../workspaces/client.js";
+import { PTY_PACKAGE, workspaceFolder } from "../workspaces/host.js";
+import { C, palette } from "./theme.js";
 import { FileTree } from "./FileTree.js";
 import { CodeView } from "./CodeView.js";
 import { Editor } from "./Editor.js";
-import { SLASH_COMMANDS, runsWhileBusy } from "./commands.js";
+import { SLASH_COMMANDS, closestCommand, onlyChangesScreen, runsWhileBusy } from "./commands.js";
 import { WHEEL_STEP } from "./scroll.js";
 import { Chat, chatTabZones } from "./Chat.js";
 import { copyToClipboard, openInBrowser } from "./clipboard.js";
-import { Header } from "./Header.js";
+import { Header, headerZones } from "./Header.js";
 import { Tabs, layoutTabs } from "./Tabs.js";
 import { GAME_PANEL, GameGuard, GamePanel } from "./GamePanel.js";
 import { Terminal } from "./Terminal.js";
 import { forgetScreen } from "./redraw.js";
-import { showMePrompt, showStepsTool, stepsFromReply } from "../guide/index.js";
+import { SHOW_PLACES_NOTE, explainPrompt, showMePrompt, showPlacesTool, showStepsTool, stepsFromReply, stopsFromReply } from "../guide/index.js";
 import { Shell } from "../terminal/index.js";
 import { QuickOpen, listAllFiles, score } from "./QuickOpen.js";
 import { Settings } from "./Settings.js";
@@ -86,7 +88,7 @@ Keys:
   Ctrl+click, Option+click or right-click a name: go to its definition (an import's path opens the file)
   p  problems              u    undo Nou's edit   s   settings
   c  (in files) show only changed files            Ctrl+C twice  quit
-Mouse: wheel scrolls (Shift+wheel sideways) · click/drag a scrollbar · double-click in the code to edit there (in the editor: select a word), drag to select
+Mouse: wheel scrolls (Shift+wheel sideways) · click/drag a scrollbar · double-click in the code to edit there (in the editor: select a word), drag to select · in the chat: double-click copies a word, triple-click a paragraph
 In the editor:
   Shift+arrows / mouse drag select · Ctrl+A all · Ctrl+C/X/V copy/cut/paste · Esc clear selection or leave
   Ctrl+←/→ word · Ctrl+Backspace or Ctrl+W delete word · Ctrl+Home/End file start/end
@@ -110,13 +112,17 @@ export function App({ initialModel, permContext, resume }) {
     const { exit } = useApp();
     const { columns, rows } = useWindowSize();
     const [settings, setSettings] = useState(loadSettings);
-    setCodeTheme(settings.codeTheme); // before anything below highlights code
+    // Before anything below highlights code. One Dark's light text is unreadable on a light terminal: there the
+    // default switches to GitHub Light (any other theme you picked stays).
+    setCodeTheme(palette() === "light" && settings.codeTheme === "one-dark" ? "github-light" : settings.codeTheme);
     const [view, setView] = useState("main");
     const [connectTo, setConnectTo] = useState();
     /** Why settings were opened for you (a request failed on the provider's setup). */
     const [setupReason, setSetupReason] = useState(null);
     /** The file finder / command palette: closed (null), or open with this query (">" for commands). */
     const [quickOpen, setQuickOpen] = useState(null);
+    /** /resume's picker: the conversations, in the palette's place while it's open. */
+    const [resumePicker, setResumePicker] = useState(null);
     const [focus, setFocus] = useState("chat");
     /** The Games panel: whether it's open, the pane it's being dragged over, and the pane to go back to. */
     const [gamesOpen, setGamesOpen] = useState(false);
@@ -136,7 +142,7 @@ export function App({ initialModel, permContext, resume }) {
     /** The tab strip, kept while nothing in it changes: a new one would redraw the whole code view on every scroll. */
     const tabStripCache = useRef(null);
     /**
-     * "Show me how" (/showme): the steps Nou found, and the one you're on. While Nou looks for them,
+     * "Teach me" (/teach): the steps Nou found, and the one you're on. While Nou looks for them,
      * `guideAsk` holds what you asked (and its edits are turned down: you're doing the typing).
      */
     const [guide, setGuide] = useState(null);
@@ -146,6 +152,12 @@ export function App({ initialModel, permContext, resume }) {
     /** /resume just listed the conversations: the next message, if it's a number, picks one. */
     const pickingResume = useRef(false);
     const guideFound = useRef(null);
+    /**
+     * "Show me" (/showme, or any explanation that points at code): the places the agent pointed at, and the
+     * one open in the code view. `tourFound` holds what Nou's engine passed to show_places during a turn.
+     */
+    const [tour, setTour] = useState(null);
+    const tourFound = useRef(null);
     const shellRef = useRef(null);
     const beforeTerm = useRef("code");
     const [follow, setFollow] = useState(settings.followMode);
@@ -545,7 +557,7 @@ export function App({ initialModel, permContext, resume }) {
     useEffect(() => {
         const { extras, extraTools } = harness({ diagnostics, plugins: activePlugins.map((p) => p.plugin), git: settings.gitContext && repo });
         // Other engines read AGENTS.md / CLAUDE.md themselves: they get only the NOU.md rules on top.
-        engineConfig.current = { system: buildSystemPrompt(permContext, extras), extras: [...extras, nouRulesOnly(permContext)].filter(Boolean), extraTools: [...extraTools, showStepsTool((steps) => (guideFound.current = steps)), ...mcpRef.current.tools()], effort: settings.effort };
+        engineConfig.current = { system: buildSystemPrompt(permContext, extras), extras: [...extras, nouRulesOnly(permContext), SHOW_PLACES_NOTE].filter(Boolean), extraTools: [...extraTools, showStepsTool((steps) => (guideFound.current = steps)), showPlacesTool((stops) => (tourFound.current = stops)), ...mcpRef.current.tools()], effort: settings.effort };
         agentRef.current.configure(engineConfig.current);
     }, [settings.gitContext, settings.effort, activePlugins, mcpVersion]);
     // Pick up changes made outside Nou (other editors, git commands). Not while Nou's window is in the
@@ -581,6 +593,24 @@ export function App({ initialModel, permContext, resume }) {
         if (openFile && diffMode === "off" && !editing)
             setContent(readText(openFile));
     }, [busy]);
+    /**
+     * Workspaces: when this Nou is one tab of several, the host says when it's on screen again (redraw all of
+     * it, and turn the mouse and focus reports back on, which another workspace may have turned off on its way
+     * out), and hears when it's busy, for the tab's ● .
+     */
+    const tabsOfWorkspaces = useWorkspaceTabs();
+    useEffect(() => {
+        connectToHost({
+            redraw: () => {
+                process.stdout.write(`\x1b[?1049h${settings.mouse ? MOUSE_ON : ""}\x1b[?1004h`);
+                redraw();
+            },
+            error: (text) => info(text, "error"),
+        });
+    }, []);
+    useEffect(() => {
+        sendToHost({ type: "state", busy: !!busy });
+    }, [!!busy]);
     const updateSettings = (patch) => setSettings(saveSettings(patch));
     const switchModel = (next) => {
         const problem = next.provider.unavailable();
@@ -642,19 +672,31 @@ export function App({ initialModel, permContext, resume }) {
         const list = resumable();
         if (!list.length)
             return info("No earlier conversations in this folder yet: Nou's are saved after each reply, and Claude Code's and Codex's own sessions here show up too.");
+        const where = (c) => ("file" in c ? `${engineInfo(c.engine).label} CLI` : engineInfo(isEngineId(c.engine) ? c.engine : "nou").label);
         if (!arg) {
-            const rows = list.slice(0, 10).map((c, i) => `  ${String(i + 1).padStart(2)}. ${c.title}  (${c.messages} message${c.messages === 1 ? "" : "s"} · ${"file" in c ? `${engineInfo(c.engine).label} CLI` : engineInfo(isEngineId(c.engine) ? c.engine : "nou").label} · ${ago(c.updated)})`);
+            const rows = list.slice(0, 10).map((c, i) => `  ${String(i + 1).padStart(2)}. ${c.title}  (${c.messages} message${c.messages === 1 ? "" : "s"} · ${where(c)} · ${ago(c.updated)})`);
             pickingResume.current = true; // a bare number, typed next, picks one
-            return info(`Earlier conversations here. Type a number to pick one up (or /resume last):\n${rows.join("\n")}`);
+            info(`Earlier conversations here (also in the picker: ↑↓ and Enter, or type a number here):\n${rows.join("\n")}`);
+            // A picker over the screen: ↑↓ and Enter, or type to filter by title.
+            setResumePicker(list.map((c, i) => ({ title: `${i + 1}. ${c.title}`, keys: `${where(c)} · ${ago(c.updated)}`, run: () => void resumePicked(c) })));
+            setQuickOpen(">");
+            return;
         }
         const pick = arg === "last" ? list[0] : list[Number(arg) - 1] ?? list.find((c) => c.id === arg);
         if (!pick)
             return info(`There's no conversation ${arg}: /resume lists them.`, "error");
+        return resumePicked(pick);
+    };
+    /** Picks a conversation back up: Nou's own, or a Claude Code or Codex CLI session. */
+    const resumePicked = async (pick) => {
+        pickingResume.current = false;
+        if (busy)
+            return info("Wait for the current reply to finish (or press Esc) before resuming another conversation.", "error");
         if ("file" in pick)
             return resumeExternal(pick);
         const saved = loadConversation(pick.id);
         if (!saved)
-            return info(`Couldn't read conversation ${arg}.`, "error");
+            return info(`Couldn't read conversation "${pick.title}".`, "error");
         const engine = engineFor(isEngineId(saved.engine) ? saved.engine : null);
         const restored = saved.engine === engine.id && !!saved.state && !!engine.restore?.(saved.state);
         if (!restored) {
@@ -1020,6 +1062,14 @@ export function App({ initialModel, permContext, resume }) {
         }
         if (event.kind === "click" && !approval && event.y === 0 && event.x >= clickable.current.modelFrom)
             return setView("settings");
+        // Workspace tabs in the header: click one to switch to it, + to open another.
+        if (event.kind === "click" && event.y === 0) {
+            const zone = headerZones(workspaceTabs()).find((z) => event.x >= z.from && event.x < z.to);
+            if (zone?.tab === "new")
+                return typeCommand("/workspace new ");
+            if (typeof zone?.tab === "number")
+                return void sendToHost({ type: "switch", index: zone.tab });
+        }
         if (event.kind === "click" && event.y === paneHeight + 1)
             return clickable.current.status.find((z) => event.x >= z.from && event.x < z.to)?.run();
         if (event.y < 1 || event.y > paneHeight)
@@ -1097,8 +1147,14 @@ export function App({ initialModel, permContext, resume }) {
         }
         // Two clicks in the same spot within half a second are a double-click.
         const last = lastClick.current;
-        const double = !!last && Date.now() - last.time < DOUBLE_CLICK_MS && Math.abs(last.x - event.x) <= 1 && last.y === event.y;
-        lastClick.current = double ? null : { x: event.x, y: event.y, time: Date.now() };
+        const again = !!last && Date.now() - last.time < DOUBLE_CLICK_MS && Math.abs(last.x - event.x) <= 1 && last.y === event.y;
+        const count = again ? last.count + 1 : 1;
+        const double = count === 2;
+        // The chat counts a third click too (the whole paragraph); elsewhere a double-click starts over.
+        lastClick.current = double && pane !== "chat" ? null : count >= 3 ? null : { x: event.x, y: event.y, time: Date.now(), count };
+        // In the chat: a double-click selects and copies the word (or path, or link), a triple-click the paragraph.
+        if (pane === "chat" && event.y >= 3 && count >= 2)
+            chatAt(event.x, event.y, count === 2 ? "word" : "block");
         if (pane === "code" && event.y >= 3 && codePanel === "code") {
             // As the code view counts them (a last empty line after the final newline isn't shown).
             const digits = String(splitLines(content).length).length;
@@ -1632,6 +1688,21 @@ ${snippet}
                     return info(`No file matches "${wanted}". To find where something is in the code, ask in the chat.`, "error");
                 return openRef({ path: file, ...(m[2] ? { line: Number(m[2]) } : {}), ...(m[3] ? { to: Number(m[3]) } : {}) });
             }
+            case "effort": {
+                // Speed vs smarts, by name: /effort smarter (or the effort itself: /effort xhigh).
+                const options = EFFORTS.map((e) => EFFORT_LABELS[e].name.toLowerCase()).join(", ");
+                if (!arg)
+                    return info(`Now: ${EFFORT_LABELS[settings.effort].name}. ${EFFORT_LABELS[settings.effort].tradeoff} Change it with /effort ${options}.`);
+                const next = effortFrom(arg);
+                if (!next)
+                    return info(`No such level: "${arg}". Try one of: ${options}.`, "error");
+                updateSettings({ effort: next });
+                return info(`Now: ${EFFORT_LABELS[next].name}. ${EFFORT_LABELS[next].tradeoff}`);
+            }
+            case "now":
+                if (!queued.length)
+                    return info(busy ? "Nothing is queued. Type a message and press Alt+Enter to stop Nou and send it now." : "Nothing is queued.");
+                return sendNow();
             case "games":
                 return toggleGames();
             case "cancel":
@@ -1748,6 +1819,10 @@ ${snippet}
                 return toggleTerminal();
             case "redraw":
                 return redraw();
+            case "workspace":
+            case "workspaces":
+            case "ws":
+                return void workspaceCommand(arg);
             case "fold":
             case "unfold":
                 if (!openFile)
@@ -1766,7 +1841,9 @@ ${snippet}
                 return switchChatTab(chatTabs[n - 1]);
             }
             case "showme":
+                return showPlaces(rest.join(" "));
             case "teach":
+            case "teachme":
                 return showMe(rest.join(" "));
             case "resume":
                 return resumeConversation(rest[0] ?? "");
@@ -1791,6 +1868,13 @@ ${snippet}
                     }
                     return;
                 }
+                // A typo of a command ("/termnial"): one that only changes the screen just runs; others are suggested,
+                // so a slip never clears or undoes anything.
+                const meant = closestCommand(command ?? "", [...SLASH_COMMANDS.map((c) => c.name), ...activePlugins.flatMap(({ plugin }) => plugin.commands?.map((c) => c.name) ?? [])]);
+                if (meant && onlyChangesScreen(meant))
+                    return runCommand(`/${meant}${arg ? ` ${arg}` : ""}`);
+                if (meant)
+                    return info(`Unknown command /${command}. Did you mean /${meant}${arg ? ` ${arg}` : ""}?`, "error");
                 return info(`Unknown command /${command}. Type /help.`, "error");
             }
         }
@@ -1872,6 +1956,57 @@ ${snippet}
         setQueued(queued.slice(take));
         send(queued.slice(0, take).join("\n\n"));
     }, [busy, approval, queued]);
+    // When a reply points at places in the code (Nou's engine with show_places, the others with a ```nou-show
+    // block, which is taken out of the reply), the first one opens highlighted and the rest are listed.
+    useEffect(() => {
+        if (busy || guideAsk.current)
+            return;
+        let stops = tourFound.current;
+        tourFound.current = null;
+        const reply = [...entries].reverse().find((e) => e.kind === "assistant");
+        const found = reply && stopsFromReply(reply.text);
+        if (found) {
+            stops = stops?.length ? stops : found.stops;
+            setEntries((prev) => prev.map((e) => (e === reply ? { ...e, text: found.rest || "Here's where." } : e)));
+        }
+        stops = (stops ?? []).filter((s) => existsSync(s.file));
+        if (!stops.length)
+            return;
+        const list = stops.map((s, i) => `${i + 1}. ${s.file}:${s.line}${s.end > s.line ? `-${s.end}` : ""}${s.note ? ` · ${s.note}` : ""}`).join("\n");
+        info(`📍 ${stops.length === 1 ? "Here it is" : `${stops.length} places`}, open in the code view (click one to jump there${stops.length > 1 ? "; /showme next and /showme back step through them" : ""}):\n${list}`);
+        setTour({ stops, at: 0 });
+    }, [busy]);
+    // Each place: open it in the code view with its lines highlighted.
+    useEffect(() => {
+        const stop = tour?.stops[tour.at];
+        if (!stop)
+            return;
+        openRef({ path: stop.file, line: stop.line, ...(stop.end > stop.line ? { to: stop.end } : {}) });
+    }, [tour?.at, tour?.stops]);
+    /** /showme <question>: explains it and opens the places in the code; /showme next|back|stop steps through them. */
+    const showPlaces = (arg) => {
+        const words = arg.trim();
+        if (/^(stop|end|done)$/.test(words)) {
+            setTour(null);
+            return info(tour ? "Done showing." : "Nothing is being shown.");
+        }
+        if (/^(next|back|prev|previous)$/.test(words)) {
+            if (!tour)
+                return info("Nothing is being shown. Ask with /showme <question>, e.g. /showme where do we check the login?");
+            const at = tour.at + (words === "next" ? 1 : -1);
+            if (at < 0 || at >= tour.stops.length)
+                return info(at < 0 ? "That's the first place." : "That was the last place.");
+            const stop = tour.stops[at];
+            info(`📍 ${at + 1} of ${tour.stops.length}: ${stop.file}:${stop.line}${stop.end > stop.line ? `-${stop.end}` : ""}${stop.note ? ` · ${stop.note}` : ""}`);
+            return setTour({ ...tour, at });
+        }
+        if (!words)
+            return info("Ask how something works or where it happens, and Nou explains it and opens the places in the code, highlighted: /showme where do we check the login? (To be walked through typing a change yourself: /teach.)");
+        if (busy)
+            return info("Wait for the current reply to finish (or press Esc) first.", "error");
+        setTour(null);
+        send(explainPrompt(words, agentRef.current.id === "nou"));
+    };
     // When Nou has finished looking, the guide starts at its first step.
     useEffect(() => {
         if (busy || !guideAsk.current)
@@ -1897,8 +2032,8 @@ ${snippet}
             info("It edited files anyway, so those changes were put back: you're the one typing them.");
         }
         if (!steps?.length)
-            return info("Nou didn't come back with steps to show. Try asking more specifically, e.g. /showme add a --verbose flag to the CLI", "error");
-        info(`Here's how, in ${steps.length} step${steps.length > 1 ? "s" : ""}. You type each one in the editor: the dim text ahead of the cursor is what goes next, and Tab fills in the rest of a line. /showme next skips a step, /showme stop ends it.`);
+            return info("Nou didn't come back with steps to show. Try asking more specifically, e.g. /teach add a --verbose flag to the CLI", "error");
+        info(`Here's how, in ${steps.length} step${steps.length > 1 ? "s" : ""}. You type each one in the editor: the dim text ahead of the cursor is what goes next, and Tab fills in the rest of a line. /teach next skips a step, /teach stop ends it.`);
         setGuide({ steps, at: 0, task });
     }, [busy]);
     // Each step: open its file in the editor where the code goes, and say what to type and why.
@@ -1934,7 +2069,7 @@ ${snippet}
             setGuide(null);
         }
     });
-    /** /showme <what you want>: Nou finds where the change goes and walks you through typing it. */
+    /** /teach <what you want>: Nou finds where the change goes and walks you through typing it. */
     const showMe = (arg) => {
         const words = arg.trim();
         if (words === "stop" || words === "end") {
@@ -1952,8 +2087,8 @@ ${snippet}
         }
         if (!words) {
             if (guide)
-                return info(`On step ${guide.at + 1} of ${guide.steps.length}: ${guideStep.file}:${guideStep.line}. /showme next skips it, /showme stop ends it.`);
-            return info("Tell Nou what you want to do and it shows you how, step by step, for you to type: /showme add a --verbose flag to the CLI");
+                return info(`On step ${guide.at + 1} of ${guide.steps.length}: ${guideStep.file}:${guideStep.line}. /teach next skips it, /teach stop ends it.`);
+            return info("Tell Nou what you want to do and it shows you how, step by step, for you to type: /teach add a --verbose flag to the CLI");
         }
         if (busy)
             return info("Wait for the current reply to finish (or press Esc) first.", "error");
@@ -1967,10 +2102,21 @@ ${snippet}
         if (busy)
             stopped.current = false;
     }, [busy]);
-    /** From the chat: while Nou works, a message waits its turn, or (`now`) stops Nou and goes right away. */
-    const submit = (text, now = false) => {
+    /** Stops Nou and sends what's queued right away (a click on the queue, or /now). */
+    const sendNow = () => {
+        if (!queued.length)
+            return;
+        stop();
+        stopped.current = false; // what's queued is meant to go
+    };
+    /**
+     * From the chat: while Nou works, a message waits its turn, or (`now`: Alt+Enter) stops Nou and goes right
+     * away. The "Send while Nou works" setting swaps the two, so Enter sends now and Alt+Enter queues.
+     */
+    const submit = (text, alt = false) => {
         if (!busy || (text.startsWith("/") && runsWhileBusy(text)))
             return send(text);
+        const now = settings.sendNowWhileBusy ? !alt : alt;
         if (now) {
             stop();
             stopped.current = false; // this one is meant to go
@@ -2129,6 +2275,51 @@ ${snippet}
         forgetScreen();
         setRepaint((n) => n + 1);
     }
+    /** /workspace: list them, `new [folder]` opens one, a number switches. */
+    async function workspaceCommand(arg) {
+        const [sub, ...more] = arg.split(/\s+/);
+        const tabs = workspaceTabs();
+        if (!sub) {
+            if (!isHosted())
+                return info(`One workspace: ${path.basename(process.cwd())}. /workspace new <folder> opens another in this window, a tab each in the header (click + there too).`);
+            return info(`Workspaces: ${tabs.map((t, i) => `${i + 1}. ${t.name}${t.busy ? " (working)" : ""}${t.active ? " ← here" : ""}`).join("  ")}. /workspace <n> switches, /workspace new <folder> opens one, /quit closes this one.`);
+        }
+        if (/^\d+$/.test(sub)) {
+            const n = Number(sub);
+            if (!isHosted() || !tabs[n - 1])
+                return info(`There's no workspace ${n}. /workspace lists them.`, "error");
+            return void sendToHost({ type: "switch", index: n - 1 });
+        }
+        if (sub !== "new")
+            return info("Try /workspace new <folder>, /workspace <n> or /workspace.", "error");
+        const wanted = more.join(" ");
+        if (isHosted())
+            return void sendToHost({ type: "new", folder: wanted });
+        const folder = workspaceFolder(wanted, process.cwd());
+        if (!folder)
+            return info(`No such folder: ${wanted}`, "error");
+        if (busy)
+            return info("Wait for the current reply to finish (or press Esc) first: Nou reopens as a workspaces window.", "error");
+        // The pseudo-terminals workspaces run in come from a small native package, installed once like an engine.
+        const pty = { id: "nou", label: "workspaces", description: "", approvals: "before", model: () => "", package: PTY_PACKAGE };
+        if (!isInstalled(pty)) {
+            info(`Workspaces need ${PTY_PACKAGE} (pseudo-terminals, prebuilt for macOS, Linux and Windows). Installing it once into ~/.nou/engines...`);
+            setBusy("Installing workspaces support (npm)...");
+            try {
+                await installEngine(pty, (line) => setBusy(`Installing workspaces support (npm): ${line.slice(0, 70)}`));
+            }
+            catch (error) {
+                return info(`Couldn't install ${PTY_PACKAGE}: ${error.message}`, "error");
+            }
+            finally {
+                setBusy(null);
+            }
+        }
+        if (draft.current && settings.autoSave !== "off")
+            saveFromEditor(draft.current.text, draft.current.path);
+        reopenAsWorkspaces([process.cwd(), folder]);
+        exit();
+    }
     /** Opens the terminal panel (starting its shell the first time) and gives it the keyboard, or closes it. */
     function toggleTerminal(open = !termOpen) {
         shellRef.current ??= new Shell(() => setTermVersion((v) => v + 1));
@@ -2302,9 +2493,9 @@ ${snippet}
     }
     const modelLabel = agentRef.current.id === "nou" ? describe(choice) : `${engineInfo(agentRef.current.id).label} · ${engineInfo(agentRef.current.id).model(choice)}`;
     clickable.current = { status: zones, modelFrom: columns - (" ⌂ LOCAL ".length + ` ${modelLabel} `.length + 1) };
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: modelLabel, local: choice.provider.local, busy: busy, update: update }), _jsxs(Box, { flexDirection: "row", height: height, children: [_jsx(FileTree, { width: treeWidth, height: heights.tree, focused: focus === "tree", openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, working: working, git: git, problemCounts: problemCounts, wheel: wheelFor("tree"), scrollTo: scrollFor("tree"), click: treeClick, onOpen: onTreeOpen, onHover: onTreeHover }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: heights.code, focused: focus === "code", problems: diagnostics.all(), checking: checking, wheel: wheelFor("code"), onJump: onJump, onClose: onCloseProblems })) : showEditor ? (_jsx(Editor, { ...(tabStrip ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, initial: draft.current?.path === openFile ? draft.current.text : content, baseline: draft.current?.path === openFile ? draft.current.baseline : content, startLine: editorStart.line, ...(editorStart.col ? { startCol: editorStart.col } : {}), problems: fileProblems, autoSave: settings.autoSave, syntaxVersion: syntaxVersion, wheel: wheelFor("code"), scrollTo: scrollFor("code"), mouse: editorMouse, onHover: onEditorHover, onDefinition: onEditorDefinition, onSave: onEditorSave, onExit: onEditorExit, onState: onEditorState, ...(guideStep && openFile === guideStep.file ? { guide: { row: guideStep.line - 1, code: guideStep.code }, onGuideDone } : {}) }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { ...(tabStrip && !diff ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, content: content, diff: diff, diffLabel: diffMode === "git" ? "vs HEAD" : diffMode === "session" ? sessionView?.label ?? "this session" : "Nou's edit", pending: !!pendingChange && diff === pendingChange, marked: record?.lines ?? NO_LINES, problems: fileProblems, focusLine: focusLine, syntaxVersion: syntaxVersion, diffNote: pendingChange && diff === pendingChange ? pendingNote?.short ?? (checking.length ? "checking…" : null) : null, wheel: wheelFor("code"), scrollTo: scrollFor("code"), onViewport: onViewport, defineAt: codeDefine, onDefine: onCodeDefine, onFinding: onCodeFinding, findRequest: findRequest, foldClick: foldClick, foldAll: foldAll })), _jsx(Chat, { width: chatWidth, height: heights.chat, focused: focus === "chat", entries: entries, streaming: streaming, busy: busy, approval: approval?.request ?? null, approvalNote: pendingChange ? pendingNote?.detail ?? null : null, contextChip: contextChip, wheel: wheelFor("chat"), scrollTo: scrollFor("chat"), prefill: chatPrefill, extraCommands: pluginCommands, onMenu: onChatMenu, onSubmit: onSend, queued: queued, onAnswer: onAnswer, click: chatClick, select: chatSelect, tabs: chatTabsProp(), onOpenRef: openRef })] }), _jsx(Box, { children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: mode.color, color: "black", bold: true, children: ` ${mode.label} ` }), _jsx(Text, { backgroundColor: C.panel, color: autoMode === "ask" ? C.dim : C.orange, bold: autoMode !== "ask", children: ` ${autoMode === "ask" ? "ask" : autoMode} ` }), _jsx(Text, { backgroundColor: C.panel, color: follow ? C.green : C.dim, children: followChip }), _jsx(Text, { backgroundColor: C.panel, color: totals.errors ? C.red : C.dim, children: ` ✖ ${totals.errors}` }), _jsx(Text, { backgroundColor: C.panel, color: totals.warnings ? C.yellow : C.dim, children: ` ▲ ${totals.warnings} ` }), checking.length > 0 && _jsxs(Text, { color: C.accent2, children: [" \u27F3 ", checking.join(", ")] }), exitArmed
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: modelLabel, local: choice.provider.local, busy: busy, update: update, tabs: tabsOfWorkspaces }), _jsxs(Box, { flexDirection: "row", height: height, children: [_jsx(FileTree, { width: treeWidth, height: heights.tree, focused: focus === "tree", openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, working: working, git: git, problemCounts: problemCounts, wheel: wheelFor("tree"), scrollTo: scrollFor("tree"), click: treeClick, onOpen: onTreeOpen, onHover: onTreeHover }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: heights.code, focused: focus === "code", problems: diagnostics.all(), checking: checking, wheel: wheelFor("code"), onJump: onJump, onClose: onCloseProblems })) : showEditor ? (_jsx(Editor, { ...(tabStrip ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, initial: draft.current?.path === openFile ? draft.current.text : content, baseline: draft.current?.path === openFile ? draft.current.baseline : content, startLine: editorStart.line, ...(editorStart.col ? { startCol: editorStart.col } : {}), problems: fileProblems, autoSave: settings.autoSave, syntaxVersion: syntaxVersion, wheel: wheelFor("code"), scrollTo: scrollFor("code"), mouse: editorMouse, onHover: onEditorHover, onDefinition: onEditorDefinition, onSave: onEditorSave, onExit: onEditorExit, onState: onEditorState, ...(guideStep && openFile === guideStep.file ? { guide: { row: guideStep.line - 1, code: guideStep.code }, onGuideDone } : {}) }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { ...(tabStrip && !diff ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, content: content, diff: diff, diffLabel: diffMode === "git" ? "vs HEAD" : diffMode === "session" ? sessionView?.label ?? "this session" : "Nou's edit", pending: !!pendingChange && diff === pendingChange, marked: record?.lines ?? NO_LINES, problems: fileProblems, focusLine: focusLine, syntaxVersion: syntaxVersion, diffNote: pendingChange && diff === pendingChange ? pendingNote?.short ?? (checking.length ? "checking…" : null) : null, wheel: wheelFor("code"), scrollTo: scrollFor("code"), onViewport: onViewport, defineAt: codeDefine, onDefine: onCodeDefine, onFinding: onCodeFinding, findRequest: findRequest, foldClick: foldClick, foldAll: foldAll })), _jsx(Chat, { width: chatWidth, height: heights.chat, focused: focus === "chat", entries: entries, streaming: streaming, busy: busy, approval: approval?.request ?? null, approvalNote: pendingChange ? pendingNote?.detail ?? null : null, contextChip: contextChip, wheel: wheelFor("chat"), scrollTo: scrollFor("chat"), prefill: chatPrefill, extraCommands: pluginCommands, onMenu: onChatMenu, onSubmit: onSend, queued: queued, sendNowFirst: settings.sendNowWhileBusy, onSendNow: sendNow, onAnswer: onAnswer, click: chatClick, select: chatSelect, tabs: chatTabsProp(), onOpenRef: openRef })] }), _jsx(Box, { children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: mode.color, color: C.onBadge, bold: true, children: ` ${mode.label} ` }), _jsx(Text, { backgroundColor: C.panel, color: autoMode === "ask" ? C.dim : C.orange, bold: autoMode !== "ask", children: ` ${autoMode === "ask" ? "ask" : autoMode} ` }), _jsx(Text, { backgroundColor: C.panel, color: follow ? C.green : C.dim, children: followChip }), _jsx(Text, { backgroundColor: C.panel, color: totals.errors ? C.red : C.dim, children: ` ✖ ${totals.errors}` }), _jsx(Text, { backgroundColor: C.panel, color: totals.warnings ? C.yellow : C.dim, children: ` ▲ ${totals.warnings} ` }), checking.length > 0 && _jsxs(Text, { color: C.accent2, children: [" \u27F3 ", checking.join(", ")] }), exitArmed
                             ? _jsxs(Text, { color: C.yellow, bold: true, children: ["  ", "Press again to quit", draft.current && settings.autoSave === "off" ? ` (unsaved changes in ${draft.current.path} will be lost)` : ""] })
-                            : shownHints.map(([key, action], i) => (_jsxs(Text, { children: [i === 0 ? "  " : _jsx(Text, { color: C.dim, children: " \u00B7 " }), _jsx(Text, { color: C.text, children: key }), _jsxs(Text, { color: C.dim, children: [" ", action] })] }, key)))] }) }), layout.current.terminal && shellRef.current && (_jsx(Box, { position: "absolute", marginLeft: layout.current.terminal.x, marginTop: layout.current.terminal.y, children: _jsx(Terminal, { shell: shellRef.current, version: termVersion, width: layout.current.terminal.width, height: layout.current.terminal.height, focused: focus === "terminal", wheel: wheelFor("terminal"), onLeave: leaveTerminal, onResize: resizeTerminal }) })), layout.current.game && (_jsx(Box, { position: "absolute", marginLeft: layout.current.game.x, marginTop: layout.current.game.y, children: _jsx(GameGuard, { children: _jsx(GamePanel, { width: layout.current.game.width, height: layout.current.game.height, focused: focus === "game", moving: !!gameDrag, installed: settings.games, best: settings.gameBest ?? {}, onScore: onGameScore, onLeave: leaveGames, onOpenSettings: gamesSettings }) }) })), quickOpen !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, recent: recent, actions: paletteActions, initialQuery: quickOpen, onPick: (file) => {
+                            : shownHints.map(([key, action], i) => (_jsxs(Text, { children: [i === 0 ? "  " : _jsx(Text, { color: C.dim, children: " \u00B7 " }), _jsx(Text, { color: C.text, children: key }), _jsxs(Text, { color: C.dim, children: [" ", action] })] }, key)))] }) }), layout.current.terminal && shellRef.current && (_jsx(Box, { position: "absolute", marginLeft: layout.current.terminal.x, marginTop: layout.current.terminal.y, children: _jsx(Terminal, { shell: shellRef.current, version: termVersion, width: layout.current.terminal.width, height: layout.current.terminal.height, focused: focus === "terminal", wheel: wheelFor("terminal"), onLeave: leaveTerminal, onClose: () => toggleTerminal(false), onResize: resizeTerminal }) })), layout.current.game && (_jsx(Box, { position: "absolute", marginLeft: layout.current.game.x, marginTop: layout.current.game.y, children: _jsx(GameGuard, { children: _jsx(GamePanel, { width: layout.current.game.width, height: layout.current.game.height, focused: focus === "game", moving: !!gameDrag, installed: settings.games, best: settings.gameBest ?? {}, onScore: onGameScore, onLeave: leaveGames, onOpenSettings: gamesSettings }) }) })), quickOpen !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, recent: recent, actions: resumePicker ?? paletteActions, initialQuery: quickOpen, ...(resumePicker ? { placeholder: "Pick a conversation to resume (type to filter)" } : {}), onPick: (file) => {
                     setQuickOpen(null);
                     clearFollow();
                     open(file);
@@ -2312,6 +2503,10 @@ ${snippet}
                     setFocus("code");
                 }, onRun: (action) => {
                     setQuickOpen(null);
+                    setResumePicker(null);
                     action.run();
-                }, onClose: () => setQuickOpen(null) }))] }));
+                }, onClose: () => {
+                    setQuickOpen(null);
+                    setResumePicker(null);
+                } }))] }));
 }

package/dist/src/ui/Chat.js

@@ -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

@@ -216,7 +216,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) {

package/dist/src/ui/Editor.js

@@ -635,7 +635,7 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
     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/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] })] }));