@oxecli/oxe 1.0.109 → 1.0.110

package/dist/tools.js

@@ -4,7 +4,7 @@ import { execFile, spawn } from "node:child_process";
 import { structuredPatch } from "diff";
 import { max_diff_source_chars, max_diff_lines, max_diff_context_lines, max_diff_line_chars, max_read_line_chars, max_read_file_bytes, max_read_lines, max_output_chars, max_bash_timeout_seconds, max_grep_file_bytes, strict_max_properties, ignoredDirs, } from "./config.js";
 import { toolLoadSkill } from "./skills.js";
-import { truncateStyled, plainLen, terminalWidth, highlightCodeLine } from "./ui.js";
+import { truncateStyled, plainLen, terminalWidth, highlightCodeLine, fitBoxWidth } from "./ui.js";
 export { toolLoadSkill };
 // ---------------------------------------------------------------------------
 // Path sanitization helper
@@ -148,6 +148,10 @@ function displayDiff(pathName, oldContent, newContent) {
         return { kind: k, body: line.slice(1), oldNum, newNum };
     });
     const termW = terminalWidth();
+    // The diff rows render outside a panel, so clamp their width to the scaled
+    // box width (minus margin) so they never overflow on narrow terminals.
+    const boxW = fitBoxWidth(termW - 4, termW);
+    const innerW = Math.max(boxW - 4, 1);
     let maxNum = 1;
     for (const v of visible) {
         if (v.oldNum)
@@ -156,7 +160,7 @@ function displayDiff(pathName, oldContent, newContent) {
             maxNum = Math.max(maxNum, v.newNum);
     }
     const numW = String(maxNum).length;
-    const bodyMax = Math.max(termW - ind.length - numW - 4, 20);
+    const bodyMax = Math.max(innerW - ind.length - numW - 4, 1);
     const gap = " ".repeat(numW);
     for (const v of visible) {
         if (v.kind === "~") {
@@ -184,7 +188,7 @@ function displayDiff(pathName, oldContent, newContent) {
             const shown = isAdd
                 ? body
                 : recolorBrackets(body, fg, "\x1b[97m");
-            const fill = Math.max(0, termW - ind.length - numW - 4 - plainLen(body));
+            const fill = Math.max(0, innerW - ind.length - numW - 4 - plainLen(body));
             pendingDiffOutput.push(`${ind}${bg}${fg}${numStr} ${sign}  \x1b[0m${bg}\x1b[97m${shown}${bg}\x1b[97m${" ".repeat(fill)}\x1b[0m`);
         }
         else {

package/dist/ui.js

@@ -117,7 +117,7 @@ export function terminalWidth() {
     return process.stdout.columns || 80;
 }
 /** Minimum width for boxes/cards so they don't collapse to nothing. */
-const MIN_BOX_WIDTH = 40;
+const MIN_BOX_WIDTH = 52;
 /** Horizontal margin reserved on each side of a box/card from the terminal edge. */
 const BOX_MARGIN = 4;
 /**
@@ -127,7 +127,7 @@ const BOX_MARGIN = 4;
  * terminal is narrower than min+margin, so cards size down smoothly instead of
  * overflowing.
  */
-function fitBoxWidth(pref, termW) {
+export function fitBoxWidth(pref, termW) {
     const maxW = Math.max(termW - BOX_MARGIN, 1);
     return Math.min(Math.max(Math.min(pref, maxW), MIN_BOX_WIDTH), maxW);
 }
@@ -363,13 +363,36 @@ function formatMarkdownTable(tableLines) {
         }
         colWidths.push(Math.max(mw, 3));
     }
+    // Scale the table to fit the terminal: shrink columns (each toward a minimum
+    // of 3) so the whole table stays inside the box width instead of overflowing
+    // or wrapping its borders on a narrow/scaled terminal. Cell content that no
+    // longer fits is truncated to the column width when rendered.
+    {
+        const termW = terminalWidth();
+        const boxW = fitBoxWidth(termW - 4, termW);
+        const availW = Math.max(boxW - 4, 1);
+        // total = Σ(colWidth+2) + (ncols-1) separators + 2 outer borders.
+        const totalW = colWidths.reduce((a, w) => a + w + 2, 0) + (colWidths.length - 1) + 2;
+        let extra = totalW - availW;
+        if (extra > 0) {
+            for (let c = 0; c < colWidths.length && extra > 0; c++) {
+                const room = colWidths[c] - 3;
+                if (room > 0) {
+                    const cut = Math.min(room, extra);
+                    colWidths[c] -= cut;
+                    extra -= cut;
+                }
+            }
+        }
+    }
     const out = [];
     const topBorder = `\x1b[90m╭${colWidths.map((w) => "─".repeat(w + 2)).join("┬")}╮\x1b[0m`;
     const midBorder = `\x1b[90m├${colWidths.map((w) => "─".repeat(w + 2)).join("┼")}┤\x1b[0m`;
     const botBorder = `\x1b[90m╰${colWidths.map((w) => "─".repeat(w + 2)).join("┴")}╯\x1b[0m`;
     out.push(topBorder);
     const headCells = header.map((h, i) => {
-        const formatted = `\x1b[1;37m${formatInlineMarkdown(h)}\x1b[0m`;
+        const raw = `\x1b[1;37m${formatInlineMarkdown(h)}\x1b[0m`;
+        const formatted = truncateStyled(raw, colWidths[i]);
         const pad = colWidths[i] - plainLen(formatted);
         return ` ${formatted}${" ".repeat(Math.max(pad, 0))} `;
     });
@@ -377,7 +400,7 @@ function formatMarkdownTable(tableLines) {
     out.push(midBorder);
     for (const r of rows) {
         const rowCells = header.map((_, i) => {
-            const cell = r[i] ? formatInlineMarkdown(r[i]) : "";
+            const cell = r[i] ? truncateStyled(formatInlineMarkdown(r[i]), colWidths[i]) : "";
             const pad = colWidths[i] - plainLen(cell);
             return ` ${cell}${" ".repeat(Math.max(pad, 0))} `;
         });

package/package.json

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