Support composite MCP servers #4560
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
|
I changed the issue to #4635 |
njhale
force-pushed
the
feat/cmcp
branch
2 times, most recently
from
a1b63cd to
a3e6c99
Compare
thedadams
reviewed
Oct 23, 2025
thedadams
requested changes
Oct 28, 2025
Comment on lines
+77
to
+81
| if err != nil { | ||
| if req.Context().Err() != nil { | ||
| return "", fmt.Errorf("failed to check component server OAuth: %w", req.Context().Err()) | ||
| } | ||
| } |
There was a problem hiding this comment.
Do we want to continue if err != nil here?
There was a problem hiding this comment.
Disabled components are already skipped in the code above, so I'm on the fence about whether to continue here. If we return the error here, at least it can bubble up to the user.
njhale
force-pushed
the
feat/cmcp
branch
2 times, most recently
from
5c0db82 to
ec283cb
Compare
Signed-off-by: Nick Hale <[email protected]>
Signed-off-by: Nick Hale <[email protected]>
thedadams
approved these changes
Oct 29, 2025
pkg/mcp/types.go
Outdated
Comment on lines
310
to
312
| if !strings.HasPrefix(scope, mcpServerName+"-") { | ||
| finalScope = fmt.Sprintf("%s-%s", mcpServerName, scope) | ||
| } |
There was a problem hiding this comment.
I think the scope should be what the scope is at this point. We don't need to modify it.
Signed-off-by: Nick Hale <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This change introduces "Composite" MCP Servers and support for:
This change does not include support for:
Support for these will be included in follow up PRs.
Addresses part of #3553