@oxecli/oxe 1.0.13 → 1.0.15

package/dist/engine.js

@@ -1,7 +1,7 @@
 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 { 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) {

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

@@ -670,12 +670,37 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 return;
             }
         };
-        const insert = (text) => {
+        const shiftSpansAfterInsert = (pos, delta) => {
+            const newSpans = [];
+            for (const [s, e] of pasteSpans) {
+                if (pos <= s)
+                    newSpans.push([s + delta, e + delta]);
+                else if (pos >= e)
+                    newSpans.push([s, e]);
+                else {
+                    newSpans.push([s, pos]);
+                    newSpans.push([pos + delta, e + delta]);
+                }
+            }
+            return newSpans;
+        };
+        const insert = (text, isPaste = false) => {
             if (histIdx !== hist.length) {
                 draft = { buffer, cursor, spans: pasteSpans.slice() };
                 histIdx = hist.length;
             }
+            const pasteStart = cursor;
             buffer = buffer.slice(0, cursor) + text + buffer.slice(cursor);
+            // Keep existing paste spans valid across the insertion point.
+            pasteSpans = shiftSpansAfterInsert(cursor, text.length);
+            // A real paste records a span so the prompt box can collapse it (mirrors
+            // Python's handle_paste). splitBlocks only collapses segments inside a
+            // span that meet the threshold, so small pastes stay expanded but remain
+            // tagged for cursor/backspace handling.
+            if (isPaste) {
+                pasteSpans.push([pasteStart, pasteStart + text.length]);
+                pasteSpans.sort((a, b) => a[0] - b[0]);
+            }
             cursor += text.length;
         };
         const backspace = () => {
@@ -689,7 +714,25 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             const before = Array.from(buffer.slice(0, cursor));
             before.pop();
             buffer = before.join("") + buffer.slice(cursor);
+            const deletedAt = cursor - 1;
             cursor -= 1;
+            // Adjust spans: shrink any span covering the deleted char, shift spans
+            // that start after it left by one.
+            const adjusted = [];
+            for (const [s, e] of pasteSpans) {
+                if (deletedAt >= s && deletedAt < e) {
+                    const ne = e - 1;
+                    if (s < ne)
+                        adjusted.push([s, ne]);
+                }
+                else if (deletedAt < s) {
+                    adjusted.push([s - 1, e - 1]);
+                }
+                else {
+                    adjusted.push([s, e]);
+                }
+            }
+            pasteSpans = adjusted.filter(([s, e]) => s < e);
         };
         const moveLeft = () => {
             if (cursor > 0)
@@ -782,8 +825,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 return;
             }
             if (str) {
-                // paste / multi-char sequence
-                insert(str);
+                // Multi-char sequence = a paste (single-char typed keys arrive one per
+                // event). Tag it so the prompt box collapses it when it meets the rules.
+                insert(str, str.length > 1);
                 repaint();
             }
         };
@@ -795,6 +839,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 = "";
@@ -806,9 +855,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.13",
+  "version": "1.0.15",
   "publishConfig": {
     "access": "public"
   },