Skip to content

Commit a7ed625

Browse files
authored
Merge branch 'main' into sambhav/access-site
2 parents 5cb26f1 + 8b2a06b commit a7ed625

5 files changed

Lines changed: 23 additions & 10 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ The PR's `pulumi preview` comment shows the repository create. Once merged, the
6767

6868
The [contributor ladder](https://modelcontextprotocol.io/community/contributor-ladder) ([SEP-2148](https://modelcontextprotocol.io/seps/2148-contributor-ladder)) defines project roles and their privileges. This repo grants access by **team** (roles in [`src/config/roles.ts`](src/config/roles.ts)), not by ladder rank. The table shows how each ladder role corresponds to what is configured here.
6969

70-
| Ladder role | Ladder privilege | Configured here |
71-
| ------------------------ | ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
72-
| Contributor | None | None. `defaultRepositoryPermission` is `none` ([`orgSettings.ts`](src/config/orgSettings.ts)). |
73-
| Member | Org membership with triage rights | `members` team and `members (synced)` Discord role. The team has `triage` on `modelcontextprotocol`, `docs`, `.github`, `inspector`, `quickstart-resources`, and `servers`, granted per repository rather than through the `all_repo_triage` org role, which would also cover private repositories. Add someone by putting `ROLE_IDS.MEMBERS` in their `memberOf` once the ladder's sponsorship requirements are met. |
74-
| Maintainer | Merge privileges for owned areas | An "owned area" is a team: SDK teams (under `sdk-maintainers`), `docs-maintainers`, `inspector-maintainers`, `registry-wg`, `reference-servers-maintainers`, and others, each with `push`/`maintain`/`admin` on its repos ([`repoAccess.ts`](src/config/repoAccess.ts)). The general `maintainers` team has `push` on `modelcontextprotocol`. |
75-
| Core Maintainer | Administrative rights to all MCP repositories | `core-maintainers` holds the `all_repo_admin` org role ([`orgRoles.ts`](src/config/orgRoles.ts)). |
76-
| Lead Maintainer | All Core Maintainer privileges | `lead-maintainers` holds the `all_repo_admin` org role. Veto and appointment authority are governance, not access. |
77-
| Community Moderator | Moderation rights on Discord and GitHub Discussions | `moderators` team and Discord role. The team has `maintain` on most community-facing repos. |
78-
| WG Lead / IG Facilitator | Facilitation and SEP triage; no merge authority by default | `wg-ig-facilitators` Discord role (calendar access). Some WGs have a `*-wg-leads` team with `admin` on the WG's extension repo; most WGs do not. |
70+
| Ladder role | Ladder privilege | Configured here |
71+
| ------------------------ | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
72+
| Contributor | None | None. `defaultRepositoryPermission` is `none` ([`orgSettings.ts`](src/config/orgSettings.ts)). |
73+
| Member | Org membership with triage rights | `members` team and `members (synced)` Discord role. The team has `push` on `modelcontextprotocol`, so Members can open pull requests there (the repository accepts them from collaborators only, which GitHub defines as write or higher), and `triage` on `docs`, `.github`, `inspector`, `quickstart-resources`, and `servers`. Grants are per repository rather than through the `all_repo_triage` org role, which would also cover private repositories. Add someone by putting `ROLE_IDS.MEMBERS` in their `memberOf` once the ladder's sponsorship requirements are met. |
74+
| Maintainer | Merge privileges for owned areas | An "owned area" is a team: SDK teams (under `sdk-maintainers`), `docs-maintainers`, `inspector-maintainers`, `registry-wg`, `reference-servers-maintainers`, and others, each with `push`/`maintain`/`admin` on its repos ([`repoAccess.ts`](src/config/repoAccess.ts)). The general `maintainers` team has `push` on `modelcontextprotocol`. |
75+
| Core Maintainer | Administrative rights to all MCP repositories | `core-maintainers` holds the `all_repo_admin` org role ([`orgRoles.ts`](src/config/orgRoles.ts)). |
76+
| Lead Maintainer | All Core Maintainer privileges | `lead-maintainers` holds the `all_repo_admin` org role. Veto and appointment authority are governance, not access. |
77+
| Community Moderator | Moderation rights on Discord and GitHub Discussions | `moderators` team and Discord role. The team has `maintain` on most community-facing repos. |
78+
| WG Lead / IG Facilitator | Facilitation and SEP triage; no merge authority by default | `wg-ig-facilitators` Discord role (calendar access). Some WGs have a `*-wg-leads` team with `admin` on the WG's extension repo; most WGs do not. |
7979

8080
Things to know when reading the config against the ladder:
8181

‎src/config/repoAccess.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
188188
{ team: 'java-sdk', permission: 'triage' },
189189
{ team: 'kotlin-sdk', permission: 'triage' },
190190
{ team: 'maintainers', permission: 'push' },
191-
{ team: 'members', permission: 'triage' },
191+
{ team: 'members', permission: 'push' },
192192
{ team: 'moderators', permission: 'maintain' },
193193
{ team: 'php-sdk', permission: 'triage' },
194194
{ team: 'python-sdk', permission: 'triage' },

‎src/config/roleIds.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const ROLE_IDS = {
1515
SECURITY_TEAM: 'security-team', // GitHub only (MCP Security Team; Cloudflare Access to securityroom.modelcontextprotocol.io)
1616
ADMINISTRATORS: 'administrators', // Discord only
1717
COMMUNITY_MANAGERS: 'community-managers', // Discord only
18+
RELEASE_MANAGERS: 'release-managers', // Discord only
1819

1920
// ===================
2021
// Maintainer Groups

‎src/config/roles.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ export const ROLES: readonly Role[] = [
8686
discord: { role: 'community managers (synced)' },
8787
// Discord only - no GitHub equivalent
8888
},
89+
{
90+
id: ROLE_IDS.RELEASE_MANAGERS,
91+
description: 'Release managers',
92+
discord: { role: 'release managers (synced)' },
93+
// Discord only - no GitHub equivalent
94+
},
8995
{
9096
id: ROLE_IDS.LEAD_MAINTAINERS,
9197
description: 'Lead core maintainers',

‎src/config/users.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,7 @@ export const MEMBERS: readonly Member[] = [
721721
ROLE_IDS.TRANSPORT_WG,
722722
ROLE_IDS.TYPESCRIPT_SDK,
723723
ROLE_IDS.APPEALS,
724+
ROLE_IDS.RELEASE_MANAGERS,
724725
],
725726
},
726727
{
@@ -736,6 +737,7 @@ export const MEMBERS: readonly Member[] = [
736737
ROLE_IDS.TASKS_EVENTS_WG_LEADS,
737738
ROLE_IDS.AGENTS_IG,
738739
ROLE_IDS.WORKING_GROUPS,
740+
ROLE_IDS.RELEASE_MANAGERS,
739741
],
740742
},
741743
{
@@ -1167,6 +1169,10 @@ export const MEMBERS: readonly Member[] = [
11671169
discord: '1414713222224941097',
11681170
memberOf: [ROLE_IDS.SKILLS_OVER_MCP_WG],
11691171
},
1172+
{
1173+
github: 't3dotgg',
1174+
memberOf: [ROLE_IDS.DOCS_MAINTAINERS],
1175+
},
11701176
{
11711177
github: 'tadasant',
11721178
githubUserId: 3900899,

0 commit comments

Comments
 (0)