nou-cli 0.5.2 → 0.5.4

package/dist/src/ui/App.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import path from "path";
 import { Box, Text, useApp, useInput, useWindowSize } from "ink";
 import { nouRulesOnly } from "../context/index.js";
 import { MCP_PRESETS, McpManager, loadMcpServers, removeUserServer, saveUserServers, USER_MCP_FILE } from "../mcp/index.js";
 import { findOtherMcpServers } from "../mcp/import.js";
-import { buildSystemPrompt } from "../agent/index.js";
+import { ago, listConversations, loadConversation, saveConversation } from "../conversations/index.js";
+import { externalEntries, externalSessions } from "../conversations/external.js";
+import { buildSystemPrompt, newSessionId } from "../agent/index.js";
 import { ENGINES, createEngine, engineInfo, installEngine, isEngineId, isInstalled } from "../engines/index.js";
 import { harness, problemsIntroduced } from "../agent/harness.js";
 import { describe, providers, resolveModel, saveModel, setupProblem } from "../providers/index.js";
@@ -28,13 +30,16 @@ import { C } from "./theme.js";
 import { FileTree } from "./FileTree.js";
 import { CodeView } from "./CodeView.js";
 import { Editor } from "./Editor.js";
-import { SLASH_COMMANDS } from "./commands.js";
+import { SLASH_COMMANDS, runsWhileBusy } from "./commands.js";
 import { WHEEL_STEP } from "./scroll.js";
-import { Chat } from "./Chat.js";
-import { copyToClipboard } from "./clipboard.js";
+import { Chat, chatTabZones } from "./Chat.js";
+import { copyToClipboard, openInBrowser } from "./clipboard.js";
 import { Header } from "./Header.js";
 import { Tabs, layoutTabs } from "./Tabs.js";
 import { GAME_PANEL, GamePanel } from "./GamePanel.js";
+import { Terminal } from "./Terminal.js";
+import { showMePrompt, showStepsTool, stepsFromReply } from "../guide/index.js";
+import { Shell } from "../terminal/index.js";
 import { QuickOpen, listAllFiles, score } from "./QuickOpen.js";
 import { Settings } from "./Settings.js";
 const FOCUS_ORDER = ["tree", "code", "chat"];
@@ -42,13 +47,14 @@ const MIN_TREE = 14;
 const MIN_CODE = 20;
 const MIN_CHAT = 24;
 const NO_LINES = new Set();
+const NO_FILES = new Set();
 const DOUBLE_CLICK_MS = 500;
 /** How long each follow step stays on screen before the next. */
 const FOLLOW_STEP_MS = { slow: 2500, normal: 1200, fast: 450, instant: 0 };
 /** Steps follow mode may fall behind before it skips ahead. */
 const MAX_FOLLOW_LAG = 12;
 /** Columns the tabs get in the code view's title, leaving room for the scroll position and badges. */
-const tabsWidth = (codeWidth) => Math.max(16, codeWidth - 16);
+const tabsWidth = (codeWidth) => Math.max(16, codeWidth - 3);
 /** How much of the conversation a newly switched-to engine is given (the latest part when it's longer). */
 const HANDOFF_CHARS = 24_000;
 /** The conversation so far as text, for an engine taking over from another one; null when there's none. */
@@ -98,7 +104,7 @@ function readText(filePath) {
         return "";
     }
 }
