@pikaa-ai/pikaa 0.3.16 → 0.3.18

package/dist/cli.js

@@ -6429,7 +6429,7 @@ function parsePatch(oldSrc, newSrc, contextLines = 3) {
 // package.json
 var package_default = {
   name: "@pikaa-ai/pikaa",
-  version: "0.3.16",
+  version: "0.3.18",
   description: "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   main: "./dist/index.js",
   module: "./dist/index.js",
@@ -6986,12 +6986,23 @@ ${preview}${more}`);
 }
 
 // src/cli/ui/line-editor.ts
+import readline2 from "readline";
+
+// src/cli/ui/keypress.ts
 import readline from "readline";
 var keypressEventsInitialized = false;
-function ensureKeypressInitialized() {
+var listeners = new Set;
+function initGlobalKeypress() {
   if (!keypressEventsInitialized && process.stdin.isTTY) {
     readline.emitKeypressEvents(process.stdin);
     keypressEventsInitialized = true;
+    process.stdin.on("keypress", (str, key) => {
+      for (const listener of Array.from(listeners)) {
+        try {
+          listener(str, key);
+        } catch {}
+      }
+    });
     process.on("exit", () => {
       if (process.stdin.isTTY) {
         try {
@@ -7001,7 +7012,15 @@ function ensureKeypressInitialized() {
     });
   }
 }
+function addGlobalKeypressListener(listener) {
+  initGlobalKeypress();
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
 
+// src/cli/ui/line-editor.ts
 class InteractiveLineEditor {
   promptSymbol;
   cwd;
@@ -7052,14 +7071,13 @@ class InteractiveLineEditor {
   async readLine() {
     if (!process.stdin.isTTY) {
       return new Promise((resolve17) => {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
         rl.question(this.promptSymbol, (answer) => {
           rl.close();
           resolve17(answer);
         });
       });
     }
-    ensureKeypressInitialized();
     return new Promise((resolve17) => {
       let buffer = "";
       let cursor = 0;
@@ -7067,6 +7085,7 @@ class InteractiveLineEditor {
       let scrollTop = 0;
       let popupDismissed = false;
       let lastCursorRowFromTop = 0;
+      let unsubscribeKeypress = null;
       if (process.stdin.isTTY) {
         try {
           process.stdin.setRawMode(true);
@@ -7244,7 +7263,10 @@ class InteractiveLineEditor {
         if (process.stdout && typeof process.stdout.removeListener === "function") {
           process.stdout.removeListener("resize", onResize);
         }
-        process.stdin.removeListener("keypress", onKeypress);
+        if (unsubscribeKeypress) {
+          unsubscribeKeypress();
+          unsubscribeKeypress = null;
+        }
         if (process.stdin.isTTY) {
           try {
             process.stdin.setRawMode(false);
@@ -7284,12 +7306,15 @@ class InteractiveLineEditor {
             process.stdout.write(`\x1B[${lastCursorRowFromTop}A`);
           }
           process.stdout.write("\r\x1B[J");
+          if (unsubscribeKeypress) {
+            unsubscribeKeypress();
+            unsubscribeKeypress = null;
+          }
           if (process.stdin.isTTY) {
             try {
               process.stdin.setRawMode(false);
             } catch {}
           }
-          process.stdin.removeListener("keypress", onKeypress);
           if (this.onInterrupt) {
             this.onInterrupt();
           }
@@ -7428,7 +7453,7 @@ class InteractiveLineEditor {
           redraw();
         }
       };
-      process.stdin.on("keypress", onKeypress);
+      unsubscribeKeypress = addGlobalKeypressListener(onKeypress);
       const RULE_COLOR = "\x1B[38;2;60;60;68m";
       process.stdout.write(`
   ${RULE_COLOR}${getRule()}\x1B[0m
@@ -7439,31 +7464,27 @@ class InteractiveLineEditor {
 }
 
 // src/cli/ui/prompt.ts
-import readline2 from "readline";
+import readline3 from "readline";
 async function promptChoice(config) {
   const { message, choices, defaultIndex = 0 } = config;
   if (!process.stdin.isTTY) {
     if (!process.stdin.readable) {
-      return choices[defaultIndex]?.value ?? choices[0].value;
+      const def = choices[defaultIndex] || choices[0];
+      return def ? def.value : "";
     }
     return new Promise((resolve17) => {
-      const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
-      const hint = choices.map((c3) => c3.isDefault ? `[${c3.key.toUpperCase()}]` : `[${c3.key}]`).join("/");
-      let resolved = false;
-      const doResolve = (val) => {
-        if (!resolved) {
-          resolved = true;
-          rl.close();
-          resolve17(val);
-        }
-      };
-      rl.question(`${message} ${hint}: `, (answer) => {
+      const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
+      const promptText = `  ${message} (${choices.map((c3) => `[${c3.key}] ${c3.label}`).join(", ")}): `;
+      rl.question(promptText, (answer) => {
+        rl.close();
         const trimmed = answer.trim().toLowerCase();
-        const matched = choices.find((c3) => c3.key.toLowerCase() === trimmed);
-        doResolve(matched ? matched.value : choices[defaultIndex].value);
-      });
-      rl.on("close", () => {
-        doResolve(choices[defaultIndex].value);
+        const match = choices.find((c3) => c3.key.toLowerCase() === trimmed);
+        if (match) {
+          resolve17(match.value);
+        } else {
+          const def = choices[defaultIndex] || choices[0];
+          resolve17(def ? def.value : "");
+        }
       });
     });
   }
@@ -7471,7 +7492,6 @@ async function promptChoice(config) {
     let selectedIndex = defaultIndex;
     if (selectedIndex < 0 || selectedIndex >= choices.length)
       selectedIndex = 0;
-    readline2.emitKeypressEvents(process.stdin);
     const wasRaw = process.stdin.isRaw;
     try {
       process.stdin.setRawMode(true);
@@ -7489,8 +7509,12 @@ async function promptChoice(config) {
       process.stdout.write(`\r\x1B[2K  ${style.bold(message)}
 \r\x1B[2K${parts.join("  ")}`);
     };
+    let unsubscribe = null;
     const cleanup = (confirmedChoice) => {
-      process.stdin.removeListener("keypress", onKeypress);
+      if (unsubscribe) {
+        unsubscribe();
+        unsubscribe = null;
+      }
       try {
         process.stdin.setRawMode(wasRaw ?? false);
       } catch {}
@@ -7502,21 +7526,12 @@ async function promptChoice(config) {
       if (!key)
         return;
       if (key.ctrl && key.name === "c") {
-        cleanup(choices.find((c3) => c3.key.toLowerCase() === "n") || choices[defaultIndex]);
+        const def = choices[defaultIndex] || choices[0];
+        cleanup(def);
         return;
       }
-      if (key.name === "escape") {
-        cleanup(choices.find((c3) => c3.key.toLowerCase() === "n") || choices[defaultIndex]);
-        return;
-      }
-      if (key.name === "return" || key.name === "enter") {
-        cleanup(choices[selectedIndex]);
-        return;
-      }
-      if (key.name === "left") {
+      if (key.name === "left" || key.name === "up" || key.name === "h" || key.name === "k") {
         selectedIndex = (selectedIndex - 1 + choices.length) % choices.length;
-        process.stdout.write("\x1B[1A");
-        render();
         return;
       }
       if (key.name === "right" || key.name === "tab") {
@@ -7573,7 +7588,6 @@ async function promptToolApproval(params) {
   }
   return new Promise((resolve17) => {
     let selectedIndex = 1;
-    readline2.emitKeypressEvents(process.stdin);
     const wasRaw = process.stdin.isRaw;
     try {
       process.stdin.setRawMode(true);
@@ -7582,8 +7596,12 @@ async function promptToolApproval(params) {
     const render = () => {
       renderCard(selectedIndex);
     };
+    let unsubscribe = null;
     const cleanup = (val) => {
-      process.stdin.removeListener("keypress", onKeypress);
+      if (unsubscribe) {
+        unsubscribe();
+        unsubscribe = null;
+      }
       try {
         process.stdin.setRawMode(wasRaw ?? false);
       } catch {}
@@ -7642,7 +7660,7 @@ async function promptToolApproval(params) {
         return;
       }
     };
-    process.stdin.on("keypress", onKeypress);
+    unsubscribe = addGlobalKeypressListener(onKeypress);
     render();
   });
 }
@@ -7672,7 +7690,7 @@ async function promptUserQuestion(params) {
     return options[0] || "yes";
   }
   return new Promise((resolve17) => {
-    const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+    const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
     const promptLabel = options.length > 0 ? `Select [1-${options.length}] or type custom response: ` : `Your response: `;
     rl.question(`  ${style.bold(promptLabel)}`, (answer) => {
       rl.close();
@@ -7741,7 +7759,6 @@ async function promptInteractiveList(config) {
     let selectedIndex = Math.max(0, Math.min(defaultIndex, items.length - 1));
     let scrollTop = 0;
     let renderedLines = 0;
-    readline2.emitKeypressEvents(process.stdin);
     const wasRaw = process.stdin.isRaw;
     try {
       process.stdin.setRawMode(true);
@@ -7818,6 +7835,7 @@ async function promptInteractiveList(config) {
       process.stdout.write(buffer);
       renderedLines = lines.length;
     };
+    let unsubscribe = null;
     const cleanup = (res) => {
       if (renderedLines > 0) {
         process.stdout.write(`\x1B[${renderedLines}A\r\x1B[J\x1B[?25h`);
@@ -7825,7 +7843,10 @@ async function promptInteractiveList(config) {
       } else {
         process.stdout.write("\x1B[?25h");
       }
-      process.stdin.removeListener("keypress", onKeypress);
+      if (unsubscribe) {
+        unsubscribe();
+        unsubscribe = null;
+      }
       try {
         process.stdin.setRawMode(wasRaw ?? false);
       } catch {}
@@ -7894,7 +7915,7 @@ async function promptInteractiveList(config) {
         render();
       }
     };
-    process.stdin.on("keypress", onKeypress);
+    unsubscribe = addGlobalKeypressListener(onKeypress);
     render();
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikaa-ai/pikaa",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",