use new getClient function inadd and reply pr review tools

Author: juruen

github-mcp-server

@@ -645,7 +645,7 @@ func GetPullRequestComments(getClient GetClientFn, t translations.TranslationHel
 }
 
 // AddPullRequestReviewComment creates a tool to add a review comment to a pull request.
-func AddPullRequestReviewComment(client *github.Client, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
+func AddPullRequestReviewComment(getClient GetClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
 	return mcp.NewTool("add_pull_request_review_comment",
 			mcp.WithDescription(t("TOOL_ADD_PULL_REQUEST_COMMENT_DESCRIPTION", "Add a review comment to a pull request")),
 			mcp.WithString("owner",
@@ -770,6 +770,11 @@ func AddPullRequestReviewComment(client *github.Client, t translations.Translati
 				}
 			}
 
+			client, err := getClient(ctx)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get GitHub client: %w", err)
+			}
+
 			createdComment, resp, err := client.PullRequests.CreateComment(ctx, owner, repo, pullNumber, comment)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create pull request comment: %w", err)
@@ -794,7 +799,7 @@ 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,
+func ReplyToPullRequestReviewComment(getClient GetClientFn, 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")),
@@ -841,6 +846,11 @@ func ReplyToPullRequestReviewComment(client *github.Client, t translations.Trans
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
+			client, err := getClient(ctx)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get GitHub client: %w", err)
+			}
+
 			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)

pkg/github/pullrequests.go

@@ -1722,7 +1722,7 @@ func Test_CreatePullRequest(t *testing.T) {
 
 func Test_AddPullRequestReviewComment(t *testing.T) {
 	mockClient := github.NewClient(nil)
-	tool, _ := AddPullRequestReviewComment(mockClient, translations.NullTranslationHelper)
+	tool, _ := AddPullRequestReviewComment(stubGetClientFn(mockClient), translations.NullTranslationHelper)
 
 	assert.Equal(t, "add_pull_request_review_comment", tool.Name)
 	assert.NotEmpty(t, tool.Description)
@@ -1808,7 +1808,7 @@ func Test_AddPullRequestReviewComment(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			mockClient := github.NewClient(tc.mockedClient)
 
-			_, handler := AddPullRequestReviewComment(mockClient, translations.NullTranslationHelper)
+			_, handler := AddPullRequestReviewComment(stubGetClientFn(mockClient), translations.NullTranslationHelper)
 
 			request := createMCPRequest(tc.requestArgs)
 
@@ -1840,7 +1840,7 @@ 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)
+	tool, _ := ReplyToPullRequestReviewComment(stubGetClientFn(mockClient), translations.NullTranslationHelper)
 
 	assert.Equal(t, "reply_to_pull_request_review_comment", tool.Name)
 	assert.NotEmpty(t, tool.Description)
@@ -1918,7 +1918,7 @@ func Test_ReplyToPullRequestReviewComment(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			mockClient := github.NewClient(tc.mockedClient)
 
-			_, handler := ReplyToPullRequestReviewComment(mockClient, translations.NullTranslationHelper)
+			_, handler := ReplyToPullRequestReviewComment(stubGetClientFn(mockClient), translations.NullTranslationHelper)
 
 			request := createMCPRequest(tc.requestArgs)
 

pkg/github/pullrequests_test.go

@@ -51,13 +51,13 @@ func NewServer(getClient GetClientFn, version string, readOnly bool, t translati
 	s.AddTool(GetPullRequestComments(getClient, t))
 	s.AddTool(GetPullRequestReviews(getClient, t))
 	if !readOnly {
-		s.AddTool(MergePullRequest(client, t))
-		s.AddTool(UpdatePullRequestBranch(client, t))
-		s.AddTool(CreatePullRequestReview(client, t))
-		s.AddTool(CreatePullRequest(client, t))
+		s.AddTool(MergePullRequest(getClient, t))
+		s.AddTool(UpdatePullRequestBranch(getClient, t))
+		s.AddTool(CreatePullRequestReview(getClient, t))
+		s.AddTool(CreatePullRequest(getClient, t))
 		s.AddTool(UpdatePullRequest(getClient, t))
-		s.AddTool(AddPullRequestReviewComment(client, t))
-		s.AddTool(ReplyToPullRequestReviewComment(client, t))
+		s.AddTool(AddPullRequestReviewComment(getClient, t))
+		s.AddTool(ReplyToPullRequestReviewComment(getClient, t))
 	}
 
 	// Add GitHub tools - Repositories