fix: address review feedback on granular toolsets

- Fix translation keys to use ALL_CAPS convention (strings.ToUpper)
- Fix assignees/labels clearing: check key presence instead of len==0
- Extract AddCommentToPendingReviewCall helper to deduplicate GraphQL
  logic between consolidated and granular tools
- Add missing granular tools: resolve_review_thread, unresolve_review_thread
  (were in pull_request_review_write but had no granular replacements)
- Add handler tests for new resolve/unresolve tools

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

Author: SamMorrowDrums

pkg/github/__toolsnaps__/resolve_review_thread.snap

@@ -0,0 +1,21 @@
+{
+  "annotations": {
+    "destructiveHint": false,
+    "openWorldHint": true,
+    "title": "Resolve Review Thread"
+  },
+  "description": "Resolve a review thread on a pull request. Resolving an already-resolved thread is a no-op.",
+  "inputSchema": {
+    "properties": {
+      "threadID": {
+        "description": "The node ID of the review thread to resolve (e.g., PRRT_kwDOxxx)",
+        "type": "string"
+      }
+    },
+    "required": [
+      "threadID"
+    ],
+    "type": "object"
+  },
+  "name": "resolve_review_thread"
+}

pkg/github/__toolsnaps__/unresolve_review_thread.snap

@@ -0,0 +1,21 @@
+{
+  "annotations": {
+    "destructiveHint": false,
+    "openWorldHint": true,
+    "title": "Unresolve Review Thread"
+  },
+  "description": "Unresolve a previously resolved review thread on a pull request. Unresolving an already-unresolved thread is a no-op.",
+  "inputSchema": {
+    "properties": {
+      "threadID": {
+        "description": "The node ID of the review thread to unresolve (e.g., PRRT_kwDOxxx)",
+        "type": "string"
+      }
+    },
+    "required": [
+      "threadID"
+    ],
+    "type": "object"
+  },
+  "name": "unresolve_review_thread"
+}

pkg/github/granular_tools_test.go

@@ -48,6 +48,8 @@ func TestGranularToolSnaps(t *testing.T) {
 		GranularSubmitPendingPullRequestReview,
 		GranularDeletePendingPullRequestReview,
 		GranularAddPullRequestReviewComment,
+		GranularResolveReviewThread,
+		GranularUnresolveReviewThread,
 	}
 
 	for _, constructor := range toolConstructors {
@@ -112,6 +114,8 @@ func TestPullRequestsGranularToolset(t *testing.T) {
 			"submit_pending_pull_request_review",
 			"delete_pending_pull_request_review",
 			"add_pull_request_review_comment",
+			"resolve_review_thread",
+			"unresolve_review_thread",
 		}
 		for _, name := range expected {
 			assert.Contains(t, toolNames, name)
@@ -700,3 +704,73 @@ func TestGranularAddPullRequestReviewComment(t *testing.T) {
 	require.NoError(t, err)
 	assert.False(t, result.IsError)
 }
+
+func TestGranularResolveReviewThread(t *testing.T) {
+	mockedClient := githubv4mock.NewMockedHTTPClient(
+		githubv4mock.NewMutationMatcher(
+			struct {
+				ResolveReviewThread struct {
+					Thread struct {
+						ID         githubv4.ID
+						IsResolved githubv4.Boolean
+					}
+				} `graphql:"resolveReviewThread(input: $input)"`
+			}{},
+			githubv4.ResolveReviewThreadInput{
+				ThreadID: githubv4.ID("PRRT_123"),
+			},
+			nil,
+			githubv4mock.DataResponse(map[string]any{
+				"resolveReviewThread": map[string]any{
+					"thread": map[string]any{"id": "PRRT_123", "isResolved": true},
+				},
+			}),
+		),
+	)
+	gqlClient := githubv4.NewClient(mockedClient)
+	deps := BaseDeps{GQLClient: gqlClient}
+	serverTool := GranularResolveReviewThread(translations.NullTranslationHelper)
+	handler := serverTool.Handler(deps)
+
+	request := createMCPRequest(map[string]any{
+		"threadID": "PRRT_123",
+	})
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	assert.False(t, result.IsError)
+}
+
+func TestGranularUnresolveReviewThread(t *testing.T) {
+	mockedClient := githubv4mock.NewMockedHTTPClient(
+		githubv4mock.NewMutationMatcher(
+			struct {
+				UnresolveReviewThread struct {
+					Thread struct {
+						ID         githubv4.ID
+						IsResolved githubv4.Boolean
+					}
+				} `graphql:"unresolveReviewThread(input: $input)"`
+			}{},
+			githubv4.UnresolveReviewThreadInput{
+				ThreadID: githubv4.ID("PRRT_123"),
+			},
+			nil,
+			githubv4mock.DataResponse(map[string]any{
+				"unresolveReviewThread": map[string]any{
+					"thread": map[string]any{"id": "PRRT_123", "isResolved": false},
+				},
+			}),
+		),
+	)
+	gqlClient := githubv4.NewClient(mockedClient)
+	deps := BaseDeps{GQLClient: gqlClient}
+	serverTool := GranularUnresolveReviewThread(translations.NullTranslationHelper)
+	handler := serverTool.Handler(deps)
+
+	request := createMCPRequest(map[string]any{
+		"threadID": "PRRT_123",
+	})
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	assert.False(t, result.IsError)
+}

pkg/github/issues_granular.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"maps"
+	"strings"
 
 	ghErrors "github.com/github/github-mcp-server/pkg/errors"
 	"github.com/github/github-mcp-server/pkg/inventory"
@@ -47,9 +48,9 @@ func issueUpdateTool(
 		ToolsetMetadataIssues,
 		mcp.Tool{
 			Name:        name,
-			Description: t("TOOL_"+name+"_DESCRIPTION", description),
+			Description: t("TOOL_"+strings.ToUpper(name)+"_DESCRIPTION", description),
 			Annotations: &mcp.ToolAnnotations{
-				Title:           t("TOOL_"+name+"_USER_TITLE", title),
+				Title:           t("TOOL_"+strings.ToUpper(name)+"_USER_TITLE", title),
 				ReadOnlyHint:    false,
 				DestructiveHint: jsonschema.Ptr(false),
 				OpenWorldHint:   jsonschema.Ptr(true),
@@ -244,13 +245,13 @@ func GranularUpdateIssueAssignees(t translations.TranslationHelperFunc) inventor
 		},
 		[]string{"assignees"},
 		func(args map[string]any) (*github.IssueRequest, error) {
+			if _, ok := args["assignees"]; !ok {
+				return nil, fmt.Errorf("missing required parameter: assignees")
+			}
 			assignees, err := OptionalStringArrayParam(args, "assignees")
 			if err != nil {
 				return nil, err
 			}
-			if len(assignees) == 0 {
-				return nil, fmt.Errorf("missing required parameter: assignees")
-			}
 			return &github.IssueRequest{Assignees: &assignees}, nil
 		},
 	)
@@ -271,13 +272,13 @@ func GranularUpdateIssueLabels(t translations.TranslationHelperFunc) inventory.S
 		},
 		[]string{"labels"},
 		func(args map[string]any) (*github.IssueRequest, error) {
+			if _, ok := args["labels"]; !ok {
+				return nil, fmt.Errorf("missing required parameter: labels")
+			}
 			labels, err := OptionalStringArrayParam(args, "labels")
 			if err != nil {
 				return nil, err
 			}
-			if len(labels) == 0 {
-				return nil, fmt.Errorf("missing required parameter: labels")
-			}
 			return &github.IssueRequest{Labels: &labels}, nil
 		},
 	)