fix: preserve typed batch label compatibility

Author: CAOShurong

pkg/github/__toolsnaps__/batch_update_issue_labels.snap

@@ -7,6 +7,18 @@
     "title": "Batch Update Issue Labels"
   },
   "description": "Apply label changes to multiple issues in one call. Each entry in operations targets one issue and can add labels, remove labels, or both. Labels not named in the operation are left untouched. Invalid input fails the whole call before any change is applied; per-issue API errors are reported individually.",
+  "icons": [
+    {
+      "mimeType": "image/png",
+      "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAC2UlEQVRIicWVMUyTaRjHf/+vVUpOJOdilOYoUvVreq2CDmLOwdlAS5xMbrrhBifjYG7QjYuJw108nZx1huLgYlw0QshxChUK2koxHHcuCmgsFfieG0or3kGPSoz/8X3f5/97nvfN8z7wmaVqm9FodFfR/EnMugy5giCAwYwgI9Ff9Hl9L9Lp1zUBgsGO+rqGwnlhF4CdwBSyAUwvS1G220zHBSFgHtmVxYWvfp2ZGSj8LyAcjgfZphTQZtAr7OdsZvSP9RIJR+LtQhcNusF+d1aUfPp05M8NAavmg8AOk3cmN56+s1Hpa7U/cviUYbcw3jgex9ZCKoBgsKM+0PDuAdBq2He5zOiTzZiXtc+NxRw598GeLRcWTuTz+UUAp3ygrqFwHmgzeWdqNQd4PpFOy/gedNQfaDz3UQXRaHRX0fNPGdzNZUZO12q+VuHIoV7g5Hu/1/IinX7tABTNnwR2SvRsxRzAzOsBGuuWfAkoX5FZFzCVHR95tFVAbiI9DEwj6wLwl5YVMTRYLTDsxjuRrgGYYz/kxkbvbXRWMOBB24cKYI9ks1X8hXQDaAaa5XG9WjImZgV71wI+m8qAv8y0t1pSmP0ITANTmHO2qqvRZDALlTdgHKyjWkx2YvQ2cHtTacMxYBhWK5DoF4TCkXj7Jg02VKsbOwI0Y+qvALZrOQXMC13cKkDSJWBuJUCqAhgbG3uF7IpBcn/k8KlPNQ+78U5QQuhy/vHjuQoAYPndwi9gw4bd2ufGYrWatxz8No50ExhaKsz9Vl6vAPL5/KKzoiTGG0fOg1oqCbvxTp/juw/M+zynu/yTwjoD58CBQ02ez/pAR4E+M69ntf3/o1Y3dqR050oAQz7P6Z6cfPRRw647MkOhUMAfaDyH+AloBKYNPRT292rQHoMOSp09J3TZlt5ezWazxX97VR3638RiX9ct+RImSyBcrDT0ETMyMp4ptRIgVX7QL6J/ALSUEwJ5rdg2AAAAAElFTkSuQmCC\r",
+      "theme": "light"
+    },
+    {
+      "mimeType": "image/png",
+      "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAABxElEQVRIibWVvW4TURCFv0vlNEDcIHAkKAERJOIKSjoUArwBPwUFFaKIIngAJARCPIgdh4cgRBYt6ZIAEYEqdhpEw0fhCbkKa68dxyNtsfNzzpnZu3NhwpYGBdUqcA+4A1wEZiK0DawD74FWSml3JAJ1CngGLAIngU1gFfgZKWeAG8AFoAu8At6mlH6VtqTOqJ/UP2pDnRuQO6c27VlbrQ0Dvq121Fulag7q5qPmW18SdSqUd9Qrw4Jn9bNR21YrRQkvYixDKy/AuB3jWjocqKpdtXFU8AxrOTqZzp2PgvnaMRDUA+tB7mypG+OCZ3hbahPgRPguAR9LihaicEu9WcKxClzOi/fU1wPAk7rjgX0uEfNG3cs7mJjtE+wA5/olpZQEHgNf6K2NJyW4NeD7v7c4WptjSc0svlMjdzyM2fbdOyOA7x/T+7mzGj9H8xgIWuquevpw4HmsivkxwBdC/WJRsBKLqqPOHgH8aqybtcJlF0m1WLndUToJ5V31q9r3NOYk7Wh1Wa0PyK3HzA3l/4H3uzIrwFNgCThF7/x/AH5EylngOnAe6AAvgXcppd9DEWRE08DdeIou/RVgJaXUGYQzUfsL+zmwV7BtIq0AAAAASUVORK5CYII=\r",
+      "theme": "dark"
+    }
+  ],
   "inputSchema": {
     "properties": {
       "operations": {
@@ -46,11 +58,13 @@
       },
       "owner": {
         "description": "Repository owner (username or organization)",
-        "type": "string"
+        "type": "string",
+        "x-mcp-header": "owner"
       },
       "repo": {
         "description": "Repository name",
-        "type": "string"
+        "type": "string",
+        "x-mcp-header": "repo"
       }
     },
     "required": [
@@ -60,5 +74,51 @@
     ],
     "type": "object"
   },
-  "name": "batch_update_issue_labels"
+  "name": "batch_update_issue_labels",
+  "outputSchema": {
+    "additionalProperties": false,
+    "properties": {
+      "results": {
+        "items": {
+          "additionalProperties": false,
+          "properties": {
+            "applied": {
+              "type": "boolean"
+            },
+            "error": {
+              "type": "string"
+            },
+            "issue_number": {
+              "type": "integer"
+            },
+            "labels": {
+              "items": {
+                "type": "string"
+              },
+              "type": [
+                "null",
+                "array"
+              ]
+            }
+          },
+          "required": [
+            "issue_number",
+            "applied"
+          ],
+          "type": "object"
+        },
+        "type": [
+          "null",
+          "array"
+        ]
+      }
+    },
+    "required": [
+      "results"
+    ],
+    "type": [
+      "null",
+      "object"
+    ]
+  }
 }

