@tiens.nguyen/gonext-local-worker 1.0.203 → 1.0.204

package/gonext-repl.mjs

@@ -43,11 +43,11 @@ const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
 const green = (s) => `\x1b[32m${s}\x1b[0m`;
 const red = (s) => `\x1b[31m${s}\x1b[0m`;
 const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
+const white = (s) => `\x1b[37m${s}\x1b[0m`;
 // ANSI 90 ("bright black") — a reliable neutral grey across terminal themes, unlike
 // code 34 (blue) which many dark-theme palettes render as purple/indigo instead.
 const codeColor = (s) => `\x1b[90m${s}\x1b[0m`;
 const bold = (s) => `\x1b[1m${s}\x1b[0m`;
-const CLEAR_LINE = "\r\x1b[K"; // carriage-return + erase-to-end-of-line
 
 // The worker's "still thinking" heartbeat lines look like "Caffeinating… (90s)" — we
 // SWALLOW them from the terminal (the local ticker below drives progress instead), and
@@ -400,7 +400,6 @@ async function runAgentTurn(history) {
   let warnedPending = false;
   let jobRunning = false; // only tick "thinking…" once the worker has claimed the job
   let answerShownLive = false; // plain-reply content already printed — don't re-print it
-  let routingAnnounced = false; // one friendly line replaces the whole routing play-by-play
   // True once we've SPECIFICALLY seen "→ Chat reply" (the plain-reply/trivial-chat
   // branch), as opposed to "→ Agent mode…" (the tool-use branch). Only the plain-reply
   // path streams its answer via answer_stream with NO heartbeat/tool-summary/code lines
@@ -419,11 +418,18 @@ async function runAgentTurn(history) {
   let lastContentAt = Date.now();
   let thinking = false;
   let thinkingSince = 0;
+  let thinkWord = pickWord(); // playful word shown UNDER the in-progress line (flavor)
   let almostDone = false; // set from the worker's "…almost completed thinking…" heartbeat
+  let runningCmd = null; // the command currently executing (from a "Running → …" event)
   const thinkSecs = () => Math.max(1, Math.round((Date.now() - thinkingSince) / 1000));
 
+  // The status is TWO in-place lines — the in-progress action, then the playful word
+  // under it. Cursor sits at the end of line 2, so clearing = wipe line 2, move up, wipe
+  // line 1, leaving the cursor back at the status's origin for a redraw or real content.
   const clearStatus = () => {
-    if (statusShown) { process.stdout.write(CLEAR_LINE); statusShown = false; }
+    if (!statusShown) return;
+    process.stdout.write("\r\x1b[K\x1b[1A\r\x1b[K");
+    statusShown = false;
   };
 
   const tick = () => {
@@ -433,22 +439,33 @@ async function runAgentTurn(history) {
     // done — overwriting the ticker there corrupts the visible answer mid-word. Stay
     // silent once any of THIS line has already been shown (see carryFlushedLen).
     if (plainReplyFlow && carryFlushedLen > 0) return;
-    // Count from when the stream went quiet, so the seconds reflect the true wait.
-    if (!thinking) { thinking = true; thinkingSince = lastContentAt; }
+    // Count from when this phase went quiet, so the seconds reflect the current wait/run.
+    if (!thinking) { thinking = true; thinkingSince = lastContentAt; thinkWord = pickWord(); }
     const secs = thinkSecs();
-    const glyph = SPINNER[secs % SPINNER.length];       // rotates → reads as "in progress"
-    const label = almostDone ? "almost done" : "working";
-    process.stdout.write(CLEAR_LINE + yellow(`${glyph} ${label}… (${secs}s)`));
+    if (secs % 12 === 0) thinkWord = pickWord(); // rotate the word on long waits
+    const glyph = SPINNER[secs % SPINNER.length]; // rotates → reads as "in progress"
+    // Line 1 = WHAT is happening now: the running command, else the phase (Thinking /
+    // Almost done). Line 2 = the playful word (flavor). Truncate so neither wraps.
+    const primary = runningCmd
+      ? `Running ${runningCmd}`
+      : almostDone ? "Almost done" : "Thinking";
+    const max = Math.max(24, (process.stdout.columns || 80) - 14);
+    const fit = (s) => (s.length > max ? s.slice(0, max - 1) + "…" : s);
+    clearStatus();
+    process.stdout.write(
+      yellow(`${glyph} ${fit(primary)}… (${secs}s)`) + "\n" + dim(`  ${thinkWord}…`)
+    );
     statusShown = true;
   };
   const ticker = setInterval(tick, 1000);
 
   // Called right before any real (bullet/edit-card/answer) content prints: drop the
-  // blinking-bullet status line so content lands cleanly on its own line. No "completed
-  // thought" stamp — each finished action prints its own solid ● bullet instead.
+  // status lines so content lands cleanly, and end the current phase (so the next phase's
+  // seconds count fresh, and any running command is considered finished).
   const onContent = () => {
     clearStatus();
-    if (thinking) { process.stdout.write(CLEAR_LINE); thinking = false; }
+    thinking = false;
+    runningCmd = null;
     lastContentAt = Date.now();
   };
 
@@ -494,17 +511,10 @@ async function runAgentTurn(history) {
       if (inStreamFence) continue;
       if (isToolStepSummary(line)) { lastContentAt = Date.now(); continue; } // swallow
       if (isRoutingLine(line)) {
-        // Replace the whole routing play-by-play with ONE friendly line, shown once
-        // per turn — the raw labels are implementation detail (visible in the daemon's
-        // own terminal if you need them).
+        // Swallow the router's play-by-play entirely — the blinking-bullet ticker (which
+        // already shows the playful word + seconds) is the single in-progress indicator,
+        // so a separate static "Booting the big brain…" line here would just duplicate it.
         if (line.trim() === "→ Chat reply") plainReplyFlow = true;
-        if (!routingAnnounced) {
-          routingAnnounced = true;
-          onContent();
-          process.stdout.write(dim(`${pickWord()}…`) + "\n");
-          lastWasBlank = false;
-        }
-        lastContentAt = Date.now();
         continue;
       }
       // Edit card (a file change made by the agent's edit tools) — rendered as a
@@ -593,6 +603,14 @@ async function runAgentTurn(history) {
         }
         continue;
       }
+      // Agent flow: a "Running → <cmd>" is the START of a command — show it as the live
+      // in-progress status (the blinking bullet names it) rather than a solid bullet; its
+      // completion ("Command passed/failed → …" / "Server up → …") prints the done bullet.
+      // So the pair collapses to: "◑ Running <cmd>…" while it runs, then "● <result>".
+      if (!plainReplyFlow) {
+        const mRun = /^Running → (.+)$/.exec(line.trim());
+        if (mRun) { runningCmd = mRun[1]; thinking = false; lastContentAt = Date.now(); continue; }
+      }
       if (alreadyFlushed === 0) onContent();
       if (plainReplyFlow) {
         // Plain-reply content IS the answer — print it in the default color and remember
@@ -600,11 +618,10 @@ async function runAgentTurn(history) {
         process.stdout.write(line.slice(alreadyFlushed) + "\n");
         answerShownLive = true;
       } else {
-        // Agent flow: with the raw Thought/code stream suppressed above, the only lines
-        // that reach here are the worker's out-of-fence ACTION events ("Running → npx…",
-        // "Searching code → import (11 hits)", "Server up → …", "Composing answer…").
-        // Render each as ONE solid bullet — the clean, summarized action list (task #41).
-        process.stdout.write(green(BULLET) + " " + line.trim() + "\n");
+        // The remaining out-of-fence ACTION events ("Command passed → …", "Searching code
+        // → …", "Server up → …", "Composing answer…") each print as ONE solid bullet —
+        // the clean, summarized action list (task #41).
+        process.stdout.write(white(BULLET) + " " + line.trim() + "\n");
       }
       lastWasBlank = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-local-worker",
-  "version": "1.0.203",
+  "version": "1.0.204",
   "description": "Polls GoNext cloud API for async local LLM jobs and runs them against Ollama/OpenAI-compatible servers on this Mac",
   "type": "module",
   "license": "MIT",