@tiens.nguyen/gonext-cli 1.0.366 → 1.0.368

package/gonext-repl.mjs

@@ -21,7 +21,7 @@
  * interrupted investigation actually resumes it). /reset clears it.
  *
  * Requires the worker daemon to be running (it claims the job).
- * Commands: /exit  /model  /reset  /revert [runId]  /help   Ctrl-C stops following the current run.
+ * Commands: /exit  /model  /reset  /manual-edit [runId]  /help   Ctrl-C stops following the current run.
  */
 import { readFile, mkdir, writeFile, unlink } from "node:fs/promises";
 import { existsSync, statSync, readFileSync } from "node:fs";
@@ -127,6 +127,37 @@ const wrapGutter = (plain, colorFn = (s) => s) =>
   wrapBlock(plain, GUTTER, process.stdout.columns || 80)
     .map((l) => (l.length ? GUTTER + colorFn(l) : l))
     .join("\n");
+// Visible width of a string, ignoring SGR colour escapes (they occupy no cells).
+const vwidth = (s) => String(s).replace(/\x1b\[[0-9;]*m/g, "").length;
+// The gonext startup LOGO (task #131): a small block-art right-chevron — the "go / next"
+// play mark — drawn to the left of the status facts. Kept minimal so it renders on any
+// terminal/theme (block elements only, like the ● ✓ ✗ already in use). Rows are plain text;
+// padded + coloured at render time. LOGO_W = the visible column the status text starts after.
+const LOGO = ["█▖", "███▖", "█████▖", "███▘", "█▘"];
+const LOGO_W = 7;
+// Lay the LOGO and the status rows SIDE BY SIDE (logo left, facts right), or STACK them (logo
+// then facts) when the terminal is too narrow to fit both without wrapping — so the banner is
+// never the soft-wrapped jumble the plain "· … · …" lines used to be (task #131). Side-by-side
+// only when GUTTER + logo + gap + the WIDEST status row fits in `cols`; otherwise stacked, with
+// each status row clipped (clipVisible) so nothing spills past the edge. All rows stay within
+// width → the #109 no-wrap invariant holds. `statusRows` are pre-coloured strings.
+const renderBanner = (statusRows) => {
+  const cols = process.stdout.columns || 80;
+  const gap = "  ";
+  const widest = Math.max(0, ...statusRows.map(vwidth));
+  const out = [];
+  if (GUTTER.length + LOGO_W + gap.length + widest <= cols) {
+    const n = Math.max(LOGO.length, statusRows.length);
+    for (let i = 0; i < n; i++) {
+      const left = i < LOGO.length ? cyan(LOGO[i].padEnd(LOGO_W)) : " ".repeat(LOGO_W);
+      out.push(GUTTER + left + gap + (statusRows[i] ?? ""));
+    }
+  } else {
+    for (const r of LOGO) out.push(GUTTER + cyan(r));
+    for (const r of statusRows) out.push(GUTTER + clipVisible(r, cols - 1 - GUTTER.length));
+  }
+  return out.join("\n");
+};
 // The blank SEAM between the dim action log and the bright final answer (grouping, senior-UI
 // advice): the completed-action bullets are now a TIGHT group with no blanks between them, so
 // this one gap is what separates the "what I did" scaffolding from the deliverable. A knob:
@@ -255,7 +286,7 @@ if (argv.includes("--help") || argv.includes("-h")) {
       "  -v, --verbose   show the agent's diagnostic logs ([gonext-agent] …) and python stderr\n" +
       "  -h, --help      this help\n\n" +
       "Auth comes from ~/.gonext/worker.env; models/budgets/RAG come from your web Settings.\n" +
-      "Inside the REPL: /exit · /model · /reset · /revert [runId] · /help — Ctrl-C stops following a turn.\n" +
+      "Inside the REPL: /exit · /model · /reset · /manual-edit [runId] · /help — Ctrl-C stops following a turn.\n" +
       "Questions are enqueued like web questions and executed by the RUNNING\n" +
       "gonext-cli daemon — its terminal shows the full [gonext-agent] logs.\n" +
       "Conversation history is saved per-folder in ~/.gonext/sessions and resumed next time\n" +
@@ -329,7 +360,7 @@ const COMMANDS = [
   { name: "/test-auto", desc: "toggle auto-test (verify & fix until it passes) for this folder" },
   { name: "/rag-local", desc: "toggle storing this folder's RAG knowledge base locally (vs cloud/S3)" },
   { name: "/server", desc: "pick a deployment server (host/user) for this session" },
-  { name: "/revert", usage: "/revert [runId]", desc: "undo the agent's file edits (latest run)" },
+  { name: "/manual-edit", aliases: ["/revert"], usage: "/manual-edit [runId]", desc: "undo the agent's file edits so you can edit them yourself (latest run)" },
   { name: "/reset", aliases: ["/new"], desc: "forget this folder's saved conversation and start fresh" },
   { name: "/output-token", desc: "show the agent code-model OUTPUT-token total for this workspace" },
   { name: "/reset-output-token-global", desc: "reset the GLOBAL (you + coding server) output-token total to 0" },
@@ -610,6 +641,26 @@ if (process.stdout.isTTY) {
     }
   });
 }
