git-stack-cli 1.13.2 → 1.15.0

package/dist/cjs/index.cjs

@@ -14912,7 +14912,7 @@ var isSafeInteger = hasNativeIsSafeInteger
 // IE11 does not support y and u.
 var REGEX_SUPPORTS_U_AND_Y = true;
 try {
-    var re = RE$5('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu');
+    var re = RE$6('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu');
     /**
      * legacy Edge or Xbox One browser
      * Unicode flag support: supported
@@ -15009,14 +15009,14 @@ var trimEnd = hasTrimEnd
             return s.replace(SPACE_SEPARATOR_END_REGEX, '');
         };
 // Prevent minifier to translate new RegExp to literal form that might cause syntax error on IE11.
-function RE$5(s, flag) {
+function RE$6(s, flag) {
     return new RegExp(s, flag);
 }
 // #endregion
 var matchIdentifierAtIndex;
 if (REGEX_SUPPORTS_U_AND_Y) {
     // Native
-    var IDENTIFIER_PREFIX_RE_1 = RE$5('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu');
+    var IDENTIFIER_PREFIX_RE_1 = RE$6('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu');
     matchIdentifierAtIndex = function matchIdentifierAtIndex(s, index) {
         var _a;
         IDENTIFIER_PREFIX_RE_1.lastIndex = index;
@@ -18487,15 +18487,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;
 }
@@ -26197,6 +26223,10 @@ function LogTimestamp() {
     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) => ({
     // set immediately in `index.tsx` so no `null` scenario
     process_argv: [],
@@ -26214,6 +26244,8 @@ const BaseStore = createStore()(immer((set, get) => ({
     pr_templates: [],
     pr_template_body: null,
     sync_github: null,
+    is_dirty_check_stash: false,
+    abort_handler: null,
     step: "loading",
     output: [],
     pending_output: {},
@@ -26239,7 +26271,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 +26308,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 +26603,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 };
 }
@@ -26898,7 +26936,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]);
@@ -26941,15 +26979,15 @@ match_group.safe = (value, re, group) => {
 
 function auth_status(output) {
     let username;
-    username = match_group.safe(output, RE$4.logged_in_as, "username");
+    username = match_group.safe(output, RE$5.logged_in_as, "username");
     if (username)
         return username;
-    username = match_group.safe(output, RE$4.logged_in_account, "username");
+    username = match_group.safe(output, RE$5.logged_in_account, "username");
     if (username)
         return username;
     return null;
 }
-const RE$4 = {
+const RE$5 = {
     // Logged in to github.com as magus
     logged_in_as: /Logged in to github.com as (?<username>[^\s]+)/,
     logged_in_account: /Logged in to github.com account (?<username>[^\s]+)/,
@@ -29663,10 +29701,10 @@ var cloneDeep$1 = /*@__PURE__*/getDefaultExportFromCjs(cloneDeep_1);
 // escape double-quote for cli
 function safe_quote(value) {
     let result = value;
-    result = result.replace(RE$3.all_double_quote, '\\"');
+    result = result.replace(RE$4.all_double_quote, '\\"');
     return result;
 }
-const RE$3 = {
+const RE$4 = {
     all_double_quote: /"/g,
 };
 
@@ -29684,12 +29722,12 @@ function write$1(message, values) {
 }
 function read(message) {
     const values = { id: null, title: null };
-    const match_id = message.match(RE$2.stack_id);
+    const match_id = message.match(RE$3.stack_id);
     if (match_id?.groups) {
         values.id = match_id.groups["id"];
         invariant(values.id, "id must exist");
     }
-    const match_title = message.match(RE$2.group_title);
+    const match_title = message.match(RE$3.group_title);
     if (match_title?.groups) {
         values.title = match_title.groups["title"];
     }
@@ -29698,8 +29736,8 @@ function read(message) {
 function remove(message) {
     let result = message;
     // remove metadata
-    result = result.replace(new RegExp(RE$2.stack_id, "gmi"), "");
-    result = result.replace(new RegExp(RE$2.group_title, "gmi"), "");
+    result = result.replace(new RegExp(RE$3.stack_id, "gmi"), "");
+    result = result.replace(new RegExp(RE$3.group_title, "gmi"), "");
     result = result.trimEnd();
     return result;
 }
@@ -29711,7 +29749,7 @@ const TEMPLATE$1 = {
         return `git-stack-title: ${title}`;
     },
 };
-const RE$2 = {
+const RE$3 = {
     // https://regex101.com/r/wLmGVq/1
     stack_id: new RegExp(`${TEMPLATE$1.stack_id("(?<id>[^\\s]+)")}`, "i"),
     group_title: new RegExp(TEMPLATE$1.group_title("(?<title>[^\\n^\\r]+)"), "i"),
@@ -29788,11 +29826,17 @@ async function pr_create(args) {
     //   pull request create failed: GraphQL: Head sha can't be blank, Base sha can't be blank, No commits between gs-6LAx-On45 and origin/gs-ED2etrzv2, Head ref must be a branch (createPullRequest)
     //
     // https://github.com/cli/cli/issues/5465
-    let command = `gh pr create --head refs/heads/${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
+    let command_parts = [
+        "gh pr create",
+        `--head refs/heads/${args.branch}`,
+        `--base ${args.base}`,
+        `--title="${title}"`,
+        `--body="${args.body}"`,
+    ];
     if (args.draft) {
-        command += " --draft";
+        command_parts.push("--draft");
     }
-    const cli_result = await cli(command);
+    const cli_result = await cli(command_parts);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
         return null;
@@ -29801,15 +29845,19 @@ 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 command = command_parts.join(" ");
-    const cli_result = await cli(command);
+    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
@@ -29873,11 +29921,19 @@ function handle_error(output) {
 async function write_body_file(args) {
     invariant(args.body, "args.body must exist");
     const temp_dir = os.tmpdir();
-    const temp_path = path.join(temp_dir, `git-stack-body-${args.base}`);
+    // ensure unique filename is safe for filesystem
+    // base (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
+    // the flashes would mess up the filesystem path to this file
+    let temp_filename = `git-stack-body-${args.base}`;
+    temp_filename = temp_filename.replace(RE$2.non_alphanumeric_dash, "-");
+    const temp_path = path.join(temp_dir, temp_filename);
     await safe_rm(temp_path);
     await fs$1.writeFile(temp_path, args.body);
     return temp_path;
 }
+const RE$2 = {
+    non_alphanumeric_dash: /[^a-zA-Z0-9_-]+/g,
+};
 
 async function range(commit_group_map) {
     const master_branch = Store.getState().master_branch;
@@ -30173,6 +30229,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) {
@@ -30289,19 +30347,23 @@ function DirtyCheck(props) {
         case "done":
             return props.children;
         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 () => {
+                        await cli("git stash --include-untracked");
+                        actions.output(reactExports.createElement(Text, null, "\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 ",
@@ -30312,8 +30374,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.");
@@ -30463,6 +30529,32 @@ async function run$9() {
             reactExports.createElement(Text, { bold: true, color: colors.yellow }, time_until))));
 }
 
+function HandleCtrlCSigint() {
+    const actions = Store.useActions();
+    const [exiting, set_exiting] = reactExports.useState(false);
+    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" })));
+                set_exiting(true);
+                await sleep(1);
+                actions.exit(235);
+            }
+        }
+    });
+    if (exiting) {
+        return (reactExports.createElement(Text, { color: colors.red },
+            reactExports.createElement(FormatText, { message: "\uD83D\uDEA8 Exiting\u2026" })));
+    }
+    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"));
@@ -30559,21 +30651,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;
@@ -30584,11 +30664,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)}`);
@@ -30639,6 +30720,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";
@@ -30651,7 +30733,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() {
@@ -30673,7 +30756,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),
@@ -30683,7 +30766,6 @@ Rebase.run = async function run(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 };
 
@@ -30692,21 +30774,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;
@@ -30718,11 +30788,12 @@ 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
@@ -30777,6 +30848,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";
@@ -30797,7 +30869,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() {
@@ -30819,7 +30892,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),
@@ -30829,7 +30902,6 @@ async function run$7(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 }
 
@@ -31534,8 +31606,20 @@ function SelectCommitRangesInternal(props) {
             reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.gray }), message: "Press {enter} to toggle commit selection", values: {
                     enter: (reactExports.createElement(Text, { bold: true, color: colors.green }, SYMBOL.enter)),
                 } }))));