-export function App({ initialModel, permContext }) {
+export function App({ initialModel, permContext, resume }) {
     const { exit } = useApp();
     const { columns, rows } = useWindowSize();
     const [settings, setSettings] = useState(loadSettings);
@@ -110,16 +116,32 @@ export function App({ initialModel, permContext }) {
     /** The file finder / command palette: closed (null), or open with this query (">" for commands). */
     const [quickOpen, setQuickOpen] = useState(null);
     const [focus, setFocus] = useState("chat");
-    /** The Games panel: whether it's open, where it is while being dragged, and the pane to go back to. */
+    /** 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);
     const [gameDrag, setGameDrag] = useState(null);
     const beforeGame = useRef("chat");
-    /** Keeps the Games panel on screen (it's dragged by its title; the header row stays clear). */
-    const placeGames = (x, y) => ({
-        x: Math.max(0, Math.min(columns - GAME_PANEL.width, x)),
-        y: Math.max(1, Math.min(rows - GAME_PANEL.height - 1, y)),
-    });
-    const gamePos = gameDrag ?? placeGames(settings.gamePanel?.x ?? columns - GAME_PANEL.width - 1, settings.gamePanel?.y ?? rows - GAME_PANEL.height - 2);
+    /** It docks under a pane, splitting that pane's column: under the one it's dragged over while moving. */
+    const gameDock = gameDrag ?? settings.gameDock ?? "chat";
+    /** The terminal panel under the code (` or /terminal): its shell lives on while the panel is closed. */
+    const [termOpen, setTermOpen] = useState(false);
+    const [termVersion, setTermVersion] = useState(0);
+    /** Its height while its top border is being dragged (saved when you let go). */
+    const [termDrag, setTermDrag] = useState(null);
+    /** The Games panel's height while its top border is being dragged (saved when you let go). */
+    const [gameSizeDrag, setGameSizeDrag] = useState(null);
+    /** 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,
+     * `guideAsk` holds what you asked (and its edits are turned down: you're doing the typing).
+     */
+    const [guide, setGuide] = useState(null);
+    const guideAsk = useRef(null);
+    /** Where the undo history stood when the steps were asked for: an engine that edits anyway is put back. */
+    const guideMark = useRef(0);
+    const guideFound = useRef(null);
+    const shellRef = useRef(null);
+    const beforeTerm = useRef("code");
     const [follow, setFollow] = useState(settings.followMode);
     // Follow mode replays what the agent reads a step at a time (it reads far faster than you can watch):
     // the steps waiting, and the timer that shows the next one.
@@ -134,6 +156,8 @@ export function App({ initialModel, permContext }) {
         setFollowLag(0);
     };
     const [entries, setEntries] = useState([]);
+    /** This conversation, as saved for /resume: a new one after /clear, an old one once resumed. */
+    const [conversationId, setConversationId] = useState(newSessionId);
     const [streaming, setStreaming] = useState("");
     // Streamed text arrives a token at a time; redrawing the whole screen for each one is wasted work.
     const streamed = useRef({ text: "", timer: null });
@@ -154,6 +178,8 @@ export function App({ initialModel, permContext }) {
         }
     };
     const [busy, setBusy] = useState(null);
+    /** Files Nou has changed (or is asking to) since it started working: they shimmer in the tree until it's done. */
+    const [working, setWorking] = useState(NO_FILES);
     const [choice, setChoice] = useState(initialModel);
     const [approval, setApproval] = useState(null);
     const [openFile, setOpenFile] = useState(null);
@@ -217,8 +243,10 @@ export function App({ initialModel, permContext }) {
     };
     const [codeDefine, setCodeDefine] = useState(null);
     const [chatClick, setChatClick] = useState(null);
+    /** Dragging over the chat's messages selects them (copied when you let go). */
+    const [chatSelect, setChatSelect] = useState(null);
     // Pane geometry from the last render, so mouse events can be mapped to the pane under the pointer.
-    const layout = useRef({ treeWidth: 0, codeWidth: 0, paneHeight: 0 });
+    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);
     const paneWidthsRef = useRef(paneWidths);
@@ -275,29 +303,11 @@ export function App({ initialModel, permContext }) {
                 openAtRef.current(filePath, line ?? 1, false, to);
             },
             onRead: (filePath, line, to) => followStepRef.current({ file: filePath, ...(line ? { line } : {}), ...(to ? { to } : {}) }),
-            onChange: (change, status, turn) => {
-                if (status === "applied") {
-                    timelineRef.current.record({ path: change.path, before: change.isNew ? null : change.before, after: change.after, source: "nou", turn });
-                }
-                const lines = status === "applied" ? changedLines(change.before, change.after) : NO_LINES;
-                setChanges((prev) => new Map(prev).set(change.path, { change, status, lines }));
-                // Diffs awaiting approval are shown unless you're in the middle of editing a file (the chat says what's waiting).
-                if ((status === "pending" && !draftActiveRef.current) || followRef.current) {
-                    clearFollow(); // an edit is shown as it happens, ahead of reads still waiting
-                    setOpenFile(change.path);
-                    setContent(status === "applied" ? change.after : readText(change.path));
-                    setDiffMode("off");
-                    setReveal(change.path);
-                }
-                if (status === "applied") {
-                    setTreeVersion((v) => v + 1);
-                    setGit(gitStatus());
-                    if (draft.current?.path === change.path) {
-                        setEntries((prev) => [...prev, { kind: "info", text: `Heads up: you have unsaved edits in ${change.path}; saving them will overwrite Nou's change.` }]);
-                    }
-                }
-            },
+            onChange: (change, status, turn) => applyChange(change, status, turn, false),
             approve: (request) => {
+                // Asked to show how, not to do it: edits are turned down (the model is told to hand back steps).
+                if (guideAsk.current && request.kind === "change")
+                    return Promise.resolve(false);
                 const s = settingsRef.current;
                 if ((request.kind === "change" && s.autoApproveEdits) || (request.kind !== "change" && s.autoApproveCommands)) {
                     return Promise.resolve(true);
@@ -307,9 +317,154 @@ export function App({ initialModel, permContext }) {
             checkChange: (change) => problemsIntroduced(diagnosticsRef.current, change),
         };
     }
+    /** A change an engine made or proposes; one from a tab in the background doesn't take over the code view. */
+    function applyChange(change, status, turn, background) {
+        if (status === "applied") {
+            timelineRef.current.record({ path: change.path, before: change.isNew ? null : change.before, after: change.after, source: "nou", turn });
+        }
+        const lines = status === "applied" ? changedLines(change.before, change.after) : NO_LINES;
+        setChanges((prev) => new Map(prev).set(change.path, { change, status, lines }));
+        setWorking((w) => {
+            if (status === "rejected")
+                return w.has(change.path) ? new Set([...w].filter((p) => p !== change.path)) : w;
+            return w.has(change.path) ? w : new Set(w).add(change.path);
+        });
+        // Diffs awaiting approval are shown unless you're in the middle of editing a file (the chat says what's waiting).
+        if (!background && ((status === "pending" && !draftActiveRef.current) || followRef.current)) {
+            clearFollow(); // an edit is shown as it happens, ahead of reads still waiting
+            setOpenFile(change.path);
+            setContent(status === "applied" ? change.after : readText(change.path));
+            setDiffMode("off");
+            setReveal(change.path);
+        }
+        if (status === "applied") {
+            setTreeVersion((v) => v + 1);
+            setGit(gitStatus());
+            if (draft.current?.path === change.path) {
+                setEntries((prev) => [...prev, { kind: "info", text: `Heads up: you have unsaved edits in ${change.path}; saving them will overwrite Nou's change.` }]);
+            }
+        }
+    }
+    // Conversation tabs: several agents at once. The one on screen uses the state above; the others keep
+    // theirs here, and each tab's engine reports through hooks that send it to the right place.
+    const activeTab = useRef("1");
+    const [activeTabId, setActiveTabId] = useState("1");
+    const [chatTabs, setChatTabs] = useState(["1"]);
+    const tabStore = useRef(new Map());
+    const [, setTabVersion] = useState(0);
+    const tabHooks = useRef(new Map());
+    /** The tab strip's data, kept while it reads the same, so the chat doesn't redraw on every app render. */
+    const chatTabsCache = useRef(null);
+    /** The hooks for tab `id`'s engine: on screen, they're the chat's own; in the background, its stored state. */
+    function hooksFor(id) {
+        const cached = tabHooks.current.get(id);
+        if (cached)
+            return cached;
+        const live = () => hooksRef.current;
+        const shown = () => activeTab.current === id;
+        const stored = (fn) => {
+            const t = tabStore.current.get(id);
+            if (!t)
+                return;
+            fn(t);
+            setTabVersion((v) => v + 1);
+        };
+        const hooks = {
+            onEntry: (entry) => (shown() ? live().onEntry(entry) : stored((t) => (t.entries = [...t.entries, entry]))),
+            onStream: (text) => (shown() ? live().onStream(text) : void (tabStore.current.get(id) && (tabStore.current.get(id).streaming = text))),
+            onBusy: (label) => {
+                if (shown())
+                    return live().onBusy(label);
+                stored((t) => {
+                    t.busy = label;
+                    if (!label)
+                        saveTab(t); // it finished in the background: keep it for /resume
+                });
+            },
+            onOpen: (...args) => (shown() ? live().onOpen?.(...args) : undefined),
+            onRead: (...args) => (shown() ? live().onRead(...args) : undefined),
+            onChange: (change, status, turn) => applyChange(change, status, turn, !shown()),
+            approve: (request) => {
+                if (shown())
+                    return live().approve(request);
+                const s = settingsRef.current;
+                if ((request.kind === "change" && s.autoApproveEdits) || (request.kind !== "change" && s.autoApproveCommands))
+                    return Promise.resolve(true);
+                // It waits for you: its tab says so, and the question is there when you switch to it.
+                return new Promise((resolve) => stored((t) => (t.approval = { request, resolve })));
+            },
+            checkChange: (change) => live().checkChange?.(change) ?? Promise.resolve(null),
+        };
+        tabHooks.current.set(id, hooks);
+        return hooks;
+    }
+    /** Puts tab `id` on screen, keeping the one there now (and whatever it's doing) in the background. */
+    function switchChatTab(id) {
+        if (id === activeTab.current || !tabStore.current.has(id))
+            return;
+        tabStore.current.set(activeTab.current, { entries, streaming: streamed.current.text, busy, approval, queued, conversationId, agent: agentRef.current });
+        const t = tabStore.current.get(id);
+        tabStore.current.delete(id);
+        activeTab.current = id;
+        setActiveTabId(id);
+        agentRef.current = t.agent;
+        setEntries(t.entries);
+        showStream(t.streaming);
+        setBusy(t.busy);
+        setApproval(t.approval);
+        setQueued(t.queued);
+        setConversationId(t.conversationId);
+        setFocus("chat");
+    }
+    /** A new conversation tab, with the same engine and model, next to the others. */
+    function newChatTab() {
+        const id = String(Date.now());
+        const agent = createEngine(agentRef.current.id, choice, engineConfig.current.system ?? buildSystemPrompt(permContext), hooksFor(id));
+        agent.configure(engineConfig.current);
+        tabStore.current.set(id, { entries: [], streaming: "", busy: null, approval: null, queued: [], conversationId: newSessionId(), agent });
+        setChatTabs((tabs) => [...tabs, id]);
+        switchChatTab(id);
+    }
+    /** Closes the conversation tab on screen (stopping its engine); the conversation stays saved for /resume. */
+    function closeChatTab() {
+        if (chatTabs.length < 2)
+            return info("That's the only conversation tab. /clear starts a fresh conversation in it.");
+        const id = activeTab.current;
+        const at = chatTabs.indexOf(id);
+        const next = chatTabs[at + 1] ?? chatTabs[at - 1];
+        const agent = agentRef.current;
+        approval?.resolve(false);
+        switchChatTab(next);
+        agent.cancel();
+        agent.dispose?.();
+        tabStore.current.delete(id);
+        tabHooks.current.delete(id);
+        setChatTabs((tabs) => tabs.filter((t) => t !== id));
+    }
+    /** The tabs as the chat's title row shows them: named for what you asked first, marked when working or waiting. */
+    function chatTabItems() {
+        return chatTabs.map((id, i) => {
+            const t = id === activeTab.current ? { entries, busy, approval } : tabStore.current.get(id);
+            const first = t?.entries.find((e) => e.kind === "user")?.text.replace(/\s+/g, " ");
+            const label = first ? (first.length > 14 ? `${first.slice(0, 13)}…` : first) : `chat ${i + 1}`;
+            return { id, label, state: t?.approval ? "waiting" : t?.busy ? "busy" : "idle" };
+        });
+    }
+    function chatTabsProp() {
+        const items = chatTabItems();
+        const key = `${activeTabId}|${items.map((t) => `${t.id}:${t.label}:${t.state}`).join("|")}`;
+        if (chatTabsCache.current?.key !== key)
+            chatTabsCache.current = { key, tabs: { items, active: activeTabId } };
+        return chatTabsCache.current.tabs;
+    }
+    function saveTab(t) {
+        const first = t.entries.find((e) => e.kind === "user");
+        if (first)
+            saveConversation({ id: t.conversationId, title: first.text.replace(/\s+/g, " ").slice(0, 80), updated: Date.now(), engine: t.agent.id, entries: t.entries, state: t.agent.snapshot?.() });
+    }
     if (!agentRef.current) {
         const saved = loadSettings().engine;
-        agentRef.current = createEngine(isEngineId(saved) ? saved : "nou", initialModel, buildSystemPrompt(permContext), hooksRef.current);
+        agentRef.current = createEngine(isEngineId(saved) ? saved : "nou", initialModel, buildSystemPrompt(permContext), hooksFor(activeTab.current));
     }
     useEffect(() => diagnostics.subscribe(() => setDiagVersion((v) => v + 1)), []);
     useEffect(() => onGrammarLoaded(() => setSyntaxVersion((v) => v + 1)), []);
@@ -318,6 +473,24 @@ export function App({ initialModel, permContext }) {
     useEffect(() => {
         void checkForUpdate().then(setUpdate);
     }, []);
+    useEffect(() => {
+        if (!busy)
+            setWorking(NO_FILES); // done: the files stop shimmering (● still marks them)
+    }, [!busy]);
+    // After each reply, the conversation is saved so /resume can pick it back up.
+    useEffect(() => {
+        const first = entries.find((e) => e.kind === "user");
+        if (busy || !first)
+            return;
+        const engine = agentRef.current;
+        saveConversation({ id: conversationId, title: first.text.replace(/\s+/g, " ").slice(0, 80), updated: Date.now(), engine: engine.id, entries, state: engine.snapshot?.() });
+    }, [!busy, entries.length, conversationId]);
+    /** Earlier conversations for the palette, read from disk when it opens. */
+    const recentChats = useMemo(() => (quickOpen !== null ? resumable() : []), [quickOpen !== null]);
+    useEffect(() => {
+        if (resume)
+            void resumeConversation(resume === "last" ? "last" : "");
+    }, []);
     // Discover plugins once and load the enabled ones.
     useEffect(() => {
         void (async () => {
@@ -363,7 +536,7 @@ export function App({ initialModel, permContext }) {
     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, ...mcpRef.current.tools()], effort: settings.effort };
+        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 };
         agentRef.current.configure(engineConfig.current);
     }, [settings.gitContext, settings.effort, activePlugins, mcpVersion]);
     // Pick up changes made outside Nou (other editors, git commands).
@@ -431,7 +604,7 @@ export function App({ initialModel, permContext }) {
             info(`Installed ${target.label} (${target.package}).`);
         }
         agentRef.current.dispose?.();
-        const engine = createEngine(id, choice, engineConfig.current.system ?? buildSystemPrompt(permContext), hooksRef.current);
+        const engine = createEngine(id, choice, engineConfig.current.system ?? buildSystemPrompt(permContext), hooksFor(activeTab.current));
         engine.configure(engineConfig.current);
         agentRef.current = engine;
         updateSettings({ engine: id });
@@ -440,6 +613,80 @@ export function App({ initialModel, permContext }) {
             engine.note(handoff);
         info(`Now using the ${target.label} engine (model: ${target.model(choice)}). ${handoff ? "It has the conversation so far." : "This starts a new conversation."}${target.approvals === "after" ? " It edits without asking first; review its changes in the diff view and press u to undo." : ""}`);
     };
+    /**
+     * /resume: lists this folder's earlier conversations, or picks one back up (by number, or "last"). The
+     * engine it was with carries on from its own saved state where it can (Nou's messages, Claude Code's
+     * session, Codex's thread); otherwise it's handed the conversation, like switching engines.
+     */
+    const resumeConversation = async (arg) => {
+        if (busy)
+            return info("Wait for the current reply to finish (or press Esc) before resuming another conversation.", "error");
+        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.");
+        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)})`);
+            return info(`Earlier conversations here. /resume <number> picks one up (or /resume last):\n${rows.join("\n")}`);
+        }
+        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");
+        if ("file" in pick)
+            return resumeExternal(pick);
+        const saved = loadConversation(pick.id);
+        if (!saved)
+            return info(`Couldn't read conversation ${arg}.`, "error");
+        const engine = engineFor(isEngineId(saved.engine) ? saved.engine : null);
+        const restored = saved.engine === engine.id && !!saved.state && !!engine.restore?.(saved.state);
+        if (!restored) {
+            const handoff = conversationSoFar(saved.entries);
+            if (handoff)
+                engine.note(handoff);
+        }
+        setConversationId(saved.id);
+        setQueued([]);
+        setEntries([...saved.entries, { kind: "info", text: `Resumed "${saved.title}" from ${ago(saved.updated)} with ${engineInfo(engine.id).label}. ${restored ? "It picks up right where it left off." : "It has the conversation so far."}` }]);
+        setFocus("chat");
+    };
+    /** Nou's saved conversations and Claude Code's and Codex's own sessions here, latest first, without doubles. */
+    function resumable() {
+        const own = listConversations().filter((c) => c.id !== conversationId);
+        const current = agentRef.current.snapshot?.();
+        const known = new Set([...own.map((c) => c.ref), current?.claudeSession, current?.codexThread].filter(Boolean));
+        return [...own, ...externalSessions().filter((s) => !known.has(s.id))].sort((a, b) => b.updated - a.updated);
+    }
+    /** The engine to resume with: back to `id` when it's installed (it picks up best), else the current one, cleared. */
+    const engineFor = (id) => {
+        let engine = agentRef.current;
+        if (id && id !== engine.id && isInstalled(engineInfo(id))) {
+            engine.dispose?.();
+            engine = createEngine(id, choice, engineConfig.current.system ?? buildSystemPrompt(permContext), hooksFor(activeTab.current));
+            engine.configure(engineConfig.current);
+            agentRef.current = engine;
+            updateSettings({ engine: id });
+        }
+        engine.clear();
+        return engine;
+    };
+    /** A session from Claude Code's or Codex's own CLI: that engine resumes it, so it carries on with all of it. */
+    const resumeExternal = (session) => {
+        const label = engineInfo(session.engine).label;
+        if (!isInstalled(engineInfo(session.engine))) {
+            return info(`That's a ${label} session: switch to its engine first (/engine ${session.engine}, which installs it), then /resume it again.`, "error");
+        }
+        const engine = engineFor(session.engine);
+        const restored = !!engine.restore?.(session.engine === "claude-code" ? { claudeSession: session.id } : { codexThread: session.id });
+        const entries = externalEntries(session);
+        if (!restored) {
+            const handoff = conversationSoFar(entries);
+            if (handoff)
+                engine.note(handoff);
+        }
+        setConversationId(newSessionId());
+        setQueued([]);
+        setEntries([...entries, { kind: "info", text: `Resumed "${session.title}" from ${label}'s CLI (${ago(session.updated)}). ${label} picks up right where it left off, with Nou's diffs and undo from here on.` }]);
+        setFocus("chat");
+    };
     /** Downloads an Ollama model, showing progress in the status line. Esc stops it. */
     const pullModel = async (model) => {
         const ollama = providers.find((p) => p.id === "ollama");
@@ -629,7 +876,7 @@ export function App({ initialModel, permContext }) {
     };
     /** Scrolls a pane to where its scrollbar was clicked or dragged (rows start at y=3, under the border and title). */
     const scrollPane = (pane, y) => {
-        const { paneHeight } = layout.current;
+        const paneHeight = pane === "game" || pane === "terminal" ? 0 : layout.current.heights[pane];
         const fraction = (y - 3) / Math.max(1, paneHeight - 4);
         setScrollTo((s) => ({ pane, fraction, nonce: (s?.nonce ?? 0) + 1 }));
     };
@@ -640,35 +887,88 @@ export function App({ initialModel, permContext }) {
     useMouse((event) => {
         if (view !== "main" || quickOpen !== null)
             return;
-        // The Games panel floats over the panes: it takes the clicks that land on it, and its title bar drags it.
-        if (gamesOpen) {
+        // The Games panel sits under a pane: it takes the clicks that land on it, × on its title closes it,
+        // and dragging its title docks it under the pane you let go over.
+        const term = layout.current.terminal;
+        // Dragging the terminal's top border makes it taller or shorter; its bottom stays put.
+        if (term && dragging.current === "terminal") {
+            const rows = Math.max(4, term.y + term.height - event.y);
+            if (event.kind === "release") {
+                dragging.current = null;
+                setTermDrag(null);
+                updateSettings({ terminalRows: rows });
+            }
+            else if (event.kind === "drag")
+                setTermDrag(rows);
+            return;
+        }
+        if (term && event.x >= term.x && event.x < term.x + term.width && event.y >= term.y && event.y < term.y + term.height && !dragging.current) {
+            if (event.kind === "wheel")
+                return queueWheel("terminal", event.dir, false);
+            if (event.kind !== "click")
+                return;
+            if (event.y === term.y + 1 && event.x >= term.x + term.width - 5)
+                return toggleTerminal(false); // ×
+            if (event.y === term.y) {
+                dragging.current = "terminal"; // its top border: drag to resize
+                return;
+            }
+            if (focus !== "terminal")
+                beforeTerm.current = focus;
+            setFocus("terminal");
+            return;
+        }
+        const game = layout.current.game;
+        if (gamesOpen && game) {
             const drag = dragging.current;
-            if (drag && typeof drag === "object" && "game" in drag) {
-                const at = placeGames(event.x - drag.game.dx, event.y - drag.game.dy);
+            // Its top border makes it taller or shorter (its bottom stays put); its title moves it.
+            if (drag === "gameSize") {
+                const rows = Math.max(GAME_PANEL.minHeight, game.y + game.height - event.y);
+                if (event.kind === "release") {
+                    dragging.current = null;
+                    setGameSizeDrag(null);
+                    updateSettings({ gameRows: rows });
+                }
+                else if (event.kind === "drag")
+                    setGameSizeDrag(rows);
+                return;
+            }
+            if (drag === "game") {
+                const { treeWidth, codeWidth } = layout.current;
+                const over = event.x < treeWidth ? "tree" : event.x < treeWidth + codeWidth ? "code" : "chat";
                 if (event.kind === "release") {
                     dragging.current = null;
                     setGameDrag(null);
-                    updateSettings({ gamePanel: at });
+                    updateSettings({ gameDock: over });
                 }
                 else
-                    setGameDrag(at);
+                    setGameDrag(over);
                 return;
             }
-            const g = gamePos;
-            const inside = event.x >= g.x && event.x < g.x + GAME_PANEL.width && event.y >= g.y && event.y < g.y + GAME_PANEL.height;
+            const inside = event.x >= game.x && event.x < game.x + game.width && event.y >= game.y && event.y < game.y + game.height;
             if (inside) {
                 if (event.kind !== "click")
                     return;
+                if (event.y === game.y + 1 && event.x >= game.x + game.width - 5) {
+                    // × closes it
+                    setGamesOpen(false);
+                    if (focus === "game")
+                        setFocus(beforeGame.current === "game" ? "chat" : beforeGame.current);
+                    return;
+                }
                 if (focus !== "game")
                     beforeGame.current = focus;
                 setFocus("game");
-                if (event.y <= g.y + 1)
-                    dragging.current = { game: { dx: event.x - g.x, dy: event.y - g.y } };
+                if (event.y === game.y)
+                    dragging.current = "gameSize";
+                else if (event.y === game.y + 1)
+                    dragging.current = "game";
                 return;
             }
         }
         const { treeWidth, codeWidth, paneHeight } = layout.current;
         const codeLeft = treeWidth;
+        const chatAt = (x, y, kind) => setChatSelect((c) => ({ row: y - 3, col: x - treeWidth - codeWidth - 3, kind, nonce: (c?.nonce ?? 0) + 1 }));
         const editorAt = (x, y, kind) => setEditorMouse((m) => [...m.slice(-15), { x: x - codeLeft - 1, y: y - 3, kind, seq: (m[m.length - 1]?.seq ?? 0) + 1 }]);
         if (event.kind === "drag") {
             lastClick.current = null; // a press that became a drag doesn't start a double-click
@@ -677,7 +977,9 @@ export function App({ initialModel, permContext }) {
                 moveBorder(drag, event.x);
             else if (drag === "editor")
                 editorAt(event.x, event.y, "drag");
-            else if (drag && "scroll" in drag)
+            else if (drag === "chatText")
+                chatAt(event.x, event.y, "drag");
+            else if (drag && typeof drag === "object")
                 scrollPane(drag.scroll, event.y);
             return;
         }
@@ -692,6 +994,8 @@ export function App({ initialModel, permContext }) {
                 scrollPane(dragging.current.scroll, event.y);
             if (dragging.current === "editor")
                 editorAt(event.x, event.y, "release");
+            if (dragging.current === "chatText")
+                chatAt(event.x, event.y, "release");
             dragging.current = null;
             return;
         }
@@ -722,12 +1026,29 @@ export function App({ initialModel, permContext }) {
             scrollPane(pane, event.y);
             return;
         }
+        // The chat's title row holds the conversation tabs: a click switches, + opens a new one.
+        if (event.kind === "click" && pane === "chat" && event.y === 2) {
+            const at = event.x - treeWidth - codeWidth - 1;
+            const { zones, plus } = chatTabZones(chatTabItems());
+            if (Math.abs(at - plus) <= 1)
+                return newChatTab();
+            const zone = zones.find((z) => at >= z.from && at < z.to);
+            if (zone)
+                return switchChatTab(zone.id);
+        }
         // The code view's title row holds the tabs: a click switches, the × closes.
-        if (event.kind === "click" && pane === "code" && event.y === 2 && tabs.length >= 2 && !diff) {
-            const zone = layoutTabs(tabs, openFile, tabsWidth(codeWidth)).zones.find((z) => event.x - codeLeft - 1 >= z.from && event.x - codeLeft - 1 < z.to);
+        if (event.kind === "click" && pane === "code" && event.y === 2 && tabs.length && !diff) {
+            const at = event.x - codeLeft - 1;
+            const layout = layoutTabs(tabs, openFile, tabsWidth(codeWidth));
+            setFocus("code"); // so x, Ctrl+W and [ ] work next
+            if (layout.prev !== null && at === layout.prev)
+                return cycleTab(-1);
+            if (layout.next !== null && at === layout.next)
+                return cycleTab(1);
+            const zone = layout.zones.find((z) => at >= z.from && at < z.to);
             if (!zone)
                 return;
-            if (zone.close !== null && Math.abs(event.x - codeLeft - 1 - zone.close) <= 1)
+            if (Math.abs(at - zone.close) <= 1)
                 closeTab(zone.file);
             else
                 switchTab(zone.file);
@@ -750,8 +1071,11 @@ export function App({ initialModel, permContext }) {
         if (pane === "tree" && event.y >= 3)
             setTreeClick((c) => ({ row: event.y - 3, nonce: (c?.nonce ?? 0) + 1 }));
         // Messages start after the chat's border and the two-column bar in front of each line.
-        if (pane === "chat" && event.y >= 3)
+        if (pane === "chat" && event.y >= 3) {
             setChatClick((c) => ({ row: event.y - 3, col: event.x - treeWidth - codeWidth - 3, nonce: (c?.nonce ?? 0) + 1 }));
+            dragging.current = "chatText";
+            chatAt(event.x, event.y, "press");
+        }
         // 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;
@@ -776,6 +1100,8 @@ export function App({ initialModel, permContext }) {
             return;
         if (showEditor && focus === "code" && editorStateRef.current?.selection)
             return; // the editor copies it
+        if (focus === "terminal")
+            return; // the terminal stops its command
         if (busy || approval) {
             stop();
             approval?.resolve(false);
@@ -1013,6 +1339,8 @@ export function App({ initialModel, permContext }) {
     openAtRef.current = openAt;
     /** A file named in the chat (clicked, or shown by Nou): open it there, highlighting the lines it names. */
     const openRef = useEvent((ref) => {
+        if (ref.url)
+            return openInBrowser(ref.url);
         clearFollow();
         const file = path.relative(process.cwd(), path.resolve(ref.path)).replace(/\\/g, "/");
         openAt(file, ref.line ?? 1, false, ref.line ? ref.to ?? ref.line : undefined);
@@ -1052,7 +1380,7 @@ export function App({ initialModel, permContext }) {
                 stop();
                 return answer(false);
             }
-            if (focus !== "chat" && /^[yYnN]$/.test(input))
+            if (focus !== "chat" && focus !== "terminal" && /^[yYnN]$/.test(input))
                 return answer(/[yY]/.test(input));
             if (focus !== "chat" && input === "o" && pendingChange)
                 return openPending();
@@ -1065,8 +1393,8 @@ export function App({ initialModel, permContext }) {
             return; // the editor owns the keyboard
         if (focus === "code" && codeFinding.current)
             return; // so does the find bar
-        if (focus === "game")
-            return; // and the Games panel
+        if (focus === "game" || focus === "terminal")
+            return; // and the Games panel and the terminal
         if (key.tab && key.shift)
             return cycleAutoMode();
         if (key.tab && focus === "chat" && chatMenuOpen.current)
@@ -1099,6 +1427,8 @@ export function App({ initialModel, permContext }) {
             setFollow((f) => !f);
         else if (input === "m")
             toggleMouse();
+        else if (input === "`")
+            toggleTerminal();
         else if (input === "p")
             toggleProblems();
         else if (input === "u")
@@ -1119,7 +1449,7 @@ export function App({ initialModel, permContext }) {
             stepSessionFile(input === "]" ? 1 : -1);
         else if (input === "]" || input === "[")
             cycleTab(input === "]" ? 1 : -1);
-        else if (input === "x")
+        else if (input === "x" || (key.ctrl && input === "w"))
             closeTab();
         else if (input === "e")
             startEditing();
@@ -1274,6 +1604,8 @@ ${snippet}
             }
             case "games":
                 return toggleGames();
+            case "cancel":
+                return cancelLast();
             case "mcp":
                 return mcpCommand(rest);
             case "problems":
@@ -1380,7 +1712,25 @@ ${snippet}
             case "clear":
                 agentRef.current.clear();
                 setEntries([]);
+                setConversationId(newSessionId()); // the last one stays saved for /resume
                 return;
+            case "terminal":
+                return toggleTerminal();
+            case "new":
+                return newChatTab();
+            case "close":
+                return closeChatTab();
+            case "tab": {
+                const n = Number(arg);
+                if (!n || !chatTabs[n - 1])
+                    return info(`Conversation tabs: ${chatTabItems().map((t, i) => `${i + 1}. ${t.label}${t.state !== "idle" ? ` (${t.state === "busy" ? "working" : "waiting on you"})` : ""}`).join("  ")}. /tab <n> switches, /new opens one, /close closes this one.`);
+                return switchChatTab(chatTabs[n - 1]);
+            }
+            case "showme":
+            case "teach":
+                return showMe(rest.join(" "));
+            case "resume":
+                return resumeConversation(rest[0] ?? "");
             case "plugins":
                 return pluginsCommand(rest);
             case "version":
@@ -1427,7 +1777,38 @@ ${snippet}
     };
     const setupCheckRef = useRef(setupCheck);
     setupCheckRef.current = setupCheck;
-    /** Messages sent while Nou works: each goes when it finishes, in order. */
+    /**
+     * Takes back your last message: stops Nou if it's still on it, removes the message and its reply from the
+     * conversation (yours on screen and the model's), and puts the text back in the input to edit and resend.
+     * Files it changed stay changed: /rewind undoes those.
+     */
+    // What was queued behind it comes back into the input too, rather than being sent.
+    const [retract, setRetract] = useState(null);
+    const cancelLast = () => {
+        setRetract({ queued });
+        setQueued([]);
+        if (busy)
+            stop();
+    };
+    useEffect(() => {
+        if (!retract || busy)
+            return;
+        const later = retract.queued;
+        setRetract(null);
+        const engine = agentRef.current;
+        const at = entries.findLastIndex((e) => e.kind === "user");
+        if (at < 0)
+            return info("There's no message to take back.");
+        if (!engine.retractLast)
+            return info(`${engineInfo(engine.id).label} keeps its own history, so a message can't be taken back there: /clear starts over.`, "error");
+        engine.retractLast();
+        const text = [entries[at].text, ...later].join("\n");
+        stopped.current = false;
+        setEntries((prev) => [...prev.slice(0, at), { kind: "info", text: "Took back your last message; it's in the input to edit and resend. (Any files it changed stay changed: /rewind undoes them.)" }]);
+        setChatPrefill((p) => ({ text, nonce: (p?.nonce ?? 0) + 1 }));
+        setFocus("chat");
+    }, [retract, busy]);
+    /** Messages sent while Nou works: they go together when it finishes (commands each in turn). */
     const [queued, setQueued] = useState([]);
     /** Set when you stop Nou: what was queued goes back into the input instead of being sent. */
     const stopped = useRef(false);
@@ -1445,17 +1826,111 @@ ${snippet}
             setQueued([]);
             return;
         }
-        const [next, ...rest] = queued;
-        setQueued(rest);
-        send(next);
+        // Messages queued together go together, as one message, so they're answered at once rather than one
+        // after another. A command runs on its own, in its turn.
+        const isCommand = (text) => text.startsWith("/");
+        const take = isCommand(queued[0]) ? 1 : Math.max(1, queued.findIndex(isCommand) === -1 ? queued.length : queued.findIndex(isCommand));
+        setQueued(queued.slice(take));
+        send(queued.slice(0, take).join("\n\n"));
     }, [busy, approval, queued]);
+    // When Nou has finished looking, the guide starts at its first step.
+    useEffect(() => {
+        if (busy || !guideAsk.current)
+            return;
+        const task = guideAsk.current;
+        let steps = guideFound.current;
+        guideAsk.current = null;
+        guideFound.current = null;
+        // Other engines hand their steps back in a ```nou-steps block at the end of the reply: read it, and
+        // show the reply without it.
+        if (!steps?.length) {
+            const reply = [...entries].reverse().find((e) => e.kind === "assistant");
+            const found = reply && stepsFromReply(reply.text);
+            if (found) {
+                steps = found.steps;
+                setEntries((prev) => prev.map((e) => (e === reply ? { ...e, text: found.rest || "Here's how." } : e)));
+            }
+        }
+        // Asked not to, an engine that edited anyway (Codex can't be stopped before it does) is put back.
+        const edited = timeline.all.slice(guideMark.current).filter((c) => c.source === "nou" && !c.undone);
+        if (edited.length) {
+            undoCheckpoints([...edited].reverse());
+            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.`);
+        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.
+    useEffect(() => {
+        if (!guide)
+            return;
+        const step = guide.steps[guide.at];
+        if (!existsSync(step.file)) {
+            // A step that starts a new file: it's created empty, for you to type into.
+            mkdirSync(path.dirname(path.resolve(step.file)), { recursive: true });
+            writeFileSync(step.file, "");
+            setTreeVersion((v) => v + 1);
+        }
+        info(`👉 Step ${guide.at + 1} of ${guide.steps.length}: ${step.file}:${step.line}\n${step.why}\n\n\`\`\`\n${step.code}\n\`\`\``);
+        openAt(step.file, step.line, true);
+    }, [guide?.at, guide?.steps]);
+    const guideStep = guide?.steps[guide.at] ?? null;
+    /** The step's code is all typed: save it, and go on to the next one. */
+    const onGuideDone = useEvent(() => {
+        if (!guide || !guideStep)
+            return;
+        if (draft.current?.path === guideStep.file)
+            saveFromEditor(draft.current.text, guideStep.file);
+        // Later steps in the same file further down move down by the lines just added.
+        const added = guideStep.code.split("\n").length;
+        const steps = guide.steps.map((s, i) => (i > guide.at && s.file === guideStep.file && s.line >= guideStep.line ? { ...s, line: s.line + added } : s));
+        if (guide.at + 1 < steps.length) {
+            info(`✓ Step ${guide.at + 1} done.`);
+            setGuide({ ...guide, steps, at: guide.at + 1 });
+        }
+        else {
+            info(`🎉 That's it: all ${steps.length} step${steps.length > 1 ? "s" : ""} done and saved. Ask Nou to check it over if you like.`);
+            setGuide(null);
+        }
+    });
+    /** /showme <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") {
+            setGuide(null);
+            return info(guide ? "Stopped the guide. What you typed so far stays." : "No guide is running.");
+        }
+        if (words === "next" || words === "skip") {
+            if (!guide)
+                return info("No guide is running.");
+            if (guide.at + 1 >= guide.steps.length) {
+                setGuide(null);
+                return info("That was the last step.");
+            }
+            return setGuide({ ...guide, at: guide.at + 1 });
+        }
+        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");
+        }
+        if (busy)
+            return info("Wait for the current reply to finish (or press Esc) first.", "error");
+        setGuide(null);
+        guideAsk.current = words;
+        guideFound.current = null;
+        guideMark.current = timeline.all.length;
+        send(showMePrompt(words, agentRef.current.id === "nou"));
+    };
     useEffect(() => {
         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) => {
-        if (!busy)
+        if (!busy || (text.startsWith("/") && runsWhileBusy(text)))
             return send(text);
         if (now) {
             stop();
@@ -1577,8 +2052,21 @@ ${snippet}
     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 codeWidth = Math.max(MIN_CODE, columns - treeWidth - chatWidth);
-    const tabStrip = tabs.length >= 2 && openFile ? _jsx(Tabs, { tabs: tabs, active: openFile, width: tabsWidth(codeWidth), dirty: showEditor && !!editorState?.dirty }) : undefined;
-    layout.current = { treeWidth, codeWidth, paneHeight: height };
+    const tabKey = tabs.length && openFile ? `${tabs.join("\0")}|${openFile}|${tabsWidth(codeWidth)}|${showEditor && !!editorState?.dirty}` : "";
+    if (tabStripCache.current?.key !== tabKey) {
+        tabStripCache.current = { key: tabKey, strip: tabKey ? _jsx(Tabs, { tabs: tabs, active: openFile, width: tabsWidth(codeWidth), dirty: showEditor && !!editorState?.dirty }) : undefined };
+    }
+    const tabStrip = tabStripCache.current.strip;
+    // The Games panel takes the bottom of its pane's column: up to 19 rows, and never more than half.
+    const gameHeight = gamesOpen ? Math.max(GAME_PANEL.minHeight, Math.min(gameSizeDrag ?? settings.gameRows ?? GAME_PANEL.height, height - 6)) : 0;
+    const heights = { tree: height, code: height, chat: height };
+    heights[gameDock] -= gameHeight;
+    // The terminal takes the bottom third of the code's column (above the Games panel when that's there too).
+    const termHeight = termOpen ? Math.max(4, Math.min(termDrag ?? settings.terminalRows ?? Math.floor(height / 3), heights.code - 4)) : 0;
+    heights.code -= termHeight;
+    const dockLeft = gameDock === "tree" ? 0 : gameDock === "code" ? treeWidth : treeWidth + codeWidth;
+    const dockWidth = gameDock === "tree" ? treeWidth : gameDock === "code" ? codeWidth : chatWidth;
+    layout.current = { treeWidth, codeWidth, paneHeight: height, heights, game: gamesOpen ? { x: dockLeft, y: 1 + heights[gameDock] + (gameDock === "code" ? termHeight : 0), width: dockWidth, height: gameHeight } : null, terminal: termOpen ? { x: treeWidth, y: 1 + heights.code, width: codeWidth, height: termHeight } : null };
     const wheelFor = (pane) => (wheel?.pane === pane ? wheel : null);
     const scrollFor = (pane) => (scrollTo?.pane === pane ? scrollTo : null);
     const totals = diagnostics.counts();
@@ -1592,6 +2080,27 @@ ${snippet}
         updateSettings({ mouse: !settings.mouse });
         info(settings.mouse ? "Mouse off: drag to select text and copy it as usual in your terminal. m turns it back on." : "Mouse on: wheel scrolls, click focuses, drag borders to resize.");
     };
+    /** 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));
+        setTermOpen(open);
+        if (open) {
+            if (focus !== "terminal")
+                beforeTerm.current = focus;
+            setFocus("terminal");
+        }
+        else if (focus === "terminal")
+            setFocus(beforeTerm.current === "terminal" ? "code" : beforeTerm.current);
+    }
+    /** Alt+↑/↓ in the terminal: taller or shorter by a couple of rows. */
+    function resizeTerminal(by) {
+        const now = layout.current.terminal?.height ?? 0;
+        if (now)
+            updateSettings({ terminalRows: Math.max(4, now + by) });
+    }
+    function leaveTerminal() {
+        setFocus(beforeTerm.current === "terminal" ? "code" : beforeTerm.current);
+    }
     /** Opens the Games panel and gives it the keyboard, or closes it. */
     const toggleGames = (open = !gamesOpen) => {
         setGamesOpen(open);
@@ -1629,6 +2138,10 @@ ${snippet}
         { title: "Find in the open file", keys: "Ctrl+F", 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 },
+        { title: "Resume an earlier conversation", keys: "/resume", run: () => void resumeConversation("") },
+        { title: termOpen ? "Close the terminal" : "Open a terminal under the code", keys: "`", run: () => toggleTerminal() },
+        ...recentChats.slice(0, 5).map((c) => ({ title: `Resume: ${c.title}${"file" in c ? ` (${engineInfo(c.engine).label} CLI)` : ""}`, keys: ago(c.updated), run: () => void resumeConversation(c.id) })),
         { title: "MCP servers: tools from other programs", keys: "/mcp", run: () => void runCommand("/mcp") },
         { title: "Browser control (Playwright MCP)", keys: "/mcp add browser", run: () => void runCommand("/mcp add browser") },
         { title: "Import MCP servers from Claude Code, Cursor, Codex...", keys: "/mcp import", run: () => void runCommand("/mcp import") },
@@ -1739,9 +2252,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: height, focused: focus === "tree", openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, git: git, problemCounts: problemCounts, wheel: wheelFor("tree"), scrollTo: scrollFor("tree"), click: treeClick, onOpen: onTreeOpen, onHover: onTreeHover }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: height, focused: focus === "code", problems: diagnostics.all(), checking: checking, wheel: wheelFor("code"), onJump: onJump, onClose: onCloseProblems })) : showEditor ? (_jsx(Editor, { ...(tabStrip ? { tabs: tabStrip } : {}), width: codeWidth, height: height, 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 }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { ...(tabStrip && !diff ? { tabs: tabStrip } : {}), width: codeWidth, height: height, 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 })), _jsx(Chat, { width: chatWidth, height: height, 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, 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 }), _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 })), _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
                             ? _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)))] }) }), gamesOpen && (_jsx(GamePanel, { x: gamePos.x, y: gamePos.y, focused: focus === "game", installed: settings.games, 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, onResize: resizeTerminal }) })), layout.current.game && (_jsx(Box, { position: "absolute", marginLeft: layout.current.game.x, marginTop: layout.current.game.y, children: _jsx(GamePanel, { width: layout.current.game.width, height: layout.current.game.height, focused: focus === "game", moving: !!gameDrag, installed: settings.games, onLeave: leaveGames, onOpenSettings: gamesSettings }) })), quickOpen !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, recent: recent, actions: paletteActions, initialQuery: quickOpen, onPick: (file) => {
                     setQuickOpen(null);
                     clearFollow();
                     open(file);