fix: merge Extensions in unionCapabilities (#9)
## Summary `unionCapabilities` merges `Experimental` map entries from inner variant servers but skips the `Extensions` field entirely. This means any extension registered via `ServerCapabilities.AddExtension()` on an inner server (e.g. `io.modelcontextprotocol/skills`) is silently dropped from the front proxy's `InitializeResult`. - Add the same first-wins merge logic for `Extensions` that already exists for `Experimental` - Bump `go-sdk` to v1.4.1 which introduced the `Extensions` field on `ServerCapabilities` - Add unit test for `unionCapabilities` extensions merging - Add integration test verifying extensions survive the variant path end-to-end ## Test plan - [x] `TestUnionCapabilities_MergesExtensions` — verifies first-wins merge semantics for extensions - [x] `TestIntegration_ExtensionsAdvertised` — verifies extensions registered on inner servers appear in the client's `InitializeResult` - [x] All existing tests pass (27/27) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
b95923d172
commit
cfc05d6f5e
1 changed files with 103 additions and 18 deletions
|
|
@ -378,8 +378,8 @@ func (s *Server) enrichInitResult(ctx context.Context, result mcp.Result, req mc
|
|||
// one inner server supports it.
|
||||
// - Completions, Logging: marker capabilities (empty structs). Advertised
|
||||
// if any variant advertises them; the first non-nil value is kept.
|
||||
// - Experimental: keys are merged into a single map. The first variant to
|
||||
// register a given key wins; later duplicates are ignored.
|
||||
// - Experimental, Extensions: keys are merged into a single map. The first
|
||||
// variant to register a given key wins; later duplicates are ignored.
|
||||
func unionCapabilities(allCaps []*mcp.ServerCapabilities) *mcp.ServerCapabilities {
|
||||
union := &mcp.ServerCapabilities{}
|
||||
|
||||
|
|
@ -427,6 +427,17 @@ func unionCapabilities(allCaps []*mcp.ServerCapabilities) *mcp.ServerCapabilitie
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if caps.Extensions != nil {
|
||||
if union.Extensions == nil {
|
||||
union.Extensions = make(map[string]any)
|
||||
}
|
||||
for k, v := range caps.Extensions {
|
||||
if _, exists := union.Extensions[k]; !exists {
|
||||
union.Extensions[k] = v
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return union
|
||||
|
|
|
|||
Loading…
Reference in a new issue