@@ -759,9 +759,8 @@ func GetIssue(ctx context.Context, client *github.Client, deps ToolDependencies,
759759
760760 minimalIssue := convertToMinimalIssue (issue )
761761
762- // Enrich with field_values via GraphQL for consistency with list_issues/search_issues.
763- // Gated behind FeatureFlagIssueFields so the GraphQL round-trip is only paid when the
764- // feature is active. Always clear the verbose REST IssueFieldValues regardless.
762+ // Enrich with field_values via GraphQL when the flag is on; always clear the verbose
763+ // REST IssueFieldValues.
765764 minimalIssue .IssueFieldValues = nil
766765 if deps .IsFeatureEnabled (ctx , FeatureFlagIssueFields ) {
767766 if issue != nil && issue .NodeID != nil && * issue .NodeID != "" {
@@ -1636,13 +1635,8 @@ func searchIssuesHandler(ctx context.Context, deps ToolDependencies, args map[st
16361635// IssueWriteUIResourceURI is the URI for the issue_write tool's MCP App UI resource.
16371636const IssueWriteUIResourceURI = "ui://github-mcp-server/issue-write"
16381637
1639- // IssueWrite is the FeatureFlagIssueFields-enabled variant of issue_write. It exposes
1640- // the full schema including the issue_fields parameter for setting custom issue field
1641- // values. When the flag is off, LegacyIssueWrite is served instead. Both registrations
1642- // share the tool name "issue_write" and rely on the inventory's feature-flag filter to
1643- // make exactly one active at a time.
1644- // Delete this comment (and the Legacy* block below) when the flag is removed and fold
1645- // issue_fields back into a single registration.
1638+ // IssueWrite is the FeatureFlagIssueFields-enabled variant of issue_write (with issue_fields).
1639+ // LegacyIssueWrite is served when the flag is off. Delete both when the flag is removed.
16461640
16471641func IssueWrite (t translations.TranslationHelperFunc ) inventory.ServerTool {
16481642 st := NewTool (
@@ -1902,13 +1896,8 @@ Options are:
19021896 return st
19031897}
19041898
1905- // LegacyIssueWrite is the FeatureFlagIssueFields-disabled variant of issue_write.
1906- // It exposes the pre-issue-fields schema (no issue_fields parameter) and skips the
1907- // custom field value resolution, so the request does not depend on server-side
1908- // issue_fields GraphQL features. Both this and IssueWrite register under the tool name
1909- // "issue_write"; exactly one is active for any given request thanks to mutually
1910- // exclusive FeatureFlagEnable / FeatureFlagDisable annotations.
1911- // Delete this function (and the Legacy* block) when FeatureFlagIssueFields is removed.
1899+ // LegacyIssueWrite is the FeatureFlagIssueFields-disabled variant of issue_write (no issue_fields).
1900+ // IssueWrite is served when the flag is on. Delete both when the flag is removed.
19121901func LegacyIssueWrite (t translations.TranslationHelperFunc ) inventory.ServerTool {
19131902 st := NewTool (
19141903 ToolsetMetadataIssues ,
0 commit comments