@oxecli/oxe 1.0.106 → 1.0.108

package/dist/cli.js

@@ -60,7 +60,7 @@ export class CLI {
             // The result body was formatted against the terminal width at tool time,
             // but the window may be narrower on resume — re-truncate defensively so
             // long persisted lines never run off the screen.
-            const lineMax = Math.max(terminalWidth() - 4, 20);
+            const lineMax = Math.max(terminalWidth() - 4, 1);
             const allLines = body.split("\n");
             const lines = allLines
                 .slice(0, TOOL_RESULT_MAX_LINES)
@@ -81,7 +81,7 @@ export class CLI {
         const truncated = truncateEllipsis(body, Math.min(max_action_chars, MAX_COMMAND_DISPLAY_CHARS), "text");
         // truncateEllipsis appends a "…(text truncated: N chars total)" suffix, so
         // re-truncate to the current width to keep the legacy action on one row.
-        const displayMax = Math.max(terminalWidth() - 6, 20);
+        const displayMax = Math.max(terminalWidth() - 6, 1);
         process.stdout.write(`${icon} ${style}${truncateStyled(truncated, displayMax)}\x1b[0m\n`);
     }
     printAssistantBlock(text) {

package/dist/oxe.js

@@ -1,10 +1,18 @@
 import { main } from "./cli.js";
+import { dockTearDown, showCursor } from "./ui.js";
 export { main };
 // The TUI keeps the terminal cursor hidden except inside a prompt field. Always
-// restore it on exit so the shell isn't left with an invisible cursor.
+// restore it on exit and tear down any docked prompt box so the shell isn't
+// left with a stale prompt box or an invisible cursor.
 process.on("exit", () => {
     try {
-        process.stdout.write("\x1b[?25h");
+        dockTearDown();
+    }
+    catch {
+        /* ignore */
+    }
+    try {
+        showCursor();
     }
     catch {
         /* ignore */

package/dist/ui.js

@@ -76,8 +76,11 @@ export function startDraftCapture(onInterrupt, renderBox) {
             return;
         }
         if (str && !key?.ctrl && !key?.meta) {
-            draft += str.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-            renderBox?.(draft, pasteSpans);
+            const added = str.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+            if (draft.length + added.length <= MAX_PROMPT_CHARS) {
+                draft += added;
+                renderBox?.(draft, pasteSpans);
+            }
         }
     };
     readline.emitKeypressEvents(process.stdin);
@@ -113,6 +116,21 @@ export function clearScreen() {
 export function terminalWidth() {
     return process.stdout.columns || 80;
 }
+/** Minimum width for boxes/cards so they don't collapse to nothing. */
+const MIN_BOX_WIDTH = 20;
+/** Horizontal margin reserved on each side of a box/card from the terminal edge. */
+const BOX_MARGIN = 4;
+/**
+ * Clamp a preferred box width so it fits inside the terminal (borders never wrap
+ * or duplicate on narrow/scaled terminals, e.g. a larger command-prompt scale)
+ * while keeping a preferred minimum. Fitting wins over the minimum when the
+ * terminal is narrower than min+margin, so cards size down smoothly instead of
+ * overflowing.
+ */
+function fitBoxWidth(pref, termW) {
+    const maxW = Math.max(termW - BOX_MARGIN, 1);
+    return Math.min(Math.max(Math.min(pref, maxW), MIN_BOX_WIDTH), maxW);
+}
 // ---------------------------------------------------------------------------
 // ANSI and plain text length helpers
 // ---------------------------------------------------------------------------
@@ -155,6 +173,81 @@ export function truncateStyled(text, maxVisible) {
     }
     return out;
 }
+/**
+ * Wrap a styled (ANSI) string into lines of at most `width` visible characters,
+ * wrapping whole words onto new lines and splitting any single word longer than
+ * `width`. ANSI escape sequences are preserved and re-attached to their glyphs,
+ * so no style is lost and no escape sequence is ever cut mid-way.
+ */
+function wrapStyledToWidth(line, width) {
+    if (width <= 0)
+        return [line];
+    if (plainLen(line) <= width)
+        return [line];
+    // Tokenize into glyph units, each carrying the ANSI prefix that precedes it.
+    const units = [];
+    const re = /(\x1b\[[0-9;]*[a-zA-Z]|\x1b\].*?\x07)|([\s\S])/g;
+    let pending = "";
+    let m;
+    re.lastIndex = 0;
+    while ((m = re.exec(line)) !== null) {
+        if (m[1] !== undefined)
+            pending += m[1];
+        else {
+            units.push({ ch: m[2], pre: pending });
+            pending = "";
+        }
+    }
+    const out = [];
+    let cur = "";
+    let curLen = 0;
+    let word = [];
+    const emitChunk = (chunk, prependSpace) => {
+        const add = (prependSpace && curLen > 0 ? 1 : 0) + chunk.length;
+        if (curLen + add > width)
+            return false;
+        if (prependSpace && curLen > 0) {
+            cur += " ";
+            curLen++;
+        }
+        for (const u of chunk)
+            cur += u.pre + u.ch;
+        curLen += chunk.length;
+        return true;
+    };
+    const flushWord = () => {
+        if (!word.length)
+            return;
+        const wlen = word.length;
+        // Split overlong words into <= width chunks so nothing is ever cut off.
+        const chunks = [];
+        if (wlen <= width)
+            chunks.push(word);
+        else
+            for (let i = 0; i < wlen; i += width)
+                chunks.push(word.slice(i, i + width));
+        for (let ci = 0; ci < chunks.length; ci++) {
+            const chunk = chunks[ci];
+            if (!emitChunk(chunk, ci === 0)) {
+                out.push(cur);
+                cur = "";
+                curLen = 0;
+                emitChunk(chunk, false);
+            }
+        }
+        word = [];
+    };
+    for (const u of units) {
+        if (/\s/.test(u.ch))
+            flushWord();
+        else
+            word.push(u);
+    }
+    flushWord();
+    if (cur)
+        out.push(cur);
+    return out.length ? out : [line];
+}
 // ---------------------------------------------------------------------------
 // Markup tag -> ANSI
 // ---------------------------------------------------------------------------
@@ -290,7 +383,7 @@ function formatMarkdownTable(tableLines) {
 // Rich Markdown -> ANSI Terminal Renderer
 // ---------------------------------------------------------------------------
 export function markdownToAnsi(text) {
-    const width = Math.max(terminalWidth() - 2, 40);
+    const width = Math.max(terminalWidth() - 2, 1);
     const rawLines = text.split("\n");
     const out = [];
     let inCode = false;
@@ -394,22 +487,11 @@ export function markdownToAnsi(text) {
         if (!line.includes("\x1b[36m•\x1b[0m") && !line.includes(".\x1b[0m ")) {
             line = formatInlineMarkdown(line);
         }
-        // Word wrap paragraph line if too long
+        // Word wrap paragraph line if too long. Whole words move to a new row; any
+        // single word longer than the width is split so nothing is ever cut off at
+        // the right edge.
         if (plainLen(line) > width && !line.startsWith(" ")) {
-            const words = line.split(" ");
-            let cur = "";
-            for (const w of words) {
-                if (plainLen(cur) + plainLen(w) + 1 > width) {
-                    if (cur)
-                        out.push(cur);
-                    cur = w;
-                }
-                else {
-                    cur = cur ? `${cur} ${w}` : w;
-                }
-            }
-            if (cur)
-                out.push(cur);
+            out.push(...wrapStyledToWidth(line, width));
         }
         else {
             out.push(line);
@@ -445,8 +527,8 @@ function panelString(content, title = "", subtitle = "", expand = true, borderSt
         maxLineW = Math.max(maxLineW, plainLen(subtitle) + 4);
     const termW = terminalWidth();
     const boxW = expand
-        ? Math.max(termW - 4, 20)
-        : Math.min(Math.max(maxLineW + 4, 20), termW - 4);
+        ? fitBoxWidth(termW - 4, termW)
+        : fitBoxWidth(maxLineW + 4, termW);
     const innerW = Math.max(boxW - 4, 1);
     const embed = (text, align) => {
         if (!text)
@@ -1072,7 +1154,7 @@ export function toolCallLabel(name, argumentsJson) {
     arg = arg.trim().replace(/\s*\r?\n\s*/g, " ");
     if (!arg)
         return `\x1b[1;36m${display}\x1b[0m`;
-    const cap = Math.max(Math.min(terminalWidth() - plainLen(display) - 4, MAX_COMMAND_DISPLAY_CHARS), 20);
+    const cap = Math.max(Math.min(terminalWidth() - plainLen(display) - 4, MAX_COMMAND_DISPLAY_CHARS), Math.min(terminalWidth() - plainLen(display) - 2, 8));
     if (plainLen(arg) > cap)
         arg = truncateStyled(arg, cap) + "…";
     return `\x1b[1;36m${display}\x1b[0m(${arg})`;
@@ -1097,7 +1179,7 @@ export function formatToolResult(rawResult, failed) {
     // Truncate to the terminal width (rows OR per-line length, whichever trips
     // first) so long tool output — e.g. Glob paths — never runs off the screen.
     const termW = terminalWidth();
-    const lineMax = Math.max(termW - 4, 20);
+    const lineMax = Math.max(termW - 4, 1);
     const allLines = clean.split("\n");
     const lines = allLines
         .slice(0, TOOL_RESULT_MAX_LINES)
@@ -1116,10 +1198,32 @@ export function formatToolResult(rawResult, failed) {
 export const PROMPT_PLACEHOLDER = "Describe a coding task, or type /help for commands";
 const MAX_PROMPT_DISPLAY_LINES = 12;
 const MAX_PROMPT_PASTE_CHARS = 400;
+const MAX_PROMPT_CHARS = 500;
 function shouldCollapsePaste(text) {
     return (text.split("\n").length > MAX_PROMPT_DISPLAY_LINES ||
         text.length > MAX_PROMPT_PASTE_CHARS);
 }
+/**
+ * Effective character count of a prompt for its length limit. Each non-collapsed
+ * char counts as one; a collapsed pasted block counts as a single char.
+ */
+export function promptCharCount(buffer, pasteSpans) {
+    if (!buffer)
+        return 0;
+    const spans = [...pasteSpans].sort((a, b) => a[0] - b[0]);
+    let count = 0;
+    let last = 0;
+    for (const [s, e] of spans) {
+        if (s > last)
+            count += s - last;
+        const seg = buffer.slice(s, e);
+        count += shouldCollapsePaste(seg) ? 1 : e - s;
+        last = e;
+    }
+    if (last < buffer.length)
+        count += buffer.length - last;
+    return count;
+}
 export function cursorLineCol(buffer, cursor) {
     const before = buffer.slice(0, cursor);
     const lines = before.split("\n");
@@ -1238,7 +1342,7 @@ function wrapRuns(runs, width) {
 }
 export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor, hints) {
     const termW = terminalWidth();
-    const boxW = Math.max(termW - 4, 16);
+    const boxW = fitBoxWidth(termW - 4, termW);
     const innerW = boxW - 4;
     const runs = [];
     runs.push({ text: prefix, style: "\x1b[90m" });
@@ -1337,11 +1441,18 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const lines = [top, ...body, bottom];
     let totalRows = body.length + 2;
     if (hints && (hints.left || hints.right)) {
-        const left = hints.left ?? "";
+        let left = hints.left ?? "";
         const right = hints.right ?? "";
         // Inset the hint row inside the box (box spans columns 0..boxW-1): a
         // leading space gives left-edge padding, and the right hint ends one
-        // column before the box's right border for the same padding.
+        // column before the box's right border for the same padding. Truncate the
+        // left hint so the row never exceeds the box width on narrow terminals
+        // (otherwise it overflows past the right border instead of scaling down).
+        const hintMax = boxW - 2;
+        if (plainLen(left) + plainLen(right) + 1 > hintMax) {
+            const room = Math.max(0, hintMax - plainLen(right) - 1);
+            left = truncateStyled(left, room);
+        }
         const gap = Math.max(1, boxW - 2 - plainLen(left) - plainLen(right));
         lines.push(" " + left + " ".repeat(gap) + right);
         totalRows += 1;
@@ -1464,6 +1575,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 dockEnterDocked();
             }
             process.stdin.removeListener("keypress", onKeypress);
+            process.stdout.removeListener("resize", onResize);
             process.stdin.pause();
             showCursor();
             if (isErr)
@@ -1536,14 +1648,32 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 draft = { buffer, cursor, spans: pasteSpans.slice() };
                 histIdx = hist.length;
             }
-            const pasteStart = cursor;
-            buffer = buffer.slice(0, cursor) + text + buffer.slice(cursor);
-            pasteSpans = shiftSpansAfterInsert(cursor, text.length);
+            // Non-collapsing pastes get a leading space when inserted after non-empty,
+            // non-whitespace text (never when a space is already present). The space is
+            // inserted as plain text (outside the paste span) so display spacing isn't
+            // doubled.
+            let prefix = "";
+            if (isPaste &&
+                !shouldCollapsePaste(text) &&
+                cursor > 0 &&
+                !endsWithWs(buffer.slice(0, cursor))) {
+                prefix = " ";
+            }
+            const pasteStart = cursor + prefix.length;
+            const insertLen = prefix.length + text.length;
+            const newBuffer = buffer.slice(0, cursor) + prefix + text + buffer.slice(cursor);
+            const newSpans = shiftSpansAfterInsert(cursor, insertLen);
             if (isPaste) {
-                pasteSpans.push([pasteStart, pasteStart + text.length]);
-                pasteSpans.sort((a, b) => a[0] - b[0]);
+                newSpans.push([pasteStart, pasteStart + text.length]);
+                newSpans.sort((a, b) => a[0] - b[0]);
             }
-            cursor += text.length;
+            // Enforce the 500-char effective limit; a collapsed block counts as one.
+            if (promptCharCount(newBuffer, newSpans) > MAX_PROMPT_CHARS) {
+                return;
+            }
+            buffer = newBuffer;
+            pasteSpans = newSpans;
+            cursor += insertLen;
         };
         const spanCollapsed = (span) => {
             return shouldCollapsePaste(buffer.slice(span[0], span[1]));
@@ -1887,6 +2017,17 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             }
         };
         process.stdin.on("keypress", onKeypress);
+        // Reflow the idle prompt box when the terminal resizes so it scales down
+        // instead of wrapping/overflowing its borders on a narrow/scaled terminal.
+        const onResize = () => {
+            try {
+                repaint(false);
+            }
+            catch {
+                /* ignore */
+            }
+        };
+        process.stdout.on("resize", onResize);
         repaint(true);
     });
 }

package/package.json

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