nou-cli 0.5.13 → 0.5.15

package/README.md

@@ -104,7 +104,7 @@ Every change is reviewed like a code review:
 | <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 |
 | <kbd>c</kbd> | in the file tree: show only changed files |
-| <kbd>f</kbd> | follow mode (off by default): watch along as Nou works. Each file it reads (the exact lines, highlighted) is shown a step at a time, a little behind it, and its edits as they happen. The status bar shows how many steps behind it is; set the speed in settings → Preferences (slow · normal · fast · instant) |
+| <kbd>f</kbd> or `/follow [on\|off]` | follow mode (off by default, and your choice is remembered): watch along as Nou works, with any engine (Codex's `sed`/`cat` reads count too). Each file it reads (the exact lines, highlighted) is shown a step at a time, a little behind it, and its edits as they happen. The status bar shows how many steps behind it is; set the speed in settings → Preferences (slow · normal · fast · instant) |
 | <kbd>&lt;</kbd> / <kbd>&gt;</kbd> / <kbd>=</kbd> | make the focused pane narrower / wider / reset the layout |
 | <kbd>`</kbd> | a terminal under the code, like VS Code's (also `/terminal`): Enter runs a command, Ctrl+C stops it, ↑↓ history, Esc back to the code, × or `exit` closes it; drag its top border (or <kbd>Alt</kbd>+↑/↓) to make it taller or shorter. Commands run through your shell one at a time, so full-screen programs like vim don't draw there |
 | <kbd>z</kbd> | in the code view: fold every function and block to its first line, or open them all again (also `/fold`, `/unfold`); click a ▾/▸ beside a line number to fold or open just that one |
@@ -113,7 +113,7 @@ Every change is reviewed like a code review:
 | <kbd>m</kbd> | mouse on/off, so you can select and copy text in the terminal (in the chat, just drag over the text: it's copied when you let go; double-click copies a word, path or link, triple-click a paragraph) |
 | <kbd>s</kbd> | settings: model, preferences, plugins |
 | <kbd>y</kbd> / <kbd>n</kbd> | accept / reject a proposed edit or command, from any pane; the rest of Nou keeps working while it waits (<kbd>o</kbd> shows the edit) |
-| <kbd>Enter</kbd> while Nou works | queue the message: it goes when Nou finishes, together with anything else you queued, as one message; commands that only change the screen, like `/terminal`, `/games` or `/open`, run right away. To send now instead of waiting: <kbd>Alt</kbd>+<kbd>Enter</kbd> (stops Nou and sends it), click the queued message, or `/now`; or turn on **Send while Nou works** in settings so <kbd>Enter</kbd> sends right away (<kbd>Alt</kbd>+<kbd>Enter</kbd> then queues) |
+| <kbd>Enter</kbd> while Nou works | queue the message: it goes when Nou finishes, together with anything else you queued, as one message; commands that only change the screen, like `/terminal`, `/games` or `/open`, run right away. To send now instead of waiting: <kbd>Alt</kbd>+<kbd>Enter</kbd> (stops Nou and sends it), click the queued message, or `/now`. Nou answers it first, then finishes what it was working on, unless your message says to drop it; or turn on **Send while Nou works** in settings so <kbd>Enter</kbd> sends right away (<kbd>Alt</kbd>+<kbd>Enter</kbd> then queues) |
 | <kbd>Esc</kbd> | stop Nou (anything queued goes back in the input) · close a diff · back to chat |
 | <kbd>Ctrl</kbd>+<kbd>C</kbd> | stop Nou while it works · press twice to quit |
 

package/dist/src/engines/claude.js

@@ -1,7 +1,7 @@
 import { readFileSync } from "fs";
 import path from "path";
 import { toRelative } from "../commands/index.js";
-import { ExternalEngine, replaceIn } from "./external.js";
+import { ExternalEngine, readsInCommand, replaceIn } from "./external.js";
 import { loadPackage } from "./index.js";
 const EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
 /** Claude Code tools that change files; Nou previews and approves them. */
@@ -95,8 +95,16 @@ export class ClaudeCodeEngine extends ExternalEngine {
                     ? { hookSpecificOutput: { hookEventName: "PostToolUse", additionalContext: `This edit introduced problems; fix them:\n${problems}` } }
                     : {};
             }
-            if (tool === "Read" && args.file_path)
-                this.hooks.onRead(toRelative(args.file_path));
+            if (tool === "Read" && args.file_path) {
+                // A part of the file (offset and limit, in lines): follow mode shows those lines.
+                const from = typeof args.offset === "number" ? Math.max(1, args.offset) : undefined;
+                const to = from && typeof args.limit === "number" ? from + args.limit - 1 : undefined;
+                this.hooks.onRead(toRelative(args.file_path), from, to);
+            }
+            if ((tool === "Bash" || tool === "PowerShell") && typeof args.command === "string") {
+                for (const read of readsInCommand(args.command))
+                    this.hooks.onRead(read.path, read.line, read.to);
+            }
             this.hooks.onEntry({ kind: "tool", text: tool === "Bash" || tool === "PowerShell" ? `Ran: ${args.command}` : describeTool(tool, args) });
             return {};
         };

package/dist/src/engines/codex.js

@@ -3,7 +3,7 @@ import { realpathSync, statSync } from "fs";
 import path from "path";
 import { transientMessage } from "../agent/index.js";
 import { listAllFiles } from "../ui/QuickOpen.js";
-import { ExternalEngine } from "./external.js";
+import { ExternalEngine, readsInCommand } from "./external.js";
 import { loadPackage } from "./index.js";
 const EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
 const MAX_FILES = 5000;
@@ -166,6 +166,9 @@ export class CodexEngine extends ExternalEngine {
         }
         else if (event.type === "item.started" && event.item.type === "command_execution") {
             this.hooks.onBusy(`Codex: ${event.item.command}`);
+            // Codex reads files with shell commands: follow mode shows them as it would a read.
+            for (const read of readsInCommand(event.item.command))
+                this.hooks.onRead(read.path, read.line, read.to);
         }
         else if (event.type === "item.completed") {
             const item = event.item;

package/dist/src/engines/external.js

@@ -1,4 +1,4 @@
-import { readFileSync } from "fs";
+import { readFileSync, statSync } from "fs";
 import path from "path";
 import { newSessionId } from "../agent/index.js";
 import { isInProject, toRelative } from "../commands/index.js";
@@ -10,6 +10,53 @@ function readOrNull(filePath) {
         return null;
     }
 }
+/**
+ * The files a shell command reads, so follow mode can show them: engines like Codex read with `sed -n
+ * '10,80p' f`, `cat f`, `nl -ba f`, `head -n 40 f` instead of a read tool. Only files that exist in the
+ * project count; anything it can't make sense of is no read.
+ */
+export function readsInCommand(command) {
+    // Codex runs `bash -lc '<script>'`: look inside the quotes.
+    const wrapped = command.match(/^\S*(?:bash|sh|zsh)\s+-l?c\s+(['"])([\s\S]*)\1\s*$/);
+    const script = wrapped ? wrapped[2] : command;
+    const reads = [];
+    for (const part of script.split(/\s*(?:&&|\|\||;|\||\n)\s*/)) {
+        const words = (part.match(/'[^']*'|"[^"]*"|\S+/g) ?? []).map((w) => w.replace(/^(['"])(.*)\1$/, "$2"));
+        const [tool, ...args] = words;
+        if (!tool)
+            continue;
+        const files = args.filter((a) => !a.startsWith("-") && /[./]|\w\.\w/.test(a));
+        let range = {};
+        if (tool === "sed" && args.includes("-n")) {
+            const m = args.join(" ").match(/(\d+)\s*,\s*(\d+)\s*p/) ?? args.join(" ").match(/(\d+)p/);
+            if (!m)
+                continue;
+            range = { line: Number(m[1]), to: Number(m[2] ?? m[1]) };
+            files.splice(0, files.length, ...files.filter((f) => !/^\d+(,\d+)?p$/.test(f)));
+            // `nl -ba f | sed -n '5,9p'`: the lines are of the file read just before it in the pipe.
+            const last = reads.at(-1);
+            if (!files.length && last && last.line === undefined)
+                Object.assign(last, range);
+        }
+        else if (tool === "head") {
+            const n = Number(args.join(" ").match(/-n\s*(\d+)|-(\d+)/)?.slice(1).find(Boolean) ?? 10);
+            range = { line: 1, to: n };
+        }
+        else if (!["cat", "nl", "bat", "less", "more", "tail"].includes(tool))
+            continue;
+        for (const file of files) {
+            try {
+                if (!statSync(path.resolve(process.cwd(), file)).isFile() || !isInProject(file))
+                    continue;
+            }
+            catch {
+                continue;
+            }
+            reads.push({ path: toRelative(file), ...range });
+        }
+    }
+    return reads;
+}
 /** Replaces `oldText` with `newText`, as edit tools do; null if it isn't there (the tool will fail on its own). */
 export function replaceIn(text, oldText, newText, all = false) {
     if (!oldText || !text.includes(oldText))

package/dist/src/ui/App.js

@@ -35,7 +35,7 @@ import { FIND_KEY, isFind } from "./keys.js";
 import { FileTree } from "./FileTree.js";
 import { CodeView } from "./CodeView.js";
 import { Editor } from "./Editor.js";
-import { SLASH_COMMANDS, closestCommand, onlyChangesScreen, runsWhileBusy } from "./commands.js";
+import { SLASH_COMMANDS, closestCommand, finishAfter, onlyChangesScreen, runsWhileBusy } from "./commands.js";
 import { WHEEL_STEP, sendWheel } from "./scroll.js";
 import { Chat, chatTabZones } from "./Chat.js";
 import { copyToClipboard, openInBrowser } from "./clipboard.js";
@@ -1457,6 +1457,17 @@ export function App({ initialModel, permContext, resume }) {
         if (!followTimer.current)
             playFollow();
     };
+    /** Turns follow mode on or off (`to`), or flips it; remembered for next time, and the chat says what it does. */
+    const toggleFollow = (to) => {
+        const on = to ?? !followRef.current;
+        followRef.current = on;
+        setFollow(on);
+        if (settingsRef.current.followMode !== on)
+            updateSettings({ followMode: on });
+        info(on
+            ? "Follow on: the code view now shows each file Nou reads or edits as it works (f, the follow chip or /follow off to stop)."
+            : "Follow off: the code view stays on what you have open. Edits waiting for your OK still show.");
+    };
     const followStepRef = useRef(followStep);
     followStepRef.current = followStep;
     useEffect(() => {
@@ -1570,7 +1581,7 @@ export function App({ initialModel, permContext, resume }) {
             setChatPrefill((p) => ({ text: "/", nonce: (p?.nonce ?? 0) + 1 }));
         }
         else if (input === "f")
-            setFollow((f) => !f);
+            toggleFollow();
         else if (input === "m")
             toggleMouse();
         else if (input === "`")
@@ -1752,6 +1763,12 @@ ${snippet}
                     return info(`No file matches "${wanted}". To find where something is in the code, ask in the chat.`, "error");
                 return openRef({ path: file, ...(m[2] ? { line: Number(m[2]) } : {}), ...(m[3] ? { to: Number(m[3]) } : {}) });
             }
