@oxecli/oxe 1.0.78 → 1.0.80

package/dist/cli.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
-import { loadOrPrompt, default_reasoning_effort, max_action_chars, max_resume_history_items, runtimeOsSummary, } from "./config.js";
+import { loadOrPrompt, default_reasoning_effort, max_action_chars, max_resume_history_items, runtimeOsSummary, max_context_tokens, context_overhead_margin, } from "./config.js";
 import { InferenceEngine, estimateTokens } from "./engine.js";
 import { saveSession, loadSession, listSessions, nextSessionId, conversationLabel, COMMAND_HELP, stripOrphanCalls, toolOutputFailed, } from "./sessions.js";
 import { clearScreen, enableAnsi, askBottomPrompt, userDisplayText, aiMarkdown, mutedMarkdown, messageText, toolCallLabel, formatToolResult, truncateEllipsis, stripAnsi, renderPanel, renderTableString, enableRawStdin, disableRawStdin, waitRawKey, } from "./ui.js";
@@ -372,7 +372,13 @@ export class CLI {
             engine.inQuery = false;
             let queryStarted = false;
             try {
-                const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory);
+                const used = estimateTokens(this.inputItems);
+                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[90mesc to interrupt\x1b[0m",
+                    right: `\x1b[1;36m${pct}%\x1b[0m \x1b[90muntil auto-compact\x1b[0m`,
+                });
                 if (!input.trim())
                     continue;
                 this.interruptPending = false;

package/dist/engine.js

@@ -577,8 +577,11 @@ export class InferenceEngine {
                 for (const c of calls) {
                     this.workActive = false;
                     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.
+                    process.stdout.write(`${started}\n`);
                     const toolSpinner = new Spinner();
-                    toolSpinner.startDots("Running");
+                    toolSpinner.startDots("\x1b[90m⎿\x1b[0m  Working");
                     const rawResult = await this.runTool(c.name, c.arguments);
                     if (this.interrupted) {
                         toolSpinner.stop();
@@ -592,10 +595,9 @@ export class InferenceEngine {
                         text: action,
                         status: failed ? "failed" : "ok",
                     });
-                    // Replace the "Running..." line in place with the tool label so the
-                    // transition is seamless, then print the result beneath it.
-                    toolSpinner.replaceWith(started);
-                    process.stdout.write(`${action}\n\n`);
+                    // Swap the "⎿  Working..." line for the real result, then a blank line.
+                    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();

package/dist/tools.js

@@ -133,11 +133,16 @@ function displayDiff(pathName, oldContent, newContent) {
         const num = v.kind === "+" ? v.newNum : v.oldNum;
         const numStr = num ? String(num).padStart(numW, " ") : gap;
         if (v.kind === "+" || v.kind === "-") {
-            const bg = v.kind === "+" ? "\x1b[48;2;2;40;0m" : "\x1b[48;2;61;1;0m";
-            const sign = v.kind === "+" ? "+" : "-";
-            const body = truncateStyled(v.body, bodyMax);
+            const isAdd = v.kind === "+";
+            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.
+            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}\x1b[97m${numStr} ${sign}  ${body}${" ".repeat(fill)}\x1b[0m`);
+            pendingDiffOutput.push(`${bg}${fg}${numStr} ${sign}  \x1b[0m\x1b[97m${body}${" ".repeat(fill)}\x1b[0m`);
         }
         else {
             const raw = v.kind === "\\" ? v.body : highlightCodeLine(v.body);

package/dist/ui.js

@@ -550,9 +550,10 @@ export class Spinner {
         }, 80);
         this.draw();
     }
-    /** Dots-mode label: renders `Running` + a fixed 3-cell animated dots field.
-     *  Each tick rewrites ONLY the dots cells via a cursor jump, so the rest of
-     *  the line never flickers. Swap in the final label with replaceWith(). */
+    /** Dots-mode label: renders `text` (ANSI pre-colored by the caller) + a
+     *  fixed 3-cell animated dots field. Each tick rewrites ONLY the dots cells
+     *  via a cursor jump, so the rest of the line never flickers. Swap in the
+     *  final label with replaceWith(). */
     startDots(text) {
         if (!this.enabled)
             return;
@@ -562,7 +563,7 @@ export class Spinner {
         this.dotsFrame = 0;
         this.rows = 1;
         this.lastRendered = "";
-        this.lastLen = text.length + 3;
+        this.lastLen = plainLen(text) + 3;
         this.writeDots(true);
         this.timer = setInterval(() => {
             this.dotsFrame = (this.dotsFrame + 1) % DOT_FRAMES.length;
@@ -570,18 +571,18 @@ export class Spinner {
         }, 300);
     }
     writeDots(initial) {
-        const label = `\x1b[1;36m${this.dotsText}\x1b[0m`;
         const dots = `\x1b[1;36m${DOT_FRAMES[this.dotsFrame]}\x1b[0m`;
         if (initial) {
-            process.stdout.write("\r" + label + dots + "\r");
+            process.stdout.write("\r" + this.dotsText + dots + "\r");
         }
         else {
             // Jump to the dots column (1-based) and rewrite only the 3-cell field.
-            process.stdout.write(`\x1b[${this.dotsText.length + 1}G` + dots + "\r");
+            process.stdout.write(`\x1b[${plainLen(this.dotsText) + 1}G` + dots + "\r");
         }
     }
     /** Overwrite the dots line in place with `text` and advance to the next
-     *  line, without erasing (so there is no flash). */
+     *  line, without erasing (so there is no flash). Multi-line text replaces
+     *  the first line in place and prints the remaining lines below it. */
     replaceWith(text) {
         if (this.timer) {
             clearInterval(this.timer);
@@ -591,9 +592,14 @@ export class Spinner {
             process.stdout.write(`${text}\n`);
             return;
         }
-        const plain = stripAnsi(text);
+        const parts = text.split("\n");
+        const first = parts[0];
+        const rest = parts.slice(1);
+        const plain = stripAnsi(first);
         const pad = Math.max(0, this.lastLen - plain.length);
-        process.stdout.write("\r" + text + " ".repeat(pad) + "\r\n");
+        process.stdout.write("\r" + first + " ".repeat(pad) + "\r\n");
+        if (rest.length)
+            process.stdout.write(rest.join("\n") + "\n");
         this.rows = 0;
         this.lastLen = plain.length;
     }
@@ -860,7 +866,7 @@ function wrapRuns(runs, width) {
     flush();
     return { rows, caretRow, caretCol };
 }
-export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor) {
+export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor, hints) {
     const termW = terminalWidth();
     const boxW = Math.max(termW - 4, 16);
     const innerW = boxW - 4;
@@ -958,10 +964,18 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
         body.push(`\x1b[90m│\x1b[0m ${l}${" ".repeat(pad)} \x1b[90m│\x1b[0m`);
     }
     const bottom = `\x1b[90m╰${"─".repeat(Math.max(0, boxW - 2))}╯\x1b[0m`;
-    const frame = [top, ...body, bottom].join("\n");
+    const lines = [top, ...body, bottom];
+    let totalRows = body.length + 2;
+    if (hints && (hints.left || hints.right)) {
+        const left = hints.left ?? "";
+        const right = hints.right ?? "";
+        const gap = Math.max(1, termW - plainLen(left) - plainLen(right));
+        lines.push(left + " ".repeat(gap) + right);
+        totalRows += 1;
+    }
+    const frame = lines.join("\n");
     const cursorRow = (caretRow === -1 ? 0 : caretRow) + 1;
     const cursorCol = (caretCol === -1 ? 0 : caretCol) + 2;
-    const totalRows = body.length + 2;
     return { frame, cursorRow, cursorCol, totalRows };
 }
 /**
@@ -983,7 +997,7 @@ function isEnterKey(str, key) {
         seq === "\x1bOM" // application keypad
     );
 }
-export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
+export function askBottomPrompt(label = "You", prefix = "❯", history = [], hints) {
     return new Promise((resolve, reject) => {
         const isTTY = process.stdin.isTTY;
         if (!isTTY) {
@@ -1050,7 +1064,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 resolve(value);
         };
         const repaint = (isFirst = false) => {
-            const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor);
+            const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor, hints);
             const newLines = frame.split("\n");
             if (isFirst) {
                 process.stdout.write("\n");

package/package.json

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