@oxecli/oxe 1.0.75 → 1.0.76

package/dist/tools.js

@@ -44,7 +44,7 @@ function displayDiff(pathName, oldContent, newContent) {
     if (oldContent.length + newContent.length > max_diff_source_chars) {
         pendingDiffOutput.push(`\x1b[90m${pathName}: ${oldContent.length.toLocaleString()} chars -> ${newContent.length.toLocaleString()} chars ` +
             `(diff hidden: exceeds ${max_diff_source_chars.toLocaleString()} char limit)\x1b[0m`);
-        return;
+        return null;
     }
     const patch = structuredPatch(pathName, pathName, oldContent, newContent, "", "", { context: max_diff_context_lines });
     const contentLines = [];
@@ -74,7 +74,7 @@ function displayDiff(pathName, oldContent, newContent) {
     const added = contentLines.filter((c) => c.kind === "+").length;
     const removed = contentLines.filter((c) => c.kind === "-").length;
     if (!added && !removed)
-        return;
+        return null;
     const shown = [];
     let run = [];
     let lastKind = null;
@@ -121,51 +121,30 @@ function displayDiff(pathName, oldContent, newContent) {
         if (v.newNum)
             maxNum = Math.max(maxNum, v.newNum);
     }
-    const numW = Math.max(String(maxNum).length, 2);
-    let contentW = 0;
-    for (const v of visible) {
-        const len = v.kind === "~" ? plainLen(v.body) : numW + 1 + 2 + plainLen(v.body);
-        contentW = Math.max(contentW, len);
-    }
-    const headerPlain = `${pathName}  +${added}  -${removed}`;
-    const boxW = Math.min(Math.max(contentW + 6, plainLen(headerPlain) + 6), Math.max(termW - 2, 20));
-    const innerW = Math.max(boxW - 4, 1);
-    const maxPath = Math.max(10, boxW - 2 - plainLen(`  +${added}  -${removed}`) - 3);
-    let pathDisp = pathName;
-    if (plainLen(pathDisp) > maxPath)
-        pathDisp = truncateStyled(pathDisp, Math.max(maxPath - 1, 1)) + "…";
-    const header = `\x1b[1m${pathDisp}\x1b[0m \x1b[32m+${added}\x1b[0m \x1b[31m-${removed}\x1b[0m`;
-    const headerStr = `─ ${header} `;
-    const top = `╭${headerStr}${"─".repeat(Math.max(0, boxW - 2 - plainLen(headerStr)))}╮`;
-    pendingDiffOutput.push(`\x1b[90m${top}\x1b[0m`);
-    const bodyMax = Math.max(innerW - numW - 3, 1);
+    const numW = String(maxNum).length;
+    const indent = "      ";
+    const bodyMax = Math.max(termW - plainLen(indent) - numW - 4, 20);
     const gap = " ".repeat(numW);
     for (const v of visible) {
         if (v.kind === "~") {
-            const body = truncateStyled(v.body, innerW - 2);
-            const text = `\x1b[90m${gap}   ${body}\x1b[0m`;
-            const fill = Math.max(0, innerW - plainLen(text));
-            pendingDiffOutput.push(`\x1b[90m│\x1b[0m ${text}${" ".repeat(fill)} \x1b[90m│\x1b[0m`);
+            const body = truncateStyled(v.body, bodyMax);
+            pendingDiffOutput.push(`\x1b[90m${indent}${gap}   ${body}\x1b[0m`);
             continue;
         }
         const num = v.kind === "+" ? v.newNum : v.oldNum;
         const numStr = num ? String(num).padStart(numW, " ") : gap;
         if (v.kind === "+" || v.kind === "-") {
             const color = v.kind === "+" ? "\x1b[32m" : "\x1b[31m";
+            const sign = v.kind === "+" ? "+" : "-";
             const body = truncateStyled(v.body, bodyMax);
-            const text = `${numStr} ${v.kind === "+" ? "+ " : "- "}${body}`;
-            const fill = Math.max(0, innerW - plainLen(text));
-            // Whole line is painted green/red, filling to the right edge.
-            pendingDiffOutput.push(`\x1b[90m│\x1b[0m ${color}${text}${" ".repeat(fill)}\x1b[0m \x1b[90m│\x1b[0m`);
+            pendingDiffOutput.push(`${indent}${color}${numStr} ${sign}  ${body}\x1b[0m`);
         }
         else {
             const body = truncateStyled(v.kind === "\\" ? v.body : highlightCodeLine(v.body), bodyMax);
-            const text = `\x1b[90m${numStr}  ${body}\x1b[0m`;
-            const fill = Math.max(0, innerW - plainLen(text));
-            pendingDiffOutput.push(`\x1b[90m│\x1b[0m ${text}${" ".repeat(fill)} \x1b[90m│\x1b[0m`);
+            pendingDiffOutput.push(`\x1b[90m${indent}${numStr}  ${body}\x1b[0m`);
         }
     }
-    pendingDiffOutput.push(`\x1b[90m╰${"─".repeat(boxW - 2)}╯\x1b[0m`);
+    return { added, removed };
 }
 export function truncateToolOutput(output, maxChars = max_output_chars) {
     if (output.length > maxChars) {
@@ -491,7 +470,6 @@ export function toolEditFile(pathName, oldString, newString, replaceAll = false)
     const text = data.toString("utf-8");
     const newline = detectNewline(text);
     let match;
-    let normalized = false;
     if (text.includes(oldString)) {
         match = oldString;
     }
@@ -499,7 +477,6 @@ export function toolEditFile(pathName, oldString, newString, replaceAll = false)
         const norm = withNewlines(oldString, newline);
         if (text.includes(norm)) {
             match = norm;
-            normalized = true;
         }
         else {
             const blocks = findWsBlocks(text, oldString);
@@ -508,7 +485,6 @@ export function toolEditFile(pathName, oldString, newString, replaceAll = false)
                     "(line endings and per-line leading/trailing whitespace are normalized for matching)");
             }
             match = blocks[0];
-            normalized = true;
         }
     }
     const count = text.split(match).length - 1;
