@pikaa-ai/pikaa 0.3.15 → 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.15",
+  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,21 +7071,21 @@ 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;
       let selectedIndex = 0;
       let scrollTop = 0;
-      let renderedMenuLines = 0;
       let popupDismissed = false;
+      let lastCursorRowFromTop = 0;
+      let unsubscribeKeypress = null;
       if (process.stdin.isTTY) {
         try {
           process.stdin.setRawMode(true);
@@ -7129,20 +7148,21 @@ class InteractiveLineEditor {
         if (scrollTop > maxScroll)
           scrollTop = maxScroll;
       };
-      const clearMenu = () => {
-        if (renderedMenuLines > 0) {
-          process.stdout.write("\x1B[J");
-          renderedMenuLines = 0;
-        }
-      };
       const redraw = () => {
-        process.stdout.write("\x1B[J");
-        process.stdout.write(`\r\x1B[2K${this.promptSymbol}${buffer}`);
+        const termCols = getTerminalCols();
+        const visiblePromptWidth = this.promptSymbol.replace(/\x1b\[[0-9;]*m/g, "").length;
+        if (lastCursorRowFromTop > 0) {
+          process.stdout.write(`\x1B[${lastCursorRowFromTop}A`);
+        }
+        process.stdout.write("\r\x1B[J");
+        process.stdout.write(`${this.promptSymbol}${buffer}`);
+        const totalPromptChars = visiblePromptWidth + buffer.length;
+        const promptRows = Math.max(1, Math.floor(totalPromptChars / termCols) + 1);
         const slashMatches = getMatchingCommands();
         const activeFile = getActiveFileQuery();
         const fileMatches = activeFile ? getMatchingFiles(activeFile.query) : [];
+        let menuRows = 0;
         if (buffer.startsWith("/") && !popupDismissed && slashMatches.length > 0) {
-          const termCols = getTerminalCols();
           const BOX_WIDTH = Math.max(20, Math.min(termCols - 4, 120));
           const maxVisible = Math.min(slashMatches.length, 7);
           ensureVisible(slashMatches.length, maxVisible);
@@ -7173,10 +7193,8 @@ class InteractiveLineEditor {
             process.stdout.write(`
 \x1B[2K${line}`);
           }
-          renderedMenuLines = menuLines.length;
-          process.stdout.write(`\x1B[${renderedMenuLines}A`);
+          menuRows = menuLines.length;
         } else if (activeFile && !popupDismissed && fileMatches.length > 0) {
-          const termCols = getTerminalCols();
           const BOX_WIDTH = Math.max(20, Math.min(termCols - 4, 120));
           const maxVisible = Math.min(fileMatches.length, 7);
           ensureVisible(fileMatches.length, maxVisible);
@@ -7212,8 +7230,7 @@ class InteractiveLineEditor {
             process.stdout.write(`
 \x1B[2K${line}`);
           }
-          renderedMenuLines = menuLines.length;
-          process.stdout.write(`\x1B[${renderedMenuLines}A`);
+          menuRows = menuLines.length;
         } else {
           const RULE_COLOR2 = "\x1B[38;2;60;60;68m";
           const bottomRule = `  ${RULE_COLOR2}${getRule()}\x1B[0m`;
@@ -7221,16 +7238,20 @@ class InteractiveLineEditor {
           process.stdout.write(`
 \x1B[2K${bottomRule}
 \x1B[2K${modeLine}`);
-          renderedMenuLines = 2;
-          process.stdout.write(`\x1B[2A`);
+          menuRows = 2;
+        }
+        const cursorCharsFromTop = visiblePromptWidth + cursor;
+        const cursorRow = Math.floor(cursorCharsFromTop / termCols);
+        const cursorCol = cursorCharsFromTop % termCols;
+        const moveUpRows = promptRows - 1 - cursorRow + menuRows;
+        if (moveUpRows > 0) {
+          process.stdout.write(`\x1B[${moveUpRows}A`);
         }
-        const visiblePromptLength = this.promptSymbol.replace(/\x1b\[[0-9;]*m/g, "").length;
-        const cursorCol = visiblePromptLength + cursor;
+        process.stdout.write("\r");
         if (cursorCol > 0) {
-          process.stdout.write(`\r\x1B[${cursorCol}C`);
-        } else {
-          process.stdout.write("\r");
+          process.stdout.write(`\x1B[${cursorCol}C`);
         }
+        lastCursorRowFromTop = cursorRow;
       };
       const onResize = () => {
         redraw();
@@ -7242,19 +7263,25 @@ class InteractiveLineEditor {
         if (process.stdout && typeof process.stdout.removeListener === "function") {
           process.stdout.removeListener("resize", onResize);
         }
-        clearMenu();
-        process.stdin.removeListener("keypress", onKeypress);
+        if (unsubscribeKeypress) {
+          unsubscribeKeypress();
+          unsubscribeKeypress = null;
+        }
         if (process.stdin.isTTY) {
           try {
             process.stdin.setRawMode(false);
           } catch {}
         }
+        if (lastCursorRowFromTop > 0) {
+          process.stdout.write(`\x1B[${lastCursorRowFromTop}A`);
+        }
+        process.stdout.write("\r\x1B[J");
         if (result.trim().length > 0 && !result.startsWith("/")) {
-          process.stdout.write(`\x1B[1A\r\x1B[2K\x1B[J${CliFormatter.formatClaudeUserPrompt(result)}
+          process.stdout.write(`${CliFormatter.formatClaudeUserPrompt(result)}
 
 `);
         } else {
-          process.stdout.write(`\x1B[1A\r\x1B[2K\x1B[J
+          process.stdout.write(`
 `);
         }
         resolve17(result);
@@ -7275,13 +7302,19 @@ class InteractiveLineEditor {
           if (process.stdout && typeof process.stdout.removeListener === "function") {
             process.stdout.removeListener("resize", onResize);
           }
-          clearMenu();
+          if (lastCursorRowFromTop > 0) {
+            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();
           }
@@ -7290,12 +7323,9 @@ class InteractiveLineEditor {
           process.exit(0);
         }
         if (key.name === "escape") {
-          if (renderedMenuLines > 0) {
-            popupDismissed = true;
-            clearMenu();
-            redraw();
-            return;
-          }
+          popupDismissed = true;
+          redraw();
+          return;
         }
         if (key.ctrl && key.name === "d") {
           cleanupAndResolve("/exit");
@@ -7423,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
@@ -7434,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 : "");
+        }
       });
     });
   }
@@ -7466,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);
@@ -7484,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 {}
@@ -7497,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") {
@@ -7568,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);
@@ -7577,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 {}
@@ -7637,7 +7660,7 @@ async function promptToolApproval(params) {
         return;
       }
     };
-    process.stdin.on("keypress", onKeypress);
+    unsubscribe = addGlobalKeypressListener(onKeypress);
     render();
   });
 }
@@ -7667,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();
@@ -7736,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);
@@ -7813,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`);
@@ -7820,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 {}
@@ -7889,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.15",
+  "version": "0.3.18",
   "description": "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",