Implement rebaseUnder function and enhance customization anchoring in CopilotAgent#322661
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Addresses issue #322527 where worktree-isolated Copilot sessions could still discover skills/instructions/agents from the original folder (leading the session to read/write files outside the worktree). The PR re-anchors customization discovery to the resolved working directory (worktree when materialized/resumed) and adds a small URI rebasing helper plus targeted tests.
Changes:
- Add
rebaseUnder()helper to rebase URIs from one directory to another while preserving relative paths. - Re-anchor customization discovery during session materialization/resume so skills/instructions are discovered from the worktree.
- Add unit tests covering rebasing behavior and customization anchoring for worktree materialization.
Show a summary per file
| File | Description |
|---|---|
| src/vs/platform/agentHost/node/copilot/copilotAgent.ts | Re-anchor customization discovery to the resolved working directory (worktree) and migrate enablement state across anchor changes. |
| src/vs/platform/agentHost/test/node/copilotAgent.test.ts | Add tests for rebaseUnder and for anchoring customization discovery to the resolved worktree during materialization. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 1
…erve others verbatim
TylerLeonhardt
approved these changes
Jun 24, 2026
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.
Fixes #322527