nou-cli 0.4.0 → 0.5.1

package/README.md

@@ -76,12 +76,13 @@ Every change is reviewed like a code review:
 
 | Key | Does |
 | --- | --- |
-| 🖱️ Mouse | wheel scrolls the pane under the pointer · click a pane to focus it · click a file to open it · drag a border between panes to resize them (hold <kbd>Shift</kbd> to select text, or press <kbd>m</kbd> to turn the mouse off) |
-| <kbd>Shift</kbd>+<kbd>↑</kbd>/<kbd>↓</kbd>, <kbd>PgUp</kbd>/<kbd>PgDn</kbd> | scroll the chat history |
+| 🖱️ Mouse | wheel scrolls the pane under the pointer (<kbd>Shift</kbd>+wheel or a tilt wheel: sideways) · click or drag a scrollbar to jump · click a file to open it · **double-click in the code to edit right there** (in the editor: select a word), drag to select · drag a border between panes to resize them (press <kbd>m</kbd> to turn the mouse off and select text in your terminal) |
+| <kbd>PgUp</kbd>/<kbd>PgDn</kbd>, <kbd>Shift</kbd>+<kbd>↑</kbd>/<kbd>↓</kbd> | scroll the chat; scrolled up, new replies wait below instead of yanking the view (<kbd>Ctrl</kbd>+<kbd>End</kbd> jumps back) |
+| <kbd>/</kbd> | start a command from any pane |
 | <kbd>Tab</kbd> | switch between files, code and chat |
 | <kbd>Shift</kbd>+<kbd>Tab</kbd> | ask → auto-edit (edits apply without asking) → auto (commands too); everything stays undoable |
 | <kbd>Ctrl</kbd>+<kbd>P</kbd> | fuzzy-find a file |
-| <kbd>e</kbd> | edit the open file (<kbd>Ctrl</kbd>+<kbd>S</kbd> save · <kbd>Ctrl</kbd>+<kbd>Z</kbd>/<kbd>Y</kbd> undo/redo · <kbd>Ctrl</kbd>+<kbd>K</kbd> info · <kbd>Ctrl</kbd>+<kbd>G</kbd> definition · <kbd>Esc</kbd> close) |
+| <kbd>e</kbd> or a double-click | edit the open file (see the editor keys below) |
 | <kbd>p</kbd> | Problems panel: every error and warning, <kbd>Enter</kbd> jumps to it |
 | <kbd>u</kbd> | undo Nou's last edit |
 | <kbd>v</kbd> | diff the open file vs git `HEAD`, Nou's last edit, or this session · <kbd>n</kbd>/<kbd>N</kbd> jump between changes · <kbd>[</kbd>/<kbd>]</kbd> previous/next file in a session diff |
@@ -94,6 +95,20 @@ Every change is reviewed like a code review:
 | <kbd>Esc</kbd> | stop Nou · close a diff · back to chat |
 | <kbd>Ctrl</kbd>+<kbd>C</kbd> | stop Nou while it works · press twice to quit |
 
