@tiens.nguyen/gonext-cli 1.0.370 → 1.0.372

package/gonext-repl.mjs

@@ -673,6 +673,18 @@ const tokenLineText = () => {
   );
 };
 const FOOTER_ROWS = 3; // the rule row + the token row + the mode row
+// The bar's rows as plain printable strings, one PHYSICAL terminal row each. Both text rows
+// can exceed the width (the mode line is ~44 columns, the token row carries a model name) and
+// would then WRAP onto an extra row — every consumer here counts rows with ESC[nA / ESC[nB, so
+// a wrapped row corrupts the redraw (the #109 failure mode). Hence clipVisible on both.
+const footerRows = () => {
+  const width = Math.max(20, process.stdout.columns || 80);
+  return [
+    dim("─".repeat(width)),
+    clipVisible(GUTTER + tokenLineText(), width - 1),
+    clipVisible(GUTTER + modeLineText(), width - 1),
+  ];
+};
 // True only while the MAIN loop's ">> " prompt is waiting for input. The bar belongs to that
 // prompt, so it must never appear under an ask()/askSecret() question or during a turn.
 let footerActive = false;
@@ -690,18 +702,11 @@ const cursorPos = () =>
 // matching up-move still lands on it.
 function drawFooter() {
   if (!footerActive || !process.stdout.isTTY || slashOverlayActive) return;
-  const width = Math.max(20, process.stdout.columns || 80);
   const pos = cursorPos();
   const down = Math.max(0, inputRows() - 1 - pos.rows); // caret row → last input row
   process.stdout.write(
     (down ? `\x1b[${down}B` : "") +
-      "\r\n\x1b[2K" + dim("─".repeat(width)) +
-      // CLIPPED: both rows can exceed the width (the mode line is ~44 columns, the token row
-      // carries a model name) and would then WRAP onto an extra row — ESC[nA counts PHYSICAL
-      // rows, so the caret would come back short and the next keystroke would type over the
-      // bar (the #109 failure mode).
-      "\r\n\x1b[2K" + clipVisible(GUTTER + tokenLineText(), width - 1) +
-      "\r\n\x1b[2K" + clipVisible(GUTTER + modeLineText(), width - 1) +
+      footerRows().map((r) => "\r\n\x1b[2K" + r).join("") +
       "\x1b[J" +                                  // nothing stale below the bar
       `\x1b[${FOOTER_ROWS + down}A\r` +           // back to the caret's row
       (pos.cols > 0 ? `\x1b[${pos.cols}C` : "")
@@ -722,12 +727,20 @@ function eraseFooter() {
 }
 // Shift+Tab redraw: the bar is below the caret, so a plain redraw in place is enough.
 const redrawModeLine = () => drawFooter();
+// Set by the prepended Enter handler, cleared once the resulting line is consumed. It tells
+// the empty-input path that readline really echoed a newline to the terminal (a live
+// keypress) and there is therefore a row to step back onto — as opposed to a line drained
+// from _lineQueue, which produced no echo to undo.
+let enterEchoed = false;
 // Enter must tear the bar down BEFORE readline echoes its newline (which would land the
 // cursor on the rule row and leave the mode line orphaned below the output). Our normal
 // keypress listener runs AFTER readline's, so this one is prepended to run first.
 if (process.stdin.isTTY) {
   process.stdin.prependListener("keypress", (_ch, key) => {
-    if (key && (key.name === "return" || key.name === "enter")) eraseFooter();
+    if (key && (key.name === "return" || key.name === "enter")) {
+      enterEchoed = true;
+      eraseFooter();
+    }
   });
 }
 if (process.stdin.isTTY) {
@@ -1864,7 +1877,9 @@ async function runAgentTurn(history) {
   let lastApprovalId = null; // the last command-approval request we've already answered
   let carry = ""; // trailing partial content line held until its newline arrives
   let statusShown = false; // a transient status line is currently on screen
-  let statusLines = 2; // how many rows the status block currently occupies (grows when expanded)
+  let statusLines = 2; // TOTAL rows the status block occupies, bottom bar included (clearStatus)
+  // …of which these are the thought/word rows — the only ones hover + click hit-test against.
+  let statusContentLines = 2;
   let warnedPending = false;
   // Transient poll failures (a network blip or a 5xx like the API's momentary "Worker
   // key lookup failed." — a cold Mongo connection, NOT a bad key) must NOT kill a
@@ -1891,6 +1906,10 @@ async function runAgentTurn(history) {
   // the lifetime per-workspace + global counters once the turn completes.
   let latestOutputTokens = 0;
   let outputTokensPosted = false; // guard: increment the lifetime counters once per turn
+  // A new turn starts from zero on the bar's token row too — otherwise the previous turn's
+  // in/out figures would sit there, looking live, until the first poll reports real numbers.
+  lastTurnInputTokens = 0;
+  lastTurnOutputTokens = 0;
   // First few KB of the raw stream as consumed — a cheap fingerprint to verify the
   // completed resultText really EXTENDS what we streamed (an old worker replaces it
   // with the shorter bare answer, which must not be sliced by shownChars).
@@ -2012,11 +2031,16 @@ async function runAgentTurn(history) {
     // the playful-word line.
     const expLines = thoughtExpanded && rest ? wrapThought(rest, max, 4) : [];
     const drawn = 2 + expLines.length;
+    // The bottom bar rides along UNDER the live status while a turn runs, so it stays on screen
+    // the whole time the agent is thinking instead of only at the prompt. It's part of the same
+    // in-place block: the ticker redraws it every 120ms and clearStatus wipes it with the rest,
+    // so content still lands on clean rows.
+    const bar = process.stdout.isTTY ? footerRows() : [];
     const rows = process.stdout.rows || 24;
     // Hover-highlight only the THOUGHT line (line 1) — its exact viewport row comes from the
     // \x1b[6n probe below (`thoughtRow`); fall back to the viewport-bottom assumption only when
-    // the terminal never answered the probe.
-    const tRow = thoughtRow >= 1 ? thoughtRow : rows - drawn + 1;
+    // the terminal never answered the probe (the block's top = bottom minus ALL its rows).
+    const tRow = thoughtRow >= 1 ? thoughtRow : rows - (drawn + bar.length) + 1;
     const hovering = clickable && hoverRow === tRow;
     clearStatus();
     // Right after clearing, the cursor sits at the status block's TOP-LEFT = the thought line's
@@ -2034,8 +2058,10 @@ async function runAgentTurn(history) {
     let out = `${markLine(green(BULLET))}${hovering ? hoverThought(label) : green(label)}`;
     for (const wl of expLines) out += "\n" + GUTTER + dim(wl);
     out += "\n" + `${markLine(color256(wc, glyph))}${color256(wc, `${thinkWord}…`)}${tokLabel}`;
+    for (const br of bar) out += "\n" + br;
     process.stdout.write(out);
-    statusLines = drawn;
+    statusContentLines = drawn;
+    statusLines = drawn + bar.length;
     statusShown = true;
   };
   // 120ms so the spinner animates smoothly (the frame math above uses the wall clock, so
@@ -2053,9 +2079,10 @@ async function runAgentTurn(history) {
     if (!statusShown) return;
     const rows = process.stdout.rows || 24;
     const top = thoughtRow >= 1 ? thoughtRow : rows - statusLines + 1; // thought line row
-    // Toggle only on the thought line + its grey expansion — NOT the last row (the playful
-    // word / token line), so a click there doesn't expand what it isn't part of.
-    if (row < top || row > top + statusLines - 2) return;
+    // Toggle only on the thought line + its grey expansion — NOT the playful-word/token row,
+    // and NOT the bottom bar below it (statusContentLines excludes the bar), so a click there
+    // doesn't expand what it isn't part of.
+    if (row < top || row > top + statusContentLines - 2) return;
     // Only meaningful when there IS a fuller thought to reveal; otherwise ignore the click
     // so we don't flicker an empty expand.
     if (!thoughtExpanded && !(fullLiveThought && !runningCmd)) return;
@@ -2404,6 +2431,12 @@ async function runAgentTurn(history) {
       if (Number.isFinite(job.agentOutputTokens) && job.agentOutputTokens > latestOutputTokens) {
         latestOutputTokens = job.agentOutputTokens;
       }
+      // Mirror both into the bottom bar's token row so it counts UP live while the turn runs
+      // (the bar rides under the status block now), instead of sitting on the last turn's
+      // figures until this one finishes. The turn-end assignment writes the same numbers again.
+      lastTurnInputTokens = latestCodeTokens;
+      lastTurnOutputTokens = latestOutputTokens;
+      lastTurnTotalOutput = globalOutputTokens + latestOutputTokens;
       const text = typeof job.resultText === "string" ? job.resultText : "";
       if (job.jobStatus === "completed") {
         // Task #104: fold this turn's output-token total into the lifetime per-workspace +
@@ -2774,16 +2807,22 @@ async function main() {
     let lineRaw;
     for (;;) {
       lineRaw = await nextLine();
+      const echoed = enterEchoed;
+      enterEchoed = false;
       if (lineRaw === null || lineRaw.trim()) break;
-      // A bare Enter: its keypress already tore the bar down, and readline left the caret on
-      // a fresh row with no prompt on it. Re-print the prompt so that row isn't blank — the
-      // refresh repaints the bar under it. (Queued lines drain with no keypress at all, so
-      // this re-prompt just overwrites in place and can't stack ">> " on one row.)
+      // EMPTY (or whitespace-only) input is not a question — it must leave NO trace, or a few
+      // stray Enters stack up a column of bare ">>" rows. readline has already echoed its
+      // newline, so step back UP onto the ">> " row it left behind and re-prompt there:
+      // prompt() erases from the caret down, so the row is rewritten in place and the empty
+      // submit becomes a visual no-op. Nothing to step back over if the line came from
+      // _lineQueue (no keypress, no echo) — hence the `echoed` guard.
       if (process.stdout.isTTY) {
+        if (echoed) process.stdout.write("\x1b[1A");
         footerActive = true;
         rl.prompt();
       }
     }
+    enterEchoed = false;
     footerActive = false; // a line arrived from the queue (no Enter keypress) → disarm
     if (lineRaw === null) break; // stdin closed
     const line = lineRaw.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-cli",
-  "version": "1.0.370",
+  "version": "1.0.372",
   "description": "GoNext CLI — the gonext terminal plus the local worker that runs agent / OCR / PDF / embedding jobs on your Mac (Ollama / MLX / OpenAI-compatible).",
   "type": "module",
   "license": "MIT",