@tiens.nguyen/gonext-cli 1.0.369 → 1.0.371

package/gonext-repl.mjs

@@ -651,7 +651,28 @@ let editMode = "accept"; // "accept" | "manual"
 const modeLineText = () =>
   white("✎ " + (editMode === "accept" ? "accept edits on" : "manually edit")) +
   dim("   (shift+tab to switch)");
-const FOOTER_ROWS = 2; // the rule row + the mode row
+// Token usage for the bar's middle row (task #104): the LAST turn's code-model input +
+// output, then the coder's lifetime output total. Unlike the old per-turn print, this row is
+// ALWAYS on screen — a turn that did no code-model work honestly reads "0", and the lifetime
+// total is loaded at startup so the row is populated before the first turn.
+let lastTurnInputTokens = 0;
+let lastTurnOutputTokens = 0;
+// This turn's lifetime total. `globalOutputTokens` is updated by an async POST that can lag a
+// turn behind, so the bar takes whichever of the two is fresher (both are zeroed by a reset).
+let lastTurnTotalOutput = 0;
+const tokenLineText = () => {
+  const coder = sessionCodingLabel || defaultCodingModel;
+  return (
+    dim("tokens · ↑ in ") +
+    fmtTokens(lastTurnInputTokens) +
+    dim(" · ") +
+    cyan(`↓ out ${fmtTokens(lastTurnOutputTokens)}`) +
+    dim(" · ") +
+    dim(`${coder ? coder + " " : ""}total `) +
+    cyan(`↓ ${fmtTokens(Math.max(globalOutputTokens, lastTurnTotalOutput))}`)
+  );
+};
+const FOOTER_ROWS = 3; // the rule row + the token row + the mode row
 // 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;
@@ -675,9 +696,11 @@ function drawFooter() {
   process.stdout.write(
     (down ? `\x1b[${down}B` : "") +
       "\r\n\x1b[2K" + dim("─".repeat(width)) +
-      // CLIPPED: the mode line is ~44 columns, so on a narrow terminal it would WRAP onto a
-      // third row — and ESC[nA counts PHYSICAL rows, so the caret would come back one row
-      // short and the next keystroke would type over the rule (the #109 failure mode).
+      // 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) +
       "\x1b[J" +                                  // nothing stale below the bar
       `\x1b[${FOOTER_ROWS + down}A\r` +           // back to the caret's row
@@ -699,12 +722,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) {
@@ -2751,16 +2782,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();
@@ -2842,6 +2879,9 @@ async function main() {
       const done = await resetGlobalOutputTokens();
       if (done) {
         globalOutputTokens = 0;
+        // The bar takes the FRESHER of the two totals, so the last turn's copy has to be
+        // zeroed too or the reset wouldn't show up in it.
+        lastTurnTotalOutput = 0;
         console.log(GUTTER + green("✓ global + workspace output-token totals reset to 0.\n"));
       } else {
         console.log(GUTTER + dim("Could not reset the output-token totals (API error).\n"));
@@ -2887,6 +2927,14 @@ async function main() {
     try {
       const { text: answer, shown, cancelled, inputTokens, outputTokens, turnOutputTokens } =
         await runAgentTurn(history);
+      // Feed the bottom bar's token row (task #104). Assigned for EVERY turn — including one
+      // that ended without an answer — so the row never shows a stale count from an older
+      // turn. It replaces the print-once-per-turn footer that used to live here: the bar is
+      // always on screen, so printing the same three figures into the scrollback right above
+      // it just read as a duplicate.
+      lastTurnInputTokens = inputTokens ?? 0;
+      lastTurnOutputTokens = turnOutputTokens ?? 0;
+      lastTurnTotalOutput = outputTokens ?? 0;
       if (answer) {
         history.push({ role: "assistant", content: answer });
         // Persist after every successful turn (not just on clean exit) — an ungraceful
@@ -2902,24 +2950,6 @@ async function main() {
         // renderAnswer also WRAPS long lines and re-indents each continuation row, so a wrapped
         // paragraph keeps the same left margin instead of soft-wrapping back to column 0.
         console.log(shown ? "" : `${LINE_SPACING}${renderAnswer(answer)}\n`);
-        // Task #104: persistent token footer at the bottom of the screen — this turn's
-        // code-model INPUT + this turn's OUTPUT (↓ out), then the model's GLOBAL lifetime
-        // output total (all turns for this user + coding server), labelled with the model
-        // name so it's clear which coder that running total belongs to. Guard on THIS turn's
-        // activity so a plain-reply greeting that did no code-model work shows nothing (#112).
-        if ((inputTokens ?? 0) > 0 || (turnOutputTokens ?? 0) > 0) {
-          const coder = sessionCodingLabel || defaultCodingModel;
-          console.log(
-            GUTTER +
-              dim("tokens · ↑ in ") +
-              fmtTokens(inputTokens ?? 0) +
-              dim(" · ") +
-              cyan(`↓ out ${fmtTokens(turnOutputTokens ?? 0)}`) +
-              dim(" · ") +
-              dim(`${coder ? coder + " " : ""}total `) +
-              cyan(`↓ ${fmtTokens(outputTokens ?? 0)}`)
-          );
-        }
       } else {
         history.pop(); // aborted/failed/cancelled turn — don't poison the next request
         // A turn that ended WITHOUT an answer (Ctrl+C cancel, or an abort/failure) must not

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-cli",
-  "version": "1.0.369",
+  "version": "1.0.371",
   "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",