+In the editor:
+
+| Key | Does |
+| --- | --- |
+| <kbd>Shift</kbd>+arrows, <kbd>Shift</kbd>+<kbd>Home</kbd>/<kbd>End</kbd>, mouse drag | select · <kbd>Ctrl</kbd>+<kbd>A</kbd> select all |
+| <kbd>Ctrl</kbd>+<kbd>C</kbd> / <kbd>X</kbd> / <kbd>V</kbd> | copy / cut / paste (the whole line when nothing is selected); your terminal's own paste works too |
+| <kbd>Ctrl</kbd>+<kbd>←</kbd>/<kbd>→</kbd>, <kbd>Ctrl</kbd>+<kbd>Backspace</kbd> or <kbd>Ctrl</kbd>+<kbd>W</kbd> | move by word, delete a word · <kbd>Ctrl</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> start / end of the file |
+| <kbd>Ctrl</kbd>+<kbd>F</kbd> · <kbd>Ctrl</kbd>+<kbd>L</kbd> | find (<kbd>Enter</kbd>/<kbd>↓</kbd> next, <kbd>Shift</kbd>+<kbd>Enter</kbd>/<kbd>↑</kbd> previous) · go to line |
+| <kbd>Ctrl</kbd>+<kbd>/</kbd> · <kbd>Ctrl</kbd>+<kbd>D</kbd> · <kbd>Alt</kbd>+<kbd>↑</kbd>/<kbd>↓</kbd> | comment the line or selection · duplicate it · move it up / down |
+| <kbd>Tab</kbd> / <kbd>Shift</kbd>+<kbd>Tab</kbd> | indent / outdent (whole lines with a selection) · <kbd>Enter</kbd> keeps the indent, one more after `{`, `(`, `[` |
+| <kbd>Ctrl</kbd>+<kbd>S</kbd> · <kbd>Ctrl</kbd>+<kbd>Z</kbd>/<kbd>Y</kbd> | save (auto-save is on by default) · undo / redo |
+| <kbd>Ctrl</kbd>+<kbd>K</kbd> · <kbd>Ctrl</kbd>+<kbd>G</kbd> | hover info · go to definition (with a language server) |
+| <kbd>Esc</kbd> | clear the selection, or leave the editor |
+
 Chat commands: `/settings` · `/model [provider:model]` · `/models [provider]` · `/pull <model>` · `/engine [name]` · `/auto [ask|auto-edit|auto]` · `/copy [code|file]` · `/undo` · `/rewind` · `/history` · `/diff [file or n]` · `/sessions` · `/problems` · `/compact` · `/clear` · `/help`
 
 ## 🧠 Models

package/dist/index.js

@@ -14,6 +14,8 @@ import { borrowToolConfig, ensureLocalModel, pickStartingModel } from "./src/set
 import { checkForUpdate, currentVersion, installUpdate, relaunch } from "./src/update/index.js";
 import { lsp } from "./src/lsp/index.js";
 import { App } from "./src/ui/App.js";
+import { installFastOutput } from "./src/ui/fast-output.js";
+import { RENDER_OPTIONS } from "./src/ui/render-options.js";
 const HELP = `nou ${currentVersion()}: an AI coding assistant for your terminal
 
 Usage:
@@ -92,11 +94,8 @@ async function main() {
     p.log.info(`Model: ${chalk.yellow(describe(choice))}  (change it any time with /model)`);
     await ensureProjectContext(choice);
     const permContext = await loadPermanentContext();
-    // Ctrl+C is handled inside the app: press it twice to quit, so a stray press doesn't lose work.
-    const app = render(createElement(App, { initialModel: choice, permContext }), {
-        alternateScreen: true,
-        exitOnCtrlC: false,
-    });
+    await installFastOutput();
+    const app = render(createElement(App, { initialModel: choice, permContext }), RENDER_OPTIONS);
     await app.waitUntilExit();
     lsp.stopAll();
     p.outro(chalk.cyan("Bye bye!"));

package/dist/src/env.js

@@ -7,6 +7,9 @@ if (major < 22 || (major === 22 && minor < 12)) {
     console.error(`Nou needs Node.js 22.12 or newer (you have ${process.versions.node}). Get it from https://nodejs.org`);
     process.exit(1);
 }
