@tiens.nguyen/gu-cli 1.0.808 → 1.0.810

package/gu-repl.mjs

@@ -142,7 +142,7 @@ import { unapprovedProjectServers } from "./mcp-command.mjs";
 import { readHooks } from "./hooks-config.mjs";
 import { readSkillSource, sourceLabel, SKILL_SOURCE_KEY } from "./skill-source.mjs";
 import { codingBannerLabel, isOllamaCloudUrl, SECRET_KEY_HINT } from "./coding-key-prompt.mjs";
-import { questionEchoText, thoughtPrintSeq } from "./terminal-layout.mjs";
+import { questionEchoText, thoughtPrintSeq, wrapDiffText } from "./terminal-layout.mjs";
 import { globalPrefixOf } from "./install-path.mjs";
 import { firstGuOnPath, pathGuMismatch, guOnPathIsCurrent, updateAttemptRecord, repeatUpdateNotice } from "./update-verify.mjs";
 import { embedNotice, embedState } from "./embed-model-command.mjs";
@@ -917,16 +917,14 @@ const COMMANDS = [
   // outside, it is confused". The command still works and still does the same thing.
   { name: "/agent-model", desc: "switch the AGENT model (the one that talks) — saved on this machine" },
   { name: "/embed-model", desc: "switch the RAG EMBEDDING model (nomic-embed-text / qwen3-embedding) and its server — re-indexes what is already indexed; supports a remote URL + API key" },
-  { name: "/test-auto", desc: "toggle auto-test (verify & fix until it passes) for this folder" },
-  // ONE command, three answers. /rag-local and /rag-cloud still work — they are in people's
-  // fingers — but they are HIDDEN_COMMANDS now, because offering three doors into one setting
-  // is what made this confusing in the first place.
-  { name: "/rag", desc: "where this folder's RAG knowledge base lives: local, cloud, or both" },
+  // /test-auto is HIDDEN_COMMANDS now — the handler still works when typed, it is just not offered.
+  // /rag, /rag-local and /rag-cloud all still work — they are in people's fingers — but they are
+  // HIDDEN_COMMANDS now, so /help and Tab-completion do not offer them.
   // The two synonyms were dispatched but declared nowhere (found by slash-command-wiring.test.mjs):
   // they worked, Tab-completed to nothing, and appeared in no help. Aliases is what the registry
   // already has for exactly this — /quit, /rag-local.
   { name: "/host-mode", desc: "undo client mode — run agent turns on THIS machine again" },
-  { name: "/undo", usage: "/undo [runId]", desc: "put back the files the last stopped turn changed (from its backups) — asks first" },
+  // /undo is HIDDEN_COMMANDS now — still works when typed.
   { name: "/server", desc: "pick a deployment server (host/user) for this session" },
   { name: "/proxy", usage: "/proxy [show|set|on|off|clear|test]", desc: "route MODEL calls through an HTTP proxy (local calls always go direct)" },
   { name: "/s3", usage: "/s3 [test]", desc: "set up YOUR S3 bucket (RAG index, and the PDFs/downloads gu makes) and check the AWS keys work — without it, files are saved on this computer" },
@@ -12053,7 +12051,14 @@ async function runAgentTurn(history, { attachJobId = "", ownJob = false } = {})
           if (m) {
             // "    19 -  old text" → dim line number, red/cyan signed content.
             const paintDiff = m[3] === "+" ? accent : red;
-            process.stdout.write(`${GUTTER}${m[1]}${dim(m[2])} ${paintDiff(`${m[3]} ${m[4]}`)}\n`);
+            // Wrap to the terminal width: continuation rows hang under the text column
+            // (no line number, blank sign) instead of soft-wrapping back to column 0.
+            const room = Math.max(8, Math.max(20, process.stdout.columns || 80) - 1 - visibleLen(GUTTER) - m[1].length - m[2].length - 1 - 2);
+            const pieces = wrapDiffText(m[4], room);
+            process.stdout.write(`${GUTTER}${m[1]}${dim(m[2])} ${paintDiff(`${m[3]} ${pieces[0]}`)}\n`);
+            for (const p of pieces.slice(1)) {
+              process.stdout.write(`${GUTTER}${m[1]}${" ".repeat(m[2].length)} ${paintDiff(`  ${p}`)}\n`);
+            }
           } else {
             process.stdout.write(GUTTER + dim(line) + "\n"); // "└ summary" / "… (+N more)"
           }

package/package.json

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

package/terminal-layout.mjs

@@ -66,6 +66,45 @@ export function clipVisible(s, max) {
   return out;
 }
 
+/**
+ * Wrap the TEXT of one edit-card diff row so no piece is wider than `room` visible columns
+ * (task #24). A raw over-wide row is soft-wrapped by the terminal back to column 0, which
+ * destroys the card's indent. Prefers breaking after a space; a token longer than a whole
+ * row is hard-split. The caller paints the first piece after the line number and every
+ * further piece under the text column (hanging indent). Leading code indentation is kept.
+ */
+export function wrapDiffText(text, room) {
+  const max = Math.max(8, Math.floor(room) || 8);
+  const chars = [...String(text ?? "").replace(/\t/g, "  ")];
+  const rows = [];
+  let cur = [];
+  let w = 0;
+  let lastSpace = -1;
+  for (const ch of chars) {
+    const cw = charWidth(ch);
+    if (w + cw > max) {
+      const canBreak = lastSpace > 0 && ch !== " " && cur.slice(0, lastSpace).some((c) => c !== " ");
+      if (canBreak) {
+        const tail = cur.slice(lastSpace + 1);
+        rows.push(cur.slice(0, lastSpace).join("").replace(/\s+$/, ""));
+        cur = tail;
+        w = tail.reduce((n, c) => n + charWidth(c), 0);
+      } else {
+        rows.push(cur.join(""));
+        cur = [];
+        w = 0;
+      }
+      lastSpace = -1;
+      if (ch === " ") continue; // a space that lands on the break is not carried to the next row
+    }
+    cur.push(ch);
+    w += cw;
+    if (ch === " ") lastSpace = cur.length - 1;
+  }
+  rows.push(cur.join(""));
+  return rows;
+}
+
 /**
  * The prompt breakdown as rows to print (task #142) — WHERE the coding model's context went.
  *
@@ -2296,6 +2335,9 @@ export const HIDDEN_COMMANDS = [
                                 // too offered two doors into one setting (reported as confusing)
   "/rag-local",                 // superseded by /rag's picker; still work, still mean what
   "/rag-cloud",                 // they say — unlisted so /help offers one way into the setting
+  "/rag",                       // hidden too (user request, #25): handler unchanged, not offered
+  "/test-auto",                 // hidden, still toggles auto-test when typed
+  "/undo",                      // hidden, still restores the last stopped turn when typed
   "/thought",                   // the reasoning display stays ON; only the toggle is unlisted
   "/hover",                     // in-turn mouse capture — behaviour unchanged, just hidden
   "/reset",                     // the old name of /new (#278) — still works, one name is offered