mcp: turn off auto extension activation, enable when clause #268097
Merged
Conversation
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
- Now that MCP autostart is on by default, we can remove the special eager activation we did for extensions. - Also support a `when` clause for MCP extension collections, so they can be activated lazily and specifically. Closes #266221
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR removes automatic eager activation of MCP extensions and introduces support for conditional activation via when clauses. With MCP autostart now enabled by default, the special eager activation behavior is no longer needed, allowing extensions to be activated lazily based on specific conditions.
Key changes:
- Removed auto-discovery and eager activation logic from McpLanguageModelToolContribution
- Added support for
whenclause in MCP extension collections for conditional activation - Enhanced McpService.autostart() to activate collections before processing servers
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/contrib/mcp/common/mcpService.ts | Added early return for disabled autostart and collection activation call |
| src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts | Removed auto-discovery logic and LazyCollectionState import |
| src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts | Added when property to MCP collection contribution schema |
| src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts | Implemented conditional collection registration with context key evaluation |
| src/vs/workbench/api/browser/mainThreadMcp.ts | Added conditional registration logic for extension-provided collections |
| src/vs/platform/extensions/common/extensions.ts | Added optional when property to IMcpCollectionContribution interface |
lszomoru
approved these changes
Sep 24, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
eager activation we did for extensions.
whenclause for MCP extension collections, so theycan be activated lazily and specifically.
Closes #266221