git-stack-cli 2.5.3 → 2.6.1

package/dist/js/index.js

@@ -31944,7 +31944,7 @@ var React18 = __toESM(require_react(), 1);
 var React10 = __toESM(require_react(), 1);
 
 // src/core/colors.ts
-var colors = {
+var colors = Object.freeze({
   red: "rgb(248, 81, 73)",
   green: "rgb(63, 185, 80)",
   purple: "rgb(163, 113, 247)",
@@ -31952,8 +31952,9 @@ var colors = {
   orange: "rgb(255, 166, 87)",
   yellow: "rgb(234, 179, 8)",
   gray: "rgb(110, 118, 129)",
-  lightGray: "rgb(125, 133, 144)"
-};
+  lightGray: "rgb(125, 133, 144)",
+  white: "whiteBright"
+});
 
 // src/app/Brackets.tsx
 function Brackets(props) {
@@ -32061,6 +32062,11 @@ function YesNoPrompt(props) {
   }, choices))));
 }
 
+// src/core/assertNever.ts
+function assertNever(value) {
+  console.error("[assertNever]", { value });
+}
+
 // src/core/cli.ts
 import * as child from "node:child_process";
 
@@ -37053,6 +37059,7 @@ var BaseStore = createStore()(immer2((set2, get) => ({
   master_branch: "origin/master",
   head: null,
   branch_name: null,
+  merge_base: null,
   commit_range: null,
   commit_map: null,
   pr_templates: [],
@@ -37279,6 +37286,7 @@ async function cli(unsafe_command, unsafe_options) {
     function write_output(value) {
       output += value;
       state.actions.debug(value, id);
+      options.onOutput?.(value);
     }
     childProcess.stdout?.on("data", (data) => {
       const value = String(data);
@@ -37442,25 +37450,34 @@ function AutoUpdate(props) {
     }
   }
   React18.useEffect(() => {
-    let status2 = "done";
+    switch (state.status) {
+      case "init":
+      case "prompt":
+      case "install":
+        break;
+      case "done": {
+        props.onDone?.();
+        break;
+      }
+      default:
+        assertNever(state.status);
+    }
+  }, [state.status]);
+  React18.useEffect(() => {
+    let status2 = "init";
     let latest_version = null;
     let is_brew_bun_standalone = false;
-    const local_version = "2.5.3";
+    const local_version = "2.6.1";
     const is_output = props_ref.current.verbose || props_ref.current.force;
     async function auto_update() {
       if (!local_version) {
         throw new Error("Auto update requires process.env.CLI_VERSION to be set");
       }
-      if (is_output) {
-        handle_output(/* @__PURE__ */ React18.createElement(Text, {
-          key: "init"
-        }, "Checking for 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(() => {
-          throw new Error("Timeout");
+          throw new Error("AutoUpdate timeout");
         })
       ]);
       latest_version = npm_json?.["dist-tags"]?.latest;
@@ -37497,32 +37514,37 @@ function AutoUpdate(props) {
         }));
       }
       const semver_result = semver_compare(latest_version, local_version);
+      if (props_ref.current.verbose) {
+        handle_output(/* @__PURE__ */ React18.createElement(Text, {
+          dimColor: true
+        }, JSON.stringify({ semver_result })));
+      }
       if (semver_result === 0) {
+        status2 = "done";
         if (is_output) {
           handle_output(/* @__PURE__ */ React18.createElement(Text, null, "✅ Everything up to date. ", /* @__PURE__ */ React18.createElement(Brackets, null, latest_version)));
         }
         return;
       }
-      if (semver_result === -1) {
-        throw new Error(`latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`);
+      if (semver_result === 1) {
+        status2 = "prompt";
       }
-      status2 = "prompt";
+      throw new Error("AutoUpdate failed");
     }
     const onError = props_ref.current.onError || (() => {
     });
     auto_update().then(() => {
       patch({ status: status2, local_version, latest_version, is_brew_bun_standalone });
     }).catch((error) => {
-      patch({ status: status2, error, local_version, latest_version, is_brew_bun_standalone });
-      onError(error);
       if (props_ref.current.verbose) {
         handle_output(/* @__PURE__ */ React18.createElement(Text, {
           key: "error",
           color: colors.red
         }, error?.message));
       }
-    }).finally(() => {
-      props.onDone?.();
+      status2 = "done";
+      patch({ status: status2, error, local_version, latest_version, is_brew_bun_standalone });
+      onError(error);
     });
   }, []);
   const status = function render_status() {
@@ -37532,47 +37554,45 @@ function AutoUpdate(props) {
       case "prompt": {
         let install_command = "";
         if (state.is_brew_bun_standalone) {
-          install_command = `npm install -g ${props.name}@latest`;
+          install_command = "brew install magus/git-stack/git-stack";
         } else {
-          install_command = "brew upgrade magus/git-stack/git-stack";
+          install_command = `npm install -g ${props.name}@latest`;
         }
         return /* @__PURE__ */ React18.createElement(YesNoPrompt, {
           message: /* @__PURE__ */ React18.createElement(Box_default, {
             flexDirection: "column"
+          }, /* @__PURE__ */ React18.createElement(Box_default, {
+            flexDirection: "column"
           }, /* @__PURE__ */ React18.createElement(Text, {
             color: colors.yellow
           }, /* @__PURE__ */ React18.createElement(FormatText, {
             wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-            message: "New version available {latest_version}, would you like to update?",
+            message: "New version available {latest_version}",
             values: {
               latest_version: /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)
             }
-          }), ","), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(Command, null, install_command), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(FormatText, {
+          }), ","), /* @__PURE__ */ React18.createElement(Text, null, " "), /* @__PURE__ */ React18.createElement(Command, null, install_command), /* @__PURE__ */ React18.createElement(Text, null, " ")), /* @__PURE__ */ React18.createElement(Box_default, null, /* @__PURE__ */ React18.createElement(FormatText, {
             wrapper: /* @__PURE__ */ React18.createElement(Text, {
               color: colors.yellow
             }),
             message: "Would you like to run the above command to update?"
-          })),
+          }))),
           onYes: async () => {
-            handle_output(/* @__PURE__ */ React18.createElement(FormatText, {
-              key: "install",
-              wrapper: /* @__PURE__ */ React18.createElement(Text, null),
-              message: "Installing {name}@{version}...",
-              values: {
-                name: /* @__PURE__ */ React18.createElement(Text, {
-                  color: colors.yellow
-                }, props.name),
-                version: /* @__PURE__ */ React18.createElement(Text, {
-                  color: colors.blue
-                }, state.latest_version)
-              }
-            }));
+            handle_output(/* @__PURE__ */ React18.createElement(Command, null, install_command));
             patch({ status: "install" });
-            await cli(install_command);
-            patch({ status: "exit" });
+            await cli(install_command, {
+              env: {
+                ...process.env,
+                HOMEBREW_COLOR: "1"
+              },
+              onOutput: (data) => {
+                handle_output(/* @__PURE__ */ React18.createElement(Text, null, data));
+              }
+            });
             handle_output(/* @__PURE__ */ React18.createElement(Text, {
               key: "done"
-            }, "Auto update done."));
+            }, "✅ Installed ", /* @__PURE__ */ React18.createElement(Brackets, null, state.latest_version)));
+            patch({ status: "done" });
           },
           onNo: () => {
             patch({ status: "done" });
@@ -37581,8 +37601,6 @@ function AutoUpdate(props) {
       }
       case "install":
         return null;
-      case "exit":
-        return null;
       case "done":
         return props.children;
     }