+            case "follow": {
+                const want = arg.trim().toLowerCase();
+                if (want && !/^(on|off)$/.test(want))
+                    return info("Use /follow on or /follow off (or just /follow to switch).", "error");
+                return toggleFollow(want ? want === "on" : undefined);
+            }
             case "effort": {
                 // Speed vs smarts, by name: /effort smarter (or the effort itself: /effort xhigh).
                 const options = EFFORTS.map((e) => EFFORT_LABELS[e].name.toLowerCase()).join(", ");
@@ -2017,6 +2034,17 @@ ${snippet}
         agentRef.current?.cancel();
         stopped.current = true;
     };
+    /** What Nou was working on when a message cut in (see interruptToSend), so it finishes that too. */
+    const unfinished = useRef(null);
+    const lastAsked = useRef(null);
+    /** Stops Nou so what's queued goes now; the request it was on isn't dropped, it's handed back with it. */
+    const interruptToSend = () => {
+        // What the agent was last asked, unfinished work handed back included: cutting in twice keeps both.
+        if (lastAsked.current)
+            unfinished.current = lastAsked.current;
+        stop();
+        stopped.current = false; // what's queued is meant to go
+    };
     useEffect(() => {
         if (busy || approval || !queued.length)
             return;
@@ -2031,7 +2059,10 @@ ${snippet}
         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"));
+        const text = queued.slice(0, take).join("\n\n");
+        const previous = unfinished.current;
+        unfinished.current = null;
+        send(text, previous && !isCommand(text) ? finishAfter(text, previous) : undefined);
     }, [busy, approval, queued]);
     // When a reply points at places in the code (Nou's engine with show_places, the others with a ```nou-show
     // block, which is taken out of the reply), the first one opens highlighted and the rest are listed.
