fix(lanes): bit status crash after change-scope on a forked lane#10401
Closed
davidfirst wants to merge 1 commit into
Closed
fix(lanes): bit status crash after change-scope on a forked lane#10401davidfirst wants to merge 1 commit into
davidfirst wants to merge 1 commit into
Conversation
When a forked lane is rescoped (bit lane change-scope) to a scope different from the original lane, calculateRemote() fell through to comparing against the component's main-head. For components living on a different scope than the lane, that main-head object isn't fetched by "bit lane import", so status threw TargetHeadNotFound. Now cross-scope forks return null (all snaps treated as local/staged), matching the documented intent and avoiding the missing-object comparison. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a lane status crash when a newly forked lane is changed to a different target scope. It updates remote-baseline calculation so cross-scope forked lanes are treated as having no remote baseline, allowing all lane snaps to be staged for re-export instead of comparing against a potentially missing main head.
Changes:
- Adds a cross-scope fork guard in
calculateRemote()to returnnull. - Adds an e2e regression covering
lane import→ fork →change-scope→status.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
scopes/scope/objects/models/model-component.ts |
Adjusts lane remote-head calculation for cross-scope forked lanes. |
e2e/harmony/lanes/lane-management.e2e.ts |
Adds regression coverage for the prior bit status crash and staged status behavior. |
Member
Author
|
It's gonna be part of this PR: #10390. Closing this. |
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.
Running
bit statusafterbit lane import→bit lane create→bit lane change-scopecrashed with:Cause: when a forked lane is rescoped to a scope different from the original lane,
calculateRemote()(inmodel-component.ts) handled only the same-scope fork explicitly and let the cross-scope case fall through to comparing against the component's main-head. For components that live on a different scope than the lane, that main-head object isn't fetched bybit lane import(it's on a branch not reachable from the lane), so it's absent from the VersionHistory object and the divergence computation threwTargetHeadNotFound.Fix: cross-scope forks now return
null(no remote baseline → all snaps treated as local/staged, to be re-exported to the new scope). This matches the documented intent of the originalforkedFrom.scope === lane.scopeguard and avoids the fragile missing-object comparison. Same-scope forks and non-forked lanes are unchanged.Added an e2e regression test that reproduces the exact error without the fix and passes with it.