git-stack-cli 1.14.0 → 1.15.0

package/dist/cjs/index.cjs

@@ -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]);
@@ -29807,14 +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 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
@@ -30186,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) {
@@ -30302,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 ",
@@ -30325,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.");
@@ -30476,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"));
@@ -30572,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;
@@ -30597,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)}`);
@@ -30652,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";
@@ -30664,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() {
@@ -30686,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),
@@ -30696,7 +30766,6 @@ Rebase.run = async function run(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 };
 
@@ -30705,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;
@@ -30731,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
@@ -30790,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";
@@ -30810,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() {
@@ -30832,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),
@@ -30842,7 +30902,6 @@ async function run$7(args) {
             "Restored ",
             reactExports.createElement(Brackets, null, branch_name),
             "."));
-        actions.exit(code);
     }
 }
 
@@ -31757,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;
@@ -31786,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;
@@ -31859,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";
         });
@@ -31871,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
@@ -31980,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
@@ -31996,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;
@@ -32179,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 {
@@ -32199,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"));
         }
     }
@@ -32278,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);
@@ -37620,7 +37670,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.14.0" )
+        .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;
@@ -37708,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 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/App.tsx

@@ -8,6 +8,7 @@ import { DetectInitialPR } from "~/app/DetectInitialPR";
 import { DirtyCheck } from "~/app/DirtyCheck";
 import { GatherMetadata } from "~/app/GatherMetadata";
 import { GithubApiError } from "~/app/GithubApiError";
+import { HandleCtrlCSigint } from "~/app/HandleCtrlCSigint";
 import { LocalCommitStatus } from "~/app/LocalCommitStatus";
 import { Main } from "~/app/Main";
 import { Output } from "~/app/Output";
@@ -65,6 +66,8 @@ export function App() {
           </DependencyCheck>
         </VerboseDebugInfo>
       </AutoUpdate>
+
+      <HandleCtrlCSigint />
     </Providers>
   );
 }

package/src/app/Debug.tsx

@@ -8,6 +8,7 @@ import * as Ink from "ink-cjs";
 import { Store } from "~/app/Store";
 import { colors } from "~/core/colors";
 import * as json from "~/core/json";
+import { pretty_json } from "~/core/pretty_json";
 import { safe_rm } from "~/core/safe_rm";
 
 export function Debug() {
@@ -41,7 +42,7 @@ export function Debug() {
         await safe_rm(output_file);
 
         const serialized = json.serialize(state);
-        const content = JSON.stringify(serialized, null, 2);
+        const content = pretty_json(serialized);
         await fs.writeFile(output_file, content);
       }
     },

package/src/app/DirtyCheck.tsx

@@ -15,7 +15,7 @@ type Props = {
 };
 
 type State = {
-  status: "init" | "prompt" | "done";
+  status: "init" | "prompt" | "stash" | "done";
 };
 
 function reducer(state: State, patch: Partial<State>) {
@@ -35,34 +35,42 @@ export function DirtyCheck(props: Props) {
 
     case "prompt":
       return (
-        <YesNoPrompt
-          message={
-            <Ink.Box flexDirection="column">
-              <FormatText
-                wrapper={<Ink.Text color={colors.yellow} />}
-                message="{git} repo has uncommitted changes."
-                values={{
-                  git: <Command>git</Command>,
-                  git_stack: <Command>git stack</Command>,
-                }}
-              />
+        <Ink.Box flexDirection="column">
+          <FormatText
+            wrapper={<Ink.Text color={colors.yellow} />}
+            message="⚠️ Uncommitted changes detected. {git_stack} needs a clean working tree."
+            values={{
+              git: <Command>git</Command>,
+              git_stack: <Command>git stack</Command>,
+            }}
+          />
+
+          <YesNoPrompt
+            message={
               <FormatText
                 wrapper={<Ink.Text color={colors.yellow} />}
-                message="Changes may be lost during {git_stack}, are you sure you want to proceed?"
+                message="{git_stash} changes to proceed?"
                 values={{
-                  git: <Command>git</Command>,
-                  git_stack: <Command>git stack</Command>,
+                  git_stash: <Command>git stash</Command>,
                 }}
               />
-            </Ink.Box>
-          }
-          onYes={async () => {
-            patch({ status: "done" });
-          }}
-          onNo={async () => {
-            actions.exit(0);
-          }}
-        />
+            }
+            onYes={async () => {
+              await cli("git stash --include-untracked");
+
+              actions.output(<Ink.Text>📦 Changes saved to stash</Ink.Text>);
+
+              actions.set((state) => {
+                state.is_dirty_check_stash = true;
+              });
+
+              patch({ status: "done" });
+            }}
+            onNo={async () => {
+              actions.exit(0);
+            }}
+          />
+        </Ink.Box>
       );
 
     default:
@@ -84,8 +92,11 @@ export function DirtyCheck(props: Props) {
     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.");
 

package/src/app/Exit.tsx

@@ -1,6 +1,11 @@
 import * as React from "react";
 
+import * as Ink from "ink-cjs";
+
 import { Store } from "~/app/Store";
+import { cli } from "~/core/cli";
+import { colors } from "~/core/colors";
+import { sleep } from "~/core/sleep";
 
 type Props = {
   clear: boolean;
@@ -8,17 +13,49 @@ type Props = {
 };
 
 export function Exit(props: Props) {
-  const actions = Store.useActions();
-
   React.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;
 
-    actions.unmount();
+      // run abort_handler if it exists
+      if (state.abort_handler) {
+        exit_code = await state.abort_handler();
+      }
 
-    process.exitCode = props.code;
-    process.exit();
+      // restore git stash if necessary
+      if (state.is_dirty_check_stash) {
+        await cli("git stash pop");
+        actions.output(
+          <Ink.Text color={colors.green}>
+            ✅ Changes restored from stash
+          </Ink.Text>
+        );
+      }
+
+      // 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();
+    }
   }, [props.clear, props.code]);
 
   return null;

package/src/app/HandleCtrlCSigint.tsx

@@ -0,0 +1,47 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { FormatText } from "~/app/FormatText";
+import { Store } from "~/app/Store";
+import { colors } from "~/core/colors";
+import { sleep } from "~/core/sleep";
+
+export function HandleCtrlCSigint() {
+  const actions = Store.useActions();
+
+  const [exiting, set_exiting] = React.useState(false);
+
+  Ink.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(
+          <Ink.Text color={colors.red}>
+            <FormatText message="🚨 Ctrl+C detected" />
+          </Ink.Text>
+        );
+
+        set_exiting(true);
+        await sleep(1);
+        actions.exit(235);
+      }
+    }
+  });
+
+  if (exiting) {
+    return (
+      <Ink.Text color={colors.red}>
+        <FormatText message="🚨 Exiting…" />
+      </Ink.Text>
+    );
+  }
+
+  return null;
+}

package/src/app/ManualRebase.tsx

@@ -15,35 +15,15 @@ import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
 export function ManualRebase() {
-  const abort_handler = React.useRef(() => {});
-
-  React.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 (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={async function () {
-        await run({ abort_handler });
-      }}
+      function={run}
     />
   );
 }
 
-type Args = {
-  abort_handler: React.MutableRefObject<() => void>;
-};
-
-async function run(args: Args) {
+async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -57,11 +37,12 @@ async function run(args: Args) {
   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(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit(15);
-  };
+    handle_exit();
+    return 15;
+  });
 
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
@@ -137,6 +118,8 @@ async function run(args: Args) {
 
     restore_git();
 
+    actions.unregister_abort_handler();
+
     if (argv.sync) {
       actions.set((state) => {
         state.step = "sync-github";
@@ -157,7 +140,8 @@ async function run(args: Args) {
       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
@@ -185,7 +169,7 @@ async function run(args: Args) {
     cli.sync(`pwd`, spawn_options);
   }
 
-  function handle_exit(code: number) {
+  function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restoring <Brackets>{branch_name}</Brackets>…
@@ -199,7 +183,5 @@ async function run(args: Args) {
         Restored <Brackets>{branch_name}</Brackets>.
       </Ink.Text>
     );
-
-    actions.exit(code);
   }
 }

package/src/app/Store.tsx

@@ -7,6 +7,7 @@ import { immer } from "zustand/middleware/immer";
 import { Exit } from "~/app/Exit";
 import { LogTimestamp } from "~/app/LogTimestamp";
 import { colors } from "~/core/colors";
+import { pretty_json } from "~/core/pretty_json";
 
 import type { Instance as InkInstance } from "ink-cjs";
 import type { Argv } from "~/command";
@@ -29,6 +30,9 @@ type SyncGithubState = {
   rebase_group_index: number;
 };
 
+// async function that returns exit code
+type AbortHandler = () => Promise<number>;
+
 export type State = {
   // set immediately in `index.tsx` so no `null` scenario
   process_argv: Array<string>;
@@ -47,6 +51,8 @@ export type State = {
   pr_templates: Array<string>;
   pr_template_body: null | string;
   sync_github: null | SyncGithubState;
+  is_dirty_check_stash: boolean;
+  abort_handler: null | AbortHandler;
 
   step:
     | "github-api-error"
@@ -71,7 +77,7 @@ export type State = {
     clear(): void;
     unmount(): void;
     newline(): void;
-    json(value: object): void;
+    json(value: pretty_json.JSONValue): void;
     error(message: string): void;
     output(node: React.ReactNode): void;
     debug(node: React.ReactNode, id?: string): void;
@@ -79,6 +85,8 @@ export type State = {
     isDebug(): boolean;
 
     reset_pr(): void;
+    register_abort_handler(abort_handler: AbortHandler): void;
+    unregister_abort_handler(): void;
 
     set(setter: Setter): void;
   };
@@ -113,6 +121,8 @@ const BaseStore = createStore<State>()(
     pr_templates: [],
     pr_template_body: null,
     sync_github: null,
+    is_dirty_check_stash: false,
+    abort_handler: null,
 
     step: "loading",
 
@@ -146,7 +156,7 @@ const BaseStore = createStore<State>()(
 
       json(value) {
         set((state) => {
-          const node = JSON.stringify(value, null, 2);
+          const node = pretty_json(value);
           state.mutate.output(state, { node });
         });
       },
@@ -189,6 +199,18 @@ const BaseStore = createStore<State>()(
         });
       },
 
+      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);

package/src/app/SyncGithub.tsx

@@ -14,35 +14,15 @@ import { invariant } from "~/core/invariant";
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
 export function SyncGithub() {
-  const abort_handler = React.useRef(() => {});
-
-  React.useEffect(function listen_sigint() {
-    process.once("SIGINT", sigint_handler);
-
-    return function cleanup() {
-      process.removeListener("SIGINT", sigint_handler);
-    };
-
-    function sigint_handler() {
-      abort_handler.current();
-    }
-  }, []);
-
   return (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Syncing…</Ink.Text>}
-      function={async function () {
-        await run({ abort_handler });
-      }}
+      function={run}
     />
   );
 }
 
-type Args = {
-  abort_handler: React.MutableRefObject<() => void>;
-};
-
-async function run(args: Args) {
+async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -60,11 +40,12 @@ async function run(args: Args) {
   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(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit(17);
-  };
+    handle_exit();
+    return 17;
+  });
 
   let DEFAULT_PR_BODY = "";
   if (state.pr_template_body) {
@@ -151,6 +132,8 @@ async function run(args: Args) {
 
     await Promise.all(update_pr_body_tasks);
 
+    actions.unregister_abort_handler();
+
     actions.set((state) => {
       state.step = "post-rebase-status";
     });
@@ -164,7 +147,8 @@ async function run(args: Args) {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    await handle_exit(18);
+    handle_exit();
+    actions.exit(18);
   }
 
   function get_push_group_list() {
@@ -305,7 +289,7 @@ async function run(args: Args) {
     }
   }
 
-  function handle_exit(code: number) {
+  function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>
     );
@@ -329,8 +313,6 @@ async function run(args: Args) {
     actions.output(
       <Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>
     );
-
-    actions.exit(code);
   }
 }
 

package/src/commands/Fixup.tsx

@@ -97,7 +97,7 @@ async function run() {
   if (diff_cmd.code) {
     save_stash = true;
 
-    await cli("git stash -q");
+    await cli("git stash --include-untracked");
 
     actions.output(<Ink.Text>📦 Changes saved to stash</Ink.Text>);
   }
@@ -118,7 +118,7 @@ async function run() {
     await cli("git reset --soft HEAD~1");
   } finally {
     if (save_stash) {
-      await cli("git stash pop -q");
+      await cli("git stash pop");
 
       actions.output(
         <Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>

package/src/commands/Rebase.tsx

@@ -16,35 +16,15 @@ import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
 export function Rebase() {
-  const abort_handler = React.useRef(() => {});
-
-  React.useEffect(function listen_sigint() {
-    process.once("SIGINT", sigint_handler);
-
-    return function cleanup() {
-      process.removeListener("SIGINT", sigint_handler);
-    };
-
-    function sigint_handler() {
-      abort_handler.current();
-    }
-  }, []);
-
   return (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={async function () {
-        await Rebase.run({ abort_handler });
-      }}
+      function={Rebase.run}
     />
   );
 }
 
-type Args = {
-  abort_handler: React.MutableRefObject<() => void>;
-};
-
-Rebase.run = async function run(args: Args) {
+Rebase.run = async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -57,11 +37,12 @@ Rebase.run = async function run(args: Args) {
   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(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit(19);
-  };
+    handle_exit();
+    return 19;
+  });
 
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
@@ -153,6 +134,8 @@ Rebase.run = async function run(args: Args) {
       />
     );
 
+    actions.unregister_abort_handler();
+
     actions.set((state) => {
       state.commit_range = next_commit_range;
       state.step = "status";
@@ -166,7 +149,8 @@ Rebase.run = async function run(args: Args) {
       }
     }
 
-    handle_exit(20);
+    handle_exit();
+    actions.exit(20);
   }
 
   // cleanup git operations if cancelled during manual rebase
@@ -194,7 +178,7 @@ Rebase.run = async function run(args: Args) {
     cli.sync(`pwd`, spawn_options);
   }
 
-  function handle_exit(code: number) {
+  function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restoring <Brackets>{branch_name}</Brackets>…
@@ -208,7 +192,5 @@ Rebase.run = async function run(args: Args) {
         Restored <Brackets>{branch_name}</Brackets>.
       </Ink.Text>
     );
-
-    actions.exit(code);
   }
 };

package/src/core/GitReviseTodo.ts

@@ -5,6 +5,7 @@ import path from "node:path";
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
 import { invariant } from "~/core/invariant";
+import { safe_rm } from "~/core/safe_rm";
 
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
@@ -140,6 +141,9 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
   // 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);
 };
 
 type ExecuteArgs = {

package/src/core/github.tsx

@@ -161,8 +161,10 @@ type EditPullRequestArgs = {
 export async function pr_edit(args: EditPullRequestArgs) {
   const command_parts = [`gh pr edit ${args.branch} --base ${args.base}`];
 
+  let body_file: string | undefined;
+
   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}"`);
   }
 
