git-stack-cli 1.14.0 → 1.15.1

package/dist/cjs/index.cjs

@@ -17667,33 +17667,42 @@ function Parens(props) {
 
 function YesNoPrompt(props) {
     const [answer, set_answer] = reactExports.useState("");
+    const answered_ref = reactExports.useRef(false);
     useInput((input) => {
-        const inputLower = input.toLowerCase();
-        set_answer(inputLower);
-        switch (inputLower) {
+        // prevent answering multiple times
+        if (answered_ref.current) {
+            return;
+        }
+        const input_lower = input.toLowerCase();
+        let handler;
+        switch (input_lower) {
             case "n":
-                return props.onNo();
+                handler = props.onNo;
+                break;
             case "y":
-                return props.onYes();
+                handler = props.onYes;
+                break;
+        }
+        // handler if valid answer (y or n)
+        if (handler) {
+            answered_ref.current = true;
+            set_answer(input_lower);
+            handler();
         }
     });
-    // prettier-ignore
-    const y = reactExports.createElement(Text, { bold: true, color: colors.green }, "Y");
-    const n = reactExports.createElement(Text, { color: colors.red }, "n");
-    let choices;
-    switch (answer) {
-        case "y":
-            choices = y;
-            break;
-        case "n":
-            choices = n;
-            break;
-        default:
-            choices = (reactExports.createElement(reactExports.Fragment, null,
-                y,
-                reactExports.createElement(Text, null, "/"),
-                n));
-    }
+    const choices = (function get_choices() {
+        // prettier-ignore
+        const y = reactExports.createElement(Text, { bold: true, color: colors.green }, "Y");
+        const n = reactExports.createElement(Text, { color: colors.red }, "n");
+        switch (answer) {
+            case "y":
+                return y;
+            case "n":
+                return n;
+            default:
+                return reactExports.createElement(FormatText, { message: "{y}/{n}", values: { y, n } });
+        }
+    })();
     return (reactExports.createElement(Box, { flexDirection: "column" },
         reactExports.createElement(Box, { alignItems: "flex-end" },
             typeof props.message === "object" ? (props.message) : (reactExports.createElement(Text, { color: colors.yellow }, props.message)),
@@ -18487,15 +18496,41 @@ const immerImpl = (initializer) => (set, get, store) => {
 };
 const immer = immerImpl;
 
+async function sleep(time) {
+    return new Promise((resolve) => setTimeout(resolve, time));
+}
+
 function Exit(props) {
-    const actions = Store.useActions();
     reactExports.useEffect(() => {
-        if (props.clear) {
-            actions.clear();
+        // immediately handle exit on mount
+        handle_exit().catch((err) => {
+            // eslint-disable-next-line no-console
+            console.error(err);
+        });
+        async function handle_exit() {
+            const state = Store.getState();
+            const actions = state.actions;
+            actions.debug(`[Exit] handle_exit ${JSON.stringify(props)}`);
+            let exit_code = props.code;
+            // run abort_handler if it exists
+            if (state.abort_handler) {
+                exit_code = await state.abort_handler();
+            }
+            // restore git stash if necessary
+            if (state.is_dirty_check_stash) {
+                await cli("git stash pop");
+                actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
+            }
+            // ensure output has a chance to render
+            await sleep(1);
+            // finally handle the actual app and process exit
+            if (props.clear) {
+                actions.clear();
+            }
+            actions.unmount();
+            process.exitCode = exit_code;
+            process.exit();
         }
-        actions.unmount();
-        process.exitCode = props.code;
-        process.exit();
     }, [props.clear, props.code]);
     return null;
 }
@@ -26194,7 +26229,11 @@ function friendlyDateTime(dateTimeish) {
 }
 
 function LogTimestamp() {
-    return (reactExports.createElement(Text, { dimColor: true }, DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] ")));
+    return reactExports.createElement(Text, { dimColor: true }, DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] "));
+}
+
+function pretty_json(input) {
+    return JSON.stringify(input, null, 2);
 }
 
 const BaseStore = createStore()(immer((set, get) => ({
@@ -26214,6 +26253,9 @@ const BaseStore = createStore()(immer((set, get) => ({
     pr_templates: [],
     pr_template_body: null,
     sync_github: null,
+    is_dirty_check_stash: false,
+    abort_handler: null,
+    is_exiting: false,
     step: "loading",
     output: [],
     pending_output: {},
@@ -26221,6 +26263,7 @@ const BaseStore = createStore()(immer((set, get) => ({
     actions: {
         exit(code, clear = true) {
             set((state) => {
+                state.is_exiting = true;
                 const node = reactExports.createElement(Exit, { clear: clear, code: code });
                 state.mutate.output(state, { node });
             });
@@ -26239,7 +26282,7 @@ const BaseStore = createStore()(immer((set, get) => ({
         },
         json(value) {
             set((state) => {
-                const node = JSON.stringify(value, null, 2);
+                const node = pretty_json(value);
                 state.mutate.output(state, { node });
             });
         },
@@ -26276,6 +26319,16 @@ const BaseStore = createStore()(immer((set, get) => ({
                 state.pr = {};
             });
         },
+        register_abort_handler(abort_handler) {
+            set((state) => {
+                state.abort_handler = abort_handler;
+            });
+        },
+        unregister_abort_handler() {
+            set((state) => {
+                state.abort_handler = null;
+            });
+        },
         set(setter) {
             set((state) => {
                 setter(state);
@@ -26561,10 +26614,6 @@ function semver_compare(version_a, version_b) {
     return 0;
 }
 
-async function sleep(time) {
-    return new Promise((resolve) => setTimeout(resolve, time));
-}
-
 function reducer$4(state, patch) {
     return { ...state, ...patch };
 }
@@ -26596,9 +26645,7 @@ function AutoUpdate(props) {
             if (props_ref.current.verbose) {
                 handle_output(reactExports.createElement(Text, { key: "init" }, "Checking for latest version..."));
             }
-            const timeout_ms = is_finite_value(props.timeoutMs)
-                ? props.timeoutMs
-                : 2 * 1000;
+            const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
             const npm_json = await Promise.race([
                 fetch_json(`https://registry.npmjs.org/${props.name}`),
                 sleep(timeout_ms).then(() => {
@@ -26659,8 +26706,8 @@ function AutoUpdate(props) {
             case "prompt":
                 return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Text, { color: colors.yellow }, "New version available, would you like to update?"), onYes: async () => {
                         handle_output(reactExports.createElement(FormatText, { key: "install", wrapper: reactExports.createElement(Text, null), message: "Installing {name}@{version}...", values: {
-                                name: (reactExports.createElement(Text, { color: colors.yellow }, props.name)),
-                                version: (reactExports.createElement(Text, { color: colors.blue }, state.latest_version)),
+                                name: reactExports.createElement(Text, { color: colors.yellow }, props.name),
+                                version: reactExports.createElement(Text, { color: colors.blue }, state.latest_version),
                             } }));
                         patch({ status: "install" });
                         await cli(`npm install -g ${props.name}@latest`);
@@ -26898,7 +26945,7 @@ function Debug() {
             const output_file = path.join(state.cwd, "git-stack-state.json");
             await safe_rm(output_file);
             const serialized = serialize(state);
-            const content = JSON.stringify(serialized, null, 2);
+            const content = pretty_json(serialized);
             await fs$1.writeFile(output_file, content);
         }
     }, [argv, state]);
@@ -29807,22 +29854,25 @@ async function pr_create(args) {
 }
 async function pr_edit(args) {
     const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
+    let body_file;
     if (args.body) {
-        const body_file = await write_body_file(args);
+        body_file = await write_body_file(args);
         command_parts.push(`--body-file="${body_file}"`);
     }
     const cli_result = await cli(command_parts);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
     }
+    // cleanup body_file
+    if (body_file) {
+        await safe_rm(body_file);
+    }
 }
 async function pr_draft(args) {
     // https://cli.github.com/manual/gh_api
     // https://docs.github.com/en/graphql/reference/mutations#convertpullrequesttodraft
     // https://docs.github.com/en/graphql/reference/mutations#markpullrequestreadyforreview
-    const mutation_name = args.draft
-        ? "convertPullRequestToDraft"
-        : "markPullRequestReadyForReview";
+    const mutation_name = args.draft ? "convertPullRequestToDraft" : "markPullRequestReadyForReview";
     let query = `
     mutation($id: ID!) {
       ${mutation_name}(input: { pullRequestId: $id }) {
@@ -29841,9 +29891,7 @@ async function pr_draft(args) {
     const state = Store.getState();
     const cache_pr = state.pr[args.branch];
     invariant(cache_pr, "cache_pr must exist");
-    const command_parts = [
-        `gh api graphql -F id="${cache_pr.id}" -f query='${query}'`,
-    ];
+    const command_parts = [`gh api graphql -F id="${cache_pr.id}" -f query='${query}'`];
     const command = command_parts.join(" ");
     const cli_result = await cli(command);
     if (cli_result.code !== 0) {
@@ -30186,6 +30234,8 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
     // change to pipe to see output temporarily
     // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
     await cli(command, { stdio: ["ignore", "ignore", "ignore"] });
+    // cleanup tmp_git_sequence_editor_path
+    await safe_rm(tmp_git_sequence_editor_path);
 };
 
 function reducer$2(state, patch) {
@@ -30301,20 +30351,28 @@ function DirtyCheck(props) {
     switch (state.status) {
         case "done":
             return props.children;
+        case "stash":
+            return (reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDCE6 Stashing uncommitted changes\u2026" }));
         case "prompt":
-            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Box, { flexDirection: "column" },
-                    reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{git} repo has uncommitted changes.", values: {
-                            git: reactExports.createElement(Command, null, "git"),
-                            git_stack: reactExports.createElement(Command, null, "git stack"),
-                        } }),
-                    reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "Changes may be lost during {git_stack}, are you sure you want to proceed?", values: {
-                            git: reactExports.createElement(Command, null, "git"),
-                            git_stack: reactExports.createElement(Command, null, "git stack"),
-                        } })), onYes: async () => {
-                    patch({ status: "done" });
-                }, onNo: async () => {
-                    actions.exit(0);
-                } }));
+            return (reactExports.createElement(Box, { flexDirection: "column" },
+                reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\u26A0\uFE0F Uncommitted changes detected. {git_stack} needs a clean working tree.", values: {
+                        git: reactExports.createElement(Command, null, "git"),
+                        git_stack: reactExports.createElement(Command, null, "git stack"),
+                    } }),
+                reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{git_stash} changes to proceed?", values: {
+                            git_stash: reactExports.createElement(Command, null, "git stash"),
+                        } }), onYes: async () => {
+                        patch({ status: "stash" });
+                        await cli("git stash --include-untracked");
+                        actions.output(reactExports.createElement(Text, { color: colors.yellow },
+                            reactExports.createElement(FormatText, { message: "\uD83D\uDCE6 Changes saved to stash" })));
+                        actions.set((state) => {
+                            state.is_dirty_check_stash = true;
+                        });
+                        patch({ status: "done" });
+                    }, onNo: async () => {
+                        actions.exit(0);
+                    } })));
         default:
             return (reactExports.createElement(Await, { function: run, fallback: reactExports.createElement(Text, { color: colors.yellow },
                     "Ensuring ",
@@ -30325,8 +30383,12 @@ function DirtyCheck(props) {
         const actions = Store.getState().actions;
         try {
             const git_dirty = (await cli(`git status --porcelain`)).stdout;
-            const status = git_dirty ? "prompt" : "done";
-            patch({ status });
+            if (!git_dirty) {
+                patch({ status: "done" });
+            }
+            else {
+                patch({ status: "prompt" });
+            }
         }
         catch (err) {
             actions.error("Must be run from within a git repository.");
@@ -30341,7 +30403,7 @@ function DirtyCheck(props) {
 }
 
 function GatherMetadata(props) {
-    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information\u2026"));
+    const fallback = reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information\u2026");
     return (reactExports.createElement(Await, { fallback: fallback, function: run$a }, props.children));
 }
 async function run$a() {
@@ -30383,8 +30445,7 @@ async function run$a() {
             return;
         }
         const head = (await cli("git rev-parse HEAD")).stdout;
-        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
-            .stdout;
+        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
         // handle when there are no detected changes
         if (head === merge_base) {
             actions.newline();
@@ -30476,9 +30537,29 @@ async function run$9() {
             reactExports.createElement(Text, { bold: true, color: colors.yellow }, time_until))));
 }
 
+function HandleCtrlCSigint() {
+    const actions = Store.useActions();
+    useInput((input, key) => {
+        handle_input().catch((err) => {
+            // eslint-disable-next-line no-console
+            console.error(err);
+        });
+        async function handle_input() {
+            if (input === "c" && key.ctrl) {
+                actions.clear();
+                actions.output(reactExports.createElement(Text, { color: colors.red },
+                    reactExports.createElement(FormatText, { message: "\uD83D\uDEA8 Ctrl+C detected" })));
+                await sleep(1);
+                actions.exit(235);
+            }
+        }
+    });
+    return null;
+}
+
 function LocalCommitStatus(props) {
     const argv = Store.useState((state) => state.argv);
-    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Fetching PR status from Github\u2026"));
+    const fallback = reactExports.createElement(Text, { color: colors.yellow }, "Fetching PR status from Github\u2026");
     if (argv["mock-metadata"]) {
         return (reactExports.createElement(Await, { fallback: fallback, function: mock_metadata }, props.children));
     }
@@ -30572,21 +30653,9 @@ function encode(value) {
 }
 
 function Rebase() {
-    const abort_handler = reactExports.useRef(() => { });
-    reactExports.useEffect(function listen_sigint() {
-        process.once("SIGINT", sigint_handler);
-        return function cleanup() {
-            process.removeListener("SIGINT", sigint_handler);
-        };
-        function sigint_handler() {
-            abort_handler.current();
-        }
-    }, []);
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: async function () {
-            await Rebase.run({ abort_handler });
-        } }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: Rebase.run }));
 }
-Rebase.run = async function run(args) {
+Rebase.run = async function run() {
     const state = Store.getState();
     const actions = state.actions;
     const branch_name = state.branch_name;
@@ -30597,11 +30666,12 @@ Rebase.run = async function run(args) {
     invariant(branch_name, "branch_name must exist");
     invariant(commit_range, "commit_range must exist");
     invariant(repo_root, "repo_root must exist");
-    // always listen for SIGINT event and restore git state
-    args.abort_handler.current = async function sigint_handler() {
+    // immediately register abort_handler in case of ctrl+c exit
+    actions.register_abort_handler(async function abort_rebase() {
         actions.output(reactExports.createElement(Text, { color: colors.red }, "\uD83D\uDEA8 Abort"));
-        handle_exit(19);
-    };
+        handle_exit();
+        return 19;
+    });
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
         // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
@@ -30652,6 +30722,7 @@ Rebase.run = async function run(args) {
                 branch_name: reactExports.createElement(Brackets, null, branch_name),
                 origin_branch: reactExports.createElement(Brackets, null, `origin/${master_branch}`),
             } }));
+        actions.unregister_abort_handler();
         actions.set((state) => {
             state.commit_range = next_commit_range;
             state.step = "status";
@@ -30664,7 +30735,8 @@ Rebase.run = async function run(args) {
                 actions.error(err.message);
             }
         }
-        handle_exit(20);
+        handle_exit();
+        actions.exit(20);
     }
     // cleanup git operations if cancelled during manual rebase
     function restore_git() {
@@ -30686,7 +30758,7 @@ Rebase.run = async function run(args) {
         }
         cli.sync(`pwd`, spawn_options);
     }
-    function handle_exit(code) {
+    function handle_exit() {
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restoring ",
             reactExports.createElement(Brackets, null, branch_name),
@@ -30696,7 +30768,6 @@ Rebase.run = async function run(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 };
 
@@ -30705,21 +30776,9 @@ function LocalMergeRebase() {
 }
 
 function ManualRebase() {
-    const abort_handler = reactExports.useRef(() => { });
-    reactExports.useEffect(function listen_sigint() {
-        process.once("SIGINT", sigint_handler);
-        return function cleanup() {
-            process.removeListener("SIGINT", sigint_handler);
-        };
-        async function sigint_handler() {
-            abort_handler.current();
-        }
-    }, []);
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: async function () {
-            await run$7({ abort_handler });
-        } }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$7 }));
 }
-async function run$7(args) {
+async function run$7() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -30731,16 +30790,16 @@ async function run$7(args) {
     invariant(branch_name, "branch_name must exist");
     invariant(commit_map, "commit_map must exist");
     invariant(repo_root, "repo_root must exist");
-    // always listen for SIGINT event and restore git state
-    args.abort_handler.current = function sigint_handler() {
+    // immediately register abort_handler in case of ctrl+c exit
+    actions.register_abort_handler(async function abort_manual_rebase() {
         actions.output(reactExports.createElement(Text, { color: colors.red }, "\uD83D\uDEA8 Abort"));
-        handle_exit(15);
-    };
+        handle_exit();
+        return 15;
+    });
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
         // get latest merge_base relative to local master
-        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
-            .stdout;
+        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
         // immediately paint all commit to preserve selected commit ranges
         let commit_range = await range(commit_map);
         // reverse group list to ensure we create git revise in correct order
@@ -30790,6 +30849,7 @@ async function run$7(args) {
         // of original branch to the newly created temporary branch
         await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
         restore_git();
+        actions.unregister_abort_handler();
         if (argv.sync) {
             actions.set((state) => {
                 state.step = "sync-github";
@@ -30810,7 +30870,8 @@ async function run$7(args) {
         if (!argv.verbose) {
             actions.error("Try again with `--verbose` to see more information.");
         }
-        handle_exit(16);
+        handle_exit();
+        actions.exit(16);
     }
     // cleanup git operations if cancelled during manual rebase
     function restore_git() {
@@ -30832,7 +30893,7 @@ async function run$7(args) {
         }
         cli.sync(`pwd`, spawn_options);
     }
-    function handle_exit(code) {
+    function handle_exit() {
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restoring ",
             reactExports.createElement(Brackets, null, branch_name),
@@ -30842,7 +30903,6 @@ async function run$7(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 }
 
@@ -31035,6 +31095,7 @@ async function run$6() {
     });
     actions.output(reactExports.createElement(StatusTable, null));
     actions.output(reactExports.createElement(Text, null, "\u2705 Everything up to date."));
+    actions.exit(0);
 }
 
 function PreLocalMergeRebase() {
@@ -31095,7 +31156,7 @@ async function run$5() {
         state.pr_templates = pr_templates;
         if (pr_templates.length > 0) {
             actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{count} queryable templates found under {dir}, but not supported.", values: {
-                    count: (reactExports.createElement(Text, { color: colors.blue }, pr_templates.length)),
+                    count: reactExports.createElement(Text, { color: colors.blue }, pr_templates.length),
                     dir: reactExports.createElement(Brackets, null, PR_TEMPLATE.TemplateDir("")),
                 } }));
         }
@@ -31757,21 +31818,9 @@ const RE = {
 };
 
 function SyncGithub() {
-    const abort_handler = reactExports.useRef(() => { });
-    reactExports.useEffect(function listen_sigint() {
-        process.once("SIGINT", sigint_handler);
-        return function cleanup() {
-            process.removeListener("SIGINT", sigint_handler);
-        };
-        function sigint_handler() {
-            abort_handler.current();
-        }
-    }, []);
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Syncing\u2026"), function: async function () {
-            await run$3({ abort_handler });
-        } }));
+    return reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Syncing\u2026"), function: run$3 });
 }
-async function run$3(args) {
+async function run$3() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -31786,11 +31835,12 @@ async function run$3(args) {
     invariant(sync_github, "sync_github must exist");
     const commit_range = sync_github.commit_range;
     const rebase_group_index = sync_github.rebase_group_index;
-    // always listen for SIGINT event and restore pr state
-    args.abort_handler.current = function sigint_handler() {
+    // immediately register abort_handler in case of ctrl+c exit
+    actions.register_abort_handler(async function abort_sync_github() {
         actions.output(reactExports.createElement(Text, { color: colors.red }, "\uD83D\uDEA8 Abort"));
-        handle_exit(17);
-    };
+        handle_exit();
+        return 17;
+    });
     let DEFAULT_PR_BODY = "";
     if (state.pr_template_body) {
         DEFAULT_PR_BODY = state.pr_template_body;
@@ -31859,6 +31909,7 @@ async function run$3(args) {
             update_pr_body_tasks.push(task);
         }
         await Promise.all(update_pr_body_tasks);
+        actions.unregister_abort_handler();
         actions.set((state) => {
             state.step = "post-rebase-status";
         });
@@ -31871,7 +31922,8 @@ async function run$3(args) {
         if (!argv.verbose) {
             actions.error("Try again with `--verbose` to see more information.");
         }
-        await handle_exit(18);
+        handle_exit();
+        actions.exit(18);
     }
     function get_push_group_list() {
         // start from HEAD and work backward to rebase_group_index
@@ -31980,7 +32032,7 @@ async function run$3(args) {
             });
         }
     }
-    function handle_exit(code) {
+    function handle_exit() {
         actions.output(reactExports.createElement(Text, { color: colors.yellow }, "Restoring PR state\u2026"));
         for (const group of push_group_list) {
             // we may temporarily mark PR as a draft before editing it
@@ -31996,7 +32048,6 @@ async function run$3(args) {
             }
         }
         actions.output(reactExports.createElement(Text, { color: colors.yellow }, "Restored PR state."));
-        actions.exit(code);
     }
 }
 const get_group_url = (group) => group.pr?.url || group.id;
@@ -32102,7 +32153,7 @@ function RebaseCheck(props) {
 }
 
 function VerboseDebugInfo(props) {
-    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Logging verbose debug information\u2026"));
+    const fallback = reactExports.createElement(Text, { color: colors.yellow }, "Logging verbose debug information\u2026");
     return (reactExports.createElement(Await, { fallback: fallback, function: run$2 }, props.children));
 }
 async function run$2() {
@@ -32165,8 +32216,7 @@ async function run$1() {
     // Calculate commit SHA based on the relative commit number
     const adjusted_number = Number(relative_number) - 1;
     // get the commit SHA of the target commit
-    const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`))
-        .stdout;
+    const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`)).stdout;
     actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDEE0\uFE0F fixup {relative_number} {commit_sha}", values: {
             commit_sha: reactExports.createElement(Parens, null, commit_sha),
             relative_number: relative_number,
@@ -32179,8 +32229,9 @@ async function run$1() {
     });
     if (diff_cmd.code) {
         save_stash = true;
-        await cli("git stash -q");
-        actions.output(reactExports.createElement(Text, null, "\uD83D\uDCE6 Changes saved to stash"));
+        await cli("git stash --include-untracked");
+        actions.output(reactExports.createElement(Text, { color: colors.yellow },
+            reactExports.createElement(FormatText, { message: "\uD83D\uDCE6 Changes saved to stash" })));
     }
     try {
         // rebase target needs to account for new commit created above
@@ -32199,7 +32250,7 @@ async function run$1() {
     }
     finally {
         if (save_stash) {
-            await cli("git stash pop -q");
+            await cli("git stash pop");
             actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
         }
     }
@@ -32233,13 +32284,7 @@ async function run(args) {
     // commit subject - 80 characters wide, truncated
     const subject_format = `%<(60,trunc)%s`;
     // combine all the above formats into one
-    const format = [
-        sha_format,
-        date_format,
-        author_format,
-        decoration_format,
-        subject_format,
-    ].join(" ");
+    const format = [sha_format, date_format, author_format, decoration_format, subject_format].join(" ");
     // view the SHA, description and history graph of last 20 commits
     const rest_args = process_argv.slice(3).join(" ");
     const command = [
@@ -32251,6 +32296,58 @@ async function run(args) {
     actions.output(result.stdout);
 }
 
+/* eslint-disable no-console */
+class ErrorBoundary extends reactExports.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            error: null,
+            component_stack: "",
+        };
+    }
+    static getDerivedStateFromError(error) {
+        return { error };
+    }
+    componentDidCatch(_error, error_info) {
+        let component_stack = error_info.componentStack;
+        if (component_stack) {
+            // remove first line of component_stack
+            component_stack = component_stack.split("\n").slice(1).join("\n");
+            this.setState({ component_stack });
+        }
+    }
+    render() {
+        if (!this.state.error) {
+            return this.props.children;
+        }
+        const message = this.state.error.message;
+        return (reactExports.createElement(Box, { flexDirection: "column", gap: 0 },
+            reactExports.createElement(Text, { color: colors.red },
+                reactExports.createElement(FormatText, { message: "\uD83D\uDEA8 Unhandled error {message}", values: {
+                        message: reactExports.createElement(Text, { color: colors.gray }, message),
+                    } })),
+            this._render_verbose()));
+    }
+    _render_verbose() {
+        const store_state = Store.getState();
+        if (store_state.argv.verbose) {
+            return reactExports.createElement(Text, { color: colors.gray }, this.state.component_stack);
+        }
+        return (reactExports.createElement(Text, { color: colors.gray },
+            reactExports.createElement(FormatText, { message: "Try again with `--verbose` to see more information." })));
+    }
+}
+
+function ExitingGate(props) {
+    const is_exiting = Store.useState((state) => state.is_exiting);
+    if (!is_exiting) {
+        return props.children;
+    }
+    return (reactExports.createElement(Box, { flexDirection: "column" },
+        reactExports.createElement(Text, { color: colors.red },
+            reactExports.createElement(FormatText, { message: "\uD83D\uDEA8 Exiting\u2026" }))));
+}
+
 function App() {
     const actions = Store.useActions();
     const ink = Store.useState((state) => state.ink);
@@ -32267,18 +32364,21 @@ function App() {
     //   </React.Fragment>
     // );
     return (reactExports.createElement(Providers, null,
-        reactExports.createElement(Debug, null),
-        reactExports.createElement(Output, null),
-        reactExports.createElement(AutoUpdate, { name: "git-stack-cli", verbose: argv.verbose || argv.update, timeoutMs: argv.update ? 30 * 1000 : 2 * 1000, onOutput: actions.output, onDone: () => {
-                if (argv.update) {
-                    actions.exit(0);
-                }
-            } },
-            reactExports.createElement(VerboseDebugInfo, null,
-                reactExports.createElement(DependencyCheck, null,
-                    reactExports.createElement(RebaseCheck, null,
-                        reactExports.createElement(CherryPickCheck, null,
-                            reactExports.createElement(MaybeMain, null))))))));
+        reactExports.createElement(ErrorBoundary, null,
+            reactExports.createElement(Debug, null),
+            reactExports.createElement(Output, null),
+            reactExports.createElement(ExitingGate, null,
+                reactExports.createElement(AutoUpdate, { name: "git-stack-cli", verbose: argv.verbose || argv.update, timeoutMs: argv.update ? 30 * 1000 : 2 * 1000, onOutput: actions.output, onDone: () => {
+                        if (argv.update) {
+                            actions.exit(0);
+                        }
+                    } },
+                    reactExports.createElement(VerboseDebugInfo, null,
+                        reactExports.createElement(DependencyCheck, null,
+                            reactExports.createElement(RebaseCheck, null,
+                                reactExports.createElement(CherryPickCheck, null,
+                                    reactExports.createElement(MaybeMain, null)))))),
+                reactExports.createElement(HandleCtrlCSigint, null)))));
 }
 function MaybeMain() {
     const argv = Store.useState((state) => state.argv);
@@ -32294,12 +32394,13 @@ function MaybeMain() {
             reactExports.createElement(LocalCommitStatus, null,
                 reactExports.createElement(Rebase, null))));
     }
-    return (reactExports.createElement(DirtyCheck, null,
+    return (reactExports.createElement(reactExports.Fragment, null,
         !argv.verbose ? null : reactExports.createElement(GithubApiError, null),
         reactExports.createElement(GatherMetadata, null,
-            reactExports.createElement(LocalCommitStatus, null,
-                reactExports.createElement(DetectInitialPR, null,
-                    reactExports.createElement(Main, null))))));
+            reactExports.createElement(DirtyCheck, null,
+                reactExports.createElement(LocalCommitStatus, null,
+                    reactExports.createElement(DetectInitialPR, null,
+                        reactExports.createElement(Main, null)))))));
 }
 
 const align = {
@@ -37620,10 +37721,9 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.14.0" )
+        .version("1.15.1" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
-        .help("help", "Show usage via `git stack help`")
-        .argv;
+        .help("help", "Show usage via `git stack help`").argv;
 }
 const GlobalOptions = {
     verbose: {
@@ -37708,22 +37808,52 @@ const FixupOptions = {
     },
 };
 
-command()
-    .then((argv) => {
-    const ink = render(reactExports.createElement(App, null), {
-    // If true, each update will be rendered as a separate output, without replacing the previous one.
-    // debug: true,
-    });
-    Store.setState((state) => {
-        state.ink = ink;
-        state.process_argv = process.argv;
-        state.argv = argv;
-        state.cwd = process.cwd();
-    });
-    Store.getState().actions.debug(JSON.stringify(argv, null, 2));
-})
-    // eslint-disable-next-line no-console
-    .catch(console.error);
+/* eslint-disable no-console */
+(async function main() {
+    try {
+        const argv = await command();
+        process.on("uncaughtException", (error) => {
+            console.error("🚨 uncaughtException");
+            console.error(error);
+            maybe_verbose_help();
+            process.exit(237);
+        });
+        process.on("unhandledRejection", (reason, _promise) => {
+            console.error("🚨 unhandledRejection");
+            console.error(reason);
+            maybe_verbose_help();
+            process.exit(238);
+        });
+        const ink = render(reactExports.createElement(App, null), {
+            // If true, each update will be rendered as a separate output, without replacing the previous one.
+            // debug: true,
+            //
+            // Configure whether Ink should listen to Ctrl+C keyboard input and exit the app.
+            // We intentionally handle this ourselves in `<Exit />`
+            exitOnCtrlC: false,
+        });
+        Store.setState((state) => {
+            state.ink = ink;
+            state.process_argv = process.argv;
+            state.argv = argv;
+            state.cwd = process.cwd();
+        });
+        Store.getState().actions.debug(pretty_json(argv));
+        await ink.waitUntilExit();
+        function maybe_verbose_help() {
+            if (!argv.verbose) {
+                console.error();
+                console.error("Try again with `--verbose` to see more information.");
+            }
+        }
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(236);
+    }
+})().catch((err) => {
+    console.error(err);
+});
 
 // prettier-ignore
 const METADATA = {