feat: wire up SearchRepositories to use typed input

- Change SearchRepositories to use mcp.ToolHandlerFor[SearchRepositoriesInput, any]
- Use SearchRepositoriesInput.MCPSchema() for InputSchema
- Handler receives typed struct instead of map[string]any
- Update tests to use typed input
- Update toolsnaps to reflect the new schema

This demonstrates the pattern for wiring up tools to use generated schemas.
Pattern established for remaining 90+ tools.

Co-authored-by: SamMorrowDrums <[email protected]>

Author: Copilot

pkg/github/__toolsnaps__/search_repositories.snap

@@ -12,43 +12,40 @@
     "properties": {
       "minimal_output": {
         "type": "boolean",
-        "description": "Return minimal repository information (default: true). When false, returns full GitHub API repository objects.",
-        "default": true
+        "description": "Return minimal repository information - when false returns full GitHub API objects"
       },
       "order": {
         "type": "string",
-        "description": "Sort order",
+        "description": "Sort order (asc/desc)",
         "enum": [
           "asc",
           "desc"
         ]
       },
       "page": {
-        "type": "number",
-        "description": "Page number for pagination (min 1)",
-        "minimum": 1
+        "type": "integer",
+        "description": "Page number for pagination (min 1)"
       },
       "perPage": {
-        "type": "number",
-        "description": "Results per page for pagination (min 1, max 100)",
-        "minimum": 1,
-        "maximum": 100
+        "type": "integer",
+        "description": "Results per page for pagination (min 1 and max 100)"
       },
       "query": {
         "type": "string",
-        "description": "Repository search query. Examples: 'machine learning in:name stars:\u003e1000 language:python', 'topic:react', 'user:facebook'. Supports advanced search syntax for precise filtering."
+        "description": "Repository search query using GitHub search syntax"
       },
       "sort": {
         "type": "string",
-        "description": "Sort repositories by field, defaults to best match",
+        "description": "Sort repositories by field - defaults to best match",
         "enum": [
           "stars",
           "forks",
           "help-wanted-issues",
           "updated"
         ]
       }
-    }
+    },
+    "additionalProperties": false
   },
   "name": "search_repositories"
 }

pkg/github/search.go

@@ -16,81 +16,34 @@ import (
 )
 
 // SearchRepositories creates a tool to search for GitHub repositories.
