git-stack-cli 2.6.1 → 2.7.0

package/README.md

@@ -58,6 +58,15 @@ git stack --no-verify # skip git hooks such as pre-commit and pre-push
 git stack help        # print a table of all CLI arguments
 ```
 
+### Adding new commits and pull requests
+
+Adding commits to a PR is as simple as running `git stack` and adding commits to a PR.
+
+1. Run `git stack`
+1. Press `c` to create a new PR
+1. Use `↑↓` and `space`/`enter` to navigate and assign commits to the PR
+1. Press `s` to sync created PRs and commits to Github
+
 ### Editing existing commits and pull requests
 
 Sometimes you want to add changes to an existing commit or pull request.
@@ -87,19 +96,29 @@ To update your local branch with the latest changes in the remote branch (e.g. `
 git stack rebase
 ```
 
-### Customizing branch name
+### Branch names
+
+By default `git stack` generates a unique identifier and appends it to your local branch name.
 
-By default `git stack` generates a unique branch name such as `gs-3cmrMBSUj`.
+For example, if you are locally working in `dev/feature-a`, PRs branch names will look like `dev/feature-a-3cmrMBSUj`.
 
-You can specify a prefix for the generated branch name by using either the environment variable or the command line option.
-In the example below branches would be generated such as `dev/magus/gs-3cmrMBSUj`.
+### Overriding defaults
+
+`git stack` has many optional flags to control its behavior.
+You can view them by running `git stack help` and set them as needed.
+
+If you prefer to set them once in your environment, you can use the command below to generate a one-time configuration.
 
 ```bash
-GIT_STACK_BRANCH_PREFIX="dev/magus/" git stack
+❯ git stack config --draft --force
 
