taskplane 0.24.9 → 0.24.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -567,6 +567,20 @@ export function resolveBaseBranch(
|
|
|
567
567
|
batchBaseBranch: string,
|
|
568
568
|
workspaceConfig?: WorkspaceConfig | null,
|
|
569
569
|
): string {
|
|
570
|
+
// Step 0: If the batch base branch is an orch branch (wave 2+), check if
|
|
571
|
+
// it exists in this repo. The orch branch has merged work from previous
|
|
572
|
+
// waves — worktrees MUST branch from it so workers see prior wave output.
|
|
573
|
+
// Without this, wave 2 worktrees branch from the repo's HEAD (e.g. develop)
|
|
574
|
+
// which lacks wave 1's code, causing dependency satisfaction failures.
|
|
575
|
+
if (batchBaseBranch.startsWith("orch/") && repoId) {
|
|
576
|
+
try {
|
|
577
|
+
const check = runGit(["rev-parse", "--verify", `refs/heads/${batchBaseBranch}`], repoRoot);
|
|
578
|
+
if (check.status === 0) {
|
|
579
|
+
return batchBaseBranch;
|
|
580
|
+
}
|
|
581
|
+
} catch { /* orch branch doesn't exist in this repo — fall through */ }
|
|
582
|
+
}
|
|
583
|
+
|
|
570
584
|
// Step 1: Detect current branch of this specific repo.
|
|
571
585
|
// This is the branch the developer is working on — worktrees should
|
|
572
586
|
// branch from here so task files committed on this branch are visible.
|