git-stack-cli 2.7.6 → 2.7.8

package/package.json

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

package/src/app/SelectCommitRanges.tsx

@@ -38,6 +38,8 @@ function SelectCommitRangesInternal(props: Props) {
   const branch_name = Store.useState((state) => state.branch_name);
   invariant(branch_name, "branch_name must exist");
 
+  const [focused, set_focused] = React.useState("");
+
   const [selected_group_id, set_selected_group_id] = React.useState(() => {
     const first_group = props.commit_range.group_list.find(
       (g) => g.id !== props.commit_range.UNASSIGNED,
@@ -79,57 +81,6 @@ function SelectCommitRangesInternal(props: Props) {
 
   const group_list: Array<SimpleGroup> = [];
 
-  // detect if there are unassigned commits
-  let unassigned_count = 0;
-  let assigned_count = 0;
-  for (const [, group_id] of commit_map.entries()) {
-    if (group_id === null) {
-      // console.debug("unassigned commit detected", sha);
-      unassigned_count++;
-    } else {
-      assigned_count++;
-    }
-  }
-
-  const total_group_count = new_group_list.length + props.commit_range.group_list.length;
-
-  for (let i = 0; i < props.commit_range.group_list.length; i++) {
-    const index = props.commit_range.group_list.length - i - 1;
-    const group = props.commit_range.group_list[index];
-
-    if (group.pr?.state === "MERGED") continue;
-
-    if (group.id === props.commit_range.UNASSIGNED) {
-      // only include unassigned group when there are no other groups
-      if (total_group_count === 1) {
-        group_list.push({
-          id: group.id,
-          title: "Unassigned",
-        });
-      }
-
-      continue;
-    }
-
-    group_list.push({
-      id: group.id,
-      title: group.pr?.title || group.title || group.id,
-    });
-  }
-
-  group_list.push(...new_group_list);
-
-  let current_index = group_list.findIndex((g) => g.id === selected_group_id);
-  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();
-  // console.debug({ sync_status });
-
   Ink.useInput((input, key) => {
     const input_lower = input.toLowerCase();
 
@@ -189,13 +140,67 @@ function SelectCommitRangesInternal(props: Props) {
     }
   });
 
+  // detect if there are unassigned commits
+  let unassigned_count = 0;
+  let assigned_count = 0;
+  for (const [, group_id] of commit_map.entries()) {
+    if (group_id === null) {
+      // console.debug("unassigned commit detected", sha);
+      unassigned_count++;
+    } else {
+      assigned_count++;
+    }
+  }
+
+  if (!props.commit_range.group_list.length) {
+    return null;
+  }
+
+  const total_group_count = new_group_list.length + props.commit_range.group_list.length;
+
+  for (let i = 0; i < props.commit_range.group_list.length; i++) {
+    const index = props.commit_range.group_list.length - i - 1;
+    const group = props.commit_range.group_list[index];
+
+    if (group.pr?.state === "MERGED") continue;
+
+    if (group.id === props.commit_range.UNASSIGNED) {
+      // only include unassigned group when there are no other groups
+      if (total_group_count === 1) {
+        group_list.push({
+          id: group.id,
+          title: "Unassigned",
+        });
+      }
+
+      continue;
+    }
+
+    group_list.push({
+      id: group.id,
+      title: group.pr?.title || group.title || group.id,
+    });
+  }
+
+  group_list.push(...new_group_list);
+
+  let current_index = group_list.findIndex((g) => g.id === selected_group_id);
+  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();
+  // console.debug({ sync_status });
+
   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] = React.useState("");
   const has_groups = group.id !== props.commit_range.UNASSIGNED;
 
   const items = props.commit_range.commit_list.map((commit) => {

package/src/app/Status.tsx

@@ -21,6 +21,10 @@ async function run() {
 
   invariant(commit_range, "commit_range must exist");
 
+  if (commit_range.group_list.length === 0) {
+    return actions.exit(0);
+  }
+
   actions.output(<StatusTable />);
 
   let needs_rebase = false;

package/src/app/SyncGithub.tsx

@@ -169,10 +169,26 @@ async function run() {
     // avoid accidentally pointing to orphaned parent commit
     // should hopefully fix issues where a PR includes a bunch of commits after pushing
     if (group.pr) {
-      await github.pr_edit({
-        branch: group.id,
-        base: master_branch,
-      });
+      // only update base if it is different
+      // github api started returning errors here on 2025-12-08
+      //
+      // ```
+      // [2025-12-08 17:54:44.114] [start] gh pr edit noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu --base master
+      // [2025-12-08 17:54:45.935] [end] gh pr edit noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu --base master (exit_code=1 duration=1.8s)
+      // [2025-12-08 17:54:45.937] GraphQL: A pull request already exists for base branch 'master' and head branch 'noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu' (updatePullRequest)
+      //
+      // [2025-12-08 17:54:45.938] gh pr edit noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu --base master (exit_code=1 duration=1.8s)
+      // GraphQL: A pull request already exists for base branch 'master' and head branch 'noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu' (updatePullRequest)
+      // gh pr edit noah/cua-images-chatgpt-prod-tags---4h0tk3liqmmplu --base master (exit_code=1 duration=1.8s)
+      // Unable to sync.
+      // ```
+      //
+      if (`origin/${group.pr.baseRefName}` !== master_branch) {
+        await github.pr_edit({
+          branch: group.id,
+          base: master_branch,
+        });
+      }
     }
   }
 
@@ -184,16 +200,27 @@ async function run() {
     const selected_url = get_group_url(group);
 
     if (group.pr) {
-      // ensure base matches pr in github
-      await github.pr_edit({
-        branch: group.id,
-        base: group.base,
-        body: StackSummaryTable.write({
-          body: group.pr.body,
-          pr_url_list,
-          selected_url,
-        }),
-      });
+      if (`origin/${group.pr.baseRefName}` !== master_branch) {
+        // ensure base matches pr in github
+        await github.pr_edit({
+          branch: group.id,
+          base: group.base,
+          body: StackSummaryTable.write({
+            body: group.pr.body,
+            pr_url_list,
+            selected_url,
+          }),
+        });
+      } else {
+        await github.pr_edit({
+          branch: group.id,
+          body: StackSummaryTable.write({
+            body: group.pr.body,
+            pr_url_list,
+            selected_url,
+          }),
+        });
+      }
     } else {
       // create pr in github
       const pr_url = await github.pr_create({

package/src/components/ErrorBoundary.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import * as React from "react";
 
 import * as Ink from "ink-cjs";

package/src/core/github.tsx

@@ -162,13 +162,17 @@ export async function pr_create(args: CreatePullRequestArgs) {
 
 type EditPullRequestArgs = {
   branch: string;
-  base: string;
+  base?: string;
   body?: string;
 };
 
 export async function pr_edit(args: EditPullRequestArgs) {
-  const base = args.base.replace(/^origin\//, "");
-  const command_parts = [`gh pr edit ${args.branch} --base ${base}`];
+  const command_parts = [`gh pr edit ${args.branch}`];
+
+  if (args.base) {
+    const base = args.base.replace(/^origin\//, "");
+    command_parts.push(`--base ${base}`);
+  }
 
   let body_file: string | undefined;
 
@@ -279,7 +283,8 @@ async function write_body_file(args: EditPullRequestArgs) {
   // ensure unique filename is safe for filesystem
   // base (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
   // the flashes would mess up the filesystem path to this file
-  const base = args.base.replace(/^origin\//, "");
+  let base = args.base || "master";
+  base = base.replace(/^origin\//, "");
   let tmp_filename = safe_filename(`git-stack-body-${base}`);
 
   const temp_path = path.join(await get_tmp_dir(), tmp_filename);

package/src/index.tsx

@@ -27,14 +27,14 @@ import { pretty_json } from "~/core/pretty_json";
       console.error("🚨 uncaughtException");
       console.error(error);
       maybe_verbose_help();
-      process.exit(237);
+      process.exit(20);
     });
 
     process.on("unhandledRejection", (reason, _promise) => {
       console.error("🚨 unhandledRejection");
       console.error(reason);
       maybe_verbose_help();
-      process.exit(238);
+      process.exit(21);
     });
 
     // cleanup leftover temporary files from previous run
@@ -76,9 +76,10 @@ import { pretty_json } from "~/core/pretty_json";
   } catch (err) {
     console.error("🚨 main catch");
     console.error(err);
-    process.exit(236);
+    process.exit(22);
   }
 })().catch((err) => {
   console.error("🚨 index catch");
   console.error(err);
+  process.exit(23);
 });