Fix phantom file carry-forward causing lingering shadow branches#586
Fix phantom file carry-forward causing lingering shadow branches#586
Conversation
Agent transcript parsers capture file paths from all tool calls, including ones that were attempted but never created on disk (e.g. agent writes src/types.go but creates src/types/types.go instead). These phantom paths in FilesTouched caused filesWithRemainingAgentChanges to always return non-empty results, creating an infinite carry-forward loop where shadow branches were never cleaned up. Fix: for non-committed files, also check the shadow branch tree before carrying forward. buildTreeWithChanges already skips non-existent files, so the shadow tree is the ground truth of what was actually checkpointed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 95bb0b3d0af0
PR SummaryMedium Risk Overview Adds unit coverage for the two edge cases: a phantom path referenced in the transcript but never created, and an uncommitted deletion where the file is absent from the shadow tree. Written by Cursor Bugbot for commit c283dc8. Configure here. |
There was a problem hiding this comment.
Pull request overview
Fixes carry-forward logic in the manual-commit shadow-branch strategy by preventing “phantom” file paths (captured from agent transcripts but never materialized in the shadow tree) from being repeatedly carried forward, which can create lingering shadow branches and E2E failures.
Changes:
- Update
filesWithRemainingAgentChangesto skip uncommitted paths that aren’t present in the shadow tree (treating the shadow tree as ground truth for what the agent actually produced). - Add a unit test covering the phantom-file scenario to prevent infinite carry-forward loops.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
cmd/entire/cli/strategy/content_overlap.go |
Adds a shadow-tree existence check before carrying forward uncommitted touched paths. |
cmd/entire/cli/strategy/content_overlap_test.go |
Adds a unit test ensuring phantom transcript paths don’t get carried forward. |
Move the shadow tree existence check to the top of the loop instead of nesting it inside the wasCommitted branch. Both code paths (committed and uncommitted) skip files absent from the shadow tree, so a single early guard is equivalent and clearer. Add a test for the uncommitted-deletion scenario to document that skipping agent-deleted files is intentional (no content on disk to carry forward). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Entire-Checkpoint: 04e65de01f59
|
bugbot run |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Summary
TestMixedNewAndModifiedFiles,TestPartialStaging) caused by phantom file paths infilesTouchedcreating infinite carry-forward loopssrc/types.goin a tool call but actually createssrc/types/types.gofor Go package structure)filesWithRemainingAgentChangesnow checks shadow tree existence before carrying forward non-committed files — the shadow tree is the ground truth sincebuildTreeWithChangesalready skips non-existent filesFailing E2E runs
Test plan
TestFilesWithRemainingAgentChanges_PhantomFileunit testmise run test:ci)mise run lint)TestMixedNewAndModifiedFilesandTestPartialStagingshould stop failing for gemini-cli🤖 Generated with Claude Code