@oxecli/oxe 1.0.82 → 1.0.84

package/LICENSE

@@ -12,10 +12,16 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+Redistribution or publication of the Software, in original or modified form,
+must retain this copyright notice and must not be presented, published, or
+distributed under a different author's name or claimed as the redistributor's
+own original work. Attribution to the original author ("Oxe") must be
+preserved in any public release, fork, or derivative distribution.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/cli.js

@@ -45,11 +45,13 @@ export class CLI {
             reasoning_effort: engine.reasoningEffort,
         });
     }
-    printToolEntry(started, text, status) {
+    printToolEntry(started, text, status, diff = "") {
         const label = started && String(started).trim();
         const body = String(text).trim();
-        if (label && stripAnsi(body).startsWith("⎿")) {
+        if (label && /^[⎿╰]/.test(stripAnsi(body))) {
             process.stdout.write(`${label}\n${body}\n`);
+            if (diff)
+                process.stdout.write(diff + "\n\n");
             return;
         }
         const icon = status === "failed" ? "\x1b[31m✗\x1b[0m" : "\x1b[32m✓\x1b[0m";
@@ -213,7 +215,7 @@ export class CLI {
                 this.printAssistantBlock(text);
             }
             else if (typ === "tool") {
-                this.printToolEntry(e["started"], text, e["status"] ?? "");
+                this.printToolEntry(e["started"], text, e["status"] ?? "", e["diff"] ?? "");
             }
             else if (typ === "footer") {
                 process.stdout.write(mutedMarkdown(text) + "\n");
@@ -376,7 +378,7 @@ export class CLI {
                 const budget = max_context_tokens - context_overhead_margin;
                 const pct = Math.max(0, Math.min(100, Math.round(((budget - used) / budget) * 100)));
                 const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory, {
-                    left: "\x1b[90mPress \x1b[1;36mesc\x1b[0m\x1b[90m to interrupt\x1b[0m",
+                    left: "\x1b[90mPress \x1b[1;36mCtrl+C\x1b[0m\x1b[90m to interrupt\x1b[0m",
                     right: `\x1b[1;36m${pct}%\x1b[0m \x1b[90muntil auto-compact\x1b[0m`,
                 });
                 if (!input.trim())

package/dist/engine.js

@@ -5,7 +5,7 @@ import { buildTools, truncateToolOutput, toolReadFile, toolWriteFile, toolEditFi
 import { mutedMarkdown, aiMarkdown, tickDuration, displayRows, safeCommitPoint, printAiChunk, toolCallLabel, formatToolResult, renderPanel, Spinner, hideCursor, } from "./ui.js";
 import { reportUsage } from "./api.js";
 import { stripOrphanCalls, persistCompactionSummary, toolOutputFailed, } from "./sessions.js";
-import { flushPendingDiffOutput } from "./tools.js";
+import { takePendingDiffOutput } from "./tools.js";
 // ---------------------------------------------------------------------------
 // Token estimation
 // ---------------------------------------------------------------------------
@@ -581,10 +581,10 @@ export class InferenceEngine {
                     this.queryCalledTool = true;
                     const started = toolCallLabel(c.name, c.arguments);
                     // Print the tool label the instant the command starts, then show a
-                    // "⎿  Working..." dots line that swaps to the real result in place.
+                    // "╰  Working..." dots line that swaps to the real result in place.
                     process.stdout.write(`${started}\n`);
                     const toolSpinner = new Spinner();
-                    toolSpinner.startDots("\x1b[90m⎿\x1b[0m  Working");
+                    toolSpinner.startDots("\x1b[90m╰\x1b[0m  Working");
                     const rawResult = await this.runTool(c.name, c.arguments);
                     if (this.interrupted) {
                         toolSpinner.stop();
@@ -592,18 +592,22 @@ export class InferenceEngine {
                     }
                     const failed = toolOutputFailed(c.name, rawResult);
                     const action = formatToolResult(rawResult, failed);
+                    const diff = takePendingDiffOutput();
                     story.push({
                         type: "tool",
                         started,
                         text: action,
                         status: failed ? "failed" : "ok",
+                        diff,
                     });
-                    // Swap the "⎿  Working..." line for the real result, then a blank line.
+                    // Swap the "╰  Working..." line for the real result. If the tool
+                    // produced a diff it renders directly below the action line with no
+                    // gap; otherwise a blank line separates the action from what follows.
                     toolSpinner.replaceWith(action);
-                    process.stdout.write(`\n`);
-                    // Any diff the tool produced is flushed only now, after the spinner
-                    // has stopped, so the box renders cleanly below the action line.
-                    flushPendingDiffOutput();
+                    if (diff)
+                        process.stdout.write(diff + "\n\n");
+                    else
+                        process.stdout.write("\n");
                     const truncatedResult = c.name === "read_file"
                         ? truncateToolOutput(rawResult, max_read_file_stored_chars)
                         : truncateToolOutput(rawResult);

package/dist/tools.js

@@ -34,15 +34,19 @@ function truncateDiffLine(line) {
 // Diff output is deferred (not written straight to stdout) so it doesn't
 // collide with the tool spinner that is still animating while the tool runs.
 const pendingDiffOutput = [];
-export function flushPendingDiffOutput() {
+export function takePendingDiffOutput() {
     if (!pendingDiffOutput.length)
-        return;
-    process.stdout.write(pendingDiffOutput.join("\n") + "\n\n");
+        return "";
+    const out = pendingDiffOutput.join("\n");
     pendingDiffOutput.length = 0;
+    return out;
 }
 function displayDiff(pathName, oldContent, newContent) {
+    // Indent every diff row 3 columns so the diff's left edge lines up with the
+    // tool result text above it ("╰  Wrote N chars").
+    const ind = "   ";
     if (oldContent.length + newContent.length > max_diff_source_chars) {
-        pendingDiffOutput.push(`\x1b[90m${pathName}: ${oldContent.length.toLocaleString()} chars -> ${newContent.length.toLocaleString()} chars ` +
+        pendingDiffOutput.push(`\x1b[90m${ind}${pathName}: ${oldContent.length.toLocaleString()} chars -> ${newContent.length.toLocaleString()} chars ` +
             `(diff hidden: exceeds ${max_diff_source_chars.toLocaleString()} char limit)\x1b[0m`);
         return null;
     }
@@ -122,12 +126,12 @@ function displayDiff(pathName, oldContent, newContent) {
             maxNum = Math.max(maxNum, v.newNum);
     }
     const numW = String(maxNum).length;
-    const bodyMax = Math.max(termW - numW - 4, 20);
+    const bodyMax = Math.max(termW - ind.length - numW - 4, 20);
     const gap = " ".repeat(numW);
     for (const v of visible) {
         if (v.kind === "~") {
             const body = truncateStyled(v.body, bodyMax);
-            pendingDiffOutput.push(`\x1b[90m${gap}   ${body}\x1b[0m`);
+            pendingDiffOutput.push(`\x1b[90m${ind}${gap}   ${body}\x1b[0m`);
             continue;
         }
         const num = v.kind === "+" ? v.newNum : v.oldNum;
@@ -137,19 +141,24 @@ function displayDiff(pathName, oldContent, newContent) {
             const bg = isAdd ? "\x1b[48;2;2;40;0m" : "\x1b[48;2;61;1;0m";
             const fg = isAdd ? "\x1b[38;2;80;200;80m" : "\x1b[38;2;220;90;90m";
             const sign = isAdd ? "+" : "-";
-            // Changed content renders normal white with syntax highlighting;
-            // re-apply the white base after each token reset.
+            // The row background spans the full line width (number, sign, content,
+            // and trailing fill) so the row reads as one colored strip. Changed
+            // content renders normal white with syntax highlighting; re-apply the
+            // background + white base after each token reset so both hold across
+            // the whole body.
             const raw = highlightCodeLine(v.body);
-            const body = truncateStyled(raw.replace(/\x1b\[0m/g, "\x1b[0m\x1b[97m"), bodyMax);
-            const fill = Math.max(0, termW - numW - 4 - plainLen(body));
-            pendingDiffOutput.push(`${bg}${fg}${numStr} ${sign}  \x1b[0m\x1b[97m${body}${" ".repeat(fill)}\x1b[0m`);
+            const body = truncateStyled(raw.replace(/\x1b\[0m/g, `\x1b[0m${bg}\x1b[97m`), bodyMax);
+            const fill = Math.max(0, termW - ind.length - numW - 4 - plainLen(body));
+            pendingDiffOutput.push(`${ind}${bg}${fg}${numStr} ${sign}  \x1b[0m${bg}\x1b[97m${body}${bg}\x1b[97m${" ".repeat(fill)}\x1b[0m`);
         }
         else {
             const raw = v.kind === "\\" ? v.body : highlightCodeLine(v.body);
-            // highlightCodeLine resets to default after each token; re-apply the dim
-            // gray base so plain text stays dim and only tokens show color.
-            const body = truncateStyled(raw.replace(/\x1b\[0m/g, "\x1b[0m\x1b[90m"), bodyMax);
-            pendingDiffOutput.push(`\x1b[90m${numStr}  ${body}\x1b[0m`);
+            // Unchanged lines render their content normal white like the changed
+            // lines (only the number gutter stays dim). highlightCodeLine resets to
+            // default after each token, so re-apply the base after every reset.
+            const base = v.kind === "\\" ? "\x1b[90m" : "\x1b[97m";
+            const body = truncateStyled(raw.replace(/\x1b\[0m/g, `\x1b[0m${base}`), bodyMax);
+            pendingDiffOutput.push(`\x1b[90m${ind}${numStr}  \x1b[0m${base}${body}\x1b[0m`);
         }
     }
     return { added, removed };
@@ -403,7 +412,7 @@ export function toolWriteFile(pathName, content) {
     catch (err) {
         return `Error: ${err}`;
     }
-    return `Wrote ${content.length.toLocaleString()} characters to ${pathName}`;
+    return `Wrote ${content.length.toLocaleString()} chars`;
 }
 // ---------------------------------------------------------------------------
 // edit_file

package/dist/ui.js

@@ -240,14 +240,15 @@ export function markdownToAnsi(text) {
     const flushCodeBlock = () => {
         if (!codeBuffer.length && !codeLang)
             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`);
+        const badge = codeLang ? ` \x1b[1;36m${codeLang}\x1b[0m ` : "";
+        const barLen = Math.max(10, Math.min(width - plainLen(badge) - (codeLang ? 4 : 2), 60));
+        const topPrefix = codeLang ? "─" : "";
+        out.push(`\x1b[90m╭${topPrefix}${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) + 1)}╯\x1b[0m`);
+        out.push(`\x1b[90m╰${"─".repeat(barLen + plainLen(badge) + (codeLang ? 1 : 0))}╯\x1b[0m`);
         codeBuffer = [];
         codeLang = "";
     };
@@ -720,7 +721,7 @@ export function toolCallLabel(name, argumentsJson) {
     return `\x1b[1;36m${display}\x1b[0m(${arg})`;
 }
 /**
- * Second line of a tool entry: `⎿  Done` on a quiet success, otherwise the
+ * Second line of a tool entry: `╰  Done` on a quiet success, otherwise the
  * tool's output / error, collapsed and truncated so it never floods the screen.
  */
 export function formatToolResult(rawResult, failed) {
@@ -729,7 +730,7 @@ export function formatToolResult(rawResult, failed) {
         .trim();
     const code = raw.match(/^exit code: (\d+)/)?.[1] ?? null;
     const clean = raw.replace(/^exit code: \d+\n?/, "").trim();
-    const corner = "\x1b[90m⎿\x1b[0m  ";
+    const corner = "\x1b[90m╰\x1b[0m  ";
     if (!failed && (!clean || clean === "(no output)")) {
         return `${corner}\x1b[32mDone\x1b[0m`;
     }
@@ -871,10 +872,10 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const boxW = Math.max(termW - 4, 16);
     const innerW = boxW - 4;
     const runs = [];
-    runs.push({ text: prefix, style: "\x1b[1;36m" });
+    runs.push({ text: prefix, style: "\x1b[90m" });
     runs.push({ text: " ", style: "" });
     if (!buffer) {
-        runs.push({ text: PROMPT_CARET, style: "\x1b[1;36m" });
+        runs.push({ text: PROMPT_CARET, style: "\x1b[90m" });
         runs.push({ text: PROMPT_PLACEHOLDER, style: "\x1b[90m" });
     }
     else {
@@ -933,14 +934,14 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
                     runs.push({ text: disp, style: "\x1b[1;36m" });
                     if (!endsWithWs(disp))
                         runs.push({ text: " ", style: "" });
-                    runs.push({ text: PROMPT_CARET, style: "\x1b[1;36m" });
+                    runs.push({ text: PROMPT_CARET, style: "\x1b[90m" });
                 }
                 else {
                     const before = disp.slice(0, inside);
                     const after = disp.slice(inside);
                     if (before)
                         runs.push({ text: before, style: "" });
-                    runs.push({ text: PROMPT_CARET, style: "\x1b[1;36m" });
+                    runs.push({ text: PROMPT_CARET, style: "\x1b[90m" });
                     if (after)
                         runs.push({ text: after, style: "" });
                 }
@@ -955,8 +956,8 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     }
     const { rows, caretRow, caretCol } = wrapRuns(runs, innerW);
     const labelLen = plainLen(label);
-    const topPad = Math.max(0, boxW - labelLen - 5);
-    const top = `\x1b[90m╭─ \x1b[1m\x1b[36m${label}\x1b[0m\x1b[90m ${"─".repeat(topPad)}╮\x1b[0m`;
+    const topPad = Math.max(0, boxW - labelLen - 7);
+    const top = `\x1b[90m╭─── \x1b[1m\x1b[36m${label}\x1b[0m\x1b[90m ${"─".repeat(topPad)}╮\x1b[0m`;
     const body = [];
     for (const l of rows) {
         const plain = stripAnsi(l);

package/package.json

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