+    function get_group_id() {
+        let branch_prefix = "";
+        // branch prefix via cli flag or env var
+        // cli flag takes precedence since it is more explicit
+        if (argv["branch-prefix"]) {
+            branch_prefix = argv["branch-prefix"];
+        }
+        else if (process.env.GIT_STACK_BRANCH_PREFIX) {
+            branch_prefix = process.env.GIT_STACK_BRANCH_PREFIX;
+        }
+        return `${branch_prefix}${gs_short_id()}`;
+    }
     function submit_group_input(title) {
-        const id = gs_short_id();
+        const id = get_group_id();
         actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { dimColor: true }), message: "Created new group {group} {note}", values: {
                 group: reactExports.createElement(Brackets, null, title),
                 note: reactExports.createElement(Parens, null, id),
@@ -31732,21 +31816,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;
@@ -31761,11 +31833,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;
@@ -31834,6 +31907,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";
         });
@@ -31846,7 +31920,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
@@ -31955,7 +32030,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
@@ -31971,7 +32046,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;
@@ -32154,7 +32228,7 @@ async function run$1() {
     });
     if (diff_cmd.code) {
         save_stash = true;
-        await cli("git stash -q");
+        await cli("git stash --include-untracked");
         actions.output(reactExports.createElement(Text, null, "\uD83D\uDCE6 Changes saved to stash"));
     }
     try {
@@ -32174,7 +32248,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"));
         }
     }