+// ---------- edit-mode bottom bar (display-only + Shift+Tab to cycle) ----------
+// A split line + a mode indicator shown just above the prompt each turn: "accept edits on"
+// (the agent applies file edits — today's behaviour) vs "manually edit". DISPLAY-ONLY for now
+// — it tracks the mode so the bar reflects it and Shift+Tab cycles it; wiring it to actually
+// gate the agent's edits is a deliberate follow-up.
+let editMode = "accept"; // "accept" | "manual"
+const modeLineText = () =>
+  white("✎ " + (editMode === "accept" ? "accept edits on" : "manually edit")) +
+  dim("   (shift+tab to switch)");
+// The bar: a full-width dim rule (turn separator), then the gutter-inset mode line. Printed
+// above the prompt in the main loop.
+const modeBar = () =>
+  dim("─".repeat(process.stdout.columns || 80)) + "\n" + GUTTER + modeLineText();
+// Shift+Tab redraw: the mode line sits ONE physical row above the ">> " input line. Move up,
+// rewrite it, drop back, and let readline restore the input row + caret (cursor-relative, like
+// the status ticker / pickers, so it survives scrolling).
+const redrawModeLine = () => {
+  process.stdout.write("\x1b[1A\r\x1b[2K" + GUTTER + modeLineText() + "\x1b[1B\r");
+  rl._refreshLine();
+};
 if (process.stdin.isTTY) {
   process.stdin.on("keypress", (_ch, key) => {
     // An arrow-key list picker (/server) is up → ↑/↓ move the highlight, Enter chooses.
@@ -634,6 +685,15 @@ if (process.stdin.isTTY) {
       rl.historyIndex = -1;
       return;
     }
+    // Shift+Tab cycles the edit mode shown in the bottom bar (display-only). Skip while the
+    // slash overlay owns the screen so we don't fight its redraw.
+    if (key && key.name === "tab" && key.shift) {
+      if (!slashOverlayActive) {
+        editMode = editMode === "accept" ? "manual" : "accept";
+        redrawModeLine();
+      }
+      return;
+    }
     // Enter is handled by rl.on("line") — don't redraw the hint on the way out.
     if (key && (key.name === "return" || key.name === "enter")) return;
     // ↑/↓ while the menu is up = move the highlight IN PLACE. readline drawing is
@@ -770,14 +830,8 @@ async function ensureWorkspace() {
       );
       await writeFile(WS_FILE, JSON.stringify({ workspaces: list }, null, 2) + "\n");
     }
-    wsSync = { enabled: hit.allowSync !== false, name: hit.name, path: hit.path };
-    console.log(
-      wrapGutter(
-        `workspace: ${hit.name} → ${hit.path} (run ${hit.allowRun ? "enabled" : "disabled"}` +
-          `${hit.allowSync !== false ? ", cloud sync on" : ""})`,
-        dim
-      )
-    );
+    // The workspace facts now live in the startup banner (task #131) — just remember them.
+    wsSync = { enabled: hit.allowSync !== false, name: hit.name, path: hit.path, run: !!hit.allowRun };
     return;
   }
   if (!existsSync(cwd) || !statSync(cwd).isDirectory()) return;
@@ -812,7 +866,7 @@ async function ensureWorkspace() {
   });
   await mkdir(dirname(WS_FILE), { recursive: true });
   await writeFile(WS_FILE, JSON.stringify({ workspaces: next }, null, 2) + "\n");
