@oxecli/oxe 1.0.51 → 1.0.53

package/dist/engine.js

@@ -1,12 +1,12 @@
 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 { getSystemPrompt } from "./system.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";
 // ---------------------------------------------------------------------------
-// Token estimation (heuristic, mirrors Python fallback)
+// Token estimation
 // ---------------------------------------------------------------------------
 const tokenEstCache = new Map();
 const tokenEstCacheMax = 4096;
@@ -42,8 +42,6 @@ export class InferenceEngine {
     reasoningEffort;
     keyData;
     client;
-    // "Worked for Xs" line is overwritten in place across tool iterations
-    // (mirrors Python's _work_active / _overwrite_work_line).
     workActive = false;
     workRows = 2;
     inQuery = false;
@@ -59,7 +57,6 @@ export class InferenceEngine {
         this.client = new OpenAI({
             apiKey: config["api_key"],
             baseURL: config["base_url"],
-            // OpenAI SDK `timeout` is in MILLISECONDS; config stores seconds.
             timeout: (config["timeout"] ?? 120) * 1000,
             maxRetries: config["max_retries"] ?? 2,
         });
@@ -90,11 +87,6 @@ export class InferenceEngine {
             args = {};
         }
         try {
-            // 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":
@@ -142,8 +134,9 @@ export class InferenceEngine {
         if (reason)
             return `(empty response: ${reason})`;
         const status = response?.status;
-        if (status && status !== "completed")
+        if (status && status !== "completed") {
             return `(empty response: status=${status})`;
+        }
         if (reasoned)
             return "(model reasoned but returned no text or tool call)";
         return "(empty response from the model — no text, no tool calls)";
@@ -151,7 +144,6 @@ export class InferenceEngine {
     incompleteReason(response) {
         return response?.incomplete_details?.reason ?? null;
     }
-    /** Replace the previously-printed "Worked for Xs" line in place. */
     overwriteWorkLine(text) {
         for (let i = 0; i < this.workRows; i++) {
             process.stdout.write("\x1b[1A\x1b[2K");
@@ -177,9 +169,9 @@ export class InferenceEngine {
         let thinkingStart = null;
         const workStatus = new Spinner();
         const workingStarted = Date.now();
-        workStatus.start(`Working for ${tickDuration(0)}`);
+        workStatus.start(`Working (${tickDuration(0)})`);
         const workTimer = setInterval(() => {
-            workStatus.update(`Working for ${tickDuration((Date.now() - workingStarted) / 1000)}`);
+            workStatus.update(`Working (${tickDuration((Date.now() - workingStarted) / 1000)})`);
         }, 500);
         let workingReported = false;
         let response = null;
@@ -187,8 +179,6 @@ export class InferenceEngine {
         const silenceWorking = () => {
             clearInterval(workTimer);
             workStatus.stop();
-            // Reasoning took over; suppress any later "Worked for Xs" report for this
-            // stream (mirrors Python's working_started = None in silence_working()).
             workingReported = true;
         };
         const reportWorking = () => {
@@ -213,6 +203,7 @@ export class InferenceEngine {
             if (thinkingStart === null)
                 return;
             const elapsed = (Date.now() - thinkingStart) / 1000;
+            stats["thinking"] = (stats["thinking"] ?? 0) + elapsed;
             if (status) {
                 status.stop();
                 status = null;
@@ -228,7 +219,7 @@ export class InferenceEngine {
         try {
             const kwargs = {
                 model: this.modelName,
-                instructions: SYSTEM_PROMPT,
+                instructions: getSystemPrompt(),
                 input: inputItems.map((item) => {
                     const copy = { ...item };
                     delete copy["footer"];
@@ -263,10 +254,10 @@ export class InferenceEngine {
                     if (thinkingStart === null) {
                         thinkingStart = Date.now();
                         status = new Spinner();
-                        status.start("Thinking for `0s`");
+                        status.start("Thinking `0s`");
                     }
                     else {
-                        status?.update(`Thinking for ${tickDuration((Date.now() - thinkingStart) / 1000)}`);
+                        status?.update(`Thinking ${tickDuration((Date.now() - thinkingStart) / 1000)}`);
                     }
                 }
                 else if (etype === "response.reasoning_text.done" ||
@@ -299,8 +290,6 @@ export class InferenceEngine {
         finally {
             clearInterval(workTimer);
             workStatus.stop();
-            // If the stream ended while still reasoning (no *.done event), still report
-            // the elapsed "Thought for Xs" (mirrors Python's `still_thinking` handling).
             const stillThinking = thinkingStart !== null;
             finishThinking(stillThinking);
             if (this.interrupted && !this.queryHasOutput)
@@ -314,15 +303,15 @@ export class InferenceEngine {
             throw new Error("Stream ended without a completed response");
         }
         if (etype === "response.failed") {
-            throw new Error(`DeepSeek response failed: ${response?.error}`);
+            throw new Error(`Response failed: ${response?.error ?? "unknown error"}`);
         }
         const usage = response?.usage;
         if (usage) {
-            stats["input"] = (stats["input"] ?? 0) + (usage?.input_tokens ?? 0);
-            const outTok = usage?.output_tokens ??
-                usage?.total_tokens ??
-                0;
-            stats["tokens"] = (stats["tokens"] ?? 0) + outTok;
+            const inTok = usage?.input_tokens ?? 0;
+            const outTok = usage?.output_tokens ?? 0;
+            const totalTok = usage?.total_tokens ?? inTok + outTok;
+            stats["input"] = (stats["input"] ?? 0) + inTok;
+            stats["tokens"] = (stats["tokens"] ?? 0) + totalTok;
             const reasoningTok = usage?.output_tokens_details?.reasoning_tokens ?? 0;
             stats["reasoning"] = (stats["reasoning"] ?? 0) + reasoningTok;
         }
@@ -414,9 +403,9 @@ export class InferenceEngine {
             return [conversation, false];
         const started = Date.now();
         const comp = new Spinner();
-        comp.start("Compacting conversation for `0s`");
+        comp.start("Compacting conversation `0s`");
         const compTimer = setInterval(() => {
-            comp.update(`Compacting conversation for ${tickDuration((Date.now() - started) / 1000)}`);
+            comp.update(`Compacting conversation ${tickDuration((Date.now() - started) / 1000)}`);
         }, 500);
         let compacted;
         try {
@@ -432,14 +421,11 @@ export class InferenceEngine {
         const text = `Compacted conversation in ${tickDuration((Date.now() - started) / 1000)}`;
         story.push({ type: "compacted", text });
         this.workActive = false;
-        process.stdout.write(mutedMarkdown(text) + "\n");
-        process.stdout.write("\n");
+        process.stdout.write(mutedMarkdown(text) + "\n\n");
         return [compacted, true];
     }
     async executeQuery(userPrompt, inputItems, story, pasteSpans) {
         this.inQuery = true;
-        // A completed status line belongs to the previous turn. Never let its
-        // replacement state reach the next user prompt.
         this.workActive = false;
         this.workRows = 0;
         this.interrupted = false;
@@ -456,9 +442,25 @@ export class InferenceEngine {
         [conversation] = await this.compactIfNeeded(conversation, inputItems, story);
         let emptyRetries = 0;
         const retryPrompts = [];
-        const stats = { thinking: 0, tokens: 0, reasoning: 0, input: 0 };
+        const stats = {
+            thinking: 0,
+            tokens: 0,
+            reasoning: 0,
+            input: 0,
+        };
         const queryStart = Date.now();
-        const footerText = () => `\x1b[2m(Thought for ${tickDuration(stats["thinking"])} · Worked for ${tickDuration((Date.now() - queryStart) / 1000)} · Used \x1b[22;37m${stats["tokens"].toLocaleString()}\x1b[2m tokens)\x1b[0m`;
+        const footerText = () => {
+            const parts = [];
+            if (stats["thinking"] > 0) {
+                parts.push(`Thought for ${tickDuration(stats["thinking"])}`);
+            }
+            parts.push(`Worked for ${tickDuration((Date.now() - queryStart) / 1000)}`);
+            if (stats["tokens"] > 0) {
+                parts.push(`Used \x1b[22;37m${stats["tokens"].toLocaleString()}\x1b[2m tokens`);
+            }
+            parts.push(`Effort: \x1b[1;36m${this.reasoningEffort}\x1b[0m\x1b[2m`);
+            return `\x1b[2m(${parts.join(" · ")})\x1b[0m`;
+        };
         const summary = () => mutedMarkdown(footerText());
         const attachFooter = (items) => {
             const footer = footerText();
@@ -537,7 +539,8 @@ export class InferenceEngine {
                     pending = conversation;
                 }
                 if (emptyMessage !== null) {
-                    if (incompleteReason === "max_output_tokens" && emptyRetries < max_empty_retries) {
+                    if (incompleteReason === "max_output_tokens" &&
+                        emptyRetries < max_empty_retries) {
                         emptyRetries++;
                         const retryPrompt = {
                             role: "user",
@@ -561,7 +564,11 @@ export class InferenceEngine {
                     return;
                 }
                 if (!calls.length) {
-                    const gap = text.endsWith("\n\n") ? "" : text.endsWith("\n") ? "\n" : "\n\n";
+                    const gap = text.endsWith("\n\n")
+                        ? ""
+                        : text.endsWith("\n")
+                            ? "\n"
+                            : "\n\n";
                     process.stdout.write(gap + summary() + "\n");
                     story.push({ type: "footer", text: footerText() });
                     attachFooter(conversation);
@@ -575,17 +582,23 @@ export class InferenceEngine {
                 for (const c of calls) {
                     this.workActive = false;
                     const started = formatToolAction(c.name, c.arguments, "started");
-                    process.stdout.write(`\x1b[2m${started}\x1b[0m\n`);
-                    if (c.name === "edit_file" || c.name === "write_file")
-                        process.stdout.write("\n");
+                    const toolSpinner = new Spinner();
+                    toolSpinner.start(started);
                     const rawResult = await this.runTool(c.name, c.arguments);
+                    toolSpinner.stop();
                     if (this.interrupted)
                         throw new Error("interrupt");
                     const failed = toolOutputFailed(c.name, rawResult);
                     const action = formatToolAction(c.name, c.arguments, failed ? "failed" : "ok");
-                    story.push({ type: "tool", started, text: action, status: failed ? "failed" : "ok" });
-                    const style = failed ? "\x1b[31m" : "\x1b[32m";
-                    process.stdout.write(`${style}${action}\x1b[0m\n\n`);
+                    story.push({
+                        type: "tool",
+                        started,
+                        text: action,
+                        status: failed ? "failed" : "ok",
+                    });
+                    const icon = failed ? "\x1b[31m✗\x1b[0m" : "\x1b[32m✓\x1b[0m";
+                    const actionStyle = failed ? "\x1b[31m" : "\x1b[32m";
+                    process.stdout.write(`${icon} ${actionStyle}${action}\x1b[0m\n\n`);
                     const truncatedResult = c.name === "read_file"
                         ? truncateToolOutput(rawResult, max_read_file_stored_chars)
                         : truncateToolOutput(rawResult);

package/dist/skills.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import YAML from "yaml";
 import { SKILLS_DIR } from "./config.js";
-const FRONTMATTER_RE = /^---[ \t]*\r?\n(.*?)\r?\n---[ \t]*\r?\n?([\s\S]*)$/;
+const FRONTMATTER_RE = /^---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*\r?\n?([\s\S]*)$/;
 function naturalSortKey(s) {
     return s.replace(/\d+/g, (m) => m.padStart(12, "0")).toLowerCase();
 }
@@ -34,7 +34,8 @@ function scanSkills() {
         .filter((d) => d.isDirectory())
         .sort((a, b) => naturalSortKey(a.name).localeCompare(naturalSortKey(b.name)));
     for (const sub of subs) {
-        const mdPath = path.join(SKILLS_DIR, sub.name, "SKILL.md");
+        const skillDirPath = path.join(SKILLS_DIR, sub.name);
+        const mdPath = path.join(skillDirPath, "SKILL.md");
         if (!fs.existsSync(mdPath))
             continue;
         let text;
@@ -51,7 +52,12 @@ function scanSkills() {
         if (seen.has(name))
             continue;
         seen.add(name);
-        skills.push({ name, description: meta["description"] ?? "", path: mdPath, dir: sub.name });
+        skills.push({
+            name,
+            description: meta["description"] ?? "",
+            path: mdPath,
+            dir: skillDirPath,
+        });
     }
     return skills;
 }
@@ -111,7 +117,7 @@ export function toolLoadSkill(skillName) {
         return "Error: skill_name must be a non-empty string.";
     }
     const skills = getSkills();
-    const skill = skills.find((s) => s.name === skillName);
+    const skill = skills.find((s) => s.name === skillName.trim());
     if (!skill) {
         const available = skills.map((s) => s.name).join(", ") || "none";
         return `Error: unknown skill '${skillName}'. Available skills: ${available}`;

package/dist/system.js

@@ -1,6 +1,6 @@
 import { osPrefix, SYSTEM_PROMPT_BODY } from "./config.js";
 import { getSkills } from "./skills.js";
-function buildSystemPrompt() {
+export function getSystemPrompt() {
     const skills = getSkills();
     let skillsText = "";
     if (skills.length) {
@@ -16,4 +16,4 @@ function buildSystemPrompt() {
     }
     return osPrefix() + SYSTEM_PROMPT_BODY + skillsText;
 }
-export const SYSTEM_PROMPT = buildSystemPrompt();
+export const SYSTEM_PROMPT = getSystemPrompt();