@oxecli/oxe 1.0.56 → 1.0.58

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;
@@ -149,7 +149,7 @@ export class InferenceEngine {
             process.stdout.write("\x1b[1A\x1b[2K");
         }
         process.stdout.write(mutedMarkdown(text) + "\n\n");
-        this.workRows = displayRows(text) + 1;
+        this.workRows = displayRows(mutedMarkdown(text)) + 1;
     }
     clearWorkLine() {
         if (!this.workActive || this.workRows < 1)
@@ -196,7 +196,7 @@ export class InferenceEngine {
             else {
                 process.stdout.write(mutedMarkdown(`Worked for ${t}`) + "\n\n");
                 this.workActive = true;
-                this.workRows = displayRows(`Worked for ${t}`) + 1;
+                this.workRows = displayRows(mutedMarkdown(`Worked for ${t}`)) + 1;
             }
         };
         const finishThinking = (report) => {
@@ -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

@@ -64,6 +64,38 @@ export function stripAnsi(s) {
 export function plainLen(s) {
     return stripAnsi(s).length;
 }
+// Truncate styled text to a max number of visible characters while keeping
+// ANSI escape sequences intact (never cut mid-sequence).
+export function truncateStyled(text, maxVisible) {
+    if (maxVisible <= 0)
+        return "";
+    if (plainLen(text) <= maxVisible)
+        return text;
+    const re = ANSI_RE;
+    re.lastIndex = 0;
+    let out = "";
+    let visible = 0;
+    let last = 0;
+    let m;
+    while ((m = re.exec(text)) !== null) {
+        if (m.index > last) {
+            const seg = text.slice(last, m.index);
+            const room = maxVisible - visible;
+            if (room <= 0)
+                return out;
+            out += seg.slice(0, room);
+            visible += Math.min(seg.length, room);
+            if (visible >= maxVisible)
+                return out;
+        }
+        out += m[0];
+        last = m.index + m[0].length;
+    }
+    if (visible < maxVisible) {
+        out += text.slice(last, last + (maxVisible - visible));
+    }
+    return out;
+}
 // ---------------------------------------------------------------------------
 // Markup tag -> ANSI
 // ---------------------------------------------------------------------------
@@ -334,11 +366,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 +408,9 @@ 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);
+        const display = plain.length > innerW ? truncateStyled(line, innerW) : line;
+        out.push(`\x1b[${borderStyle}m│\x1b[0m ${display}${" ".repeat(pad)} \x1b[${borderStyle}m│\x1b[0m`);
     }
     const bottom = `╰${embed(subtitle, "center")}╯`;
     out.push(`\x1b[${borderStyle}m${bottom}\x1b[0m`);
@@ -1002,6 +1027,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;
@@ -1010,14 +1049,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));
@@ -1049,7 +1082,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;
@@ -1059,6 +1092,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)
@@ -1075,7 +1124,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;
                 }
@@ -1086,7 +1135,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.56",
+  "version": "1.0.58",
   "publishConfig": {
     "access": "public"
   },