agent.libx.js 0.94.22 → 0.94.23

package/dist/cli.js

@@ -7429,8 +7429,61 @@ function applyBidi(buf, cursor) {
   return { text: out.join("\n"), cursor: visCursor };
 }
 
+// cli/stdinSource.ts
+import { PassThrough } from "stream";
+var cancelPump;
+var keyInput = (() => {
+  const bun = globalThis.Bun;
+  if (!bun || !process.stdin.isTTY) return process.stdin;
+  const pt = new PassThrough();
+  pt.isTTY = true;
+  pt.setRawMode = (mode) => {
+    process.stdin.setRawMode(mode);
+    return pt;
+  };
+  Object.defineProperty(pt, "isRaw", { get: () => process.stdin.isRaw });
+  let pump = () => {
+    pump = void 0;
+    const reader = bun.stdin.stream().getReader();
+    let stopped = false;
+    cancelPump = () => {
+      stopped = true;
+      void reader.cancel().catch(() => {
+      });
+    };
+    void (async () => {
+      try {
+        while (!stopped) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          if (value?.length) pt.write(Buffer.from(value));
+        }
+      } catch {
+      }
+      pt.end();
+    })();
+  };
+  const ptResume = pt.resume.bind(pt);
+  pt.resume = () => {
+    pump?.();
+    return ptResume();
+  };
+  return pt;
+})();
+function releaseKeyInput() {
+  cancelPump?.();
+}
+
 // cli/lineEditor.ts
