Go SDK: Upgrade MCP SDK and remove vendored copy (#35)
<!-- Provide a brief summary of your changes -->
Update the Go interceptor SDK to use
`github.com/modelcontextprotocol/go-sdk` v1.7.0 custom method APIs and
remove the vendored Go SDK copy. This shouldn't update the behaviours,
but addding following functions.
Changed public/user-facing interfaces:
extension.Extension.Install now returns an error:
```
// before
ext.Install(mcpServer)
// after
if err := ext.Install(mcpServer); err != nil {
return err
}
```
New helper added:
```
extension.RegisterSendingMethods(client *mcp.Client) error
```
## Motivation and Context
<!-- Why is this change needed? What problem does it solve? -->
Pick up MCP Go SDK 1.7.0. This provides upstream custom method support,
so the local vendored SDK copy is no longer needed.
## How Has This Been Tested?
<!-- Have you tested this in a real application? Which scenarios were
tested? -->
- `go test -v ./...`
## Breaking Changes
<!-- Will users need to update their code or configurations? -->
```go
if err := ext.Install(mcpServer); err != nil {
return err
}
```
The Go SDK module now requires Go 1.25 via
github.com/modelcontextprotocol/go-sdk v1.7.0.
## Types of changes
<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [x] Breaking change (fix or feature that would cause existing
functionality to change)
- [x] Documentation update
## Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->
- [x] I have read the [MCP
Documentation](https://modelcontextprotocol.io)
- [x] My code follows the repository's style guidelines
- [x] New and existing tests pass locally
- [x] I have added appropriate error handling
- [x] I have added or updated documentation as needed
## Additional context
<!-- Add any other context, implementation notes, or design decisions
-->
LocalChain now registers interceptor custom sending methods internally.
Manual remote chain setup should call
`extension.RegisterSendingMethods(client)` before connecting the MCP
client session used with chain.AddMCPServer.
Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
1a3e5ef459
commit
8704137635
7 changed files with 231 additions and 57228 deletions
24
go/sdk/interceptors/extension/client.go
Normal file
24
go/sdk/interceptors/extension/client.go
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
// Copyright 2025 The MCP Interceptors Authors. All rights reserved.
|
||||
// Use of this source code is governed by an Apache-2.0
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package extension
|
||||
|
||||
import (
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
|
||||
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors"
|
||||
)
|
||||
|
||||
// RegisterSendingMethods registers the interceptor custom RPC methods on a
|
||||
// client before it connects to interceptor-capable servers.
|
||||
func RegisterSendingMethods(client *mcp.Client) error {
|
||||
if err := mcp.AddSendingCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
client, interceptors.MethodList,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
return mcp.AddSendingCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
client, interceptors.MethodInvoke,
|
||||
)
|
||||
}
|
||||
|
|
@ -16,7 +16,9 @@
|
|||
// ext := extension.New(extension.WithLogger(logger))
|
||||
// ext.AddInterceptor(myValidator)
|
||||
// ext.AddInterceptor(myMutator)
|
||||
// ext.Install(mcpServer)
|
||||
// if err := ext.Install(mcpServer); err != nil {
|
||||
// return err
|
||||
// }
|
||||
//
|
||||
// At this point any connected MCP client can call interceptors/list
|
||||
// and interceptor/invoke.
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ import (
|
|||
|
||||
// handleList implements the "interceptors/list" JSON-RPC method.
|
||||
// It returns all registered interceptors, optionally filtered by event.
|
||||
func (e *Extension) handleList(_ context.Context, req *mcp.ServerRequest[*interceptors.ListParams]) (*interceptors.ListResult, error) {
|
||||
func (e *Extension) handleList(_ context.Context, _ *mcp.ServerSession, params *interceptors.ListParams) (*interceptors.ListResult, error) {
|
||||
var event string
|
||||
if req.Params != nil {
|
||||
event = req.Params.Event
|
||||
if params != nil {
|
||||
event = params.Event
|
||||
}
|
||||
|
||||
all := e.getInterceptors()
|
||||
|
|
@ -38,14 +38,13 @@ func (e *Extension) handleList(_ context.Context, req *mcp.ServerRequest[*interc
|
|||
|
||||
// handleInvoke implements the "interceptor/invoke" JSON-RPC method.
|
||||
// It invokes a single interceptor by name and returns its result.
|
||||
func (e *Extension) handleInvoke(ctx context.Context, req *mcp.ServerRequest[*interceptors.InvokeParams]) (*interceptors.InvokeResult, error) {
|
||||
if req.Params == nil || req.Params.Name == "" {
|
||||
func (e *Extension) handleInvoke(ctx context.Context, _ *mcp.ServerSession, params *interceptors.InvokeParams) (*interceptors.InvokeResult, error) {
|
||||
if params == nil || params.Name == "" {
|
||||
return nil, &jsonrpc.Error{
|
||||
Code: jsonrpc.CodeInvalidParams,
|
||||
Message: "name is required",
|
||||
}
|
||||
}
|
||||
params := req.Params
|
||||
|
||||
// Look up the interceptor by name.
|
||||
i := e.findByName(params.Name)
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
|
|
@ -22,8 +23,9 @@ func TestListInterceptors(t *testing.T) {
|
|||
blockToolValidator("dangerous"),
|
||||
)
|
||||
|
||||
var result interceptors.ListResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodList, nil, &result)
|
||||
result, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList, nil,
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Len(t, result.Interceptors, 2)
|
||||
|
|
@ -56,25 +58,28 @@ func TestListWithEventFilter(t *testing.T) {
|
|||
cs := setupRPCServer(t, toolsValidator, promptsValidator)
|
||||
|
||||
// Filter for tools/call — should only return tools-v
|
||||
var result interceptors.ListResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: interceptors.EventToolsCall}, &result)
|
||||
result, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: interceptors.EventToolsCall},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, result.Interceptors, 1)
|
||||
assert.Equal(t, "tools-v", result.Interceptors[0].Name)
|
||||
|
||||
// Filter for prompts/get — should only return prompts-v
|
||||
var result2 interceptors.ListResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: interceptors.EventPromptsGet}, &result2)
|
||||
result2, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: interceptors.EventPromptsGet},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, result2.Interceptors, 1)
|
||||
assert.Equal(t, "prompts-v", result2.Interceptors[0].Name)
|
||||
|
||||
// Filter for non-existent event — empty
|
||||
var result3 interceptors.ListResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: "nonexistent/method"}, &result3)
|
||||
result3, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList,
|
||||
&interceptors.ListParams{Event: "nonexistent/method"},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
assert.Empty(t, result3.Interceptors)
|
||||
}
|
||||
|
|
@ -87,14 +92,15 @@ func TestInvokeValidator(t *testing.T) {
|
|||
cs := setupRPCServer(t, allowAllValidator("v1"))
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{"name": "echo", "arguments": map[string]any{"text": "hello"}})
|
||||
var result interceptors.InvokeResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodInvoke,
|
||||
result, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "v1",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &result)
|
||||
},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, "v1", result.Interceptor)
|
||||
|
|
@ -131,14 +137,15 @@ func TestInvokeValidatorRejects(t *testing.T) {
|
|||
cs := setupRPCServer(t, rejectAll)
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{"name": "echo"})
|
||||
var result interceptors.InvokeResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodInvoke,
|
||||
result, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "reject-all",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &result)
|
||||
},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, "reject-all", result.Interceptor)
|
||||
|
|
@ -182,14 +189,15 @@ func TestInvokeMutator(t *testing.T) {
|
|||
cs := setupRPCServer(t, mutator)
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{"name": "echo"})
|
||||
var result interceptors.InvokeResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodInvoke,
|
||||
result, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "add-field",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &result)
|
||||
},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, "add-field", result.Interceptor)
|
||||
|
|
@ -212,14 +220,15 @@ func TestInvokeUnknownName(t *testing.T) {
|
|||
cs := setupRPCServer(t, allowAllValidator("v1"))
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{})
|
||||
var result interceptors.InvokeResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodInvoke,
|
||||
_, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "nonexistent",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &result)
|
||||
},
|
||||
)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "nonexistent")
|
||||
|
|
@ -250,15 +259,16 @@ func TestInvokeTimeout(t *testing.T) {
|
|||
cs := setupRPCServer(t, slowValidator)
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{})
|
||||
var result interceptors.InvokeResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodInvoke,
|
||||
_, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "slow-v",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
TimeoutMs: 50,
|
||||
}, &result)
|
||||
},
|
||||
)
|
||||
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ package extension
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"sync"
|
||||
|
||||
|
|
@ -30,9 +31,9 @@ func WithLogger(l *slog.Logger) Option {
|
|||
}
|
||||
|
||||
// Extension manages interceptors and can install them on one or more
|
||||
// *mcp.Server instances. Interceptors are registered as first-class
|
||||
// MCP resources discoverable via the "interceptors/list" JSON-RPC
|
||||
// method and invocable via "interceptor/invoke".
|
||||
// *mcp.Server instances. Interceptors are exposed as custom MCP methods:
|
||||
// discoverable via the "interceptors/list" JSON-RPC method and invocable
|
||||
// via "interceptor/invoke".
|
||||
//
|
||||
// Extension is a pure interceptor container — it does not hold a
|
||||
// reference to any particular server. Call [Extension.Install] to
|
||||
|
|
@ -59,11 +60,16 @@ func New(opts ...Option) *Extension {
|
|||
// JSON-RPC methods and installs a receiving middleware to enrich the
|
||||
// initialize response with interceptor capabilities on the given
|
||||
// server. It can be called on multiple servers.
|
||||
func (e *Extension) Install(server *mcp.Server) {
|
||||
func (e *Extension) Install(server *mcp.Server) error {
|
||||
// Register JSON-RPC methods for interceptor discovery and invocation.
|
||||
mcp.AddReceivingCustomMethod(server, interceptors.MethodList, e.handleList)
|
||||
mcp.AddReceivingCustomMethod(server, interceptors.MethodInvoke, e.handleInvoke)
|
||||
if err := mcp.AddReceivingCustomMethod(server, interceptors.MethodList, e.handleList); err != nil {
|
||||
return fmt.Errorf("interceptors: register %q: %w", interceptors.MethodList, err)
|
||||
}
|
||||
if err := mcp.AddReceivingCustomMethod(server, interceptors.MethodInvoke, e.handleInvoke); err != nil {
|
||||
return fmt.Errorf("interceptors: register %q: %w", interceptors.MethodInvoke, err)
|
||||
}
|
||||
server.AddReceivingMiddleware(e.initMiddleware())
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddInterceptor registers an interceptor. It panics if the interceptor
|
||||
|
|
@ -128,6 +134,10 @@ func (e *Extension) LocalChain(ctx context.Context, server *mcp.Server) (*chain.
|
|||
Name: "interceptor-chain-client",
|
||||
Version: "internal",
|
||||
}, nil)
|
||||
if err := RegisterSendingMethods(client); err != nil {
|
||||
ss.Close()
|
||||
return nil, err
|
||||
}
|
||||
cs, err := client.Connect(ctx, clientTransport, nil)
|
||||
if err != nil {
|
||||
ss.Close()
|
||||
|
|
|
|||
|
|
@ -637,20 +637,23 @@ func TestCustomMethodsFlowThroughMiddleware(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for tools/call")
|
||||
|
||||
var listResult interceptors.ListResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodList, nil, &listResult)
|
||||
listResult, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList, nil,
|
||||
)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, listResult.Interceptors, 1)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for interceptors/list")
|
||||
|
||||
payload, _ := json.Marshal(map[string]any{"name": "echo", "arguments": map[string]any{}})
|
||||
var invokeResult interceptors.InvokeResult
|
||||
err = cs.CallCustom(context.Background(), interceptors.MethodInvoke, &interceptors.InvokeParams{
|
||||
Name: "v1",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
}, &invokeResult)
|
||||
_, err = mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
context.Background(), cs, interceptors.MethodInvoke,
|
||||
&interceptors.InvokeParams{
|
||||
Name: "v1",
|
||||
Event: interceptors.EventToolsCall,
|
||||
Phase: interceptors.PhaseRequest,
|
||||
Payload: payload,
|
||||
},
|
||||
)
|
||||
require.NoError(t, err)
|
||||
assert.Greater(t, count.Swap(0), int64(0), "middleware must fire for interceptor/invoke")
|
||||
}
|
||||
|
|
@ -676,8 +679,9 @@ func TestMiddlewareCanRejectCustomMethods(t *testing.T) {
|
|||
mcpServer.AddReceivingMiddleware(blockingMiddleware)
|
||||
cs := connectHTTPClient(t, mcpServer)
|
||||
|
||||
var listResult interceptors.ListResult
|
||||
err := cs.CallCustom(context.Background(), interceptors.MethodList, nil, &listResult)
|
||||
_, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
context.Background(), cs, interceptors.MethodList, nil,
|
||||
)
|
||||
assert.Error(t, err, "blockingMiddleware should reject interceptors/list")
|
||||
assert.True(t, rejected.Load())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ func setupWithTools(t *testing.T, tools []testTool, is ...interceptors.Intercept
|
|||
for _, i := range is {
|
||||
ext.AddInterceptor(i)
|
||||
}
|
||||
ext.Install(mcpServer)
|
||||
require.NoError(t, ext.Install(mcpServer))
|
||||
|
||||
// Create a chain via LocalChain (in-memory transport).
|
||||
chain, err := ext.LocalChain(context.Background(), mcpServer)
|
||||
|
|
@ -64,6 +64,7 @@ func setupWithTools(t *testing.T, tools []testTool, is ...interceptors.Intercept
|
|||
t.Cleanup(httpServer.Close)
|
||||
|
||||
client := mcp.NewClient(&mcp.Implementation{Name: "test-client", Version: "0.1.0"}, nil)
|
||||
require.NoError(t, extension.RegisterSendingMethods(client))
|
||||
cs, err := client.Connect(context.Background(), &mcp.StreamableClientTransport{
|
||||
Endpoint: httpServer.URL,
|
||||
}, nil)
|
||||
|
|
@ -148,7 +149,7 @@ func buildServer(t *testing.T, is ...interceptors.Interceptor) *mcp.Server {
|
|||
for _, i := range is {
|
||||
ext.AddInterceptor(i)
|
||||
}
|
||||
ext.Install(mcpServer)
|
||||
require.NoError(t, ext.Install(mcpServer))
|
||||
|
||||
return mcpServer
|
||||
}
|
||||
|
|
@ -164,6 +165,7 @@ func connectHTTPClient(t *testing.T, srv *mcp.Server) *mcp.ClientSession {
|
|||
httpServer := httptest.NewServer(handler)
|
||||
t.Cleanup(httpServer.Close)
|
||||
client := mcp.NewClient(&mcp.Implementation{Name: "test-client", Version: "0.1.0"}, nil)
|
||||
require.NoError(t, extension.RegisterSendingMethods(client))
|
||||
cs, err := client.Connect(context.Background(), &mcp.StreamableClientTransport{
|
||||
Endpoint: httpServer.URL,
|
||||
}, nil)
|
||||
|
|
|
|||
Loading…
Reference in a new issue