nou-cli 0.5.6 → 0.5.11

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,24 @@ 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 { FIND_KEY, isFind } from "./keys.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";
@@ -81,16 +84,16 @@ Keys:
   m  mouse on/off (off: select text to copy; Shift+drag also works in most terminals)
   /  start a command from any pane
   e  edit open file (or double-click in the code)  v  diff (git / Nou / session)  f  follow mode
-  Ctrl+F  find in the open file (Enter/↓ next, ↑ previous)
+  ${FIND_KEY}  find in the open file (Enter/↓ next, ↑ previous)
   b  back to the previous file (Ctrl+P lists recent files first)   [ ]  previous/next tab · x close tab
   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
-  Ctrl+F find · Ctrl+L go to line · Ctrl+/ comment · Ctrl+D duplicate line · Alt+↑/↓ move line
+  ${FIND_KEY} find · Ctrl+L go to line · Ctrl+/ comment · Ctrl+D duplicate line · Alt+↑/↓ move line
   Tab/Shift+Tab indent/outdent · Ctrl+S save · Ctrl+Z/Y undo/redo · Ctrl+K info · Ctrl+G go to definition`;
 /** A callback that keeps one identity across renders but always runs the latest code, so memoized panes don't re-render for it. */
 function useEvent(fn) {
@@ -110,13 +113,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 +143,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 +153,20 @@ 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);
+    /** The files on /showme's tour and which of its places are in each, for the file tree. */
+    const tourFiles = useMemo(() => {
+        if (!tour)
+            return null;
+        const map = new Map();
+        tour.stops.forEach((s, i) => map.set(s.file, [...(map.get(s.file) ?? []), i + 1]));
+        return map;
+    }, [tour]);
     const shellRef = useRef(null);
     const beforeTerm = useRef("code");
     const [follow, setFollow] = useState(settings.followMode);
@@ -243,7 +264,7 @@ export function App({ initialModel, permContext, resume }) {
     const [findRequest, setFindRequest] = useState(0);
     const startFind = () => {
         if (!openFile)
-            return info("Open a file first (Ctrl+P), then Ctrl+F searches it.");
+            return info(`Open a file first (Ctrl+P), then ${FIND_KEY} searches it.`);
         setDiffMode("off");
         setEditing(false);
         setCodePanel("code");
@@ -258,6 +279,12 @@ export function App({ initialModel, permContext, resume }) {
     const layout = useRef({ treeWidth: 0, codeWidth: 0, paneHeight: 0, heights: { tree: 0, code: 0, chat: 0 }, game: null, terminal: null });
     /** Pane widths while a border is dragged (saved on release); the saved ones otherwise. */
     const [paneWidths, setPaneWidths] = useState(settings.paneWidths);
+    /**
+     * How far the code panel is zoomed (+ and - in the code, /zoom in|out): each step makes it a few columns
+     * wider (taken from the files and chat) or narrower (given to them). 0 is the normal layout.
+     */
+    const [codeZoom, setCodeZoom] = useState(0);
+    const zoomCode = (by) => setCodeZoom((z) => (by === 0 ? 0 : Math.max(-6, Math.min(8, z + by))));
     const paneWidthsRef = useRef(paneWidths);
     paneWidthsRef.current = paneWidths;
     /** What a mouse drag is moving: a pane border, a pane's scrollbar, or the editor's selection. */
@@ -545,7 +572,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 +608,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 +687,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 +1077,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 +1162,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;
@@ -1423,6 +1494,16 @@ export function App({ initialModel, permContext, resume }) {
             return; // so does the find bar
         if (focus === "game" || focus === "terminal")
             return; // and the Games panel and the terminal
+        // Cmd+F (Mac) or Ctrl+F from the files or the chat: find in the open file (the code view takes it itself
+        // when it has the keyboard). Other Cmd+letters aren't Nou's: a plain letter is, so Cmd+F never also
+        // toggles follow mode (f).
+        if (isFind(input, key)) {
+            if (focus !== "code")
+                startFind();
+            return;
+        }
+        if (key.super)
+            return;
         if (key.tab && key.shift)
             return cycleAutoMode();
         if (key.tab && focus === "chat" && chatMenuOpen.current)
@@ -1470,9 +1551,13 @@ export function App({ initialModel, permContext, resume }) {
             updateSettings({ paneWidths: moveBorder(focus === "tree" ? "tree" : "chat", (focus === "tree" ? treeWidth - 1 : treeWidth + codeWidth) + step) });
         }
         else if (input === "=") {
+            setCodeZoom(0);
             setPaneWidths(null);
             updateSettings({ paneWidths: null });
         }
+        else if ((input === "+" || input === "-") && focus === "code") {
+            zoomCode(input === "+" ? 1 : -1);
+        }
         else if (input === "v")
             cycleDiff();
         else if ((input === "]" || input === "[") && diffMode === "session")
@@ -1563,7 +1648,7 @@ ${snippet}
         if (action)
             return info("Usage: /mcp, /mcp add <name> <command|url>, /mcp add browser, /mcp remove <name>, /mcp import, /mcp reconnect", "error");
         const list = mcpRef.current.status();
-        const mark = { ready: "●", connecting: "◌", failed: "✖", off: "○" };
+        const mark = { ready: "●", connecting: "◌", failed: "✗", off: "○" };
         const lines = list.map((x) => `  ${mark[x.state]} ${x.name.padEnd(16)} ${x.state === "ready" ? `${x.tools} tools` : x.state}${x.scope === "project" ? " · this project" : ""}${x.error ? ` · ${x.error}` : ""}`);
         const others = findOtherMcpServers().filter((f) => !list.some((x) => x.name === f.name));
         return info([
@@ -1600,7 +1685,7 @@ ${snippet}
         const mark = { on: "●", off: "○", changed: "⚠" };
         const lines = allPlugins.map((p) => p.scope === "starter"
             ? `  + ${p.id.padEnd(16)} ${p.plugin?.description ?? ""}`
-            : `  ${mark[trustState(p, settings)]} ${p.id.padEnd(16)} ${p.scope}${p.error ? ` · ✖ ${p.error}` : ""}`);
+            : `  ${mark[trustState(p, settings)]} ${p.id.padEnd(16)} ${p.scope}${p.error ? ` · ✗ ${p.error}` : ""}`);
         return info(`Plugins (● on, ○ off, + starter you can add with /plugins add <name>):\n${lines.join("\n")}\nWrite your own: /plugins new <name>`);
     };
     const runCommand = async (input) => {
@@ -1632,6 +1717,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 +1848,18 @@ ${snippet}
                 return toggleTerminal();
             case "redraw":
                 return redraw();
+            case "zoom":
+                if (/^(in|\+|bigger)$/.test(arg))
+                    return zoomCode(1);
+                if (/^(out|-|smaller)$/.test(arg))
+                    return zoomCode(-1);
+                if (/^(reset|0|off)$/.test(arg))
+                    return zoomCode(0);
+                return info("/zoom in makes the code panel bigger, /zoom out smaller, /zoom reset puts it back (or + and - with the code focused, = to reset). The files and chat give or take the room. For bigger text, use your terminal's own zoom (Cmd/Ctrl and +).");
+            case "workspace":
+            case "workspaces":
+            case "ws":
+                return void workspaceCommand(arg);
             case "fold":
             case "unfold":
                 if (!openFile)
@@ -1766,7 +1878,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 +1905,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 +1993,60 @@ ${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" : ""}; /showme stop clears the highlights):\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|clear)$/.test(words)) {
+            // Done looking: the highlighted lines go back to plain code.
+            setTour(null);
+            const highlighted = !!focusLine?.to;
+            setFocusLine((f) => (f?.to !== undefined ? null : f));
+            return info(tour || highlighted ? "Done showing: the highlights are cleared." : "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 +2072,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 +2109,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 +2127,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 +2142,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
@@ -2093,8 +2279,16 @@ ${snippet}
             } }));
     }
     const height = Math.max(10, rows - 2);
-    const treeWidth = paneWidths ? Math.max(MIN_TREE, Math.round(columns * paneWidths.tree)) : Math.max(24, Math.floor(columns * 0.2));
-    const chatWidth = paneWidths ? Math.max(MIN_CHAT, Math.min(Math.round(columns * paneWidths.chat), columns - treeWidth - MIN_CODE)) : Math.max(34, Math.floor(columns * 0.3));
+    const baseTree = paneWidths ? Math.max(MIN_TREE, Math.round(columns * paneWidths.tree)) : Math.max(24, Math.floor(columns * 0.2));
+    const baseChat = paneWidths ? Math.max(MIN_CHAT, Math.min(Math.round(columns * paneWidths.chat), columns - baseTree - MIN_CODE)) : Math.max(34, Math.floor(columns * 0.3));
+    // Zooming the code panel: each step moves a few columns between it and the files and chat, as far as their
+    // minimums (zooming in) or its own (zooming out) allow.
+    const zoomCols = codeZoom * Math.max(4, Math.round(columns * 0.06));
+    const spare = { tree: baseTree - MIN_TREE, chat: baseChat - MIN_CHAT };
+    const taken = zoomCols > 0 ? Math.min(zoomCols, spare.tree + spare.chat) : -Math.min(-zoomCols, Math.max(0, columns - baseTree - baseChat - MIN_CODE));
+    const fromTree = zoomCols > 0 ? Math.round(taken * (spare.tree / Math.max(1, spare.tree + spare.chat))) : Math.round(taken / 2);
+    const treeWidth = baseTree - fromTree;
+    const chatWidth = baseChat - (taken - fromTree);
     const codeWidth = Math.max(MIN_CODE, columns - treeWidth - chatWidth);
     const tabKey = tabs.length && openFile ? `${tabs.join("\0")}|${openFile}|${tabsWidth(codeWidth)}|${showEditor && !!editorState?.dirty}` : "";
     if (tabStripCache.current?.key !== tabKey) {
@@ -2129,6 +2323,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));
@@ -2185,7 +2424,7 @@ ${snippet}
     // Everything Nou can do, for the command palette (? or Ctrl+P then >), with the key that does it.
     const paletteActions = [
         { title: "Find a file", keys: "Ctrl+P", run: () => setQuickOpen("") },
-        { title: "Find in the open file", keys: "Ctrl+F", run: startFind },
+        { title: "Find in the open file", keys: FIND_KEY, run: startFind },
         { title: "Open a file at a line", keys: "/open", run: () => typeCommand("/open ") },
         { title: "Go back to the previous file", keys: "b", run: goBack },
         { title: "Cancel your last message (edit it and resend)", keys: "/cancel", run: cancelLast },
@@ -2251,7 +2490,7 @@ ${snippet}
             : showEditor && focus === "code"
                 ? editorState?.selection
                     ? [["Ctrl+C", "copy"], ["Ctrl+X", "cut"], ["Tab", "indent"], ["Ctrl+/", "comment"], ["Esc", "deselect"]]
-                    : [["Esc", "done"], ["Ctrl+S", settings.autoSave === "off" ? "save" : "save (auto-save on)"], ["Ctrl+Z", "undo"], ["Shift+→", "select"], ["Ctrl+F", "find"], ["Ctrl+/", "comment"], ["/help", "all keys"]]
+                    : [["Esc", "done"], ["Ctrl+S", settings.autoSave === "off" ? "save" : "save (auto-save on)"], ["Ctrl+Z", "undo"], ["Shift+→", "select"], [FIND_KEY, "find"], ["Ctrl+/", "comment"], ["/help", "all keys"]]
                 : focus === "chat"
                     ? chatMenu ? [["↑↓", "choose"], ["Tab", "complete"], ["Enter", "run"], ["Esc", "close"]]
                         : busy
@@ -2261,9 +2500,9 @@ ${snippet}
                         ? [["Enter", "open"], ["e", "edit"], ["/", "command"], ["c", "changes"], ["Ctrl+P", "find"], ["u", "undo"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]]
                         : diff
                             ? [["Esc", "close diff"], ["n/N", "next/prev change"], ...(diffMode === "session" ? [["[ ]", "prev/next file"]] : []), ["v", "cycle diff"]]
-                            : [["double-click/e", "edit"], ["Ctrl+F", "find"], ["v", "diff"], ...(recent.length > 1 ? [["b", "back"]] : []), ["u", "undo"], ["/", "command"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]];
+                            : [["double-click/e", "edit"], [FIND_KEY, "find"], ["v", "diff"], ...(recent.length > 1 ? [["b", "back"]] : []), ["u", "undo"], ["/", "command"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]];
     const followChip = follow ? ` ◉ follow${followLag ? ` ·${followLag}` : ""} ` : " ○ follow ";
-    const statusUsed = mode.label.length + 2 + autoMode.length + 2 + followChip.length + ` ✖ ${totals.errors} ▲ ${totals.warnings} `.length + (checking.length ? 4 + checking.join(", ").length : 0) + 2;
+    const statusUsed = mode.label.length + 2 + autoMode.length + 2 + followChip.length + ` ✗ ${totals.errors} ▲ ${totals.warnings} `.length + (checking.length ? 4 + checking.join(", ").length : 0) + 2;
     const shownHints = [];
     for (let used = statusUsed, i = 0; i < hints.length; i++) {
         used += hints[i][0].length + hints[i][1].length + 4;
@@ -2276,7 +2515,7 @@ ${snippet}
         y: () => answer(true), n: approval ? () => answer(false) : undefined, o: openPending,
         "Shift+Tab": () => cycleAutoMode(), "/": () => typeCommand("/"), "Ctrl+P": () => setQuickOpen(""),
         Tab: () => setFocus((f) => FOCUS_ORDER[(FOCUS_ORDER.indexOf(f) + 1) % FOCUS_ORDER.length]),
-        e: startEditing, "double-click/e": startEditing, b: goBack, "Ctrl+F": showEditor ? undefined : startFind, v: cycleDiff, u: undoLast, p: toggleProblems, m: toggleMouse,
+        e: startEditing, "double-click/e": startEditing, b: goBack, [FIND_KEY]: showEditor ? undefined : startFind, v: cycleDiff, u: undoLast, p: toggleProblems, m: toggleMouse,
         s: () => setView("settings"), "/help": () => void runCommand("/help"),
         Esc: busy ? stop : diff && !showEditor ? () => setDiffMode("off") : undefined,
     };
@@ -2290,7 +2529,7 @@ ${snippet}
         };
         add(` ${autoMode} `.length, () => cycleAutoMode());
         add(followChip.length, () => setFollow((f) => !f));
-        add(` ✖ ${totals.errors} ▲ ${totals.warnings} `.length, toggleProblems);
+        add(` ✗ ${totals.errors} ▲ ${totals.warnings} `.length, toggleProblems);
         if (checking.length)
             add(3 + checking.join(", ").length);
         if (!exitArmed) {
@@ -2301,10 +2540,10 @@ ${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
+    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, 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, ...(tourFiles ? { showing: tourFiles } : {}), 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, { ...(tour && tour.stops[tour.at]?.file === openFile && !diff ? { showing: `${tour.at + 1}/${tour.stops.length}` } : {}), ...(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 +2551,10 @@ ${snippet}
                     setFocus("code");
                 }, onRun: (action) => {
                     setQuickOpen(null);
+                    setResumePicker(null);
                     action.run();
-                }, onClose: () => setQuickOpen(null) }))] }));
+                }, onClose: () => {
+                    setQuickOpen(null);
+                    setResumePicker(null);
+                } }))] }));
 }