@oxecli/oxe 1.0.12 → 1.0.14

package/dist/cli.js

@@ -46,7 +46,13 @@ export class CLI {
     showHelp() {
         process.stdout.write("\n");
         for (const [cmd, desc] of COMMAND_HELP) {
-            process.stdout.write(`\x1b[1m${cmd.padEnd(18)}\x1b[0m\x1b[2m${desc}\x1b[0m\n`);
+            // The whole command column is bold; any `<arg>` placeholder (e.g. <n>,
+            // <level>) is additionally cyan — matching the original's
+            // `[bold cyan]<n>[/bold cyan]`. Pad based on the plain text length so the
+            // ANSI codes don't skew the column alignment.
+            const styled = cmd.replace(/(<[^>]+>)/g, "\x1b[36m$1\x1b[0m");
+            const pad = Math.max(18 - cmd.length, 0);
+            process.stdout.write(`\x1b[1m${styled}${" ".repeat(pad)}\x1b[0m\x1b[2m${desc}\x1b[0m\n`);
         }
         process.stdout.write("\n");
     }

package/dist/engine.js

@@ -1,8 +1,8 @@
 import OpenAI from "openai";
 import { max_output_tokens, max_empty_retries, max_agent_steps, max_context_tokens, context_overhead_margin, compact_keep_recent_turns, max_summary_source_chars, max_read_file_stored_chars, } from "./config.js";
 import { SYSTEM_PROMPT } from "./system.js";
-import { buildTools, truncateToolOutput, TOOL_IMPLEMENTATIONS } from "./tools.js";
-import { mutedMarkdown, aiMarkdown, tickDuration, displayRows, safeCommitPoint, printAiChunk, formatToolAction, renderPanel, Spinner, hideCursor, showCursor, } from "./ui.js";
+import { buildTools, truncateToolOutput, toolReadFile, toolWriteFile, toolEditFile, toolBash, toolGlob, toolGrep, toolLoadSkill, } from "./tools.js";
+import { mutedMarkdown, aiMarkdown, tickDuration, displayRows, safeCommitPoint, printAiChunk, formatToolAction, renderPanel, Spinner, hideCursor, } from "./ui.js";
 import { reportUsage } from "./api.js";
 import { stripOrphanCalls, persistCompactionSummary, toolOutputFailed, } from "./sessions.js";
 // ---------------------------------------------------------------------------
@@ -83,10 +83,37 @@ export class InferenceEngine {
             args = {};
         }
         try {
-            const impl = TOOL_IMPLEMENTATIONS[name];
-            if (!impl)
-                return `Error: unknown tool '${name}'`;
-            const result = await impl(...Object.values(args));
+            // Dispatch by explicit named parameters. Do NOT use Object.values(args)
+            // (order-dependent): JSON object key order is not guaranteed, and when a
+            // model emits e.g. {content, path} for write_file the content would be
+            // mistaken for the path (turning JSX "/" into "\" on Windows). Binding
+            // each argument by name makes the tools robust to any key ordering.
+            let result;
+            switch (name) {
+                case "read_file":
+                    result = toolReadFile(args.path, args.start_line, args.end_line);
+                    break;
+                case "write_file":
+                    result = toolWriteFile(args.path, args.content);
+                    break;
+                case "edit_file":
+                    result = toolEditFile(args.path, args.old_string, args.new_string, args.replace_all);
+                    break;
+                case "bash":
+                    result = await toolBash(args.command, args.timeout, args.cwd);
+                    break;
+                case "glob":
+                    result = toolGlob(args.pattern, args.path, args.limit);
+                    break;
+                case "grep":
+                    result = toolGrep(args.pattern, args.path, args.glob, args.limit);
+                    break;
+                case "load_skill":
+                    result = toolLoadSkill(args.skill_name);
+                    break;
+                default:
+                    return `Error: unknown tool '${name}'`;
+            }
             return typeof result === "string" ? result : String(result);
         }
         catch (err) {
@@ -548,7 +575,6 @@ export class InferenceEngine {
         }
         finally {
             this.inQuery = false;
-            showCursor();
             if (stats["tokens"] > 0 && this.keyData) {
                 const userId = this.keyData["user_id"];
                 if (userId) {

package/dist/oxe.js

@@ -1,5 +1,15 @@
 import { main } from "./cli.js";
 export { main };
+// The TUI keeps the terminal cursor hidden except inside a prompt field. Always
+// restore it on exit so the shell isn't left with an invisible cursor.
+process.on("exit", () => {
+    try {
+        process.stdout.write("\x1b[?25h");
+    }
+    catch {
+        /* ignore */
+    }
+});
 main().catch((err) => {
     const msg = err?.message;
     if (msg === "interrupt" || msg === "eof") {

package/dist/tools.js

@@ -4,6 +4,7 @@ import { execFile, spawn } from "node:child_process";
 import { structuredPatch } from "diff";
 import { max_diff_source_chars, max_diff_lines, max_diff_context_lines, max_diff_line_chars, max_read_line_chars, max_read_file_bytes, max_read_lines, max_output_chars, max_bash_timeout_seconds, max_grep_file_bytes, strict_max_properties, ignoredDirs, } from "./config.js";
 import { toolLoadSkill } from "./skills.js";
+export { toolLoadSkill };
 // ---------------------------------------------------------------------------
 // Natural sort + diff helpers
 // ---------------------------------------------------------------------------

package/dist/ui.js

@@ -588,6 +588,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         let done = false;
         let lastCursorRow = 0;
         let lastTotalRows = 0;
+        let prevFrameLines = null;
         // 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
@@ -609,7 +610,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 return;
             done = true;
             process.stdin.setRawMode(false);
-            showCursor();
             clearBox();
             process.stdin.removeListener("keypress", onKeypress);
             process.stdin.pause();
@@ -620,9 +620,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         };
         const repaint = (isFirst = false) => {
             const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor);
-            lastCursorRow = cursorRow;
-            lastTotalRows = totalRows;
-            const frameLines = frame.split("\n");
+            const newLines = frame.split("\n");
             if (isFirst) {
                 // 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
@@ -630,20 +628,47 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 // 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");
+                for (let i = 0; i < newLines.length; i++) {
+                    process.stdout.write(newLines[i]);
+                    if (i < newLines.length - 1)
+                        process.stdout.write("\n");
+                }
+                prevFrameLines = newLines;
+                lastCursorRow = cursorRow;
+                lastTotalRows = totalRows;
+                // Cursor sits on the bottom border line; move it up to the input row.
+                const up = totalRows - 1 - cursorRow;
+                process.stdout.write(`\x1b[${up}A\r\x1b[${cursorCol}C`);
+                return;
             }
             else {
-                // 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");
+                // Cursor currently sits at the previous input position (lastCursorRow
+                // inside the box). Move up to the top border, then rewrite ONLY the
+                // lines whose content actually changed, leaving the static borders
+                // untouched — this avoids the whole-box flicker on every keystroke.
+                process.stdout.write(`\x1b[${lastCursorRow}A\r`);
+                const oldLines = prevFrameLines ?? [];
+                const maxLen = Math.max(oldLines.length, newLines.length);
+                for (let i = 0; i < maxLen; i++) {
+                    if (newLines[i] !== oldLines[i]) {
+                        process.stdout.write("\r\x1b[K" + (newLines[i] ?? ""));
+                    }
+                    if (i < maxLen - 1)
+                        process.stdout.write("\n");
+                }
+                // Cursor now sits at line (maxLen-1), column 0. Move it to the target
+                // input row (cursorRow), handling line-count changes in either direction.
+                const atLine = maxLen - 1;
+                if (atLine > cursorRow)
+                    process.stdout.write(`\x1b[${atLine - cursorRow}A`);
+                else if (atLine < cursorRow)
+                    process.stdout.write(`\x1b[${cursorRow - atLine}B`);
+                process.stdout.write(`\r\x1b[${cursorCol}C`);
+                prevFrameLines = newLines;
+                lastCursorRow = cursorRow;
+                lastTotalRows = totalRows;
+                return;
             }
-            // 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) {
@@ -770,6 +795,11 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
 // User display + message text
 // ---------------------------------------------------------------------------
 export function userDisplayText(payload, pasteSpans) {
+    // Mirror the prompt field exactly: collapse ONLY segments that fall inside a
+    // paste span and exceed the collapse threshold (via splitBlocks). Content that
+    // the user typed (no paste span) is never collapsed in the prompt, so it must
+    // not be collapsed here either — keeping the echoed message consistent with
+    // what the prompt box displayed.
     if (pasteSpans && pasteSpans.length) {
         const segs = splitBlocks(payload, pasteSpans);
         let out = "";
@@ -781,9 +811,6 @@ export function userDisplayText(payload, pasteSpans) {
         }
         return out;
     }
-    if (shouldCollapsePaste(payload)) {
-        return `\x1b[1m\x1b[36m[Pasted text, ${payload.split("\n").length} lines]\x1b[0m`;
-    }
     return payload;
 }
 export function collapseLabelText(text, spans) {

package/package.json

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