nou-cli 0.5.0 → 0.5.1

package/README.md

@@ -76,13 +76,13 @@ Every change is reviewed like a code review:
 
 | Key | Does |
 | --- | --- |
-| 🖱️ 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 · **click in the code to edit right there**, 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) |
+| 🖱️ 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> or a click | edit the open file (see the editor keys below) |
+| <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 |

package/dist/src/ui/App.js

@@ -34,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
@@ -60,10 +61,10 @@ Keys:
   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)
   /  start a command from any pane
-  e  edit open file (or click in the code)  v  diff (git / Nou / session)  f  follow mode
+  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
-Mouse: wheel scrolls (Shift+wheel sideways) · click/drag a scrollbar · click in the code to edit there, drag to select
+Mouse: wheel scrolls (Shift+wheel sideways) · click/drag a scrollbar · double-click in the code to edit there (in the editor: select a word), drag to select
 In the 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
@@ -146,7 +147,7 @@ export function App({ initialModel, permContext }) {
     const [update, setUpdate] = useState(null);
     const [wheel, setWheel] = useState(null);
     const [scrollTo, setScrollTo] = useState(null);
-    const [editorMouse, setEditorMouse] = 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);
@@ -158,6 +159,7 @@ export function App({ initialModel, permContext }) {
     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);
@@ -524,8 +526,9 @@ export function App({ initialModel, permContext }) {
             return;
         const { treeWidth, codeWidth, paneHeight } = layout.current;
         const codeLeft = treeWidth;
-        const editorAt = (x, y, kind) => setEditorMouse((m) => ({ x: x - codeLeft - 1, y: y - 3, kind, nonce: (m?.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
             const drag = dragging.current;
             if (drag === "tree" || drag === "chat")
                 moveBorder(drag, event.x);
@@ -536,8 +539,12 @@ export function App({ initialModel, permContext }) {
             return;
         }
         if (event.kind === "release") {
+            // 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: paneWidthsRef.current });
+                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;
@@ -566,13 +573,17 @@ 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, "press");
+                editorAt(event.x, event.y, double ? "double" : "press");
             }
-            else if (openFile && !diff && settleDraft(openFile)) {
-                // Click in the code: edit right there.
+            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");
@@ -1160,7 +1171,7 @@ ${snippet}
                     ? [["Enter", "open"], ["e", "edit"], ["/", "command"], ["c", "changes"], ["Ctrl+P", "find"], ["u", "undo"], ["p", "problems"], ["< >", "resize"], ["m", "select text"], ["s", "settings"]]
                     : diff
                         ? [["Esc", "close diff"], ["n/N", "next/prev change"], ...(diffMode === "session" ? [["[ ]", "prev/next file"]] : []), ["v", "cycle diff"]]
-                        : [["click/e", "edit"], ["v", "diff"], ["u", "undo"], ["/", "command"], ["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++) {

package/dist/src/ui/CodeView.js

@@ -111,7 +111,7 @@ export const CodeView = memo(function CodeView({ width, height, focused, filePat
     const { icon, color } = fileIcon(filePath);
     const errorCount = problems.filter((d) => d.severity === "error").length;
     const warningCount = problems.filter((d) => d.severity === "warning").length;
-    const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath, errorCount > 0 && _jsxs(Text, { color: C.red, children: ["  \u2716 ", errorCount] }), warningCount > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", warningCount] }), _jsxs(Text, { color: C.dim, children: [scroll, total > rows ? ` (${percent}%)` : "", focused ? "   click or e to edit · v diff" : ""] })] }));
+    const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath, errorCount > 0 && _jsxs(Text, { color: C.red, children: ["  \u2716 ", errorCount] }), warningCount > 0 && _jsxs(Text, { color: C.yellow, children: ["  \u25B2 ", warningCount] }), _jsxs(Text, { color: C.dim, children: [scroll, total > rows ? ` (${percent}%)` : "", focused ? "   double-click or e to edit · v diff" : ""] })] }));
     return (_jsx(Pane, { title: title, width: width, height: height, focused: focused, children: _jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: lines.slice(start, start + rows).map((line, i) => {
                         const n = start + i + 1;
                         const isMarked = marked.has(n);

package/dist/src/ui/Editor.js

@@ -309,10 +309,17 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
         view.current.top = topFor(scrollTo.fraction, buf.lines.length, rows);
         rerender((n) => n + 1);
     }, [scrollTo?.nonce]);
-    // Click to put the cursor there; drag to select.
+    // Click to put the cursor there; double-click to select a word; drag to select.
+    const lastMouse = useRef(mouse?.[mouse.length - 1]?.seq ?? 0); // events from before the editor opened are done
     useEffect(() => {
-        if (!mouse)
-            return;
+        for (const event of mouse ?? []) {
+            if (event.seq <= lastMouse.current)
+                continue;
+            lastMouse.current = event.seq;
+            handleMouse(event);
+        }
+    }, [mouse]);
+    const handleMouse = (mouse) => {
         if (mouse.kind === "release") {
             dragFrom.current = null;
             return;
@@ -327,12 +334,21 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                 dragFrom.current = { row, col };
                 return { ...b, row, col, anchor: null };
             }
+            if (mouse.kind === "double") {
+                // Double-click selects the word under the pointer.
+                const line = b.lines[row];
+                const at = isWord(line[col]) ? col : isWord(line[col - 1]) ? col - 1 : -1;
+                dragFrom.current = null;
+                if (at < 0)
+                    return { ...b, row, col, anchor: null };
+                return { ...b, row, col: wordRight(line, at), anchor: { row, col: wordLeft(line, at + 1) } };
+            }
             return { ...b, row, col, anchor: dragFrom.current ?? b.anchor ?? { row: b.row, col: b.col } };
         });
         // Dragging past the top or bottom edge scrolls.
         if (mouse.kind === "drag" && (mouse.y < 0 || mouse.y >= rows))
             reveal.current = true;
-    }, [mouse?.nonce]);
+    };
     usePaste((text) => {
         if (prompt)
             return setPrompt({ ...prompt, text: prompt.text + text.replace(/\s+/g, " ") });

package/dist/src/ui/mouse.js

@@ -1,8 +1,10 @@
 import { useEffect, useRef } from "react";
 import { useStdin } from "ink";
-// Report clicks and wheel (1000) using SGR coordinates (1006), which work past column 223.
-const ENABLE = "\x1b[?1000h\x1b[?1006h";
-const DISABLE = "\x1b[?1000l\x1b[?1006l";
+// Report clicks and wheel (1000), and movement while a button is held (1002, without it terminals never
+// send drags: no resizing panes, dragging scrollbars or selecting), using SGR coordinates (1006), which
+// work past column 223.
+export const ENABLE = "\x1b[?1000h\x1b[?1002h\x1b[?1006h";
+const DISABLE = "\x1b[?1006l\x1b[?1002l\x1b[?1000l";
 /** Mouse events in a chunk of terminal input (SGR format: ESC [ < button ; x ; y M|m). */
 export function parseMouse(chunk) {
     const events = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Nou: an IDE-style AI coding assistant for your terminal. Local (Ollama, LM Studio) and cloud (Claude, OpenAI, Gemini...) models, live diffs, git-aware, built-in editor.",
   "type": "module",
   "bin": {