@@ -38409,15 +38427,19 @@ function GitReviseTodo(args) {
 GitReviseTodo.todo = function todo(args) {
   const entry_list = [];
   for (const commit2 of args.commit_list) {
-    const id = commit2.branch_id;
-    const title = commit2.title;
-    invariant(id, "commit.branch_id must exist");
-    invariant(title, "commit.title must exist");
-    const metadata = { id, title };
-    const unsafe_message_with_id = write(commit2.full_message, metadata);
-    let message_with_id = unsafe_message_with_id;
     const sha = commit2.sha.slice(0, 12);
-    const entry_lines = [`++ pick ${sha}`, message_with_id];
+    const entry_lines = [`++ pick ${sha}`];
+    const id = commit2.branch_id;
+    if (id == null || id === UNASSIGNED) {
+      entry_lines.push(commit2.full_message);
+    } else {
+      const title = commit2.title;
+      invariant(title, "commit.title must exist");
+      const metadata = { id, title };
+      const unsafe_message_with_id = write(commit2.full_message, metadata);
+      const message_with_id = unsafe_message_with_id;
+      entry_lines.push(message_with_id);
+    }
     const entry = entry_lines.join(`
 `);
     entry_list.push(entry);
@@ -38761,27 +38783,9 @@ async function run() {
       }
     }
     actions.debug(`master_branch = ${master_branch}`);
-    const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
-    if (branch_name === "HEAD") {
-      actions.error("Must run within a branch.");
-      actions.exit(0);
-      return;
-    }
-    if (`origin/${branch_name}` === master_branch) {
-      actions.error("Must run within a branch.");
-      actions.exit(0);
-      return;
-    }
     const head = (await cli("git rev-parse HEAD")).stdout;
+    const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
-    if (head === merge_base) {
-      actions.newline();
-      actions.output(/* @__PURE__ */ React27.createElement(Text, {
-        color: colors.gray
-      }, "No changes detected."));
-      actions.exit(0);
-      return;
-    }
     const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
     const repo_path = match_group(origin_url, RE5.repo_path, "repo_path");
     const repo_root = (await cli(`git rev-parse --show-toplevel`)).stdout;
@@ -38791,6 +38795,7 @@ async function run() {
       state.master_branch = master_branch;
       state.head = head;
       state.branch_name = branch_name;
+      state.merge_base = merge_base;
     });
   } catch (err) {
     actions.error("Unable to gather git metadata.");
@@ -38927,7 +38932,7 @@ async function run3() {
 }
 
 // src/app/Main.tsx
-var React45 = __toESM(require_react(), 1);
+var React44 = __toESM(require_react(), 1);
 
 // src/app/LocalMergeRebase.tsx
 var React35 = __toESM(require_react(), 1);
@@ -39013,11 +39018,6 @@ function Container(props) {
   }));
 }
 
-// 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);
@@ -39165,11 +39165,7 @@ async function run4() {
     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) {
+  } else if (needs_update || argv.force) {
     Store.setState((state2) => {
       state2.step = "select-commit-ranges";
     });
@@ -39228,7 +39224,7 @@ function Rebase(props) {
   return /* @__PURE__ */ React34.createElement(Await, {
     fallback: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
-    }, "Rebasing commits…"),
+    }, "Rebasing…"),
     function: () => Rebase.run(props)
   });
 }
@@ -39250,12 +39246,50 @@ Rebase.run = async function run5(props) {
     handle_exit2();
     return 19;
   });
