cherrypick-interactive 1.14.3 → 1.14.5

package/cli.js

@@ -1621,6 +1621,11 @@ async function main() {
         await deleteSession();
 
         log(chalk.green(`\n✅ Done on ${finalBranch}`));
+
+        // Allow process to exit naturally. stdin.ref() may have been called
+        // after ink unmount to keep inquirer prompts working; unref it now
+        // so the event loop can drain.
+        process.stdin.unref();
     } catch (e) {
         err(chalk.red(`\n❌ Error: ${e.message || e}`));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.14.3",
+  "version": "1.14.5",
   "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
@@ -33,18 +49,11 @@ export function renderCommitSelector(commits, gitRawFn, { devBranch, mainBranch,
         );
 
         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();
-            }
+            restoreStdin();
             // Fallback: if exited without calling onDone, resolve with empty
             settle([]);
         }).catch(() => {
-            if (process.stdin.isPaused()) {
-                process.stdin.resume();
-            }
+            restoreStdin();
             settle([]);
         });
     });