@@ -519,15 +495,17 @@ export function toolEditFile(pathName, oldString, newString, replaceAll = false)
     const newContent = replaceAll
         ? text.split(match).join(insert)
         : text.replace(match, insert);
-    displayDiff(pathName, text, newContent);
+    const summary = displayDiff(pathName, text, newContent);
     try {
         fs.writeFileSync(p, newContent, "utf-8");
     }
     catch (err) {
         return `Error: ${err}`;
     }
-    return (`Edited ${pathName} (${count} occurrence${count !== 1 ? "s" : ""} replaced` +
-        `${normalized ? "; line endings and per-line whitespace normalized" : ""})`);
+    if (!summary)
+        return `Edited ${pathName}`;
+    return (`Added ${summary.added} line${summary.added !== 1 ? "s" : ""}, ` +
+        `removed ${summary.removed} line${summary.removed !== 1 ? "s" : ""}`);
 }
 // ---------------------------------------------------------------------------
 // bash

package/dist/ui.js

@@ -556,7 +556,7 @@ export class Spinner {
     draw() {
         const text = this.render ? this.render() : "";
         const icon = SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length];
-        const rendered = `\x1b[36m${icon}\x1b[0m \x1b[90m${text}\x1b[0m`;
+        const rendered = `\x1b[1;36m${icon}\x1b[0m \x1b[90m${text}\x1b[0m`;
         // Nothing changed on this tick -> do not rewrite the line (avoids flicker).
         if (rendered === this.lastRendered)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxecli/oxe",
-  "version": "1.0.75",
+  "version": "1.0.76",
   "publishConfig": {
     "access": "public"
   },