refactor: convert projects, labels, and dynamic_tools to NewTool pattern

pkg/github/dynamic_tools.go

@@ -20,27 +20,27 @@ func ToolsetEnum(toolsetGroup *toolsets.ToolsetGroup) []any {
 	return toolsetNames
 }
 
-func EnableToolset(s *mcp.Server, toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) (mcp.Tool, mcp.ToolHandlerFor[map[string]any, any]) {
-	return mcp.Tool{
-			Name:        "enable_toolset",
-			Description: t("TOOL_ENABLE_TOOLSET_DESCRIPTION", "Enable one of the sets of tools the GitHub MCP server provides, use get_toolset_tools and list_available_toolsets first to see what this will enable"),
-			Annotations: &mcp.ToolAnnotations{
-				Title: t("TOOL_ENABLE_TOOLSET_USER_TITLE", "Enable a toolset"),
-				// Not modifying GitHub data so no need to show a warning
-				ReadOnlyHint: true,
-			},
-			InputSchema: &jsonschema.Schema{
-				Type: "object",
-				Properties: map[string]*jsonschema.Schema{
-					"toolset": {
-						Type:        "string",
-						Description: "The name of the toolset to enable",
-						Enum:        ToolsetEnum(toolsetGroup),
-					},
+func EnableToolset(s *mcp.Server, toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) toolsets.ServerTool {
+	return toolsets.NewServerToolLegacy(mcp.Tool{
+		Name:        "enable_toolset",
+		Description: t("TOOL_ENABLE_TOOLSET_DESCRIPTION", "Enable one of the sets of tools the GitHub MCP server provides, use get_toolset_tools and list_available_toolsets first to see what this will enable"),
+		Annotations: &mcp.ToolAnnotations{
+			Title: t("TOOL_ENABLE_TOOLSET_USER_TITLE", "Enable a toolset"),
+			// Not modifying GitHub data so no need to show a warning
+			ReadOnlyHint: true,
+		},
+		InputSchema: &jsonschema.Schema{
+			Type: "object",
+			Properties: map[string]*jsonschema.Schema{
+				"toolset": {
+					Type:        "string",
+					Description: "The name of the toolset to enable",
+					Enum:        ToolsetEnum(toolsetGroup),
 				},
-				Required: []string{"toolset"},
 			},
+			Required: []string{"toolset"},
 		},
+	},
 		mcp.ToolHandlerFor[map[string]any, any](func(_ context.Context, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
 			// We need to convert the toolsets back to a map for JSON serialization
 			toolsetName, err := RequiredParam[string](args, "toolset")
@@ -64,22 +64,22 @@ func EnableToolset(s *mcp.Server, toolsetGroup *toolsets.ToolsetGroup, t transla
 			toolset.RegisterTools(s)
 
 			return utils.NewToolResultText(fmt.Sprintf("Toolset %s enabled", toolsetName)), nil, nil
-		})
+		}))
 }
 
-func ListAvailableToolsets(toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) (mcp.Tool, mcp.ToolHandlerFor[map[string]any, any]) {
-	return mcp.Tool{
-			Name:        "list_available_toolsets",
-			Description: t("TOOL_LIST_AVAILABLE_TOOLSETS_DESCRIPTION", "List all available toolsets this GitHub MCP server can offer, providing the enabled status of each. Use this when a task could be achieved with a GitHub tool and the currently available tools aren't enough. Call get_toolset_tools with these toolset names to discover specific tools you can call"),
-			Annotations: &mcp.ToolAnnotations{
-				Title:        t("TOOL_LIST_AVAILABLE_TOOLSETS_USER_TITLE", "List available toolsets"),
-				ReadOnlyHint: true,
-			},
-			InputSchema: &jsonschema.Schema{
-				Type:       "object",
-				Properties: map[string]*jsonschema.Schema{},
-			},
+func ListAvailableToolsets(toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) toolsets.ServerTool {
+	return toolsets.NewServerToolLegacy(mcp.Tool{
+		Name:        "list_available_toolsets",
+		Description: t("TOOL_LIST_AVAILABLE_TOOLSETS_DESCRIPTION", "List all available toolsets this GitHub MCP server can offer, providing the enabled status of each. Use this when a task could be achieved with a GitHub tool and the currently available tools aren't enough. Call get_toolset_tools with these toolset names to discover specific tools you can call"),
+		Annotations: &mcp.ToolAnnotations{
+			Title:        t("TOOL_LIST_AVAILABLE_TOOLSETS_USER_TITLE", "List available toolsets"),
+			ReadOnlyHint: true,
 		},
+		InputSchema: &jsonschema.Schema{
+			Type:       "object",
+			Properties: map[string]*jsonschema.Schema{},
+		},
+	},
 		mcp.ToolHandlerFor[map[string]any, any](func(_ context.Context, _ *mcp.CallToolRequest, _ map[string]any) (*mcp.CallToolResult, any, error) {
 			// We need to convert the toolsetGroup back to a map for JSON serialization
 
@@ -103,29 +103,29 @@ func ListAvailableToolsets(toolsetGroup *toolsets.ToolsetGroup, t translations.T
 			}
 
 			return utils.NewToolResultText(string(r)), nil, nil
-		})
+		}))
 }
 
-func GetToolsetsTools(toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) (mcp.Tool, mcp.ToolHandlerFor[map[string]any, any]) {
-	return mcp.Tool{
-			Name:        "get_toolset_tools",
-			Description: t("TOOL_GET_TOOLSET_TOOLS_DESCRIPTION", "Lists all the capabilities that are enabled with the specified toolset, use this to get clarity on whether enabling a toolset would help you to complete a task"),
-			Annotations: &mcp.ToolAnnotations{
-				Title:        t("TOOL_GET_TOOLSET_TOOLS_USER_TITLE", "List all tools in a toolset"),
-				ReadOnlyHint: true,
-			},
-			InputSchema: &jsonschema.Schema{
-				Type: "object",
-				Properties: map[string]*jsonschema.Schema{
-					"toolset": {
-						Type:        "string",
-						Description: "The name of the toolset you want to get the tools for",
-						Enum:        ToolsetEnum(toolsetGroup),
-					},
+func GetToolsetsTools(toolsetGroup *toolsets.ToolsetGroup, t translations.TranslationHelperFunc) toolsets.ServerTool {
+	return toolsets.NewServerToolLegacy(mcp.Tool{
+		Name:        "get_toolset_tools",
+		Description: t("TOOL_GET_TOOLSET_TOOLS_DESCRIPTION", "Lists all the capabilities that are enabled with the specified toolset, use this to get clarity on whether enabling a toolset would help you to complete a task"),
+		Annotations: &mcp.ToolAnnotations{
+			Title:        t("TOOL_GET_TOOLSET_TOOLS_USER_TITLE", "List all tools in a toolset"),
+			ReadOnlyHint: true,
+		},
+		InputSchema: &jsonschema.Schema{
+			Type: "object",
+			Properties: map[string]*jsonschema.Schema{
+				"toolset": {
+					Type:        "string",
+					Description: "The name of the toolset you want to get the tools for",
+					Enum:        ToolsetEnum(toolsetGroup),
 				},
-				Required: []string{"toolset"},
 			},
+			Required: []string{"toolset"},
 		},
+	},
 		mcp.ToolHandlerFor[map[string]any, any](func(_ context.Context, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
 			// We need to convert the toolsetGroup back to a map for JSON serialization
 			toolsetName, err := RequiredParam[string](args, "toolset")
@@ -154,5 +154,5 @@ func GetToolsetsTools(toolsetGroup *toolsets.ToolsetGroup, t translations.Transl
 			}
 
 			return utils.NewToolResultText(string(r)), nil, nil
-		})
+		}))
 }