add additional tool to get team members

Author: mattdholloway

README.md

@@ -421,6 +421,10 @@ The following sets of tools are available (all are on by default):
 - **get_me** - Get my user profile
   - No parameters required
 
+- **get_team_members** - Get team members
+  - `org`: Organization login (owner) that contains the team. (string, required)
+  - `team_slug`: Team slug (string, required)
+
 - **get_teams** - Get teams
   - `user`: Username to get teams for. If not provided, uses the authenticated user. (string, optional)
 

pkg/github/__toolsnaps__/get_team_members.snap

@@ -0,0 +1,25 @@
+{
+  "annotations": {
+    "title": "Get team members",
+    "readOnlyHint": true
+  },
+  "description": "Get member usernames of a specific team in an organization.",
+  "inputSchema": {
+    "properties": {
+      "org": {
+        "description": "Organization login (owner) that contains the team.",
+        "type": "string"
+      },
+      "team_slug": {
+        "description": "Team slug",
+        "type": "string"
+      }
+    },
+    "required": [
+      "org",
+      "team_slug"
+    ],
+    "type": "object"
+  },
+  "name": "get_team_members"
+}

pkg/github/context_tools.go

@@ -191,3 +191,60 @@ func GetTeams(getClient GetClientFn, getGQLClient GetGQLClientFn, t translations
 
 	return tool, handler
 }
+
+func GetTeamMembers(getGQLClient GetGQLClientFn, t translations.TranslationHelperFunc) (mcp.Tool, server.ToolHandlerFunc) {
+	tool := mcp.NewTool("get_team_members",
+		mcp.WithDescription(t("TOOL_GET_TEAM_MEMBERS_DESCRIPTION", "Get member usernames of a specific team in an organization.")),
+		mcp.WithString("org",
+			mcp.Description(t("TOOL_GET_TEAM_MEMBERS_ORG_DESCRIPTION", "Organization login (owner) that contains the team.")),
+			mcp.Required(),
+		),
+		mcp.WithString("team_slug",
+			mcp.Description(t("TOOL_GET_TEAM_MEMBERS_TEAM_SLUG_DESCRIPTION", "Team slug")),
+			mcp.Required(),
+		),
+		mcp.WithToolAnnotation(mcp.ToolAnnotation{
+			Title:        t("TOOL_GET_TEAM_MEMBERS_TITLE", "Get team members"),
+			ReadOnlyHint: ToBoolPtr(true),
+		}),
+	)
+
+	type args struct {
+		Org      string `json:"org"`
+		TeamSlug string `json:"team_slug"`
+	}
+	handler := mcp.NewTypedToolHandler(func(ctx context.Context, _ mcp.CallToolRequest, a args) (*mcp.CallToolResult, error) {
+		gqlClient, err := getGQLClient(ctx)
+		if err != nil {
+			return mcp.NewToolResultErrorFromErr("failed to get GitHub GQL client", err), nil
+		}
+
+		var q struct {
+			Organization struct {
+				Team struct {
+					Members struct {
+						Nodes []struct {
+							Login githubv4.String
+						}
+					} `graphql:"members(first: 100)"`
+				} `graphql:"team(slug: $teamSlug)"`
+			} `graphql:"organization(login: $org)"`
+		}
+		vars := map[string]interface{}{
+			"org":      githubv4.String(a.Org),
+			"teamSlug": githubv4.String(a.TeamSlug),
+		}
+		if err := gqlClient.Query(ctx, &q, vars); err != nil {
+			return ghErrors.NewGitHubGraphQLErrorResponse(ctx, "Failed to get team members", err), nil
+		}
+
+		var members []string
+		for _, member := range q.Organization.Team.Members.Nodes {
+			members = append(members, string(member.Login))
+		}
+
+		return MarshalledTextResult(members), nil
+	})
+
+	return tool, handler
+}

pkg/github/context_tools_test.go

@@ -376,3 +376,131 @@ func Test_GetTeams(t *testing.T) {
 		})
 	}
 }
