Fix tab slice rebase retries with planned ranges#386
Open
morluto wants to merge 3 commits into
Open
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.
Summary
Follow-up to #379.
Why
This is a focused correctness follow-up to #379, not another CI/test-suite optimization change. That PR included an initial hidden-session slice rebase fix, and review feedback correctly pointed out that the deeper issue was not hidden-session ownership itself, but that tab slice rebasing could become coordinate-epoch ambiguous across async retry boundaries.
The previous tab rebase flow could resume after async partition writes and compute against whatever ranges were live in the tab at retry time. That made already-rebased ranges or stale hidden-session mappings vulnerable to being transformed again.
This change makes tab rebase application explicit: apply only when the tab still matches the captured expected ranges, no-op when it is already at the planned rebased ranges, and skip otherwise.
Reviewer guide
Suggested review order:
WorkspaceManagerViewModel.swiftWorkspaceFilesViewModel.swiftRegression tests
Validation
make guardrailsmake dev-formatmake dev-swift-build PRODUCT=RepoPromptmake dev-test FILTER=PersistentAgentModeMCPReadFileConnectionTests/testAgentOwnedHiddenWorktreeWatcherRebases6500LineReadSlicesBeforePostEditReadsmake dev-test FILTER=SelectionSlicePersistenceAndRebaseTestspython3 Scripts/test_suite_optimizer.py verify-ledger --ledger Scripts/Fixtures/test-suite-contract-ledger.tsvmake dev-lint.agents/skills/rpce-contribution-check/scripts/preflight.sh commit.agents/skills/rpce-contribution-check/scripts/preflight.sh pushNotes
make dev-testpassed earlier during this refactor; after the final stale-target regression hook/test, I reran focused coverage, build, lint, guardrails, and ledger verification.