git-stack-cli 1.3.5 → 1.4.0

package/dist/cjs/index.cjs

@@ -26560,14 +26560,14 @@ async function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
 
-function reducer$1(state, patch) {
+function reducer$3(state, patch) {
     return { ...state, ...patch };
 }
 function AutoUpdate(props) {
     const props_ref = reactExports.useRef(props);
     props_ref.current = props;
     const [output, set_output] = reactExports.useState([]);
-    const [state, patch] = reactExports.useReducer(reducer$1, {
+    const [state, patch] = reactExports.useReducer(reducer$3, {
         error: null,
         local_version: null,
         latest_version: null,
@@ -26676,67 +26676,6 @@ function AutoUpdate(props) {
         status));
 }
 
-function serialize(obj) {
-    if (obj instanceof Map) {
-        return {
-            _type: "Map",
-            _value: Array.from(obj.entries()).map(([k, v]) => [k, serialize(v)]),
-        };
-    }
-    else if (Array.isArray(obj)) {
-        return obj.map(serialize);
-    }
-    else if (obj !== null && typeof obj === "object") {
-        const serializedObj = {};
-        for (const [key, value] of Object.entries(obj)) {
-            serializedObj[key] = serialize(value);
-        }
-        return serializedObj;
-    }
-    return obj;
-}
-function deserialize(obj) {
-    if (obj && obj._type === "Map") {
-        return new Map(obj._value.map(([k, v]) => [k, deserialize(v)]));
-    }
-    else if (Array.isArray(obj)) {
-        return obj.map(deserialize);
-    }
-    else if (obj !== null && typeof obj === "object") {
-        const deserializedObj = {};
-        for (const [key, value] of Object.entries(obj)) {
-            deserializedObj[key] = deserialize(value);
-        }
-        return deserializedObj;
-    }
-    return obj;
-}
-
-function Debug() {
-    const actions = Store.useActions();
-    const state = Store.useState((state) => state);
-    const argv = Store.useState((state) => state.argv);
-    const debug = Store.useState((state) => state.select.debug(state));
-    reactExports.useEffect(function debugMessageOnce() {
-        if (debug) {
-            actions.output(reactExports.createElement(Text, { color: colors.yellow }, "Debug mode enabled"));
-        }
-    }, [argv]);
-    reactExports.useEffect(function syncStateJson() {
-        if (!argv?.["write-state-json"]) {
-            return;
-        }
-        const output_file = path.join(state.cwd, "git-stack-state.json");
-        if (fs.existsSync(output_file)) {
-            fs.rmSync(output_file);
-        }
-        const serialized = serialize(state);
-        const content = JSON.stringify(serialized, null, 2);
-        fs.writeFileSync(output_file, content);
-    }, [argv, state]);
-    return null;
-}
-
 function cache(cacheable) {
     let status = "pending";
     let response;
@@ -26831,6 +26770,113 @@ function Command(props) {
     return (reactExports.createElement(Text, { bold: true, color: text_color }, props.children));
 }
 
+function reducer$2(state, patch) {
+    return { ...state, ...patch };
+}
+function CherryPickCheck(props) {
+    const actions = Store.useActions();
+    const [state, patch] = reactExports.useReducer(reducer$2, {
+        status: "init",
+    });
+    switch (state.status) {
+        case "done":
+            return props.children;
+        case "prompt":
+            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Text, { color: colors.yellow },
+                    reactExports.createElement(Command, null, "git cherry-pick"),
+                    " detected, would you like to abort it?"), onYes: async () => {
+                    await cli(`git cherry-pick --abort`);
+                    patch({ status: "done" });
+                }, onNo: async () => {
+                    actions.exit(0);
+                } }));
+        default:
+            return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow },
+                    "Checking for ",
+                    reactExports.createElement(Command, null, "git cherry-pick"),
+                    "\u2026"), function: cherry_pick_check }));
+    }
+    async function cherry_pick_check() {
+        const actions = Store.getState().actions;
+        try {
+            const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
+            const is_cherry_pick = fs.existsSync(path.join(git_dir, "CHERRY_PICK_HEAD"));
+            const status = is_cherry_pick ? "prompt" : "done";
+            patch({ status });
+        }
+        catch (err) {
+            actions.error("Must be run from within a git repository.");
+            if (err instanceof Error) {
+                if (actions.isDebug()) {
+                    actions.error(err.message);
+                }
+            }
+            actions.exit(9);
+        }
+    }
+}
+
+function serialize(obj) {
+    if (obj instanceof Map) {
+        return {
+            _type: "Map",
+            _value: Array.from(obj.entries()).map(([k, v]) => [k, serialize(v)]),
+        };
+    }
+    else if (Array.isArray(obj)) {
+        return obj.map(serialize);
+    }
+    else if (obj !== null && typeof obj === "object") {
+        const serializedObj = {};
+        for (const [key, value] of Object.entries(obj)) {
+            serializedObj[key] = serialize(value);
+        }
+        return serializedObj;
+    }
+    return obj;
+}
+function deserialize(obj) {
+    if (obj && obj._type === "Map") {
+        return new Map(obj._value.map(([k, v]) => [k, deserialize(v)]));
+    }
+    else if (Array.isArray(obj)) {
+        return obj.map(deserialize);
+    }
+    else if (obj !== null && typeof obj === "object") {
+        const deserializedObj = {};
+        for (const [key, value] of Object.entries(obj)) {
+            deserializedObj[key] = deserialize(value);
+        }
+        return deserializedObj;
+    }
+    return obj;
+}
+
+function Debug() {
+    const actions = Store.useActions();
+    const state = Store.useState((state) => state);
+    const argv = Store.useState((state) => state.argv);
+    const debug = Store.useState((state) => state.select.debug(state));
+    reactExports.useEffect(function debugMessageOnce() {
+        if (debug) {
+            actions.output(reactExports.createElement(Text, { color: colors.yellow }, "Debug mode enabled"));
+        }
+    }, [argv]);
+    reactExports.useEffect(function syncStateJson() {
+        if (!argv?.["write-state-json"]) {
+            return;
+        }
+        const output_file = path.join(state.cwd, "git-stack-state.json");
+        if (fs.existsSync(output_file)) {
+            fs.rmSync(output_file);
+        }
+        const serialized = serialize(state);
+        const content = JSON.stringify(serialized, null, 2);
+        fs.writeFileSync(output_file, content);
+    }, [argv, state]);
+    return null;
+}
+
 function Url(props) {
     return (reactExports.createElement(Text, { bold: true, color: colors.blue, ...props }, props.children));
 }
