modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: introduce Requests (#267)

Browse source 
Handlers and client/server methods take a single request argument
combining the session and params. This slightly simplifies the signature
for handlers, since there is no longer an often-ignored session
argument.

But more importantly, it opens the door to adding more information in
requests, such as auth info and HTTP request headers.

For #243.
This commit is contained in:
Jonathan Amsterdam 2025-08-12 17:49:50 -04:00 • committed by GitHub
commit 6e03217c83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 517 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mcp/shared_test.go
View file

@ -23,7 +23,7 @@ func TestToolValidate(t *testing.T) {
P *int `json:",omitempty"`
}
dummyHandler := func(context.Context, *ServerSession, *CallToolParamsFor[req]) (*CallToolResultFor[any], error) {
dummyHandler := func(context.Context, *ServerRequest[*CallToolParamsFor[req]]) (*CallToolResultFor[any], error) {
return nil, nil
}
@ -73,8 +73,9 @@ func TestToolValidate(t *testing.T) {
if err != nil {
t.Fatal(err)
}
_, err = st.handler(context.Background(), nil,
&CallToolParamsFor[json.RawMessage]{Arguments: json.RawMessage(raw)})
_, err = st.handler(context.Background(), &ServerRequest[*CallToolParamsFor[json.RawMessage]]{
Params: &CallToolParamsFor[json.RawMessage]{Arguments: json.RawMessage(raw)},
})
if err == nil && tt.want != "" {
t.Error("got success, wanted failure")
}
@ -102,12 +103,12 @@ func TestNilParamsHandling(t *testing.T) {
type TestResult = *CallToolResultFor[string]
// Simple test handler
testHandler := func(ctx context.Context, ss *ServerSession, params TestParams) (TestResult, error) {
result := "processed: " + params.Arguments.Name
testHandler := func(ctx context.Context, req *ServerRequest[TestParams]) (TestResult, error) {
result := "processed: " + req.Params.Arguments.Name
return &CallToolResultFor[string]{StructuredContent: result}, nil
}
methodInfo := newMethodInfo(testHandler, missingParamsOK)
methodInfo := newServerMethodInfo(testHandler, missingParamsOK)
// Helper function to test that unmarshalParams doesn't panic and handles nil gracefully
mustNotPanic := func(t *testing.T, rawMsg json.RawMessage, expectNil bool) Params {
@ -183,11 +184,11 @@ func TestNilParamsEdgeCases(t *testing.T) {
}
type TestParams = *CallToolParamsFor[TestArgs]
testHandler := func(ctx context.Context, ss *ServerSession, params TestParams) (*CallToolResultFor[string], error) {
testHandler := func(context.Context, *ServerRequest[TestParams]) (*CallToolResultFor[string], error) {
return &CallToolResultFor[string]{StructuredContent: "test"}, nil
}
methodInfo := newMethodInfo(testHandler, missingParamsOK)
methodInfo := newServerMethodInfo(testHandler, missingParamsOK)
// These should fail normally, not be treated as nil params
invalidCases := []json.RawMessage{
@ -209,7 +210,7 @@ func TestNilParamsEdgeCases(t *testing.T) {
// Test that methods without missingParamsOK flag properly reject nil params
t.Run("reject_when_params_required", func(t *testing.T) {
methodInfoStrict := newMethodInfo(testHandler, 0) // No missingParamsOK flag
methodInfoStrict := newServerMethodInfo(testHandler, 0) // No missingParamsOK flag
testCases := []struct {
name string