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
1 changed files with 231 additions and 57228 deletions
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue