@tritard/waterbrother 0.14.1 → 0.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "Waterbrother: Grok-powered coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -4704,29 +4704,74 @@ async function readInteractiveLine(options = {}) {
       }
     }
 
+    // Track whether keypress handler processed the last data chunk
+    let keypressHandled = false;
+    const origOnKeypress = onKeypress;
+    onKeypress = function (str, key) {
+      keypressHandled = true;
+      origOnKeypress(str, key);
+    };
+
     function onData(chunk) {
       if (settled) return;
       const text = String(chunk || "");
       if (!text) return;
-      const normalized = normalizePastedChunk(text);
-      const looksLikeBracketedPaste = text.includes("\x1b[200~") || text.includes("\x1b[201~");
-      const looksLikePastedBlock =
-        looksLikeBracketedPaste ||
-        (normalized.length > 1 && normalized.includes("\n") && /[^\n]/.test(normalized));
-
-      if (!looksLikePastedBlock) {
-        return;
-      }
 
-      if (normalized) {
-        buffer += normalized;
-        selectedIndex = 0;
-        render();
-      }
+      // Give keypress handler a chance to fire first (it's synchronous)
+      keypressHandled = false;
+      // readline.emitKeypressEvents will fire onKeypress synchronously before onData returns
+      // on some platforms. Set a microtask to check if keypress handled it.
+      Promise.resolve().then(() => {
+        if (keypressHandled || settled) return;
+
+        // Keypress didn't fire — handle raw data as fallback
+        const normalized = normalizePastedChunk(text);
+        const looksLikeBracketedPaste = text.includes("\x1b[200~") || text.includes("\x1b[201~");
+        const looksLikePastedBlock =
+          looksLikeBracketedPaste ||
+          (normalized.length > 1 && normalized.includes("\n") && /[^\n]/.test(normalized));
+
+        if (looksLikePastedBlock) {
+          if (normalized) {
+            buffer += normalized;
+            selectedIndex = 0;
+            render();
+          }
+          ignoredPastePrintable += [...normalized].filter((char) => char !== "\n").length;
+          ignoredPasteEnters += (normalized.match(/\n/g) || []).length;
+          pasteSuppressUntil = Date.now() + 300;
+          return;
+        }
 
-      ignoredPastePrintable += [...normalized].filter((char) => char !== "\n").length;
-      ignoredPasteEnters += (normalized.match(/\n/g) || []).length;
-      pasteSuppressUntil = Date.now() + 300;
+        // Single character fallback — keypress emitter failed to fire
+        for (const ch of text) {
+          if (ch === "\r" || ch === "\n") {
+            handleSubmit();
+            return;
+          }
+          if (ch === "\u0003") {
+            if (settled) return;
+            settled = true;
+            cleanup();
+            output.write("\n");
+            reject(new Error("Interrupted"));
+            return;
+          }
+          if (ch === "\u007f" || ch === "\b") {
+            if (buffer.length > 0) {
+              buffer = buffer.slice(0, -1);
+              selectedIndex = 0;
+              render();
+            }
+            continue;
+          }
+          if (ch.charCodeAt(0) < 32 || ch.charCodeAt(0) === 127) continue;
+          if (ch.includes("\x1b")) continue;
+          buffer += ch;
+          selectedIndex = 0;
+          render();
+        }
+      });
     }
 
     // Ensure stdin is in a clean state before attaching listeners.