git-stack-cli 2.6.1 → 2.7.1

package/dist/js/index.js

@@ -28098,7 +28098,7 @@ var require_last = __commonJS((exports, module) => {
 });
 
 // src/index.tsx
-var React56 = __toESM(require_react(), 1);
+var React57 = __toESM(require_react(), 1);
 import fs12 from "node:fs/promises";
 import path9 from "node:path";
 
@@ -31935,10 +31935,10 @@ var import_react20 = __toESM(require_react(), 1);
 // node_modules/.pnpm/ink-cjs@4.4.1_@types+react@18.2.33_react-devtools-core@4.19.1_react@18.2.0/node_modules/ink-cjs/build/hooks/use-focus-manager.js
 var import_react21 = __toESM(require_react(), 1);
 // src/app/App.tsx
-var React55 = __toESM(require_react(), 1);
+var React56 = __toESM(require_react(), 1);
 
 // src/app/AutoUpdate.tsx
-var React18 = __toESM(require_react(), 1);
+var React19 = __toESM(require_react(), 1);
 
 // src/app/Brackets.tsx
 var React10 = __toESM(require_react(), 1);
@@ -31993,24 +31993,34 @@ function FormatText(props) {
   });
 }
 
+// src/app/Url.tsx
+var React13 = __toESM(require_react(), 1);
+function Url(props) {
+  return /* @__PURE__ */ React13.createElement(Text, {
+    bold: true,
+    color: colors.blue,
+    ...props
+  }, props.children);
+}
+
 // src/app/YesNoPrompt.tsx
-var React14 = __toESM(require_react(), 1);
+var React15 = __toESM(require_react(), 1);
 
 // src/app/Parens.tsx