@@ -2186,8 +2217,7 @@ ${snippet}
     const sendNow = () => {
         if (!queued.length)
             return;
-        stop();
-        stopped.current = false; // what's queued is meant to go
+        interruptToSend();
     };
     /**
      * From the chat: while Nou works, a message waits its turn, or (`now`: Alt+Enter) stops Nou and goes right
@@ -2198,14 +2228,14 @@ ${snippet}
             return send(text);
         const now = settings.sendNowWhileBusy ? !alt : alt;
         if (now) {
-            stop();
-            stopped.current = false; // this one is meant to go
+            interruptToSend();
             setQueued((q) => [text, ...q]);
         }
         else
             setQueued((q) => [...q, text]);
     };
-    const send = (text) => {
+    /** `forAgent`: what the agent gets instead of `text` (the chat still shows `text`). */
+    const send = (text, forAgent) => {
         // Right after /resume lists them, a number picks a conversation instead of being sent to the agent.
         const picking = pickingResume.current;
         pickingResume.current = false;
@@ -2222,7 +2252,8 @@ ${snippet}
             return;
         }
         setEntries((prev) => [...prev, { kind: "user", text }]);
-        void agentRef.current.send(text, editorContext() ?? undefined);
+        lastAsked.current = forAgent ?? text;
+        void agentRef.current.send(forAgent ?? text, editorContext() ?? undefined);
     };
     function saveFromEditor(text, file = openFile) {
         if (!file)
@@ -2535,7 +2566,7 @@ ${snippet}
         { title: "Ask before every edit and command", keys: "Shift+Tab", run: () => cycleAutoMode("ask") },
         { title: "Auto-edit: apply edits without asking", keys: "Shift+Tab", run: () => cycleAutoMode("auto-edit") },
         { title: "Auto: edits and commands without asking", keys: "Shift+Tab", run: () => cycleAutoMode("auto") },
-        { title: `Follow mode ${follow ? "off" : "on"}: jump to files Nou works on`, keys: "f", run: () => setFollow((f) => !f) },
+        { title: `Follow mode ${follow ? "off" : "on"}: jump to files Nou works on`, keys: "f", run: () => toggleFollow() },
         { title: `Replay speed for follow mode: ${settings.followSpeed} (next: ${FOLLOW_SPEEDS[(FOLLOW_SPEEDS.indexOf(settings.followSpeed) + 1) % FOLLOW_SPEEDS.length]})`, keys: "settings", run: () => updateSettings({ followSpeed: FOLLOW_SPEEDS[(FOLLOW_SPEEDS.indexOf(settings.followSpeed) + 1) % FOLLOW_SPEEDS.length] }) },
         { title: `Mouse ${settings.mouse ? "off (select text in the terminal)" : "on"}`, keys: "m", run: toggleMouse },
         { title: "Copy the last reply", keys: "/copy", run: () => void runCommand("/copy") },
@@ -2611,7 +2642,7 @@ ${snippet}
             x += width;
         };
         add(` ${autoMode} `.length, () => cycleAutoMode());
