@tiens.nguyen/gonext-cli 1.0.354 → 1.0.356

package/gonext-repl.mjs

@@ -55,6 +55,18 @@ 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`;
+// Left gutter so terminal output doesn't hug the edge (task #128, Phase 1). A terminal has
+// no CSS padding — a "left margin" is just a space prefix on every printed line, applied
+// consistently at the prompt, the ● bullets, plain replies, the banner and the live status
+// so they share ONE clean left edge. Existing secondary indents already use 2 spaces, so a
+// 2-space gutter converges everything to the same column. `gutterLines` insets a multi-line
+// block (blank lines left bare — no trailing whitespace).
+const GUTTER = "  ";
+const gutterLines = (s) =>
+  String(s)
+    .split("\n")
+    .map((l) => (l.length ? GUTTER + l : l))
+    .join("\n");
 // 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`;
@@ -278,7 +290,7 @@ const rl = createInterface({
   terminal: IS_TTY,
   completer: slashCompleter,
 });
-const PROMPT = cyan(">> ");
+const PROMPT = GUTTER + cyan(">> ");
 rl.setPrompt(PROMPT);
 // Side effect of terminal:false above: readline no longer intercepts arrow keys for
 // command-history recall, so pressing ↑/↓/→/← (or Home/End/Delete) sends the RAW escape
@@ -383,7 +395,9 @@ let secretInput = false;
 
 // Visible width of PROMPT (">> ") — used to put the caret back on the input line by
 // COLUMN, since the string itself carries color escapes that don't occupy cells.
-const PROMPT_COLS = 3;
+// Visible width of PROMPT = the gutter + ">> " (task #128). Used by the slash-overlay
+// cursor math to park the caret at the right column, so it must include the gutter.
+const PROMPT_COLS = GUTTER.length + 3;
 
 // Truncate to `max` VISIBLE columns, keeping the ANSI color escapes (which occupy no
 // cells) intact. Essential for the overlay: every row it draws must fit on ONE physical