-git stack --branch-prefix="dev/magus/"
+Add the line below to your shell rc file (.zshrc, .bashrc, etc.)
+
+export GIT_STACK_CONFIG="{\"draft\":true,\"force\":true}"
 ```
 
+Copy this environment variable into your shell configuration, e.g. `.zshrc`, `.bashrc`, etc.
+
 ## Why?
 
 The goal of `git stack` is to combine the **simplicity of developing in a single branch** in order to **preserve your commit history** while also **grouping commits into pull requests for code review**.

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,7 +31935,7 @@ 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);
@@ -37467,7 +37467,7 @@ function AutoUpdate(props) {
     let status2 = "init";
     let latest_version = null;
     let is_brew_bun_standalone = false;
-    const local_version = "2.6.1";
+    const local_version = "2.7.0";
     const is_output = props_ref.current.verbose || props_ref.current.force;
     async function auto_update() {
       if (!local_version) {
@@ -39844,11 +39844,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 +39855,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 +40152,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,260 +40665,8 @@ 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);
-  }
-  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__ */ 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";
@@ -45790,8 +45529,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.0").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 +45592,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 +45631,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 +45987,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 +46003,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) => {

package/package.json

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

package/src/app/App.tsx

@@ -17,6 +17,7 @@ import { RebaseCheck } from "~/app/RebaseCheck";
 import { RequireBranch } from "~/app/RequireBranch";
 import { Store } from "~/app/Store";
 import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
+import { Config } from "~/commands/Config";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
 import { Rebase } from "~/commands/Rebase";
@@ -92,6 +93,8 @@ function MaybeMain() {
     return <Log />;
   } else if (positional_list.has("update")) {
     return <Update />;
+  } else if (positional_list.has("config")) {
+    return <Config />;
   } else if (positional_list.has("rebase")) {
     return (
       <DependencyCheck>

package/src/app/SelectCommitRanges.tsx

@@ -10,8 +10,8 @@ import { Parens } from "~/app/Parens";
 import { Store } from "~/app/Store";
 import { TextInput } from "~/app/TextInput";
 import { colors } from "~/core/colors";
-import { gs_short_id } from "~/core/gs_short_id";
 import { invariant } from "~/core/invariant";
+import { short_id } from "~/core/short_id";
 import { wrap_index } from "~/core/wrap_index";
 
 import type { State } from "~/app/Store";
@@ -35,6 +35,8 @@ function SelectCommitRangesInternal(props: 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] = React.useState(() => {
     const first_group = props.commit_range.group_list.find(
@@ -444,17 +446,7 @@ function SelectCommitRangesInternal(props: Props) {
   );
 
   function get_group_id() {
-    let branch_prefix = "";
-
-    // branch prefix via cli flag or env var
-    // cli flag takes precedence since it is more explicit
-    if (argv["branch-prefix"]) {
-      branch_prefix = argv["branch-prefix"];
-    } else if (process.env.GIT_STACK_BRANCH_PREFIX) {
-      branch_prefix = process.env.GIT_STACK_BRANCH_PREFIX;
-    }
-
-    return `${branch_prefix}${gs_short_id()}`;
+    return `${branch_name}-${short_id()}`;
   }
 
   function submit_group_input(title: string) {

package/src/command.ts

@@ -1,54 +1,78 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-import type { Options, InferredOptionTypes, Arguments } from "yargs";
+import type { Options, InferredOptionTypes, Arguments, ParserConfigurationOptions } from "yargs";
 
 export type Argv = Arguments & TGlobalOptions & TFixupOptions & TDefaultOptions;
 
-export async function command() {
+type CommandOptions = {
+  env_config?: Partial<Argv>;
+  parserConfiguration?: Partial<ParserConfigurationOptions>;
+};
+
+export async function command(argv: string[], options: CommandOptions = {}) {
   // https://yargs.js.org/docs/#api-reference-optionkey-opt
-  return (
-    yargs(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)
-
-      // yargs default wraps to 80 columns
-      // passing null will wrap to terminal width
-      // value below if what seems to look decent
-      .wrap(123)
-
-      // disallow unknown options
-      .strict()
-      .version(process.env.CLI_VERSION || "unknown")
-      .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
-      .help("help", "Show usage via `git stack help`").argv as unknown as Promise<Argv>
-  );
+  let builder = yargs(hideBin(argv));
+
+  if (options.parserConfiguration) {
+    builder = builder.parserConfiguration(options.parserConfiguration);
+  }
+
+  // apply overrides from config
+  // higher precedence than defaults, but lower precendence than cli flags
+  // perfect since that's what we want, prefer config only if not explicitly set on cli
+  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)
+
+    // yargs default wraps to 80 columns
+    // passing null will wrap to terminal width
+    // value below if what seems to look decent
+    .wrap(123)
+
+    // disallow unknown options
+    .strict()
+    .version(process.env.CLI_VERSION || "unknown")
+    .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
+    .help("help", "Show usage via `git stack help`");
+
+  const result = parsed.argv as unknown as Argv;
+  return result;
 }
 
 const GlobalOptions = {
@@ -109,12 +133,6 @@ const DefaultOptions = {
     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,

package/src/commands/Config.tsx

@@ -0,0 +1,106 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { FormatText } from "~/app/FormatText";
+import { Store } from "~/app/Store";
+import { command } from "~/command";
+import { colors } from "~/core/colors";
+import { invariant } from "~/core/invariant";
+
+export function Config() {
+  return <Await fallback={null} function={run} />;
+
+  async function run() {
+    const state = Store.getState();
+    const actions = state.actions;
+
+    const config = await get_explicit_args();
+    const config_json = JSON.stringify(config).replace(/"/g, '\\"');
+
+    actions.output(
+      <Ink.Box flexDirection="column" gap={1} paddingTop={1}>
+        <Ink.Text></Ink.Text>
+
+        <FormatText
+          message="Add the line below to your shell rc file ({zshrc}, {bashrc}, etc.)"
+          values={{
+            zshrc: <Ink.Text color={colors.gray}>.zshrc</Ink.Text>,
+            bashrc: <Ink.Text color={colors.gray}>.bashrc</Ink.Text>,
+          }}
+        />
+
+        <FormatText
+          message={`{export} {ENV_VAR}{e}{q}{config_json}{q}`}
+          values={{
+            export: <Ink.Text color={colors.purple}>export</Ink.Text>,
+            ENV_VAR: <Ink.Text color={colors.yellow}>{ENV_VAR}</Ink.Text>,
+            e: <Ink.Text color={colors.purple}>{"="}</Ink.Text>,
+            q: <Ink.Text color={colors.white}>{'"'}</Ink.Text>,
+            config_json: <Ink.Text color={colors.green}>{config_json}</Ink.Text>,
+          }}
+        />
+      </Ink.Box>,
+    );
+
+    actions.exit(0);
+  }
+}
+
+export async function argv_with_config_from_env() {
+  if (!process.env.GIT_STACK_CONFIG) {
+    return await command(process.argv);
+  }
+
+  const env_config = parse_env_config();
+  return await command(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) {
+    // eslint-disable-next-line no-console
+    console.error(`ERROR GIT_STACK_CONFIG=${GIT_STACK_CONFIG}`);
+    // eslint-disable-next-line no-console
+    console.error("ERROR GIT_STACK_CONFIG environment variable is not valid JSON");
+    process.exit(18);
+  }
+}
+
+async function get_explicit_args() {
+  const default_argv = await command(["git", "stack"], COMMAND_OPTIONS);
+  const state_argv = await command(process.argv, COMMAND_OPTIONS);
+
+  const config: Record<string, any> = {};
+
+  // find delta between default_argv and argv
+  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;
+}
+
+const ENV_VAR = "GIT_STACK_CONFIG";
+
+type CommandOptions = NonNullable<Parameters<typeof command>[1]>;
+
+const COMMAND_OPTIONS = {
+  parserConfiguration: {
+    // Should aliases be removed before returning results? Default is `false`
+    "strip-aliased": true,
+  },
+} satisfies CommandOptions;

package/src/index.tsx

@@ -11,13 +11,13 @@ import * as Ink from "ink-cjs";
 
 import { App } from "~/app/App";
 import { Store } from "~/app/Store";
-import { command } from "~/command";
+import { argv_with_config_from_env } from "~/commands/Config";
 import { get_tmp_dir } from "~/core/get_tmp_dir";
 import { pretty_json } from "~/core/pretty_json";
 
 (async function main() {
   try {
-    const argv = await command();
+    const argv = await argv_with_config_from_env();
 
     // required to get bun working with ink
     // https://github.com/oven-sh/bun/issues/6862#issuecomment-2429444852

package/src/types/global.d.ts

@@ -4,6 +4,6 @@ declare namespace NodeJS {
     DEV?: "true" | "false";
     CLI_VERSION?: string;
     GIT_SEQUENCE_EDITOR_SCRIPT?: string;
-    GIT_STACK_BRANCH_PREFIX?: string;
+    GIT_STACK_CONFIG?: string;
   }
 }

package/src/core/gs_short_id.ts

@@ -1,5 +0,0 @@
-import { short_id } from "~/core/short_id";
-
-export function gs_short_id() {
-  return `gs-${short_id()}`;
-}