-        add(followChip.length, () => setFollow((f) => !f));
+        add(followChip.length, () => toggleFollow());
         add(` ✗ ${totals.errors} ▲ ${totals.warnings} `.length, toggleProblems);
         if (checking.length)
             add(3 + checking.join(", ").length);

package/dist/src/ui/commands.js

@@ -2,7 +2,7 @@
  * Commands that only change what's on screen (or handle a busy Nou themselves): they run right away
  * while Nou works instead of waiting in the queue behind it.
  */
-const INSTANT = new Set(["files", "actions", "palette", "zoom", "now", "fold", "unfold", "redraw", "new", "tab", "close", "terminal", "games", "open", "settings", "auto", "diff", "sessions", "history", "problems", "copy", "help", "version", "cancel"]);
+const INSTANT = new Set(["follow", "files", "actions", "palette", "zoom", "now", "fold", "unfold", "redraw", "new", "tab", "close", "terminal", "games", "open", "settings", "auto", "diff", "sessions", "history", "problems", "copy", "help", "version", "cancel"]);
 /** Whether a typed command runs right away while Nou works (see INSTANT); `/showme` counts only to look or step. */
 /**
  * The command a mistyped name means: the same letters in another order ("/termnial"), or one letter off
@@ -51,6 +51,7 @@ export const SLASH_COMMANDS = [
     { name: "models", args: "[provider]", description: "list the models a provider offers" },
     { name: "connect", args: "<provider>", description: "enter an API key (and URL) for a provider" },
     { name: "open", args: "<file>[:line]", description: "open a file in the code view (part of its name is enough)" },
+    { name: "follow", args: "[on|off]", description: "the code view shows each file the agent reads or edits as it works" },
     { name: "effort", args: "[fastest|fast|balanced|smarter|smartest]", description: "speed vs smarts: how hard the model thinks (cheaper + faster, or smarter)" },
     { name: "workspace", args: "[new <folder> | n]", description: "several projects in this window, a tab each in the header: open one, or switch" },
     { name: "files", description: "find a file by part of its name (also Ctrl+P)" },
@@ -96,3 +97,11 @@ export function matchCommands(typed, extra = []) {
     const contains = query ? all.filter((c) => !c.name.startsWith(query) && (c.name.includes(query) || c.description.includes(query))) : [];
     return [...starts.sort((a, b) => Number(b.name === query) - Number(a.name === query)), ...contains];
 }
+/**
+ * A message sent while Nou was working stops it so it's answered now, but what Nou was on isn't dropped:
+ * the agent is told what that was and to finish it after, unless the new message says otherwise.
+ */
+export function finishAfter(text, previous) {
+    const was = previous.length > 6000 ? `${previous.slice(0, 6000)}…` : previous;
+    return `${text}\n\n[Sent while you were still working on my previous message, so you were interrupted. Handle this first, then carry on with and finish the previous request, picking up where you left off (don't redo finished steps), unless this message cancels or replaces it. The previous request was:\n${was}]`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "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": {