cherrypick-interactive 1.14.1 → 1.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.14.1",
+  "version": "1.14.3",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
   "bin": "cli.js",

package/src/tui/CommitList.js

@@ -1,4 +1,4 @@
-import { Box } from 'ink';
+import { Box, Text } from 'ink';
 import { html } from './html.js';
 import { CommitRow } from './CommitRow.js';
 
@@ -22,7 +22,7 @@ export function CommitList({ commits, selected, cursorIndex }) {
                 `,
             )}
             ${commits.length > maxVisible
-                ? html`<${Box}><${'Text'} color="dim">  ... ${commits.length - maxVisible} more (scroll with ↑↓)</${'Text'}></${Box}>`
+                ? html`<${Box}><${Text} color="dim">  ... ${commits.length - maxVisible} more (scroll with ↑↓)</${Text}></${Box}>`
                 : null}
         </${Box}>
     `;

package/src/tui/index.js

@@ -11,6 +11,14 @@ import { App } from './App.js';
  */
 export function renderCommitSelector(commits, gitRawFn, { devBranch, mainBranch, since }) {
     return new Promise((resolve) => {
+        let resolved = false;
+        const settle = (val) => {
+            if (!resolved) {
+                resolved = true;
+                resolve(val);
+            }
+        };
+
         const { unmount, waitUntilExit } = render(
             createElement(App, {
                 commits,
@@ -19,16 +27,25 @@ export function renderCommitSelector(commits, gitRawFn, { devBranch, mainBranch,
                 mainBranch,
                 since,
                 onDone: (selectedHashes) => {
-                    resolve(selectedHashes);
+                    settle(selectedHashes);
                 },
             }),
         );
 
         waitUntilExit().then(() => {
+            // Restore stdin so subsequent prompts (inquirer) work correctly.
+            // Ink pauses stdin on unmount which causes inquirer to immediately
+            // throw ExitPromptError ("Aborted by user").
+            if (process.stdin.isPaused()) {
+                process.stdin.resume();
+            }
             // Fallback: if exited without calling onDone, resolve with empty
-            resolve([]);
+            settle([]);
         }).catch(() => {
-            resolve([]);
+            if (process.stdin.isPaused()) {
+                process.stdin.resume();
+            }
+            settle([]);
         });
     });
 }