Repository navigation
fix(channel): start lanes from origin's default branch and diff against their base - #144
Merged
Merged
Conversation
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
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.
New lanes fetch origin's advertised default branch before creating their worktree, or use an explicit base. Remote bases are fetched; local branches, tags, and commits work offline. The project checkout stays unchanged. If origin is unavailable, the error explains how to select a local base.
Each lane stores its comparison target in pi. Both the Diff file list and patches use the merge-base with that target, so changes already on the target stay out of the lane's diff. Passing a base when switching an existing lane retargets the comparison without moving its files. Starts memoize their selected commit for crash recovery, and lane ownership is rechecked inside the claiming transaction.
The version 2
ace.lanesmigration preserves existing lane ownership and paths. Legacy lanes compare against localorigin/HEAD, retaining project-HEAD comparison only for repositories without origin. A missing local default produces a repair instruction.Fixes #96. Part of #5.
Validation
bun types,bun run ci, andgit diff --checkpass after rebasing onto main.The fetch-time ownership race and a crash before the worktree directory exists were reviewed in code but not exercised at runtime.
Built in Ace
Implementation, Git/model smokes, migration validation, checks, and PR creation used an Ace channel and its tools. Initial inspection, coordination, and parallel review used Codex because Ace cannot continue this external harness session yet (#9).