nou-cli 0.5.13 → 0.5.14

package/README.md

@@ -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/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";
@@ -2017,6 +2017,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 +2042,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 +2200,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 +2211,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 +2235,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)

package/dist/src/ui/commands.js

@@ -96,3 +96,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.14",
   "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": {