+
+func Test_GetTeamMembers(t *testing.T) {
+	t.Parallel()
+
+	tool, _ := GetTeamMembers(nil, translations.NullTranslationHelper)
+	require.NoError(t, toolsnaps.Test(tool.Name, tool))
+
+	assert.Equal(t, "get_team_members", tool.Name)
+	assert.True(t, *tool.Annotations.ReadOnlyHint, "get_team_members tool should be read-only")
+
+	mockTeamMembersResponse := githubv4mock.DataResponse(map[string]any{
+		"organization": map[string]any{
+			"team": map[string]any{
+				"members": map[string]any{
+					"nodes": []map[string]any{
+						{
+							"login": "user1",
+						},
+						{
+							"login": "user2",
+						},
+					},
+				},
+			},
+		},
+	})
+
+	mockNoMembersResponse := githubv4mock.DataResponse(map[string]any{
+		"organization": map[string]any{
+			"team": map[string]any{
+				"members": map[string]any{
+					"nodes": []map[string]any{},
+				},
+			},
+		},
+	})
+
+	tests := []struct {
+		name                  string
+		stubbedGetGQLClientFn GetGQLClientFn
+		requestArgs           map[string]any
+		expectToolError       bool
+		expectedToolErrMsg    string
+		expectedMembersCount  int
+	}{
+		{
+			name: "successful get team members",
+			stubbedGetGQLClientFn: func(_ context.Context) (*githubv4.Client, error) {
+				queryStr := "query($org:String!$teamSlug:String!){organization(login: $org){team(slug: $teamSlug){members(first: 100){nodes{login}}}}}"
+				vars := map[string]interface{}{
+					"org":      "testorg",
+					"teamSlug": "testteam",
+				}
+				matcher := githubv4mock.NewQueryMatcher(queryStr, vars, mockTeamMembersResponse)
+				httpClient := githubv4mock.NewMockedHTTPClient(matcher)
+				return githubv4.NewClient(httpClient), nil
+			},
+			requestArgs: map[string]any{
+				"org":       "testorg",
+				"team_slug": "testteam",
+			},
+			expectToolError:      false,
+			expectedMembersCount: 2,
+		},
+		{
+			name: "team with no members",
+			stubbedGetGQLClientFn: func(_ context.Context) (*githubv4.Client, error) {
+				queryStr := "query($org:String!$teamSlug:String!){organization(login: $org){team(slug: $teamSlug){members(first: 100){nodes{login}}}}}"
+				vars := map[string]interface{}{
+					"org":      "testorg",
+					"teamSlug": "emptyteam",
+				}
+				matcher := githubv4mock.NewQueryMatcher(queryStr, vars, mockNoMembersResponse)
+				httpClient := githubv4mock.NewMockedHTTPClient(matcher)
+				return githubv4.NewClient(httpClient), nil
+			},
+			requestArgs: map[string]any{
+				"org":       "testorg",
+				"team_slug": "emptyteam",
+			},
+			expectToolError:      false,
+			expectedMembersCount: 0,
+		},
+		{
+			name: "getting GraphQL client fails",
+			stubbedGetGQLClientFn: func(_ context.Context) (*githubv4.Client, error) {
+				return nil, fmt.Errorf("GraphQL client error")
+			},
+			requestArgs: map[string]any{
+				"org":       "testorg",
+				"team_slug": "testteam",
+			},
+			expectToolError:    true,
+			expectedToolErrMsg: "failed to get GitHub GQL client: GraphQL client error",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			_, handler := GetTeamMembers(tc.stubbedGetGQLClientFn, translations.NullTranslationHelper)
+
+			request := createMCPRequest(tc.requestArgs)
+			result, err := handler(context.Background(), request)
+			require.NoError(t, err)
+			textContent := getTextResult(t, result)
+
+			if tc.expectToolError {
+				assert.True(t, result.IsError, "expected tool call result to be an error")
+				assert.Contains(t, textContent.Text, tc.expectedToolErrMsg)
+				return
+			}
+
+			var members []string
+			err = json.Unmarshal([]byte(textContent.Text), &members)
+			require.NoError(t, err)
+
+			assert.Len(t, members, tc.expectedMembersCount)
+
+			if tc.expectedMembersCount > 0 {
+				assert.Equal(t, "user1", members[0])
+
+				if tc.expectedMembersCount > 1 {
+					assert.Equal(t, "user2", members[1])
+				}
+			}
+		})
+	}
+}

pkg/github/tools.go

@@ -163,6 +163,7 @@ func DefaultToolsetGroup(readOnly bool, getClient GetClientFn, getGQLClient GetG
 		AddReadTools(
 			toolsets.NewServerTool(GetMe(getClient, t)),
 			toolsets.NewServerTool(GetTeams(getClient, getGQLClient, t)),
+			toolsets.NewServerTool(GetTeamMembers(getGQLClient, t)),
 		)
 
 	gists := toolsets.NewToolset("gists", "GitHub Gist related tools").