Add reply_to_pull_request_review_comment tool

ashwin-ant · claude · ashwin-ant · commit fb384b652a17 · 2025-04-06T16:26:31.000-07:00
Adds a new tool to reply to existing pull request review comments using the GitHub API's comment reply endpoint. This allows for threaded discussions on pull request reviews. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/pkg/github/pullrequests.go b/pkg/github/pullrequests.go
@@ -658,6 +658,77 @@ func addPullRequestReviewComment(client *github.Client, t translations.Translati
 		}
 }
 
+// replyToPullRequestReviewComment creates a tool to reply to an existing review comment on a pull request.
+func replyToPullRequestReviewComment(client *github.Client, t translations.TranslationHelperFunc) (tool mcp.Tool,
+	handler server.ToolHandlerFunc) {
+	return mcp.NewTool("reply_to_pull_request_review_comment",
+			mcp.WithDescription(t("TOOL_REPLY_TO_PULL_REQUEST_REVIEW_COMMENT_DESCRIPTION", "Reply to an existing review comment on a pull request")),
+			mcp.WithString("owner",
+				mcp.Required(),
+				mcp.Description("Repository owner"),
+			),
+			mcp.WithString("repo",
+				mcp.Required(),
+				mcp.Description("Repository name"),
+			),
+			mcp.WithNumber("pull_number",
+				mcp.Required(),
+				mcp.Description("Pull request number"),
+			),
+			mcp.WithNumber("comment_id",
+				mcp.Required(),
+				mcp.Description("The unique identifier of the comment to reply to"),
+			),
+			mcp.WithString("body",
+				mcp.Required(),
+				mcp.Description("The text of the reply comment"),
+			),
+		),
+		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+			owner, err := requiredParam[string](request, "owner")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			repo, err := requiredParam[string](request, "repo")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			pullNumber, err := requiredInt(request, "pull_number")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			commentID, err := requiredInt(request, "comment_id")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			body, err := requiredParam[string](request, "body")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+
+			createdReply, resp, err := client.PullRequests.CreateCommentInReplyTo(ctx, owner, repo, pullNumber, body, int64(commentID))
+			if err != nil {
+				return nil, fmt.Errorf("failed to reply to pull request comment: %w", err)
+			}
+			defer func() { _ = resp.Body.Close() }()
+
+			if resp.StatusCode != http.StatusCreated {
+				body, err := io.ReadAll(resp.Body)
+				if err != nil {
+					return nil, fmt.Errorf("failed to read response body: %w", err)
+				}
+				return mcp.NewToolResultError(fmt.Sprintf("failed to reply to pull request comment: %s", string(body))), nil
+			}
+
+			r, err := json.Marshal(createdReply)
+			if err != nil {
+				return nil, fmt.Errorf("failed to marshal response: %w", err)
+			}
+
+			return mcp.NewToolResultText(string(r)), nil
+		}
+}
+
 // getPullRequestReviews creates a tool to get the reviews on a pull request.
 func getPullRequestReviews(client *github.Client, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
 	return mcp.NewTool("get_pull_request_reviews",
diff --git a/pkg/github/pullrequests_test.go b/pkg/github/pullrequests_test.go
@@ -1505,3 +1505,106 @@ func Test_AddPullRequestReviewComment(t *testing.T) {
 		})
 	}
 }
+
+func Test_ReplyToPullRequestReviewComment(t *testing.T) {
+	// Verify tool definition once
+	mockClient := github.NewClient(nil)
+	tool, _ := replyToPullRequestReviewComment(mockClient, translations.NullTranslationHelper)
+
+	assert.Equal(t, "reply_to_pull_request_review_comment", tool.Name)
+	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, "pull_number")
+	assert.Contains(t, tool.InputSchema.Properties, "comment_id")
+	assert.Contains(t, tool.InputSchema.Properties, "body")
+	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "pull_number", "comment_id", "body"})
+
+	// Setup mock PR comment for success case
+	mockReply := &github.PullRequestComment{
+		ID:   github.Ptr(int64(456)),
+		Body: github.Ptr("Good point, will fix!"),
+	}
+
+	tests := []struct {
+		name           string
+		mockedClient   *http.Client
+		requestArgs    map[string]interface{}
+		expectError    bool
+		expectedReply  *github.PullRequestComment
+		expectedErrMsg string
+	}{
+		{
+			name: "successful reply creation",
+			mockedClient: mock.NewMockedHTTPClient(
+				mock.WithRequestMatchHandler(
+					mock.PostReposPullsCommentsByOwnerByRepoByPullNumber,
+					http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+						w.WriteHeader(http.StatusCreated)
+						json.NewEncoder(w).Encode(mockReply)
+					}),
+				),
+			),
+			requestArgs: map[string]interface{}{
+				"owner":       "owner",
+				"repo":        "repo",
+				"pull_number": float64(1),
+				"comment_id":  float64(123),
+				"body":        "Good point, will fix!",
+			},
+			expectError:   false,
+			expectedReply: mockReply,
+		},
+		{
+			name: "reply creation fails",
+			mockedClient: mock.NewMockedHTTPClient(
+				mock.WithRequestMatchHandler(
+					mock.PostReposPullsCommentsByOwnerByRepoByPullNumber,
+					http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+						w.WriteHeader(http.StatusNotFound)
+						w.Header().Set("Content-Type", "application/json")
+						_, _ = w.Write([]byte(`{"message": "Comment not found"}`))
+					}),
+				),
+			),
+			requestArgs: map[string]interface{}{
+				"owner":       "owner",
+				"repo":        "repo",
+				"pull_number": float64(1),
+				"comment_id":  float64(999),
+				"body":        "Good point, will fix!",
+			},
+			expectError:    true,
+			expectedErrMsg: "failed to reply to pull request comment",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			mockClient := github.NewClient(tc.mockedClient)
+
+			_, handler := replyToPullRequestReviewComment(mockClient, translations.NullTranslationHelper)
+
+			request := createMCPRequest(tc.requestArgs)
+
+			result, err := handler(context.Background(), request)
+
+			if tc.name == "reply creation fails" {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), tc.expectedErrMsg)
+				return
+			}
+
+			require.NoError(t, err)
+			assert.NotNil(t, result)
+			require.Len(t, result.Content, 1)
+
+			var returnedReply github.PullRequestComment
+			err = json.Unmarshal([]byte(getTextResult(t, result).Text), &returnedReply)
+			require.NoError(t, err)
+
+			assert.Equal(t, *tc.expectedReply.ID, *returnedReply.ID)
+			assert.Equal(t, *tc.expectedReply.Body, *returnedReply.Body)
+		})
+	}
+}
diff --git a/pkg/github/server.go b/pkg/github/server.go
@@ -54,6 +54,7 @@ func NewServer(client *github.Client, readOnly bool, t translations.TranslationH
 		s.AddTool(createPullRequestReview(client, t))
 		s.AddTool(createPullRequest(client, t))
 		s.AddTool(addPullRequestReviewComment(client, t))
+		s.AddTool(replyToPullRequestReviewComment(client, t))
 	}
 
 	// Add GitHub tools - Repositories

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func NewServer(client *github.Client, readOnly bool, t translations.TranslationH`
`54`	`54`	`s.AddTool(createPullRequestReview(client, t))`
`55`	`55`	`s.AddTool(createPullRequest(client, t))`
`56`	`56`	`s.AddTool(addPullRequestReviewComment(client, t))`
	`57`	`+ s.AddTool(replyToPullRequestReviewComment(client, t))`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`// Add GitHub tools - Repositories`