+// React and Ink pick their build from NODE_ENV when they load: without this every render runs React's
+// development build, which is several times slower and checks every update.
+process.env.NODE_ENV ??= "production";
 // Load the project's .env (API keys, base URLs). Providers read their settings when they load,
 // so loading .env later would be too late for them.
 if (existsSync(".env")) {

package/dist/src/ui/App.js

@@ -23,6 +23,7 @@ import { C } from "./theme.js";
 import { FileTree } from "./FileTree.js";
 import { CodeView } from "./CodeView.js";
 import { Editor } from "./Editor.js";
+import { WHEEL_STEP } from "./scroll.js";
 import { Chat } from "./Chat.js";
 import { copyToClipboard } from "./clipboard.js";
 import { Header } from "./Header.js";
@@ -33,6 +34,7 @@ const MIN_TREE = 14;
 const MIN_CODE = 20;
 const MIN_CHAT = 24;
 const NO_LINES = new Set();
+const DOUBLE_CLICK_MS = 500;
 const HELP = `Commands:
   /settings            models, preferences and plugins
   /model               show providers and the current model
@@ -58,10 +60,22 @@ Keys:
   Ctrl+P  find a file      Tab  switch pane      Esc  stop / back
   Shift+Tab  ask / auto-edit / auto                < > resize pane  = reset
   m  mouse on/off (off: select text to copy; Shift+drag also works in most terminals)
-  e  edit open file        v    diff (git / Nou / session)  f   follow mode
+  /  start a command from any pane
+  e  edit open file (or double-click in the code)  v  diff (git / Nou / session)  f  follow mode
   p  problems              u    undo Nou's edit   s   settings
   c  (in files) show only changed files            Ctrl+C twice  quit
-In the editor: Ctrl+S save · Ctrl+Z/Y undo/redo · Ctrl+K info · Ctrl+G go to definition`;
+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 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
+  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) {
+    const ref = useRef(fn);
+    ref.current = fn;
+    return useCallback((...args) => ref.current(...args), []);
+}
 function readText(filePath) {
     try {
         return readFileSync(path.resolve(process.cwd(), filePath), "utf-8");
@@ -117,11 +131,14 @@ export function App({ initialModel, permContext }) {
     const [plugins, setPlugins] = useState([]);
     const [starters, setStarters] = useState([]);
     const [viewport, setViewport] = useState(null);
+    // The editor reports every keystroke; the app only re-renders when what it shows changes (line, unsaved, selection).
+    const editorStateRef = useRef(null);
     const [editorState, setEditorState] = useState(null);
+    const editorProblemsTimer = useRef(null);
     // Unsaved editor text survives switching to a diff and back.
     const draft = useRef(null);
     const [codePanel, setCodePanel] = useState("code");
-    const [, setDiagVersion] = useState(0);
+    const [diagnosticsVersion, setDiagVersion] = useState(0);
     const [syntaxVersion, setSyntaxVersion] = useState(0);
     const [focusLine, setFocusLine] = useState(null);
     const [editorStart, setEditorStart] = useState({ line: 1, nonce: 0 });
@@ -129,6 +146,11 @@ export function App({ initialModel, permContext }) {
     const [exitArmed, setExitArmed] = useState(false);
     const [update, setUpdate] = useState(null);
     const [wheel, setWheel] = useState(null);
+    const [scrollTo, setScrollTo] = useState(null);
+    const [editorMouse, setEditorMouse] = useState([]);
+    /** Wheel events waiting for the next frame, added up per pane. */
+    const pendingWheel = useRef({ pane: "chat", lines: 0, columns: 0, timer: null });
+    const [chatPrefill, setChatPrefill] = useState(null);
     const [treeClick, setTreeClick] = 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 });
@@ -136,6 +158,8 @@ export function App({ initialModel, permContext }) {
     const [paneWidths, setPaneWidths] = useState(settings.paneWidths);
     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. */
+    const lastClick = useRef(null);
     const dragging = useRef(null);
     const pullAbort = useRef(null);
     const diagnosticsRef = useRef(null);
@@ -404,6 +428,11 @@ export function App({ initialModel, permContext }) {
             : next === "auto-edit" ? "Auto-edit mode: edits apply without asking; Nou still asks before commands. Review with the diff view, u to undo."
                 : "Auto mode: edits and commands run without asking. Review with the diff view, u to undo. Shift+Tab to change.");
     };
+    // Derived values handed to the panes keep their identity until they really change, so a pane that
+    // didn't change skips re-rendering (memo) instead of redrawing on every keystroke elsewhere.
+    const edited = useMemo(() => new Set([...changes].filter(([, c]) => c.status === "applied").map(([p]) => p)), [changes]);
+    const problemCounts = useMemo(() => diagnostics.fileCounts(), [diagnosticsVersion]);
+    const fileProblems = useMemo(() => (openFile ? diagnostics.get(openFile) : []), [openFile, diagnosticsVersion]);
     const record = openFile ? changes.get(openFile) : undefined;
     const pendingChange = approval?.request.kind === "change" ? approval.request.change : null;
     const gitChange = useMemo(() => (diffMode === "git" && openFile ? diffAgainstHead(openFile, content) : null), [diffMode, openFile, content]);
@@ -435,13 +464,6 @@ export function App({ initialModel, permContext }) {
             cancelled = true;
         };
     }, [pendingChange]);
