Merge branch 'main' into cross-platform-licences

Author: SamMorrowDrums

README.md

@@ -284,7 +284,6 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
   - `description`: Repository description (string, optional)
   - `private`: Whether the repository is private (boolean, optional)
   - `auto_init`: Auto-initialize with README (boolean, optional)
-  - `gitignore_template`: Gitignore template name (string, optional)
 
 - **get_file_contents** - Get contents of a file or directory
 

pkg/github/issues.go

@@ -261,6 +261,9 @@ func createIssue(client *github.Client, t translations.TranslationHelperFunc) (t
 					},
 				),
 			),
+			mcp.WithNumber("milestone",
+				mcp.Description("Milestone number"),
+			),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			owner, err := requiredParam[string](request, "owner")
@@ -294,12 +297,24 @@ func createIssue(client *github.Client, t translations.TranslationHelperFunc) (t
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
+			// Get optional milestone
+			milestone, err := optionalIntParam(request, "milestone")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+
+			var milestoneNum *int
+			if milestone != 0 {
+				milestoneNum = &milestone
+			}
+
 			// Create the issue request
 			issueRequest := &github.IssueRequest{
 				Title:     github.Ptr(title),
 				Body:      github.Ptr(body),
 				Assignees: &assignees,
 				Labels:    &labels,
+				Milestone: milestoneNum,
 			}
 
 			issue, resp, err := client.Issues.Create(ctx, owner, repo, issueRequest)

pkg/github/issues_test.go

@@ -392,6 +392,7 @@ func Test_CreateIssue(t *testing.T) {
 	assert.Contains(t, tool.InputSchema.Properties, "body")
 	assert.Contains(t, tool.InputSchema.Properties, "assignees")
 	assert.Contains(t, tool.InputSchema.Properties, "labels")
+	assert.Contains(t, tool.InputSchema.Properties, "milestone")
 	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "title"})
 
 	// Setup mock issue for success case
@@ -403,6 +404,7 @@ func Test_CreateIssue(t *testing.T) {
 		HTMLURL:   github.Ptr("https://github.com/owner/repo/issues/123"),
 		Assignees: []*github.User{{Login: github.Ptr("user1")}, {Login: github.Ptr("user2")}},
 		Labels:    []*github.Label{{Name: github.Ptr("bug")}, {Name: github.Ptr("help wanted")}},
+		Milestone: &github.Milestone{Number: github.Ptr(5)},
 	}
 
 	tests := []struct {
@@ -423,6 +425,7 @@ func Test_CreateIssue(t *testing.T) {
 						"body":      "This is a test issue",
 						"labels":    []any{"bug", "help wanted"},
 						"assignees": []any{"user1", "user2"},
+						"milestone": float64(5),
 					}).andThen(
 						mockResponse(t, http.StatusCreated, mockIssue),
 					),
@@ -435,6 +438,7 @@ func Test_CreateIssue(t *testing.T) {
 				"body":      "This is a test issue",
 				"assignees": []string{"user1", "user2"},
 				"labels":    []string{"bug", "help wanted"},
+				"milestone": float64(5),
 			},
 			expectError:   false,
 			expectedIssue: mockIssue,

pkg/github/pullrequests_test.go

