Add Tool Handler shim to RegisterFunc (#1536)

* Add tool handler shim to use server.AddTool instead of mcp.AddTool

---

Co-authored-by: Ksenia Bobrova <[email protected]>
Co-authored-by: Sam Morrow <[email protected]>

Author: 3 people

pkg/github/__toolsnaps__/get_me.snap

@@ -4,6 +4,8 @@
     "title": "Get my user profile"
   },
   "description": "Get details of the authenticated GitHub user. Use this when a request is about the user's own profile for GitHub. Or when information is missing to build other tool calls.",
-  "inputSchema": null,
+  "inputSchema": {
+    "type": "object"
+  },
   "name": "get_me"
 }

pkg/github/context_tools.go

@@ -43,6 +43,9 @@ func GetMe(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Too
 				Title:        t("TOOL_GET_ME_USER_TITLE", "Get my user profile"),
 				ReadOnlyHint: true,
 			},
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+			},
 		},
 		mcp.ToolHandlerFor[map[string]any, any](func(ctx context.Context, _ *mcp.CallToolRequest, _ map[string]any) (*mcp.CallToolResult, any, error) {
 			client, err := getClient(ctx)

pkg/toolsets/toolsets.go

@@ -1,6 +1,8 @@
 package toolsets
 
 import (
+	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
@@ -35,9 +37,20 @@ type ServerTool struct {
 	RegisterFunc func(s *mcp.Server)
 }
 
-func NewServerTool[In, Out any](tool mcp.Tool, handler mcp.ToolHandlerFor[In, Out]) ServerTool {
+func NewServerTool[In any, Out any](tool mcp.Tool, handler mcp.ToolHandlerFor[In, Out]) ServerTool {
 	return ServerTool{Tool: tool, RegisterFunc: func(s *mcp.Server) {
-		mcp.AddTool(s, &tool, handler)
+		th := func(ctx context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+			var arguments In
+			if err := json.Unmarshal(req.Params.Arguments, &arguments); err != nil {
+				return nil, err
+			}
+
+			resp, _, err := handler(ctx, req, arguments)
+
+			return resp, err
+		}
+
+		s.AddTool(&tool, th)
 	}}
 }