@@ -171,6 +173,11 @@ export async function pr_edit(args: EditPullRequestArgs) {
   if (cli_result.code !== 0) {
     handle_error(cli_result.output);
   }
+
+  // cleanup body_file
+  if (body_file) {
+    await safe_rm(body_file);
+  }
 }
 
 type DraftPullRequestArgs = {

package/src/core/pretty_json.ts

@@ -0,0 +1,12 @@
+export namespace pretty_json {
+  export type JSONValue =
+    | null
+    | number
+    | string
+    | boolean
+    | { [key: string]: JSONValue };
+}
+
+export function pretty_json<T extends pretty_json.JSONValue>(input: T): string {
+  return JSON.stringify(input, null, 2);
+}

package/src/index.tsx

@@ -7,12 +7,19 @@ import * as Ink from "ink-cjs";
 import { App } from "~/app/App";
 import { Store } from "~/app/Store";
 import { command } from "~/command";
+import { pretty_json } from "~/core/pretty_json";
+
+(async function main() {
+  try {
+    const argv = await command();
 
-command()
-  .then((argv) => {
     const ink = Ink.render(<App />, {
       // 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) => {
@@ -22,7 +29,15 @@ command()
       state.cwd = process.cwd();
     });
 
-    Store.getState().actions.debug(JSON.stringify(argv, null, 2));
-  })
+    Store.getState().actions.debug(pretty_json(argv as any));
+
+    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);
+});