@@ -26892,7 +26938,7 @@ function CheckGit(props) {
     return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow },
             "Checking ",
             reactExports.createElement(Command, null, "git"),
-            " install..."), function: async () => {
+            " install\u2026"), function: async () => {
             // await Promise.all([
             //   cli(`for i in $(seq 1 5); do echo $i; sleep 1; done`),
             //   cli(`for i in $(seq 5 1); do printf "$i "; sleep 1; done; echo`),
@@ -26912,7 +26958,7 @@ function CheckGithubCli(props) {
             reactExports.createElement(Text, null,
                 "Checking ",
                 reactExports.createElement(Command, null, "gh"),
-                " install...")), function: async () => {
+                " install\u2026")), function: async () => {
             if (is_command_available("gh")) {
                 return;
             }
@@ -26932,7 +26978,7 @@ function CheckGithubCliAuth(props) {
             reactExports.createElement(Text, null,
                 "Checking ",
                 reactExports.createElement(Command, null, "gh auth status"),
-                "...")), function: async () => {
+                "\u2026")), function: async () => {
             const options = { ignoreExitCode: true };
             const auth_status$1 = await cli(`gh auth status`, options);
             if (auth_status$1.code === 0) {
@@ -26965,7 +27011,7 @@ function CheckGitRevise(props) {
             reactExports.createElement(Text, null,
                 "Checking ",
                 reactExports.createElement(Command, null, "git revise"),
-                " install...")), function: async () => {
+                " install\u2026")), function: async () => {
             if (is_command_available("git-revise")) {
                 return;
             }
@@ -26982,8 +27028,53 @@ function CheckGitRevise(props) {
         } }, props.children));
 }
 
