git-stack-cli 2.7.1 → 2.7.3

package/dist/js/index.js

@@ -37414,6 +37414,17 @@ async function fetch_json(url) {
   });
 }
 
+// src/core/get_timeout_fn.ts
+function get_timeout_fn(ms, message) {
+  return function timeout(promise) {
+    let id;
+    const timeout = new Promise((_resolve, reject) => {
+      id = setTimeout(() => reject(new Error(message)), ms);
+    });
+    return Promise.race([promise, timeout]).finally(() => clearTimeout(id));
+  };
+}
+
 // src/core/is_finite_value.ts
 function is_finite_value(value) {
   return typeof value === "number" && Number.isFinite(value);
@@ -37522,19 +37533,15 @@ function AutoUpdate(props) {
     async function init_state() {
       if (state.latest_version !== null)
         return;
-      const local_version = "2.7.1";
+      const local_version = "2.7.3";
       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 timeout = get_timeout_fn(timeout_ms, "AutoUpdate timeout");
+      const npm_json = await timeout(fetch_json(`https://registry.npmjs.org/${props.name}`));
       const maybe_version = npm_json?.["dist-tags"]?.latest;
       if (typeof maybe_version === "string") {
         return maybe_version;
@@ -38078,7 +38085,12 @@ function write(message, values) {
   return new_message;
 }
 function read(message) {
-  const values = { id: null, title: null };
+  const values = { subject: null, id: null, title: null };
+  const match_subject = message.match(RE2.subject_line);
+  if (match_subject?.groups) {
+    values.subject = match_subject.groups["subject"];
+    invariant(values.subject, "subject must exist");
+  }
   const match_id = message.match(RE2.stack_id);
   if (match_id?.groups) {
     values.id = match_id.groups["id"];
@@ -38106,10 +38118,46 @@ var TEMPLATE = {
   }
 };
 var RE2 = {
+  subject_line: /^(?<subject>[^\n]*)/,
   stack_id: new RegExp(`${TEMPLATE.stack_id("(?<id>[^\\s]+)")}`, "i"),
   group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i")
 };
 
+// src/core/git.ts
+async function get_commits(dot_range) {
+  const log_result = await cli(`git log ${dot_range} --format=${FORMAT} --color=never`);
+  if (!log_result.stdout) {
+    return [];
+  }
+  const commit_list = [];
+  for (let record of log_result.stdout.split(SEP2.record)) {
+    record = record.replace(/^\n/, "");
+    record = record.replace(/\n$/, "");
+    if (!record)
+      continue;
+    const [sha, full_message] = record.split(SEP2.field);
+    const metadata = read(full_message);
+    const branch_id = metadata.id;
+    const subject_line = metadata.subject || "";
+    const title = metadata.title;
+    const commit = {
+      sha,
+      full_message,
+      subject_line,
+      branch_id,
+      title
+    };
+    commit_list.push(commit);
+  }
+  commit_list.reverse();
+  return commit_list;
+}
+var SEP2 = {
+  record: "\x1E",
+  field: "\x1F"
+};
+var FORMAT = `%H${SEP2.field}%B${SEP2.record}`;
+
 // src/core/github.tsx
 var React24 = __toESM(require_react(), 1);
 import crypto from "node:crypto";
@@ -38144,6 +38192,8 @@ var RE3 = {
 async function pr_list() {
   const state = Store.getState();
   const actions = state.actions;
+  const timer = Timer();
+  actions.debug("start github.pr_list");
   const username = state.username;
   const repo_path = state.repo_path;
   invariant(username, "username must exist");
@@ -38165,6 +38215,8 @@ async function pr_list() {
       state2.pr[pr.headRefName] = pr;
     }
   });
+  const duration = timer.duration();
+  actions.debug(`end github.pr_list (duration=${duration})`);
   return result_pr_list;
 }
 async function pr_status(branch) {
@@ -38287,11 +38339,12 @@ var RE4 = {
 
 // src/core/CommitMetadata.ts
 async function range(commit_group_map) {
-  const master_branch = Store.getState().master_branch;
   await pr_list();
-  const commit_list = await get_commit_list();
+  const master_branch = Store.getState().master_branch;
+  const commit_list = await get_commits(`${master_branch}..HEAD`);
   const pr_lookup = {};
   let invalid = false;
+  let last_group_id = null;
   const group_map = new Map;
   for (const commit of commit_list) {
     let id = commit.branch_id;
@@ -38307,9 +38360,7 @@ async function range(commit_group_map) {
       invalid = true;
     }
     if (id) {
-      const group_key_list = Array.from(group_map.keys());
-      const last_key = group_key_list[group_key_list.length - 1];
-      if (group_map.has(id) && last_key !== id) {
+      if (group_map.has(id) && last_group_id !== id) {
         invalid = true;
       }
     } else {
@@ -38329,6 +38380,7 @@ async function range(commit_group_map) {
     };
     group.commits.push(commit);
     group_map.set(id, group);
+    last_group_id = id;
   }
   const group_value_list = Array.from(group_map.values());
   const group_list = [];
@@ -38394,44 +38446,6 @@ async function range(commit_group_map) {
   }
   return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
-async function get_commit_list() {
-  const master_branch = Store.getState().master_branch;
-  const log_result = await cli(`git log ${master_branch}..HEAD --oneline --format=%H --color=never`);
-  if (!log_result.stdout) {
-    return [];
-  }
-  const sha_list = lines(log_result.stdout).reverse();
-  const commit_metadata_list = [];
-  for (let i2 = 0;i2 < sha_list.length; i2++) {
-    const sha = sha_list[i2];
-    const commit_metadata = await commit(sha);
-    commit_metadata_list.push(commit_metadata);
-  }
-  return commit_metadata_list;
-}
-async function commit(sha) {
-  const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-  const metadata = await read(full_message);
-  const branch_id = metadata?.id;
-  const subject_line = get_subject_line(full_message);
-  const title = metadata?.title;
-  return {
-    sha,
-    full_message,
-    subject_line,
-    branch_id,
-    title
-  };
-}
-function get_subject_line(message) {
-  const line_list = lines(message);
-  const first_line = line_list[0];
-  return remove(first_line);
-}
-function lines(value) {
-  return value.split(`
-`);
-}
 var UNASSIGNED = "unassigned";
 
 // src/core/GitReviseTodo.ts
@@ -38442,8 +38456,8 @@ function GitReviseTodo(args) {
   const group_list = args.commit_range.group_list;
   for (let i2 = args.rebase_group_index;i2 < group_list.length; i2++) {
     const group = group_list[i2];
-    for (const commit2 of group.commits) {
-      commit_list.push(commit2);
+    for (const commit of group.commits) {
+      commit_list.push(commit);
     }
   }
   const todo = GitReviseTodo.todo({ commit_list });
@@ -38451,17 +38465,17 @@ function GitReviseTodo(args) {
 }
 GitReviseTodo.todo = function todo(args) {
   const entry_list = [];
-  for (const commit2 of args.commit_list) {
-    const sha = commit2.sha.slice(0, 12);
+  for (const commit of args.commit_list) {
+    const sha = commit.sha.slice(0, 12);
     const entry_lines = [`++ pick ${sha}`];
-    const id = commit2.branch_id;
+    const id = commit.branch_id;
     if (id == null || id === UNASSIGNED) {
-      entry_lines.push(commit2.full_message);
+      entry_lines.push(commit.full_message);
     } else {
-      const title = commit2.title;
+      const title = commit.title;
       invariant(title, "commit.title must exist");
       const metadata = { id, title };
-      const unsafe_message_with_id = write(commit2.full_message, metadata);
+      const unsafe_message_with_id = write(commit.full_message, metadata);
       const message_with_id = unsafe_message_with_id;
       entry_lines.push(message_with_id);
     }
@@ -38629,8 +38643,8 @@ function DetectInitialPR(props) {
     invariant(commit_range, "commit_range must exist");
     try {
       let has_existing_metadata = false;
-      for (const commit2 of commit_range.commit_list) {
-        if (commit2.branch_id) {
+      for (const commit of commit_range.commit_list) {
+        if (commit.branch_id) {
           has_existing_metadata = true;
           break;
         }
@@ -38659,9 +38673,9 @@ function DetectInitialPR(props) {
     for (const group of commit_range.group_list) {
       group.id = branch_name2;
       group.title = state.pr?.title || "-";
-      for (const commit2 of commit_range.commit_list) {
-        commit2.branch_id = group.id;
-        commit2.title = group.title;
+      for (const commit of commit_range.commit_list) {
+        commit.branch_id = group.id;
+        commit.title = group.title;
       }
     }
     const rebase_group_index = 0;
@@ -39290,7 +39304,9 @@ Rebase.run = async function run5(props) {
     }
     actions.exit(20);
   }
+  actions.debug("start CommitMetadata.range");
   const next_commit_range = await range();
+  actions.debug("end CommitMetadata.range");
   actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.green
@@ -39320,12 +39336,12 @@ Rebase.run = async function run5(props) {
     await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
     const picked_commit_list = [];
     for (let i2 = 0;i2 < commit_range.commit_list.length; i2++) {
-      const commit2 = commit_range.commit_list[i2];
-      const commit_pr = commit_range.pr_lookup[commit2.branch_id || ""];
+      const commit = commit_range.commit_list[i2];
+      const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
       const merged_pr = commit_pr?.state === "MERGED";
       const commit_message = /* @__PURE__ */ React34.createElement(Text, {
         color: colors.blue
-      }, commit2.subject_line);
+      }, commit.subject_line);
       if (merged_pr) {
         actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
           wrapper: /* @__PURE__ */ React34.createElement(Text, {
@@ -39352,15 +39368,17 @@ Rebase.run = async function run5(props) {
           commit_message
         }
       }));
-      picked_commit_list.push(commit2);
+      picked_commit_list.push(commit);
     }
     if (picked_commit_list.length > 0) {
       await cli(`git clean -fd`);
-      const sha_list = picked_commit_list.map((commit2) => commit2.sha).join(" ");
+      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
       await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
     }
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
+    actions.debug("start restore_git()");
     restore_git();
+    actions.debug("end restore_git()");
   }
   function restore_git() {
     const spawn_options = { ignoreExitCode: true };
@@ -39431,10 +39449,10 @@ async function run6() {
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
     let commit_range = await range(commit_map);
     commit_range.group_list.reverse();
-    for (const commit2 of commit_range.commit_list) {
-      const group_from_map = commit_map[commit2.sha];
-      commit2.branch_id = group_from_map.id;
-      commit2.title = group_from_map.title;
+    for (const commit of commit_range.commit_list) {
+      const group_from_map = commit_map[commit.sha];
+      commit.branch_id = group_from_map.id;
+      commit.title = group_from_map.title;
     }
     await GitReviseTodo.execute({
       rebase_group_index: 0,
@@ -39898,8 +39916,8 @@ function SelectCommitRangesInternal(props) {
     map.set(args.key, args.value);
     return new Map(map);
   }, new Map, (map) => {
-    for (const commit2 of props.commit_range.commit_list) {
-      map.set(commit2.sha, commit2.branch_id);
+    for (const commit of props.commit_range.commit_list) {
+      map.set(commit.sha, commit.branch_id);
     }
     return new Map(map);
   });
@@ -39989,8 +40007,8 @@ function SelectCommitRangesInternal(props) {
   const max_width = 80;
   const [focused, set_focused] = React42.useState("");
   const has_groups = group.id !== props.commit_range.UNASSIGNED;
-  const items = props.commit_range.commit_list.map((commit2) => {
-    const commit_metadata_id = commit_map.get(commit2.sha);
+  const items = props.commit_range.commit_list.map((commit) => {
+    const commit_metadata_id = commit_map.get(commit.sha);
     const selected = commit_metadata_id !== null;
     let disabled;
     if (group_input) {
@@ -40001,8 +40019,8 @@ function SelectCommitRangesInternal(props) {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
     return {
-      label: commit2.subject_line,
-      value: commit2,
+      label: commit.subject_line,
+      value: commit,
       selected,
       disabled
     };
@@ -40133,7 +40151,7 @@ function SelectCommitRangesInternal(props) {
     wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
-    message: "Press {s} to {sync} the {count} assigned commits to Github",
+    message: argv.sync ? "Press {s} to {sync} the {count} assigned commits to Github" : "Press {s} to {sync} the {count} assigned commits locally",
     values: {
       ...S_TO_SYNC_VALUES,
       count: /* @__PURE__ */ React42.createElement(Text, {
@@ -40141,15 +40159,11 @@ function SelectCommitRangesInternal(props) {
         bold: true
       }, assigned_count)
     }
-  })) : /* @__PURE__ */ React42.createElement(React42.Fragment, null, argv.sync ? /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github",
-    values: S_TO_SYNC_VALUES
-  }) : /* @__PURE__ */ React42.createElement(FormatText, {
+  })) : /* @__PURE__ */ React42.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React42.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
+    message: argv.sync ? "\uD83C\uDF89 Done! Press {s} to {sync} the PRs to Github" : "\uD83C\uDF89 Done! Press {s} to {sync} the PRs locally",
     values: S_TO_SYNC_VALUES
-  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
+  }), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
@@ -40204,8 +40218,8 @@ function SelectCommitRangesInternal(props) {
     }
     let allow_unassigned_sync = null;
     for (let i2 = 0;i2 < props.commit_range.commit_list.length; i2++) {
-      const commit2 = props.commit_range.commit_list[i2];
-      const group_id = commit_map.get(commit2.sha);
+      const commit = props.commit_range.commit_list[i2];
+      const group_id = commit_map.get(commit.sha);
       if (allow_unassigned_sync === null) {
         if (group_id === null) {
           allow_unassigned_sync = true;
@@ -40770,14 +40784,14 @@ class UI {
     return [0, noAnsi.match(/\s*$/)[0].length, 0, noAnsi.match(/^\s*/)[0].length];
   }
   toString() {
-    const lines2 = [];
+    const lines = [];
     this.rows.forEach((row) => {
-      this.rowToString(row, lines2);
+      this.rowToString(row, lines);
     });
-    return lines2.filter((line) => !line.hidden).map((line) => line.text).join(`
+    return lines.filter((line) => !line.hidden).map((line) => line.text).join(`
 `);
   }
-  rowToString(row, lines2) {
+  rowToString(row, lines) {
     this.rasterize(row).forEach((rrow, r3) => {
       let str = "";
       rrow.forEach((col, c2) => {
@@ -40804,16 +40818,16 @@ class UI {
         if (padding[right]) {
           str += " ".repeat(padding[right]);
         }
-        if (r3 === 0 && lines2.length > 0) {
-          str = this.renderInline(str, lines2[lines2.length - 1]);
+        if (r3 === 0 && lines.length > 0) {
+          str = this.renderInline(str, lines[lines.length - 1]);
         }
       });
-      lines2.push({
+      lines.push({
         text: str.replace(/ +$/, ""),
         span: row.span
       });
     });
-    return lines2;
+    return lines;
   }
   renderInline(source, previousLine) {
     const match2 = source.match(/^ */);
@@ -45559,10 +45573,13 @@ async function command2(argv, options = {}) {
   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 parsed = await builder.scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => {
+    let builder2 = yargs.options(DefaultOptions);
+    if (options.env_config) {
+      builder2 = builder2.config(options.env_config);
+    }
+    return builder2;
+  }).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.3").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;
 }

package/package.json

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

package/scripts/bun-build.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import * as util from "util";
 
 import * as file from "~/core/file";
+import { get_local_iso } from "~/core/get_local_iso";
 import { spawn } from "~/core/spawn";
 
 const parsed_args = util.parseArgs({
@@ -25,7 +26,7 @@ const WATCH = parsed_args.values.watch;
 const VERBOSE = parsed_args.values.verbose;
 
 function log(...args: any[]) {
-  const timestamp = new Date().toISOString();
+  const timestamp = get_local_iso(new Date());
   console.debug(`[${timestamp}]`, ...args);
 }
 

package/scripts/core/get_local_iso.ts

@@ -0,0 +1,20 @@
+export function get_local_iso(date: Date) {
+  const d: Record<string, string> = {};
+  for (const part of FORMATTER.formatToParts(date)) {
+    d[part.type] = part.value;
+  }
+
+  const ms = String(date.getMilliseconds()).padStart(3, "0");
+  const timestamp = `${d.year}-${d.month}-${d.day}T${d.hour}:${d.minute}:${d.second}.${ms}Z`;
+  return timestamp;
+}
+
+const FORMATTER = new Intl.DateTimeFormat("en-CA", {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hour12: false,
+});

package/src/app/AutoUpdate.tsx

@@ -11,9 +11,9 @@ import { assertNever } from "~/core/assertNever";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { fetch_json } from "~/core/fetch_json";
+import { get_timeout_fn } from "~/core/get_timeout_fn";
 import { is_finite_value } from "~/core/is_finite_value";
 import { semver_compare } from "~/core/semver_compare";
-import { sleep } from "~/core/sleep";
 
 type Props = {
   name: string;
@@ -162,21 +162,12 @@ export function AutoUpdate(props: Props) {
 
     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 timeout = get_timeout_fn(timeout_ms, "AutoUpdate timeout");
+      const npm_json = await timeout(fetch_json(`https://registry.npmjs.org/${props.name}`));
       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");
     }
 

package/src/app/SelectCommitRanges.tsx

@@ -380,7 +380,11 @@ function SelectCommitRangesInternal(props: Props) {
           {sync_status !== "allow_unassigned" ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
-              message="Press {s} to {sync} the {count} assigned commits to Github"
+              message={
+                argv.sync
+                  ? "Press {s} to {sync} the {count} assigned commits to Github"
+                  : "Press {s} to {sync} the {count} assigned commits locally"
+              }
               values={{
                 ...S_TO_SYNC_VALUES,
                 count: (
@@ -393,21 +397,15 @@ function SelectCommitRangesInternal(props: Props) {
           )}
         </React.Fragment>
       ) : (
-        <React.Fragment>
-          {argv.sync ? (
-            <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {sync} the commits to Github"
-              values={S_TO_SYNC_VALUES}
-            />
-          ) : (
-            <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {save} the commits locally"
-              values={S_TO_SYNC_VALUES}
-            />
-          )}
-        </React.Fragment>
+        <FormatText
+          wrapper={<Ink.Text />}
+          message={
+            argv.sync
+              ? "🎉 Done! Press {s} to {sync} the PRs to Github"
+              : "🎉 Done! Press {s} to {sync} the PRs locally"
+          }
+          values={S_TO_SYNC_VALUES}
+        />
       )}
 
       <Ink.Box>

package/src/command.ts

@@ -18,18 +18,22 @@ export async function command(argv: string[], options: CommandOptions = {}) {
     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("$0", "Sync commit ranges to Github", (yargs) => {
+      let builder = yargs.options(DefaultOptions);
+
+      // 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);
+      }
+
+      return builder;
+    })
 
     .command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) =>
       yargs.positional("commit", FixupOptions.commit),
@@ -52,6 +56,7 @@ export async function command(argv: string[], options: CommandOptions = {}) {
       "Check and install the latest version of git stack",
       (yargs) => yargs,
     )
+
     .command(
       "config",
       "Generate a one-time configuration json based on the passed arguments",

package/src/commands/Rebase.tsx

@@ -78,7 +78,9 @@ Rebase.run = async function run(props: Props) {
     actions.exit(20);
   }
 
+  actions.debug("start CommitMetadata.range");
   const next_commit_range = await CommitMetadata.range();
+  actions.debug("end CommitMetadata.range");
 
   actions.output(
     <FormatText
@@ -167,7 +169,9 @@ Rebase.run = async function run(props: Props) {
     // of original branch to the newly created temporary branch
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
 
+    actions.debug("start restore_git()");
     restore_git();
+    actions.debug("end restore_git()");
   }
 
   // cleanup git operations if cancelled during manual rebase

package/src/core/CommitMetadata.ts

@@ -1,9 +1,7 @@
 import { Store } from "~/app/Store";
-import * as Metadata from "~/core/Metadata";
-import { cli } from "~/core/cli";
+import * as git from "~/core/git";
 import * as github from "~/core/github";
 
-export type CommitMetadata = Awaited<ReturnType<typeof commit>>;
 export type CommitRange = Awaited<ReturnType<typeof range>>;
 
 type GithubPRStatus = ReturnType<typeof github.pr_status>;
@@ -15,24 +13,25 @@ type CommitGroup = {
   pr: null | PullRequest;
   base: null | string;
   dirty: boolean;
-  commits: Array<CommitMetadata>;
+  commits: Array<git.Commit>;
 };
 
 export type SimpleGroup = { id: string; title: string };
 type CommitGroupMap = { [sha: string]: SimpleGroup };
 
 export async function range(commit_group_map?: CommitGroupMap) {
-  const master_branch = Store.getState().master_branch;
-
   // gather all open prs in repo first
   // cheaper query to populate cache
   await github.pr_list();
 
-  const commit_list = await get_commit_list();
+  const master_branch = Store.getState().master_branch;
+  const commit_list = await git.get_commits(`${master_branch}..HEAD`);
 
   const pr_lookup: Record<string, void | PullRequest> = {};
 
   let invalid = false;
+  let last_group_id: null | string = null;
+
   const group_map = new Map<string, CommitGroup>();
 
   for (const commit of commit_list) {
@@ -57,10 +56,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
     }
 
     if (id) {
-      const group_key_list = Array.from(group_map.keys());
-      const last_key = group_key_list[group_key_list.length - 1];
-
-      if (group_map.has(id) && last_key !== id) {
+      if (group_map.has(id) && last_group_id !== id) {
         // if we've seen this id before and it's not
         // the last added key then we are out of order
         // console.debug("INVALID", "OUT OF ORDER");
@@ -87,6 +83,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
     group.commits.push(commit);
     group_map.set(id, group);
+    last_group_id = id;
   }
 
   // check each group for dirty state and base
@@ -183,53 +180,4 @@ export async function range(commit_group_map?: CommitGroupMap) {
   return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
 
-async function get_commit_list() {
-  const master_branch = Store.getState().master_branch;
-  const log_result = await cli(
-    `git log ${master_branch}..HEAD --oneline --format=%H --color=never`,
-  );
-
-  if (!log_result.stdout) {
-    return [];
-  }
-
-  const sha_list = lines(log_result.stdout).reverse();
-
-  const commit_metadata_list = [];
-
-  for (let i = 0; i < sha_list.length; i++) {
-    const sha = sha_list[i];
-    const commit_metadata = await commit(sha);
-    commit_metadata_list.push(commit_metadata);
-  }
-
-  return commit_metadata_list;
-}
-
-export async function commit(sha: string) {
-  const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-  const metadata = await Metadata.read(full_message);
-  const branch_id = metadata?.id;
-  const subject_line = get_subject_line(full_message);
-  const title = metadata?.title;
-
-  return {
-    sha,
-    full_message,
-    subject_line,
-    branch_id,
-    title,
-  };
-}
-
-function get_subject_line(message: string) {
-  const line_list = lines(message);
-  const first_line = line_list[0];
-  return Metadata.remove(first_line);
-}
-
-function lines(value: string) {
-  return value.split("\n");
-}
-
 export const UNASSIGNED = "unassigned";

package/src/core/Metadata.test.ts

@@ -17,6 +17,7 @@ test("read handles bulleted lists", () => {
   const metadata = Metadata.read(body);
 
   expect(metadata).toEqual({
+    subject: "[feat] implement various features",
     id: "DdKIFyufW",
     title: "saved group title",
   });
@@ -63,6 +64,7 @@ test("read handles slashes in branch name", () => {
   const metadata = Metadata.read(body);
 
   expect(metadata).toEqual({
+    subject: "[fix] slash in branch name",
     id: "dev/noah/fix-slash-branch",
     title: "fix slash branch",
   });
@@ -109,6 +111,7 @@ test("read handles double quotes", () => {
   const metadata = Metadata.read(body);
 
   expect(metadata).toEqual({
+    subject: 'Revert "[abc / 123] subject (#1234)"',
     id: "dev/noah/fix-slash-branch",
     title: 'Revert \\"[abc / 123] subject (#1234)\\"',
   });

package/src/core/Metadata.ts

@@ -6,6 +6,7 @@ type InputMetadataValues = {
 };
 
 type OutputMetadataValues = {
+  subject: null | string;
   id: null | string;
   title: null | string;
 };
@@ -28,7 +29,14 @@ export function write(message: string, values: InputMetadataValues) {
 }
 
 export function read(message: string): OutputMetadataValues {
-  const values: OutputMetadataValues = { id: null, title: null };
+  const values: OutputMetadataValues = { subject: null, id: null, title: null };
+
+  const match_subject = message.match(RE.subject_line);
+
+  if (match_subject?.groups) {
+    values.subject = match_subject.groups["subject"];
+    invariant(values.subject, "subject must exist");
+  }
 
   const match_id = message.match(RE.stack_id);
 
@@ -69,6 +77,8 @@ const TEMPLATE = {
 };
 
 const RE = {
+  // https://regex101.com/r/pOrChS/1
+  subject_line: /^(?<subject>[^\n]*)/,
   // https://regex101.com/r/wLmGVq/1
   stack_id: new RegExp(`${TEMPLATE.stack_id("(?<id>[^\\s]+)")}`, "i"),
   group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i"),

package/src/core/__snapshots__/git.test.ts.snap

@@ -0,0 +1,95 @@
+// Bun Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`get_commits ABC..DEF: 
+[
+  {
+    "branch_id": null,
+    "full_message": "homebrew-git-stack 2.7.1",
+    "sha": "ba067f8ad641dda7e65e3c2acb2421c955843829",
+    "subject_line": "homebrew-git-stack 2.7.1",
+    "title": null,
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqhd033n6y5",
+    "full_message":
+"Rebase: debug logs
+
+git-stack-id: noah/paint-test---4gwpqhd033n6y5
+git-stack-title: Rebase: debug logs"
+,
+    "sha": "7c8da9f5fe681fc7459a0e737241df631983cd3c",
+    "subject_line": "Rebase: debug logs",
+    "title": "Rebase: debug logs",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqirewoudxa",
+    "full_message":
+"CommitMetadata: track last group id
+
+git-stack-id: noah/paint-test---4gwpqirewoudxa
+git-stack-title: CommitMetadata: track last group id"
+,
+    "sha": "47a69d37f8c5cc796884a91fa9e93fc1db5297dd",
+    "subject_line": "CommitMetadata: track last group id",
+    "title": "CommitMetadata: track last group id",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqjcpu7-isv",
+    "full_message":
+"Github: pr_list duration timer
+
+git-stack-id: noah/paint-test---4gwpqjcpu7-isv
+git-stack-title: Github: pr_list duration timer"
+,
+    "sha": "8ccf42a7c72aa194fafc7c326f5874f5a0a009c6",
+    "subject_line": "Github: pr_list duration timer",
+    "title": "Github: pr_list duration timer",
+  },
+]
+ 1`] = `
+[
+  {
+    "branch_id": null,
+    "full_message": "homebrew-git-stack 2.7.1",
+    "sha": "ba067f8ad641dda7e65e3c2acb2421c955843829",
+    "subject_line": "homebrew-git-stack 2.7.1",
+    "title": null,
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqhd033n6y5",
+    "full_message": 
+"Rebase: debug logs
+
+git-stack-id: noah/paint-test---4gwpqhd033n6y5
+git-stack-title: Rebase: debug logs"
+,
+    "sha": "7c8da9f5fe681fc7459a0e737241df631983cd3c",
+    "subject_line": "Rebase: debug logs",
+    "title": "Rebase: debug logs",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqirewoudxa",
+    "full_message": 
+"CommitMetadata: track last group id
+
+git-stack-id: noah/paint-test---4gwpqirewoudxa
+git-stack-title: CommitMetadata: track last group id"
+,
+    "sha": "47a69d37f8c5cc796884a91fa9e93fc1db5297dd",
+    "subject_line": "CommitMetadata: track last group id",
+    "title": "CommitMetadata: track last group id",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqjcpu7-isv",
+    "full_message": 
+"Github: pr_list duration timer
+
+git-stack-id: noah/paint-test---4gwpqjcpu7-isv
+git-stack-title: Github: pr_list duration timer"
+,
+    "sha": "8ccf42a7c72aa194fafc7c326f5874f5a0a009c6",
+    "subject_line": "Github: pr_list duration timer",
+    "title": "Github: pr_list duration timer",
+  },
+]
+`;

package/src/core/get_timeout_fn.ts

@@ -0,0 +1,11 @@
+export function get_timeout_fn(ms: number, message: string) {
+  return function timeout<T>(promise: Promise<T>) {
+    let id: ReturnType<typeof setTimeout>;
+
+    const timeout = new Promise<never>((_resolve, reject) => {
+      id = setTimeout(() => reject(new Error(message)), ms);
+    });
+
+    return Promise.race([promise, timeout]).finally(() => clearTimeout(id));
+  };
+}

package/src/core/git.test.ts

@@ -0,0 +1,54 @@
+import { test, expect } from "bun:test";
+
+import * as git from "~/core/git";
+
+test("get_commits ABC..DEF", async () => {
+  const commits = await git.get_commits("e781ede..8ccf42a");
+  expect(commits).toMatchSnapshot(`
+[
+  {
+    "branch_id": null,
+    "full_message": "homebrew-git-stack 2.7.1",
+    "sha": "ba067f8ad641dda7e65e3c2acb2421c955843829",
+    "subject_line": "homebrew-git-stack 2.7.1",
+    "title": null,
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqhd033n6y5",
+    "full_message":
+"Rebase: debug logs
+
+git-stack-id: noah/paint-test---4gwpqhd033n6y5
+git-stack-title: Rebase: debug logs"
+,
+    "sha": "7c8da9f5fe681fc7459a0e737241df631983cd3c",
+    "subject_line": "Rebase: debug logs",
+    "title": "Rebase: debug logs",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqirewoudxa",
+    "full_message":
+"CommitMetadata: track last group id
+
+git-stack-id: noah/paint-test---4gwpqirewoudxa
+git-stack-title: CommitMetadata: track last group id"
+,
+    "sha": "47a69d37f8c5cc796884a91fa9e93fc1db5297dd",
+    "subject_line": "CommitMetadata: track last group id",
+    "title": "CommitMetadata: track last group id",
+  },
+  {
+    "branch_id": "noah/paint-test---4gwpqjcpu7-isv",
+    "full_message":
+"Github: pr_list duration timer
+
+git-stack-id: noah/paint-test---4gwpqjcpu7-isv
+git-stack-title: Github: pr_list duration timer"
+,
+    "sha": "8ccf42a7c72aa194fafc7c326f5874f5a0a009c6",
+    "subject_line": "Github: pr_list duration timer",
+    "title": "Github: pr_list duration timer",
+  },
+]
+`);
+});

package/src/core/git.ts

@@ -0,0 +1,55 @@
+import * as Metadata from "~/core/Metadata";
+import { cli } from "~/core/cli";
+
+export type Commit = Awaited<ReturnType<typeof get_commits>>[0];
+
+export async function get_commits(dot_range: string) {
+  const log_result = await cli(`git log ${dot_range} --format=${FORMAT} --color=never`);
+
+  if (!log_result.stdout) {
+    return [];
+  }
+
+  const commit_list = [];
+
+  for (let record of log_result.stdout.split(SEP.record)) {
+    record = record.replace(/^\n/, "");
+    record = record.replace(/\n$/, "");
+
+    if (!record) continue;
+
+    const [sha, full_message] = record.split(SEP.field);
+
+    const metadata = Metadata.read(full_message);
+    const branch_id = metadata.id;
+    const subject_line = metadata.subject || "";
+    const title = metadata.title;
+
+    const commit = {
+      sha,
+      full_message,
+      subject_line,
+      branch_id,
+      title,
+    };
+
+    commit_list.push(commit);
+  }
+
+  commit_list.reverse();
+
+  return commit_list;
+}
+
+// Why these separators?
+// - Rare in human written text
+// - Supported in git %xNN to write bytes
+// - Supported in javascript \xNN to write bytes
+// - Used historically as separators in unicode
+//   https://en.wikipedia.org/wiki/C0_and_C1_control_codes#Field_separators
+const SEP = {
+  record: "\x1e",
+  field: "\x1f",
+};
+
+const FORMAT = `%H${SEP.field}%B${SEP.record}`;

package/src/core/github.tsx

@@ -8,6 +8,7 @@ import * as Ink from "ink-cjs";
 
 import { Brackets } from "~/app/Brackets";
 import { Store } from "~/app/Store";
+import { Timer } from "~/core/Timer";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { get_tmp_dir } from "~/core/get_tmp_dir";
@@ -19,6 +20,9 @@ export async function pr_list(): Promise<Array<PullRequest>> {
   const state = Store.getState();
   const actions = state.actions;
 
+  const timer = Timer();
+  actions.debug("start github.pr_list");
+
   const username = state.username;
   const repo_path = state.repo_path;
   invariant(username, "username must exist");
@@ -53,6 +57,8 @@ export async function pr_list(): Promise<Array<PullRequest>> {
     }
   });
 
+  const duration = timer.duration();
+  actions.debug(`end github.pr_list (duration=${duration})`);
   return result_pr_list;
 }