Clean up 'Servers' in API docs (break out sub-components)

Author: peteski22

internal/api/prompts.go

@@ -243,11 +243,11 @@ func handleServerPromptGenerate(
 }
 
 // RegisterPromptRoutes registers prompt-related routes under the servers API.
-func RegisterPromptRoutes(serversAPI huma.API, accessor contracts.MCPClientAccessor) {
-	tags := []string{"Servers", "Prompts"}
+func RegisterPromptRoutes(parentAPI huma.API, accessor contracts.MCPClientAccessor) {
+	tags := []string{"Prompts"}
 
 	huma.Register(
-		serversAPI,
+		parentAPI,
 		huma.Operation{
 			OperationID: "listPrompts",
 			Method:      "GET",
@@ -261,7 +261,7 @@ func RegisterPromptRoutes(serversAPI huma.API, accessor contracts.MCPClientAcces
 	)
 
 	huma.Register(
-		serversAPI,
+		parentAPI,
 		huma.Operation{
 			OperationID: "generatePrompt",
 			Method:      "POST",

internal/api/resources.go

@@ -344,11 +344,11 @@ func handleServerResourceContent(
 }
 
 // RegisterResourceRoutes registers resource-related routes under the servers API.
-func RegisterResourceRoutes(serversAPI huma.API, accessor contracts.MCPClientAccessor) {
-	tags := []string{"Servers", "Resources"}
+func RegisterResourceRoutes(parentAPI huma.API, accessor contracts.MCPClientAccessor) {
+	tags := []string{"Resources"}
 
 	huma.Register(
-		serversAPI,
+		parentAPI,
 		huma.Operation{
 			OperationID: "listResources",
 			Method:      "GET",
@@ -362,7 +362,7 @@ func RegisterResourceRoutes(serversAPI huma.API, accessor contracts.MCPClientAcc
 	)
 
 	huma.Register(
-		serversAPI,
+		parentAPI,
 		huma.Operation{
 			OperationID: "listResourceTemplates",
 			Method:      "GET",
@@ -376,7 +376,7 @@ func RegisterResourceRoutes(serversAPI huma.API, accessor contracts.MCPClientAcc
 	)
 
 	huma.Register(
-		serversAPI,
+		parentAPI,
 		huma.Operation{
 			OperationID: "getResourceContent",
 			Method:      "GET",

internal/api/servers.go

@@ -51,33 +51,8 @@ func RegisterServerRoutes(routerAPI huma.API, accessor contracts.MCPClientAccess
 		},
 	)
 
-	huma.Register(
-		serversAPI,
-		huma.Operation{
-			OperationID: "listTools",
-			Method:      http.MethodGet,
-			Path:        "/{name}/tools",
-			Summary:     "List server tools",
-			Tags:        append(tags, "Tools"),
-		},
-		func(ctx context.Context, input *ServerToolsRequest) (*ToolsResponse, error) {
-			return handleServerTools(accessor, input.Name)
-		},
-	)
-
-	huma.Register(
-		serversAPI,
-		huma.Operation{
-			OperationID: "callTool",
-			Method:      http.MethodPost,
-			Path:        "/{server}/tools/{tool}",
-			Summary:     "Call a tool for a server",
-			Tags:        append(tags, "Tools"),
-		},
-		func(ctx context.Context, input *ServerToolCallRequest) (*ToolCallResponse, error) {
-			return handleServerToolCall(accessor, input.Server, input.Tool, input.Body)
-		},
-	)
+	// Register tool routes.
+	RegisterToolRoutes(serversAPI, accessor)
 
 	// Register prompt routes.
 	RegisterPromptRoutes(serversAPI, accessor)

internal/api/tools.go

@@ -1,8 +1,13 @@
 package api
 
 import (
+	"context"
+	"net/http"
+
+	"github.com/danielgtaylor/huma/v2"
 	"github.com/mark3labs/mcp-go/mcp"
 
+	"github.com/mozilla-ai/mcpd/v2/internal/contracts"
 	"github.com/mozilla-ai/mcpd/v2/internal/filter"
 )
 
@@ -122,3 +127,35 @@ func (d DomainTool) ToAPIType() (Tool, error) {
 		Annotations: annotations,
 	}, nil
 }
+
+func RegisterToolRoutes(parentAPI huma.API, accessor contracts.MCPClientAccessor) {
+	tags := []string{"Tools"}
+
+	huma.Register(
+		parentAPI,
+		huma.Operation{
+			OperationID: "listTools",
+			Method:      http.MethodGet,
+			Path:        "/{name}/tools",
+			Summary:     "List server tools",
+			Tags:        tags,
+		},
+		func(ctx context.Context, input *ServerToolsRequest) (*ToolsResponse, error) {
+			return handleServerTools(accessor, input.Name)
+		},
+	)
+
+	huma.Register(
+		parentAPI,
+		huma.Operation{
+			OperationID: "callTool",
+			Method:      http.MethodPost,
+			Path:        "/{server}/tools/{tool}",
+			Summary:     "Call a tool for a server",
+			Tags:        tags,
+		},
+		func(ctx context.Context, input *ServerToolCallRequest) (*ToolCallResponse, error) {
+			return handleServerToolCall(accessor, input.Server, input.Tool, input.Body)
+		},
+	)
+}