git-stack-cli 1.14.0 → 1.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.14.0",
+  "version": "1.15.1",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -24,6 +24,7 @@
     "dev": "npm run build -- --watch",
     "build": "rollup -c rollup.config.js",
     "build:standalone": "GIT_STACK_STANDALONE=true bun run scripts/build-standalone.ts",
+    "link": "bun run scripts/link.ts",
     "release:npm": "bun run scripts/release-npm.ts",
     "release:github": "bun run scripts/release-github.ts",
     "release:brew": "bun run scripts/release-brew.ts",

package/scripts/link.ts

@@ -0,0 +1,14 @@
+import path from "node:path";
+
+import { spawn } from "~/core/spawn";
+
+const SCRIPT_DIR = import.meta.dir;
+const PROJECT_DIR = path.join(SCRIPT_DIR, "..");
+
+process.chdir(PROJECT_DIR);
+
+await spawn.sync("npm unlink git-stack-cli");
+await spawn.sync("npm link");
+
+console.debug();
+console.debug("✅", "linked");

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";
@@ -18,6 +19,8 @@ import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
 import { Rebase } from "~/commands/Rebase";
+import { ErrorBoundary } from "~/components/ErrorBoundary";
+import { ExitingGate } from "~/components/ExitingGate";
 
 export function App() {
   const actions = Store.useActions();
@@ -41,30 +44,36 @@ export function App() {
 
   return (
     <Providers>
-      <Debug />
-      <Output />
+      <ErrorBoundary>
+        <Debug />
+        <Output />
 
-      <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);
-          }
-        }}
-      >
-        <VerboseDebugInfo>
-          <DependencyCheck>
-            <RebaseCheck>
-              <CherryPickCheck>
-                <MaybeMain />
-              </CherryPickCheck>
-            </RebaseCheck>
-          </DependencyCheck>
-        </VerboseDebugInfo>
-      </AutoUpdate>
+        <ExitingGate>
+          <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);
+              }
+            }}
+          >
+            <VerboseDebugInfo>
+              <DependencyCheck>
+                <RebaseCheck>
+                  <CherryPickCheck>
+                    <MaybeMain />
+                  </CherryPickCheck>
+                </RebaseCheck>
+              </DependencyCheck>
+            </VerboseDebugInfo>
+          </AutoUpdate>
+
+          <HandleCtrlCSigint />
+        </ExitingGate>
+      </ErrorBoundary>
     </Providers>
   );
 }
@@ -88,16 +97,18 @@ function MaybeMain() {
   }
 
   return (
-    <DirtyCheck>
+    <React.Fragment>
       {!argv.verbose ? null : <GithubApiError />}
 
       <GatherMetadata>
-        <LocalCommitStatus>
-          <DetectInitialPR>
-            <Main />
-          </DetectInitialPR>
-        </LocalCommitStatus>
+        <DirtyCheck>
+          <LocalCommitStatus>
+            <DetectInitialPR>
+              <Main />
+            </DetectInitialPR>
+          </LocalCommitStatus>
+        </DirtyCheck>
       </GatherMetadata>
-    </DirtyCheck>
+    </React.Fragment>
   );
 }

package/src/app/AutoUpdate.tsx

