github · mattdholloway · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025
@@ -144,6 +144,7 @@ To keep your GitHub PAT secure and reusable across different MCP hosts:
 - **Minimum scopes**: Only grant necessary permissions
   - `repo` - Repository operations
   - `read:packages` - Docker image access
+  - `read:org` - Organization team access
 - **Separate tokens**: Use different PATs for different projects/environments
 - **Regular rotation**: Update tokens periodically
 - **Never commit**: Keep tokens out of version control
@@ -421,6 +422,13 @@ 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)
+
 </details>
 
 <details>

@@ -0,0 +1,25 @@
+{
+  "annotations": {
+    "title": "Get team members",
+    "readOnlyHint": true
+  },
+  "description": "Get member usernames of a specific team in an organization. Limited to organizations accessible with current credentials",
+  "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"
+}
@@ -0,0 +1,17 @@
+{
+  "annotations": {
+    "title": "Get teams",
+    "readOnlyHint": true
+  },
+  "description": "Get details of the teams the user is a member of. Limited to organizations accessible with current credentials",
+  "inputSchema": {
+    "properties": {
+      "user": {
+        "description": "Username to get teams for. If not provided, uses the authenticated user.",
+        "type": "string"
+      }
+    },
+    "type": "object"
+  },
+  "name": "get_teams"
+}
@@ -8,6 +8,7 @@ import (
 	"github.com/github/github-mcp-server/pkg/translations"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
+	"github.com/shurcooL/githubv4"
 )
 
 // UserDetails contains additional fields about a GitHub user not already
@@ -90,3 +91,159 @@ func GetMe(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Too
 
 	return tool, handler
 }
+
+func GetTeams(getClient GetClientFn, getGQLClient GetGQLClientFn, t translations.TranslationHelperFunc) (mcp.Tool, server.ToolHandlerFunc) {
+	type TeamInfo struct {
+		Name        string `json:"name"`
+		Slug        string `json:"slug"`
+		Description string `json:"description"`
+	}
+
+	type OrganizationTeams struct {
+		Login string     `json:"login"`
+		Teams []TeamInfo `json:"teams"`
+	}
+
+	tool := mcp.NewTool("get_teams",
+		mcp.WithDescription(t("TOOL_GET_TEAMS_DESCRIPTION", "Get details of the teams the user is a member of. Limited to organizations accessible with current credentials")),
+		mcp.WithString("user",
+			mcp.Description(t("TOOL_GET_TEAMS_USER_DESCRIPTION", "Username to get teams for. If not provided, uses the authenticated user.")),
+		),
+		mcp.WithToolAnnotation(mcp.ToolAnnotation{
+			Title:        t("TOOL_GET_TEAMS_TITLE", "Get teams"),
+			ReadOnlyHint: ToBoolPtr(true),
+		}),
+	)
+
+	type args struct {
+		User *string `json:"user,omitempty"`
+	}
+	handler := mcp.NewTypedToolHandler(func(ctx context.Context, _ mcp.CallToolRequest, a args) (*mcp.CallToolResult, error) {
+		var username string
+		if a.User != nil && *a.User != "" {
+			username = *a.User
+		} else {
+			client, err := getClient(ctx)
+			if err != nil {
+				return mcp.NewToolResultErrorFromErr("failed to get GitHub client", err), nil
+			}
+
+			user, res, err := client.Users.Get(ctx, "")
+			if err != nil {
+				return ghErrors.NewGitHubAPIErrorResponse(ctx,
+					"failed to get user",
+					res,
+					err,
+				), nil
+			}
+			username = user.GetLogin()
+		}
+
+		gqlClient, err := getGQLClient(ctx)
+		if err != nil {
+			return mcp.NewToolResultErrorFromErr("failed to get GitHub GQL client", err), nil
+		}
+
+		var q struct {
+			User struct {
+				Organizations struct {
+					Nodes []struct {
+						Login githubv4.String
+						Teams struct {
+							Nodes []struct {
+								Name        githubv4.String
+								Slug        githubv4.String
+								Description githubv4.String
+							}
+						} `graphql:"teams(first: 100, userLogins: [$login])"`
+					}
+				} `graphql:"organizations(first: 100)"`
+			} `graphql:"user(login: $login)"`
+		}
+		vars := map[string]interface{}{
+			"login": githubv4.String(username),
+		}
+		if err := gqlClient.Query(ctx, &q, vars); err != nil {
+			return ghErrors.NewGitHubGraphQLErrorResponse(ctx, "Failed to find teams", err), nil
+		}
+
+		var organizations []OrganizationTeams
+		for _, org := range q.User.Organizations.Nodes {
+			orgTeams := OrganizationTeams{
+				Login: string(org.Login),
+				Teams: make([]TeamInfo, 0, len(org.Teams.Nodes)),
+			}
+
+			for _, team := range org.Teams.Nodes {
+				orgTeams.Teams = append(orgTeams.Teams, TeamInfo{
+					Name:        string(team.Name),
+					Slug:        string(team.Slug),
+					Description: string(team.Description),
+				})
+			}
+
+			organizations = append(organizations, orgTeams)
+		}
+
+		return MarshalledTextResult(organizations), nil
+	})
+
+	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. Limited to organizations accessible with current credentials")),
+		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
+}