@oxecli/oxe 1.0.55 → 1.0.57

package/dist/engine.js

@@ -43,7 +43,7 @@ export class InferenceEngine {
     keyData;
     client;
     workActive = false;
-    workRows = 2;
+    workRows = 0;
     inQuery = false;
     activeAbort = null;
     interrupted = false;
@@ -403,7 +403,7 @@ export class InferenceEngine {
             return [conversation, false];
         const started = Date.now();
         const comp = new Spinner();
-        comp.start("Compacting conversation `0s`");
+        comp.start(`Compacting conversation ${tickDuration(0)}`);
         const compTimer = setInterval(() => {
             comp.update(`Compacting conversation ${tickDuration((Date.now() - started) / 1000)}`);
         }, 100);

package/dist/ui.js

@@ -334,11 +334,10 @@ export function aiMarkdown(text) {
     return markdownToAnsi(text);
 }
 export function mutedMarkdown(text) {
-    const dimmed = text
+    return markdownToAnsi(text)
         .split("\n")
         .map((l) => `\x1b[2m${l}\x1b[0m`)
         .join("\n");
-    return markdownToAnsi(dimmed);
 }
 // ---------------------------------------------------------------------------
 // Panel Rendering
@@ -377,15 +376,8 @@ function panelString(content, title = "", subtitle = "", expand = true, borderSt
     for (let i = 0; i < styledLines.length; i++) {
         const line = styledLines[i];
         const plain = plainLines[i] ?? "";
-        if (plain.length > innerW) {
-            // Truncate cleanly if single line overflows max box width
-            const truncated = line.slice(0, innerW);
-            out.push(`\x1b[${borderStyle}m│\x1b[0m ${truncated} \x1b[${borderStyle}m│\x1b[0m`);
-        }
-        else {
-            const pad = Math.max(innerW - plain.length, 0);
-            out.push(`\x1b[${borderStyle}m│\x1b[0m ${line}${" ".repeat(pad)} \x1b[${borderStyle}m│\x1b[0m`);
-        }
+        const pad = Math.max(innerW - plain.length, 0);
+        out.push(`\x1b[${borderStyle}m│\x1b[0m ${line}${" ".repeat(pad)} \x1b[${borderStyle}m│\x1b[0m`);
     }
     const bottom = `╰${embed(subtitle, "center")}╯`;
     out.push(`\x1b[${borderStyle}m${bottom}\x1b[0m`);
@@ -830,60 +822,45 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const totalRows = body.length + 2;
     return { frame, cursorRow, cursorCol, totalRows };
 }
-export function isNewlineKey(str, key) {
+export function isShiftEnterKey(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 &&
+    if (key.shift &&
         (key.name === "return" ||
             key.name === "enter" ||
             key.name === "linefeed" ||
             seq === "\r" ||
-            seq === "\n" ||
-            (key.ctrl && key.name === "j"))) {
+            seq === "\n")) {
         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") {
+    if (seq === "\x1b[13;2u" ||
+        seq === "\x1b[13;2~" ||
+        seq === "\x1b[13;2_" ||
+        seq === "\x1b[27;2;13~" ||
+        seq === "\x1bOM") {
         return true;
     }
-    // F3 Shift decode in legacy Node
-    if (key.name === "f3" && key.shift)
+    if (!key.ctrl && (str === "\n" || seq === "\n" || key.name === "linefeed")) {
         return true;
+    }
     return false;
 }
+export const isNewlineKey = isShiftEnterKey;
 export function isSubmitEnterKey(str, key) {
     if (!key)
         return false;
-    if (isNewlineKey(str, key))
+    if (isShiftEnterKey(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~")
+    if ((key.name === "return" ||
+        key.name === "enter" ||
+        seq === "\r" ||
+        seq === "\x1b[13u" ||
+        seq === "\x1b[13;1u") &&
+        !key.shift) {
         return true;
+    }
     return false;
 }
 export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
@@ -1017,6 +994,20 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             }
             cursor += text.length;
         };
+        // A paste span is treated as a single atomic "block" only when it collapses
+        // to a marker (large pastes). Small inline pastes behave like normal text.
+        const spanCollapsed = (span) => {
+            return shouldCollapsePaste(buffer.slice(span[0], span[1]));
+        };
+        const deleteWholeSpan = (span) => {
+            const [start, end] = span;
+            buffer = buffer.slice(0, start) + buffer.slice(end);
+            const delta = start - end;
+            pasteSpans = pasteSpans
+                .filter(([s, e]) => s !== start || e !== end)
+                .map(([s, e]) => (s >= end ? [s + delta, e + delta] : [s, e]));
+            cursor = start;
+        };
         const backspace = () => {
             if (cursor <= 0)
                 return;
@@ -1025,14 +1016,8 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 histIdx = hist.length;
             }
             const containing = pasteSpans.find(([s, e]) => s < cursor && cursor <= e);
-            if (containing) {
-                const [start, end] = containing;
-                buffer = buffer.slice(0, start) + buffer.slice(end);
-                const delta = start - end;
-                pasteSpans = pasteSpans
-                    .filter(([s, e]) => s !== start || e !== end)
-                    .map(([s, e]) => (s >= end ? [s + delta, e + delta] : [s, e]));
-                cursor = start;
+            if (containing && spanCollapsed(containing)) {
+                deleteWholeSpan(containing);
                 return;
             }
             const before = Array.from(buffer.slice(0, cursor));
@@ -1064,7 +1049,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 histIdx = hist.length;
             }
             const containing = pasteSpans.find(([s, e]) => s <= cursor && cursor < e);
-            if (containing) {
+            if (containing && spanCollapsed(containing)) {
                 const [start, end] = containing;
                 buffer = buffer.slice(0, start) + buffer.slice(end);
                 const delta = start - end;
@@ -1074,6 +1059,22 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
                 return;
             }
             buffer = buffer.slice(0, cursor) + buffer.slice(cursor + 1);
+            const deletedAt = cursor;
+            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 deleteWordBefore = () => {
             if (cursor <= 0)
@@ -1090,7 +1091,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             if (cursor <= 0)
                 return;
             for (const [s, e] of pasteSpans) {
-                if (s < cursor && cursor <= e) {
+                if (s < cursor && cursor <= e && spanCollapsed([s, e])) {
                     cursor = s;
                     return;
                 }
@@ -1101,7 +1102,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             if (cursor >= buffer.length)
                 return;
             for (const [s, e] of pasteSpans) {
-                if (s <= cursor && cursor < e) {
+                if (s <= cursor && cursor < e && spanCollapsed([s, e])) {
                     cursor = e;
                     return;
                 }

package/package.json

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