@@ -67,14 +67,10 @@ export function AutoUpdate(props: Props) {
 
     async function auto_update() {
       if (props_ref.current.verbose) {
-        handle_output(
-          <Ink.Text key="init">Checking for latest version...</Ink.Text>
-        );
+        handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
       }
 
-      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}`),
@@ -94,12 +90,7 @@ export function AutoUpdate(props: Props) {
       const script_dir = path.dirname(script_path);
 
       // dist/ts/index.js
-      const package_json_path = path.join(
-        script_dir,
-        "..",
-        "..",
-        "package.json"
-      );
+      const package_json_path = path.join(script_dir, "..", "..", "package.json");
 
       type PackageJson = { version: string };
       const package_json = await read_json<PackageJson>(package_json_path);
@@ -121,7 +112,7 @@ export function AutoUpdate(props: Props) {
               latest_version: <Brackets>{latest_version}</Brackets>,
               local_version: <Brackets>{local_version}</Brackets>,
             }}
-          />
+          />,
         );
       }
 
@@ -134,7 +125,7 @@ export function AutoUpdate(props: Props) {
       if (semver_result === -1) {
         // latest version is less than or equal to local version, skip auto update
         throw new Error(
-          `latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`
+          `latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`,
         );
       }
 
@@ -156,7 +147,7 @@ export function AutoUpdate(props: Props) {
           handle_output(
             <Ink.Text key="error" color={colors.red}>
               {error?.message}
-            </Ink.Text>
+            </Ink.Text>,
           );
         }
       })
@@ -185,16 +176,10 @@ export function AutoUpdate(props: Props) {
                   wrapper={<Ink.Text />}
                   message="Installing {name}@{version}..."
                   values={{
-                    name: (
-                      <Ink.Text color={colors.yellow}>{props.name}</Ink.Text>
-                    ),
-                    version: (
-                      <Ink.Text color={colors.blue}>
-                        {state.latest_version}
-                      </Ink.Text>
-                    ),
+                    name: <Ink.Text color={colors.yellow}>{props.name}</Ink.Text>,
+                    version: <Ink.Text color={colors.blue}>{state.latest_version}</Ink.Text>,
                   }}
-                />
+                />,
               );
 
               patch({ status: "install" });

package/src/app/CherryPickCheck.tsx

@@ -40,8 +40,7 @@ export function CherryPickCheck(props: Props) {
         <YesNoPrompt
           message={
             <Ink.Text color={colors.yellow}>
-              <Command>git cherry-pick</Command> detected, would you like to
-              abort it?
+              <Command>git cherry-pick</Command> detected, would you like to abort it?
             </Ink.Text>
           }
           onYes={async () => {

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() {
@@ -19,12 +20,10 @@ export function Debug() {
   React.useEffect(
     function debugMessageOnce() {
       if (debug) {
-        actions.output(
-          <Ink.Text color={colors.yellow}>Debug mode enabled</Ink.Text>
-        );
+        actions.output(<Ink.Text color={colors.yellow}>Debug mode enabled</Ink.Text>);
       }
     },
-    [argv]
+    [argv],
   );
 
   React.useEffect(
@@ -41,11 +40,11 @@ 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);
       }
     },
-    [argv, state]
+    [argv, state],
   );
 
   return null;

package/src/app/DependencyCheck.tsx

@@ -55,7 +55,7 @@ function CheckGit(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>git</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.exit(2);
@@ -86,7 +86,7 @@ function CheckGithubCli(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>gh</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.output(
@@ -98,7 +98,7 @@ function CheckGithubCli(props: Props) {
 
               command: <Command>gh</Command>,
             }}
-          />
+          />,
         );
 
         actions.exit(3);
@@ -150,7 +150,7 @@ function CheckGithubCliAuth(props: Props) {
 
               command: <Command>gh auth login</Command>,
             }}
-          />
+          />,
         );
 
         actions.exit(4);
@@ -181,7 +181,7 @@ function CheckGitRevise(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>git revise</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.output(
@@ -199,7 +199,7 @@ function CheckGitRevise(props: Props) {
                 </Parens>
               ),
             }}
-          />
+          />,
         );
 
         actions.exit(10);

package/src/app/DetectInitialPR.tsx

@@ -97,11 +97,7 @@ export function DetectInitialPR(props: Props) {
       return (
         <Await
           function={run}
-          fallback={
-            <Ink.Text color={colors.yellow}>
-              Checking for existing PR on Github…
-            </Ink.Text>
-          }
+          fallback={<Ink.Text color={colors.yellow}>Checking for existing PR on Github…</Ink.Text>}
         />
       );
   }
@@ -167,9 +163,7 @@ export function DetectInitialPR(props: Props) {
     // get latest merge_base relative to local master
     const rebase_group_index = 0;
 
-    const rebase_merge_base = (
-      await cli(`git merge-base HEAD ${master_branch}`)
-    ).stdout;
+    const rebase_merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
     await GitReviseTodo.execute({
       rebase_group_index,

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>) {
@@ -33,36 +33,58 @@ export function DirtyCheck(props: Props) {
     case "done":
       return props.children;
 
+    case "stash":
+      return (
+        <FormatText
+          wrapper={<Ink.Text color={colors.yellow} />}
+          message="📦 Stashing uncommitted changes…"
+        />
+      );
+
     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 () => {
+              patch({ status: "stash" });
+
+              await cli("git stash --include-untracked");
+
+              actions.output(
+                <Ink.Text color={colors.yellow}>
+                  <FormatText message="📦 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 +106,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,45 @@ 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/FormatText.tsx

@@ -13,11 +13,7 @@ export function FormatText(props: Props) {
   const wrapper = (props.wrapper as React.ReactElement) || <Ink.Text />;
 
   return (
-    <FormattedMessage
-      id="FormatText"
-      defaultMessage={props.message}
-      values={props.values}
-    >
+    <FormattedMessage id="FormatText" defaultMessage={props.message} values={props.values}>
       {(chunks) => {
         return React.cloneElement(wrapper, {}, chunks);
       }}

package/src/app/GatherMetadata.tsx

@@ -15,9 +15,7 @@ type Props = {
 };
 
 export function GatherMetadata(props: Props) {
-  const fallback = (
-    <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>
-  );
+  const fallback = <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>;
 
   return (
     <Await fallback={fallback} function={run}>
@@ -41,14 +39,12 @@ async function run() {
           values={{
             branch: <Brackets>{argv.branch}</Brackets>,
           }}
-        />
+        />,
       );
 
       master_branch = argv.branch;
     } else {
-      const detect_master = await cli(
-        `git branch --list "${BRANCH.master}" --color=never`
-      );
+      const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
 
       if (detect_master.stdout !== "") {
         master_branch = BRANCH.master;
@@ -60,7 +56,7 @@ async function run() {
               master: <Brackets>{BRANCH.master}</Brackets>,
               main: <Brackets>{BRANCH.main}</Brackets>,
             }}
-          />
+          />,
         );
 
         master_branch = BRANCH.main;
@@ -84,15 +80,12 @@ async function run() {
     }
 
     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();
-      actions.output(
-        <Ink.Text color={colors.gray}>No changes detected.</Ink.Text>
-      );
+      actions.output(<Ink.Text color={colors.gray}>No changes detected.</Ink.Text>);
       actions.exit(0);
       return;
     }

package/src/app/GithubApiError.tsx

@@ -69,6 +69,6 @@ async function run() {
           {time_until}
         </Ink.Text>
       </Parens>
-    </Ink.Text>
+    </Ink.Text>,
   );
 }

package/src/app/HandleCtrlCSigint.tsx

@@ -0,0 +1,36 @@
+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();
+
+  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>,
+        );
+
+        await sleep(1);
+        actions.exit(235);
+      }
+    }
+  });
+
+  return null;
+}

package/src/app/LocalCommitStatus.tsx

@@ -15,9 +15,7 @@ type Props = {
 export function LocalCommitStatus(props: Props) {
   const argv = Store.useState((state) => state.argv);
 
-  const fallback = (
-    <Ink.Text color={colors.yellow}>Fetching PR status from Github…</Ink.Text>
-  );
+  const fallback = <Ink.Text color={colors.yellow}>Fetching PR status from Github…</Ink.Text>;
 
   if (argv["mock-metadata"]) {
     return (

package/src/app/LogTimestamp.tsx

@@ -4,9 +4,5 @@ import * as Ink from "ink-cjs";
 import { DateTime } from "luxon";
 
 export function LogTimestamp() {
-  return (
-    <Ink.Text dimColor>
-      {DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] ")}
-    </Ink.Text>
-  );
+  return <Ink.Text dimColor>{DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] ")}</Ink.Text>;
 }