@oxecli/oxe 1.0.59 → 1.0.61

package/dist/tools.js

@@ -4,6 +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 } from "./ui.js";
 export { toolLoadSkill };
 // ---------------------------------------------------------------------------
 // Path sanitization helper
@@ -52,7 +53,6 @@ function displayDiff(pathName, oldContent, newContent) {
     const removed = contentLines.filter((c) => c.kind === "-").length;
     if (!added && !removed)
         return;
-    process.stdout.write(`\x1b[90m┌─\x1b[0m \x1b[1m${pathName}\x1b[0m \x1b[32m+${added}\x1b[0m \x1b[31m-${removed}\x1b[0m\n`);
     const shown = [];
     let run = [];
     let lastKind = null;
@@ -77,18 +77,46 @@ function displayDiff(pathName, oldContent, newContent) {
         run.push(c);
     }
     flush();
-    for (const l of shown) {
-        if (l.startsWith("+")) {
-            process.stdout.write(`\x1b[90m│\x1b[0m \x1b[32m${l}\x1b[0m\n`);
-        }
-        else if (l.startsWith("-")) {
-            process.stdout.write(`\x1b[90m│\x1b[0m \x1b[31m${l}\x1b[0m\n`);
+    // Build the lines, stripping the leading + / - / space marker for display.
+    const visible = shown.map((l) => {
+        const kind = l[0] === "+" ? "+" : l[0] === "-" ? "-" : " ";
+        return { kind, body: l.slice(1) };
+    });
+    // A "… (N lines hidden) …" summary line is neutral context.
+    const termW = terminalWidth();
+    let contentW = 0;
+    for (const v of visible) {
+        contentW = Math.max(contentW, plainLen(v.body));
+    }
+    const headerPlain = `${pathName}  +${added}  -${removed}`;
+    const boxW = Math.min(Math.max(contentW, 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)))}╮`;
+    process.stdout.write(`\x1b[90m${top}\x1b[0m\n`);
+    for (const v of visible) {
+        let line;
+        if (v.kind === "+") {
+            const body = truncateStyled(v.body, innerW - 2);
+            line = `\x1b[32m+ ${body}\x1b[0m`;
+        }
+        else if (v.kind === "-") {
+            const body = truncateStyled(v.body, innerW - 2);
+            line = `\x1b[31m- ${body}\x1b[0m`;
         }
         else {
-            process.stdout.write(`\x1b[90m│\x1b[0m \x1b[2m${l}\x1b[0m\n`);
+            const body = truncateStyled(v.body, innerW - 2);
+            line = `\x1b[2m  ${body}\x1b[0m`;
         }
+        const fill = Math.max(0, innerW - plainLen(line));
+        process.stdout.write(`\x1b[90m│\x1b[0m ${line}${" ".repeat(fill)} \x1b[90m│\x1b[0m\n`);
     }
-    process.stdout.write(`\x1b[90m└────────────────────────────────────────\x1b[0m\n`);
+    process.stdout.write(`\x1b[90m╰${"─".repeat(boxW - 2)}╯\x1b[0m\n`);
 }
 export function truncateToolOutput(output, maxChars = max_output_chars) {
     if (output.length > maxChars) {

package/dist/ui.js

@@ -183,11 +183,14 @@ function highlightCodeLine(line, _lang = "") {
 }
 function formatInlineMarkdown(text) {
     let line = text;
+    // Links MUST be converted first: the other rules inject ANSI escape codes,
+    // and the link pattern `\[[^\]]+\]\([^)]+\)` would otherwise match the `[`
+    // inside an already-inserted escape (e.g. `\x1b[1m`) and corrupt the output.
+    line = line.replace(/\[([^\]]+)\]\(([^)]+)\)/g, "\x1b[4;36m$1\x1b[0m \x1b[2m($2)\x1b[0m");
     line = line.replace(/\*\*\*([^*]+)\*\*\*/g, "\x1b[1;3m$1\x1b[0m");
     line = line.replace(/\*\*([^*]+)\*\*/g, "\x1b[1m$1\x1b[0m");
     line = line.replace(/(^|[^\w*])\*([^*\n]+)\*(?=$|[^\w*])/g, "$1\x1b[3m$2\x1b[0m");
     line = line.replace(/`([^`]+)`/g, "\x1b[1;36m`$1`\x1b[0m");
-    line = line.replace(/\[([^\]]+)\]\(([^)]+)\)/g, "\x1b[4;36m$1\x1b[0m \x1b[2m($2)\x1b[0m");
     return line;
 }
 // ---------------------------------------------------------------------------
@@ -213,9 +216,9 @@ function formatMarkdownTable(tableLines) {
         colWidths.push(Math.max(mw, 3));
     }
     const out = [];
-    const topBorder = `\x1b[90m┌${colWidths.map((w) => "─".repeat(w + 2)).join("┬")}┐\x1b[0m`;
+    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`;
+    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`;
@@ -251,12 +254,12 @@ export function markdownToAnsi(text) {
             return;
         const badge = codeLang ? ` \x1b[1;36m${codeLang}\x1b[0m ` : " ";
         const barLen = Math.max(10, Math.min(width - plainLen(badge) - 4, 60));
-        out.push(`\x1b[90m┌─${badge}${"─".repeat(barLen)}┐\x1b[0m`);
+        out.push(`\x1b[90m╭─${badge}${"─".repeat(barLen)}╮\x1b[0m`);
         for (const cline of codeBuffer) {
             const highlighted = highlightCodeLine(cline, codeLang);
             out.push(`\x1b[90m│\x1b[0m  ${highlighted}`);
         }
-        out.push(`\x1b[90m└${"─".repeat(barLen + plainLen(badge) + 2)}┘\x1b[0m`);
+        out.push(`\x1b[90m╰${"─".repeat(barLen + plainLen(badge) + 2)}╯\x1b[0m`);
         codeBuffer = [];
         codeLang = "";
     };
@@ -302,20 +305,20 @@ export function markdownToAnsi(text) {
             continue;
         }
         let line = raw;
-        // Headers
+        // Headers (render as styled headings with the '#' markers stripped)
         const h1 = line.match(/^#\s+(.+)$/);
         if (h1) {
-            out.push(`\x1b[1;36m# ${formatInlineMarkdown(h1[1])}\x1b[0m`);
+            out.push(`\x1b[1;36m${formatInlineMarkdown(h1[1])}\x1b[0m`);
             continue;
         }
         const h2 = line.match(/^##\s+(.+)$/);
         if (h2) {
-            out.push(`\x1b[1;34m## ${formatInlineMarkdown(h2[1])}\x1b[0m`);
+            out.push(`\x1b[1;34m${formatInlineMarkdown(h2[1])}\x1b[0m`);
             continue;
         }
         const h3 = line.match(/^###\s+(.+)$/);
         if (h3) {
-            out.push(`\x1b[1;37m### ${formatInlineMarkdown(h3[1])}\x1b[0m`);
+            out.push(`\x1b[1;37m${formatInlineMarkdown(h3[1])}\x1b[0m`);
             continue;
         }
         // Blockquote
@@ -728,11 +731,25 @@ function wrapRuns(runs, width) {
             while (rest.length > 0) {
                 if (curLen >= width)
                     flush();
-                let take = Math.min(rest.length, width - curLen);
-                if (take < rest.length && curLen > 0) {
-                    const lastSpace = rest.slice(0, take).lastIndexOf(" ");
-                    if (lastSpace > 0)
-                        take = lastSpace + 1;
+                let take;
+                if (curLen === 0) {
+                    // Start of a line: take a whole word (or one char for a lone space,
+                    // or a full-width chunk for an overlong word).
+                    const sp = rest.indexOf(" ");
+                    take = sp === -1 ? rest.length : sp;
+                    if (take === 0)
+                        take = 1;
+                    take = Math.min(take, width);
+                }
+                else {
+                    // Mid-line: append the next whole word (plus its trailing space) only
+                    // if it fits; otherwise move the entire word to the next line.
+                    const sp = rest.indexOf(" ");
+                    take = sp === -1 ? rest.length : sp + 1;
+                    if (take > width - curLen) {
+                        flush();
+                        continue;
+                    }
                 }
                 const chunk = rest.slice(0, take);
                 cur += run.style ? run.style + chunk + "\x1b[0m" : chunk;

package/package.json

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