-var visibleWidth = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
+var cpWidth = (cp) => {
+  if (cp === 8205 || cp === 65039 || cp >= 768 && cp <= 879) return 0;
+  return cp >= 4352 && (cp <= 4447 || cp === 9001 || cp === 9002 || cp >= 11904 && cp <= 42191 && cp !== 12351 || cp >= 44032 && cp <= 55203 || cp >= 63744 && cp <= 64255 || cp >= 65072 && cp <= 65103 || cp >= 65280 && cp <= 65376 || cp >= 65504 && cp <= 65510 || cp >= 126976 && cp <= 129791 || cp >= 131072 && cp <= 262141) ? 2 : 1;
+};
+var visibleWidth = (s) => {
+  let w = 0;
+  for (const ch of s.replace(/\x1b\[[0-9;]*m/g, "")) w += cpWidth(ch.codePointAt(0));
+  return w;
+};
 var isPrintable = (str) => !!str && !/[\x00-\x1f\x7f]/.test(str);
 var EditorState = class _EditorState {
   // pending operator awaiting a motion (dd/dw/cc)
@@ -7564,6 +7617,17 @@ var EditorState = class _EditorState {
     this.histIdx = -1;
     this.refresh();
   }
+  // Code-point boundaries: cursor/delete ops must never split a surrogate pair (emoji = 2 code units;
+  // a half-pair in the buffer reaches the model as mojibake). Steps are by code POINT (lean — ZWJ
+  // families delete component-wise, which even many terminals do).
+  prevCp(i) {
+    if (i >= 2 && /[\uDC00-\uDFFF]/.test(this.buf[i - 1]) && /[\uD800-\uDBFF]/.test(this.buf[i - 2])) return i - 2;
+    return Math.max(0, i - 1);
+  }
+  nextCp(i) {
+    if (i <= this.buf.length - 2 && /[\uD800-\uDBFF]/.test(this.buf[i]) && /[\uDC00-\uDFFF]/.test(this.buf[i + 1])) return i + 2;
+    return Math.min(this.buf.length, i + 1);
+  }
   insert(s) {
     this.snapshot();
     this.buf = this.buf.slice(0, this.cursor) + s + this.buf.slice(this.cursor);
@@ -7574,22 +7638,23 @@ var EditorState = class _EditorState {
   backspace() {
     if (this.cursor === 0) return;
     this.snapshot();
-    this.buf = this.buf.slice(0, this.cursor - 1) + this.buf.slice(this.cursor);
-    this.cursor--;
+    const start = this.prevCp(this.cursor);
+    this.buf = this.buf.slice(0, start) + this.buf.slice(this.cursor);
+    this.cursor = start;
     this.histIdx = -1;
     this.refresh();
   }
   del() {
     if (this.cursor >= this.buf.length) return;
     this.snapshot();
-    this.buf = this.buf.slice(0, this.cursor) + this.buf.slice(this.cursor + 1);
+    this.buf = this.buf.slice(0, this.cursor) + this.buf.slice(this.nextCp(this.cursor));
     this.refresh();
   }
   left() {
-    if (this.cursor > 0) this.cursor--;
+    if (this.cursor > 0) this.cursor = this.prevCp(this.cursor);
   }
   right() {
-    if (this.cursor < this.buf.length) this.cursor++;
+    if (this.cursor < this.buf.length) this.cursor = this.nextCp(this.cursor);
   }
   home() {
     this.cursor = 0;
@@ -8080,9 +8145,9 @@ function createLineEditor(out) {
     curRow = 0;
     if (opts.initial) s.insert(opts.initial);
     s.refresh();
-    emitKeypressEvents(process.stdin);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
+    emitKeypressEvents(keyInput);
+    keyInput.setRawMode(true);
+    keyInput.resume();
     out.write("\x1B[?2004h");
     const promptOf = () => typeof opts.prompt === "function" ? opts.prompt() : opts.prompt;
     render(s, promptOf(), maxVisible, opts.status);
@@ -8152,9 +8217,9 @@ function createLineEditor(out) {
           return;
         }
         if (key?.meta && key.name === "p" && opts.onPickModel) {
-          process.stdin.off("keypress", onKey);
+          keyInput.off("keypress", onKey);
           void opts.onPickModel().finally(() => {
-            process.stdin.on("keypress", onKey);
+            keyInput.on("keypress", onKey);
             curRow = 0;
             redraw();
           });
@@ -8163,6 +8228,7 @@ function createLineEditor(out) {
         const action = applyKey(s, key ?? {}, str);
         if (action === "submit") {
           finish();
+          opts.onSubmit?.();
           return resolve4(s.expand());
         }
         if (action === "eof") {
@@ -8190,15 +8256,14 @@ function createLineEditor(out) {
         activeRedraw = void 0;
         activeAbort = void 0;
         if (ticker) clearInterval(ticker);
-        process.stdin.off("keypress", onKey);
+        keyInput.off("keypress", onKey);
         process.removeListener("SIGWINCH", onResize);
-        out.write("\x1B[?2004l");
         s.closeMenu();
         s.end();
         render(s, promptOf(), maxVisible);
         out.write("\r\n");
       };
-      process.stdin.on("keypress", onKey);
+      keyInput.on("keypress", onKey);
     });
   }
   return {
@@ -8220,6 +8285,8 @@ function createLineEditor(out) {
     abort: () => activeAbort?.()
   };
 }
+var menusOpen = 0;
+var isMenuActive = () => menusOpen > 0;
 function selectMenu(out, opts) {
   if (!out.isTTY || !process.stdin.isTTY || !opts.items.length) return Promise.resolve(null);
   const maxVisible = opts.maxVisible ?? 10;
@@ -8278,18 +8345,20 @@ function selectMenu(out, opts) {
     prevLines++;
   };
   return new Promise((resolve4) => {
-    const wasRaw = !!process.stdin.isRaw;
-    emitKeypressEvents(process.stdin);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
+    const wasRaw = !!keyInput.isRaw;
+    menusOpen++;
+    emitKeypressEvents(keyInput);
+    keyInput.setRawMode(true);
+    keyInput.resume();
     draw();
     const finish = (val) => {
-      process.stdin.off("keypress", onKey);
+      menusOpen--;
+      keyInput.off("keypress", onKey);
       if (prevLines > 1) out.write(`\x1B[${prevLines - 1}A`);
       out.write("\r\x1B[J");
       if (!wasRaw) {
         try {
-          process.stdin.setRawMode(false);
+          keyInput.setRawMode(false);
         } catch {
         }
       }
@@ -8352,7 +8421,7 @@ function selectMenu(out, opts) {
         draw();
       }
     };
-    process.stdin.on("keypress", onKey);
+    keyInput.on("keypress", onKey);
   });
 }
 var INPUT_MODES = [
@@ -8372,26 +8441,35 @@ function wrapLayout(promptW, buf, cursor, cols) {
     rows.push(line);
     line = "";
   };
-  for (let i = 0; i <= buf.length; i++) {
+  for (let i = 0; i <= buf.length; ) {
+    const cp = i < buf.length ? buf.codePointAt(i) : -1;
+    const ch = cp >= 0 ? String.fromCodePoint(cp) : "";
+    const w = ch && ch !== "\n" ? cpWidth(cp) : 0;
+    if (w === 2 && col + w > width && col > 0) {
+      pushRow();
+      r++;
+      col = 0;
+    }
     if (i === cursor) {
       cursorRow = r;
       cursorCol = col;
     }
     if (i === buf.length) break;
-    const ch = buf[i];
     if (ch === "\n") {
       pushRow();
       r++;
       col = 0;
+      i++;
       continue;
     }
     line += ch;
-    col++;
+    col += w;
     if (col >= width) {
       pushRow();
       r++;
       col = 0;
     }
+    i += ch.length;
   }
   pushRow();
   return { rows, cursorRow, cursorCol };
@@ -8639,12 +8717,19 @@ var spinner = /* @__PURE__ */ (() => {
   return {
     /** Anchor for the elapsed counter; runTurn sets it once per turn so tool-call stop/start cycles don't reset it. */
     turnStart: 0,
+    /** Mid-turn type-ahead, rendered as the frame's tail — the spinner repaints its row every 90ms,
+     *  so the typed text must live INSIDE the frame or it gets erased on the next tick. */
+    tail: void 0,
+    get active() {
+      return !!timer;
+    },
     start(label = "thinking\u2026") {
       if (!tty || timer) return;
       t0 = this.turnStart || Date.now();
       timer = setInterval(() => {
         const secs = Math.round((Date.now() - t0) / 1e3);
-        err("\r\x1B[2K" + dim(`  ${frames[i = (i + 1) % frames.length]} ${label} ${secs ? `${secs}s \xB7 ` : ""}esc to interrupt`));
+        const tail = this.tail?.();
+        err("\r\x1B[2K" + dim(`  ${frames[i = (i + 1) % frames.length]} ${label} ${secs ? `${secs}s \xB7 ` : ""}esc to interrupt`) + (tail ? "  " + tail : ""));
       }, 90);
     },
     stop() {
@@ -8662,7 +8747,9 @@ var setTermTitle = (t) => {
 var activeTurn = null;
 var exitRequested = false;
 var inputStash = [];
-var stashBuf = "";
+var stashEd = null;
+var stashText = () => stashEd?.buf ?? "";
+var dispatchPending = false;
 var latestTodos = [];
 function numFlag(raw, flag) {
   const n = Number(raw);
@@ -8919,7 +9006,7 @@ function makeHost(format = "text", opts) {
     async confirm(prompt) {
       const v = await selectMenu(process.stderr, { title: `? ${prompt}`, items: [{ label: "Yes", value: "y" }, { label: "No", value: "n" }], current: "n" });
       if (v !== null) return v === "y";
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         return /^y(es)?$/i.test((await io.question(yellow(`  ? ${prompt} [y/N] `))).trim());
       } finally {
@@ -8930,7 +9017,7 @@ function makeHost(format = "text", opts) {
       const title = `? ${q2.header ? "[" + q2.header + "] " : ""}${q2.question}`;
       const v = await selectMenu(process.stderr, { title, items: q2.options.map((o) => ({ label: o.label, value: o.label, desc: o.description })) });
       if (v !== null) return v;
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         const lines = [yellow("  " + title)];
         q2.options.forEach((o, i) => lines.push(`     ${i + 1}) ${o.label}${o.description ? dim(" \u2014 " + o.description) : ""}`));
@@ -9247,7 +9334,7 @@ function makeAskResolver(cwd) {
       current: "allow"
     });
     if (v === null) {
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         return { decision: /^y(es)?$/i.test((await io.question(yellow(`  ? Allow ${call.name}${tgt}? [y/N] `))).trim()) ? "allow" : "deny" };
       } finally {
@@ -9732,7 +9819,7 @@ async function repl(args, ai, cfg, cwd) {
           editorRef?.suspend();
           voiceEcho(e.message);
           return;
-        } else if (e.kind === "text_delta" && stashBuf) {
+        } else if (e.kind === "text_delta" && stashText()) {
           process.stdout.write("\r\x1B[K");
           base.notify(e);
           repaintStash();
@@ -10764,7 +10851,7 @@ ${extra}` : body);
         if (a[0] === "new") {
           let name = a[1];
           if (!name) {
-            const io = createInterface({ input: process.stdin, output: process.stderr });
+            const io = createInterface({ input: keyInput, output: process.stderr });
             try {
               name = (await io.question(yellow("  agent name: "))).trim();
             } finally {
@@ -11004,7 +11091,7 @@ ${extra}` : body);
         }
         a = [picked];
         if (picked === "add") {
-          const io = createInterface({ input: process.stdin, output: process.stderr });
+          const io = createInterface({ input: keyInput, output: process.stderr });
           try {
             const name = (await io.question(yellow("  name: "))).trim();
             const target = (await io.question(yellow("  command or url: "))).trim();
@@ -11141,30 +11228,36 @@ ${extra}` : body);
   editorRef = editor;
   let aborting = false;
   let pendingRewind = false;
+  const classifyPaste = pastePathClassifier(cwd);
   if (process.stdin.isTTY) {
-    const renderStashBuf = () => {
-      if (!stashBuf) return;
+    const sEd = new EditorState(() => ({ hits: [], token: "" }), [], classifyPaste, grabClipboardAttachment);
+    stashEd = sEd;
+    const inverse = (x) => `\x1B[7m${x}\x1B[0m`;
+    const stashView = () => {
+      const v = sEd.buf.replace(/\n/g, "\u23CE");
+      const c = Math.min(sEd.cursor, v.length);
+      const at = c < v.length ? String.fromCodePoint(v.codePointAt(c)) : " ";
       const q2 = inputStash.length ? dim(` [${inputStash.length} queued]`) : "";
-      err(`\r\x1B[K${dim("  stash \u203A ")}${stashBuf}${q2}`);
+      return `${dim("\u203A ")}${v.slice(0, c)}${inverse(at)}${v.slice(c + at.length)}${q2}`;
+    };
+    spinner.tail = () => sEd.buf ? stashView() : "";
+    const renderStashBuf = () => {
+      if (spinner.active) return;
+      err(`\r\x1B[K${sEd.buf ? "  " + stashView() : ""}`);
     };
     repaintStash = renderStashBuf;
-    process.stdin.on("keypress", (_s, key) => {
-      if (!activeTurn) return;
+    keyInput.on("keypress", (_s, key) => {
+      if (isMenuActive()) return;
+      if (!activeTurn && !dispatchPending) return;
       if (key?.ctrl && key?.name === "o") {
         toggleVerbose();
         return;
       }
       const k = key?.name;
-      const cancel = k === "escape" || key?.ctrl && k === "c";
-      if (cancel) {
-        if (stashBuf) {
-          stashBuf = "";
-          err("\r\x1B[K");
-          return;
-        }
+      if (!sEd.pasting && (k === "escape" || key?.ctrl && k === "c")) {
         if (!aborting) {
           aborting = true;
-          activeTurn.abort();
+          activeTurn?.abort();
           voiceIO?.interrupt();
           err(yellow("\n  \u238B cancelling\u2026") + dim(" (Ctrl-C again to force-quit)\n"));
           setTimeout(() => {
@@ -11179,35 +11272,29 @@ ${extra}` : body);
         }
         return;
       }
-      if (k === "return" || k === "enter") {
-        if (stashBuf.trim()) {
-          inputStash.push(stashBuf.trim());
-          err(`\r\x1B[K${green("  \u2713 stashed")} ${dim(`#${inputStash.length}: ${stashBuf.trim().slice(0, 50)}${stashBuf.trim().length > 50 ? "\u2026" : ""}`)}
+      const action = applyKey(sEd, key ?? {}, _s);
+      if (action === "submit") {
+        const text = sEd.expand().trim();
+        sEd.reset();
+        if (text) {
+          inputStash.push(text);
+          const view = text.replace(/\n+/g, " \u23CE ");
+          err(`\r\x1B[K${green("  \u2713 stashed")} ${dim(`#${inputStash.length}: ${view.slice(0, 50)}${view.length > 50 ? "\u2026" : ""}`)}
 `);
         }
-        stashBuf = "";
-        return;
-      }
-      if (k === "backspace") {
-        if (stashBuf.length) {
-          stashBuf = stashBuf.slice(0, -1);
-          if (stashBuf) renderStashBuf();
-          else err("\r\x1B[K");
-        }
-        return;
-      }
-      if (!key?.ctrl && !key?.meta && isPrintable(_s)) {
-        stashBuf += _s;
-        renderStashBuf();
         return;
       }
+      if (sEd.pasting) return;
+      if (action === "eof" || action === "rewind") return;
+      renderStashBuf();
     });
   }
   const promptStr = bold(cyan("agentx \u203A "));
   const contPrompt = dim("  \u2026 \u203A ");
-  const classifyPaste = pastePathClassifier(cwd);
   const releaseStdin = () => {
+    releaseKeyInput();
     if (process.stdin.isTTY) {
+      err("\x1B[?2004l");
       try {
         process.stdin.setRawMode(false);
       } catch {
@@ -11218,6 +11305,7 @@ ${extra}` : body);
   let prefill;
   let tick = 0;
   const dispatchLine = async (line) => {
+    if (/^[!#/]/.test(line)) dispatchPending = false;
     history.unshift(line.replace(/\n+/g, " \u23CE "));
     remember(line.replace(/\n+/g, " \u23CE "));
     if (line.startsWith("!")) {
@@ -11372,8 +11460,8 @@ ${extra}` : body);
       if (t !== void 0) prefill = t;
     }
     aborting = false;
-    const carry = stashBuf;
-    stashBuf = "";
+    const carry = stashText() ? stashEd.expand() : "";
+    stashEd?.reset();
     err("\n");
     const initial = prefill ?? (carry || void 0);
     prefill = void 0;
@@ -11428,6 +11516,10 @@ ${extra}` : body);
       history,
       classifyPaste,
       onEmptyPaste: grabClipboardAttachment,
+      onSubmit: () => {
+        dispatchPending = true;
+      },
+      // claim keys buffered behind the Enter (turn isn't active yet)
       initial: cont ? void 0 : initial,
       status: computeFooter,
       vimMode: cfg.editorMode === "vim",
@@ -11478,7 +11570,8 @@ ${extra}` : body);
     let quit = await dispatchLine(line) === "quit";
     while (!quit && inputStash.length) {
       const next = inputStash.shift();
-      err(dim(`  \u23CE stashed \u203A ${next.slice(0, 60)}${next.length > 60 ? "\u2026" : ""}
+      const nview = next.replace(/\n+/g, " \u23CE ");
+      err(dim(`  \u23CE stashed \u203A ${nview.slice(0, 60)}${nview.length > 60 ? "\u2026" : ""}
 `));
       quit = await dispatchLine(next) === "quit";
     }
@@ -11488,6 +11581,7 @@ ${extra}` : body);
 `));
       await turn(prompt);
     }
+    dispatchPending = false;
     session.meta.scheduledJobs = scheduler.snapshot();
     try {
       store.save(session);
@@ -11524,11 +11618,11 @@ ${extra}` : body);
 `));
         onCtrlC();
       };
-      process.stdin.on("data", onByte);
+      keyInput.on("data", onByte);
       await Promise.race([dx.idle(), new Promise((res) => {
         onCtrlC = res;
       })]);
-      process.stdin.off("data", onByte);
+      keyInput.off("data", onByte);
       if (forced) {
         voiceIO?.stop();
         releaseStdin();