@@ -428,8 +442,12 @@ function clipVisible(s, max) {
 function slashOverlaySeq(line, cursor, menu, cols) {
   const width = Math.max(20, cols || 80);
   const n = menu.length;
+  // The input line already insets via PROMPT (= GUTTER + ">> "). Inset the MENU rows too
+  // (task #128 Phase 2), clipping to width-1-GUTTER so gutter+row stays on ONE physical row
+  // — the #109 no-wrap invariant that keeps the \x1b[nA row math exact.
   let out = "\r\x1b[2K" + clipVisible(PROMPT + line, width - 1);
-  for (const r of menu) out += "\n\x1b[2K" + clipVisible(r, width - 1);
+  for (const r of menu)
+    out += "\n\x1b[2K" + GUTTER + clipVisible(r, width - 1 - GUTTER.length);
   // Wipe anything left below (the filtered list can SHRINK as you type), then walk back
   // up to the input line and park the caret at the typed-text offset.
   out += "\x1b[J";
@@ -600,7 +618,10 @@ const ask = async (q) => {
   // Route the question through readline's own prompt so its redraw logic stays
   // consistent (a raw stdout write here would re-create the stale-cursor artifact
   // that terminal:true mode is designed to avoid). Restored to ">> " afterwards.
-  rl.setPrompt(q);
+  // Inset the question by the gutter (task #128) so Y/n prompts share the left edge —
+  // gutterLines so a MULTI-line question ("…commands\n(npm test…)?") insets every line, not
+  // just the first. All ask() callers pass un-indented questions, so it never double-indents.
+  rl.setPrompt(gutterLines(q));
   rl.prompt();
   const a = await nextLine();
   rl.setPrompt(PROMPT);
@@ -659,6 +680,7 @@ async function ensureWorkspace() {
     }
     wsSync = { enabled: hit.allowSync !== false, name: hit.name, path: hit.path };
     console.log(
+      GUTTER +
       dim(
         `workspace: ${hit.name} → ${hit.path} (run ${hit.allowRun ? "enabled" : "disabled"}` +
           `${hit.allowSync !== false ? ", cloud sync on" : ""})`
@@ -667,12 +689,12 @@ async function ensureWorkspace() {
     return;
   }
   if (!existsSync(cwd) || !statSync(cwd).isDirectory()) return;
-  console.log(`This folder is not a registered workspace:\n  ${cwd}`);
+  console.log(gutterLines(`This folder is not a registered workspace:\n  ${cwd}`));
   const register = await askYesNo(
     "Register it so the agent can read/edit code here?", true /* default Yes */
   );
   if (!register) {
-    console.log(dim("Skipped — the agent will not be able to touch files here."));
+    console.log(GUTTER + dim("Skipped — the agent will not be able to touch files here."));
     return;
   }
   const allowRun = await askYesNo(
@@ -700,7 +722,8 @@ async function ensureWorkspace() {
   await writeFile(WS_FILE, JSON.stringify({ workspaces: next }, null, 2) + "\n");
   wsSync = { enabled: allowSync, name: basename(cwd), path: cwd };
   console.log(
-    green(`✓ workspace registered: ${basename(cwd)}`) +
+    GUTTER +
+      green(`✓ workspace registered: ${basename(cwd)}`) +
       (allowRun ? green(" (run-commands enabled)") : dim(" (run-commands disabled)")) +
       (allowSync ? green(" · cloud sync on") : dim(" · cloud sync off"))
   );
@@ -1151,15 +1174,19 @@ let clearActiveStatus = null;
 function drawApprovalOptions(redraw) {
   // Two option lines, redrawn in place. On redraw the cursor sits one row below "No";
   // step up 2 rows, clear+rewrite both, landing back where we started.
+  // Gutter (task #128 Phase 2): inset each option after the line-clear. The ▸/spaces marker
+  // is 2 cols so Yes/No align; the \x1b[2A row-up count is unchanged (still 2 rows).
   const yes = approvalSel === 0 ? green("▸ Yes") : dim("  Yes");
   const no = approvalSel === 1 ? green("▸ No") : dim("  No");
-  process.stdout.write((redraw ? "\x1b[2A" : "") + "\x1b[K" + yes + "\n\x1b[K" + no + "\n");
+  process.stdout.write(
+    (redraw ? "\x1b[2A" : "") + "\x1b[K" + GUTTER + yes + "\n\x1b[K" + GUTTER + no + "\n"
+  );
 }
 function finishApproval(allow) {
   if (!approvalActive) return;
   approvalActive = false;
   // Settle the picker: overwrite the two option lines with a single result line.
-  process.stdout.write("\x1b[2A\x1b[J" + (allow ? green("  ▸ Yes — running it") : red("  ▸ No — skipped")) + "\n");
+  process.stdout.write("\x1b[2A\x1b[J" + GUTTER + (allow ? green("▸ Yes — running it") : red("▸ No — skipped")) + "\n");
   const r = approvalResolve;
   approvalResolve = null;
   if (r) r(!!allow);
@@ -1230,7 +1257,7 @@ async function approvalPrompt(command) {
   }
   const allow = await new Promise((resolve) => {
     if (!process.stdin.isTTY) {
-      process.stdout.write(dim(`\n(approval needed for: ${command} — no interactive terminal, skipping)\n`));
+      process.stdout.write("\n" + GUTTER + dim(`(approval needed for: ${command} — no interactive terminal, skipping)`) + "\n");
       resolve(false);
       return;
     }
@@ -1260,8 +1287,10 @@ let listItems = [];
 let listResolve = null;
 function drawList(redraw) {
   const n = listItems.length;
+  // Gutter (task #128 Phase 2): inset each row after its line-clear. Items are short (model
+  // / server names), so no clip is needed; the \x1b[nA row-up count is unchanged (n rows).
   const body = listItems
-    .map((it, i) => "\x1b[K" + (i === listSel ? green("▸ " + it) : dim("  " + it)))
+    .map((it, i) => "\x1b[K" + GUTTER + (i === listSel ? green("▸ " + it) : dim("  " + it)))
     .join("\n");
   process.stdout.write((redraw ? `\x1b[${n}A` : "") + body + "\n");
 }
@@ -1778,7 +1807,11 @@ async function runAgentTurn(history) {
     // underlined bright-green hover style when the mouse is over a clickable thought. Then the
     // GREY expanded lines (if any), then LAST the SPINNER + playful word + token labels
     // (task #83/#84), e.g. "  ⠙ Caffeinating… · 12.3k tok · 8.1k max".
-    let out = `${green(BULLET)} ${hovering ? hoverThought(label) : green(label)}`;
+    // Gutter the live status block's first line (task #128) so the blinking ● lines up with
+    // the finished ● bullets during a turn (no left-edge jump). The sub-lines below already
+    // use a 2-space indent = the gutter. Safe for the redraw: clearStatus clears whole lines
+    // and the hover/click hit-testing is ROW-based, so a horizontal offset changes nothing.
+    let out = `${GUTTER}${green(BULLET)} ${hovering ? hoverThought(label) : green(label)}`;
     for (const wl of expLines) out += "\n  " + dim(wl);
     out += "\n" + `  ${color256(wc, `${glyph} ${thinkWord}…`)}${tokLabel}`;
     process.stdout.write(out);
@@ -1921,7 +1954,7 @@ async function runAgentTurn(history) {
       if (isEditCardHeader(line)) {
         onContent();
         inEditCard = true;
-        process.stdout.write(green("⏺") + bold(line.slice(1)) + "\n");
+        process.stdout.write(GUTTER + green("⏺") + bold(line.slice(1)) + "\n");
         lastWasBlank = false;
         lastContentAt = Date.now();
         continue;
@@ -1933,9 +1966,9 @@ async function runAgentTurn(history) {
           if (m) {
             // "    19 -  old text" → dim line number, red/green signed content.
             const paintDiff = m[3] === "+" ? green : red;
-            process.stdout.write(`${m[1]}${dim(m[2])} ${paintDiff(`${m[3]} ${m[4]}`)}\n`);
+            process.stdout.write(`${GUTTER}${m[1]}${dim(m[2])} ${paintDiff(`${m[3]} ${m[4]}`)}\n`);
           } else {
-            process.stdout.write(dim(line) + "\n"); // "└ summary" / "… (+N more)"
+            process.stdout.write(GUTTER + dim(line) + "\n"); // "└ summary" / "… (+N more)"
           }
           lastWasBlank = false;
           lastContentAt = Date.now();
@@ -1959,7 +1992,7 @@ async function runAgentTurn(history) {
           }
           if (rest) {
             onContent();
-            process.stdout.write(codeColor(rest) + "\n");
+            process.stdout.write(GUTTER + codeColor(rest) + "\n");
             lastWasBlank = false;
           }
           lastContentAt = Date.now();
@@ -1978,7 +2011,7 @@ async function runAgentTurn(history) {
           const before = t.replace(CODE_CLOSE_RE, "").trim();
           if (before) {
             onContent();
-            process.stdout.write(codeColor(before) + "\n");
+            process.stdout.write(GUTTER + codeColor(before) + "\n");
             lastWasBlank = false;
           }
           inCode = false;
@@ -1987,7 +2020,7 @@ async function runAgentTurn(history) {
         }
         if (t === "") { lastContentAt = Date.now(); continue; } // skip blank lines in code
         onContent();
-        process.stdout.write(codeColor(line) + "\n");
+        process.stdout.write(GUTTER + codeColor(line) + "\n");
         lastWasBlank = false;
         continue;
       }
@@ -2024,14 +2057,18 @@ async function runAgentTurn(history) {
       if (plainReplyFlow) {
         // Plain-reply content IS the answer — print it in the default color and remember
         // it's visible so the caller doesn't reprint it once the turn completes.
-        process.stdout.write(line.slice(alreadyFlushed) + "\n");
+        // Gutter (task #128) ONLY at line-start: when alreadyFlushed>0 this is a re-flush of
+        // a growing SAME physical line, so a gutter here would land mid-line.
+        process.stdout.write(
+          (alreadyFlushed === 0 ? GUTTER : "") + line.slice(alreadyFlushed) + "\n"
+        );
         liveAnswer += line.slice(alreadyFlushed) + "\n";
         answerShownLive = true;
       } else {
         // 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");
+        process.stdout.write(GUTTER + white(BULLET) + " " + line.trim() + "\n");
       }
       lastWasBlank = false;
     }
@@ -2041,7 +2078,10 @@ async function runAgentTurn(history) {
     // this was meant to fix. Only safe in the plain-reply flow (see plainReplyFlow above).
     if (plainReplyFlow && !inCode && carry.length > carryFlushedLen) {
       if (carryFlushedLen === 0) onContent();
-      process.stdout.write(carry.slice(carryFlushedLen)); // default color — this IS the answer
+      // Gutter (task #128) only at the pending line's START; a continuation appends bare.
+      process.stdout.write(
+        (carryFlushedLen === 0 ? GUTTER : "") + carry.slice(carryFlushedLen)
+      ); // default color — this IS the answer
       liveAnswer += carry.slice(carryFlushedLen);
       carryFlushedLen = carry.length;
       answerShownLive = true;
@@ -2161,7 +2201,14 @@ async function runAgentTurn(history) {
           }
           if (rest) {
             onContent();
-            process.stdout.write(rest);
+            // Gutter (task #128 Phase 2): this tail CONTINUES the already-streamed answer, so
+            // inset only NEW lines within it (\n followed by content), and prepend the gutter
+            // only when the cursor is already at a line start (liveAnswer empty or ended with
+            // a newline). Rare path — an old worker that replaced the streamed text.
+            const atLineStart = liveAnswer === "" || /\n$/.test(liveAnswer);
+            process.stdout.write(
+              (atLineStart ? GUTTER : "") + rest.replace(/\n(?=[^\n])/g, "\n" + GUTTER)
+            );
             lastWasBlank = false;
           }
         }
@@ -2232,7 +2279,7 @@ async function runAgentTurn(history) {
         // killed the Python agent. Print a quiet note and return an empty, non-persisted
         // turn (main() drops it from history).
         clearStatus();
-        process.stdout.write(dim("\n(cancelled — the agent was stopped)\n"));
+        process.stdout.write("\n" + GUTTER + dim("(cancelled — the agent was stopped)") + "\n");
         return { text: "", shown: false, cancelled: true };
       }
       if (job.jobStatus === "failed") {
@@ -2272,7 +2319,7 @@ async function runAgentTurn(history) {
 
 // ---------- REPL ----------
 async function main() {
-  console.log(cyan("GoNext agent REPL") + dim(` v${REPL_VERSION} · API ${apiBase} · key ${workerKey.slice(0, 8)}…`));
+  console.log(GUTTER + cyan("GoNext agent REPL") + dim(` v${REPL_VERSION} · API ${apiBase} · key ${workerKey.slice(0, 8)}…`));
   // Task #127, Phase 2: the REPL enqueues jobs that the polling DAEMON executes, so ensure
   // one is running — no GoTerminal needed. Idempotent + BC4-safe: startDaemon() no-ops when
   // a daemon (ours, GoTerminal's, or a manual one) is already alive. Best-effort; a failure
@@ -2319,6 +2366,7 @@ async function main() {
       await saveSessionRagMode(resolve(process.cwd()), sessionRagMode);
     }
     console.log(
+      GUTTER +
       dim(
         `agent model: ${p.agentModelId || probe?.modelKey || "?"}` +
           (p.codingModelId ? ` · coder: ${p.codingModelId}` : "") +
@@ -2385,14 +2433,14 @@ async function main() {
     }
     process.exit(1);
   }
-  console.log(dim("Ask about this repo. Type / to see commands (Tab completes). Ctrl-C aborts a running turn.\n"));
+  console.log(GUTTER + dim("Ask about this repo. Type / to see commands (Tab completes). Ctrl-C aborts a running turn.\n"));
 
   const cwd = resolve(process.cwd());
   const history = await loadSession(cwd);
   if (history.length > 0) {
     const turns = history.filter((m) => m.role === "user").length;
     console.log(
-      dim(`Resumed session: ${turns} prior turn(s) from last time in this folder — /reset to start fresh.\n`)
+      GUTTER + dim(`Resumed session: ${turns} prior turn(s) from last time in this folder — /reset to start fresh.\n`)
     );
   }
   // Ctrl-C arrives on ONE of two paths depending on the readline mode: with
@@ -2413,7 +2461,7 @@ async function main() {
         // agent; the poll loop then returns cleanly with the "(cancelled)" note.
         cancelRequested = true;
         const jobId = currentJobId;
-        process.stdout.write(red("\n^C ") + dim("stopping the agent…\n"));
+        process.stdout.write("\n" + GUTTER + red("^C ") + dim("stopping the agent…\n"));
         fetch(`${apiBase}/api/worker/jobs/cancel`, {
           method: "POST",
           headers: { "Content-Type": "application/json", "X-Worker-Key": workerKey },
@@ -2425,12 +2473,12 @@ async function main() {
         // Second Ctrl+C (or no jobId yet): give up waiting locally. The worker keeps
         // trying to stop, but we stop following.
         followAborted = true;
-        process.stdout.write(red("\n^C "));
+        process.stdout.write("\n" + GUTTER + red("^C "));
       }
     } else {
       // Ctrl+C at a prompt with the slash overlay open = dismiss the overlay first (#109).
       if (slashOverlayActive) closeSlashOverlay();
-      process.stdout.write(dim("\n(/exit to quit)\n"));
+      process.stdout.write("\n" + GUTTER + dim("(/exit to quit)") + "\n");
       // Discard anything half-typed (Ctrl-C at a prompt means "never mind") and
       // redraw through readline so its cursor tracking stays right.
       rl.line = "";
@@ -2503,7 +2551,7 @@ async function main() {
     if (line === "/reset" || line === "/new") {
       history.length = 0;
       await clearSession(cwd);
-      console.log(dim("Session cleared — starting fresh.\n"));
+      console.log(GUTTER + dim("Session cleared — starting fresh.\n"));
       continue;
     }
     if (line === "/output-token") {
@@ -2531,15 +2579,15 @@ async function main() {
         false
       );
       if (!ok) {
-        console.log(dim("Cancelled — output-token totals unchanged.\n"));
+        console.log(GUTTER + dim("Cancelled — output-token totals unchanged.\n"));
         continue;
       }
       const done = await resetGlobalOutputTokens();
       if (done) {
         globalOutputTokens = 0;
-        console.log(green("✓ global + workspace output-token totals reset to 0.\n"));
+        console.log(GUTTER + green("✓ global + workspace output-token totals reset to 0.\n"));
       } else {
-        console.log(dim("Could not reset the output-token totals (API error).\n"));
+        console.log(GUTTER + dim("Could not reset the output-token totals (API error).\n"));
       }
       continue;
     }
@@ -2560,7 +2608,7 @@ async function main() {
     // question; point the user at /help (all real commands were handled above).
     if (line.startsWith("/")) {
       const cmd = line.split(/\s+/)[0];
-      console.log(dim(`unknown command: ${cmd} — type /help (or / then Tab) to list commands\n`));
+      console.log(GUTTER + dim(`unknown command: ${cmd} — type /help (or / then Tab) to list commands\n`));
       continue;
     }
     // Resume a cancelled task: a BARE "continue" right after a Ctrl+C re-runs the ORIGINAL
@@ -2576,7 +2624,7 @@ async function main() {
     ) {
       taskLine = pendingResume;
       const shown = pendingResume.length > 80 ? pendingResume.slice(0, 80) + "…" : pendingResume;
-      console.log(dim(`↻ resuming the cancelled task: ${shown}\n`));
+      console.log(GUTTER + dim(`↻ resuming the cancelled task: ${shown}\n`));
     }
     history.push({ role: "user", content: taskLine });
     try {
@@ -2590,7 +2638,7 @@ async function main() {
         await saveSession(cwd, history);
         // A plain-reply answer already streamed live in the loop above — printing it
         // again here would just duplicate it; a blank line is enough for spacing.
-        console.log(shown ? "" : `\n\n${answer}\n`);
+        console.log(shown ? "" : `\n\n${gutterLines(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

package/package.json

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