refactor(pull-requests): simplify GHES resolution gate

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: cagesellchen

pkg/github/granular_tools_test.go

@@ -56,9 +56,7 @@ func TestGranularToolSnaps(t *testing.T) {
 		GranularSubmitPendingPullRequestReview,
 		GranularDeletePendingPullRequestReview,
 		GranularAddPullRequestReviewComment,
-		func(t translations.TranslationHelperFunc) inventory.ServerTool {
-			return GranularResolveReviewThread(t)
-		},
+		GranularResolveReviewThread,
 		GranularUnresolveReviewThread,
 		GranularAddPullRequestReviewCommentReaction,
 	}

pkg/github/pullrequests.go

@@ -1771,18 +1771,22 @@ type PullRequestReviewWriteParams struct {
 	ResolutionReason *string
 }
 
-func PullRequestReviewWrite(t translations.TranslationHelperFunc, opts ...ToolOption) inventory.ServerTool {
-	return pullRequestReviewWrite(t, false, newToolConfig(opts))
+func PullRequestReviewWrite(t translations.TranslationHelperFunc) inventory.ServerTool {
+	return pullRequestReviewWrite(t, false, toolConfig{})
 }
 
 // PullRequestReviewWriteWithResolutionReason creates the feature-gated review write variant with resolution reasons.
 func PullRequestReviewWriteWithResolutionReason(t translations.TranslationHelperFunc, opts ...ToolOption) inventory.ServerTool {
-	return pullRequestReviewWrite(t, true, newToolConfig(opts))
+	cfg := newToolConfig(opts)
+	st := pullRequestReviewWrite(t, true, cfg)
+	if cfg.hostType == utils.HostTypeGHES {
+		st.Enabled = func(context.Context) (bool, error) { return false, nil }
+	}
+	return st
 }
 
 func pullRequestReviewWrite(t translations.TranslationHelperFunc, withResolutionReason bool, cfg toolConfig) inventory.ServerTool {
-	available := !withResolutionReason || cfg.hostType != utils.HostTypeGHES
-	withResolutionReason = withResolutionReason && available
+	withResolutionReason = withResolutionReason && cfg.hostType != utils.HostTypeGHES
 
 	schema := &jsonschema.Schema{
 		Type: "object",
@@ -1899,9 +1903,6 @@ Available methods:
 			st.FeatureFlagDisable = append(st.FeatureFlagDisable, FeatureFlagThreadResolutionReason)
 		}
 	}
-	if !available {
-		st.Enabled = func(context.Context) (bool, error) { return false, nil }
-	}
 	return st
 }
 

pkg/github/pullrequests_granular.go

@@ -671,18 +671,22 @@ func GranularAddPullRequestReviewComment(t translations.TranslationHelperFunc) i
 }
 
 // GranularResolveReviewThread creates a tool to resolve a review thread.
-func GranularResolveReviewThread(t translations.TranslationHelperFunc, opts ...ToolOption) inventory.ServerTool {
-	return granularResolveReviewThread(t, false, newToolConfig(opts))
+func GranularResolveReviewThread(t translations.TranslationHelperFunc) inventory.ServerTool {
+	return granularResolveReviewThread(t, false, toolConfig{})
 }
 
 // GranularResolveReviewThreadWithResolutionReason creates the feature-gated variant with resolution reasons.
 func GranularResolveReviewThreadWithResolutionReason(t translations.TranslationHelperFunc, opts ...ToolOption) inventory.ServerTool {
-	return granularResolveReviewThread(t, true, newToolConfig(opts))
+	cfg := newToolConfig(opts)
+	st := granularResolveReviewThread(t, true, cfg)
+	if cfg.hostType == utils.HostTypeGHES {
+		st.Enabled = func(context.Context) (bool, error) { return false, nil }
+	}
+	return st
 }
 
 func granularResolveReviewThread(t translations.TranslationHelperFunc, withResolutionReason bool, cfg toolConfig) inventory.ServerTool {
-	available := !withResolutionReason || cfg.hostType != utils.HostTypeGHES
-	withResolutionReason = withResolutionReason && available
+	withResolutionReason = withResolutionReason && cfg.hostType != utils.HostTypeGHES
 
 	properties := map[string]*jsonschema.Schema{
 		"threadID": {
@@ -750,9 +754,6 @@ func granularResolveReviewThread(t translations.TranslationHelperFunc, withResol
 	} else if cfg.hostType != utils.HostTypeGHES {
 		st.FeatureFlagDisable = []string{FeatureFlagThreadResolutionReason}
 	}
-	if !available {
-		st.Enabled = func(context.Context) (bool, error) { return false, nil }
-	}
 	return st
 }
 

pkg/github/tools.go

@@ -210,6 +210,7 @@ func newToolConfig(opts []ToolOption) toolConfig {
 // AllTools returns all tools with their embedded toolset metadata.
 // Tool functions return ServerTool directly with toolset info.
 func AllTools(t translations.TranslationHelperFunc, opts ...ToolOption) []inventory.ServerTool {
+	cfg := newToolConfig(opts)
 	return withCSVOutput([]inventory.ServerTool{
 		// Context tools
 		GetMe(t),
@@ -272,7 +273,7 @@ func AllTools(t translations.TranslationHelperFunc, opts ...ToolOption) []invent
 		UpdatePullRequestBranch(t),
 		CreatePullRequest(t),
 		UpdatePullRequest(t),
-		PullRequestReviewWrite(t, opts...),
+		pullRequestReviewWrite(t, false, cfg),
 		PullRequestReviewWriteWithResolutionReason(t, opts...),
 		AddCommentToPendingReview(t),
 		AddReplyToPullRequestComment(t),
@@ -372,7 +373,7 @@ func AllTools(t translations.TranslationHelperFunc, opts ...ToolOption) []invent
 		GranularSubmitPendingPullRequestReview(t),
 		GranularDeletePendingPullRequestReview(t),
 		GranularAddPullRequestReviewComment(t),
-		GranularResolveReviewThread(t, opts...),
+		granularResolveReviewThread(t, false, cfg),
 		GranularResolveReviewThreadWithResolutionReason(t, opts...),
 		GranularUnresolveReviewThread(t),
 		GranularAddPullRequestReviewCommentReaction(t),