pkg/github/batch_labels_granular_test.go

@@ -2,13 +2,17 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/github/github-mcp-server/v2/internal/toolsnaps"
+	"github.com/github/github-mcp-server/v2/pkg/inventory"
 	"github.com/github/github-mcp-server/v2/pkg/translations"
 	gogithub "github.com/google/go-github/v92/github"
+	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -207,3 +211,74 @@ func TestGranularBatchUpdateIssueLabelsTransport(t *testing.T) {
 		})
 	}
 }
+
+func TestGranularBatchUpdateIssueLabelsModernTypedSession(t *testing.T) {
+	calls := 0
+	httpClient := MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+		PostReposIssuesByOwnerByRepoByIssueNumberLabels: func(w http.ResponseWriter, r *http.Request) {
+			calls++
+			expectPath(t, "/repos/owner/repo/issues/1/labels").
+				andThen(expectRequestBody(t, []any{"bug"}).
+					andThen(mockResponse(t, http.StatusOK, []*gogithub.Label{{Name: "bug"}})))(w, r)
+		},
+	})
+	deps := BaseDeps{Client: mustNewGHClient(t, httpClient)}
+	tool := GranularBatchUpdateIssueLabels(translations.NullTranslationHelper)
+	inv, err := inventory.NewBuilder().SetTools([]inventory.ServerTool{tool}).
+		WithToolsets([]string{"all"}).
+		WithFeatureChecker(featureCheckerFor(inventory.FeatureFlag(FeatureFlagIssuesGranular))).Build()
+	require.NoError(t, err)
+	server := mcp.NewServer(&mcp.Implementation{Name: "batch-label-typed-test", Version: "v1"}, nil)
+	server.AddReceivingMiddleware(InjectDepsMiddleware(deps))
+	inv.RegisterTools(context.Background(), server, deps)
+	session := connectCommentVisibilityClient(t, server, inventory.ProtocolVersionMultiRoundTrip)
+
+	list, err := session.ListTools(context.Background(), nil)
+	require.NoError(t, err)
+	require.Len(t, list.Tools, 1)
+	require.Equal(t, tool.Tool.Name, list.Tools[0].Name)
+	require.NotNil(t, list.Tools[0].OutputSchema)
+	var schema jsonschema.Schema
+	require.NoError(t, json.Unmarshal([]byte(mustMarshalJSON(t, list.Tools[0].OutputSchema)), &schema))
+	resolved, err := schema.Resolve(nil)
+	require.NoError(t, err)
+	require.NoError(t, toolsnaps.Test(tool.Tool.Name, *list.Tools[0]))
+
+	result, err := session.CallTool(context.Background(), &mcp.CallToolParams{
+		Name: tool.Tool.Name,
+		Arguments: map[string]any{
+			"owner": "owner",
+			"repo":  "repo",
+			"operations": []any{map[string]any{
+				// RequiredInt accepted this numeric string before typed decoding.
+				"issue_number": "1.0",
+				"add":          []any{"bug"},
+			}},
+		},
+	})
+	require.NoError(t, err)
+	require.False(t, result.IsError, mustMarshalJSON(t, result))
+	expected := `{"results":[{"issue_number":1,"applied":true,"labels":["bug"]}]}`
+	assert.JSONEq(t, expected, getTextResult(t, result).Text)
+	require.NotNil(t, result.StructuredContent)
+	assert.JSONEq(t, expected, mustMarshalJSON(t, result.StructuredContent))
+	require.NoError(t, resolved.Validate(result.StructuredContent))
+	assert.Equal(t, 1, calls)
+
+	invalid, err := session.CallTool(context.Background(), &mcp.CallToolParams{
+		Name: tool.Tool.Name,
+		Arguments: map[string]any{
+			"owner": "owner",
+			"repo":  "repo",
+			"operations": []any{
+				map[string]any{"issue_number": "1.0", "add": []any{"bug"}},
+				map[string]any{"issue_number": "2", "add": []any{" "}},
+			},
+		},
+	})
+	require.NoError(t, err)
+	require.True(t, invalid.IsError)
+	assert.Nil(t, invalid.StructuredContent)
+	assert.Contains(t, getErrorResult(t, invalid).Text, "operations[1]")
+	assert.Equal(t, 1, calls, "validation must precede every mutation")
+}

pkg/github/issues_granular.go

@@ -664,9 +664,29 @@ func normalizeGranularBatchUpdateIssueLabelsArguments(raw json.RawMessage) (json
 			return nil, err
 		}
 	}
-	if _, ok := args["operations"]; !ok {
+	operationsValue, ok := args["operations"]
+	if !ok {
 		return nil, fmt.Errorf("missing required parameter: operations")
 	}
+	operations, ok := operationsValue.([]any)
+	if !ok {
+		return nil, fmt.Errorf("parameter operations is not of type array, is %T", operationsValue)
+	}
+	for i, operationValue := range operations {
+		operation, ok := operationValue.(map[string]any)
+		if !ok {
+			return nil, fmt.Errorf("operations[%d] is not an object, is %T", i, operationValue)
+		}
+		issueNumber, ok := operation["issue_number"]
+		if !ok {
+			continue
+		}
+		normalizedIssueNumber, err := toInt(issueNumber)
+		if err != nil {
+			return nil, fmt.Errorf("operations[%d].issue_number: %w", i, err)
+		}
+		operation["issue_number"] = normalizedIssueNumber
+	}
 	return json.Marshal(args)
 }