[cherry-pick] chat: fix GitHub context repository selection - #334670
Open
vs-code-engineering[bot] wants to merge 1 commit into
Open
[cherry-pick] chat: fix GitHub context repository selection#334670vs-code-engineering[bot] wants to merge 1 commit into
vs-code-engineering[bot] wants to merge 1 commit into
Conversation
Megan Rogge (meganrogge)
changed the base branch from
release/1.136
to
release/1.137
September 5, 2026 00:09
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Committed conflict markers prevent compilation, and repository scoping and remote ordering still have unresolved edge cases.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Cherry-picks fixes for repository-scoped GitHub issue and pull request attachments across Chat and Agents.
Changes:
- Adds workspace-aware repository selection.
- Resolves Git remotes directly, including worktrees.
- Adds regression coverage for repository-resolution scenarios.
File summaries
| File | Description |
|---|---|
chatContext.ts |
Adds GitHub context pickers. |
chatContext.test.ts |
Tests repository selection. |
copilotChatSessionsProvider.ts |
Resolves Agents repository context. |
copilotChatSessionsProvider.test.ts |
Tests Agents context browsing. |
gitServiceImpl.ts |
Reads and orders local Git remotes. |
copilotCloudSessionsProvider.ts |
Resolves folder arguments to repositories. |
copilotCloudSessionsProvider.spec.ts |
Tests folder resolution and fallback. |
Review details
Files not reviewed (1)
- extensions/copilot/package-lock.json: Generated file
Suppressed comments (4)
src/vs/workbench/contrib/chat/test/browser/actions/chatContext.test.ts:37
- This unresolved marker block prevents the newly added test helpers from parsing. Resolve it and add the helper dependencies (
IGitRepository,IGitService, andobservableValue) to the reconciled imports.
src/vs/workbench/contrib/chat/test/browser/actions/chatContext.test.ts:134 - This additional conflict marker around the incoming tests keeps the suite syntactically invalid. Remove the markers while retaining the intended regression cases.
src/vs/workbench/contrib/chat/browser/actions/chatContext.ts:112 - This second unresolved conflict block also leaves the class/contribution boundaries ambiguous and the file unparsable. Reconcile the incoming GitHub picker with the target branch rather than retaining either marker side verbatim.
src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts:2651 - This committed conflict marker leaves two implementations in the method and makes the provider unparsable. Resolve all marker blocks in this file before merging.
- Files reviewed: 83/85 changed files
- Comments generated: 9
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Contributor
Author
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: Ladislau Szomoru (@lszomoru)Matched files:
TylerLeonhardtMatched files:
|
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 557c3448-77ae-43aa-9ac8-785c2c42b9a7
Megan Rogge (meganrogge)
force-pushed
the
cherry-pick/334594
branch
from
September 5, 2026 00:20
65d682e to
fea1e28
Compare
Megan Rogge (meganrogge)
enabled auto-merge (squash)
September 5, 2026 00:25
auto-merge was automatically disabled
September 5, 2026 00:39
Pull request was closed
roblourens
approved these changes
Sep 5, 2026
roblourens
approved these changes
Sep 5, 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.
Summary
Cherry-pick of #334594 for
release/1.137.Fix GitHub issue and pull request attachments in both the Agents window and the editor chat context picker:
.git/configwithout waiting for repositoryHEADstateCherry-pick notes
The source change overlapped with
release/1.137updates in the chat and Sessions providers. The conflicts were reconciled against the release branch, and the follow-up review findings around single-folder fallback, symlink bit flags, and upstream-before-origin ordering are included.Validation
npm run transpile-clientFixes #334603