git-stack-cli 2.2.7 → 2.2.8

package/dist/js/index.js

@@ -38896,12 +38896,261 @@ async function run3() {
 var React45 = __toESM(require_react(), 1);
 
 // src/app/LocalMergeRebase.tsx
-var React32 = __toESM(require_react(), 1);
+var React35 = __toESM(require_react(), 1);
 
 // src/commands/Rebase.tsx
-var React31 = __toESM(require_react(), 1);
+var React34 = __toESM(require_react(), 1);
 import fs11 from "node:fs";
 
+// src/app/Status.tsx
+var React33 = __toESM(require_react(), 1);
+
+// src/app/StatusTable.tsx
+var React32 = __toESM(require_react(), 1);
+
+// src/app/Table.tsx
+var React31 = __toESM(require_react(), 1);
+function Table(props) {
+  if (!props.data.length) {
+    return /* @__PURE__ */ React31.createElement(Container, null, /* @__PURE__ */ React31.createElement(Text, {
+      dimColor: true
+    }, "No data found."));
+  }
+  const RowColumnList = Object.keys(props.columns);
+  const max_col_width = {};
+  for (const col of RowColumnList) {
+    max_col_width[col] = 0;
+  }
+  for (const row of props.data) {
+    for (const col of RowColumnList) {
+      const row_col = row[col];
+      max_col_width[col] = Math.max(String(row_col).length, max_col_width[col]);
+    }
+  }
+  for (const col of RowColumnList) {
+    const maxWidth = props.maxWidth?.[col];
+    if (maxWidth) {
+      max_col_width[col] = maxWidth(max_col_width[col]);
+    }
+  }
+  const { stdout } = use_stdout_default();
+  const available_width = stdout.columns;
+  const columnGap = is_finite_value(props.columnGap) ? props.columnGap : 2;
+  const breathing_room = 1;
+  if (props.fillColumn) {
+    let remaining_space = available_width;
+    for (const col of RowColumnList) {
+      if (props.fillColumn === col) {
+        continue;
+      }
+      remaining_space -= max_col_width[col];
+    }
+    remaining_space -= columnGap * (RowColumnList.length - 1);
+    remaining_space -= breathing_room;
+    if (props.fillColumn) {
+      max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
+    }
+  }
+  return /* @__PURE__ */ React31.createElement(Container, null, props.data.map((row, i2) => {
+    return /* @__PURE__ */ React31.createElement(Box_default, {
+      key: i2,
+      flexDirection: "row",
+      columnGap,
+      width: available_width
+    }, RowColumnList.map((column) => {
+      const ColumnComponent = props.columns[column];
+      return /* @__PURE__ */ React31.createElement(Box_default, {
+        key: String(column),
+        width: max_col_width[column]
+      }, /* @__PURE__ */ React31.createElement(ColumnComponent, {
+        row,
+        column
+      }));
+    }));
+  }));
+}
+function Container(props) {
+  return /* @__PURE__ */ React31.createElement(Box_default, {
+    flexDirection: "column"
+  }, /* @__PURE__ */ React31.createElement(Box_default, {
+    height: 1
+  }), props.children, /* @__PURE__ */ React31.createElement(Box_default, {
+    height: 1
+  }));
+}
+
+// src/core/assertNever.ts
+function assertNever(value) {
+  console.error("[assertNever]", { value });
+}
+
+// src/app/StatusTable.tsx
+function StatusTable() {
+  const commit_range = Store.useState((state) => state.commit_range);
+  invariant(commit_range, "commit_range must exist");
+  const row_list = [];
+  for (const group of commit_range.group_list) {
+    const row = {
+      count: "",
+      status: "NEW",
+      title: "",
+      url: ""
+    };
+    if (group.id === commit_range.UNASSIGNED) {
+      row.status = "NEW";
+      row.title = "Unassigned";
+      row.count = `0/${group.commits.length}`;
+      row.url = "";
+    } else {
+      if (group.dirty) {
+        row.status = "OUTDATED";
+      } else {
+        row.status = "SYNCED";
+      }
+      if (group.pr) {
+        if (group.pr.state === "MERGED") {
+          row.status = "MERGED";
+        }
+        row.title = group.pr.title;
+        row.count = `${group.pr.commits.length}/${group.commits.length}`;
+        row.url = group.pr.url;
+      } else {
+        row.title = group.title || group.id;
+        row.count = `0/${group.commits.length}`;
+      }
+    }
+    row_list.push(row);
+  }
+  return /* @__PURE__ */ React32.createElement(Table, {
+    data: row_list,
+    fillColumn: "title",
+    maxWidth: {
+      status: (v3) => v3 + 2
+    },
+    columnGap: 3,
+    columns: {
+      status: StatusColumn,
+      count: CountColumn,
+      title: TitleColumn,
+      url: UrlColumn
+    }
+  });
+}
+function StatusColumn(props) {
+  const value = props.row[props.column];
+  return /* @__PURE__ */ React32.createElement(Text, {
+    color: get_status_color(props.row),
+    bold: get_status_bold(props.row)
+  }, get_status_icon(props.row), " ", value);
+}
+function CountColumn(props) {
+  const value = props.row[props.column];
+  return /* @__PURE__ */ React32.createElement(Text, {
+    dimColor: true
+  }, value);
+}
+function TitleColumn(props) {
+  const value = props.row[props.column];
+  return /* @__PURE__ */ React32.createElement(Text, {
+    wrap: "truncate-end"
+  }, value);
+}
+function UrlColumn(props) {
+  const value = props.row[props.column];
+  return /* @__PURE__ */ React32.createElement(Url, {
+    dimColor: true
+  }, value);
+}
+function get_status_icon(row) {
+  switch (row.status) {
+    case "NEW":
+      return "⭑";
+    case "OUTDATED":
+      return "!";
+    case "MERGED":
+      return "↗";
+    case "SYNCED":
+      return "✔";
+    default:
+      assertNever(row.status);
+      return "?";
+  }
+}
+function get_status_color(row) {
+  switch (row.status) {
+    case "NEW":
+      return colors.yellow;
+    case "OUTDATED":
+      return colors.red;
+    case "MERGED":
+      return colors.purple;
+    case "SYNCED":
+      return colors.green;
+    default:
+      assertNever(row.status);
+      return colors.gray;
+  }
+}
+function get_status_bold(row) {
+  switch (row.status) {
+    case "NEW":
+    case "OUTDATED":
+      return true;
+    default:
+      return false;
+  }
+}
+
+// src/app/Status.tsx
+function Status() {
+  return /* @__PURE__ */ React33.createElement(Await, {
+    fallback: null,
+    function: run4
+  });
+}
+async function run4() {
+  const state = Store.getState();
+  const actions = state.actions;
+  const argv = state.argv;
+  const commit_range = Store.getState().commit_range;
+  invariant(commit_range, "commit_range must exist");
+  actions.output(/* @__PURE__ */ React33.createElement(StatusTable, null));
+  let needs_rebase = false;
+  let needs_update = false;
+  for (const group of commit_range.group_list) {
+    if (group.dirty) {
+      needs_update = true;
+    }
+    if (group.pr?.state === "MERGED") {
+      needs_rebase = true;
+    }
+  }
+  if (argv.check) {
+    actions.exit(0);
+  } else if (needs_rebase) {
+    Store.setState((state2) => {
+      state2.step = "pre-local-merge-rebase";
+    });
+  } else if (needs_update) {
+    Store.setState((state2) => {
+      state2.step = "pre-select-commit-ranges";
+    });
+  } else if (argv.force) {
+    Store.setState((state2) => {
+      state2.step = "select-commit-ranges";
+    });
+  } else {
+    actions.output(/* @__PURE__ */ React33.createElement(Text, null, "✅ Everything up to date."));
+    actions.output(/* @__PURE__ */ React33.createElement(Text, {
+      color: colors.gray
+    }, /* @__PURE__ */ React33.createElement(Text, null, "Run with"), /* @__PURE__ */ React33.createElement(Text, {
+      bold: true,
+      color: colors.yellow
+    }, ` --force `), /* @__PURE__ */ React33.createElement(Text, null, "to force update all pull requests.")));
+    actions.exit(0);
+  }
+}
+
 // src/core/short_id.ts
 import crypto2 from "node:crypto";
 function short_id() {
@@ -38946,14 +39195,14 @@ function encode(value) {
 
 // src/commands/Rebase.tsx
 function Rebase() {
-  return /* @__PURE__ */ React31.createElement(Await, {
-    fallback: /* @__PURE__ */ React31.createElement(Text, {
+  return /* @__PURE__ */ React34.createElement(Await, {
+    fallback: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
     }, "Rebasing commits…"),
     function: Rebase.run
   });
 }
-Rebase.run = async function run4() {
+Rebase.run = async function run5() {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -38965,7 +39214,7 @@ Rebase.run = async function run4() {
   invariant(commit_range, "commit_range must exist");
   invariant(repo_root, "repo_root must exist");
   actions.register_abort_handler(async function abort_rebase() {
-    actions.output(/* @__PURE__ */ React31.createElement(Text, {
+    actions.output(/* @__PURE__ */ React34.createElement(Text, {
       color: colors.red
     }, "\uD83D\uDEA8 Abort"));
     handle_exit();
@@ -38987,29 +39236,29 @@ Rebase.run = async function run4() {
       const merged_pr = commit_pr?.state === "MERGED";
       if (merged_pr) {
         if (actions.isDebug()) {
-          actions.output(/* @__PURE__ */ React31.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React31.createElement(Text, {
+          actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
+            wrapper: /* @__PURE__ */ React34.createElement(Text, {
               color: colors.yellow,
               wrap: "truncate-end"
             }),
             message: "Dropping {commit_message} {pr_status}",
             values: {
-              commit_message: /* @__PURE__ */ React31.createElement(Brackets, null, commit2.subject_line),
-              pr_status: /* @__PURE__ */ React31.createElement(Parens, null, "MERGED")
+              commit_message: /* @__PURE__ */ React34.createElement(Brackets, null, commit2.subject_line),
+              pr_status: /* @__PURE__ */ React34.createElement(Parens, null, "MERGED")
             }
           }));
         }
         continue;
       }
       if (actions.isDebug()) {
-        actions.output(/* @__PURE__ */ React31.createElement(FormatText, {
-          wrapper: /* @__PURE__ */ React31.createElement(Text, {
+        actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
+          wrapper: /* @__PURE__ */ React34.createElement(Text, {
             color: colors.yellow,
             wrap: "truncate-end"
           }),
           message: "Picking {commit_message}",
           values: {
-            commit_message: /* @__PURE__ */ React31.createElement(Brackets, null, commit2.subject_line)
+            commit_message: /* @__PURE__ */ React34.createElement(Brackets, null, commit2.subject_line)
           }
         }));
       }
@@ -39023,21 +39272,22 @@ Rebase.run = async function run4() {
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
     restore_git();
     const next_commit_range = await range();
-    actions.output(/* @__PURE__ */ React31.createElement(FormatText, {
-      wrapper: /* @__PURE__ */ React31.createElement(Text, {
+    actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
+      wrapper: /* @__PURE__ */ React34.createElement(Text, {
         color: colors.green
       }),
       message: "✅ {branch_name} in sync with {origin_branch}",
       values: {
-        branch_name: /* @__PURE__ */ React31.createElement(Brackets, null, branch_name),
-        origin_branch: /* @__PURE__ */ React31.createElement(Brackets, null, `origin/${master_branch}`)
+        branch_name: /* @__PURE__ */ React34.createElement(Brackets, null, branch_name),
+        origin_branch: /* @__PURE__ */ React34.createElement(Brackets, null, master_branch)
       }
     }));
     actions.unregister_abort_handler();
     actions.set((state2) => {
       state2.commit_range = next_commit_range;
-      state2.step = "status";
     });
+    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
+    actions.exit(0);
   } catch (err) {
     actions.error("Unable to rebase.");
     if (err instanceof Error) {
@@ -39060,33 +39310,33 @@ Rebase.run = async function run4() {
     cli.sync(`pwd`, spawn_options);
   }
   function handle_exit() {
-    actions.output(/* @__PURE__ */ React31.createElement(Text, {
+    actions.output(/* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
-    }, "Restoring ", /* @__PURE__ */ React31.createElement(Brackets, null, branch_name), "…"));
+    }, "Restoring ", /* @__PURE__ */ React34.createElement(Brackets, null, branch_name), "…"));
     restore_git();
-    actions.output(/* @__PURE__ */ React31.createElement(Text, {
+    actions.output(/* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
-    }, "Restored ", /* @__PURE__ */ React31.createElement(Brackets, null, branch_name), "."));
+    }, "Restored ", /* @__PURE__ */ React34.createElement(Brackets, null, branch_name), "."));
   }
 };
 
 // src/app/LocalMergeRebase.tsx
 function LocalMergeRebase() {
-  return /* @__PURE__ */ React32.createElement(Rebase, null);
+  return /* @__PURE__ */ React35.createElement(Rebase, null);
 }
 
 // src/app/ManualRebase.tsx
-var React33 = __toESM(require_react(), 1);
+var React36 = __toESM(require_react(), 1);
 import fs12 from "node:fs";
 function ManualRebase() {
-  return /* @__PURE__ */ React33.createElement(Await, {
-    fallback: /* @__PURE__ */ React33.createElement(Text, {
+  return /* @__PURE__ */ React36.createElement(Await, {
+    fallback: /* @__PURE__ */ React36.createElement(Text, {
       color: colors.yellow
     }, "Rebasing commits…"),
-    function: run5
+    function: run6
   });
 }
-async function run5() {
+async function run6() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -39099,7 +39349,7 @@ async function run5() {
   invariant(commit_map, "commit_map must exist");
   invariant(repo_root, "repo_root must exist");
   actions.register_abort_handler(async function abort_manual_rebase() {
-    actions.output(/* @__PURE__ */ React33.createElement(Text, {
+    actions.output(/* @__PURE__ */ React36.createElement(Text, {
       color: colors.red
     }, "\uD83D\uDEA8 Abort"));
     handle_exit();
@@ -39183,247 +39433,49 @@ async function run5() {
     cli.sync(`pwd`, spawn_options);
   }
   function handle_exit() {
-    actions.output(/* @__PURE__ */ React33.createElement(Text, {
+    actions.output(/* @__PURE__ */ React36.createElement(Text, {
       color: colors.yellow
-    }, "Restoring ", /* @__PURE__ */ React33.createElement(Brackets, null, branch_name), "…"));
+    }, "Restoring ", /* @__PURE__ */ React36.createElement(Brackets, null, branch_name), "…"));
     restore_git();
-    actions.output(/* @__PURE__ */ React33.createElement(Text, {
+    actions.output(/* @__PURE__ */ React36.createElement(Text, {
       color: colors.yellow
-    }, "Restored ", /* @__PURE__ */ React33.createElement(Brackets, null, branch_name), "."));
-  }
-}
-
-// src/app/PostRebaseStatus.tsx
-var React36 = __toESM(require_react(), 1);
-
-// src/app/StatusTable.tsx
-var React35 = __toESM(require_react(), 1);
-
-// src/app/Table.tsx
-var React34 = __toESM(require_react(), 1);
-function Table(props) {
-  if (!props.data.length) {
-    return /* @__PURE__ */ React34.createElement(Container, null, /* @__PURE__ */ React34.createElement(Text, {
-      dimColor: true
-    }, "No data found."));
-  }
-  const RowColumnList = Object.keys(props.columns);
-  const max_col_width = {};
-  for (const col of RowColumnList) {
-    max_col_width[col] = 0;
-  }
-  for (const row of props.data) {
-    for (const col of RowColumnList) {
-      const row_col = row[col];
-      max_col_width[col] = Math.max(String(row_col).length, max_col_width[col]);
-    }
-  }
-  for (const col of RowColumnList) {
-    const maxWidth = props.maxWidth?.[col];
-    if (maxWidth) {
-      max_col_width[col] = maxWidth(max_col_width[col]);
-    }
-  }
-  const { stdout } = use_stdout_default();
-  const available_width = stdout.columns;
-  const columnGap = is_finite_value(props.columnGap) ? props.columnGap : 2;
-  const breathing_room = 1;
-  if (props.fillColumn) {
-    let remaining_space = available_width;
-    for (const col of RowColumnList) {
-      if (props.fillColumn === col) {
-        continue;
-      }
-      remaining_space -= max_col_width[col];
-    }
-    remaining_space -= columnGap * (RowColumnList.length - 1);
-    remaining_space -= breathing_room;
-    if (props.fillColumn) {
-      max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
-    }
-  }
-  return /* @__PURE__ */ React34.createElement(Container, null, props.data.map((row, i2) => {
-    return /* @__PURE__ */ React34.createElement(Box_default, {
-      key: i2,
-      flexDirection: "row",
-      columnGap,
-      width: available_width
-    }, RowColumnList.map((column) => {
-      const ColumnComponent = props.columns[column];
-      return /* @__PURE__ */ React34.createElement(Box_default, {
-        key: String(column),
-        width: max_col_width[column]
-      }, /* @__PURE__ */ React34.createElement(ColumnComponent, {
-        row,
-        column
-      }));
-    }));
-  }));
-}
-function Container(props) {
-  return /* @__PURE__ */ React34.createElement(Box_default, {
-    flexDirection: "column"
-  }, /* @__PURE__ */ React34.createElement(Box_default, {
-    height: 1
-  }), props.children, /* @__PURE__ */ React34.createElement(Box_default, {
-    height: 1
-  }));
-}
-
-// src/core/assertNever.ts
-function assertNever(value) {
-  console.error("[assertNever]", { value });
-}
-
-// src/app/StatusTable.tsx
-function StatusTable() {
-  const commit_range = Store.useState((state) => state.commit_range);
-  invariant(commit_range, "commit_range must exist");
-  const row_list = [];
-  for (const group of commit_range.group_list) {
-    const row = {
-      count: "",
-      status: "NEW",
-      title: "",
-      url: ""
-    };
-    if (group.id === commit_range.UNASSIGNED) {
-      row.status = "NEW";
-      row.title = "Unassigned";
-      row.count = `0/${group.commits.length}`;
-      row.url = "";
-    } else {
-      if (group.dirty) {
-        row.status = "OUTDATED";
-      } else {
-        row.status = "SYNCED";
-      }
-      if (group.pr) {
-        if (group.pr.state === "MERGED") {
-          row.status = "MERGED";
-        }
-        row.title = group.pr.title;
-        row.count = `${group.pr.commits.length}/${group.commits.length}`;
-        row.url = group.pr.url;
-      } else {
-        row.title = group.title || group.id;
-        row.count = `0/${group.commits.length}`;
-      }
-    }
-    row_list.push(row);
-  }
-  return /* @__PURE__ */ React35.createElement(Table, {
-    data: row_list,
-    fillColumn: "title",
-    maxWidth: {
-      status: (v3) => v3 + 2
-    },
-    columnGap: 3,
-    columns: {
-      status: StatusColumn,
-      count: CountColumn,
-      title: TitleColumn,
-      url: UrlColumn
-    }
-  });
-}
-function StatusColumn(props) {
-  const value = props.row[props.column];
-  return /* @__PURE__ */ React35.createElement(Text, {
-    color: get_status_color(props.row),
-    bold: get_status_bold(props.row)
-  }, get_status_icon(props.row), " ", value);
-}
-function CountColumn(props) {
-  const value = props.row[props.column];
-  return /* @__PURE__ */ React35.createElement(Text, {
-    dimColor: true
-  }, value);
-}
-function TitleColumn(props) {
-  const value = props.row[props.column];
-  return /* @__PURE__ */ React35.createElement(Text, {
-    wrap: "truncate-end"
-  }, value);
-}
-function UrlColumn(props) {
-  const value = props.row[props.column];
-  return /* @__PURE__ */ React35.createElement(Url, {
-    dimColor: true
-  }, value);
-}
-function get_status_icon(row) {
-  switch (row.status) {
-    case "NEW":
-      return "⭑";
-    case "OUTDATED":
-      return "!";
-    case "MERGED":
-      return "↗";
-    case "SYNCED":
-      return "✔";
-    default:
-      assertNever(row.status);
-      return "?";
-  }
-}
-function get_status_color(row) {
-  switch (row.status) {
-    case "NEW":
-      return colors.yellow;
-    case "OUTDATED":
-      return colors.red;
-    case "MERGED":
-      return colors.purple;
-    case "SYNCED":
-      return colors.green;
-    default:
-      assertNever(row.status);
-      return colors.gray;
-  }
-}
-function get_status_bold(row) {
-  switch (row.status) {
-    case "NEW":
-    case "OUTDATED":
-      return true;
-    default:
-      return false;
+    }, "Restored ", /* @__PURE__ */ React36.createElement(Brackets, null, branch_name), "."));
   }
 }
 
 // src/app/PostRebaseStatus.tsx
+var React37 = __toESM(require_react(), 1);
 function PostRebaseStatus() {
-  return /* @__PURE__ */ React36.createElement(Await, {
+  return /* @__PURE__ */ React37.createElement(Await, {
     fallback: null,
-    function: run6
+    function: run7
   });
 }
-async function run6() {
+async function run7() {
   const actions = Store.getState().actions;
   actions.reset_pr();
   const commit_range = await range();
   actions.set((state) => {
     state.commit_range = commit_range;
   });
-  actions.output(/* @__PURE__ */ React36.createElement(StatusTable, null));
-  actions.output(/* @__PURE__ */ React36.createElement(Text, null, "✅ Everything up to date."));
+  actions.output(/* @__PURE__ */ React37.createElement(StatusTable, null));
+  actions.output(/* @__PURE__ */ React37.createElement(Text, null, "✅ Everything up to date."));
   actions.exit(0);
 }
 
 // src/app/PreLocalMergeRebase.tsx
-var React37 = __toESM(require_react(), 1);
+var React38 = __toESM(require_react(), 1);
 function PreLocalMergeRebase() {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
-  React37.useEffect(() => {
+  React38.useEffect(() => {
     if (argv.force) {
       Store.setState((state) => {
         state.step = "local-merge-rebase";
       });
     }
   }, [argv]);
-  return /* @__PURE__ */ React37.createElement(YesNoPrompt, {
+  return /* @__PURE__ */ React38.createElement(YesNoPrompt, {
     message: "Local branch needs to be rebased, would you like to rebase to update your local branch?",
     onYes: () => {
       actions.set((state) => {
@@ -39435,16 +39487,16 @@ function PreLocalMergeRebase() {
 }
 
 // src/app/PreManualRebase.tsx
-var React38 = __toESM(require_react(), 1);
+var React39 = __toESM(require_react(), 1);
 import fs13 from "node:fs/promises";
 import path8 from "node:path";
 function PreManualRebase() {
-  return /* @__PURE__ */ React38.createElement(Await, {
+  return /* @__PURE__ */ React39.createElement(Await, {
     fallback: null,
-    function: run7
+    function: run8
   });
 }
-async function run7() {
+async function run8() {
   const state = Store.getState();
   const actions = state.actions;
   const repo_root = state.repo_root;
@@ -39460,13 +39512,13 @@ async function run7() {
     const pr_template_fn = PR_TEMPLATE[key];
     if (await safe_exists(pr_template_fn(repo_root))) {
       pr_template_body = await fs13.readFile(pr_template_fn(repo_root), "utf-8");
-      actions.output(/* @__PURE__ */ React38.createElement(FormatText, {
-        wrapper: /* @__PURE__ */ React38.createElement(Text, {
+      actions.output(/* @__PURE__ */ React39.createElement(FormatText, {
+        wrapper: /* @__PURE__ */ React39.createElement(Text, {
           color: colors.yellow
         }),
         message: "Using PR template {pr_filepath}",
         values: {
-          pr_filepath: /* @__PURE__ */ React38.createElement(Brackets, null, pr_template_fn(""))
+          pr_filepath: /* @__PURE__ */ React39.createElement(Brackets, null, pr_template_fn(""))
         }
       }));
       break;
@@ -39480,16 +39532,16 @@ async function run7() {
     state2.pr_template_body = pr_template_body;
     state2.pr_templates = pr_templates;
     if (pr_templates.length > 0) {
-      actions.output(/* @__PURE__ */ React38.createElement(FormatText, {
-        wrapper: /* @__PURE__ */ React38.createElement(Text, {
+      actions.output(/* @__PURE__ */ React39.createElement(FormatText, {
+        wrapper: /* @__PURE__ */ React39.createElement(Text, {
           color: colors.yellow
         }),
         message: "{count} queryable templates found under {dir}, but not supported.",
         values: {
-          count: /* @__PURE__ */ React38.createElement(Text, {
+          count: /* @__PURE__ */ React39.createElement(Text, {
             color: colors.blue
           }, pr_templates.length),
-          dir: /* @__PURE__ */ React38.createElement(Brackets, null, PR_TEMPLATE.TemplateDir(""))
+          dir: /* @__PURE__ */ React39.createElement(Brackets, null, PR_TEMPLATE.TemplateDir(""))
         }
       }));
     }
@@ -39505,18 +39557,18 @@ var PR_TEMPLATE = Object.freeze({
 var PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE);
 
 // src/app/PreSelectCommitRanges.tsx
-var React39 = __toESM(require_react(), 1);
+var React40 = __toESM(require_react(), 1);
 function PreSelectCommitRanges() {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
-  React39.useEffect(() => {
+  React40.useEffect(() => {
     if (argv.force) {
       Store.setState((state) => {
         state.step = "select-commit-ranges";
       });
     }
   }, [argv]);
-  return /* @__PURE__ */ React39.createElement(YesNoPrompt, {
+  return /* @__PURE__ */ React40.createElement(YesNoPrompt, {
     message: "Some commits are new or outdated, would you like to select new commit ranges?",
     onYes: () => {
       actions.set((state) => {
@@ -39528,10 +39580,10 @@ function PreSelectCommitRanges() {
 }
 
 // src/app/SelectCommitRanges.tsx
-var React42 = __toESM(require_react(), 1);
+var React43 = __toESM(require_react(), 1);
 
 // src/app/MultiSelect.tsx
-var React40 = __toESM(require_react(), 1);
+var React41 = __toESM(require_react(), 1);
 
 // src/core/clamp.ts
 function clamp(value, min, max) {
@@ -39554,7 +39606,7 @@ function wrap_index(value, list) {
 
 // src/app/MultiSelect.tsx
 function MultiSelect(props) {
-  const [selected_set, select] = React40.useReducer((state, value) => {
+  const [selected_set, select] = React41.useReducer((state, value) => {
     const next = new Set(state);
     if (next.has(value)) {
       next.delete(value);
@@ -39570,7 +39622,7 @@ function MultiSelect(props) {
     });
     return set2;
   });
-  const [index, set_index] = React40.useReducer((_, value) => {
+  const [index, set_index] = React41.useReducer((_, value) => {
     const next_index = clamp(value, 0, props.items.length - 1);
     return next_index;
   }, 0, function find_initial_index() {
@@ -39589,8 +39641,8 @@ function MultiSelect(props) {
     }
     return 0;
   });
-  const selectRef = React40.useRef(false);
-  React40.useEffect(() => {
+  const selectRef = React41.useRef(false);
+  React41.useEffect(() => {
     if (!selectRef.current) {
       return;
     }
@@ -39600,7 +39652,7 @@ function MultiSelect(props) {
     const state = selected_list.map((index2) => props.items[index2].value);
     props.onSelect({ item, selected, state });
   }, [selected_set]);
-  React40.useEffect(() => {
+  React41.useEffect(() => {
     const item = props.items[index].value;
     const selected_list = Array.from(selected_set);
     const selected = selected_set.has(index);
@@ -39642,13 +39694,13 @@ function MultiSelect(props) {
       }
     }
   });
-  return /* @__PURE__ */ React40.createElement(Box_default, {
+  return /* @__PURE__ */ React41.createElement(Box_default, {
     flexDirection: "column"
   }, props.items.map((item, i2) => {
     const active = i2 === index;
     const selected = selected_set.has(i2);
     const disabled = item.disabled || false;
-    return /* @__PURE__ */ React40.createElement(ItemRow, {
+    return /* @__PURE__ */ React41.createElement(ItemRow, {
       key: i2,
       label: item.label,
       active,
@@ -39676,15 +39728,15 @@ function ItemRow(props) {
     underline = false;
     dimColor = true;
   }
-  return /* @__PURE__ */ React40.createElement(Box_default, {
+  return /* @__PURE__ */ React41.createElement(Box_default, {
     flexDirection: "row",
     gap: 1
-  }, /* @__PURE__ */ React40.createElement(Radio, {
+  }, /* @__PURE__ */ React41.createElement(Radio, {
     selected: props.selected,
     disabled: props.disabled
-  }), /* @__PURE__ */ React40.createElement(Box_default, {
+  }), /* @__PURE__ */ React41.createElement(Box_default, {
     width: props.maxWidth
-  }, /* @__PURE__ */ React40.createElement(Text, {
+  }, /* @__PURE__ */ React41.createElement(Text, {
     bold,
     underline,
     color,
@@ -39707,7 +39759,7 @@ function Radio(props) {
     color = colors.gray;
     dimColor = true;
   }
-  return /* @__PURE__ */ React40.createElement(Text, {
+  return /* @__PURE__ */ React41.createElement(Text, {
     bold: props.selected,
     color,
     dimColor
@@ -39715,14 +39767,14 @@ function Radio(props) {
 }
 
 // src/app/TextInput.tsx
-var React41 = __toESM(require_react(), 1);
+var React42 = __toESM(require_react(), 1);
 function TextInput(props) {
-  const [value, set_value] = React41.useState(get_value(props));
-  React41.useEffect(function sync_value_prop() {
+  const [value, set_value] = React42.useState(get_value(props));
+  React42.useEffect(function sync_value_prop() {
     set_value(get_value(props));
   }, [props.value]);
-  const [caret_visible, set_caret_visible] = React41.useState(false);
-  React41.useEffect(function blink_caret() {
+  const [caret_visible, set_caret_visible] = React42.useState(false);
+  React42.useEffect(function blink_caret() {
     const interval_ms = 500;
     let timeoutId = setTimeout(tick, interval_ms);
     function tick() {
@@ -39754,12 +39806,12 @@ function TextInput(props) {
     set_value(next_value);
     props.onChange?.(next_value);
   });
-  return /* @__PURE__ */ React41.createElement(Box_default, {
+  return /* @__PURE__ */ React42.createElement(Box_default, {
     borderStyle: "single",
     minHeight: 1,
     borderColor: colors.yellow,
     borderDimColor: true
-  }, /* @__PURE__ */ React41.createElement(Text, null, value || ""), /* @__PURE__ */ React41.createElement(Text, {
+  }, /* @__PURE__ */ React42.createElement(Text, null, value || ""), /* @__PURE__ */ React42.createElement(Text, {
     color: colors.yellow,
     dimColor: true,
     inverse: caret_visible
@@ -39778,26 +39830,26 @@ function gs_short_id() {
 function SelectCommitRanges() {
   const commit_range = Store.useState((state) => state.commit_range);
   invariant(commit_range, "commit_range must exist");
-  return /* @__PURE__ */ React42.createElement(SelectCommitRangesInternal, {
+  return /* @__PURE__ */ React43.createElement(SelectCommitRangesInternal, {
     commit_range
   });
 }
 function SelectCommitRangesInternal(props) {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
-  const [selected_group_id, set_selected_group_id] = React42.useState(() => {
+  const [selected_group_id, set_selected_group_id] = React43.useState(() => {
     const first_group = props.commit_range.group_list.find((g2) => g2.id !== props.commit_range.UNASSIGNED);
     if (first_group) {
       return first_group.id;
     }
     return props.commit_range.UNASSIGNED;
   });
-  const [group_input, set_group_input] = React42.useState(false);
-  const [new_group_list, create_group] = React42.useReducer((group_list2, group2) => {
+  const [group_input, set_group_input] = React43.useState(false);
+  const [new_group_list, create_group] = React43.useReducer((group_list2, group2) => {
     const next_group_list = group_list2.concat(group2);
     return next_group_list;
   }, []);
-  const [commit_map, update_commit_map] = React42.useReducer((map, args) => {
+  const [commit_map, update_commit_map] = React43.useReducer((map, args) => {
     map.set(args.key, args.value);
     return new Map(map);
   }, new Map, (map) => {
@@ -39905,12 +39957,12 @@ function SelectCommitRangesInternal(props) {
   group_title_width = Math.min(group.title.length, group_title_width);
   let max_item_width = max_group_label_width;
   max_item_width -= left_arrow.length + right_arrow.length;
-  const [focused, set_focused] = React42.useState("");
-  return /* @__PURE__ */ React42.createElement(Box_default, {
+  const [focused, set_focused] = React43.useState("");
+  return /* @__PURE__ */ React43.createElement(Box_default, {
     flexDirection: "column"
-  }, /* @__PURE__ */ React42.createElement(Box_default, {
+  }, /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React42.createElement(MultiSelect, {
+  }), /* @__PURE__ */ React43.createElement(MultiSelect, {
     items,
     maxWidth: max_item_width,
     disabled: multiselect_disabled,
@@ -39928,108 +39980,108 @@ function SelectCommitRangesInternal(props) {
       }
       update_commit_map({ key, value });
     }
-  }), /* @__PURE__ */ React42.createElement(Box_default, {
+  }), /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React42.createElement(Box_default, {
+  }), /* @__PURE__ */ React43.createElement(Box_default, {
     width: max_group_label_width,
     flexDirection: "row"
-  }, /* @__PURE__ */ React42.createElement(Text, null, left_arrow), /* @__PURE__ */ React42.createElement(Text, null, group_position), /* @__PURE__ */ React42.createElement(Box_default, {
+  }, /* @__PURE__ */ React43.createElement(Text, null, left_arrow), /* @__PURE__ */ React43.createElement(Text, null, group_position), /* @__PURE__ */ React43.createElement(Box_default, {
     width: group_title_width,
     justifyContent: "center"
-  }, /* @__PURE__ */ React42.createElement(Text, {
+  }, /* @__PURE__ */ React43.createElement(Text, {
     wrap: "truncate-end"
-  }, group.title)), /* @__PURE__ */ React42.createElement(Text, null, right_arrow)), /* @__PURE__ */ React42.createElement(Box_default, {
+  }, group.title)), /* @__PURE__ */ React43.createElement(Text, null, right_arrow)), /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  }), unassigned_count > 0 ? /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+  }), unassigned_count > 0 ? /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
     message: "{count} unassigned commits, press {c} to {create} a new group",
     values: {
-      count: /* @__PURE__ */ React42.createElement(Text, {
+      count: /* @__PURE__ */ React43.createElement(Text, {
         color: colors.yellow,
         bold: true
       }, unassigned_count),
-      c: /* @__PURE__ */ React42.createElement(Text, {
+      c: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, "c"),
-      create: /* @__PURE__ */ React42.createElement(Text, {
+      create: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
-      }, /* @__PURE__ */ React42.createElement(Parens, null, "c"), "reate")
+      }, /* @__PURE__ */ React43.createElement(Parens, null, "c"), "reate")
     }
-  }) : /* @__PURE__ */ React42.createElement(React42.Fragment, null, argv.sync ? /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, null),
+  }) : /* @__PURE__ */ React43.createElement(React43.Fragment, null, argv.sync ? /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
     message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github",
     values: {
-      s: /* @__PURE__ */ React42.createElement(Text, {
+      s: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, "s"),
-      sync: /* @__PURE__ */ React42.createElement(Text, {
+      sync: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
-      }, /* @__PURE__ */ React42.createElement(Parens, null, "s"), "ync")
+      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "ync")
     }
-  }) : /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, null),
+  }) : /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
     message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
     values: {
-      s: /* @__PURE__ */ React42.createElement(Text, {
+      s: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, "s"),
-      save: /* @__PURE__ */ React42.createElement(Text, {
+      save: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
-      }, /* @__PURE__ */ React42.createElement(Parens, null, "s"), "save")
+      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "save")
     }
-  })), !group_input ? null : /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(Box_default, {
+  })), !group_input ? null : /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+  }), /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
     message: "Enter a title for the PR {note}",
     values: {
-      note: /* @__PURE__ */ React42.createElement(Parens, null, /* @__PURE__ */ React42.createElement(FormatText, {
+      note: /* @__PURE__ */ React43.createElement(Parens, null, /* @__PURE__ */ React43.createElement(FormatText, {
         message: "press {enter} to submit",
         values: {
-          enter: /* @__PURE__ */ React42.createElement(Text, {
+          enter: /* @__PURE__ */ React43.createElement(Text, {
             bold: true,
             color: colors.green
           }, SYMBOL.enter)
         }
       }))
     }
-  }), /* @__PURE__ */ React42.createElement(TextInput, {
+  }), /* @__PURE__ */ React43.createElement(TextInput, {
     defaultValue: focused,
     onSubmit: submit_group_input
-  }), /* @__PURE__ */ React42.createElement(Box_default, {
+  }), /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+  })), /* @__PURE__ */ React43.createElement(Box_default, null, /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
     message: "Press {left} and {right} to view PR groups",
     values: {
-      left: /* @__PURE__ */ React42.createElement(Text, {
+      left: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.left),
-      right: /* @__PURE__ */ React42.createElement(Text, {
+      right: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.right)
     }
-  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+  })), /* @__PURE__ */ React43.createElement(Box_default, null, /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
     message: "Press {enter} to toggle commit selection",
     values: {
-      enter: /* @__PURE__ */ React42.createElement(Text, {
+      enter: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.enter)
@@ -40046,14 +40098,14 @@ function SelectCommitRangesInternal(props) {
   }
   function submit_group_input(title) {
     const id = get_group_id();
-    actions.output(/* @__PURE__ */ React42.createElement(FormatText, {
-      wrapper: /* @__PURE__ */ React42.createElement(Text, {
+    actions.output(/* @__PURE__ */ React43.createElement(FormatText, {
+      wrapper: /* @__PURE__ */ React43.createElement(Text, {
         dimColor: true
       }),
       message: "Created new group {group} {note}",
       values: {
-        group: /* @__PURE__ */ React42.createElement(Brackets, null, title),
-        note: /* @__PURE__ */ React42.createElement(Parens, null, id)
+        group: /* @__PURE__ */ React43.createElement(Brackets, null, title),
+        note: /* @__PURE__ */ React43.createElement(Parens, null, id)
       }
     }));
     create_group({ id, title });
@@ -40067,57 +40119,6 @@ var SYMBOL = {
   enter: "Enter"
 };
 
-// src/app/Status.tsx
-var React43 = __toESM(require_react(), 1);
-function Status() {
-  return /* @__PURE__ */ React43.createElement(Await, {
-    fallback: null,
-    function: run8
-  });
-}
-async function run8() {
-  const state = Store.getState();
-  const actions = state.actions;
-  const argv = state.argv;
-  const commit_range = Store.getState().commit_range;
-  invariant(commit_range, "commit_range must exist");
-  actions.output(/* @__PURE__ */ React43.createElement(StatusTable, null));
-  let needs_rebase = false;
-  let needs_update = false;
-  for (const group of commit_range.group_list) {
-    if (group.dirty) {
-      needs_update = true;
-    }
-    if (group.pr?.state === "MERGED") {
-      needs_rebase = true;
-    }
-  }
-  if (argv.check) {
-    actions.exit(0);
-  } else if (needs_rebase) {
-    Store.setState((state2) => {
-      state2.step = "pre-local-merge-rebase";
-    });
-  } else if (needs_update) {
-    Store.setState((state2) => {
-      state2.step = "pre-select-commit-ranges";
-    });
-  } else if (argv.force) {
-    Store.setState((state2) => {
-      state2.step = "select-commit-ranges";
-    });
-  } else {
-    actions.output(/* @__PURE__ */ React43.createElement(Text, null, "✅ Everything up to date."));
-    actions.output(/* @__PURE__ */ React43.createElement(Text, {
-      color: colors.gray
-    }, /* @__PURE__ */ React43.createElement(Text, null, "Run with"), /* @__PURE__ */ React43.createElement(Text, {
-      bold: true,
-      color: colors.yellow
-    }, ` --force `), /* @__PURE__ */ React43.createElement(Text, null, "to force update all pull requests.")));
-    actions.exit(0);
-  }
-}
-
 // src/app/SyncGithub.tsx
 var React44 = __toESM(require_react(), 1);
 var import_last = __toESM(require_last(), 1);
@@ -45662,7 +45663,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.7").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.8").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

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

package/scripts/release-brew.ts

@@ -66,6 +66,8 @@ const re_token = (name: string) => new RegExp(`{{ ${name} }}`, "g");
 process.chdir(HOMEBREW_DIR);
 await spawn.sync(`git reset --hard`);
 await spawn.sync(`git checkout master`);
+await spawn.sync("git fetch --prune");
+await spawn.sync("git reset --hard origin/master");
 
 // homebrew tap formula (binaries)
 

package/src/command.ts

@@ -9,6 +9,7 @@ export async function command() {
   // 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))

package/src/commands/Rebase.tsx

@@ -8,6 +8,7 @@ import { Await } from "~/app/Await";
 import { Brackets } from "~/app/Brackets";
 import { FormatText } from "~/app/FormatText";
 import { Parens } from "~/app/Parens";
+import { Status } from "~/app/Status";
 import { Store } from "~/app/Store";
 import * as CommitMetadata from "~/core/CommitMetadata";
 import { cli } from "~/core/cli";
@@ -128,7 +129,7 @@ Rebase.run = async function run() {
         message="✅ {branch_name} in sync with {origin_branch}"
         values={{
           branch_name: <Brackets>{branch_name}</Brackets>,
-          origin_branch: <Brackets>{`origin/${master_branch}`}</Brackets>,
+          origin_branch: <Brackets>{master_branch}</Brackets>,
         }}
       />,
     );
@@ -137,8 +138,11 @@ Rebase.run = async function run() {
 
     actions.set((state) => {
       state.commit_range = next_commit_range;
-      state.step = "status";
     });
+
+    actions.output(<Status />);
+
+    actions.exit(0);
   } catch (err) {
     actions.error("Unable to rebase.");