+  const master_branch_name = master_branch.replace(/^origin\//, "");
   const temp_branch_name = `${branch_name}_${short_id()}`;
   try {
     process.chdir(repo_root);
     await cli(`pwd`);
-    const master_branch_name = master_branch.replace(/^origin\//, "");
     await cli(`git fetch --no-tags -v origin ${master_branch_name}`);
+    if (branch_name === master_branch_name) {
+      await rebase_master();
+    } else {
+      await rebase_branch();
+    }
+    actions.unregister_abort_handler();
+  } catch (err) {
+    actions.error("Unable to rebase.");
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+    actions.exit(20);
+  }
+  const next_commit_range = await range();
+  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__ */ React34.createElement(Brackets, null, branch_name),
+      origin_branch: /* @__PURE__ */ React34.createElement(Brackets, null, master_branch)
+    }
+  }));
+  actions.set((state2) => {
+    state2.commit_range = next_commit_range;
+  });
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
+    actions.exit(0);
+  }
+  async function rebase_master() {
+    await cli(`git switch -C "${master_branch_name}" "${master_branch}"`);
+  }
+  async function rebase_branch() {
+    invariant(commit_range, "commit_range must exist");
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
     const rebase_merge_base = master_sha;
     await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
@@ -39302,33 +39336,6 @@ Rebase.run = async function run5(props) {
     }
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
     restore_git();
-    actions.unregister_abort_handler();
-  } catch (err) {
-    actions.error("Unable to rebase.");
-    if (err instanceof Error) {
-      actions.error(err.message);
-    }
-    actions.exit(20);
-  }
-  const next_commit_range = await range();
-  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__ */ React34.createElement(Brackets, null, branch_name),
-      origin_branch: /* @__PURE__ */ React34.createElement(Brackets, null, master_branch)
-    }
-  }));
-  actions.set((state2) => {
-    state2.commit_range = next_commit_range;
-  });
-  if (props.onComplete) {
-    props.onComplete();
-  } else {
-    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
-    actions.exit(0);
   }
   function restore_git() {
     const spawn_options = { ignoreExitCode: true };
@@ -39594,34 +39601,11 @@ var PR_TEMPLATE = Object.freeze({
 });
 var PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE);
 
-// src/app/PreSelectCommitRanges.tsx
-var React40 = __toESM(require_react(), 1);
-function PreSelectCommitRanges() {
-  const actions = Store.useActions();
-  const argv = Store.useState((state) => state.argv);
-  React40.useEffect(() => {
-    if (argv.force) {
-      Store.setState((state) => {
-        state.step = "select-commit-ranges";
-      });
-    }
-  }, [argv]);
-  return /* @__PURE__ */ React40.createElement(YesNoPrompt, {
-    message: "Some commits are new or outdated, would you like to select new commit ranges?",
-    onYes: () => {
-      actions.set((state) => {
-        state.step = "select-commit-ranges";
-      });
-    },
-    onNo: () => actions.exit(0)
-  });
-}
-
 // src/app/SelectCommitRanges.tsx
-var React43 = __toESM(require_react(), 1);
+var React42 = __toESM(require_react(), 1);
 
 // src/app/MultiSelect.tsx
