fix(providers): lane worktrees branch from the integration base, not operator HEAD#1089
Merged
Merged
Conversation
…operator HEAD A GLM run spawned while the operator's checkout sat on an unmerged fix branch produced a PR mixing that branch's content into the agent's diff (#1082). resolveIntegrationBase picks origin/develop, else origin/main (best-effort fetch, stale-ref fallback offline), else HEAD for fresh local-only repos, and the provider worktree branches from it. Fixes #1083 Co-Authored-By: Claude <noreply@anthropic.com>
|
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
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.
What
Fixes #1083 — provider-lane worktrees were created from the OPERATOR's checked-out HEAD; a GLM run spawned during an unmerged fix branch produced PR #1082 mixing that branch's content into the agent's diff.
How
resolveIntegrationBase: origin/develop → origin/main → HEAD (fresh local-only repos), with a best-effort 10s fetch and stale-ref fallback offline. The provider worktree branches from it.Verified
3 fixture tests (local-only → HEAD; develop preferred while on an unmerged branch; main fallback) + live check on this repo while ON a fix branch →
origin/develop. Typecheck + build green.🤖 Generated with Claude Code