@tiens.nguyen/gu-cli 1.0.807 → 1.0.809

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";
@@ -12053,7 +12053,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.807",
+  "version": "1.0.809",
   "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.
  *