@oxecli/oxe 1.0.72 → 1.0.74

package/dist/cli.js

@@ -29,7 +29,7 @@ export class CLI {
         const description = "A focused terminal workspace for building and shipping.";
         renderPanel("[bold white]Terminal Coding Agent[/bold white]\n" +
             `[dim]${description}[/dim]\n\n` +
-            `[dim]Environment: ${runtimeOsSummary()}[/dim]`, `\x1b[1;37mOxe\x1b[90m \x1b[1;36mv${version}\x1b[90m`, "Type /help for commands · Ctrl+C to interrupt", false, "90", "left");
+            `[dim]Environment: ${runtimeOsSummary()}[/dim]`, `\x1b[1;37mOxe\x1b[90m \x1b[1;36mv${version}\x1b[90m`, "Type /help for commands · Ctrl+C to interrupt", true, "90", "left");
     }
     saveSession(engine) {
         if (!this.inputItems.length)

package/dist/config.js

@@ -83,11 +83,21 @@ export const default_reasoning_effort = "low";
 export function runtimeOsSummary() {
     return `${os.platform()} ${os.release()} (${os.arch()}, Node ${process.version})`;
 }
+/**
+ * The shell that the bash tool actually launches: `spawn(cmd, { shell: true })`.
+ * On Windows Node uses %ComSpec% (cmd.exe by default); on POSIX it uses /bin/sh.
+ */
+export function detectedShell() {
+    if (process.platform === "win32") {
+        const comspec = process.env.ComSpec || process.env.COMSPEC;
+        return comspec ? path.basename(comspec) : "cmd.exe";
+    }
+    const shell = process.env.SHELL;
+    return shell ? path.basename(shell) : "sh";
+}
 export function osPrefix() {
-    const isWin = process.platform === "win32";
-    const shell = isWin ? "PowerShell / cmd.exe" : "POSIX sh";
     return (`Running environment: ${runtimeOsSummary()}. ` +
-        `Shell commands run via ${shell} ` +
+        `Shell commands run via ${detectedShell()} ` +
         "with `shell=True`; use commands, quoting, and path separators " +
         "appropriate to this OS.\n\n");
 }
@@ -157,7 +167,7 @@ export async function loadOrPrompt() {
             renderPanel("[bold white]Oxe Desktop Authentication[/bold white]\n\n" +
                 `[dim]Only valid Oxe API keys (starting with [bold cyan]${OXE_KEY_PREFIX}[/bold cyan])\n` +
                 "generated on your Oxe dashboard are authorized.\n\n" +
-                "Get your key at: [bold underline]http://localhost:5173/dashboard/api-keys[/bold underline][/dim]", "Oxe Cloud Access", "", false, "90", "left");
+                "Get your key at: [bold underline]http://localhost:5173/dashboard/api-keys[/bold underline][/dim]", "Oxe Cloud Access", "", true, "90", "left");
             process.stdout.write("\n");
             api_key = await promptApiKey("Enter Oxe API Key: ");
             if (!api_key) {

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 } from "./ui.js";
+import { truncateStyled, plainLen, terminalWidth, highlightCodeLine } from "./ui.js";
 export { toolLoadSkill };
 // ---------------------------------------------------------------------------
 // Path sanitization helper
@@ -49,13 +49,26 @@ function displayDiff(pathName, oldContent, newContent) {
     const patch = structuredPatch(pathName, pathName, oldContent, newContent, "", "", { context: max_diff_context_lines });
     const contentLines = [];
     for (const hunk of patch.hunks) {
+        let oldNum = hunk.oldStart;
+        let newNum = hunk.newStart;
         for (const l of hunk.lines) {
-            if (l.startsWith("+"))
-                contentLines.push({ line: l, kind: "+" });
-            else if (l.startsWith("-"))
-                contentLines.push({ line: l, kind: "-" });
-            else
-                contentLines.push({ line: l, kind: " " });
+            if (l.startsWith("\\")) {
+                // "" meta line: no line numbers.
+                contentLines.push({ line: l, kind: "\\", oldNum: null, newNum: null });
+            }
+            else if (l.startsWith("+")) {
+                contentLines.push({ line: l, kind: "+", oldNum: null, newNum });
+                newNum++;
+            }
+            else if (l.startsWith("-")) {
+                contentLines.push({ line: l, kind: "-", oldNum, newNum: null });
+                oldNum++;
+            }
+            else {
+                contentLines.push({ line: l, kind: " ", oldNum, newNum });
+                oldNum++;
+                newNum++;
+            }
         }
     }
     const added = contentLines.filter((c) => c.kind === "+").length;
@@ -69,14 +82,17 @@ function displayDiff(pathName, oldContent, newContent) {
         if (!run.length)
             return;
         const kind = run[0].kind;
-        const limit = kind === " " ? max_diff_context_lines : max_diff_lines;
+        const limit = kind === " " || kind === "\\" ? max_diff_context_lines : max_diff_lines;
         const hidden = run.length - limit;
-        for (const r of run.slice(0, limit))
-            shown.push({ kind, line: truncateDiffLine(r.line) });
+        for (const r of run.slice(0, limit)) {
+            shown.push({ kind, line: truncateDiffLine(r.line), oldNum: r.oldNum, newNum: r.newNum });
+        }
         if (hidden > 0) {
             shown.push({
                 kind: "~",
                 line: `… (${hidden} ${hidden === 1 ? "line" : "lines"} of diff hidden) …`,
+                oldNum: null,
+                newNum: null,
             });
         }
         run = [];
@@ -91,20 +107,28 @@ function displayDiff(pathName, oldContent, newContent) {
     flush();
     // Build the lines, stripping the leading + / - / space marker for display.
     // Summary lines ("~") are already plain text and are kept whole.
-    const visible = shown.map(({ kind, line }) => {
+    const visible = shown.map(({ kind, line, oldNum, newNum }) => {
         if (kind === "~")
-            return { kind, body: line };
-        const k = line[0] === "+" ? "+" : line[0] === "-" ? "-" : " ";
-        return { kind: k, body: line.slice(1) };
+            return { kind, body: line, oldNum, newNum };
+        const k = line[0] === "+" ? "+" : line[0] === "-" ? "-" : line[0] === "\\" ? "\\" : " ";
+        return { kind: k, body: line.slice(1), oldNum, newNum };
     });
-    // A "… (N lines hidden) …" summary line is neutral context.
     const termW = terminalWidth();
+    let maxNum = 1;
+    for (const v of visible) {
+        if (v.oldNum)
+            maxNum = Math.max(maxNum, v.oldNum);
+        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) {
-        contentW = Math.max(contentW, plainLen(v.body));
+        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, plainLen(headerPlain)) + 6, Math.max(termW - 2, 20));
+    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;
@@ -114,26 +138,32 @@ function displayDiff(pathName, oldContent, newContent) {
     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 gap = " ".repeat(numW);
     for (const v of visible) {
-        let line;
         if (v.kind === "~") {
             const body = truncateStyled(v.body, innerW - 2);
-            line = `\x1b[90m  ${body}\x1b[0m`;
-        }
-        else if (v.kind === "+") {
-            const body = truncateStyled(v.body, innerW - 2);
-            line = `\x1b[32m+ ${body}\x1b[0m`;
+            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`);
+            continue;
         }
-        else if (v.kind === "-") {
-            const body = truncateStyled(v.body, innerW - 2);
-            line = `\x1b[31m- ${body}\x1b[0m`;
+        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 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`);
         }
         else {
-            const body = truncateStyled(v.body, innerW - 2);
-            line = `\x1b[90m  ${body}\x1b[0m`;
+            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`);
         }
-        const fill = Math.max(0, innerW - plainLen(line));
-        pendingDiffOutput.push(`\x1b[90m│\x1b[0m ${line}${" ".repeat(fill)} \x1b[90m│\x1b[0m`);
     }
     pendingDiffOutput.push(`\x1b[90m╰${"─".repeat(boxW - 2)}╯\x1b[0m`);
 }

package/dist/ui.js

@@ -153,7 +153,7 @@ const KEYWORDS = new Set([
     "lambda", "with", "as", "yield", "pass", "None", "True", "False", "null",
     "undefined", "true", "false", "fn", "struct", "pub", "impl", "mut", "use",
 ]);
-function highlightCodeLine(line, _lang = "") {
+export function highlightCodeLine(line, _lang = "") {
     if (!line)
         return "";
     if (/^\s*(\/\/|#|\/\*)/.test(line)) {

package/package.json

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