-func SearchRepositories(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Tool, mcp.ToolHandlerFor[map[string]any, any]) {
-	schema := &jsonschema.Schema{
-		Type: "object",
-		Properties: map[string]*jsonschema.Schema{
-			"query": {
-				Type:        "string",
-				Description: "Repository search query. Examples: 'machine learning in:name stars:>1000 language:python', 'topic:react', 'user:facebook'. Supports advanced search syntax for precise filtering.",
-			},
-			"sort": {
-				Type:        "string",
-				Description: "Sort repositories by field, defaults to best match",
-				Enum:        []any{"stars", "forks", "help-wanted-issues", "updated"},
-			},
-			"order": {
-				Type:        "string",
-				Description: "Sort order",
-				Enum:        []any{"asc", "desc"},
-			},
-			"minimal_output": {
-				Type:        "boolean",
-				Description: "Return minimal repository information (default: true). When false, returns full GitHub API repository objects.",
-				Default:     json.RawMessage(`true`),
-			},
-		},
-		Required: []string{"query"},
-	}
-	WithPagination(schema)
-
+func SearchRepositories(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Tool, mcp.ToolHandlerFor[SearchRepositoriesInput, any]) {
 	return mcp.Tool{
 			Name:        "search_repositories",
 			Description: t("TOOL_SEARCH_REPOSITORIES_DESCRIPTION", "Find GitHub repositories by name, description, readme, topics, or other metadata. Perfect for discovering projects, finding examples, or locating specific repositories across GitHub."),
 			Annotations: &mcp.ToolAnnotations{
 				Title:        t("TOOL_SEARCH_REPOSITORIES_USER_TITLE", "Search repositories"),
 				ReadOnlyHint: true,
 			},
-			InputSchema: schema,
+			InputSchema: SearchRepositoriesInput{}.MCPSchema(),
 		},
-		func(ctx context.Context, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
-			query, err := RequiredParam[string](args, "query")
-			if err != nil {
-				return utils.NewToolResultError(err.Error()), nil, nil
-			}
-			sort, err := OptionalParam[string](args, "sort")
-			if err != nil {
-				return utils.NewToolResultError(err.Error()), nil, nil
-			}
-			order, err := OptionalParam[string](args, "order")
-			if err != nil {
-				return utils.NewToolResultError(err.Error()), nil, nil
-			}
-			pagination, err := OptionalPaginationParams(args)
-			if err != nil {
-				return utils.NewToolResultError(err.Error()), nil, nil
-			}
-			minimalOutput, err := OptionalBoolParamWithDefault(args, "minimal_output", true)
-			if err != nil {
-				return utils.NewToolResultError(err.Error()), nil, nil
-			}
+		func(ctx context.Context, _ *mcp.CallToolRequest, input SearchRepositoriesInput) (*mcp.CallToolResult, any, error) {
 			opts := &github.SearchOptions{
-				Sort:  sort,
-				Order: order,
+				Sort:  input.Sort,
+				Order: input.Order,
 				ListOptions: github.ListOptions{
-					Page:    pagination.Page,
-					PerPage: pagination.PerPage,
+					Page:    input.Page,
+					PerPage: input.PerPage,
 				},
 			}
 
 			client, err := getClient(ctx)
 			if err != nil {
 				return utils.NewToolResultErrorFromErr("failed to get GitHub client", err), nil, nil
 			}
-			result, resp, err := client.Search.Repositories(ctx, query, opts)
+			result, resp, err := client.Search.Repositories(ctx, input.Query, opts)
 			if err != nil {
 				return ghErrors.NewGitHubAPIErrorResponse(ctx,
-					fmt.Sprintf("failed to search repositories with query '%s'", query),
+					fmt.Sprintf("failed to search repositories with query '%s'", input.Query),
 					resp,
 					err,
 				), nil, nil
@@ -107,7 +60,7 @@ func SearchRepositories(getClient GetClientFn, t translations.TranslationHelperF
 
 			// Return either minimal or full response based on parameter
 			var r []byte
-			if minimalOutput {
+			if input.MinimalOutput {
 				minimalRepos := make([]MinimalRepository, 0, len(result.Repositories))
 				for _, repo := range result.Repositories {
 					minimalRepo := MinimalRepository{

pkg/github/search_test.go

@@ -24,8 +24,9 @@ func Test_SearchRepositories(t *testing.T) {
 	assert.Equal(t, "search_repositories", tool.Name)
 	assert.NotEmpty(t, tool.Description)
 
-	schema, ok := tool.InputSchema.(*jsonschema.Schema)
-	require.True(t, ok, "InputSchema should be *jsonschema.Schema")
+	// Get schema from the input type's MCPSchema() method
+	schema := SearchRepositoriesInput{}.MCPSchema()
+	require.NotNil(t, schema, "MCPSchema should return a schema")
 	assert.Contains(t, schema.Properties, "query")
 	assert.Contains(t, schema.Properties, "sort")
 	assert.Contains(t, schema.Properties, "order")
@@ -60,7 +61,7 @@ func Test_SearchRepositories(t *testing.T) {
 	tests := []struct {
 		name           string
 		mockedClient   *http.Client
-		requestArgs    map[string]interface{}
+		input          SearchRepositoriesInput
 		expectError    bool
 		expectedResult *github.RepositoriesSearchResult
 		expectedErrMsg string
@@ -81,12 +82,12 @@ func Test_SearchRepositories(t *testing.T) {
 					),
 				),
 			),
-			requestArgs: map[string]interface{}{
-				"query":   "golang test",
-				"sort":    "stars",
-				"order":   "desc",
-				"page":    float64(2),
-				"perPage": float64(10),
+			input: SearchRepositoriesInput{
+				Query:   "golang test",
+				Sort:    "stars",
+				Order:   "desc",
+				Page:    2,
+				PerPage: 10,
 			},
 			expectError:    false,
 			expectedResult: mockSearchResult,
@@ -97,16 +98,14 @@ func Test_SearchRepositories(t *testing.T) {
 				mock.WithRequestMatchHandler(
 					mock.GetSearchRepositories,
 					expectQueryParams(t, map[string]string{
-						"q":        "golang test",
-						"page":     "1",
-						"per_page": "30",
+						"q": "golang test",
 					}).andThen(
 						mockResponse(t, http.StatusOK, mockSearchResult),
 					),
 				),
 			),
-			requestArgs: map[string]interface{}{
-				"query": "golang test",
+			input: SearchRepositoriesInput{
+				Query: "golang test",
 			},
 			expectError:    false,
 			expectedResult: mockSearchResult,
@@ -122,8 +121,8 @@ func Test_SearchRepositories(t *testing.T) {
 					}),
 				),
 			),
-			requestArgs: map[string]interface{}{
-				"query": "invalid:query",
+			input: SearchRepositoriesInput{
+				Query: "invalid:query",
 			},
 			expectError:    true,
 			expectedErrMsg: "failed to search repositories",
@@ -136,11 +135,8 @@ func Test_SearchRepositories(t *testing.T) {
 			client := github.NewClient(tc.mockedClient)
 			_, handler := SearchRepositories(stubGetClientFn(client), translations.NullTranslationHelper)
 
-			// Create call request
-			request := createMCPRequest(tc.requestArgs)
-
-			// Call handler
-			result, _, err := handler(context.Background(), &request, tc.requestArgs)
+			// Call handler with typed input
+			result, _, err := handler(context.Background(), nil, tc.input)
 
 			// Verify results
 			if tc.expectError {
@@ -195,9 +191,7 @@ func Test_SearchRepositories_FullOutput(t *testing.T) {
 		mock.WithRequestMatchHandler(
 			mock.GetSearchRepositories,
 			expectQueryParams(t, map[string]string{
-				"q":        "golang test",
-				"page":     "1",
-				"per_page": "30",
+				"q": "golang test",
 			}).andThen(
 				mockResponse(t, http.StatusOK, mockSearchResult),
 			),
@@ -207,14 +201,12 @@ func Test_SearchRepositories_FullOutput(t *testing.T) {
 	client := github.NewClient(mockedClient)
 	_, handlerTest := SearchRepositories(stubGetClientFn(client), translations.NullTranslationHelper)
 
-	args := map[string]interface{}{
-		"query":          "golang test",
-		"minimal_output": false,
+	input := SearchRepositoriesInput{
+		Query:         "golang test",
+		MinimalOutput: false,
 	}
 
-	request := createMCPRequest(args)
-
-	result, _, err := handlerTest(context.Background(), &request, args)
+	result, _, err := handlerTest(context.Background(), nil, input)
 
 	require.NoError(t, err)
 	require.False(t, result.IsError)