@oxecli/oxe 1.0.21 → 1.0.23

package/dist/cli.js

@@ -219,12 +219,13 @@ export class CLI {
             const label = truncateLabel(rec["label"]);
             const items = rec["input_items"] ?? [];
             const toks = estimateTokens(items).toLocaleString();
-            const content = `\x1b[1m${sid.padStart(4)}\x1b[0m` +
-                `\x1b[2m  ${updated}\x1b[0m  ${label}` +
-                `\x1b[2m  ${items.length} items · ${toks} tok\x1b[0m`;
+            const selectedRow = idx === selected;
+            const content = `${selectedRow ? "\x1b[1m\x1b[37m" : "\x1b[1m"}${sid.padStart(4)}\x1b[0m` +
+                `${selectedRow ? "\x1b[2m\x1b[36m" : "\x1b[2m"}  ${updated}\x1b[0m` +
+                `${selectedRow ? "\x1b[37m" : ""}  ${label}\x1b[0m` +
+                `${selectedRow ? "\x1b[2m\x1b[34m" : "\x1b[2m"}  ${items.length} items · ${toks} tok\x1b[0m`;
             rows.push({
-                cells: [idx === selected ? "\x1b[1m\x1b[36m❯\x1b[0m" : "", content],
-                style: idx === selected ? "\x1b[1m" : undefined,
+                cells: [selectedRow ? "\x1b[1m\x1b[36m❯\x1b[0m" : "", content],
             });
         }
         const below = total - hi;

package/dist/ui.js

@@ -200,9 +200,9 @@ titleAlign = "center") {
     contentW = Math.max(contentW, 1);
     let innerW = contentW + 2;
     if (title)
-        innerW = Math.max(innerW, title.length + 2);
+        innerW = Math.max(innerW, plainLen(title) + 2);
     if (subtitle)
-        innerW = Math.max(innerW, subtitle.length + 2);
+        innerW = Math.max(innerW, plainLen(subtitle) + 2);
     const w = terminalWidth();
     innerW = expand ? Math.max(w - 4, 10) : Math.min(innerW, w - 4);
     // Build a border run of `innerW` chars with `text` embedded.
@@ -210,7 +210,7 @@ titleAlign = "center") {
         if (!text)
             return "─".repeat(innerW);
         const inner = ` ${text} `;
-        const fill = Math.max(innerW - inner.length, 0);
+        const fill = Math.max(innerW - plainLen(text) - 2, 0);
         if (align === "left") {
             return `${inner}${"─".repeat(fill)}`;
         }
@@ -690,7 +690,7 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     }
     const { rows, caretRow, caretCol } = wrapRuns(runs, innerW);
     // Top border with the label embedded on the left.
-    const topPad = Math.max(borderW - label.length - 2, 0);
+    const topPad = Math.max(borderW - label.length - 3, 0);
     const top = `\x1b[90m╭─ ${label} ${"─".repeat(topPad)}╮\x1b[0m`;
     // Body rows.
     const body = [];
@@ -728,6 +728,8 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         const hist = history.slice();
         let histIdx = hist.length;
         let draft = null;
+        let bracketedPaste = false;
+        let bracketedPasteBuffer = "";
         readline.emitKeypressEvents(process.stdin);
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
@@ -974,8 +976,10 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             if (!key)
                 return false;
             // Bare \n / Ctrl+J = newline.
-            if (key.name === "enter")
+            if (key.ctrl && key.name === "j")
                 return true;
+            if (key.name === "enter")
+                return !!(key.shift || key.ctrl || key.meta);
             // Enter with a modifier (Shift/Ctrl/Alt/Meta) = newline.
             if (key.name === "return")
                 return !!(key.shift || key.ctrl || key.meta);
@@ -998,14 +1002,67 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         const isSubmitEnterKey = (key) => {
             if (!key)
                 return false;
-            if (key.name === "return" && !(key.shift || key.ctrl || key.meta))
+            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~";
+            const sequence = key?.sequence || "";
+            const value = str || "";
+            if (!bracketedPaste && (sequence === start || value === start)) {
+                bracketedPaste = true;
+                bracketedPasteBuffer = "";
+                const inline = value === start ? "" : value.startsWith(start) ? value.slice(start.length) : "";
+                if (inline)
+                    bracketedPasteBuffer = inline;
+                if (inline.includes(end)) {
+                    const endAt = inline.indexOf(end);
+                    const pasted = inline.slice(0, endAt).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                    bracketedPaste = false;
+                    bracketedPasteBuffer = "";
+                    if (pasted)
+                        insert(pasted, true);
+                    repaint();
+                }
+                return true;
+            }
+            if (!bracketedPaste)
+                return false;
+            if (sequence === end || value === end) {
+                const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                bracketedPaste = false;
+                bracketedPasteBuffer = "";
+                if (pasted)
+                    insert(pasted, true);
+                repaint();
+                return true;
+            }
+            const chunk = value || (sequence && !sequence.startsWith("\x1b[") ? sequence : "");
+            if (chunk) {
+                const endAt = chunk.indexOf(end);
+                if (endAt >= 0) {
+                    bracketedPasteBuffer += chunk.slice(0, endAt);
+                    const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                    bracketedPaste = false;
+                    bracketedPasteBuffer = "";
+                    if (pasted)
+                        insert(pasted, true);
+                    repaint();
+                }
+                else {
+                    bracketedPasteBuffer += chunk;
+                }
+            }
+            return true;
+        };
         const onKeypress = (str, key) => {
+            if (consumeBracketedPaste(str, key))
+                return;
             if (key && key.ctrl && key.name === "c") {
                 settle(new Error("interrupt"), true);
                 return;

package/package.json

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