sessions: gate Copilot CLI/Claude agent-host preferences on chat.agentHost.enabled#323567
Merged
Conversation
…tHost.enabled The `chat.agents.copilotCli.hideExtensionHost` and `chat.agents.claude.preferAgentHost` settings tell the Copilot Chat sessions provider to step aside so the agent host can surface its own Copilot CLI / Claude entries. When `chat.agentHost.enabled` is off the agent host never registers those entries, so honoring the preferences would make the entries disappear entirely. Gate both on `chat.agentHost.enabled` so they are only respected when the agent host is actually enabled, and document the requirement on the settings. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
sandy081
added
the
~release-cherry-pick
Contributor
|
This PR will be automatically cherry-picked to |
TylerLeonhardt
approved these changes
Jun 29, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR makes chat.agentHost.enabled the master gate for two agent-host preference settings used by the Copilot Chat sessions provider in the Agents window, preventing Copilot CLI / Claude entries from disappearing when the agent host is disabled.
Changes:
- Gated Claude and Copilot CLI availability in
CopilotChatSessionsProvideronchat.agentHost.enabled, ignoring the two “yield/hide” preferences while the agent host is off. - Updated settings UI descriptions to explicitly state the preferences require
chat.agentHost.enabled. - Added/updated unit tests around the new gating behavior and live config toggling.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/contrib/chat/browser/chat.shared.contribution.ts | Updates Claude “prefer agent host” setting description to note the chat.agentHost.enabled requirement. |
| src/vs/platform/agentHost/common/agentHost.config.contribution.ts | Updates Copilot CLI “hide extension host” setting description to note the chat.agentHost.enabled requirement. |
| src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts | Applies the master gate in runtime availability checks and updates config-change handling. |
| src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts | Adds tests for gate behavior when disabled and for live-updating when the master gate toggles. |
Review details
- Files reviewed: 4/4 changed files
- Comments generated: 2
- Review effort level: Low
DonJayamanne
approved these changes
Jun 29, 2026
vs-code-engineering
Bot
added
release-cherry-pick
This was referenced Jun 29, 2026
Merged
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.
What
Make
chat.agentHost.enabledthe master gate for two agent-host preference settings consumed by the Copilot Chat sessions provider in the Agents window:chat.agents.copilotCli.hideExtensionHostchat.agents.claude.preferAgentHostWhen
chat.agentHost.enabledis off, these two settings are no longer respected (treated asfalse).Why
Both settings tell the Copilot Chat sessions provider to step aside so the agent host can surface its own entry in its place:
hideExtensionHosthides the Extension Host Copilot CLI so only the Agent Host Copilot CLI shows.preferAgentHost(Claude) makes this provider yield so the agent host's Claude registration shows instead.But when the agent host is disabled it never registers those replacement entries. Honoring the preferences in that state would make the Copilot CLI / Claude entries disappear entirely from the picker. Gating them on
chat.agentHost.enabledkeeps the entries visible until the agent host is actually enabled to take over.Changes
copilotChatSessionsProvider.ts:_isClaudeAvailable()and_isCopilotCliAvailable()now also checkchat.agentHost.enabled(via a small shared_isAgentHostEnabled()helper). Availability is computed live from configuration; the cached fields were removed and the config-change handler simply re-collects/re-sorts session types when any relevant setting changes.agentHost.config.contribution.ts/chat.shared.contribution.ts: updated the two setting descriptions to note they require#chat.agentHost.enabled#.chat.agentHost.enabledlive-applies the gate.Notes for reviewers
chat.agentHost.defaultSessionsProviderwas already gated onchat.agentHost.enabled(the local agent host provider only registers when enabled), so no change was needed there.Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com