Merge branch 'teams-tool' of https://github.com/github/github-mcp-server into teams-tool

mattdholloway · mattdholloway · commit 8bc6489f9f3e · 2025-08-08T16:35:03.000+01:00
diff --git a/pkg/github/context_tools.go b/pkg/github/context_tools.go
@@ -161,6 +161,14 @@ func GetMyTeams(getClient GetClientFn, getGQLClient GetGQLClientFn, t translatio
 		if len(t) == 0 {
 			return mcp.NewToolResultError("no teams found for user"), nil
 		}
+		// Check if any teams exist within the organizations
+		teamCount := 0
+		for _, org := range t {
+			teamCount += len(org.Teams.Nodes)
+		}
+		if teamCount == 0 {
+			return mcp.NewToolResultError("no teams found for user"), nil
+		}
 
 		return MarshalledTextResult(t), nil
 	})