@@ -171,9 +171,17 @@ func Test_ListPullRequests(t *testing.T) {
 		{
 			name: "successful PRs listing",
 			mockedClient: mock.NewMockedHTTPClient(
-				mock.WithRequestMatch(
+				mock.WithRequestMatchHandler(
 					mock.GetReposPullsByOwnerByRepo,
-					mockPRs,
+					expectQueryParams(t, map[string]string{
+						"state":     "all",
+						"sort":      "created",
+						"direction": "desc",
+						"per_page":  "30",
+						"page":      "1",
+					}).andThen(
+						mockResponse(t, http.StatusOK, mockPRs),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -281,9 +289,15 @@ func Test_MergePullRequest(t *testing.T) {
 		{
 			name: "successful merge",
 			mockedClient: mock.NewMockedHTTPClient(
-				mock.WithRequestMatch(
+				mock.WithRequestMatchHandler(
 					mock.PutReposPullsMergeByOwnerByRepoByPullNumber,
-					mockMergeResult,
+					expectRequestBody(t, map[string]interface{}{
+						"commit_title":   "Merge PR #42",
+						"commit_message": "Merging awesome feature",
+						"merge_method":   "squash",
+					}).andThen(
+						mockResponse(t, http.StatusOK, mockMergeResult),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -662,7 +676,11 @@ func Test_UpdatePullRequestBranch(t *testing.T) {
 			mockedClient: mock.NewMockedHTTPClient(
 				mock.WithRequestMatchHandler(
 					mock.PutReposPullsUpdateBranchByOwnerByRepoByPullNumber,
-					mockResponse(t, http.StatusAccepted, mockUpdateResult),
+					expectRequestBody(t, map[string]interface{}{
+						"expected_head_sha": "abcd1234",
+					}).andThen(
+						mockResponse(t, http.StatusAccepted, mockUpdateResult),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -679,7 +697,9 @@ func Test_UpdatePullRequestBranch(t *testing.T) {
 			mockedClient: mock.NewMockedHTTPClient(
 				mock.WithRequestMatchHandler(
 					mock.PutReposPullsUpdateBranchByOwnerByRepoByPullNumber,
-					mockResponse(t, http.StatusAccepted, mockUpdateResult),
+					expectRequestBody(t, map[string]interface{}{}).andThen(
+						mockResponse(t, http.StatusAccepted, mockUpdateResult),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -1030,9 +1050,14 @@ func Test_CreatePullRequestReview(t *testing.T) {
 		{
 			name: "successful review creation with body only",
 			mockedClient: mock.NewMockedHTTPClient(
-				mock.WithRequestMatch(
+				mock.WithRequestMatchHandler(
 					mock.PostReposPullsReviewsByOwnerByRepoByPullNumber,
-					mockReview,
+					expectRequestBody(t, map[string]interface{}{
+						"body":  "Looks good!",
+						"event": "APPROVE",
+					}).andThen(
+						mockResponse(t, http.StatusOK, mockReview),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -1048,9 +1073,15 @@ func Test_CreatePullRequestReview(t *testing.T) {
 		{
 			name: "successful review creation with commit_id",
 			mockedClient: mock.NewMockedHTTPClient(
-				mock.WithRequestMatch(
+				mock.WithRequestMatchHandler(
 					mock.PostReposPullsReviewsByOwnerByRepoByPullNumber,
-					mockReview,
+					expectRequestBody(t, map[string]interface{}{
+						"body":      "Looks good!",
+						"event":     "APPROVE",
+						"commit_id": "abcdef123456",
+					}).andThen(
+						mockResponse(t, http.StatusOK, mockReview),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -1067,9 +1098,26 @@ func Test_CreatePullRequestReview(t *testing.T) {
 		{
 			name: "successful review creation with comments",
 			mockedClient: mock.NewMockedHTTPClient(
-				mock.WithRequestMatch(
+				mock.WithRequestMatchHandler(
 					mock.PostReposPullsReviewsByOwnerByRepoByPullNumber,
-					mockReview,
+					expectRequestBody(t, map[string]interface{}{
+						"body":  "Some issues to fix",
+						"event": "REQUEST_CHANGES",
+						"comments": []interface{}{
+							map[string]interface{}{
+								"path":     "file1.go",
+								"position": float64(10),
+								"body":     "This needs to be fixed",
+							},
+							map[string]interface{}{
+								"path":     "file2.go",
+								"position": float64(20),
+								"body":     "Consider a different approach here",
+							},
+						},
+					}).andThen(
+						mockResponse(t, http.StatusOK, mockReview),
+					),
 				),
 			),
 			requestArgs: map[string]interface{}{
@@ -1240,10 +1288,18 @@ func Test_CreatePullRequest(t *testing.T) {
 			mockedClient: mock.NewMockedHTTPClient(
 				mock.WithRequestMatchHandler(
 					mock.PostReposPullsByOwnerByRepo,
-					mockResponse(t, http.StatusCreated, mockPR),
+					expectRequestBody(t, map[string]interface{}{
+						"title":                 "Test PR",
+						"body":                  "This is a test PR",
+						"head":                  "feature-branch",
+						"base":                  "main",
+						"draft":                 false,
+						"maintainer_can_modify": true,
+					}).andThen(
+						mockResponse(t, http.StatusCreated, mockPR),
+					),
 				),
 			),
-
 			requestArgs: map[string]interface{}{
 				"owner":                 "owner",
 				"repo":                  "repo",