@oxecli/oxe 1.0.5 → 1.0.6

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 = "";

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;

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,10 +448,12 @@ 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;
     return { frame, cursorRow, cursorCol, totalRows };
 }

package/package.json

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