Conform list tools

Author: williammartin

README.md

@@ -150,7 +150,7 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `direction`: Sort direction ('asc', 'desc') (string, optional)
   - `since`: Filter by date (ISO 8601 timestamp) (string, optional)
   - `page`: Page number (number, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
 
 - **update_issue** - Update an existing issue in a GitHub repository
 
@@ -177,7 +177,7 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
 
 - **list_pull_requests** - List and filter repository pull requests
 
@@ -186,14 +186,14 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `state`: PR state (string, optional)
   - `sort`: Sort field (string, optional)
   - `direction`: Sort direction (string, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
   - `page`: Page number (number, optional)
 
 - **merge_pull_request** - Merge a pull request
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
   - `commit_title`: Title for the merge commit (string, optional)
   - `commit_message`: Message for the merge commit (string, optional)
   - `merge_method`: Merge method (string, optional)
@@ -202,41 +202,41 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
 
 - **get_pull_request_status** - Get the combined status of all status checks for a pull request
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
 
 - **update_pull_request_branch** - Update a pull request branch with the latest changes from the base branch
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
-  - `expected_head_sha`: The expected SHA of the pull request's HEAD ref (string, optional)
+  - `pullNumber`: Pull request number (number, required)
+  - `expectedHeadSha`: The expected SHA of the pull request's HEAD ref (string, optional)
 
 - **get_pull_request_comments** - Get the review comments on a pull request
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
 
 - **get_pull_request_reviews** - Get the reviews on a pull request
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
 
 - **create_pull_request_review** - Create a review on a pull request review
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `pull_number`: Pull request number (number, required)
+  - `pullNumber`: Pull request number (number, required)
   - `body`: Review comment text (string, optional)
   - `event`: Review action ('APPROVE', 'REQUEST_CHANGES', 'COMMENT') (string, required)
-  - `commit_id`: SHA of commit to review (string, optional)
+  - `commitId`: SHA of commit to review (string, optional)
   - `comments`: Line-specific comments array of objects, each object with path (string), position (number), and body (string) (array, optional)
 
 - **create_pull_request** - Create a new pull request
@@ -276,14 +276,14 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `sort`: Sort field (string, optional)
   - `order`: Sort order (string, optional)
   - `page`: Page number (number, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
 
 - **create_repository** - Create a new GitHub repository
 
   - `name`: Repository name (string, required)
   - `description`: Repository description (string, optional)
   - `private`: Whether the repository is private (boolean, optional)
-  - `auto_init`: Auto-initialize with README (boolean, optional)
+  - `autoInit`: Auto-initialize with README (boolean, optional)
 
 - **get_file_contents** - Get contents of a file or directory
 
@@ -311,7 +311,7 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `sha`: Branch name, tag, or commit SHA (string, optional)
   - `path`: Only commits containing this file path (string, optional)
   - `page`: Page number (number, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
 
 ### Search
 
@@ -321,22 +321,22 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `sort`: Sort field (string, optional)
   - `order`: Sort order (string, optional)
   - `page`: Page number (number, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
 
 - **search_users** - Search for GitHub users
   - `query`: Search query (string, required)
   - `sort`: Sort field (string, optional)
   - `order`: Sort order (string, optional)
   - `page`: Page number (number, optional)
-  - `per_page`: Results per page (number, optional)
+  - `perPage`: Results per page (number, optional)
 
 ### Code Scanning
 
 - **get_code_scanning_alert** - Get a code scanning alert
 
   - `owner`: Repository owner (string, required)
   - `repo`: Repository name (string, required)
-  - `alert_number`: Alert number (number, required)
+  - `alertNumber`: Alert number (number, required)
 
 - **list_code_scanning_alerts** - List code scanning alerts for a repository
   - `owner`: Repository owner (string, required)
@@ -391,11 +391,11 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
 - **Get Repository Content for a Specific Pull Request**
   Retrieves the content of a repository at a specific path for a given pull request.
 
-  - **Template**: `repo://{owner}/{repo}/refs/pull/{pr_number}/head/contents{/path*}`
+  - **Template**: `repo://{owner}/{repo}/refs/pull/{prNumber}/head/contents{/path*}`
   - **Parameters**:
     - `owner`: Repository owner (string, required)
     - `repo`: Repository name (string, required)
-    - `pr_number`: Pull request number (string, required)
+    - `prNumber`: Pull request number (string, required)
     - `path`: File or directory path (string, optional)
 
 ## License

cmd/mcpcurl/README.md

@@ -72,7 +72,7 @@ Use "mcpcurl tools [command] --help" for more information about a command.
 Get help for a specific tool:
 
 ```bash
- % ./mcpcurl --stdio-server-cmd "docker run -i --rm -e GITHUB_PERSONAL_ACCESS_TOKEN mcp/github" tools get_issue --help                                   
+ % ./mcpcurl --stdio-server-cmd "docker run -i --rm -e GITHUB_PERSONAL_ACCESS_TOKEN mcp/github" tools get_issue --help
 Get details of a specific issue in a GitHub repository.
 
 Usage:

conformance/conformance_test.go

@@ -6,6 +6,7 @@ import (
 	"bufio"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -17,6 +18,8 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 )
 
@@ -230,6 +233,69 @@ func diffNonNilFields(a, b interface{}, path string) string {
 	return sb.String()
 }
 
+func TestListTools(t *testing.T) {
+	anthropicServer := start(t, anthropic)
+	githubServer := start(t, github)
+
+	req := listToolsRequest{
+		JSONRPC: "2.0",
+		ID:      1,
+		Method:  "tools/list",
+	}
+
+	require.NoError(t, anthropicServer.send(req))
+
+	var anthropicListToolsResponse listToolsResponse
+	require.NoError(t, anthropicServer.receive(&anthropicListToolsResponse))
+
+	require.NoError(t, githubServer.send(req))
+
+	var ghListToolsResponse listToolsResponse
+	require.NoError(t, githubServer.receive(&ghListToolsResponse))
+
+	require.NoError(t, isToolListSubset(anthropicListToolsResponse.Result, ghListToolsResponse.Result), "expected the github list tools response to be a subset of the anthropic list tools response")
+}
+
+func isToolListSubset(subset, superset listToolsResult) error {
+	// Build a map from tool name to Tool from the superset
+	supersetMap := make(map[string]tool)
+	for _, tool := range superset.Tools {
+		supersetMap[tool.Name] = tool
+	}
+
+	var err error
+	for _, tool := range subset.Tools {
+		sup, ok := supersetMap[tool.Name]
+		if !ok {
+			return fmt.Errorf("tool %q not found in superset", tool.Name)
+		}
+
+		// Intentionally ignore the description fields because there are lots of slight differences.
+		// if tool.Description != sup.Description {
+		// 	return fmt.Errorf("description mismatch for tool %q, got %q expected %q", tool.Name, tool.Description, sup.Description)
+		// }
+
+		// Ignore any description fields within the input schema properties for the same reason
+		ignoreDescOpt := cmp.FilterPath(func(p cmp.Path) bool {
+			// Look for a field named "Properties" somewhere in the path
+			for _, ps := range p {
+				if sf, ok := ps.(cmp.StructField); ok && sf.Name() == "Properties" {
+					return true
+				}
+			}
+			return false
+		}, cmpopts.IgnoreMapEntries(func(k string, _ any) bool {
+			return k == "description"
+		}))
+
+		if diff := cmp.Diff(tool.InputSchema, sup.InputSchema, ignoreDescOpt); diff != "" {
+			err = errors.Join(err, fmt.Errorf("inputSchema mismatch for tool %q:\n%s", tool.Name, diff))
+		}
+	}
+
+	return err
+}
+
 type serverStartResult struct {
 	server server
 	err    error
@@ -348,3 +414,22 @@ type serverInfo struct {
 	Name    string `json:"name"`
 	Version string `json:"version"`
 }
+
+type listToolsRequest = jsonRPRCRequest[struct{}]
+
+type listToolsResponse = jsonRPRCResponse[listToolsResult]
+
+type listToolsResult struct {
+	Tools []tool `json:"tools"`
+}
+type tool struct {
+	Name        string      `json:"name"`
+	Description string      `json:"description,omitempty"`
+	InputSchema inputSchema `json:"inputSchema"`
+}
+
+type inputSchema struct {
+	Type       string         `json:"type"`
+	Properties map[string]any `json:"properties,omitempty"`
+	Required   []string       `json:"required,omitempty"`
+}

go.mod

@@ -5,6 +5,7 @@ go 1.23.7
 require (
 	github.com/aws/smithy-go v1.22.3
 	github.com/docker/docker v28.0.4+incompatible
+	github.com/google/go-cmp v0.7.0
 	github.com/google/go-github/v69 v69.2.0
 	github.com/mark3labs/mcp-go v0.18.0
 	github.com/migueleliasweb/go-github-mock v1.1.0

pkg/github/code_scanning.go

@@ -24,7 +24,7 @@ func getCodeScanningAlert(client *github.Client, t translations.TranslationHelpe
 				mcp.Required(),
 				mcp.Description("The name of the repository."),
 			),
-			mcp.WithNumber("alert_number",
+			mcp.WithNumber("alertNumber",
 				mcp.Required(),
 				mcp.Description("The number of the alert."),
 			),
@@ -38,7 +38,7 @@ func getCodeScanningAlert(client *github.Client, t translations.TranslationHelpe
 			if err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
-			alertNumber, err := requiredInt(request, "alert_number")
+			alertNumber, err := requiredInt(request, "alertNumber")
 			if err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}

pkg/github/code_scanning_test.go

@@ -22,8 +22,8 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 	assert.NotEmpty(t, tool.Description)
 	assert.Contains(t, tool.InputSchema.Properties, "owner")
 	assert.Contains(t, tool.InputSchema.Properties, "repo")
-	assert.Contains(t, tool.InputSchema.Properties, "alert_number")
-	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "alert_number"})
+	assert.Contains(t, tool.InputSchema.Properties, "alertNumber")
+	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "alertNumber"})
 
 	// Setup mock alert for success case
 	mockAlert := &github.Alert{
@@ -50,9 +50,9 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 				),
 			),
 			requestArgs: map[string]interface{}{
-				"owner":        "owner",
-				"repo":         "repo",
-				"alert_number": float64(42),
+				"owner":       "owner",
+				"repo":        "repo",
+				"alertNumber": float64(42),
 			},
 			expectError:   false,
 			expectedAlert: mockAlert,
@@ -69,9 +69,9 @@ func Test_GetCodeScanningAlert(t *testing.T) {
 				),
 			),
 			requestArgs: map[string]interface{}{
-				"owner":        "owner",
-				"repo":         "repo",
-				"alert_number": float64(9999),
+				"owner":       "owner",
+				"repo":        "repo",
+				"alertNumber": float64(9999),
 			},
 			expectError:    true,
 			expectedErrMsg: "failed to get alert",