-    // Live problems while you type (debounced).
-    useEffect(() => {
-        if (!showEditor || !openFile || !editorState)
-            return;
-        const timer = setTimeout(() => void diagnostics.checkFile(openFile, editorState.lines.join("\n")), 700);
-        return () => clearTimeout(timer);
-    }, [editorState?.lines]);
     /** Quit, saving the editor's unsaved text first if auto-save is on. */
     const quit = () => {
         if (draft.current && settings.autoSave !== "off")
@@ -465,30 +487,84 @@ export function App({ initialModel, permContext }) {
         setPaneWidths(next);
         return next;
     };
-    // Mouse: the wheel scrolls whatever pane is under the pointer; a click focuses that pane
-    // (and in the file tree, opens the clicked file). Dragging a border between panes resizes them.
+    /** Adds a wheel event to its pane's total; the panes get one update per frame however many events arrive. */
+    const queueWheel = (pane, dir, horizontal) => {
+        const q = pendingWheel.current;
+        if (q.timer && q.pane !== pane)
+            flushWheel();
+        q.pane = pane;
+        if (horizontal)
+            q.columns += dir * WHEEL_STEP;
+        else
+            q.lines += dir * WHEEL_STEP;
+        q.timer ??= setTimeout(flushWheel, 16);
+    };
+    const flushWheel = () => {
+        const q = pendingWheel.current;
+        if (q.timer)
+            clearTimeout(q.timer);
+        q.timer = null;
+        if (!q.lines && !q.columns)
+            return;
+        const { pane, lines, columns } = q;
+        q.lines = 0;
+        q.columns = 0;
+        setWheel((w) => ({ pane, lines, columns, nonce: (w?.nonce ?? 0) + 1 }));
+    };
+    /** 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 fraction = (y - 3) / Math.max(1, paneHeight - 4);
+        setScrollTo((s) => ({ pane, fraction, nonce: (s?.nonce ?? 0) + 1 }));
+    };
+    // Mouse: the wheel scrolls whatever pane is under the pointer (Shift+wheel sideways); a click focuses
+    // that pane, opens the clicked file in the tree, and puts the cursor where you clicked in the code
+    // (starting the editor). Drag to select in the editor, drag a scrollbar to scroll, drag the border
+    // between panes to resize them.
     useMouse((event) => {
         if (view !== "main" || quickOpen)
             return;
         const { treeWidth, codeWidth, paneHeight } = layout.current;
-        if (event.kind === "drag")
-            return void (dragging.current && moveBorder(dragging.current, event.x));
+        const codeLeft = treeWidth;
+        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
+            const drag = dragging.current;
+            if (drag === "tree" || drag === "chat")
+                moveBorder(drag, event.x);
+            else if (drag === "editor")
+                editorAt(event.x, event.y, "drag");
+            else if (drag)
+                scrollPane(drag.scroll, event.y);
+            return;
+        }
         if (event.kind === "release") {
-            if (dragging.current)
-                updateSettings({ paneWidths: paneWidthsRef.current });
+            // The release says where the button let go, so a drag lands there even in a terminal that
+            // doesn't report the movement in between.
+            if (dragging.current === "tree" || dragging.current === "chat")
+                updateSettings({ paneWidths: moveBorder(dragging.current, event.x) });
+            else if (dragging.current && typeof dragging.current === "object")
+                scrollPane(dragging.current.scroll, event.y);
+            if (dragging.current === "editor")
+                editorAt(event.x, event.y, "release");
             dragging.current = null;
             return;
         }
         if (event.y < 1 || event.y > paneHeight)
             return; // header or status bar
+        const pane = event.x < treeWidth ? "tree" : event.x < treeWidth + codeWidth ? "code" : "chat";
+        if (event.kind === "wheel")
+            return queueWheel(pane, event.dir, event.horizontal);
         // Each border is two columns: the left pane's edge and the right pane's.
-        if (event.kind === "click" && Math.abs(event.x - (treeWidth - 0.5)) <= 1)
+        if (Math.abs(event.x - (treeWidth - 0.5)) <= 1)
             return void (dragging.current = "tree");
-        if (event.kind === "click" && Math.abs(event.x - (treeWidth + codeWidth - 0.5)) <= 1)
+        if (Math.abs(event.x - (treeWidth + codeWidth - 0.5)) <= 1)
             return void (dragging.current = "chat");
-        const pane = event.x < treeWidth ? "tree" : event.x < treeWidth + codeWidth ? "code" : "chat";
-        if (event.kind === "wheel") {
-            setWheel((w) => ({ pane, dir: event.dir, nonce: (w?.nonce ?? 0) + 1 }));
+        // Each pane's scrollbar is the column inside its right border.
+        const scrollbarX = pane === "tree" ? treeWidth - 2 : pane === "code" ? treeWidth + codeWidth - 2 : columns - 2;
+        if (event.x === scrollbarX && event.y >= 3) {
+            dragging.current = { scroll: pane };
+            scrollPane(pane, event.y);
             return;
         }
         if (approval)
@@ -497,11 +573,30 @@ export function App({ initialModel, permContext }) {
         // Rows start under the pane's top border (y=1) and title (y=2).
         if (pane === "tree" && event.y >= 3)
             setTreeClick((c) => ({ row: event.y - 3, nonce: (c?.nonce ?? 0) + 1 }));
+        // 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() };
+        if (pane === "code" && event.y >= 3 && codePanel === "code") {
+            if (showEditor) {
+                dragging.current = "editor";
+                editorAt(event.x, event.y, double ? "double" : "press");
+            }
+            else if (double && openFile && !diff && settleDraft(openFile)) {
+                // Double-click in the code: edit right there.
+                const gutter = String(content.split("\n").length).length + 1;
+                setEditorStart((s) => ({ line: (viewport?.top ?? 1) + event.y - 3, col: Math.max(1, event.x - codeLeft - gutter), nonce: s.nonce + 1 }));
+                setDiffMode("off");
+                setEditing(true);
+            }
+        }
     }, settings.mouse);
     // Ctrl+C: stop Nou if it's working; otherwise press twice to quit.
     useInput((input, key) => {
         if (!(key.ctrl && input === "c"))
             return;
+        if (showEditor && focus === "code" && editorStateRef.current?.selection)
+            return; // the editor copies it
         if (busy || approval) {
             pullAbort.current?.abort();
             agentRef.current?.cancel();
@@ -713,7 +808,12 @@ export function App({ initialModel, permContext }) {
         }
         if (focus === "chat")
             return; // letters belong to the text box
-        if (input === "f")
+        if (input === "/") {
+            // Commands work from anywhere: / jumps to the chat's command box.
+            setFocus("chat");
+            setChatPrefill((p) => ({ text: "/", nonce: (p?.nonce ?? 0) + 1 }));
+        }
+        else if (input === "f")
             setFollow((f) => !f);
         else if (input === "m") {
             updateSettings({ mouse: !settings.mouse });
@@ -755,6 +855,7 @@ export function App({ initialModel, permContext }) {
     const editorContext = () => {
         if (!openFile)
             return null;
+        const editorState = editorStateRef.current;
         const unsaved = showEditor && editorState?.dirty;
         const lines = showEditor && editorState ? editorState.lines : content.replace(/\r\n/g, "\n").split("\n");
         let from;
@@ -982,6 +1083,58 @@ ${snippet}
             setEntries((prev) => [...prev, { kind: "error", text: `Couldn't save ${file}: ${error.message}` }]);
         }
     }
+    // Stable callbacks for the memoized panes.
+    const onTreeOpen = useEvent((filePath) => {
+        open(filePath);
+        setFocus("code");
+    });
+    const onTreeHover = useEvent(() => { });
+    const onJump = useEvent((file, line) => openAt(file, line));
+    const onCloseProblems = useEvent(() => setCodePanel("code"));
+    const onViewport = useEvent((top, bottom) => setViewport((v) => (v?.top === top && v.bottom === bottom ? v : { top, bottom })));
+    const onSend = useEvent(send);
+    const onAnswer = useEvent(answer);
+    const onEditorHover = useEvent((text, line, col) => (lspEnabled && openFile ? lsp.hover(openFile, text, line, col) : Promise.resolve(null)));
+    const onEditorDefinition = useEvent((text, line, col) => {
+        if (!openFile)
+            return;
+        if (!lspEnabled)
+            return info("Go to definition needs a language server (see /settings → Plugins).", "error");
+        void lsp.definition(openFile, text, line, col).then((target) => {
+            if (!target)
+                return info("No definition found here.");
+            // Keep unsaved text when jumping within the same file.
+            if (target.file === openFile && draft.current)
+                draft.current = { ...draft.current, text };
+            openAt(target.file, target.line, true);
+        });
+    });
+    const onEditorSave = useEvent((text) => saveFromEditor(text));
+    const onEditorExit = useEvent(() => {
+        draft.current = null;
+        editorStateRef.current = null;
+        setEditing(false);
+    });
+    const onEditorState = useEvent((state) => {
+        if (!openFile)
+            return;
+        const prev = editorStateRef.current;
+        editorStateRef.current = state;
+        if (prev?.line !== state.line || prev?.dirty !== state.dirty || prev?.selection !== state.selection) {
+            setEditorState({ line: state.line, dirty: state.dirty, selection: state.selection });
+        }
+        draft.current = state.dirty
+            ? { path: openFile, text: state.lines.join("\n"), baseline: draft.current?.path === openFile ? draft.current.baseline : content }
+            : null;
+        // Live problems while you type (debounced).
+        if (prev && prev.lines !== state.lines) {
+            if (editorProblemsTimer.current)
+                clearTimeout(editorProblemsTimer.current);
+            const file = openFile;
+            editorProblemsTimer.current = setTimeout(() => void diagnostics.checkFile(file, state.lines.join("\n")), 700);
+        }
+    });
+    const lspEnabled = activePlugins.some((p) => p.id === "lsp");
     if (view === "settings") {
         return (_jsx(Settings, { width: columns, height: rows, settings: settings, choice: choice, plugins: allPlugins, ...(connectTo ? { connectTo } : {}), onModel: (next) => void chooseModel(next), onEngine: (id) => void switchEngine(id), onChange: updateSettings, onTogglePlugin: (id, enabled) => void togglePlugin(id, enabled), onRescanPlugins: rescanPlugins, onClose: () => {
                 setConnectTo(undefined);
@@ -994,11 +1147,9 @@ ${snippet}
     const codeWidth = Math.max(MIN_CODE, columns - treeWidth - chatWidth);
     layout.current = { treeWidth, codeWidth, paneHeight: height };
     const wheelFor = (pane) => (wheel?.pane === pane ? wheel : null);
-    const edited = new Set([...changes].filter(([, c]) => c.status === "applied").map(([p]) => p));
-    const fileProblems = openFile ? diagnostics.get(openFile) : [];
+    const scrollFor = (pane) => (scrollTo?.pane === pane ? scrollTo : null);
     const totals = diagnostics.counts();
     const checking = diagnostics.busy;
-    const lspEnabled = activePlugins.some((p) => p.id === "lsp");
     const mode = approval
         ? { label: "APPROVE", color: C.yellow }
         : showEditor ? { label: "EDIT", color: C.green }
@@ -1009,16 +1160,18 @@ ${snippet}
     const hints = approval && !(showEditor && focus === "code")
         ? [["y", "accept"], ["n", "reject"], ...(pendingChange && diff !== pendingChange ? [["o", "show the edit"]] : []), ["Esc", "stop"], ["Shift+Tab", "auto mode"]]
         : showEditor && focus === "code"
-            ? [["Esc", "done"], ["Ctrl+S", settings.autoSave === "off" ? "save" : "save (auto-save on)"], ["Ctrl+Z", "undo"], ["Ctrl+Y", "redo"], ["Ctrl+K", "info"], ["Ctrl+G", "definition"]]
+            ? 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"]]
             : focus === "chat"
                 ? busy
                     ? [["Esc", "stop"], ["Shift+↑↓", "scroll"], ["Tab", "next pane"]]
                     : [["Enter", "send"], ["/", "commands"], ["Tab", "next pane"], ["Ctrl+P", "find file"], ["Shift+↑↓", "scroll"]]
                 : focus === "tree"
-                    ? [["Enter", "open"], ["e", "edit"], ["c", "changes"], ["Ctrl+P", "find"], ["u", "undo"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]]
+                    ? [["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"]]
-                        : [["e", "edit"], ["v", "diff"], ["u", "undo"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]];
+                        : [["double-click/e", "edit"], ["v", "diff"], ["u", "undo"], ["/", "command"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]];
     const statusUsed = mode.label.length + 2 + autoMode.length + 2 + 10 + ` ✖ ${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++) {
@@ -1027,29 +1180,7 @@ ${snippet}
             break;
         shownHints.push(hints[i]);
     }
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: agentRef.current.id === "nou" ? describe(choice) : `${engineInfo(agentRef.current.id).label} · ${engineInfo(agentRef.current.id).model(choice)}`, 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: diagnostics.fileCounts(), wheel: wheelFor("tree"), click: treeClick, onOpen: (filePath) => {
-                            open(filePath);
-                            setFocus("code");
-                        }, onHover: () => { } }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: height, focused: focus === "code", problems: diagnostics.all(), checking: checking, wheel: wheelFor("code"), onJump: (file, line) => openAt(file, line), onClose: () => setCodePanel("code") })) : showEditor ? (_jsx(Editor, { 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, problems: fileProblems, autoSave: settings.autoSave, syntaxVersion: syntaxVersion, wheel: wheelFor("code"), onHover: (text, line, col) => (lspEnabled ? lsp.hover(openFile, text, line, col) : Promise.resolve(null)), onDefinition: (text, line, col) => {
-                            if (!lspEnabled)
-                                return info("Go to definition needs a language server (see /settings → Plugins).", "error");
-                            void lsp.definition(openFile, text, line, col).then((target) => {
-                                if (!target)
-                                    return info("No definition found here.");
-                                // Keep unsaved text when jumping within the same file.
-                                if (target.file === openFile && draft.current)
-                                    draft.current = { ...draft.current, text };
-                                openAt(target.file, target.line, true);
-                            });
-                        }, onSave: (text) => saveFromEditor(text), onExit: () => {
-                            draft.current = null;
-                            setEditing(false);
-                        }, onState: (state) => {
-                            setEditorState(state);
-                            draft.current = state.dirty
-                                ? { path: openFile, text: state.lines.join("\n"), baseline: draft.current?.path === openFile ? draft.current.baseline : content }
-                                : null;
-                        } }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { 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"), onViewport: (top, bottom) => setViewport((v) => (v?.top === top && v.bottom === bottom ? v : { top, bottom })) })), _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"), onSubmit: send, onAnswer: answer })] }), _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: follow ? " ◉ follow " : " ○ follow " }), _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: agentRef.current.id === "nou" ? describe(choice) : `${engineInfo(agentRef.current.id).label} · ${engineInfo(agentRef.current.id).model(choice)}`, 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, { 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, { 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 })), _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, onSubmit: onSend, onAnswer: onAnswer })] }), _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: follow ? " ◉ follow " : " ○ follow " }), _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)))] }) }), quickOpen && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, onPick: (file) => {
                     setQuickOpen(false);