-var React41 = __toESM(require_react(), 1);
+var React40 = __toESM(require_react(), 1);
 
 // src/core/clamp.ts
 function clamp(value, min, max) {
@@ -39644,7 +39628,7 @@ function wrap_index(value, list) {
 
 // src/app/MultiSelect.tsx
 function MultiSelect(props) {
-  const [selected_set, select] = React41.useReducer((state, value) => {
+  const [selected_set, select] = React40.useReducer((state, value) => {
     const next = new Set(state);
     if (next.has(value)) {
       next.delete(value);
@@ -39660,27 +39644,28 @@ function MultiSelect(props) {
     });
     return set2;
   });
-  const [index, set_index] = React41.useReducer((_, value) => {
+  const [index, set_index] = React40.useReducer((_, value) => {
     const next_index = clamp(value, 0, props.items.length - 1);
     return next_index;
   }, 0, function find_initial_index() {
     let last_enabled;
     for (let i2 = props.items.length - 1;i2 >= 0; i2--) {
       const item = props.items[i2];
-      if (!item.disabled) {
-        last_enabled = i2;
+      if (item.disabled) {
+        continue;
       }
-      if (!item.selected && !item.disabled) {
+      last_enabled = i2;
+      if (!item.selected) {
         return i2;
       }
     }
     if (is_finite_value(last_enabled)) {
       return last_enabled;
     }
-    return 0;
+    return props.startIndex || 0;
   });
-  const selectRef = React41.useRef(false);
-  React41.useEffect(() => {
+  const selectRef = React40.useRef(false);
+  React40.useEffect(() => {
     if (!selectRef.current) {
       return;
     }
@@ -39690,7 +39675,7 @@ function MultiSelect(props) {
     const state = selected_list.map((index2) => props.items[index2].value);
     props.onSelect({ item, selected, state });
   }, [selected_set]);
-  React41.useEffect(() => {
+  React40.useEffect(() => {
     const item = props.items[index].value;
     const selected_list = Array.from(selected_set);
     const selected = selected_set.has(index);
@@ -39732,13 +39717,13 @@ function MultiSelect(props) {
       }
     }
   });
-  return /* @__PURE__ */ React41.createElement(Box_default, {
+  return /* @__PURE__ */ React40.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__ */ React41.createElement(ItemRow, {
+    return /* @__PURE__ */ React40.createElement(ItemRow, {
       key: i2,
       label: item.label,
       active,
@@ -39750,32 +39735,26 @@ function MultiSelect(props) {
 }
 function ItemRow(props) {
   let color;
-  let bold;
   let underline;
   let dimColor;
   if (props.active) {
     color = colors.blue;
     underline = true;
   }
-  if (props.selected) {
-    bold = true;
-  }
   if (props.disabled) {
     color = "";
-    bold = false;
     underline = false;
     dimColor = true;
   }
-  return /* @__PURE__ */ React41.createElement(Box_default, {
+  return /* @__PURE__ */ React40.createElement(Box_default, {
     flexDirection: "row",
     gap: 1
-  }, /* @__PURE__ */ React41.createElement(Radio, {
+  }, /* @__PURE__ */ React40.createElement(Radio, {
     selected: props.selected,
     disabled: props.disabled
-  }), /* @__PURE__ */ React41.createElement(Box_default, {
+  }), /* @__PURE__ */ React40.createElement(Box_default, {
     width: props.maxWidth
-  }, /* @__PURE__ */ React41.createElement(Text, {
-    bold,
+  }, /* @__PURE__ */ React40.createElement(Text, {
     underline,
     color,
     dimColor,
@@ -39797,7 +39776,7 @@ function Radio(props) {
     color = colors.gray;
     dimColor = true;
   }
-  return /* @__PURE__ */ React41.createElement(Text, {
+  return /* @__PURE__ */ React40.createElement(Text, {
     bold: props.selected,
     color,
     dimColor
@@ -39805,14 +39784,14 @@ function Radio(props) {
 }
 
 // src/app/TextInput.tsx
-var React42 = __toESM(require_react(), 1);
+var React41 = __toESM(require_react(), 1);
 function TextInput(props) {
-  const [value, set_value] = React42.useState(get_value(props));
-  React42.useEffect(function sync_value_prop() {
+  const [value, set_value] = React41.useState(get_value(props));
+  React41.useEffect(function sync_value_prop() {
     set_value(get_value(props));
   }, [props.value]);
-  const [caret_visible, set_caret_visible] = React42.useState(false);
-  React42.useEffect(function blink_caret() {
+  const [caret_visible, set_caret_visible] = React41.useState(false);
+  React41.useEffect(function blink_caret() {
     const interval_ms = 500;
     let timeoutId = setTimeout(tick, interval_ms);
     function tick() {
@@ -39825,7 +39804,13 @@ function TextInput(props) {
   }, []);
   use_input_default((input, key) => {
     let next_value = value;
-    if (key.backspace || key.delete) {
+    if (key.escape) {
+      if (value === "") {
+        props.onCancel?.();
+      } else {
+        next_value = "";
+      }
+    } else if (key.backspace || key.delete) {
       next_value = value.slice(0, -1);
     } else if (key.return) {
       props.onSubmit?.(next_value);
@@ -39844,12 +39829,12 @@ function TextInput(props) {
     set_value(next_value);
     props.onChange?.(next_value);
   });
-  return /* @__PURE__ */ React42.createElement(Box_default, {
+  return /* @__PURE__ */ React41.createElement(Box_default, {
     borderStyle: "single",
     minHeight: 1,
     borderColor: colors.yellow,
     borderDimColor: true
-  }, /* @__PURE__ */ React42.createElement(Text, null, value || ""), /* @__PURE__ */ React42.createElement(Text, {
+  }, /* @__PURE__ */ React41.createElement(Text, null, value || ""), /* @__PURE__ */ React41.createElement(Text, {
     color: colors.yellow,
     dimColor: true,
     inverse: caret_visible
@@ -39868,26 +39853,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__ */ React43.createElement(SelectCommitRangesInternal, {
+  return /* @__PURE__ */ React42.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] = React43.useState(() => {
+  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) {
       return first_group.id;
     }
     return props.commit_range.UNASSIGNED;
   });
-  const [group_input, set_group_input] = React43.useState(false);
-  const [new_group_list, create_group] = React43.useReducer((group_list2, group2) => {
+  const [group_input, set_group_input] = React42.useState(false);
+  const [new_group_list, create_group] = React42.useReducer((group_list2, group2) => {
     const next_group_list = group_list2.concat(group2);
     return next_group_list;
   }, []);
-  const [commit_map, update_commit_map] = React43.useReducer((map, args) => {
+  const [commit_map, update_commit_map] = React42.useReducer((map, args) => {
     map.set(args.key, args.value);
     return new Map(map);
   }, new Map, (map) => {
@@ -39898,9 +39883,12 @@ function SelectCommitRangesInternal(props) {
   });
   const group_list = [];
   let unassigned_count = 0;
+  let assigned_count = 0;
   for (const [, group_id] of commit_map.entries()) {
     if (group_id === null) {
       unassigned_count++;
+    } else {
+      assigned_count++;
     }
   }
   const total_group_count = new_group_list.length + props.commit_range.group_list.length;
@@ -39928,29 +39916,37 @@ function SelectCommitRangesInternal(props) {
   if (current_index === -1) {
     current_index = 0;
   }
+  const has_unassigned_commits = unassigned_count > 0;
+  const has_assigned_commits = assigned_count > 0;
+  const sync_status = detect_sync_status();
   use_input_default((input, key) => {
-    const inputLower = input.toLowerCase();
-    const hasUnassignedCommits = unassigned_count > 0;
-    if (!hasUnassignedCommits && inputLower === "s") {
+    const input_lower = input.toLowerCase();
+    if (input_lower === SYMBOL.s) {
+      if (group_input) {
+        return;
+      }
+      if (sync_status === "disabled") {
+        return;
+      }
       actions.set((state) => {
-        state.commit_map = {};
-        for (const [sha, id] of commit_map.entries()) {
-          if (id) {
-            const group2 = group_list.find((g2) => g2.id === id);
-            if (group2) {
-              state.commit_map[sha] = group2;
-            }
+        const state_commit_map = {};
+        for (let [sha, id] of commit_map.entries()) {
+          if (!id) {
+            id = props.commit_range.UNASSIGNED;
+            const title = "allow_unassigned";
+            state_commit_map[sha] = { id, title };
+            continue;
           }
+          const group2 = group_list.find((g2) => g2.id === id);
+          invariant(group2, "group must exist");
+          state_commit_map[sha] = group2;
         }
-        switch (inputLower) {
-          case "s":
-            state.step = "pre-manual-rebase";
-            break;
-        }
+        state.commit_map = state_commit_map;
+        state.step = "pre-manual-rebase";
       });
       return;
     }
-    if (hasUnassignedCommits && inputLower === "c") {
+    if (has_unassigned_commits && input_lower === SYMBOL.c) {
       set_group_input(true);
       return;
     }
@@ -39968,12 +39964,17 @@ function SelectCommitRangesInternal(props) {
   const group = group_list[current_index];
   const multiselect_disabled = group_input;
   const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
+  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 selected = commit_metadata_id !== null;
     let disabled;
     if (group_input) {
       disabled = true;
+    } else if (!has_groups) {
+      disabled = true;
     } else {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
@@ -39985,24 +39986,84 @@ function SelectCommitRangesInternal(props) {
     };
   });
   items.reverse();
-  const left_arrow = `${SYMBOL.left} `;
-  const right_arrow = ` ${SYMBOL.right}`;
-  const group_position = `(${current_index + 1}/${group_list.length}) `;
-  const max_group_label_width = 80;
-  let group_title_width = max_group_label_width;
-  group_title_width -= group_position.length;
-  group_title_width -= left_arrow.length + right_arrow.length;
-  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] = React43.useState("");
-  return /* @__PURE__ */ React43.createElement(Box_default, {
+  return /* @__PURE__ */ React42.createElement(Box_default, {
     flexDirection: "column"
-  }, /* @__PURE__ */ React43.createElement(Box_default, {
+  }, /* @__PURE__ */ React42.createElement(Box_default, {
+    height: 1
+  }), has_groups || group_input ? null : /* @__PURE__ */ React42.createElement(Box_default, {
+    flexDirection: "column"
+  }, /* @__PURE__ */ React42.createElement(Text, {
+    bold: true,
+    color: colors.blue
+  }, "\uD83D\uDC4B Welcome to ", /* @__PURE__ */ React42.createElement(Command, null, "git stack"), "!"), /* @__PURE__ */ React42.createElement(Text, {
+    color: colors.blue
+  }, /* @__PURE__ */ React42.createElement(FormatText, {
+    message: "Press {c} to {create} a new PR",
+    values: {
+      c: /* @__PURE__ */ React42.createElement(Text, {
+        bold: true,
+        color: colors.green
+      }, "c"),
+      create: /* @__PURE__ */ React42.createElement(Text, {
+        bold: true,
+        color: colors.green
+      }, /* @__PURE__ */ React42.createElement(Parens, null, "c"), "reate")
+    }
+  }))), !has_groups || group_input ? null : /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(Box_default, {
+    width: max_width,
+    flexDirection: "row"
+  }, /* @__PURE__ */ React42.createElement(Box_default, {
+    flexDirection: "row"
+  }, /* @__PURE__ */ React42.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, SYMBOL.left), /* @__PURE__ */ React42.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React42.createElement(Text, {
+    color: colors.gray
+  }, "Pull request"), /* @__PURE__ */ React42.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React42.createElement(Text, {
+    color: colors.gray
+  }, `(${current_index + 1}/${group_list.length})`), /* @__PURE__ */ React42.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React42.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, SYMBOL.right))), /* @__PURE__ */ React42.createElement(Box_default, {
+    width: max_width
+  }, /* @__PURE__ */ React42.createElement(Text, {
+    wrap: "truncate-end",
+    bold: true,
+    color: colors.white
+  }, group.title))), !group_input ? null : /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React43.createElement(MultiSelect, {
+  }), /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+      color: colors.gray
+    }),
+    message: "Enter a title for the PR {note}",
+    values: {
+      note: /* @__PURE__ */ React42.createElement(Parens, null, /* @__PURE__ */ React42.createElement(FormatText, {
+        message: "press {enter} to submit",
+        values: {
+          enter: /* @__PURE__ */ React42.createElement(Text, {
+            bold: true,
+            color: colors.green
+          }, SYMBOL.enter)
+        }
+      }))
+    }
+  }), /* @__PURE__ */ React42.createElement(TextInput, {
+    defaultValue: focused,
+    onSubmit: submit_group_input,
+    onCancel: () => set_group_input(false)
+  })), /* @__PURE__ */ React42.createElement(Box_default, {
+    height: 1
+  }), /* @__PURE__ */ React42.createElement(MultiSelect, {
+    startIndex: items.length - 1,
     items,
-    maxWidth: max_item_width,
+    maxWidth: max_width,
     disabled: multiselect_disabled,
     disableSelect: multiselect_disableSelect,
     onFocus: (args) => {
@@ -40018,108 +40079,76 @@ function SelectCommitRangesInternal(props) {
       }
       update_commit_map({ key, value });
     }
-  }), /* @__PURE__ */ React43.createElement(Box_default, {
+  }), /* @__PURE__ */ React42.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React43.createElement(Box_default, {
-    width: max_group_label_width,
-    flexDirection: "row"
-  }, /* @__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__ */ React43.createElement(Text, {
-    wrap: "truncate-end"
-  }, group.title)), /* @__PURE__ */ React43.createElement(Text, null, right_arrow)), /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
-  }), unassigned_count > 0 ? /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+  }), has_unassigned_commits ? /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
-    message: "{count} unassigned commits, press {c} to {create} a new group",
+    message: "{count} unassigned commits",
     values: {
-      count: /* @__PURE__ */ React43.createElement(Text, {
+      count: /* @__PURE__ */ React42.createElement(Text, {
         color: colors.yellow,
         bold: true
-      }, unassigned_count),
-      c: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, "c"),
-      create: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, /* @__PURE__ */ React43.createElement(Parens, null, "c"), "reate")
-    }
-  }) : /* @__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__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, "s"),
-      sync: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "ync")
+      }, unassigned_count)
     }
-  }) : /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
+  }), group_input ? null : /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
+      color: colors.gray
+    }),
+    message: "Press {c} to {create} a new PR",
     values: {
-      s: /* @__PURE__ */ React43.createElement(Text, {
+      c: /* @__PURE__ */ React42.createElement(Text, {
         bold: true,
         color: colors.green
-      }, "s"),
-      save: /* @__PURE__ */ React43.createElement(Text, {
+      }, "c"),
+      create: /* @__PURE__ */ React42.createElement(Text, {
         bold: true,
         color: colors.green
-      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "save")
+      }, /* @__PURE__ */ React42.createElement(Parens, null, "c"), "reate")
     }
-  })), !group_input ? null : /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
-  }), /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+  }), sync_status !== "allow_unassigned" ? null : /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
-    message: "Enter a title for the PR {note}",
+    message: "Press {s} to {sync} the {count} assigned commits to Github",
     values: {
-      note: /* @__PURE__ */ React43.createElement(Parens, null, /* @__PURE__ */ React43.createElement(FormatText, {
-        message: "press {enter} to submit",
-        values: {
-          enter: /* @__PURE__ */ React43.createElement(Text, {
-            bold: true,
-            color: colors.green
-          }, SYMBOL.enter)
-        }
-      }))
+      ...S_TO_SYNC_VALUES,
+      count: /* @__PURE__ */ React42.createElement(Text, {
+        color: colors.yellow,
+        bold: true
+      }, assigned_count)
     }
-  }), /* @__PURE__ */ React43.createElement(TextInput, {
-    defaultValue: focused,
-    onSubmit: submit_group_input
-  }), /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
-  })), /* @__PURE__ */ React43.createElement(Box_default, null, /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+  })) : /* @__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, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, null),
+    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
+    values: S_TO_SYNC_VALUES
+  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
-    message: "Press {left} and {right} to view PR groups",
+    message: "Press {left} and {right} to view PRs",
     values: {
-      left: /* @__PURE__ */ React43.createElement(Text, {
+      left: /* @__PURE__ */ React42.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.left),
-      right: /* @__PURE__ */ React43.createElement(Text, {
+      right: /* @__PURE__ */ React42.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.right)
     }
-  })), /* @__PURE__ */ React43.createElement(Box_default, null, /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+  })), /* @__PURE__ */ React42.createElement(Box_default, null, /* @__PURE__ */ React42.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React42.createElement(Text, {
       color: colors.gray
     }),
     message: "Press {enter} to toggle commit selection",
     values: {
-      enter: /* @__PURE__ */ React43.createElement(Text, {
+      enter: /* @__PURE__ */ React42.createElement(Text, {
         bold: true,
         color: colors.green
       }, SYMBOL.enter)
@@ -40136,29 +40165,67 @@ function SelectCommitRangesInternal(props) {
   }
   function submit_group_input(title) {
     const id = get_group_id();
-    actions.output(/* @__PURE__ */ React43.createElement(FormatText, {
-      wrapper: /* @__PURE__ */ React43.createElement(Text, {
+    actions.output(/* @__PURE__ */ React42.createElement(FormatText, {
+      wrapper: /* @__PURE__ */ React42.createElement(Text, {
         dimColor: true
       }),
-      message: "Created new group {group} {note}",
+      message: "Created new PR {group} {note}",
       values: {
-        group: /* @__PURE__ */ React43.createElement(Brackets, null, title),
-        note: /* @__PURE__ */ React43.createElement(Parens, null, id)
+        group: /* @__PURE__ */ React42.createElement(Brackets, null, title),
+        note: /* @__PURE__ */ React42.createElement(Parens, null, id)
       }
     }));
     create_group({ id, title });
     set_selected_group_id(id);
     set_group_input(false);
   }
+  function detect_sync_status() {
+    if (!has_unassigned_commits) {
+      return "allow";
+    }
+    if (!has_assigned_commits) {
+      return "disabled";
+    }
+    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);
+      if (allow_unassigned_sync === null) {
+        if (group_id === null) {
+          allow_unassigned_sync = true;
+        }
+      } else {
+        if (group_id) {
+          allow_unassigned_sync = false;
+        }
+      }
+    }
+    if (allow_unassigned_sync) {
+      return "allow_unassigned";
+    }
+    return "disabled";
+  }
 }
 var SYMBOL = {
   left: "←",
   right: "→",
-  enter: "Enter"
+  enter: "Enter",
+  c: "c",
+  s: "s"
+};
+var S_TO_SYNC_VALUES = {
+  s: /* @__PURE__ */ React42.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, "s"),
+  sync: /* @__PURE__ */ React42.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, /* @__PURE__ */ React42.createElement(Parens, null, "s"), "ync")
 };
 
 // src/app/SyncGithub.tsx
-var React44 = __toESM(require_react(), 1);
+var React43 = __toESM(require_react(), 1);
 var import_last = __toESM(require_last(), 1);
 
 // src/core/StackSummaryTable.ts
@@ -40263,8 +40330,8 @@ var RE6 = {
 
 // src/app/SyncGithub.tsx
 function SyncGithub() {
-  return /* @__PURE__ */ React44.createElement(Await, {
-    fallback: /* @__PURE__ */ React44.createElement(Text, {
+  return /* @__PURE__ */ React43.createElement(Await, {
+    fallback: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.yellow
     }, "Syncing…"),
     function: run9
@@ -40307,15 +40374,15 @@ async function run9() {
       git_push_command.push(target);
     }
     await cli(git_push_command);
-    const pr_url_list = commit_range.group_list.map(get_group_url);
+    const pr_url_list = push_group_list.map(get_group_url);
     const after_push_tasks = [];
     for (const group of push_group_list) {
       after_push_tasks.push(after_push({ group, pr_url_list }));
     }
     await Promise.all(after_push_tasks);
     const update_pr_body_tasks = [];
-    for (let i2 = 0;i2 < commit_range.group_list.length; i2++) {
-      const group = commit_range.group_list[i2];
+    for (let i2 = 0;i2 < push_group_list.length; i2++) {
+      const group = push_group_list[i2];
       const selected_url = pr_url_list[i2];
       const task = update_pr_body({ group, selected_url, pr_url_list });
       update_pr_body_tasks.push(task);
@@ -40343,7 +40410,9 @@ async function run9() {
         break;
       }
       const group = commit_range.group_list[index];
-      push_group_list2.unshift(group);
+      if (group.id !== commit_range.UNASSIGNED) {
+        push_group_list2.unshift(group);
+      }
     }
     return push_group_list2;
   }
@@ -40420,25 +40489,23 @@ function Main() {
     case "loading":
       return null;
     case "github-api-error":
-      return /* @__PURE__ */ React45.createElement(GithubApiError, null);
+      return /* @__PURE__ */ React44.createElement(GithubApiError, null);
     case "status":
-      return /* @__PURE__ */ React45.createElement(Status, null);
+      return /* @__PURE__ */ React44.createElement(Status, null);
     case "local-merge-rebase":
-      return /* @__PURE__ */ React45.createElement(LocalMergeRebase, null);
+      return /* @__PURE__ */ React44.createElement(LocalMergeRebase, null);
     case "pre-local-merge-rebase":
-      return /* @__PURE__ */ React45.createElement(PreLocalMergeRebase, null);
-    case "pre-select-commit-ranges":
-      return /* @__PURE__ */ React45.createElement(PreSelectCommitRanges, null);
+      return /* @__PURE__ */ React44.createElement(PreLocalMergeRebase, null);
     case "select-commit-ranges":
-      return /* @__PURE__ */ React45.createElement(SelectCommitRanges, null);
+      return /* @__PURE__ */ React44.createElement(SelectCommitRanges, null);
     case "pre-manual-rebase":
-      return /* @__PURE__ */ React45.createElement(PreManualRebase, null);
+      return /* @__PURE__ */ React44.createElement(PreManualRebase, null);
     case "manual-rebase":
-      return /* @__PURE__ */ React45.createElement(ManualRebase, null);
+      return /* @__PURE__ */ React44.createElement(ManualRebase, null);
     case "sync-github":
-      return /* @__PURE__ */ React45.createElement(SyncGithub, null);
+      return /* @__PURE__ */ React44.createElement(SyncGithub, null);
     case "post-rebase-status":
-      return /* @__PURE__ */ React45.createElement(PostRebaseStatus, null);
+      return /* @__PURE__ */ React44.createElement(PostRebaseStatus, null);
     default:
       assertNever(step);
       return null;
@@ -40446,56 +40513,56 @@ function Main() {
 }
 
 // src/app/Output.tsx
-var React46 = __toESM(require_react(), 1);
+var React45 = __toESM(require_react(), 1);
 function Output2() {
   const output = Store.useState((state) => state.output);
   const pending_output = Store.useState((state) => state.pending_output);
   const pending_output_items = Object.values(pending_output);
-  return /* @__PURE__ */ React46.createElement(React46.Fragment, null, /* @__PURE__ */ React46.createElement(Static, {
+  return /* @__PURE__ */ React45.createElement(React45.Fragment, null, /* @__PURE__ */ React45.createElement(Static, {
     items: output
   }, (node, i2) => {
-    return /* @__PURE__ */ React46.createElement(Box_default, {
+    return /* @__PURE__ */ React45.createElement(Box_default, {
       key: i2
     }, node);
   }), pending_output_items.map((node_list, i2) => {
-    return /* @__PURE__ */ React46.createElement(Box_default, {
+    return /* @__PURE__ */ React45.createElement(Box_default, {
       key: i2
-    }, /* @__PURE__ */ React46.createElement(Text, null, node_list.map((text, j) => {
-      return /* @__PURE__ */ React46.createElement(React46.Fragment, {
+    }, /* @__PURE__ */ React45.createElement(Text, null, node_list.map((text, j) => {
+      return /* @__PURE__ */ React45.createElement(React45.Fragment, {
         key: j
-      }, /* @__PURE__ */ React46.createElement(Text, null, text));
+      }, /* @__PURE__ */ React45.createElement(Text, null, text));
     })));
   }));
 }
 
 // src/app/Providers.tsx
-var React47 = __toESM(require_react(), 1);
+var React46 = __toESM(require_react(), 1);
 var import_react_intl2 = __toESM(require_react_intl(), 1);
 function Providers(props) {
-  return /* @__PURE__ */ React47.createElement(import_react_intl2.IntlProvider, {
+  return /* @__PURE__ */ React46.createElement(import_react_intl2.IntlProvider, {
     locale: "en"
   }, props.children);
 }
 
 // src/app/RebaseCheck.tsx
-var React48 = __toESM(require_react(), 1);
+var React47 = __toESM(require_react(), 1);
 import path8 from "node:path";
 function reducer5(state, patch) {
   return { ...state, ...patch };
 }
 function RebaseCheck(props) {
   const actions = Store.useActions();
-  const [state, patch] = React48.useReducer(reducer5, {
+  const [state, patch] = React47.useReducer(reducer5, {
     status: "init"
   });
   switch (state.status) {
     case "done":
       return props.children;
     case "prompt":
-      return /* @__PURE__ */ React48.createElement(YesNoPrompt, {
-        message: /* @__PURE__ */ React48.createElement(Text, {
+      return /* @__PURE__ */ React47.createElement(YesNoPrompt, {
+        message: /* @__PURE__ */ React47.createElement(Text, {
           color: colors.yellow
-        }, /* @__PURE__ */ React48.createElement(Command, null, "git rebase"), " detected, would you like to abort it?"),
+        }, /* @__PURE__ */ React47.createElement(Command, null, "git rebase"), " detected, would you like to abort it?"),
         onYes: async () => {
           await cli(`git rebase --abort`);
           patch({ status: "done" });
@@ -40505,11 +40572,11 @@ function RebaseCheck(props) {
         }
       });
     default:
-      return /* @__PURE__ */ React48.createElement(Await, {
+      return /* @__PURE__ */ React47.createElement(Await, {
         function: run10,
-        fallback: /* @__PURE__ */ React48.createElement(Text, {
+        fallback: /* @__PURE__ */ React47.createElement(Text, {
           color: colors.yellow
-        }, "Checking for ", /* @__PURE__ */ React48.createElement(Command, null, "git rebase"), "…")
+        }, "Checking for ", /* @__PURE__ */ React47.createElement(Command, null, "git rebase"), "…")
       });
   }
   async function run10() {
@@ -40530,6 +40597,55 @@ function RebaseCheck(props) {
   }
 }
 
+// src/app/RequireBranch.tsx
+var React48 = __toESM(require_react(), 1);
+function RequireBranch(props) {
+  const fallback = /* @__PURE__ */ React48.createElement(Text, {
+    color: colors.yellow
+  }, "Gathering local git information…");
+  return /* @__PURE__ */ React48.createElement(Await, {
+    fallback,
+    function: run10
+  }, props.children);
+}
+async function run10() {
+  const state = Store.getState();
+  const actions = Store.getState().actions;
+  const master_branch = state.master_branch;
+  const head = state.head;
+  const branch_name = state.branch_name;
+  const merge_base = state.merge_base;
+  invariant(head, "head must exist");
+  invariant(branch_name, "branch_name must exist");
+  invariant(merge_base, "merge_base must exist");
+  try {
+    if (branch_name === "HEAD") {
+      actions.error("Must run within a branch.");
+      actions.exit(0);
+      return;
+    }
+    if (`origin/${branch_name}` === master_branch) {
+      actions.error("Must run within a branch.");
+      actions.exit(0);
+      return;
+    }
+    if (head === merge_base) {
+      actions.newline();
+      actions.output(/* @__PURE__ */ React48.createElement(Text, {
+        color: colors.gray
+      }, "No changes detected."));
+      actions.exit(0);
+      return;
+    }
+  } catch (err) {
+    actions.error("Unable to detect branch changes.");
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+    actions.exit(17);
+  }
+}
+
 // src/app/VerboseDebugInfo.tsx
 var React49 = __toESM(require_react(), 1);
 function VerboseDebugInfo(props) {
@@ -40538,10 +40654,10 @@ function VerboseDebugInfo(props) {
   }, "Logging verbose debug information…");
   return /* @__PURE__ */ React49.createElement(Await, {
     fallback,
-    function: run10
+    function: run11
   }, props.children);
 }
-async function run10() {
+async function run11() {
   const actions = Store.getState().actions;
   try {
     await cli(`echo HOME=$HOME`);
@@ -40563,10 +40679,10 @@ var React50 = __toESM(require_react(), 1);
 function Fixup() {
   return /* @__PURE__ */ React50.createElement(Await, {
     fallback: null,
-    function: run11
+    function: run12
   });
 }
-async function run11() {
+async function run12() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -40651,10 +40767,10 @@ function Log() {
   const available_width = stdout.columns || 80;
   return /* @__PURE__ */ React51.createElement(Await, {
     fallback: null,
-    function: () => run12({ available_width })
+    function: () => run13({ available_width })
   });
 }
-async function run12(args) {
+async function run13(args) {
   const state = Store.getState();
   const actions = state.actions;
   const process_argv = state.process_argv;
@@ -40685,10 +40801,10 @@ var React52 = __toESM(require_react(), 1);
 function Update() {
   return /* @__PURE__ */ React52.createElement(Await, {
     fallback: null,
-    function: run13
+    function: run14
   });
 }
-async function run13() {
+async function run14() {
   const state = Store.getState();
   const actions = state.actions;
   actions.exit(0);
@@ -40810,7 +40926,7 @@ function MaybeMain() {
   } 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(LocalCommitStatus, null, /* @__PURE__ */ React55.createElement(DetectInitialPR, null, /* @__PURE__ */ React55.createElement(Main, 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
@@ -45675,7 +45791,7 @@ 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.5.3").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).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;
 }
 var GlobalOptions = {
   verbose: {