address review comments

Author: findleyr

mcp/client.go

@@ -130,7 +130,7 @@ func (c *Client) capabilities() *ClientCapabilities {
 	caps := &ClientCapabilities{}
 	// Due to an oversight (#607), roots require special handling.
 	caps.Roots.ListChanged = true
-	caps.RootsV2 = &RootsCapabilities{
+	caps.RootsV2 = &RootCapabilities{
 		ListChanged: true,
 	}
 	if c.opts.CreateMessageHandler != nil {

mcp/client_test.go

@@ -192,7 +192,6 @@ func TestClientPaginateVariousPageSizes(t *testing.T) {
 }
 
 func TestClientCapabilities(t *testing.T) {
-	canListRoots := RootsCapabilities{ListChanged: true}
 	testCases := []struct {
 		name             string
 		configureClient  func(s *Client)
@@ -203,8 +202,8 @@ func TestClientCapabilities(t *testing.T) {
 			name:            "With initial capabilities",
 			configureClient: func(s *Client) {},
 			wantCapabilities: &ClientCapabilities{
-				Roots:   canListRoots,
-				RootsV2: &canListRoots,
+				Roots:   RootCapabilities{ListChanged: true},
+				RootsV2: &RootCapabilities{ListChanged: true},
 			},
 		},
 		{
@@ -216,8 +215,8 @@ func TestClientCapabilities(t *testing.T) {
 				},
 			},
 			wantCapabilities: &ClientCapabilities{
-				Roots:    canListRoots,
-				RootsV2:  &canListRoots,
+				Roots:    RootCapabilities{ListChanged: true},
+				RootsV2:  &RootCapabilities{ListChanged: true},
 				Sampling: &SamplingCapabilities{},
 			},
 		},
@@ -231,8 +230,8 @@ func TestClientCapabilities(t *testing.T) {
 				},
 			},
 			wantCapabilities: &ClientCapabilities{
-				Roots:   canListRoots,
-				RootsV2: &canListRoots,
+				Roots:   RootCapabilities{ListChanged: true},
+				RootsV2: &RootCapabilities{ListChanged: true},
 				Elicitation: &ElicitationCapabilities{
 					Form: &FormElicitationCapabilities{},
 				},
@@ -248,10 +247,8 @@ func TestClientCapabilities(t *testing.T) {
 				},
 			},
 			wantCapabilities: &ClientCapabilities{
-				Roots: struct {
-					ListChanged bool "json:\"listChanged,omitempty\""
-				}{ListChanged: true},
-				RootsV2: &RootsCapabilities{ListChanged: true},
+				Roots:   RootCapabilities{ListChanged: true},
+				RootsV2: &RootCapabilities{ListChanged: true},
 				Elicitation: &ElicitationCapabilities{
 					URL: &URLElicitationCapabilities{},
 				},
@@ -267,10 +264,8 @@ func TestClientCapabilities(t *testing.T) {
 				},
 			},
 			wantCapabilities: &ClientCapabilities{
-				Roots: struct {
-					ListChanged bool "json:\"listChanged,omitempty\""
-				}{ListChanged: true},
-				RootsV2: &RootsCapabilities{ListChanged: true},
+				Roots:   RootCapabilities{ListChanged: true},
+				RootsV2: &RootCapabilities{ListChanged: true},
 				Elicitation: &ElicitationCapabilities{
 					Form: &FormElicitationCapabilities{},
 					URL:  &URLElicitationCapabilities{},

mcp/protocol.go

@@ -177,8 +177,8 @@ func (x *CancelledParams) isParams()              {}
 func (x *CancelledParams) GetProgressToken() any  { return getProgressToken(x) }
 func (x *CancelledParams) SetProgressToken(t any) { setProgressToken(x, t) }
 
-// RootsCapabilities describes a client's support for roots.
-type RootsCapabilities struct {
+// RootCapabilities describes a client's support for roots.
+type RootCapabilities struct {
 	// ListChanged reports whether the client supports notifications for
 	// changes to the roots list.
 	ListChanged bool `json:"listChanged,omitempty"`
@@ -193,15 +193,15 @@ type ClientCapabilities struct {
 	// Roots describes the client's support for roots.
 	//
 	// Deprecated: use RootsV2. As described in #607, Roots should have been a
-	// pointer to a RootsCapabilities value. Roots will be continue to be
+	// pointer to a RootCapabilities value. Roots will be continue to be
 	// populated, but any new fields will only be added in the RootsV2 field.
 	Roots struct {
 		// ListChanged reports whether the client supports notifications for
 		// changes to the roots list.
 		ListChanged bool `json:"listChanged,omitempty"`
 	} `json:"roots,omitempty"`
 	// RootsV2 is present if the client supports roots.
-	RootsV2 *RootsCapabilities `json:"-"`
+	RootsV2 *RootCapabilities `json:"-"`
 	// Sampling is present if the client supports sampling from an LLM.
 	Sampling *SamplingCapabilities `json:"sampling,omitempty"`
 	// Elicitation is present if the client supports elicitation from the server.
@@ -217,10 +217,10 @@ func (c *ClientCapabilities) toV2() *clientCapabilitiesV2 {
 
 // clientCapabilitiesV2 is a version of ClientCapabilities that fixes the bug
 // described in #607: Roots should have been a pointer to value type
-// RootsCapabilities.
+// RootCapabilities.
 type clientCapabilitiesV2 struct {
 	ClientCapabilities
-	Roots *RootsCapabilities `json:"roots,omitempty"`
+	Roots *RootCapabilities `json:"roots,omitempty"`
 }
 
 func (c *clientCapabilitiesV2) toV1() *ClientCapabilities {

mcp/server_test.go

@@ -601,14 +601,14 @@ func testToolForSchema[In, Out any](t *testing.T, tool *Tool, in string, out Out
 	}
 }
 
-// TestClientRootsCapabilities verifies that the server correctly observes
+// TestClientRootCapabilities verifies that the server correctly observes
 // RootsV2 for various client capability configurations. This tests the fix
 // for #607.
-func TestClientRootsCapabilities(t *testing.T) {
+func TestClientRootCapabilities(t *testing.T) {
 	testCases := []struct {
 		name         string
 		capabilities *string // JSON for the capabilities field; nil means omit the field
-		wantRootsV2  *RootsCapabilities
+		wantRootsV2  *RootCapabilities
 	}{
 		{
 			name:         "capabilities field omitted",
@@ -628,17 +628,17 @@ func TestClientRootsCapabilities(t *testing.T) {
 		{
 			name:         "capabilities with empty roots",
 			capabilities: ptr(`{"roots": {}}`),
-			wantRootsV2:  &RootsCapabilities{ListChanged: false},
+			wantRootsV2:  &RootCapabilities{ListChanged: false},
 		},
 		{
 			name:         "capabilities with roots without listChanged",
 			capabilities: ptr(`{"roots": {"listChanged": false}}`),
-			wantRootsV2:  &RootsCapabilities{ListChanged: false},
+			wantRootsV2:  &RootCapabilities{ListChanged: false},
 		},
 		{
 			name:         "capabilities with roots with listChanged",
 			capabilities: ptr(`{"roots": {"listChanged": true}}`),
-			wantRootsV2:  &RootsCapabilities{ListChanged: true},
+			wantRootsV2:  &RootCapabilities{ListChanged: true},
 		},
 	}
 
@@ -706,7 +706,7 @@ func TestClientRootsCapabilities(t *testing.T) {
 				t.Fatal("InitializeParams is nil")
 			}
 
-			var gotRootsV2 *RootsCapabilities
+			var gotRootsV2 *RootCapabilities
 			if params.Capabilities != nil {
 				gotRootsV2 = params.Capabilities.RootsV2
 			}