@@ -32253,7 +32327,8 @@ function App() {
                 reactExports.createElement(DependencyCheck, null,
                     reactExports.createElement(RebaseCheck, null,
                         reactExports.createElement(CherryPickCheck, null,
-                            reactExports.createElement(MaybeMain, null))))))));
+                            reactExports.createElement(MaybeMain, null)))))),
+        reactExports.createElement(HandleCtrlCSigint, null)));
 }
 function MaybeMain() {
     const argv = Store.useState((state) => state.argv);
@@ -37595,7 +37670,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.13.2" )
+        .version("1.15.0" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`")
         .argv;
@@ -37649,17 +37724,22 @@ const DefaultOptions = {
         default: false,
         description: "Open all PRs as drafts",
     },
-    "write-state-json": {
-        hidden: true,
-        type: "boolean",
-        default: false,
-        description: "Write state to local json file for debugging",
+    "branch-prefix": {
+        type: "string",
+        default: "",
+        description: "Prefix for generated branch names, e.g. dev/magus/",
     },
     "template": {
         type: "boolean",
         default: true,
         description: "Use automatic Github PR template, e.g. .github/pull_request_template.md, disable with --no-template",
     },
+    "write-state-json": {
+        hidden: true,
+        type: "boolean",
+        default: false,
+        description: "Write state to local json file for debugging",
+    },
     "mock-metadata": {
         hidden: true,
         type: "boolean",
@@ -37678,22 +37758,35 @@ 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));
-})
+(async function main() {
+    try {
+        const argv = await command();
+        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();
+    }
+    catch (err) {
+        // eslint-disable-next-line no-console
+        console.error(err);
+        process.exit(235);
+    }
+})().catch((err) => {
     // eslint-disable-next-line no-console
-    .catch(console.error);
+    console.error(err);
+});
 
 // prettier-ignore
 const METADATA = {