sessions: fix unified workspace picker setting references - #334677
Merged
Megan Rogge (meganrogge) merged 1 commit intoSep 5, 2026
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 557c3448-77ae-43aa-9ac8-785c2c42b9a7
Copilot started reviewing on behalf of
Megan Rogge (meganrogge)
September 5, 2026 00:40
View session
TylerLeonhardt
approved these changes
Sep 5, 2026
Megan Rogge (meganrogge)
enabled auto-merge (squash)
September 5, 2026 00:42
Contributor
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
All reviewed references consistently use the new setting key, with no unresolved issues.
Review tier: Balanced
Findings: None
What changed in this PR
Fixes stale references to the removed Chat-owned workspace picker setting.
Changes:
- Reads the Sessions-owned workspace picker setting in the provider.
- Updates provider tests to use the new setting key.
| File | Description |
|---|---|
src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts |
Tests behavior using the migrated setting key. |
src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts |
Uses the unified workspace picker setting. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Megan Rogge (meganrogge)
deleted the
fix/unified-workspace-picker-setting
branch
September 5, 2026 00:57
TylerLeonhardt
added a commit
that referenced
this pull request
Sep 5, 2026
Keep the upstream import placements after merging #334677, removing duplicate-identifier compilation errors from the provider and its tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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
Fix the semantic merge conflict between #334554 and #334591 that left
mainreferencing the removedChatConfiguration.ConsolidatedRemoteWorkspacesenum member.The legacy setting migration already copies explicitly configured values to
UNIFIED_WORKSPACE_PICKER_SETTING, so the provider and its tests should read and write the new Sessions-owned key directly.Validation
npm run transpile-client./scripts/test.sh --run src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts(88 passing)