gh-stack 0.19.5 → 0.19.6

package/README.md

@@ -92,6 +92,9 @@ add [branch] [--parent <branch>]
     stack — without pushing or opening a PR. Walks local ancestry: if the
     branch sits on top of an existing stack it's adopted into it (parent
     auto-detected); otherwise a new stack is created from the chain.
+    A PR that gh-stack already recorded for a branch in git config (in
+    another worktree of the repo) is kept, so a stack submitted from a
+    worktree can be tracked in the main checkout and merged from there.
 
     --parent <branch>: stack it directly on <branch> (which it must
     already be based on), tracking <branch> first if needed. Use this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-stack",
-  "version": "0.19.5",
+  "version": "0.19.6",
   "description": "Stacked PR manager for squash-merge workflows",
   "author": "Kiliman <kiliman@gmail.com>",
   "license": "MIT",

package/src/commands/add.ts

@@ -38,7 +38,8 @@ OPTIONS
                      its stack and has no PR (e.g. a mistaken ${"`"}init${"`"} at trunk).
 
 Network-free — nothing is pushed and no PR is opened. Run ${"`"}gh-stack submit${"`"} when
-you're ready to publish.
+you're ready to publish. A PR already recorded for the branch in git config
+(by gh-stack in another worktree of this repo) is kept.
 
 EXAMPLES
   gh-stack add                    Track the current branch

package/src/lib/chain.ts

@@ -4,9 +4,25 @@
 // auto-create/register a stack from a bare set of local branches so the
 // end state is always stack registered + branches pushed + PRs created).
 import * as git from "./git.ts";
+import { allBranchMemberships, type BranchMembership } from "./branch-config.ts";
 import { findStackForBranch, getOrderedBranches, stackBase } from "./metadata.ts";
 import type { StackMetadata, Branch } from "../types.ts";
 
+/**
+ * A new stack entry for a branch, keeping the PR number and id already
+ * recorded for it in git config. Git config is shared by every worktree of a
+ * repo, but stack files are not: a branch submitted in one worktree and then
+ * tracked in another (the dependency sweep's handoff) would otherwise lose its
+ * PR, and `sync` and `merge --base` would not see it merge.
+ */
+function newBranchEntry(parent: string, recorded: BranchMembership | undefined): Branch {
+  return {
+    parent,
+    ...(recorded?.pr != null && { pr: recorded.pr }),
+    ...(recorded?.id && { id: recorded.id }),
+  };
+}
+
 /**
  * Detect a chain of branches from trunk to the current branch.
  *
@@ -107,6 +123,7 @@ export async function resolveOrCreateStack(
   trunk: string,
 ): Promise<StackResolution> {
   const fullChain = await detectBranchChain(branch, trunk); // trunk→current
+  const recorded = await allBranchMemberships();
 
   // Walk from just below `branch` downward; the first tracked ancestor is the
   // attachment point. Everything above it (up to `branch`) is the untracked
@@ -143,7 +160,7 @@ export async function resolveOrCreateStack(
       }
 
       if (stack.branches[name]) continue; // already tracked — leave as-is
-      stack.branches[name] = { parent };
+      stack.branches[name] = newBranchEntry(parent, recorded.get(name));
       stack.last_branch = name;
       addedBranches.push(name);
     }
@@ -177,8 +194,7 @@ export async function resolveOrCreateStack(
     const name = fullChain[i]!;
     if (stack.branches[name]) continue;
     const parent = i === 0 ? trunk : fullChain[i - 1]!;
-    const branchData: Branch = { parent };
-    stack.branches[name] = branchData;
+    stack.branches[name] = newBranchEntry(parent, recorded.get(name));
     stack.last_branch = name;
     addedBranches.push(name);
   }

package/src/lib/using-gh-stack.md

@@ -129,6 +129,11 @@ This resolves the catch-22 where `sync`/`restack` said "not in any stack" for a
 tip you hadn't submitted yet. (`submit` still auto-tracks too — `add` is just the
 no-publish path.)
 
+**Handing a stack over from another worktree.** Stack files are per worktree,
+but the PR numbers gh-stack records in git config are shared. So after
+submitting from a worktree, `gh-stack add <top-branch>` in the main checkout
+tracks the whole chain _with_ its PRs, and `sync`/`merge --base` work there.
+
 **Splice an existing branch/PR into a stack — `gh-stack join`.** For a branch
 that should have been stacked but was cut from main on its own (often with its
 own PR already open):