@pikaa-ai/pikaa 0.3.15 → 0.3.16

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.16",
   description: "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   main: "./dist/index.js",
   module: "./dist/index.js",
@@ -7065,8 +7065,8 @@ class InteractiveLineEditor {
       let cursor = 0;
       let selectedIndex = 0;
       let scrollTop = 0;
-      let renderedMenuLines = 0;
       let popupDismissed = false;
+      let lastCursorRowFromTop = 0;
       if (process.stdin.isTTY) {
         try {
           process.stdin.setRawMode(true);
@@ -7129,20 +7129,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 +7174,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 +7211,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 +7219,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 +7244,22 @@ class InteractiveLineEditor {
         if (process.stdout && typeof process.stdout.removeListener === "function") {
           process.stdout.removeListener("resize", onResize);
         }
-        clearMenu();
         process.stdin.removeListener("keypress", onKeypress);
         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,7 +7280,10 @@ 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 (process.stdin.isTTY) {
             try {
               process.stdin.setRawMode(false);
@@ -7290,12 +7298,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");

package/package.json

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