-var React13 = __toESM(require_react(), 1);
+var React14 = __toESM(require_react(), 1);
 function Parens(props) {
   const color = colors.blue;
-  return /* @__PURE__ */ React13.createElement(Text, null, /* @__PURE__ */ React13.createElement(Text, {
+  return /* @__PURE__ */ React14.createElement(Text, null, /* @__PURE__ */ React14.createElement(Text, {
     color
-  }, "("), props.children, /* @__PURE__ */ React13.createElement(Text, {
+  }, "("), props.children, /* @__PURE__ */ React14.createElement(Text, {
     color
   }, ")"));
 }
 
 // src/app/YesNoPrompt.tsx
 function YesNoPrompt(props) {
-  const [answer, set_answer] = React14.useState("");
-  const answered_ref = React14.useRef(false);
+  const [answer, set_answer] = React15.useState("");
+  const answered_ref = React15.useRef(false);
   use_input_default((input) => {
     if (answered_ref.current) {
       return;
@@ -32032,11 +32042,11 @@ function YesNoPrompt(props) {
     }
   });
   const choices = function get_choices() {
-    const y3 = /* @__PURE__ */ React14.createElement(Text, {
+    const y3 = /* @__PURE__ */ React15.createElement(Text, {
       bold: true,
       color: colors.green
     }, "Y");
-    const n3 = /* @__PURE__ */ React14.createElement(Text, {
+    const n3 = /* @__PURE__ */ React15.createElement(Text, {
       color: colors.red
     }, "n");
     switch (answer) {
@@ -32045,19 +32055,19 @@ function YesNoPrompt(props) {
       case "n":
         return n3;
       default:
-        return /* @__PURE__ */ React14.createElement(FormatText, {
+        return /* @__PURE__ */ React15.createElement(FormatText, {
           message: "{y}/{n}",
           values: { y: y3, n: n3 }
         });
     }
   }();
-  return /* @__PURE__ */ React14.createElement(Box_default, {
+  return /* @__PURE__ */ React15.createElement(Box_default, {
     flexDirection: "column"
-  }, /* @__PURE__ */ React14.createElement(Box_default, {
+  }, /* @__PURE__ */ React15.createElement(Box_default, {
     alignItems: "flex-end"
-  }, typeof props.message === "object" ? props.message : /* @__PURE__ */ React14.createElement(Text, {
+  }, typeof props.message === "object" ? props.message : /* @__PURE__ */ React15.createElement(Text, {
     color: colors.yellow
-  }, props.message), /* @__PURE__ */ React14.createElement(Text, null, " "), /* @__PURE__ */ React14.createElement(Parens, null, /* @__PURE__ */ React14.createElement(Text, {
+  }, props.message), /* @__PURE__ */ React15.createElement(Text, null, " "), /* @__PURE__ */ React15.createElement(Parens, null, /* @__PURE__ */ React15.createElement(Text, {
     color: colors.gray
   }, choices))));
 }
@@ -32071,7 +32081,7 @@ function assertNever(value) {
 import * as child from "node:child_process";
 
 // src/app/Store.tsx
-var React17 = __toESM(require_react(), 1);
+var React18 = __toESM(require_react(), 1);
 
 // node_modules/.pnpm/zustand@4.4.4_@types+react@18.2.33_immer@10.0.3_react@18.2.0/node_modules/zustand/esm/vanilla.mjs
 var createStoreImpl = (createState) => {
@@ -32702,7 +32712,7 @@ var immerImpl = (initializer) => (set2, get, store) => {
 var immer2 = immerImpl;
 
 // src/app/Exit.tsx
-var React15 = __toESM(require_react(), 1);
+var React16 = __toESM(require_react(), 1);
 
 // src/core/sleep.ts
 async function sleep(time) {
@@ -32711,7 +32721,7 @@ async function sleep(time) {
 
 // src/app/Exit.tsx
 function Exit(props) {
-  React15.useEffect(() => {
+  React16.useEffect(() => {
     Exit.handle_exit(props).catch((err) => {
       console.error(err);
     });
@@ -32728,7 +32738,7 @@ Exit.handle_exit = async function handle_exit(props) {
   }
   if (state.is_dirty_check_stash) {
     await cli("git stash pop");
-    actions.output(/* @__PURE__ */ React15.createElement(Text, {
+    actions.output(/* @__PURE__ */ React16.createElement(Text, {
       color: colors.green
     }, "✅ Changes restored from stash"));
   }
@@ -32742,7 +32752,7 @@ Exit.handle_exit = async function handle_exit(props) {
 };
 
 // src/app/LogTimestamp.tsx
-var React16 = __toESM(require_react(), 1);
+var React17 = __toESM(require_react(), 1);
 
 // node_modules/.pnpm/luxon@3.4.4/node_modules/luxon/src/errors.js
 class LuxonError extends Error {
@@ -37037,7 +37047,7 @@ function friendlyDateTime(dateTimeish) {
 
 // src/app/LogTimestamp.tsx
 function LogTimestamp() {
-  return /* @__PURE__ */ React16.createElement(Text, {
+  return /* @__PURE__ */ React17.createElement(Text, {
     dimColor: true
   }, DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] "));
 }
@@ -37081,7 +37091,7 @@ var BaseStore = createStore()(immer2((set2, get) => ({
           state.exit_mode = "normal";
         }
         let clear = args?.clear ?? true;
-        const node = /* @__PURE__ */ React17.createElement(Exit, {
+        const node = /* @__PURE__ */ React18.createElement(Exit, {
           clear,
           code
         });
@@ -37109,17 +37119,17 @@ var BaseStore = createStore()(immer2((set2, get) => ({
     error(error) {
       let node;
       if (typeof error === "string") {
-        node = /* @__PURE__ */ React17.createElement(Text, {
+        node = /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, error);
       } else if (error instanceof Error) {
-        node = /* @__PURE__ */ React17.createElement(Box_default, {
+        node = /* @__PURE__ */ React18.createElement(Box_default, {
           flexDirection: "column"
-        }, /* @__PURE__ */ React17.createElement(Text, {
+        }, /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, error.stack));
       } else {
-        node = /* @__PURE__ */ React17.createElement(Text, {
+        node = /* @__PURE__ */ React18.createElement(Text, {
           color: colors.red
         }, `Unhandled error: ${JSON.stringify(error)}`);
       }
@@ -37203,12 +37213,12 @@ function renderOutputArgs(args) {
     case "boolean":
     case "number":
     case "string":
-      output = /* @__PURE__ */ React17.createElement(Text, {
+      output = /* @__PURE__ */ React18.createElement(Text, {
         dimColor: args.debug
       }, String(args.node));
   }
   if (args.debug) {
-    return /* @__PURE__ */ React17.createElement(React17.Fragment, null, args.withoutTimestamp ? null : /* @__PURE__ */ React17.createElement(LogTimestamp, null), output);
+    return /* @__PURE__ */ React18.createElement(React18.Fragment, null, args.withoutTimestamp ? null : /* @__PURE__ */ React18.createElement(LogTimestamp, null), output);
   }
   return output;
 }
@@ -37430,127 +37440,28 @@ function reducer(state, patch) {
   return { ...state, ...patch };
 }
 function AutoUpdate(props) {
-  const props_ref = React18.useRef(props);
+  const props_ref = React19.useRef(props);
   props_ref.current = props;
-  const [output, set_output] = React18.useState([]);
-  const [state, patch] = React18.useReducer(reducer, {
-    error: null,
+  const [output, set_output] = React19.useState([]);
+  const [state, patch] = React19.useReducer(reducer, {
+    status: "init",
     local_version: null,
     latest_version: null,
-    status: "init",
     is_brew_bun_standalone: false
   });
-  function handle_output(node) {
-    if (typeof props.onOutput === "function") {
-      props.onOutput(node);
-    } else {
-      set_output((current2) => {
-        return [...current2, node];
-      });
-    }
-  }
-  React18.useEffect(() => {
+  React19.useEffect(handle_init_state, []);
+  React19.useEffect(handle_status, [state.latest_version]);
+  React19.useEffect(handle_on_done, [state.status]);
+  const status = render_status();
+  return /* @__PURE__ */ React19.createElement(React19.Fragment, null, output, status);
+  function render_status() {
     switch (state.status) {
       case "init":
-      case "prompt":
+        return null;
       case "install":
-        break;
-      case "done": {
-        props.onDone?.();
-        break;
-      }
-      default:
-        assertNever(state.status);
-    }
-  }, [state.status]);
-  React18.useEffect(() => {
-    let status2 = "init";
-    let latest_version = null;
-    let is_brew_bun_standalone = false;
-    const local_version = "2.6.1";
-    const is_output = props_ref.current.verbose || props_ref.current.force;
-    async function auto_update() {
-      if (!local_version) {
-        throw new Error("Auto update requires process.env.CLI_VERSION to be set");
-      }
-      const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
-      const npm_json = await Promise.race([
-        fetch_json(`https://registry.npmjs.org/${props.name}`),
-        sleep(timeout_ms).then(() => {
-          throw new Error("AutoUpdate timeout");
-        })
-      ]);
-      latest_version = npm_json?.["dist-tags"]?.latest;
-      if (!latest_version) {
-        throw new Error("Unable to retrieve latest version from npm");
-      }
-      const binary_path = process.argv[1];
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          dimColor: true
-        }, JSON.stringify({ binary_path })));
-      }
-      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
-      if (props_ref.current.verbose) {
-        if (is_brew_bun_standalone) {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, {
-            dimColor: true
-          }, "brew install detected (compiled bun standalone)"));
-        } else {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, {
-            dimColor: true
-          }, "npm install detected"));
-        }
-      }
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(FormatText, {
-          key: "versions",
-          wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-          message: "Auto update found latest version {latest_version} and current local version {local_version}",
-          values: {
-            latest_version: /* @__PURE__ */ React18.createElement(Brackets, null, latest_version),
-            local_version: /* @__PURE__ */ React18.createElement(Brackets, null, local_version)
-          }
-        }));
-      }
-      const semver_result = semver_compare(latest_version, local_version);
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          dimColor: true
-        }, JSON.stringify({ semver_result })));
-      }
-      if (semver_result === 0) {
-        status2 = "done";
-        if (is_output) {
-          handle_output(/* @__PURE__ */ React18.createElement(Text, null, "✅ Everything up to date. ", /* @__PURE__ */ React18.createElement(Brackets, null, latest_version)));
-        }
-        return;
-      }
-      if (semver_result === 1) {
-        status2 = "prompt";
-      }
-      throw new Error("AutoUpdate failed");
-    }
-    const onError = props_ref.current.onError || (() => {
-    });
-    auto_update().then(() => {
-      patch({ status: status2, local_version, latest_version, is_brew_bun_standalone });
-    }).catch((error) => {
-      if (props_ref.current.verbose) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          key: "error",
-          color: colors.red
-        }, error?.message));
-      }
-      status2 = "done";
-      patch({ status: status2, error, local_version, latest_version, is_brew_bun_standalone });
-      onError(error);
-    });
-  }, []);
-  const status = function render_status() {
-    switch (state.status) {
-      case "init":
         return null;
+      case "done":
+        return props.children;
       case "prompt": {
         let install_command = "";
         if (state.is_brew_bun_standalone) {
@@ -37558,27 +37469,21 @@ function AutoUpdate(props) {
         } else {
           install_command = `npm install -g ${props.name}@latest`;
         }
-        return /* @__PURE__ */ React18.createElement(YesNoPrompt, {
-          message: /* @__PURE__ */ React18.createElement(Box_default, {
-            flexDirection: "column"
-          }, /* @__PURE__ */ React18.createElement(Box_default, {
-            flexDirection: "column"
-          }, /* @__PURE__ */ React18.createElement(Text, {
-            color: colors.yellow
-          }, /* @__PURE__ */ React18.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-            message: "New version available {latest_version}",
-            values: {
-              latest_version: /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)
-            }
-          }), ","), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(Command, null, install_command), /* @__PURE__ */ React18.createElement(Text, null, " ")), /* @__PURE__ */ React18.createElement(Box_default, null, /* @__PURE__ */ React18.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React18.createElement(Text, {
+        return /* @__PURE__ */ React19.createElement(YesNoPrompt, {
+          message: /* @__PURE__ */ React19.createElement(Box_default, {
+            flexDirection: "column",
+            gap: 1
+          }, /* @__PURE__ */ React19.createElement(Command, null, install_command), /* @__PURE__ */ React19.createElement(FormatText, {
+            wrapper: /* @__PURE__ */ React19.createElement(Text, {
               color: colors.yellow
             }),
             message: "Would you like to run the above command to update?"
-          }))),
+          })),
+          onNo: () => {
+            patch({ status: "done" });
+          },
           onYes: async () => {
-            handle_output(/* @__PURE__ */ React18.createElement(Command, null, install_command));
+            info(/* @__PURE__ */ React19.createElement(Command, null, install_command));
             patch({ status: "install" });
             await cli(install_command, {
               env: {
@@ -37586,34 +37491,164 @@ function AutoUpdate(props) {
                 HOMEBREW_COLOR: "1"
               },
               onOutput: (data) => {
-                handle_output(/* @__PURE__ */ React18.createElement(Text, null, data));
+                info(/* @__PURE__ */ React19.createElement(Text, null, data));
               }
             });
-            handle_output(/* @__PURE__ */ React18.createElement(Text, {
+            info(/* @__PURE__ */ React19.createElement(Text, {
               key: "done"
-            }, "✅ Installed ", /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)));
-            patch({ status: "done" });
-          },
-          onNo: () => {
+            }, "✅ Installed ", /* @__PURE__ */ React19.createElement(Brackets, null, state.latest_version)));
             patch({ status: "done" });
           }
         });
       }
+    }
+  }
+  function handle_on_done() {
+    switch (state.status) {
+      case "init":
+      case "prompt":
       case "install":
-        return null;
-      case "done":
-        return props.children;
+        break;
+      case "done": {
+        props.onDone?.();
+        break;
+      }
+      default:
+        assertNever(state.status);
     }
-  }();
-  return /* @__PURE__ */ React18.createElement(React18.Fragment, null, output, status);
+  }
+  function handle_init_state() {
+    init_state().catch(abort);
+    async function init_state() {
+      if (state.latest_version !== null)
+        return;
+      const local_version = "2.7.1";
+      const latest_version = await get_latest_version();
+      const is_brew_bun_standalone = get_is_brew_bun_standalone();
+      patch({ local_version, latest_version, is_brew_bun_standalone });
+    }
+    async function get_latest_version() {
+      const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
+      const npm_json = await Promise.race([
+        fetch_json(`https://registry.npmjs.org/${props.name}`),
+        sleep(timeout_ms).then(() => {
+          abort(new Error("AutoUpdate timeout"));
+        })
+      ]);
+      const maybe_version = npm_json?.["dist-tags"]?.latest;
+      if (typeof maybe_version === "string") {
+        return maybe_version;
+      }
+      throw new Error("Unable to retrieve latest version from npm");
+    }
+    function get_is_brew_bun_standalone() {
+      const binary_path = process.argv[1];
+      debug(/* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }, JSON.stringify({ binary_path })));
+      const is_bunfs_path = binary_path.startsWith("/$bunfs");
+      debug(/* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }, is_bunfs_path ? "brew install detected (compiled bun standalone)" : "npm install detected"));
+      return is_bunfs_path;
+    }
+  }
+  function handle_status() {
+    const latest_version = state.latest_version;
+    if (latest_version === null) {
+      return;
+    }
+    const local_version = state.local_version;
+    if (!local_version) {
+      throw new Error("Auto update requires process.env.CLI_VERSION to be set");
+    }
+    debug(/* @__PURE__ */ React19.createElement(FormatText, {
+      key: "versions",
+      wrapper: /* @__PURE__ */ React19.createElement(Text, {
+        dimColor: true
+      }),
+      message: "Auto update found latest version {latest_version} and current local version {local_version}",
+      values: {
+        latest_version: /* @__PURE__ */ React19.createElement(Brackets, null, latest_version),
+        local_version: /* @__PURE__ */ React19.createElement(Brackets, null, local_version)
+      }
+    }));
+    const semver_result = semver_compare(latest_version, local_version);
+    debug(/* @__PURE__ */ React19.createElement(Text, {
+      dimColor: true
+    }, JSON.stringify({ semver_result })));
+    switch (semver_result) {
+      case 0: {
+        info(/* @__PURE__ */ React19.createElement(Text, null, "✅ Everything up to date. ", /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)));
+        return patch({ status: "done" });
+      }
+      case 1: {
+        const old_tag = local_version;
+        const new_tag = state.latest_version;
+        const url = `https://github.com/magus/git-stack-cli/compare/${old_tag}...${new_tag}`;
+        info(/* @__PURE__ */ React19.createElement(Box_default, {
+          flexDirection: "column",
+          gap: 1,
+          paddingTop: 1,
+          paddingBottom: 1
+        }, /* @__PURE__ */ React19.createElement(Text, null, "\uD83C\uDD95 New version available! ", /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)), /* @__PURE__ */ React19.createElement(Box_default, {
+          flexDirection: "column"
+        }, /* @__PURE__ */ React19.createElement(Text, {
+          dimColor: true
+        }, "Changelog"), /* @__PURE__ */ React19.createElement(Url, null, url))));
+        return patch({ status: "prompt" });
+      }
+      case -1: {
+        info(/* @__PURE__ */ React19.createElement(FormatText, {
+          message: "⚠️ Local version {local_version} is newer than latest version {latest_version}",
+          values: {
+            local_version: /* @__PURE__ */ React19.createElement(Brackets, null, local_version),
+            latest_version: /* @__PURE__ */ React19.createElement(Brackets, null, latest_version)
+          }
+        }));
+        return patch({ status: "done" });
+      }
+      default: {
+        assertNever(semver_result);
+        abort(new Error("AutoUpdate failed"));
+      }
+    }
+  }
+  function info(node) {
+    if (props_ref.current.verbose || props_ref.current.force) {
+      handle_output(node);
+    }
+  }
+  function debug(node) {
+    if (props_ref.current.verbose) {
+      handle_output(node);
+    }
+  }
+  function abort(error) {
+    info(/* @__PURE__ */ React19.createElement(Text, {
+      key: "error",
+      color: colors.red
+    }, error.message));
+    patch({ status: "done" });
+    props_ref.current.onError?.(error);
+  }
+  function handle_output(node) {
+    if (typeof props.onOutput === "function") {
+      props.onOutput(node);
+    } else {
+      set_output((current2) => {
+        return [...current2, node];
+      });
+    }
+  }
 }
 
 // src/app/CherryPickCheck.tsx
-var React20 = __toESM(require_react(), 1);
+var React21 = __toESM(require_react(), 1);
 import path from "node:path";
 
 // src/app/Await.tsx
-var React19 = __toESM(require_react(), 1);
+var React20 = __toESM(require_react(), 1);
 
 // src/core/cache.ts
 function cache3(cacheable) {
@@ -37661,8 +37696,8 @@ function invariant(condition, message) {
 
 // src/app/Await.tsx
 function Await(props) {
-  const [display_fallback, set_display_fallback] = React19.useState(false);
-  const cacheRef = React19.useRef(null);
+  const [display_fallback, set_display_fallback] = React20.useState(false);
+  const cacheRef = React20.useRef(null);
   if (!cacheRef.current) {
     cacheRef.current = cache3(props.function);
   }
@@ -37672,7 +37707,7 @@ function Await(props) {
   } else {
     delayFallbackMs = 1000;
   }
-  React19.useEffect(() => {
+  React20.useEffect(() => {
     const cache4 = cacheRef.current;
     if (!cache4) {
       return;
@@ -37689,13 +37724,13 @@ function Await(props) {
   }, [delayFallbackMs]);
   invariant(cacheRef.current, "cache must exist");
   if ("fallback" in props) {
-    return /* @__PURE__ */ React19.createElement(React19.Suspense, {
+    return /* @__PURE__ */ React20.createElement(React20.Suspense, {
       fallback: !display_fallback ? null : props.fallback
-    }, /* @__PURE__ */ React19.createElement(ReadCache, {
+    }, /* @__PURE__ */ React20.createElement(ReadCache, {
       cache: cacheRef.current
     }, props.children));
   }
-  return /* @__PURE__ */ React19.createElement(ReadCache, {
+  return /* @__PURE__ */ React20.createElement(ReadCache, {
     cache: cacheRef.current
   });
 }
@@ -37721,17 +37756,17 @@ function reducer2(state, patch) {
 }
 function CherryPickCheck(props) {
   const actions = Store.useActions();
-  const [state, patch] = React20.useReducer(reducer2, {
+  const [state, patch] = React21.useReducer(reducer2, {
     status: "init"
   });
   switch (state.status) {
     case "done":
       return props.children;
     case "prompt":
-      return /* @__PURE__ */ React20.createElement(YesNoPrompt, {
-        message: /* @__PURE__ */ React20.createElement(Text, {
+      return /* @__PURE__ */ React21.createElement(YesNoPrompt, {
+        message: /* @__PURE__ */ React21.createElement(Text, {
           color: colors.yellow
-        }, /* @__PURE__ */ React20.createElement(Command, null, "git cherry-pick"), " detected, would you like to abort it?"),
+        }, /* @__PURE__ */ React21.createElement(Command, null, "git cherry-pick"), " detected, would you like to abort it?"),
         onYes: async () => {
           await cli(`git cherry-pick --abort`);
           patch({ status: "done" });
@@ -37741,11 +37776,11 @@ function CherryPickCheck(props) {
         }
       });
     default:
-      return /* @__PURE__ */ React20.createElement(Await, {
+      return /* @__PURE__ */ React21.createElement(Await, {
         function: run,
-        fallback: /* @__PURE__ */ React20.createElement(Text, {
+        fallback: /* @__PURE__ */ React21.createElement(Text, {
           color: colors.yellow
-        }, "Checking for ", /* @__PURE__ */ React20.createElement(Command, null, "git cherry-pick"), "…")
+        }, "Checking for ", /* @__PURE__ */ React21.createElement(Command, null, "git cherry-pick"), "…")
       });
   }
   async function run() {
@@ -37771,7 +37806,7 @@ function CherryPickCheck(props) {
 }
 
 // src/app/Debug.tsx
-var React21 = __toESM(require_react(), 1);
+var React22 = __toESM(require_react(), 1);
 import fs4 from "node:fs/promises";
 import path2 from "node:path";
 
@@ -37824,14 +37859,14 @@ function Debug() {
   const state = Store.useState((state2) => state2);
   const argv = Store.useState((state2) => state2.argv);
   const debug = Store.useState((state2) => state2.select.debug(state2));
-  React21.useEffect(function debugMessageOnce() {
+  React22.useEffect(function debugMessageOnce() {
     if (debug) {
-      actions.output(/* @__PURE__ */ React21.createElement(Text, {
+      actions.output(/* @__PURE__ */ React22.createElement(Text, {
         color: colors.yellow
       }, "Debug mode enabled"));
     }
   }, [argv]);
-  React21.useEffect(function sync_state_json() {
+  React22.useEffect(function sync_state_json() {
     if (!argv?.["write-state-json"]) {
       return;
     }
@@ -37850,16 +37885,6 @@ function Debug() {
 // src/app/DependencyCheck.tsx
 var React23 = __toESM(require_react(), 1);
 
-// src/app/Url.tsx
-var React22 = __toESM(require_react(), 1);
-function Url(props) {
-  return /* @__PURE__ */ React22.createElement(Text, {
-    bold: true,
-    color: colors.blue,
-    ...props
-  }, props.children);
-}
-
 // src/core/is_command_available.ts
 import fs5 from "node:fs";
 import path3 from "node:path";
@@ -39844,11 +39869,6 @@ function get_value(props) {
   return props.value || props.defaultValue || "";
 }
 
-// src/core/gs_short_id.ts
-function gs_short_id() {
-  return `gs-${short_id()}`;
-}
-
 // src/app/SelectCommitRanges.tsx
 function SelectCommitRanges() {
   const commit_range = Store.useState((state) => state.commit_range);
@@ -39860,6 +39880,8 @@ function SelectCommitRanges() {
 function SelectCommitRangesInternal(props) {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
+  const branch_name = Store.useState((state) => state.branch_name);
+  invariant(branch_name, "branch_name must exist");
   const [selected_group_id, set_selected_group_id] = React42.useState(() => {
     const first_group = props.commit_range.group_list.find((g2) => g2.id !== props.commit_range.UNASSIGNED);
     if (first_group) {
@@ -40155,13 +40177,7 @@ function SelectCommitRangesInternal(props) {
     }
   })));
   function get_group_id() {
-    let branch_prefix = "";
-    if (argv["branch-prefix"]) {
-      branch_prefix = argv["branch-prefix"];
-    } else if (process.env.GIT_STACK_BRANCH_PREFIX) {
-      branch_prefix = process.env.GIT_STACK_BRANCH_PREFIX;
-    }
-    return `${branch_prefix}${gs_short_id()}`;
+    return `${branch_name}-${short_id()}`;
   }
   function submit_group_input(title) {
     const id = get_group_id();
@@ -40674,287 +40690,35 @@ async function run11() {
   }
 }
 
-// src/commands/Fixup.tsx
+// src/commands/Config.tsx
 var React50 = __toESM(require_react(), 1);
-function Fixup() {
-  return /* @__PURE__ */ React50.createElement(Await, {
-    fallback: null,
-    function: run12
-  });
-}
-async function run12() {
-  const state = Store.getState();
-  const actions = state.actions;
-  const argv = state.argv;
-  const relative_number = argv.commit;
-  if (!relative_number) {
-    actions.output(/* @__PURE__ */ React50.createElement(Text, {
-      color: colors.red
-    }, "❗️ Usage: git fixup ", "<relative-commit-number>"));
-    actions.output("");
-    actions.output("This script automates the process of adding staged changes as a fixup commit");
-    actions.output("and the subsequent git rebase to flatten the commits based on relative commit number");
-    actions.output("You can use a `git log` like below to get the relative commit number");
-    actions.output("");
-    actions.output("    ❯ git stack log");
-    actions.output("    1\te329794d5f881cbf0fc3f26d2108cf6f3fdebabe enable drop_error_subtask test param");
-    actions.output("    2\t57f43b596e5c6b97bc47e2a591f82ccc81651156 test drop_error_subtask baseline");
-    actions.output("    3\t838e878d483c6a2d5393063fc59baf2407225c6d ErrorSubtask test baseline");
-    actions.output("");
-    actions.output("To target `838e87` above, you would call `fixup 3`");
-    actions.exit(0);
+
+// node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
+import { notStrictEqual, strictEqual } from "assert";
+
+// node_modules/.pnpm/cliui@8.0.1/node_modules/cliui/build/lib/index.js
+var align = {
+  right: alignRight,
+  center: alignCenter
+};
+var top = 0;
+var right = 1;
+var bottom = 2;
+var left = 3;
+
+class UI {
+  constructor(opts) {
+    var _a;
+    this.width = opts.width;
+    this.wrap = (_a = opts.wrap) !== null && _a !== undefined ? _a : true;
+    this.rows = [];
   }
-  const diff_staged_cmd = await cli("git diff --cached --quiet", {
-    ignoreExitCode: true
-  });
-  if (!diff_staged_cmd.code) {
-    actions.error("\uD83D\uDEA8 Stage changes before calling fixup");
-    actions.exit(1);
+  span(...args) {
+    const cols = this.div(...args);
+    cols.span = true;
   }
-  const adjusted_number = Number(relative_number) - 1;
-  const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`)).stdout;
-  actions.output(/* @__PURE__ */ React50.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React50.createElement(Text, {
-      color: colors.yellow
-    }),
-    message: "\uD83D\uDEE0️ fixup {relative_number} {commit_sha}",
-    values: {
-      commit_sha: /* @__PURE__ */ React50.createElement(Parens, null, commit_sha),
-      relative_number
-    }
-  }));
-  await cli(`git commit --fixup ${commit_sha}`);
-  let save_stash = false;
-  const diff_cmd = await cli("git diff-index --quiet HEAD --", {
-    ignoreExitCode: true
-  });
-  if (diff_cmd.code) {
-    save_stash = true;
-    await cli("git stash --include-untracked");
-    actions.output(/* @__PURE__ */ React50.createElement(Text, {
-      color: colors.yellow
-    }, /* @__PURE__ */ React50.createElement(FormatText, {
-      message: "\uD83D\uDCE6 Changes saved to stash"
-    })));
-  }
-  try {
-    const rebase_target = Number(relative_number) + 1;
-    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
-      env: {
-        ...process.env,
-        GIT_EDITOR: "true"
-      }
-    });
-  } catch (error) {
-    actions.error("\uD83D\uDEA8 Fixup failed");
-    await cli("git rebase --abort");
-    await cli("git reset --soft HEAD~1");
-  } finally {
-    if (save_stash) {
-      await cli("git stash pop");
-      actions.output(/* @__PURE__ */ React50.createElement(Text, {
-        color: colors.green
-      }, "✅ Changes restored from stash"));
-    }
-  }
-  actions.exit(0);
-}
-
-// src/commands/Log.tsx
-var React51 = __toESM(require_react(), 1);
-function Log() {
-  const { stdout } = use_stdout_default();
-  const available_width = stdout.columns || 80;
-  return /* @__PURE__ */ React51.createElement(Await, {
-    fallback: null,
-    function: () => run13({ available_width })
-  });
-}
-async function run13(args) {
-  const state = Store.getState();
-  const actions = state.actions;
-  const process_argv = state.process_argv;
-  invariant(actions, "actions must exist");
-  const color_buffer = 12 * 5;
-  const truncation_width = args.available_width + color_buffer;
-  const short_sha = (await cli(`git log -1 --format=%h`)).stdout.trim();
-  const short_sha_length = short_sha.length + 1;
-  const sha_format = `%C(green)%<(${short_sha_length},trunc)%h`;
-  const date_format = `%C(white)%<(15,trunc)%cr`;
-  const author_format = `%C(white)%<(8,trunc)%al`;
-  const decoration_format = `%C(auto)%d`;
-  const subject_format = `%<(60,trunc)%s`;
-  const format = [sha_format, date_format, author_format, decoration_format, subject_format].join(" ");
-  const rest_args = process_argv.slice(3).join(" ");
-  const command = [
-    `git log --pretty=format:"${format}" -n20 --graph --color ${rest_args}`,
-    `cut -c 1-"${truncation_width}"`,
-    `nl -w3 -s' '`
-  ].join(" | ");
-  const result = await cli(command);
-  actions.output(result.stdout);
-  actions.exit(0);
-}
-
-// src/commands/Update.tsx
-var React52 = __toESM(require_react(), 1);
-function Update() {
-  return /* @__PURE__ */ React52.createElement(Await, {
-    fallback: null,
-    function: run14
-  });
-}
-async function run14() {
-  const state = Store.getState();
-  const actions = state.actions;
-  actions.exit(0);
-}
-
-// src/components/ErrorBoundary.tsx
-var React53 = __toESM(require_react(), 1);
-class ErrorBoundary extends React53.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      error: null,
-      component_stack: ""
-    };
-  }
-  static getDerivedStateFromError(error) {
-    return { error };
-  }
-  componentDidCatch(_error, error_info) {
-    let component_stack = error_info.componentStack;
-    if (component_stack) {
-      component_stack = component_stack.split(`
-`).slice(1).join(`
-`);
-      this.setState({ component_stack }, async () => {
-        await Exit.handle_exit({ code: 30, clear: true });
-      });
-    }
-  }
-  render() {
-    if (!this.state.error) {
-      return this.props.children;
-    }
-    const message = this.state.error.message;
-    return /* @__PURE__ */ React53.createElement(Box_default, {
-      flexDirection: "column",
-      gap: 0
-    }, /* @__PURE__ */ React53.createElement(Text, {
-      color: colors.red
-    }, /* @__PURE__ */ React53.createElement(FormatText, {
-      message: "\uD83D\uDEA8 Unhandled error {message}",
-      values: {
-        message: /* @__PURE__ */ React53.createElement(Text, {
-          color: colors.gray
-        }, message)
-      }
-    })), this._render_verbose());
-  }
-  _render_verbose() {
-    const store_state = Store.getState();
-    if (store_state.argv.verbose) {
-      return /* @__PURE__ */ React53.createElement(Text, {
-        color: colors.gray
-      }, this.state.component_stack);
-    }
-    return /* @__PURE__ */ React53.createElement(Text, {
-      color: colors.gray
-    }, /* @__PURE__ */ React53.createElement(FormatText, {
-      message: "Try again with `--verbose` to see more information."
-    }));
-  }
-}
-
-// src/components/ExitingGate.tsx
-var React54 = __toESM(require_react(), 1);
-function ExitingGate(props) {
-  const exit_mode = Store.useState((state) => state.exit_mode);
-  if (!exit_mode) {
-    return props.children;
-  }
-  switch (exit_mode) {
-    case "quiet":
-      return null;
-    case "normal":
-      return /* @__PURE__ */ React54.createElement(Box_default, {
-        flexDirection: "column"
-      }, /* @__PURE__ */ React54.createElement(Text, {
-        color: colors.red
-      }, /* @__PURE__ */ React54.createElement(FormatText, {
-        message: "\uD83D\uDEA8 Exiting…"
-      })));
-    default:
-      return null;
-  }
-}
-
-// src/app/App.tsx
-function App2() {
-  const actions = Store.useActions();
-  const ink = Store.useState((state) => state.ink);
-  const argv = Store.useState((state) => state.argv);
-  if (!ink || !argv || !argv.$0) {
-    return null;
-  }
-  const positional_list = new Set(argv["_"]);
-  const is_update = positional_list.has("update") || positional_list.has("upgrade");
-  return /* @__PURE__ */ React55.createElement(Providers, null, /* @__PURE__ */ React55.createElement(ErrorBoundary, null, /* @__PURE__ */ React55.createElement(Debug, null), /* @__PURE__ */ React55.createElement(Output2, null), /* @__PURE__ */ React55.createElement(ExitingGate, null, /* @__PURE__ */ React55.createElement(AutoUpdate, {
-    name: "git-stack-cli",
-    verbose: argv.verbose,
-    force: is_update,
-    timeoutMs: is_update ? 30 * 1000 : 2 * 1000,
-    onOutput: actions.output,
-    onDone: () => {
-      if (is_update) {
-        actions.exit(0);
-      }
-    }
-  }, /* @__PURE__ */ React55.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React55.createElement(RebaseCheck, null, /* @__PURE__ */ React55.createElement(CherryPickCheck, null, /* @__PURE__ */ React55.createElement(MaybeMain, null))))), /* @__PURE__ */ React55.createElement(HandleCtrlCSigint, null))));
-}
-function MaybeMain() {
-  const argv = Store.useState((state) => state.argv);
-  const positional_list = new Set(argv["_"]);
-  if (positional_list.has("fixup")) {
-    return /* @__PURE__ */ React55.createElement(Fixup, null);
-  } else if (positional_list.has("log")) {
-    return /* @__PURE__ */ React55.createElement(Log, null);
-  } else if (positional_list.has("update")) {
-    return /* @__PURE__ */ React55.createElement(Update, null);
-  } else if (positional_list.has("rebase")) {
-    return /* @__PURE__ */ React55.createElement(DependencyCheck, null, /* @__PURE__ */ React55.createElement(DirtyCheck, null, /* @__PURE__ */ React55.createElement(GatherMetadata, null, /* @__PURE__ */ React55.createElement(LocalCommitStatus, null, /* @__PURE__ */ React55.createElement(Rebase, null)))));
-  }
-  return /* @__PURE__ */ React55.createElement(React55.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React55.createElement(GithubApiError, null), /* @__PURE__ */ React55.createElement(DependencyCheck, null, /* @__PURE__ */ React55.createElement(DirtyCheck, null, /* @__PURE__ */ React55.createElement(GatherMetadata, null, /* @__PURE__ */ React55.createElement(RequireBranch, null, /* @__PURE__ */ React55.createElement(LocalCommitStatus, null, /* @__PURE__ */ React55.createElement(DetectInitialPR, null, /* @__PURE__ */ React55.createElement(Main, null))))))));
-}
-
-// node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
-import { notStrictEqual, strictEqual } from "assert";
-
-// node_modules/.pnpm/cliui@8.0.1/node_modules/cliui/build/lib/index.js
-var align = {
-  right: alignRight,
-  center: alignCenter
-};
-var top = 0;
-var right = 1;
-var bottom = 2;
-var left = 3;
-
-class UI {
-  constructor(opts) {
-    var _a;
-    this.width = opts.width;
-    this.wrap = (_a = opts.wrap) !== null && _a !== undefined ? _a : true;
-    this.rows = [];
-  }
-  span(...args) {
-    const cols = this.div(...args);
-    cols.span = true;
-  }
-  resetOutput() {
-    this.rows = [];
+  resetOutput() {
+    this.rows = [];
   }
   div(...args) {
     if (args.length === 0) {
@@ -45790,8 +45554,17 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // src/command.ts
-async function command2() {
-  return yargs_default(hideBin(process.argv)).scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.6.1").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+async function command2(argv, options = {}) {
+  let builder = yargs_default(hideBin(argv));
+  if (options.parserConfiguration) {
+    builder = builder.parserConfiguration(options.parserConfiguration);
+  }
+  if (options.env_config) {
+    builder = builder.config(options.env_config);
+  }
+  const parsed = await builder.scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).command("config", "Generate a one-time configuration json based on the passed arguments", (yargs) => yargs.options(DefaultOptions)).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.7.1").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`");
+  const result = parsed.argv;
+  return result;
 }
 var GlobalOptions = {
   verbose: {
@@ -45844,11 +45617,6 @@ var DefaultOptions = {
     default: false,
     description: "Open all PRs as drafts"
   },
-  "branch-prefix": {
-    type: "string",
-    default: "",
-    description: "Prefix for generated branch names, e.g. dev/magus/"
-  },
   "revise-sign": {
     type: "boolean",
     default: true,
@@ -45888,6 +45656,353 @@ var FixupOptions = {
   }
 };
 
+// src/commands/Config.tsx
+function Config() {
+  return /* @__PURE__ */ React50.createElement(Await, {
+    fallback: null,
+    function: run12
+  });
+  async function run12() {
+    const state = Store.getState();
+    const actions = state.actions;
+    const config = await get_explicit_args();
+    const config_json = JSON.stringify(config).replace(/"/g, "\\\"");
+    actions.output(/* @__PURE__ */ React50.createElement(Box_default, {
+      flexDirection: "column",
+      gap: 1,
+      paddingTop: 1
+    }, /* @__PURE__ */ React50.createElement(Text, null), /* @__PURE__ */ React50.createElement(FormatText, {
+      message: "Add the line below to your shell rc file ({zshrc}, {bashrc}, etc.)",
+      values: {
+        zshrc: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.gray
+        }, ".zshrc"),
+        bashrc: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.gray
+        }, ".bashrc")
+      }
+    }), /* @__PURE__ */ React50.createElement(FormatText, {
+      message: `{export} {ENV_VAR}{e}{q}{config_json}{q}`,
+      values: {
+        export: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.purple
+        }, "export"),
+        ENV_VAR: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.yellow
+        }, ENV_VAR),
+        e: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.purple
+        }, "="),
+        q: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.white
+        }, '"'),
+        config_json: /* @__PURE__ */ React50.createElement(Text, {
+          color: colors.green
+        }, config_json)
+      }
+    })));
+    actions.exit(0);
+  }
+}
+async function argv_with_config_from_env() {
+  if (!process.env.GIT_STACK_CONFIG) {
+    return await command2(process.argv);
+  }
+  const env_config = parse_env_config();
+  return await command2(process.argv, { env_config });
+}
+function parse_env_config() {
+  const GIT_STACK_CONFIG = process.env.GIT_STACK_CONFIG;
+  invariant(GIT_STACK_CONFIG, "GIT_STACK_CONFIG must exist");
+  try {
+    const env_config = JSON.parse(GIT_STACK_CONFIG);
+    return env_config;
+  } catch (error) {
+    console.error(`ERROR GIT_STACK_CONFIG=${GIT_STACK_CONFIG}`);
+    console.error("ERROR GIT_STACK_CONFIG environment variable is not valid JSON");
+    process.exit(18);
+  }
+}
+async function get_explicit_args() {
+  const default_argv = await command2(["git", "stack"], COMMAND_OPTIONS);
+  const state_argv = await command2(process.argv, COMMAND_OPTIONS);
+  const config = {};
+  for (const key of Object.keys(state_argv)) {
+    if (key === "_" || key === "$0")
+      continue;
+    const state_value = state_argv[key];
+    const default_value = default_argv[key];
+    const is_set = default_value !== state_value;
+    if (is_set) {
+      config[key] = state_value;
+    }
+  }
+  return config;
+}
+var ENV_VAR = "GIT_STACK_CONFIG";
+var COMMAND_OPTIONS = {
+  parserConfiguration: {
+    "strip-aliased": true
+  }
+};
+
+// src/commands/Fixup.tsx
+var React51 = __toESM(require_react(), 1);
+function Fixup() {
+  return /* @__PURE__ */ React51.createElement(Await, {
+    fallback: null,
+    function: run12
+  });
+}
+async function run12() {
+  const state = Store.getState();
+  const actions = state.actions;
+  const argv = state.argv;
+  const relative_number = argv.commit;
+  if (!relative_number) {
+    actions.output(/* @__PURE__ */ React51.createElement(Text, {
+      color: colors.red
+    }, "❗️ Usage: git fixup ", "<relative-commit-number>"));
+    actions.output("");
+    actions.output("This script automates the process of adding staged changes as a fixup commit");
+    actions.output("and the subsequent git rebase to flatten the commits based on relative commit number");
+    actions.output("You can use a `git log` like below to get the relative commit number");
+    actions.output("");
+    actions.output("    ❯ git stack log");
+    actions.output("    1\te329794d5f881cbf0fc3f26d2108cf6f3fdebabe enable drop_error_subtask test param");
+    actions.output("    2\t57f43b596e5c6b97bc47e2a591f82ccc81651156 test drop_error_subtask baseline");
+    actions.output("    3\t838e878d483c6a2d5393063fc59baf2407225c6d ErrorSubtask test baseline");
+    actions.output("");
+    actions.output("To target `838e87` above, you would call `fixup 3`");
+    actions.exit(0);
+  }
+  const diff_staged_cmd = await cli("git diff --cached --quiet", {
+    ignoreExitCode: true
+  });
+  if (!diff_staged_cmd.code) {
+    actions.error("\uD83D\uDEA8 Stage changes before calling fixup");
+    actions.exit(1);
+  }
+  const adjusted_number = Number(relative_number) - 1;
+  const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`)).stdout;
+  actions.output(/* @__PURE__ */ React51.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React51.createElement(Text, {
+      color: colors.yellow
+    }),
+    message: "\uD83D\uDEE0️ fixup {relative_number} {commit_sha}",
+    values: {
+      commit_sha: /* @__PURE__ */ React51.createElement(Parens, null, commit_sha),
+      relative_number
+    }
+  }));
+  await cli(`git commit --fixup ${commit_sha}`);
+  let save_stash = false;
+  const diff_cmd = await cli("git diff-index --quiet HEAD --", {
+    ignoreExitCode: true
+  });
+  if (diff_cmd.code) {
+    save_stash = true;
+    await cli("git stash --include-untracked");
+    actions.output(/* @__PURE__ */ React51.createElement(Text, {
+      color: colors.yellow
+    }, /* @__PURE__ */ React51.createElement(FormatText, {
+      message: "\uD83D\uDCE6 Changes saved to stash"
+    })));
+  }
+  try {
+    const rebase_target = Number(relative_number) + 1;
+    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
+      env: {
+        ...process.env,
+        GIT_EDITOR: "true"
+      }
+    });
+  } catch (error) {
+    actions.error("\uD83D\uDEA8 Fixup failed");
+    await cli("git rebase --abort");
+    await cli("git reset --soft HEAD~1");
+  } finally {
+    if (save_stash) {
+      await cli("git stash pop");
+      actions.output(/* @__PURE__ */ React51.createElement(Text, {
+        color: colors.green
+      }, "✅ Changes restored from stash"));
+    }
+  }
+  actions.exit(0);
+}
+
+// src/commands/Log.tsx
+var React52 = __toESM(require_react(), 1);
+function Log() {
+  const { stdout } = use_stdout_default();
+  const available_width = stdout.columns || 80;
+  return /* @__PURE__ */ React52.createElement(Await, {
+    fallback: null,
+    function: () => run13({ available_width })
+  });
+}
+async function run13(args) {
+  const state = Store.getState();
+  const actions = state.actions;
+  const process_argv = state.process_argv;
+  invariant(actions, "actions must exist");
+  const color_buffer = 12 * 5;
+  const truncation_width = args.available_width + color_buffer;
+  const short_sha = (await cli(`git log -1 --format=%h`)).stdout.trim();
+  const short_sha_length = short_sha.length + 1;
+  const sha_format = `%C(green)%<(${short_sha_length},trunc)%h`;
+  const date_format = `%C(white)%<(15,trunc)%cr`;
+  const author_format = `%C(white)%<(8,trunc)%al`;
+  const decoration_format = `%C(auto)%d`;
+  const subject_format = `%<(60,trunc)%s`;
+  const format3 = [sha_format, date_format, author_format, decoration_format, subject_format].join(" ");
+  const rest_args = process_argv.slice(3).join(" ");
+  const command3 = [
+    `git log --pretty=format:"${format3}" -n20 --graph --color ${rest_args}`,
+    `cut -c 1-"${truncation_width}"`,
+    `nl -w3 -s' '`
+  ].join(" | ");
+  const result = await cli(command3);
+  actions.output(result.stdout);
+  actions.exit(0);
+}
+
+// src/commands/Update.tsx
+var React53 = __toESM(require_react(), 1);
+function Update() {
+  return /* @__PURE__ */ React53.createElement(Await, {
+    fallback: null,
+    function: run14
+  });
+}
+async function run14() {
+  const state = Store.getState();
+  const actions = state.actions;
+  actions.exit(0);
+}
+
+// src/components/ErrorBoundary.tsx
+var React54 = __toESM(require_react(), 1);
+class ErrorBoundary extends React54.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      error: null,
+      component_stack: ""
+    };
+  }
+  static getDerivedStateFromError(error) {
+    return { error };
+  }
+  componentDidCatch(_error, error_info) {
+    let component_stack = error_info.componentStack;
+    if (component_stack) {
+      component_stack = component_stack.split(`
+`).slice(1).join(`
+`);
+      this.setState({ component_stack }, async () => {
+        await Exit.handle_exit({ code: 30, clear: true });
+      });
+    }
+  }
+  render() {
+    if (!this.state.error) {
+      return this.props.children;
+    }
+    const message = this.state.error.message;
+    return /* @__PURE__ */ React54.createElement(Box_default, {
+      flexDirection: "column",
+      gap: 0
+    }, /* @__PURE__ */ React54.createElement(Text, {
+      color: colors.red
+    }, /* @__PURE__ */ React54.createElement(FormatText, {
+      message: "\uD83D\uDEA8 Unhandled error {message}",
+      values: {
+        message: /* @__PURE__ */ React54.createElement(Text, {
+          color: colors.gray
+        }, message)
+      }
+    })), this._render_verbose());
+  }
+  _render_verbose() {
+    const store_state = Store.getState();
+    if (store_state.argv.verbose) {
+      return /* @__PURE__ */ React54.createElement(Text, {
+        color: colors.gray
+      }, this.state.component_stack);
+    }
+    return /* @__PURE__ */ React54.createElement(Text, {
+      color: colors.gray
+    }, /* @__PURE__ */ React54.createElement(FormatText, {
+      message: "Try again with `--verbose` to see more information."
+    }));
+  }
+}
+
+// src/components/ExitingGate.tsx
+var React55 = __toESM(require_react(), 1);
+function ExitingGate(props) {
+  const exit_mode = Store.useState((state) => state.exit_mode);
+  if (!exit_mode) {
+    return props.children;
+  }
+  switch (exit_mode) {
+    case "quiet":
+      return null;
+    case "normal":
+      return /* @__PURE__ */ React55.createElement(Box_default, {
+        flexDirection: "column"
+      }, /* @__PURE__ */ React55.createElement(Text, {
+        color: colors.red
+      }, /* @__PURE__ */ React55.createElement(FormatText, {
+        message: "\uD83D\uDEA8 Exiting…"
+      })));
+    default:
+      return null;
+  }
+}
+
+// src/app/App.tsx
+function App2() {
+  const actions = Store.useActions();
+  const ink = Store.useState((state) => state.ink);
+  const argv = Store.useState((state) => state.argv);
+  if (!ink || !argv || !argv.$0) {
+    return null;
+  }
+  const positional_list = new Set(argv["_"]);
+  const is_update = positional_list.has("update") || positional_list.has("upgrade");
+  return /* @__PURE__ */ React56.createElement(Providers, null, /* @__PURE__ */ React56.createElement(ErrorBoundary, null, /* @__PURE__ */ React56.createElement(Debug, null), /* @__PURE__ */ React56.createElement(Output2, null), /* @__PURE__ */ React56.createElement(ExitingGate, null, /* @__PURE__ */ React56.createElement(AutoUpdate, {
+    name: "git-stack-cli",
+    verbose: argv.verbose,
+    force: is_update,
+    timeoutMs: is_update ? 30 * 1000 : 2 * 1000,
+    onOutput: actions.output,
+    onDone: () => {
+      if (is_update) {
+        actions.exit(0);
+      }
+    }
+  }, /* @__PURE__ */ React56.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React56.createElement(RebaseCheck, null, /* @__PURE__ */ React56.createElement(CherryPickCheck, null, /* @__PURE__ */ React56.createElement(MaybeMain, null))))), /* @__PURE__ */ React56.createElement(HandleCtrlCSigint, null))));
+}
+function MaybeMain() {
+  const argv = Store.useState((state) => state.argv);
+  const positional_list = new Set(argv["_"]);
+  if (positional_list.has("fixup")) {
+    return /* @__PURE__ */ React56.createElement(Fixup, null);
+  } else if (positional_list.has("log")) {
+    return /* @__PURE__ */ React56.createElement(Log, null);
+  } else if (positional_list.has("update")) {
+    return /* @__PURE__ */ React56.createElement(Update, null);
+  } else if (positional_list.has("config")) {
+    return /* @__PURE__ */ React56.createElement(Config, null);
+  } else if (positional_list.has("rebase")) {
+    return /* @__PURE__ */ React56.createElement(DependencyCheck, null, /* @__PURE__ */ React56.createElement(DirtyCheck, null, /* @__PURE__ */ React56.createElement(GatherMetadata, null, /* @__PURE__ */ React56.createElement(LocalCommitStatus, null, /* @__PURE__ */ React56.createElement(Rebase, null)))));
+  }
+  return /* @__PURE__ */ React56.createElement(React56.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React56.createElement(GithubApiError, null), /* @__PURE__ */ React56.createElement(DependencyCheck, null, /* @__PURE__ */ React56.createElement(DirtyCheck, null, /* @__PURE__ */ React56.createElement(GatherMetadata, null, /* @__PURE__ */ React56.createElement(RequireBranch, null, /* @__PURE__ */ React56.createElement(LocalCommitStatus, null, /* @__PURE__ */ React56.createElement(DetectInitialPR, null, /* @__PURE__ */ React56.createElement(Main, null))))))));
+}
+
 // src/index.tsx
 (async function main() {
   try {
@@ -45897,7 +46012,7 @@ var FixupOptions = {
         console.error("Try again with `--verbose` to see more information.");
       }
     };
-    const argv = await command2();
+    const argv = await argv_with_config_from_env();
     process.stdin.resume();
     process.on("uncaughtException", (error) => {
       console.error("\uD83D\uDEA8 uncaughtException");
@@ -45913,7 +46028,7 @@ var FixupOptions = {
     });
     const tmp_dir = await get_tmp_dir();
     await fs12.rm(tmp_dir, { recursive: true });
-    const ink = render_default(/* @__PURE__ */ React56.createElement(App2, null), {
+    const ink = render_default(/* @__PURE__ */ React57.createElement(App2, null), {
       exitOnCtrlC: false
     });
     Store.setState((state) => {