@oxecli/oxe 1.0.4 → 1.0.6

package/dist/cli.js

@@ -189,9 +189,12 @@ export class CLI {
         this.sessionId = sid;
         engine.reasoningEffort = String(rec["reasoning_effort"] ?? default_reasoning_effort);
         clearScreen();
-        renderPanel(`AI CODING AGENT  (resumed ${sid})`, "", "Engine: Ready", false);
+        renderPanel("AI CODING AGENT", "", `Engine: Ready ${sid}`, false);
+        process.stdout.write("\n");
         process.stdout.write(`\x1b[2mResumed:\x1b[0m ${truncateLabel(rec["label"])}\n`);
-        process.stdout.write(`\x1b[2m(${this.inputItems.length} items · ${estimateTokens(this.inputItems).toLocaleString()} tokens · Effort: \x1b[1;36m${engine.reasoningEffort}\x1b[0m\x1b[2m)\x1b[0m\n\n`);
+        process.stdout.write("\n");
+        process.stdout.write(`\x1b[2m(${this.inputItems.length} items · ${estimateTokens(this.inputItems).toLocaleString()} tokens · Effort: \x1b[1;36m${engine.reasoningEffort}\x1b[0m\x1b[2m)\x1b[0m\n`);
+        process.stdout.write("\n");
         renderPanel("Conversation history", "Restored");
         process.stdout.write("\n");
         if (this.story.length)

package/dist/config.js

@@ -166,11 +166,13 @@ export async function loadOrPrompt() {
         const validation = await validateOxeApiKey(api_key);
         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 = "";
@@ -209,7 +211,7 @@ export async function loadOrPrompt() {
     };
 }
 /**
- * Prompt for a secret (API key) without echoing it to the terminal.
+ * Prompt for an API key, echoing what the user types.
  * Falls back to a plain readline read when stdin isn't a TTY (e.g. piped input).
  */
 export async function promptApiKey(prompt) {
@@ -262,7 +264,7 @@ export async function promptApiKey(prompt) {
                 if (b < 32)
                     continue;
                 input += String.fromCharCode(b);
-                process.stdout.write("*");
+                process.stdout.write(String.fromCharCode(b));
             }
         };
         const cleanup = () => {

package/dist/engine.js

@@ -76,7 +76,8 @@ export class InferenceEngine {
         this.client = new OpenAI({
             apiKey: config["api_key"],
             baseURL: config["base_url"],
-            timeout: config["timeout"] ?? 120,
+            // OpenAI SDK `timeout` is in MILLISECONDS; config stores seconds.
+            timeout: (config["timeout"] ?? 120) * 1000,
             maxRetries: config["max_retries"] ?? 2,
         });
         this.temperature = config["temperature"] ?? null;
@@ -175,6 +176,7 @@ export class InferenceEngine {
                 parallel_tool_calls: true,
                 max_output_tokens,
                 reasoning: { effort: this.reasoningEffort },
+                stream: true,
                 stream_options: { include_usage: true },
                 store: true,
             };

package/dist/ui.js

@@ -357,23 +357,84 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const w = terminalWidth();
     const borderW = Math.max(w - 4, 10);
     const [row, col] = cursorLineCol(buffer, cursor);
-    // Build the inner content line(s) — the whole prefix+text (or placeholder)
-    // lives on a single row when the buffer is empty, matching the original.
-    let content;
+    // Build the inner content: prefix, then the text with the `▏` block cursor
+    // always drawn at the cursor position (mirrors the original rich frame).
+    let display;
     if (!buffer) {
-        content = `\x1b[1m${prefix}\x1b[0m \x1b[1m▏\x1b[0m\x1b[2m${PROMPT_PLACEHOLDER}\x1b[0m`;
+        display = `\x1b[1m▏\x1b[0m\x1b[2m${PROMPT_PLACEHOLDER}\x1b[0m`;
     }
     else {
         const segs = splitBlocks(buffer, pasteSpans);
-        let display = "";
+        // Recompute each segment's buffer range [a, b) so we can locate the cursor.
+        const ranges = [];
+        {
+            let pos = 0;
+            const pts = new Set([0, buffer.length]);
+            for (const [s, e] of pasteSpans) {
+                pts.add(s);
+                pts.add(e);
+            }
+            const sorted = [...pts].sort((a, b) => a - b);
+            const isPaste = (a, b) => pasteSpans.some(([s, e]) => s <= a && b <= e);
+            const used = new Set();
+            for (const seg of segs) {
+                for (let i = 0; i < sorted.length - 1; i++) {
+                    const a = sorted[i];
+                    const b = sorted[i + 1];
+                    if (a === b || used.has(a))
+                        continue;
+                    used.add(a);
+                    ranges.push([a, b]);
+                    break;
+                }
+            }
+        }
+        // Determine the target segment + inside offset (mirrors Python).
+        let target = -1;
+        let inside = 0;
+        if (cursor >= buffer.length) {
+            target = segs.length - 1;
+            inside = ranges.length ? ranges[ranges.length - 1][1] - ranges[ranges.length - 1][0] : 0;
+        }
+        else {
+            for (let i = 0; i < ranges.length; i++) {
+                const [a, b] = ranges[i];
+                if (a <= cursor && cursor <= b) {
+                    target = i;
+                    inside = cursor - a;
+                    break;
+                }
+            }
+            if (target === -1) {
+                target = segs.length - 1;
+                inside = ranges.length ? ranges[ranges.length - 1][1] - ranges[ranges.length - 1][0] : 0;
+            }
+        }
+        display = "";
         for (let i = 0; i < segs.length; i++) {
             const [, kind, disp] = segs[i];
             if (i && !endsWithWs(segs[i - 1][2]))
                 display += " ";
-            display += kind === "collapsed" ? `\x1b[1m\x1b[36m${disp}\x1b[0m` : disp;
+            if (i === target) {
+                if (kind === "collapsed") {
+                    display += `\x1b[1m\x1b[36m${disp}\x1b[0m`;
+                    if (!endsWithWs(disp))
+                        display += " ";
+                    display += `\x1b[1m▏\x1b[0m`;
+                }
+                else {
+                    const bold = i === target;
+                    display += disp.slice(0, inside);
+                    display += `\x1b[1m▏\x1b[0m`;
+                    display += disp.slice(inside);
+                }
+            }
+            else {
+                display += kind === "collapsed" ? `\x1b[1m\x1b[36m${disp}\x1b[0m` : disp;
+            }
         }
-        content = `\x1b[1m${prefix}\x1b[0m ${display}`;
     }
+    const content = `\x1b[1m${prefix}\x1b[0m ${display}`;
     const lines = content.split("\n");
     // Top border with the label embedded on the left.
     const topPad = Math.max(borderW - label.length - 2, 0);
@@ -387,18 +448,14 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     }
     const bottom = `\x1b[90m╰${"─".repeat(borderW)}╯\x1b[0m`;
     const frame = [top, ...body, bottom].join("\n");
-    // Cursor placement: one row below the top border. Column includes the
-    // "│ " left border (2) plus "prefix " (prefix.length + 1).
+    // Cursor placement: one row below the top border. Preceding columns are
+    // `│ ` (2) + prefix (prefix.length) + ` ` (1) = prefix.length+3, so the first
+    // display char (the `▏` block cursor) sits at column prefix.length+4 relative
+    // to line column `col`.
     const cursorRow = row + 1;
-    const cursorCol = col + prefix.length + 3;
+    const cursorCol = col + prefix.length + 4;
     const totalRows = body.length + 2;
-    let cmd = "";
-    if (totalRows - 1 > cursorRow)
-        cmd += `\x1b[${totalRows - 1 - cursorRow}A`;
-    else if (cursorRow > totalRows - 1)
-        cmd += `\x1b[${cursorRow - (totalRows - 1)}B`;
-    cmd += `\r\x1b[${cursorCol}C`;
-    return frame + cmd;
+    return { frame, cursorRow, cursorCol, totalRows };
 }
 export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
     return new Promise((resolve, reject) => {
@@ -425,19 +482,46 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             process.stdin.setRawMode(true);
         process.stdin.resume();
         let done = false;
+        let lastCursorRow = 0;
+        let lastTotalRows = 0;
         const finish = (resolveVal) => {
             if (done)
                 return;
             done = true;
             process.stdin.setRawMode(false);
-            process.stdout.write("\r\x1b[K");
-            process.stdout.write("\n");
+            // Erase the whole prompt box (which occupies `lastTotalRows` lines) so no
+            // frame borders are left behind, then leave the cursor on the box's top
+            // row (a blank line). That way the caller's single leading newline yields
+            // exactly ONE blank row before the echoed user prompt — never two.
+            process.stdout.write(`\x1b[${lastCursorRow}A`);
+            for (let i = 0; i < lastTotalRows; i++) {
+                process.stdout.write("\r\x1b[K");
+                if (i < lastTotalRows - 1)
+                    process.stdout.write("\n");
+            }
+            // Cursor is now on the last box row; move back up to the box's top row.
+            if (lastTotalRows > 1)
+                process.stdout.write(`\x1b[${lastTotalRows - 1}A`);
             resolve(resolveVal);
         };
-        const repaint = () => {
-            const frame = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor);
-            process.stdout.write("\r\x1b[K");
-            process.stdout.write(frame);
+        const repaint = (isFirst = false) => {
+            const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor);
+            lastCursorRow = cursorRow;
+            lastTotalRows = totalRows;
+            const frameLines = frame.split("\n");
+            if (!isFirst) {
+                // Cursor currently sits at cursorRow (inside the box). Move to the top
+                // border, then clear+rewrite each line so old content is fully removed.
+                process.stdout.write(`\x1b[${cursorRow}A`);
+            }
+            for (let i = 0; i < frameLines.length; i++) {
+                process.stdout.write("\r\x1b[K" + frameLines[i]);
+                if (i < frameLines.length - 1)
+                    process.stdout.write("\n");
+            }
+            // Reposition the cursor inside the box.
+            const fromBottom = totalRows - 1 - cursorRow;
+            process.stdout.write(`\x1b[${fromBottom}A\r\x1b[${cursorCol}C`);
         };
         const insert = (text) => {
             if (histIdx !== hist.length) {
@@ -559,7 +643,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             }
         };
         process.stdin.on("keypress", onKeypress);
-        repaint();
+        repaint(true);
     });
 }
 // ---------------------------------------------------------------------------

package/package.json

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