@oxecli/oxe 1.0.53 → 1.0.55

package/dist/cli.js

@@ -373,7 +373,7 @@ export class CLI {
         this.renderHeader(engine.modelName);
         process.stdout.write("\n");
         process.stdout.write(`\x1b[2mResumed:\x1b[0m \x1b[1m${truncateLabel(rec["label"])}\x1b[0m\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(`\x1b[2m(${this.inputItems.length} items · ${estimateTokens(this.inputItems).toLocaleString()} tokens)\x1b[0m\n\n`);
         renderPanel("Conversation history restored", "Restored");
         process.stdout.write("\n");
         if (this.story.length)

package/dist/engine.js

@@ -169,10 +169,10 @@ export class InferenceEngine {
         let thinkingStart = null;
         const workStatus = new Spinner();
         const workingStarted = Date.now();
-        workStatus.start(`Working (${tickDuration(0)})`);
+        workStatus.start(`Working ${tickDuration(0)}`);
         const workTimer = setInterval(() => {
-            workStatus.update(`Working (${tickDuration((Date.now() - workingStarted) / 1000)})`);
-        }, 500);
+            workStatus.update(`Working ${tickDuration((Date.now() - workingStarted) / 1000)}`);
+        }, 100);
         let workingReported = false;
         let response = null;
         let etype = null;
@@ -254,7 +254,7 @@ export class InferenceEngine {
                     if (thinkingStart === null) {
                         thinkingStart = Date.now();
                         status = new Spinner();
-                        status.start("Thinking `0s`");
+                        status.start(`Thinking ${tickDuration(0)}`);
                     }
                     else {
                         status?.update(`Thinking ${tickDuration((Date.now() - thinkingStart) / 1000)}`);
@@ -406,7 +406,7 @@ export class InferenceEngine {
         comp.start("Compacting conversation `0s`");
         const compTimer = setInterval(() => {
             comp.update(`Compacting conversation ${tickDuration((Date.now() - started) / 1000)}`);
-        }, 500);
+        }, 100);
         let compacted;
         try {
             compacted = await this.compactHistory(conversation);
@@ -458,7 +458,6 @@ export class InferenceEngine {
             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());

package/dist/ui.js

@@ -429,12 +429,13 @@ export function renderTableString(rows, opts = {}) {
 // Durations & Text Formatting
 // ---------------------------------------------------------------------------
 export function formatDuration(seconds) {
-    const total = Math.max(0, Math.round(seconds * 10) / 10);
-    if (total < 60)
-        return `${total}s`;
-    const mins = Math.floor(total / 60);
-    const secs = Math.round(total % 60);
-    return `${mins}m ${secs}s`;
+    const s = Math.max(0, seconds);
+    if (s < 60) {
+        return `${s.toFixed(1)}s`;
+    }
+    const mins = Math.floor(s / 60);
+    const remSecs = (s % 60).toFixed(1);
+    return `${mins}m ${remSecs}s`;
 }
 export function tickDuration(seconds) {
     return `\x1b[22;37m${formatDuration(seconds)}\x1b[2m`;
@@ -587,19 +588,19 @@ export function formatToolAction(name, argumentsJson, status = "ok") {
             const start = args["start_line"];
             const end = args["end_line"];
             const span = start != null || end != null
-                ? ` (lines ${start ?? 1} to ${end ?? "end"})`
+                ? ` lines ${start ?? 1}-${end ?? "end"}`
                 : "";
             return phrase("Read", "Reading", "Failed to read", `${p}${span}`);
         }
         case "write_file":
-            return phrase("Wrote", "Writing", "Failed to write", `${p} (${String(args["content"] ?? "").length.toLocaleString()} chars)`);
+            return phrase("Wrote", "Writing", "Failed to write", `${p} · ${String(args["content"] ?? "").length.toLocaleString()} chars`);
         case "edit_file": {
-            const suffix = args["replace_all"] ? " (replace all)" : "";
+            const suffix = args["replace_all"] ? " · replace all" : "";
             return phrase("Edited", "Editing", "Failed to edit", `${p}${suffix}`);
         }
         case "bash": {
             const cwd = args["cwd"];
-            const location = cwd ? ` [in ${cwd}]` : "";
+            const location = cwd ? ` in ${cwd}` : "";
             const command = truncateEllipsis(String(args["command"] ?? ""), 400, "command");
             if (status === "started")
                 return `Running command${location}: ${command}`;
@@ -829,6 +830,62 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const totalRows = body.length + 2;
     return { frame, cursorRow, cursorCol, totalRows };
 }
+export function isNewlineKey(str, key) {
+    if (!key)
+        return false;
+    const seq = key.sequence || str || "";
+    const hasModifier = !!(key.shift || key.ctrl || key.meta);
+    // Any modified Enter / Return / Linefeed / Ctrl+J
+    if (hasModifier &&
+        (key.name === "return" ||
+            key.name === "enter" ||
+            key.name === "linefeed" ||
+            seq === "\r" ||
+            seq === "\n" ||
+            (key.ctrl && key.name === "j"))) {
+        return true;
+    }
+    // Kitty protocol: \x1b[13;<mod>u (mod 2=Shift, 3=Alt, 5=Ctrl, 6=Ctrl+Shift, etc.)
+    if (/^\x1b\[13;([2-9]|\d{2,})u$/.test(seq))
+        return true;
+    // Legacy kitty/xterm: \x1b[13;<mod>~
+    if (/^\x1b\[13;([2-9]|\d{2,})~$/.test(seq))
+        return true;
+    // Xterm modifyOtherKeys: \x1b[27;<mod>;13~
+    if (/^\x1b\[27;([2-9]|\d{2,});13~$/.test(seq))
+        return true;
+    // Alt+Enter / Esc+Enter
+    if (seq === "\x1b\r" ||
+        seq === "\x1b\n" ||
+        seq === "\x1b\x0d" ||
+        seq === "\x1b\x0a") {
+        return true;
+    }
+    // F3 Shift decode in legacy Node
+    if (key.name === "f3" && key.shift)
+        return true;
+    return false;
+}
+export function isSubmitEnterKey(str, key) {
+    if (!key)
+        return false;
+    if (isNewlineKey(str, key))
+        return false;
+    const seq = key.sequence || str || "";
+    const isPlainEnterName = (key.name === "return" || key.name === "enter") &&
+        !key.shift &&
+        !key.ctrl &&
+        !key.meta;
+    if (isPlainEnterName)
+        return true;
+    if (seq === "\r" && !key.ctrl && !key.shift && !key.meta)
+        return true;
+    if (seq === "\x1b[13u" || seq === "\x1b[13;1u")
+        return true;
+    if (seq === "\x1b[27;1;13~")
+        return true;
+    return false;
+}
 export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
     return new Promise((resolve, reject) => {
         const isTTY = process.stdin.isTTY;
@@ -1106,46 +1163,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 }
             }
         };
-        const isNewlineKey = (key) => {
-            if (!key)
-                return false;
-            if (key.ctrl && key.name === "j")
-                return true;
-            if (key.name === "enter")
-                return !!(key.shift || key.ctrl || key.meta);
-            if (key.name === "return")
-                return !!(key.shift || key.ctrl || key.meta);
-            const seq = key.sequence || "";
-            if (/^\x1b\[13;([2-9]|\d{2,})u$/.test(seq))
-                return true;
-            if (/^\x1b\[13;([2-9]|\d{2,})~$/.test(seq))
-                return true;
-            if (key.name === "f3" && key.shift)
-                return true;
-            return false;
-        };
-        const isModifiedEnterInput = (str, key) => {
-            const value = str || "";
-            const sequence = key?.sequence || "";
-            if (value === "\n" || value === "\x0a")
-                return true;
-            if (key?.name === "linefeed" || (key?.ctrl && key?.name === "j"))
-                return true;
-            return (/^\x1b\[13;(?:[2-9]|\d{2,})(?:u|~)$/.test(value) ||
-                /^\x1b\[13;(?:[2-9]|\d{2,})(?:u|~)$/.test(sequence));
-        };
-        const isSubmitEnterKey = (key) => {
-            if (!key)
-                return false;
-            if ((key.name === "return" || key.name === "enter") &&
-                !(key.shift || key.ctrl || key.meta)) {
-                return true;
-            }
-            const seq = key.sequence || "";
-            if (seq === "\x1b[13u" || /^\x1b\[13;1u$/.test(seq))
-                return true;
-            return false;
-        };
         const consumeBracketedPaste = (str, key) => {
             const start = "\x1b[200~";
             const end = "\x1b[201~";
@@ -1262,14 +1279,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 repaint();
                 return;
             }
-            if (isNewlineKey(key) ||
-                isModifiedEnterInput(str, key) ||
-                (pasteBurst && isSubmitEnterKey(key))) {
+            if (isNewlineKey(str, key) || (pasteBurst && isSubmitEnterKey(str, key))) {
                 insert("\n");
                 repaint();
                 return;
             }
-            if (isSubmitEnterKey(key)) {
+            if (isSubmitEnterKey(str, key)) {
                 if (buffer.trim()) {
                     settle([buffer, pasteSpans], false);
                 }

package/package.json

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