cherrypick-interactive 1.14.2 → 1.14.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "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/index.js

@@ -2,6 +2,22 @@ import { render } from 'ink';
 import { createElement } from 'react';
 import { App } from './App.js';
 
+/**
+ * Restore process.stdin after ink unmount.
+ * Ink sets stdin.setRawMode(false) and stdin.unref() on cleanup (App.js),
+ * which causes subsequent inquirer prompts to immediately throw
+ * ExitPromptError ("Aborted by user") because the event loop stops
+ * waiting for stdin input.
+ */
+function restoreStdin() {
+    const { stdin } = process;
+    if (typeof stdin.setRawMode === 'function') {
+        stdin.setRawMode(false);
+    }
+    stdin.resume();
+    stdin.ref();
+}
+
 /**
  * Render the TUI commit selector.
  * @param {Array<{hash: string, subject: string}>} commits
@@ -11,6 +27,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 +43,18 @@ export function renderCommitSelector(commits, gitRawFn, { devBranch, mainBranch,
                 mainBranch,
                 since,
                 onDone: (selectedHashes) => {
-                    resolve(selectedHashes);
+                    settle(selectedHashes);
                 },
             }),
         );
 
         waitUntilExit().then(() => {
+            restoreStdin();
             // Fallback: if exited without calling onDone, resolve with empty
-            resolve([]);
+            settle([]);
         }).catch(() => {
-            resolve([]);
+            restoreStdin();
+            settle([]);
         });
     });
 }