+function reducer$1(state, patch) {
+    return { ...state, ...patch };
+}
+function DirtyCheck(props) {
+    const actions = Store.useActions();
+    const [state, patch] = reactExports.useReducer(reducer$1, {
+        status: "init",
+    });
+    switch (state.status) {
+        case "done":
+            return props.children;
+        case "prompt":
+            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{git} repo is dirty, changed may be lost during {git_stack}, are you sure you wannt 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);
+                } }));
+        default:
+            return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow },
+                    "Ensuring ",
+                    reactExports.createElement(Command, null, "git status --porcelain"),
+                    "\u2026"), function: rebase_check }));
+    }
+    async function rebase_check() {
+        const actions = Store.getState().actions;
+        try {
+            const git_dirty = (await cli(`git status --porcelain`)).stdout;
+            const status = git_dirty ? "prompt" : "done";
+            patch({ status });
+        }
+        catch (err) {
+            actions.error("Must be run from within a git repository.");
+            if (err instanceof Error) {
+                if (actions.isDebug()) {
+                    actions.error(err.message);
+                }
+            }
+            actions.exit(9);
+        }
+    }
+}
+
 function GatherMetadata(props) {
-    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information..."));
+    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information\u2026"));
     return (reactExports.createElement(Await, { fallback: fallback, function: gather_metadata$1 }, props.children));
 }
 async function gather_metadata$1() {
@@ -27445,7 +27536,7 @@ const UNASSIGNED = "unassigned";
 
 function LocalCommitStatus(props) {
     const argv = Store.useState((state) => state.argv);
-    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Fetching PR status from Github..."));
+    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Fetching PR status from Github\u2026"));
     if (argv["mock-metadata"]) {
         return (reactExports.createElement(Await, { fallback: fallback, function: mock_metadata }, props.children));
     }
@@ -27539,7 +27630,7 @@ function encode(value) {
 }
 
 function LocalMergeRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits..."), function: run$3 }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$3 }));
 }
 async function run$3() {
     const state = Store.getState();
@@ -27589,13 +27680,11 @@ async function run$3() {
             picked_commit_list.push(commit);
         }
         if (picked_commit_list.length > 0) {
-            const first_commit = picked_commit_list.at(0);
-            const last_commit = picked_commit_list.at(-1);
-            invariant(first_commit, "first_commit must exist");
-            invariant(last_commit, "last_commit must exist");
             // ensure clean base to avoid conflicts when applying patch
             await cli(`git clean -fd`);
-            await cli(`git cherry-pick "${first_commit.sha}^..${last_commit.sha}" --keep-redundant-commits`);
+            // create list of sha for cherry-pick
+            const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
+            await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
         }
         // after all commits have been cherry-picked and amended
         // move the branch pointer to the newly created temporary branch
@@ -27649,7 +27738,7 @@ async function run$3() {
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restoring ",
             reactExports.createElement(Brackets, null, branch_name),
-            "..."));
+            "\u2026"));
         restore_git();
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restored ",
@@ -27812,7 +27901,7 @@ const RE = {
 };
 
 function ManualRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits..."), function: run$2 }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$2 }));
 }
 async function run$2() {
     const state = Store.getState();
@@ -28131,7 +28220,7 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restoring ",
             reactExports.createElement(Brackets, null, branch_name),
-            "..."));
+            "\u2026"));
         restore_git();
         actions.output(reactExports.createElement(Text, { color: colors.yellow },
             "Restored ",
@@ -28885,22 +28974,27 @@ function RebaseCheck(props) {
         case "done":
             return props.children;
         case "prompt":
-            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Text, { color: colors.yellow }, "Rebase detected, would you like to abort it?"), onYes: async () => {
+            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Text, { color: colors.yellow },
+                    reactExports.createElement(Command, null, "git rebase"),
+                    " detected, would you like to abort it?"), onYes: async () => {
                     await cli(`git rebase --abort`);
                     patch({ status: "done" });
                 }, onNo: async () => {
                     actions.exit(0);
                 } }));
         default:
