all: remove ServerRequest[T] for concrete T

README.md

@@ -115,7 +115,7 @@ type HiParams struct {
 	Name string `json:"name" jsonschema:"the name of the person to greet"`
 }
 
-func SayHi(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args HiParams) (*mcp.CallToolResult, any, error) {
+func SayHi(ctx context.Context, req *mcp.CallToolRequest, args HiParams) (*mcp.CallToolResult, any, error) {
 	return &mcp.CallToolResult{
 		Content: []mcp.Content{&mcp.TextContent{Text: "Hi " + args.Name}},
 	}, nil, nil

examples/server/completion/main.go

@@ -16,7 +16,7 @@ import (
 // a CompletionHandler to an MCP Server's options.
 func main() {
 	// Define your custom CompletionHandler logic.
-	myCompletionHandler := func(_ context.Context, req *mcp.ServerRequest[*mcp.CompleteParams]) (*mcp.CompleteResult, error) {
+	myCompletionHandler := func(_ context.Context, req *mcp.CompleteRequest) (*mcp.CompleteResult, error) {
 		// In a real application, you'd implement actual completion logic here.
 		// For this example, we return a fixed set of suggestions.
 		var suggestions []string

examples/server/custom-transport/main.go

@@ -85,7 +85,7 @@ type HiArgs struct {
 }
 
 // SayHi is a tool handler that responds with a greeting.
-func SayHi(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args HiArgs) (*mcp.CallToolResult, struct{}, error) {
+func SayHi(ctx context.Context, req *mcp.CallToolRequest, args HiArgs) (*mcp.CallToolResult, struct{}, error) {
 	return &mcp.CallToolResult{
 		Content: []mcp.Content{
 			&mcp.TextContent{Text: "Hi " + args.Name},

examples/server/hello/main.go

@@ -22,7 +22,7 @@ type HiArgs struct {
 	Name string `json:"name" jsonschema:"the name to say hi to"`
 }
 
-func SayHi(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args HiArgs) (*mcp.CallToolResult, any, error) {
+func SayHi(ctx context.Context, req *mcp.CallToolRequest, args HiArgs) (*mcp.CallToolResult, any, error) {
 	return &mcp.CallToolResult{
 		Content: []mcp.Content{
 			&mcp.TextContent{Text: "Hi " + args.Name},
@@ -69,7 +69,7 @@ var embeddedResources = map[string]string{
 	"info": "This is the hello example server.",
 }
 
-func handleEmbeddedResource(_ context.Context, req *mcp.ServerRequest[*mcp.ReadResourceParams]) (*mcp.ReadResourceResult, error) {
+func handleEmbeddedResource(_ context.Context, req *mcp.ReadResourceRequest) (*mcp.ReadResourceResult, error) {
 	u, err := url.Parse(req.Params.URI)
 	if err != nil {
 		return nil, err

examples/server/memory/kb.go

@@ -431,7 +431,7 @@ func (k knowledgeBase) openNodes(names []string) (KnowledgeGraph, error) {
 	}, nil
 }
 
-func (k knowledgeBase) CreateEntities(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args CreateEntitiesArgs) (*mcp.CallToolResult, CreateEntitiesResult, error) {
+func (k knowledgeBase) CreateEntities(ctx context.Context, req *mcp.CallToolRequest, args CreateEntitiesArgs) (*mcp.CallToolResult, CreateEntitiesResult, error) {
 	var res mcp.CallToolResult
 
 	entities, err := k.createEntities(args.Entities)
@@ -450,7 +450,7 @@ func (k knowledgeBase) CreateEntities(ctx context.Context, req *mcp.ServerReques
 	return &res, CreateEntitiesResult{Entities: entities}, nil
 }
 
-func (k knowledgeBase) CreateRelations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args CreateRelationsArgs) (*mcp.CallToolResult, CreateRelationsResult, error) {
+func (k knowledgeBase) CreateRelations(ctx context.Context, req *mcp.CallToolRequest, args CreateRelationsArgs) (*mcp.CallToolResult, CreateRelationsResult, error) {
 	var res mcp.CallToolResult
 
 	relations, err := k.createRelations(args.Relations)
@@ -465,7 +465,7 @@ func (k knowledgeBase) CreateRelations(ctx context.Context, req *mcp.ServerReque
 	return &res, CreateRelationsResult{Relations: relations}, nil
 }
 
-func (k knowledgeBase) AddObservations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args AddObservationsArgs) (*mcp.CallToolResult, AddObservationsResult, error) {
+func (k knowledgeBase) AddObservations(ctx context.Context, req *mcp.CallToolRequest, args AddObservationsArgs) (*mcp.CallToolResult, AddObservationsResult, error) {
 	var res mcp.CallToolResult
 
 	observations, err := k.addObservations(args.Observations)
@@ -482,7 +482,7 @@ func (k knowledgeBase) AddObservations(ctx context.Context, req *mcp.ServerReque
 	}, nil
 }
 
-func (k knowledgeBase) DeleteEntities(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteEntitiesArgs) (*mcp.CallToolResult, any, error) {
+func (k knowledgeBase) DeleteEntities(ctx context.Context, req *mcp.CallToolRequest, args DeleteEntitiesArgs) (*mcp.CallToolResult, any, error) {
 	var res mcp.CallToolResult
 
 	err := k.deleteEntities(args.EntityNames)
@@ -497,7 +497,7 @@ func (k knowledgeBase) DeleteEntities(ctx context.Context, req *mcp.ServerReques
 	return &res, nil, nil
 }
 
-func (k knowledgeBase) DeleteObservations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteObservationsArgs) (*mcp.CallToolResult, any, error) {
+func (k knowledgeBase) DeleteObservations(ctx context.Context, req *mcp.CallToolRequest, args DeleteObservationsArgs) (*mcp.CallToolResult, any, error) {
 	var res mcp.CallToolResult
 
 	err := k.deleteObservations(args.Deletions)
@@ -512,7 +512,7 @@ func (k knowledgeBase) DeleteObservations(ctx context.Context, req *mcp.ServerRe
 	return &res, nil, nil
 }
 
-func (k knowledgeBase) DeleteRelations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteRelationsArgs) (*mcp.CallToolResult, struct{}, error) {
+func (k knowledgeBase) DeleteRelations(ctx context.Context, req *mcp.CallToolRequest, args DeleteRelationsArgs) (*mcp.CallToolResult, struct{}, error) {
 	var res mcp.CallToolResult
 
 	err := k.deleteRelations(args.Relations)
@@ -527,7 +527,7 @@ func (k knowledgeBase) DeleteRelations(ctx context.Context, req *mcp.ServerReque
 	return &res, struct{}{}, nil
 }
 
-func (k knowledgeBase) ReadGraph(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args any) (*mcp.CallToolResult, KnowledgeGraph, error) {
+func (k knowledgeBase) ReadGraph(ctx context.Context, req *mcp.CallToolRequest, args any) (*mcp.CallToolResult, KnowledgeGraph, error) {
 	var res mcp.CallToolResult
 
 	graph, err := k.loadGraph()
@@ -542,7 +542,7 @@ func (k knowledgeBase) ReadGraph(ctx context.Context, req *mcp.ServerRequest[*mc
 	return &res, graph, nil
 }
 
-func (k knowledgeBase) SearchNodes(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args SearchNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
+func (k knowledgeBase) SearchNodes(ctx context.Context, req *mcp.CallToolRequest, args SearchNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
 	var res mcp.CallToolResult
 
 	graph, err := k.searchNodes(args.Query)
@@ -557,7 +557,7 @@ func (k knowledgeBase) SearchNodes(ctx context.Context, req *mcp.ServerRequest[*
 	return &res, graph, nil
 }
 
-func (k knowledgeBase) OpenNodes(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args OpenNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
+func (k knowledgeBase) OpenNodes(ctx context.Context, req *mcp.CallToolRequest, args OpenNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
 	var res mcp.CallToolResult
 
 	graph, err := k.openNodes(args.Names)

examples/server/sequentialthinking/main.go

@@ -231,7 +231,7 @@ func deepCopyThoughts(thoughts []*Thought) []*Thought {
 }
 
 // StartThinking begins a new sequential thinking session for a complex problem.
-func StartThinking(ctx context.Context, _ *mcp.ServerRequest[*mcp.CallToolParams], args StartThinkingArgs) (*mcp.CallToolResult, any, error) {
+func StartThinking(ctx context.Context, _ *mcp.CallToolRequest, args StartThinkingArgs) (*mcp.CallToolResult, any, error) {
 	sessionID := args.SessionID
 	if sessionID == "" {
 		sessionID = randText()
@@ -264,7 +264,7 @@ func StartThinking(ctx context.Context, _ *mcp.ServerRequest[*mcp.CallToolParams
 }
 
 // ContinueThinking adds the next thought step, revises a previous step, or creates a branch in the thinking process.
-func ContinueThinking(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args ContinueThinkingArgs) (*mcp.CallToolResult, any, error) {
+func ContinueThinking(ctx context.Context, req *mcp.CallToolRequest, args ContinueThinkingArgs) (*mcp.CallToolResult, any, error) {
 	// Handle revision of existing thought
 	if args.ReviseStep != nil {
 		err := store.CompareAndSwap(args.SessionID, func(session *ThinkingSession) (*ThinkingSession, error) {
@@ -391,7 +391,7 @@ func ContinueThinking(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolP
 }
 
 // ReviewThinking provides a complete review of the thinking process for a session.
-func ReviewThinking(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args ReviewThinkingArgs) (*mcp.CallToolResult, any, error) {
+func ReviewThinking(ctx context.Context, req *mcp.CallToolRequest, args ReviewThinkingArgs) (*mcp.CallToolResult, any, error) {
 	// Get a snapshot of the session to avoid race conditions
 	sessionSnapshot, exists := store.SessionSnapshot(args.SessionID)
 	if !exists {
@@ -428,7 +428,7 @@ func ReviewThinking(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolPar
 }
 
 // ThinkingHistory handles resource requests for thinking session data and history.
-func ThinkingHistory(ctx context.Context, req *mcp.ServerRequest[*mcp.ReadResourceParams]) (*mcp.ReadResourceResult, error) {
+func ThinkingHistory(ctx context.Context, req *mcp.ReadResourceRequest) (*mcp.ReadResourceResult, error) {
 	// Extract session ID from URI (e.g., "thinking://session_123")
 	u, err := url.Parse(req.Params.URI)
 	if err != nil {

examples/server/sequentialthinking/main_test.go

@@ -387,11 +387,11 @@ func TestThinkingHistory(t *testing.T) {
 	ctx := context.Background()
 
 	// Test listing all sessions
-	listParams := &mcp.ReadResourceParams{
-		URI: "thinking://sessions",
-	}
-
-	result, err := ThinkingHistory(ctx, requestFor(listParams))
+	result, err := ThinkingHistory(ctx, &mcp.ReadResourceRequest{
+		Params: &mcp.ReadResourceParams{
+			URI: "thinking://sessions",
+		},
+	})
 	if err != nil {
 		t.Fatalf("ThinkingHistory() error = %v", err)
 	}
@@ -417,11 +417,9 @@ func TestThinkingHistory(t *testing.T) {
 	}
 
 	// Test getting specific session
-	sessionParams := &mcp.ReadResourceParams{
-		URI: "thinking://session1",
-	}
-
-	result, err = ThinkingHistory(ctx, requestFor(sessionParams))
+	result, err = ThinkingHistory(ctx, &mcp.ReadResourceRequest{
+		Params: &mcp.ReadResourceParams{URI: "thinking://session1"},
+	})
 	if err != nil {
 		t.Fatalf("ThinkingHistory() error = %v", err)
 	}
@@ -491,7 +489,3 @@ func TestInvalidOperations(t *testing.T) {
 		t.Error("Expected error for invalid revision step")
 	}
 }
-
-func requestFor[P mcp.Params](p P) *mcp.ServerRequest[P] {
-	return &mcp.ServerRequest[P]{Params: p}
-}

examples/server/sse/main.go

@@ -24,7 +24,7 @@ type SayHiParams struct {
 	Name string `json:"name"`
 }
 
-func SayHi(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args SayHiParams) (*mcp.CallToolResult, any, error) {
+func SayHi(ctx context.Context, req *mcp.CallToolRequest, args SayHiParams) (*mcp.CallToolResult, any, error) {
 	return &mcp.CallToolResult{
 		Content: []mcp.Content{
 			&mcp.TextContent{Text: "Hi " + args.Name},

internal/readme/server/server.go

@@ -16,7 +16,7 @@ type HiParams struct {
 	Name string `json:"name" jsonschema:"the name of the person to greet"`
 }
 
-func SayHi(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args HiParams) (*mcp.CallToolResult, any, error) {
+func SayHi(ctx context.Context, req *mcp.CallToolRequest, args HiParams) (*mcp.CallToolResult, any, error) {
 	return &mcp.CallToolResult{
 		Content: []mcp.Content{&mcp.TextContent{Text: "Hi " + args.Name}},
 	}, nil, nil

mcp/example_middleware_test.go

@@ -89,7 +89,7 @@ func Example_loggingMiddleware() {
 		},
 		func(
 			ctx context.Context,
-			req *mcp.ServerRequest[*mcp.CallToolParams], args map[string]any,
+			req *mcp.CallToolRequest, args map[string]any,
 		) (*mcp.CallToolResult, any, error) {
 			name, ok := args["name"].(string)
 			if !ok {

mcp/mcp_test.go

@@ -33,7 +33,7 @@ type hiParams struct {
 // TODO(jba): after schemas are stateless (WIP), this can be a variable.
 func greetTool() *Tool { return &Tool{Name: "greet", Description: "say hi"} }
 
-func sayHi(ctx context.Context, req *ServerRequest[*CallToolParams], args hiParams) (*CallToolResult, any, error) {
+func sayHi(ctx context.Context, req *CallToolRequest, args hiParams) (*CallToolResult, any, error) {
 	if err := req.Session.Ping(ctx, nil); err != nil {
 		return nil, nil, fmt.Errorf("ping failed: %v", err)
 	}
@@ -74,20 +74,20 @@ func TestEndToEnd(t *testing.T) {
 	}
 
 	sopts := &ServerOptions{
-		InitializedHandler: func(context.Context, *ServerRequest[*InitializedParams]) {
+		InitializedHandler: func(context.Context, *InitializedRequest) {
 			notificationChans["initialized"] <- 0
 		},
-		RootsListChangedHandler: func(context.Context, *ServerRequest[*RootsListChangedParams]) {
+		RootsListChangedHandler: func(context.Context, *RootsListChangedRequest) {
 			notificationChans["roots"] <- 0
 		},
-		ProgressNotificationHandler: func(context.Context, *ServerRequest[*ProgressNotificationParams]) {
+		ProgressNotificationHandler: func(context.Context, *ProgressNotificationRequest) {
 			notificationChans["progress_server"] <- 0
 		},
-		SubscribeHandler: func(context.Context, *ServerRequest[*SubscribeParams]) error {
+		SubscribeHandler: func(context.Context, *SubscribeRequest) error {
 			notificationChans["subscribe"] <- 0
 			return nil
 		},
-		UnsubscribeHandler: func(context.Context, *ServerRequest[*UnsubscribeParams]) error {
+		UnsubscribeHandler: func(context.Context, *UnsubscribeRequest) error {
 			notificationChans["unsubscribe"] <- 0
 			return nil
 		},
@@ -98,7 +98,7 @@ func TestEndToEnd(t *testing.T) {
 		Description: "say hi",
 	}, sayHi)
 	AddTool(s, &Tool{Name: "fail", InputSchema: &jsonschema.Schema{}},
-		func(context.Context, *ServerRequest[*CallToolParams], map[string]any) (*CallToolResult, any, error) {
+		func(context.Context, *CallToolRequest, map[string]any) (*CallToolResult, any, error) {
 			return nil, nil, errTestFailure
 		})
 	s.AddPrompt(codeReviewPrompt, codReviewPromptHandler)
@@ -511,7 +511,7 @@ var embeddedResources = map[string]string{
 	"info": "This is the MCP test server.",
 }
 
-func handleEmbeddedResource(_ context.Context, req *ServerRequest[*ReadResourceParams]) (*ReadResourceResult, error) {
+func handleEmbeddedResource(_ context.Context, req *ReadResourceRequest) (*ReadResourceResult, error) {
 	u, err := url.Parse(req.Params.URI)
 	if err != nil {
 		return nil, err
@@ -663,7 +663,7 @@ func TestCancellation(t *testing.T) {
 		start     = make(chan struct{})
 		cancelled = make(chan struct{}, 1) // don't block the request
 	)
-	slowRequest := func(ctx context.Context, req *ServerRequest[*CallToolParams], args any) (*CallToolResult, any, error) {
+	slowRequest := func(ctx context.Context, req *CallToolRequest, args any) (*CallToolResult, any, error) {
 		start <- struct{}{}
 		select {
 		case <-ctx.Done():
@@ -852,7 +852,7 @@ func traceCalls[S Session](w io.Writer, prefix string) Middleware {
 	}
 }
 
-func nopHandler(context.Context, *ServerRequest[*CallToolParams]) (*CallToolResult, error) {
+func nopHandler(context.Context, *CallToolRequest) (*CallToolResult, error) {
 	return nil, nil
 }
 
@@ -1009,13 +1009,13 @@ func TestSynchronousNotifications(t *testing.T) {
 
 	var rootsChanged atomic.Bool
 	serverOpts := &ServerOptions{
-		RootsListChangedHandler: func(_ context.Context, req *ServerRequest[*RootsListChangedParams]) {
+		RootsListChangedHandler: func(_ context.Context, req *RootsListChangedRequest) {
 			rootsChanged.Store(true)
 		},
 	}
 	server := NewServer(testImpl, serverOpts)
 	cs, ss := basicClientServerConnection(t, client, server, func(s *Server) {
-		AddTool(s, &Tool{Name: "tool"}, func(ctx context.Context, req *ServerRequest[*CallToolParams], args any) (*CallToolResult, any, error) {
+		AddTool(s, &Tool{Name: "tool"}, func(ctx context.Context, req *CallToolRequest, args any) (*CallToolResult, any, error) {
 			if !rootsChanged.Load() {
 				return nil, nil, fmt.Errorf("didn't get root change notification")
 			}
@@ -1064,11 +1064,11 @@ func TestNoDistributedDeadlock(t *testing.T) {
 	}
 	client := NewClient(testImpl, clientOpts)
 	cs, _ := basicClientServerConnection(t, client, nil, func(s *Server) {
-		AddTool(s, &Tool{Name: "tool1"}, func(ctx context.Context, req *ServerRequest[*CallToolParams], args any) (*CallToolResult, any, error) {
+		AddTool(s, &Tool{Name: "tool1"}, func(ctx context.Context, req *CallToolRequest, args any) (*CallToolResult, any, error) {
 			req.Session.CreateMessage(ctx, new(CreateMessageParams))
 			return new(CallToolResult), nil, nil
 		})
-		AddTool(s, &Tool{Name: "tool2"}, func(ctx context.Context, req *ServerRequest[*CallToolParams], args any) (*CallToolResult, any, error) {
+		AddTool(s, &Tool{Name: "tool2"}, func(ctx context.Context, req *CallToolRequest, args any) (*CallToolResult, any, error) {
 			req.Session.Ping(ctx, nil)
 			return new(CallToolResult), nil, nil
 		})

mcp/requests.go

@@ -0,0 +1,24 @@
+// Copyright 2025 The Go MCP SDK Authors. All rights reserved.
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+// This file holds the request types.
+
+package mcp
+
+// TODO: expand the aliases
+type (
+	CallToolRequest              = ServerRequest[*CallToolParams]
+	CompleteRequest              = ServerRequest[*CompleteParams]
+	GetPromptRequest             = ServerRequest[*GetPromptParams]
+	InitializedRequest           = ServerRequest[*InitializedParams]
+	ListPromptsRequest           = ServerRequest[*ListPromptsParams]
+	ListResourcesRequest         = ServerRequest[*ListResourcesParams]
+	ListResourceTemplatesRequest = ServerRequest[*ListResourceTemplatesParams]
+	ListToolsRequest             = ServerRequest[*ListToolsParams]
+	ProgressNotificationRequest  = ServerRequest[*ProgressNotificationParams]
+	ReadResourceRequest          = ServerRequest[*ReadResourceParams]
+	RootsListChangedRequest      = ServerRequest[*RootsListChangedParams]
+	SubscribeRequest             = ServerRequest[*SubscribeParams]
+	UnsubscribeRequest           = ServerRequest[*UnsubscribeParams]
+)

mcp/resource.go

@@ -35,7 +35,7 @@ type serverResourceTemplate struct {
 // A ResourceHandler is a function that reads a resource.
 // It will be called when the client calls [ClientSession.ReadResource].
 // If it cannot find the resource, it should return the result of calling [ResourceNotFoundError].
-type ResourceHandler func(context.Context, *ServerRequest[*ReadResourceParams]) (*ReadResourceResult, error)
+type ResourceHandler func(context.Context, *ReadResourceRequest) (*ReadResourceResult, error)
 
 // ResourceNotFoundError returns an error indicating that a resource being read could
 // not be found.