flatten teams response to not include Nodes

mattdholloway · mattdholloway · commit b28d98b430a9 · 2025-08-11T09:40:29.000+01:00
diff --git a/pkg/github/context_tools.go b/pkg/github/context_tools.go
@@ -94,6 +94,17 @@ func GetMe(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Too
 }
 
 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")),
 		mcp.WithString("user",
@@ -157,7 +168,25 @@ func GetTeams(getClient GetClientFn, getGQLClient GetGQLClientFn, t translations
 			return mcp.NewToolResultError(err.Error()), nil
 		}
 
-		return MarshalledTextResult(q.User.Organizations.Nodes), 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
diff --git a/pkg/github/context_tools_test.go b/pkg/github/context_tools_test.go
@@ -347,12 +347,10 @@ func Test_GetTeams(t *testing.T) {
 
 			var organizations []struct {
 				Login string `json:"login"`
-				Teams struct {
-					Nodes []struct {
-						Name        string `json:"name"`
-						Slug        string `json:"slug"`
-						Description string `json:"description"`
-					} `json:"nodes"`
+				Teams []struct {
+					Name        string `json:"name"`
+					Slug        string `json:"slug"`
+					Description string `json:"description"`
 				} `json:"teams"`
 			}
 			err = json.Unmarshal([]byte(textContent.Text), &organizations)
@@ -362,14 +360,17 @@ func Test_GetTeams(t *testing.T) {
 
 			if tc.expectedTeamsCount > 0 {
 				assert.Equal(t, "testorg1", organizations[0].Login)
-				assert.Len(t, organizations[0].Teams.Nodes, 2)
-				assert.Equal(t, "team1", organizations[0].Teams.Nodes[0].Name)
-				assert.Equal(t, "team1", organizations[0].Teams.Nodes[0].Slug)
+				assert.Len(t, organizations[0].Teams, 2)
+				assert.Equal(t, "team1", organizations[0].Teams[0].Name)
+				assert.Equal(t, "team1", organizations[0].Teams[0].Slug)
+				assert.Equal(t, "Team 1", organizations[0].Teams[0].Description)
 
 				if tc.expectedTeamsCount > 1 {
 					assert.Equal(t, "testorg2", organizations[1].Login)
-					assert.Len(t, organizations[1].Teams.Nodes, 1)
-					assert.Equal(t, "team3", organizations[1].Teams.Nodes[0].Name)
+					assert.Len(t, organizations[1].Teams, 1)
+					assert.Equal(t, "team3", organizations[1].Teams[0].Name)
+					assert.Equal(t, "team3", organizations[1].Teams[0].Slug)
+					assert.Equal(t, "Team 3", organizations[1].Teams[0].Description)
 				}
 			}
 		})
