feat(polyrepo): stage task packets and fix orchestrator branch handling - #10
Merged
Conversation
…execution Remove extensions/taskplane/types.ts from 7 task file scopes where it was a secondary concern, not the primary deliverable. This shared file was creating false affinity chains that forced all tasks onto a single lane (serial execution). Kept types.ts in TP-001 (workspace config) and TP-006 (schema v2) where it is the core deliverable. Also adds dependencies.json for orchestrator dependency resolution.
Remove the integration_branch config setting entirely. The orchestrator now captures the current branch (git rev-parse --abbrev-ref HEAD) at /orch start time and uses it as the base for worktree creation and merge target throughout the batch lifecycle. This fixes a bug where worktrees were created from the configured integration_branch (defaulting to 'main'), which could be behind the working branch — causing task files to be missing in worktrees. Changes: - types.ts: Remove integration_branch from OrchestratorConfig, add baseBranch to OrchBatchRuntimeState and PersistedBatchState - git.ts: Add getCurrentBranch() helper - engine.ts: Capture current branch at batch start, fail fast on detached HEAD, pass baseBranch through execution pipeline - execution.ts: Accept baseBranch param in executeWave() - waves.ts: Accept baseBranch param in allocateLanes(), remove integration_branch validation - worktree.ts: Accept baseBranch param in createLaneWorktrees() and ensureLaneWorktrees() - merge.ts: Accept baseBranch param in mergeWave() - resume.ts: Restore baseBranch from persisted state - persistence.ts: Serialize/validate baseBranch with backward compatibility for older state files - config.ts: No changes needed (spread ignores unknown YAML keys) - Updated template, docs, CLI init, and tests
Add amendments to TP-004, TP-005, TP-006, TP-007, and TP-010 explaining the integration_branch removal and how baseBranch works now. This prevents worker agents from searching for the removed config field or misunderstanding changed function signatures.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Stage 12 polyrepo support task packets and fix critical orchestrator bugs discovered during first run.
Changes
Task staging
Bug fixes
maineven when running on a feature branch, causing task files to be missing. Removed theintegration_branchconfig setting entirely; the orchestrator now captures the current branch at/orchstart and uses it as the base for worktrees and merge target throughout the batch lifecycle.types.tsappeared in 9/12 task file scopes, creating false affinity chains that forced all tasks onto a single lane. Narrowed scopes to primary files only.taskplane initdefaults.Testing
helpanddoctorpass