@oxecli/oxe 1.0.7 → 1.0.9

package/dist/cli.js

@@ -15,6 +15,7 @@ export class CLI {
     story = [];
     sessionId = null;
     promptHistory = [];
+    interruptPending = false;
     constructor() {
         clearScreen();
         renderPanel("AI CODING AGENT", "", "Engine: Ready", false);
@@ -107,7 +108,8 @@ export class CLI {
                 if (footer) {
                     if (!footer.startsWith("("))
                         footer = `(${footer})`;
-                    process.stdout.write("\n" + mutedMarkdown(footer) + "\n");
+                    // Footer: labels white, only the backtick values grey (not the whole line).
+                    process.stdout.write("\n" + aiMarkdown(footer) + "\n");
                 }
             }
             else {
@@ -138,6 +140,10 @@ export class CLI {
             else if (typ === "tool") {
                 this.printToolEntry(e["started"], text, e["status"] ?? "");
             }
+            else if (typ === "footer") {
+                // Footer: labels white, only the backtick values grey (not the whole line).
+                process.stdout.write(aiMarkdown(text) + "\n");
+            }
             else {
                 process.stdout.write(mutedMarkdown(text) + "\n");
             }
@@ -210,6 +216,7 @@ export class CLI {
                 const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory);
                 if (!input.trim())
                     continue;
+                this.interruptPending = false;
                 this.promptHistory.push(input);
                 const lower = input.trim().toLowerCase();
                 if (lower === "/exit" || lower === "/quit") {
@@ -260,12 +267,35 @@ export class CLI {
                 this.saveSession(engine);
             }
             catch (err) {
-                if (err?.message === "interrupt" || err?.message === "eof") {
+                if (err?.message === "eof") {
                     this.saveSession(engine);
                     await engine.cleanupStoredResponses();
-                    process.stdout.write("\nClosing terminal session. Goodbye!\n");
+                    process.stdout.write("\nSession closing via exit interrupt hook.\n");
                     break;
                 }
+                if (err?.message === "interrupt") {
+                    const wasActive = engine.inQuery;
+                    engine.inQuery = false;
+                    // Drop the pending user message/story entry that was never run.
+                    if (this.inputItems.length && this.inputItems[this.inputItems.length - 1]["role"] === "user") {
+                        this.inputItems.pop();
+                    }
+                    if (this.story.length && this.story[this.story.length - 1]["type"] === "user") {
+                        this.story.pop();
+                    }
+                    if (this.interruptPending) {
+                        this.saveSession(engine);
+                        await engine.cleanupStoredResponses();
+                        process.stdout.write("\nClosing terminal session. Goodbye!\n");
+                        break;
+                    }
+                    this.interruptPending = true;
+                    process.stdout.write("\n");
+                    process.stdout.write(wasActive
+                        ? "\x1b[2mInterrupted. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n"
+                        : "\x1b[2mNo active response. Press Ctrl+C again to exit.\x1b[0m\n");
+                    continue;
+                }
                 throw err;
             }
         }

package/dist/config.js

@@ -169,13 +169,11 @@ export async function loadOrPrompt() {
         authSpinner.stop();
         if (validation.valid) {
             key_data = validation.key_data || {};
-            process.stdout.write("\n");
             process.stdout.write(markupToAnsi(`[green]✓ Oxe API Key verified[/green] [dim](${String(key_data["name"] ?? "Desktop")})[/dim]`) + "\n");
             process.env.OXE_API_KEY = api_key;
             break;
         }
         else {
-            process.stdout.write("\n");
             process.stdout.write(`\x1b[31mAuthentication Error:\x1b[0m ${validation.error}\n`);
             process.stdout.write("\n");
             api_key = "";

package/dist/engine.js

@@ -400,7 +400,7 @@ export class InferenceEngine {
         const stats = { thinking: 0, tokens: 0, reasoning: 0, input: 0 };
         const queryStart = Date.now();
         const footerText = () => `(Thought for ${tickDuration(stats["thinking"])} · Worked for ${tickDuration((Date.now() - queryStart) / 1000)} · Used \`${stats["tokens"].toLocaleString()}\` tokens)`;
-        const summary = () => mutedMarkdown(footerText());
+        const summary = () => aiMarkdown(footerText());
         const attachFooter = (items) => {
             const footer = footerText();
             for (let i = items.length - 1; i >= 0; i--) {

package/dist/ui.js

@@ -306,16 +306,25 @@ export class Spinner {
         const rendered = mutedMarkdown(`${SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length]} ${this.text}`);
         const newRows = Math.max(1, displayRows(rendered));
         const clearRows = Math.max(this.rows, newRows, 1);
-        if (this.rows > 0)
-            process.stdout.write(`\x1b[${this.rows}A`);
+        // Cursor is always at the home position (col 0) after each draw. Clear
+        // `clearRows` lines downward from home, rewrite the content, then return
+        // the cursor to home (col 0) so the next frame overwrites in place.
         for (let i = 0; i < clearRows; i++) {
             process.stdout.write("\r\x1b[2K");
             if (i < clearRows - 1)
                 process.stdout.write("\n");
         }
-        if (clearRows > 0)
+        // Cursor is now `clearRows-1` lines below home; move back to home.
+        if (clearRows > 1)
             process.stdout.write(`\x1b[${clearRows - 1}A\r`);
+        else
+            process.stdout.write("\r");
         process.stdout.write(rendered);
+        // Return cursor to home (col 0) for the next draw.
+        if (newRows > 1)
+            process.stdout.write(`\x1b[${newRows - 1}A\r`);
+        else
+            process.stdout.write("\r");
         this.rows = newRows;
     }
     stop() {
@@ -324,14 +333,16 @@ export class Spinner {
             this.timer = null;
         }
         if (this.enabled && this.rows > 0) {
-            process.stdout.write(`\x1b[${this.rows}A`);
+            // Cursor is at home (col 0); clear the rendered rows downward.
             for (let i = 0; i < this.rows; i++) {
                 process.stdout.write("\r\x1b[2K");
                 if (i < this.rows - 1)
                     process.stdout.write("\n");
             }
-            if (this.rows > 0)
-                process.stdout.write(`\x1b[${this.rows - 1}A`);
+            if (this.rows > 1)
+                process.stdout.write(`\x1b[${this.rows - 1}A\r`);
+            else
+                process.stdout.write("\r");
         }
         this.rows = 0;
     }
@@ -577,17 +588,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         let done = false;
         let lastCursorRow = 0;
         let lastTotalRows = 0;
-        const finish = (resolveVal) => {
-            if (done)
-                return;
-            done = true;
-            process.stdin.setRawMode(false);
-            showCursor();
-            // Erase the prompt region: a leading blank line + the box. Cursor sits at
-            // lastCursorRow inside the box; move up to the box's top border, erase the
-            // box rows, then erase the leading blank line, leaving the cursor on that
-            // blank row. The caller's single leading newline then yields exactly ONE
-            // blank row before the echoed user prompt.
+        // Erase the prompt region: a leading blank line + the box. Cursor sits at
+        // lastCursorRow inside the box; move up to the box's top border, erase the
+        // box rows, then erase the leading blank line, leaving the cursor on that
+        // blank row. The caller's single leading newline then yields exactly ONE
+        // blank row before the echoed user prompt / message.
+        const clearBox = () => {
             process.stdout.write(`\x1b[${lastCursorRow}A`);
             for (let i = 0; i < lastTotalRows; i++) {
                 process.stdout.write("\r\x1b[K");
@@ -596,9 +602,19 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             }
             if (lastTotalRows > 1)
                 process.stdout.write(`\x1b[${lastTotalRows - 1}A`);
-            // Clear the leading blank line above the box.
             process.stdout.write("\x1b[1A\r\x1b[K");
-            resolve(resolveVal);
+        };
+        const settle = (value, isErr) => {
+            if (done)
+                return;
+            done = true;
+            process.stdin.setRawMode(false);
+            showCursor();
+            clearBox();
+            if (isErr)
+                reject(value);
+            else
+                resolve(value);
         };
         const repaint = (isFirst = false) => {
             const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor);
@@ -606,7 +622,11 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             lastTotalRows = totalRows;
             const frameLines = frame.split("\n");
             if (isFirst) {
-                // A blank line above the box (mirrors the original's leading Text("")).
+                // The caller's content always ends with "\n", so the cursor sits at the
+                // start of a fresh (blank) line — that line is the leading blank
+                // separator (mirrors the original's Group(Text(""), panel)). Move down
+                // one line so the box starts below that blank; do NOT emit a second
+                // blank here (it caused a double gap above the box / on cancel).
                 process.stdout.write("\n");
             }
             else {
@@ -686,18 +706,16 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         };
         const onKeypress = (str, key) => {
             if (key && key.ctrl && key.name === "c") {
-                finish(["", []]);
-                reject(new Error("interrupt"));
+                settle(new Error("interrupt"), true);
                 return;
             }
             if (key && key.ctrl && (key.name === "d" || key.name === "z")) {
-                finish([buffer, []]);
-                reject(new Error("eof"));
+                settle(new Error("eof"), true);
                 return;
             }
             if (key && key.name === "return") {
                 if (buffer.trim()) {
-                    finish([buffer, pasteSpans]);
+                    settle([buffer, pasteSpans], false);
                 }
                 return;
             }

package/package.json

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