update: List outside collaborators

update: README.md

Author: cointem

README.md

@@ -547,13 +547,24 @@ The following sets of tools are available:
 - **get_me** - Get my user profile
   - No parameters required
 
+- **get_org_members** - Get organization members
+  - `org`: Organization login (owner) to get members for. (string, required)
+  - `page`: Page number for pagination (number, optional)
+  - `per_page`: Results per page (max 100) (number, optional)
+  - `role`: Filter by role: all, admin, member (string, optional)
+
 - **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)
 
+- **list_outside_collaborators** - List outside collaborators
+  - `org`: The organization name (string, required)
+  - `page`: Page number for pagination (number, optional)
+  - `per_page`: Results per page (max 100) (number, optional)
+
 </details>
 
 <details>

pkg/github/__toolsnaps__/get_org_members.snap

@@ -9,18 +9,18 @@
       "org": {
         "description": "Organization login (owner) to get members for.",
         "type": "string"
-      }
-      ,"role": {
-        "description": "Filter by role: all, admin, member",
-        "type": "string"
+      },
+      "page": {
+        "description": "Page number for pagination",
+        "type": "number"
       },
       "per_page": {
         "description": "Results per page (max 100)",
         "type": "number"
       },
-      "page": {
-        "description": "Page number for pagination",
-        "type": "number"
+      "role": {
+        "description": "Filter by role: all, admin, member",
+        "type": "string"
       }
     },
     "required": [

pkg/github/__toolsnaps__/list_outside_collaborators.snap

@@ -0,0 +1,28 @@
+{
+  "annotations": {
+    "title": "List outside collaborators",
+    "readOnlyHint": true
+  },
+  "description": "List all outside collaborators of an organization (users with access to organization repositories but not members).",
+  "inputSchema": {
+    "properties": {
+      "org": {
+        "description": "The organization name",
+        "type": "string"
+      },
+      "page": {
+        "description": "Page number for pagination",
+        "type": "number"
+      },
+      "per_page": {
+        "description": "Results per page (max 100)",
+        "type": "number"
+      }
+    },
+    "required": [
+      "org"
+    ],
+    "type": "object"
+  },
+  "name": "list_outside_collaborators"
+}

pkg/github/context_tools.go

@@ -334,6 +334,7 @@ func getOrgMembers(getClient GetClientFn, t translations.TranslationHelperFunc)
 				ID        string `json:"id"`
 				AvatarURL string `json:"avatar_url"`
 				Type      string `json:"type"`
+				SiteAdmin bool   `json:"site_admin"`
 			}
 
 			var members []outUser
@@ -343,9 +344,97 @@ func getOrgMembers(getClient GetClientFn, t translations.TranslationHelperFunc)
 					ID:        fmt.Sprintf("%v", u.GetID()),
 					AvatarURL: u.GetAvatarURL(),
 					Type:      u.GetType(),
+					SiteAdmin: u.GetSiteAdmin(),
 				})
 			}
 
 			return MarshalledTextResult(members), nil
 		}
 }
+
+func listOutsideCollaborators(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Tool, server.ToolHandlerFunc) {
+	return mcp.NewTool("list_outside_collaborators",
+			mcp.WithDescription(t("TOOL_LIST_OUTSIDE_COLLABORATORS_DESCRIPTION", "List all outside collaborators of an organization (users with access to organization repositories but not members).")),
+			mcp.WithString("org",
+				mcp.Description(t("TOOL_LIST_OUTSIDE_COLLABORATORS_ORG_DESCRIPTION", "The organization name")),
+				mcp.Required(),
+			),
+			mcp.WithNumber("per_page",
+				mcp.Description("Results per page (max 100)"),
+			),
+			mcp.WithNumber("page",
+				mcp.Description("Page number for pagination"),
+			),
+			mcp.WithToolAnnotation(mcp.ToolAnnotation{
+				Title:        t("TOOL_LIST_OUTSIDE_COLLABORATORS_TITLE", "List outside collaborators"),
+				ReadOnlyHint: ToBoolPtr(true),
+			}),
+		),
+		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+			// Decode params into struct to support optional numbers
+			var params struct {
+				Org     string `mapstructure:"org"`
+				PerPage int32  `mapstructure:"per_page"`
+				Page    int32  `mapstructure:"page"`
+			}
+			if err := mapstructure.Decode(request.Params.Arguments, &params); err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			org := params.Org
+			perPage := params.PerPage
+			page := params.Page
+			if org == "" {
+				return mcp.NewToolResultError("org is required"), nil
+			}
+
+			// Defaults
+			if perPage <= 0 {
+				perPage = 30
+			}
+			if perPage > 100 {
+				perPage = 100
+			}
+			if page <= 0 {
+				page = 1
+			}
+
+			client, err := getClient(ctx)
+			if err != nil {
+				return mcp.NewToolResultErrorFromErr("failed to get GitHub client", err), nil
+			}
+
+			// Use Organizations.ListOutsideCollaborators with pagination
+			opts := &github.ListOutsideCollaboratorsOptions{
+				ListOptions: github.ListOptions{
+					PerPage: int(perPage),
+					Page:    int(page),
+				},
+			}
+
+			users, resp, err := client.Organizations.ListOutsideCollaborators(ctx, org, opts)
+			if err != nil {
+				return ghErrors.NewGitHubAPIErrorResponse(ctx, "Failed to list outside collaborators", resp, err), nil
+			}
+
+			type outUser struct {
+				Login     string `json:"login"`
+				ID        string `json:"id"`
+				AvatarURL string `json:"avatar_url"`
+				Type      string `json:"type"`
+				SiteAdmin bool   `json:"site_admin"`
+			}
+
+			var collaborators []outUser
+			for _, u := range users {
+				collaborators = append(collaborators, outUser{
+					Login:     u.GetLogin(),
+					ID:        fmt.Sprintf("%v", u.GetID()),
+					AvatarURL: u.GetAvatarURL(),
+					Type:      u.GetType(),
+					SiteAdmin: u.GetSiteAdmin(),
+				})
+			}
+
+			return MarshalledTextResult(collaborators), nil
+		}
+}