@oxecli/oxe 1.0.112 → 1.0.114

package/dist/ui.js

@@ -1249,6 +1249,17 @@ export const PROMPT_PLACEHOLDER = "Describe a coding task, or type /help for com
 const MAX_PROMPT_DISPLAY_LINES = 12;
 const MAX_PROMPT_PASTE_CHARS = 400;
 const MAX_PROMPT_CHARS = 500;
+/**
+ * Watchdog for bracketed paste. Some terminals (notably Windows Terminal /
+ * conpty) occasionally drop the paste-END marker, which would leave the field
+ * permanently capturing keystrokes (a "locked" prompt). If a paste-start
+ * arrives but no paste-end AND no further paste data shows up within this
+ * window, we treat the paste as aborted, release capture, and keep whatever
+ * text already arrived so input is never lost. The window resets on every
+ * received paste chunk, so a genuine (continuously-streaming) paste is never
+ * cut short.
+ */
+const PASTE_GUARD_MS = 3000;
 function shouldCollapsePaste(text) {
     return (text.split("\n").length > MAX_PROMPT_DISPLAY_LINES ||
         text.length > MAX_PROMPT_PASTE_CHARS);
@@ -1492,18 +1503,29 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     let totalRows = body.length + 2;
     if (hints && (hints.left || hints.right)) {
         let left = hints.left ?? "";
-        const right = hints.right ?? "";
+        let 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. 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).
+        // column before the box's right border for the same padding. Truncate so
+        // the row NEVER exceeds the box width on narrow/scaled terminals: the left
+        // hint is cut first to keep the (priority) right hint intact, then the
+        // right hint is cut as a last resort. Otherwise a long right hint would
+        // overflow past the 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 maxText = Math.max(0, hintMax - 1); // reserve a >=1 gap between hints
+        let leftW = plainLen(left);
+        let rightW = plainLen(right);
+        if (leftW + rightW > maxText) {
+            const roomL = Math.max(0, maxText - rightW);
+            left = truncateStyled(left, roomL);
+            leftW = plainLen(left);
+        }
+        const roomR = Math.max(0, maxText - leftW);
+        if (rightW > roomR) {
+            right = truncateStyled(right, roomR);
+            rightW = plainLen(right);
         }
-        const gap = Math.max(1, boxW - 2 - plainLen(left) - plainLen(right));
+        const gap = Math.max(1, hintMax - leftW - rightW);
         lines.push(" " + left + " ".repeat(gap) + right);
         totalRows += 1;
     }
@@ -1555,6 +1577,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
         let draft = null;
         let bracketedPaste = false;
         let bracketedPasteBuffer = "";
+        let pasteGuardTimer = null;
         let pasteBurst = false;
         let pasteBurstTimer = null;
         readline.emitKeypressEvents(process.stdin);
@@ -1593,6 +1616,10 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             bracketedPasteBuffer = "";
             if (pasteBurstTimer)
                 clearTimeout(pasteBurstTimer);
+            if (pasteGuardTimer) {
+                clearTimeout(pasteGuardTimer);
+                pasteGuardTimer = null;
+            }
             if (isErr) {
                 clearBox();
                 dockSetInactive();
@@ -1898,17 +1925,46 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             const end = "\x1b[201~";
             const sequence = key?.sequence || "";
             const value = str || "";
+            // A paste-end marker must close the capture. If it never arrives and no
+            // more paste data follows, the guard below auto-releases the field so it
+            // can't lock. (definitions hoisted below)
+            const armPasteGuard = () => {
+                if (pasteGuardTimer)
+                    clearTimeout(pasteGuardTimer);
+                pasteGuardTimer = setTimeout(() => {
+                    pasteGuardTimer = null;
+                    if (!bracketedPaste)
+                        return;
+                    // The terminal dropped the paste-end (a Windows/conpty failure). Bail
+                    // out of capture mode and insert whatever already arrived so nothing
+                    // typed afterward is swallowed.
+                    bracketedPaste = false;
+                    const leftover = bracketedPasteBuffer;
+                    bracketedPasteBuffer = "";
+                    if (leftover)
+                        insert(leftover, true);
+                    repaint();
+                }, PASTE_GUARD_MS);
+            };
+            const disarmPasteGuard = () => {
+                if (pasteGuardTimer) {
+                    clearTimeout(pasteGuardTimer);
+                    pasteGuardTimer = null;
+                }
+            };
             // A new paste-start while already inside a paste means the previous paste
             // was aborted (its end marker never arrived). Reset and start over so we
             // never swallow subsequent typing.
             if ((key?.name === "paste-start" || sequence === start || value === start)) {
                 bracketedPaste = true;
                 bracketedPasteBuffer = "";
+                armPasteGuard();
                 const inline = value === start ? "" : value.startsWith(start) ? value.slice(start.length) : "";
                 if (inline)
                     bracketedPasteBuffer = inline;
                 if (inline.includes(end)) {
                     const pasted = inline.slice(0, inline.indexOf(end)).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                    disarmPasteGuard();
                     bracketedPaste = false;
                     bracketedPasteBuffer = "";
                     if (pasted)
@@ -1926,6 +1982,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             if (key?.name === "paste-end" || sequence === end || value === end || endAt >= 0) {
                 bracketedPasteBuffer += endAt >= 0 ? value.slice(0, endAt) : "";
                 const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                disarmPasteGuard();
                 bracketedPaste = false;
                 bracketedPasteBuffer = "";
                 if (pasted)
@@ -1934,8 +1991,10 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 return true;
             }
             const chunk = value || (sequence && !sequence.startsWith("\x1b[") ? sequence : "");
-            if (chunk)
+            if (chunk) {
                 bracketedPasteBuffer += chunk;
+                armPasteGuard();
+            }
             return true;
         };
         const markPasteBurst = () => {

package/package.json

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