fix design doc

Author: jba

design/design.md

@@ -618,7 +618,7 @@ type Tool struct {
 }
 
 // A ToolHandlerFor handles a call to tools/call with typed arguments and results.
-type ToolHandlerFor[In, Out any] func(context.Context, *RequestFor[*ServerSession, *CallToolParamsFor[In]]) (*CallToolResultFor[Out], error)
+type ToolHandlerFor[In, Out any] func(context.Context, *ServerRequest[*CallToolParamsFor[In]]) (*CallToolResultFor[Out], error)
 
 ```
 
@@ -669,7 +669,7 @@ type AddParams struct {
     Y int `json:"y"`
 }
 
-func addHandler(ctx context.Context, req *mcp.RequestFor[*mcp.ServerSession, *mcp.CallToolParamsFor[AddParams]]) (*mcp.CallToolResultFor[int], error) {
+func addHandler(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParamsFor[AddParams]]) (*mcp.CallToolResultFor[int], error) {
     return &mcp.CallToolResultFor[int]{StructuredContent: req.Params.Arguments.X + req.Params.Arguments.Y}, nil
 }
 ```
@@ -772,9 +772,9 @@ If a server author wants to support resource subscriptions, they must provide ha
 type ServerOptions struct {
   ...
 	// Function called when a client session subscribes to a resource.
-	SubscribeHandler func(context.Context, *RequestFor[*ServerSession, *SubscribeParams]) error
+	SubscribeHandler func(context.Context, *ServerRequest[*SubscribeParams]) error
 	// Function called when a client session unsubscribes from a resource.
-	UnsubscribeHandler func(context.Context, *RequestFor[*ServerSession, *UnsubscribeParams]) error
+	UnsubscribeHandler func(context.Context, *ServerRequest[*UnsubscribeParams]) error
 }
 ```
 
@@ -793,10 +793,10 @@ When a list of tools, prompts or resources changes as the result of an AddXXX or
 ```go
 type ClientOptions struct {
   ...
-	ToolListChangedHandler      func(context.Context, *RequestFor[*ClientSession, *ToolListChangedParams])
-	PromptListChangedHandler    func(context.Context, *RequestFor[*ClientSession, *PromptListChangedParams])
+	ToolListChangedHandler      func(context.Context, *ClientRequest[*ToolListChangedParams])
+	PromptListChangedHandler    func(context.Context, *ClientRequest[*PromptListChangedParams])
   // For both resources and resource templates.
-	ResourceListChangedHandler  func(context.Context, *RequestFor[*ClientSession, *ResourceListChangedParams])
+	ResourceListChangedHandler  func(context.Context, *ClientRequest[*ResourceListChangedParams])
 }
 ```
 
@@ -810,7 +810,7 @@ Clients call the spec method `Complete` to request completions. If a server inst
 type ServerOptions struct {
   ...
   // If non-nil, called when a client sends a completion request.
-	CompletionHandler func(context.Context, *RequestFor[*ServerSession, *CompleteParams]) (*CompleteResult, error)
+	CompletionHandler func(context.Context, *ServerRequest[*CompleteParams]) (*CompleteResult, error)
 }
 ```
 

mcp/shared.go

@@ -359,26 +359,19 @@ func setProgressToken(p Params, pt any) {
 }
 
 // A Request is a method request with parameters and additional information, such as the session.
-// The parameters are untyped; see [RequestFor] for the typed version.
+// The parameters are untyped; see [ClientRequest] and [ServerRequest] for the typed versions.
 type Request[S Session] struct {
 	Session S
 	Params  Params
 }
 
-// A RequestFor is a method request with parameters and additional information, such as the session.
-// The parameters are typed; see [Request] for the untyped version.
-// type RequestFor[S Session, P Params] struct {
-// 	Session S
-// 	Params  P
-// 	// TODO: HTTPHeader http.Header
-// 	// TODO: auth.TokenInfo
-// }
-
+// A ClientRequest is a request to a client.
 type ClientRequest[P Params] struct {
 	Session *ClientSession
 	Params  P
 }
 
+// A ServerRequest is a request to a server.
 type ServerRequest[P Params] struct {
 	Session *ServerSession
 	Params  P