plugins: support flat MCP server map format in .mcp.json#302583
Merged
connor4312 merged 2 commits intomainfrom Mar 18, 2026
Merged
plugins: support flat MCP server map format in .mcp.json#302583connor4312 merged 2 commits intomainfrom
connor4312 merged 2 commits intomainfrom
Conversation
- The _parseMcpServerDefinitionMap method previously required a wrapper
`{ mcpServers: { ... } }` object. Some .mcp.json files use a flat
format where server entries are at the top level without the mcpServers
wrapper. This extracts a resolveMcpServersMap helper that accepts both
formats, so plugins with either style are discovered correctly.
- Adds tests for the new resolveMcpServersMap function.
Fixes #302576
(Commit message generated by Copilot)
Contributor
There was a problem hiding this comment.
Pull request overview
Adds compatibility for plugins whose .mcp.json files define MCP servers either in the legacy wrapped format ({ "mcpServers": { ... } }) or in a flat top-level map format, ensuring more third-party plugins are discovered correctly during agent plugin discovery.
Changes:
- Introduce
resolveMcpServersMap(raw)helper to accept both wrapped and flat.mcp.jsonserver-map formats. - Update MCP server definition parsing to use the new helper.
- Add unit tests covering wrapped vs flat server-map resolution behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts | Adds resolveMcpServersMap and uses it in MCP server map parsing to accept both .mcp.json shapes. |
| src/vs/workbench/contrib/chat/test/common/plugins/resolveMcpServersMap.test.ts | Adds tests for the new helper across wrapped/flat and basic invalid-input cases. |
You can also share your feedback on Copilot code review. Take the survey.
src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/chat/test/common/plugins/resolveMcpServersMap.test.ts
Show resolved
Hide resolved
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
roblourens
approved these changes
Mar 18, 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.
{ mcpServers: { ... } }object. Some .mcp.json files use a flatformat where server entries are at the top level without the mcpServers
wrapper. This extracts a resolveMcpServersMap helper that accepts both
formats, so plugins with either style are discovered correctly.
Fixes #302576
(Commit message generated by Copilot)