-            return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Checking for rebase..."), function: rebase_check }));
+            return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow },
+                    "Checking for ",
+                    reactExports.createElement(Command, null, "git rebase"),
+                    "\u2026"), function: rebase_check }));
     }
     async function rebase_check() {
         const actions = Store.getState().actions;
         try {
-            const repo_root = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
+            const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
             let is_rebase = false;
-            is_rebase ||= fs.existsSync(path.join(repo_root, "rebase-apply"));
-            is_rebase ||= fs.existsSync(path.join(repo_root, "rebase-merge"));
+            is_rebase ||= fs.existsSync(path.join(git_dir, "rebase-apply"));
+            is_rebase ||= fs.existsSync(path.join(git_dir, "rebase-merge"));
             const status = is_rebase ? "prompt" : "done";
             patch({ status });
         }
@@ -28939,12 +29033,14 @@ function App() {
                     actions.exit(0);
                 }
             } },
-            reactExports.createElement(RebaseCheck, null,
-                reactExports.createElement(DependencyCheck, null,
-                    !argv.verbose ? null : reactExports.createElement(GithubApiError, null),
-                    reactExports.createElement(GatherMetadata, null,
-                        reactExports.createElement(LocalCommitStatus, null,
-                            reactExports.createElement(Main, null))))))));
+            reactExports.createElement(DependencyCheck, null,
+                reactExports.createElement(DirtyCheck, null,
+                    reactExports.createElement(RebaseCheck, null,
+                        reactExports.createElement(CherryPickCheck, null,
+                            !argv.verbose ? null : reactExports.createElement(GithubApiError, null),
+                            reactExports.createElement(GatherMetadata, null,
+                                reactExports.createElement(LocalCommitStatus, null,
+                                    reactExports.createElement(Main, null))))))))));
 }
 
 const align = {
@@ -34322,7 +34418,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.3.5" )
+        .version("1.4.0" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

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

package/src/app/App.tsx

@@ -1,8 +1,10 @@
 import * as React from "react";
 
 import { AutoUpdate } from "~/app/AutoUpdate";
+import { CherryPickCheck } from "~/app/CherryPickCheck";
 import { Debug } from "~/app/Debug";
 import { DependencyCheck } from "~/app/DependencyCheck";
+import { DirtyCheck } from "~/app/DirtyCheck";
 import { GatherMetadata } from "~/app/GatherMetadata";
 import { GithubApiError } from "~/app/GithubApiError";
 import { LocalCommitStatus } from "~/app/LocalCommitStatus";
@@ -48,17 +50,21 @@ export function App() {
           }
         }}
       >
-        <RebaseCheck>
-          <DependencyCheck>
-            {!argv.verbose ? null : <GithubApiError />}
+        <DependencyCheck>
+          <DirtyCheck>
+            <RebaseCheck>
+              <CherryPickCheck>
+                {!argv.verbose ? null : <GithubApiError />}
 
-            <GatherMetadata>
-              <LocalCommitStatus>
-                <Main />
-              </LocalCommitStatus>
-            </GatherMetadata>
-          </DependencyCheck>
-        </RebaseCheck>
+                <GatherMetadata>
+                  <LocalCommitStatus>
+                    <Main />
+                  </LocalCommitStatus>
+                </GatherMetadata>
+              </CherryPickCheck>
+            </RebaseCheck>
+          </DirtyCheck>
+        </DependencyCheck>
       </AutoUpdate>
     </Providers>
   );

package/src/app/CherryPickCheck.tsx

@@ -0,0 +1,94 @@
+import * as React from "react";
+
+import fs from "node:fs";
+import path from "node:path";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Command } from "~/app/Command";
+import { Store } from "~/app/Store";
+import { YesNoPrompt } from "~/app/YesNoPrompt";
+import { cli } from "~/core/cli";
+import { colors } from "~/core/colors";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+type State = {
+  status: "init" | "prompt" | "done";
+};
+
+function reducer(state: State, patch: Partial<State>) {
+  return { ...state, ...patch };
+}
+
+export function CherryPickCheck(props: Props) {
+  const actions = Store.useActions();
+
+  const [state, patch] = React.useReducer(reducer, {
+    status: "init",
+  });
+
+  switch (state.status) {
+    case "done":
+      return props.children;
+
+    case "prompt":
+      return (
+        <YesNoPrompt
+          message={
+            <Ink.Text color={colors.yellow}>
+              <Command>git cherry-pick</Command> detected, would you like to
+              abort it?
+            </Ink.Text>
+          }
+          onYes={async () => {
+            await cli(`git cherry-pick --abort`);
+            patch({ status: "done" });
+          }}
+          onNo={async () => {
+            actions.exit(0);
+          }}
+        />
+      );
+
+    default:
+      return (
+        <Await
+          fallback={
+            <Ink.Text color={colors.yellow}>
+              Checking for <Command>git cherry-pick</Command>…
+            </Ink.Text>
+          }
+          function={cherry_pick_check}
+        />
+      );
+  }
+
+  async function cherry_pick_check() {
+    const actions = Store.getState().actions;
+
+    try {
+      const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
+
+      const is_cherry_pick = fs.existsSync(
+        path.join(git_dir, "CHERRY_PICK_HEAD")
+      );
+
+      const status = is_cherry_pick ? "prompt" : "done";
+      patch({ status });
+    } catch (err) {
+      actions.error("Must be run from within a git repository.");
+
+      if (err instanceof Error) {
+        if (actions.isDebug()) {
+          actions.error(err.message);
+        }
+      }
+
+      actions.exit(9);
+    }
+  }
+}

