git-stack-cli 2.7.7 → 2.7.8

package/package.json

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

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/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);