-  wsSync = { enabled: allowSync, name: basename(cwd), path: cwd };
+  wsSync = { enabled: allowSync, name: basename(cwd), path: cwd, run: allowRun };
   console.log(
     GUTTER +
       green(`✓ workspace registered: ${basename(cwd)}`) +
@@ -2442,23 +2496,9 @@ async function runAgentTurn(history) {
 
 // ---------- REPL ----------
 async function main() {
-  // Wrap the header so a narrow window doesn't soft-wrap "key wk_…" to column 0; keep the
-  // "GoNext agent REPL" label cyan on row 0, dim the rest (and any wrapped continuation rows).
-  {
-    const LABEL = "GoNext agent REPL";
-    const header = `${LABEL} v${REPL_VERSION} · API ${apiBase} · key ${workerKey.slice(0, 8)}…`;
-    console.log(
-      wrapBlock(header, GUTTER, process.stdout.columns || 80)
-        .map((l, i) =>
-          !l.length
-            ? l
-            : i === 0 && l.startsWith(LABEL)
-              ? GUTTER + cyan(LABEL) + dim(l.slice(LABEL.length))
-              : GUTTER + dim(l)
-        )
-        .join("\n")
-    );
-  }
+  // The startup banner (logo + status facts) is printed AFTER the payload fetch below, once the
+  // model/coder/RAG are known — see renderBanner (task #131). Nothing prints here so the banner
+  // lands as one clean block.
   // 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
@@ -2504,17 +2544,25 @@ async function main() {
       sessionRagMode = local ? "local" : "cloud";
       await saveSessionRagMode(resolve(process.cwd()), sessionRagMode);
     }
-    console.log(
-      wrapGutter(
-        `agent model: ${p.agentModelId || probe?.modelKey || "?"}` +
-          (p.codingModelId ? ` · coder: ${p.codingModelId}` : "") +
-          (p.ragEnabled ? ` · RAG ${sessionRagMode === "cloud" ? "cloud" : "local"}` : "") +
-          ` · auto-test: ${sessionTestAuto ? "on" : "off"}` +
-          (selectedServer ? ` · deploy: ${selectedServer.name} (${selectedServer.user}@${selectedServer.host})` : "") +
-          (sessionTestAuto ? "" : " (/test-auto to enable)"),
-        dim
-      )
-    );
+    // Startup banner (task #131): the gonext logo on the left, compact status facts on the
+    // right (label dim, value bright) — one fact per short line instead of the old wrapped
+    // "· … · …" wall. renderBanner lays them side by side, or stacks on a narrow terminal.
+    {
+      const lbl = (s) => dim(s.padEnd(7)); // aligned dim labels, values start at col 7
+      const ws = wsSync?.name || basename(resolve(process.cwd()));
+      const statusRows = [
+        bold(cyan("GONEXT AGENT")) + dim(`  v${REPL_VERSION}`),
+        lbl("model") + (p.agentModelId || probe?.modelKey || "?"),
+        lbl("coder") + (p.codingModelId || dim("—")),
+        lbl("RAG") + (p.ragEnabled ? (sessionRagMode === "cloud" ? "cloud" : "local") : dim("off")),
+        sessionTestAuto ? green("auto-test on") : dim("auto-test off"),
+        lbl("folder") + ws + dim(wsSync ? ` (${wsSync.run ? "run" : "read-only"}${wsSync.enabled ? " · sync" : ""})` : ""),
+      ];
+      if (selectedServer)
+        statusRows.push(lbl("deploy") + `${selectedServer.name} ${dim(`(${selectedServer.user}@${selectedServer.host})`)}`);
+      statusRows.push(dim(`key ${workerKey.slice(0, 8)}…`));
+      console.log(renderBanner(statusRows));
+    }
     // Task #127, Phase 3: if the base chat model server isn't answering, offer to set it up
     // (download + start mlx_lm.server). BC3: only runs when NOTHING answers — an already-up
     // model is left untouched, and this is skipped entirely. Interactive TTYs only.
@@ -2635,6 +2683,9 @@ async function main() {
   let lastCancelledTask = "";
 
   for (;;) {
+    // The bottom bar (split line + edit-mode indicator) sits just above the prompt each turn;
+    // the mode line is exactly ONE row above ">> " so Shift+Tab can redraw it in place.
+    if (process.stdout.isTTY) process.stdout.write(modeBar() + "\n");
     rl.prompt();
     // Absorb blank Enter-presses SILENTLY under the same prompt — without this, lines
     // typed while the agent was busy on a long turn (queued, not yet read) all drain at
@@ -2731,7 +2782,7 @@ async function main() {
       }
       continue;
     }
-    if (line.startsWith("/revert")) {
+    if (line.startsWith("/manual-edit") || line.startsWith("/revert")) {
       const runId = line.split(/\s+/)[1] ?? "";
       await new Promise((res) => {
         const p = spawn(

package/package.json

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