package/src/app/DependencyCheck.tsx

@@ -39,7 +39,7 @@ function CheckGit(props: Props) {
     <Await
       fallback={
         <Ink.Text color={colors.yellow}>
-          Checking <Command>git</Command> install...
+          Checking <Command>git</Command> install…
         </Ink.Text>
       }
       function={async () => {
@@ -74,7 +74,7 @@ function CheckGithubCli(props: Props) {
       fallback={
         <Ink.Text color={colors.yellow}>
           <Ink.Text>
-            Checking <Command>gh</Command> install...
+            Checking <Command>gh</Command> install…
           </Ink.Text>
         </Ink.Text>
       }
@@ -117,7 +117,7 @@ function CheckGithubCliAuth(props: Props) {
       fallback={
         <Ink.Text color={colors.yellow}>
           <Ink.Text>
-            Checking <Command>gh auth status</Command>...
+            Checking <Command>gh auth status</Command>…
           </Ink.Text>
         </Ink.Text>
       }
@@ -175,7 +175,7 @@ function CheckGitRevise(props: Props) {
       fallback={
         <Ink.Text color={colors.yellow}>
           <Ink.Text>
-            Checking <Command>git revise</Command> install...
+            Checking <Command>git revise</Command> install…
           </Ink.Text>
         </Ink.Text>
       }

package/src/app/DirtyCheck.tsx

@@ -0,0 +1,91 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Command } from "~/app/Command";
+import { FormatText } from "~/app/FormatText";
+import { Store } from "~/app/Store";
+import { YesNoPrompt } from "~/app/YesNoPrompt";
+import { cli } from "~/core/cli";
+import { colors } from "~/core/colors";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+type State = {
+  status: "init" | "prompt" | "done";
+};
+
+function reducer(state: State, patch: Partial<State>) {
+  return { ...state, ...patch };
+}
+
+export function DirtyCheck(props: Props) {
+  const actions = Store.useActions();
+
+  const [state, patch] = React.useReducer(reducer, {
+    status: "init",
+  });
+
+  switch (state.status) {
+    case "done":
+      return props.children;
+
+    case "prompt":
+      return (
+        <YesNoPrompt
+          message={
+            <FormatText
+              wrapper={<Ink.Text color={colors.yellow} />}
+              message="{git} repo is dirty, changed may be lost during {git_stack}, are you sure you wannt to proceed?"
+              values={{
+                git: <Command>git</Command>,
+                git_stack: <Command>git stack</Command>,
+              }}
+            />
+          }
+          onYes={async () => {
+            patch({ status: "done" });
+          }}
+          onNo={async () => {
+            actions.exit(0);
+          }}
+        />
+      );
+
+    default:
+      return (
+        <Await
+          fallback={
+            <Ink.Text color={colors.yellow}>
+              Ensuring <Command>git status --porcelain</Command>…
+            </Ink.Text>
+          }
+          function={rebase_check}
+        />
+      );
+  }
+
+  async function rebase_check() {
+    const actions = Store.getState().actions;
+
+    try {
+      const git_dirty = (await cli(`git status --porcelain`)).stdout;
+
+      const status = git_dirty ? "prompt" : "done";
+      patch({ status });
+    } catch (err) {
+      actions.error("Must be run from within a git repository.");
+
+      if (err instanceof Error) {
+        if (actions.isDebug()) {
+          actions.error(err.message);
+        }
+      }
+
+      actions.exit(9);
+    }
+  }
+}

package/src/app/GatherMetadata.tsx

@@ -16,9 +16,7 @@ type Props = {
 
 export function GatherMetadata(props: Props) {
   const fallback = (
-    <Ink.Text color={colors.yellow}>
-      Gathering local git information...
-    </Ink.Text>
+    <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>
   );
 
   return (

package/src/app/LocalCommitStatus.tsx

@@ -16,7 +16,7 @@ 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>
+    <Ink.Text color={colors.yellow}>Fetching PR status from Github…</Ink.Text>
   );
 
   if (argv["mock-metadata"]) {

package/src/app/LocalMergeRebase.tsx

@@ -18,7 +18,7 @@ import { short_id } from "~/core/short_id";
 export function LocalMergeRebase() {
   return (
     <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits...</Ink.Text>}
+      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
       function={run}
     />
   );
@@ -102,18 +102,13 @@ async function run() {
     }
 
     if (picked_commit_list.length > 0) {
-      const first_commit = picked_commit_list.at(0);
-      const last_commit = picked_commit_list.at(-1);
-
-      invariant(first_commit, "first_commit must exist");
-      invariant(last_commit, "last_commit must exist");
-
       // ensure clean base to avoid conflicts when applying patch
       await cli(`git clean -fd`);
 
-      await cli(
-        `git cherry-pick "${first_commit.sha}^..${last_commit.sha}" --keep-redundant-commits`
-      );
+      // create list of sha for cherry-pick
+      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
+
+      await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
     }
 
     // after all commits have been cherry-picked and amended
@@ -179,7 +174,7 @@ async function run() {
   function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>
-        Restoring <Brackets>{branch_name}</Brackets>...
+        Restoring <Brackets>{branch_name}</Brackets>…
       </Ink.Text>
     );
 

package/src/app/ManualRebase.tsx

@@ -23,7 +23,7 @@ import { short_id } from "~/core/short_id";
 export function ManualRebase() {
   return (
     <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits...</Ink.Text>}
+      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
       function={run}
     />
   );
@@ -423,7 +423,7 @@ async function run() {
   function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>
-        Restoring <Brackets>{branch_name}</Brackets>...
+        Restoring <Brackets>{branch_name}</Brackets>…
       </Ink.Text>
     );
 

package/src/app/RebaseCheck.tsx

@@ -6,6 +6,7 @@ import path from "node:path";
 import * as Ink from "ink-cjs";
 
 import { Await } from "~/app/Await";
+import { Command } from "~/app/Command";
 import { Store } from "~/app/Store";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { cli } from "~/core/cli";
@@ -39,7 +40,8 @@ export function RebaseCheck(props: Props) {
         <YesNoPrompt
           message={
             <Ink.Text color={colors.yellow}>
-              Rebase detected, would you like to abort it?
+              <Command>git rebase</Command> detected, would you like to abort
+              it?
             </Ink.Text>
           }
           onYes={async () => {
@@ -56,7 +58,9 @@ export function RebaseCheck(props: Props) {
       return (
         <Await
           fallback={
-            <Ink.Text color={colors.yellow}>Checking for rebase...</Ink.Text>
+            <Ink.Text color={colors.yellow}>
+              Checking for <Command>git rebase</Command>…
+            </Ink.Text>
           }
           function={rebase_check}
         />
@@ -67,11 +71,11 @@ export function RebaseCheck(props: Props) {
     const actions = Store.getState().actions;
 
     try {
-      const repo_root = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
+      const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
 
       let is_rebase = false;
-      is_rebase ||= fs.existsSync(path.join(repo_root, "rebase-apply"));
-      is_rebase ||= fs.existsSync(path.join(repo_root, "rebase-merge"));
+      is_rebase ||= fs.existsSync(path.join(git_dir, "rebase-apply"));
+      is_rebase ||= fs.existsSync(path.join(git_dir, "rebase-merge"));
 
       const status = is_rebase ? "prompt" : "done";
       patch({ status });