feat: add organization picker to MCP server settings pages by ibetitsmike · Pull Request #28150 · coder/coder

ibetitsmike · 2026-08-13T19:38:09Z

Adds an organization picker to the MCP server settings pages so multi-org deployments can manage every organization's MCP servers through the UI, not just the default organization's. Closes CODAGT-714 (scoped to MCP servers only; model configs stay deployment-wide until CODAGT-709 lands).

Stack Context

Top of the CODAGT-711/717/712/806 stack: MCP server configs are org-scoped with RBAC, audit logging, per-config ACLs, and owner-scoped user tokens. This layer makes the admin UI org-aware, resolving the "default org only" limitation documented in the bottom PR.

Summary

The MCP servers list and add pages resolve the working organization from an org search param (falling back to the default org), and render an organization picker built on the existing OrganizationAutocomplete. The picker only appears when more than one organization is visible, so single-org deployments see no change.
Selecting an organization rewrites the search param, refetches the list for that org, and threads through to the add page so creation posts to the selected organization.
The update page now loads the server by ID (new organization-scoped GET /api/experimental/organizations/{organization}/mcp-servers/{id} frontend binding) instead of listing the default org and searching client-side, so servers from any organization can be edited. Post-save navigation returns to the owning organization's list via the server's organization_id.
Removes the now-unused getDefaultOrganizationId helper.
Review hardening: organization display labels are disambiguated with the unique org name when effective display names collide (picker options, trigger text, and accessible name). Access is no longer restricted to deployment admins: the pages, sidebar item, and nav entry accept org-scoped mcp_server_config permissions, the picker lists only organizations the user can view, content and affordances (add, edit, delete) are gated on the selected organization's permissions, and deployment admins keep full access everywhere.

Testing

Storybook interaction stories cover: picker hidden with one org, switching orgs refetches and swaps list contents, add posting to the URL-selected org, add posting after an in-form org switch (asserting typed form state survives the switch), and update loading by ID. Red-green verified by breaking the search-param resolution and observing the new stories fail.

Mux acted on Mike's behalf for this PR.

linear-code · 2026-08-13T19:38:13Z

CODAGT-714

ibetitsmike · 2026-08-13T19:38:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c22bcf1ec

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-13T19:54:36Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1ec9ca4540

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-13T20:05:06Z

@codex review

chatgpt-codex-connector · 2026-08-13T20:07:38Z

Codex Review: Didn't find any major issues. Breezy!

Reviewed commit: 58a7461b24

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-13T20:23:17Z

@codex review

chatgpt-codex-connector · 2026-08-13T20:26:42Z

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: 743da29b38

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-13T22:00:58Z

@codex review

coderagents · 2026-08-13T22:02:12Z

Documentation Check

Updates Needed

docs/ai-coder/agents/platform-controls/mcp-servers.md - Documented in 028183d7d4: the page now explains that multi-organization deployments use the organization picker to choose which organization's MCP servers to manage, and that the picker only appears when the deployment has more than one organization.

Automated review via Coder Agents

chatgpt-codex-connector · 2026-08-13T22:04:07Z

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: b9719f595d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-13T22:32:46Z

@codex review

chatgpt-codex-connector · 2026-08-13T22:36:19Z

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: 5f5235efe8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-14T00:09:26Z

@codex review

chatgpt-codex-connector · 2026-08-14T00:12:29Z

Codex Review: Didn't find any major issues. You're on a roll.

Reviewed commit: 57fc9dda6b

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike · 2026-08-14T00:43:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7a52e7fd8c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…ial permissions

Create-only MCP administrators could not reach the add form through navigation, and its back link and cancel button led to the list page that rejects them. Gate navigation on create as well as view, redirect create-only admins to the add page, and omit exit controls when the list is unreachable.

The backend rejects any update touching a user_oidc server unless the caller holds deployment update permission, so org-level update grants saw an Update button and enabled toggle that always failed with 403. Disable both for user_oidc servers without that permission while keeping the delete action available.

… MCP picker options

github-actions Bot assigned ibetitsmike Aug 13, 2026

ibetitsmike marked this pull request as ready for review August 13, 2026 19:38

chatgpt-codex-connector Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread site/src/pages/AISettingsPage/MCPServersPage/AddMCPServerPage/AddMCPServerPage.tsx Outdated

chatgpt-codex-connector Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread site/src/pages/AISettingsPage/MCPServersPage/UpdateMCPServerPage/UpdateMCPServerPage.tsx Outdated

ibetitsmike requested a review from DanielleMaywood as a code owner August 13, 2026 22:00

ibetitsmike force-pushed the mike/codagt-714-mcp-org-picker branch from 743da29 to b9719f5 Compare August 13, 2026 22:00

ibetitsmike force-pushed the mike/codagt-714-mcp-org-picker branch from b9719f5 to 5f5235e Compare August 13, 2026 22:31

ibetitsmike force-pushed the mike/codagt-714-mcp-org-picker branch from 5f5235e to 57fc9dd Compare August 14, 2026 00:06

ibetitsmike force-pushed the mike/codagt-714-mcp-org-picker branch from 57fc9dd to 7a52e7f Compare August 14, 2026 00:42

chatgpt-codex-connector Bot reviewed Aug 14, 2026

View reviewed changes

Comment thread site/src/pages/AISettingsPage/MCPServersPage/UpdateMCPServerPage/UpdateMCPServerPage.tsx Outdated

ibetitsmike added 30 commits August 19, 2026 21:37

test(site/src): cover org admin access to MCP server settings

56df9e4

fix(site): gate MCP settings actions on per-organization permissions

779c5a1

fix(site): filter MCP organizations by view permission

58093f4

fix(site): gate selected MCP organization actions

484c287

fix(site): stabilize MCP permission gating stories

49fa7f6

fix(site): keep MCP org picker and delete action reachable under part…

315ac64

…ial permissions

fix(site): keep partial MCP actions accessible

309b14f

test(site): query MCP server row by accessible role

63e0a30

refactor(site): simplify MCP permission gating after review fixes

5bad6cb

fix(site): keep MCP pages mounted on permissions refetch errors

daf2836

fix(site): redirect MCP-only admins to the MCP servers page

ac2df22

fix(site): let create-only roles add MCP servers

5c41e49

fix(site): enforce MCP form permissions

2c9b320

fix(site): admit mutation-only orgs and reset create form on success

a18db66

test(site): assert MCP create error toast presence

d248f33

fix(site): reach add flow for create-only organizations

8bc8acb

fix(site): keep denied MCP organizations selected

026afc4

test(site): cover denied MCP permission refetch

310abb8

fix(site): expose disabled MCP switch reason accessibly

f0dcd12

test(site): assert accessible disabled state for enabled switch

c7362f8

fix(site): always show MCP target organization

d6d7622

test(site): keep MCP add navigation story isolated

fad55eb

fix(coderd): admit MCP managers to audit resource links

9c8c851

fix(site): pin implicit MCP create target in the URL

71d1def

fix(coderd): keep MCP audit links for mutation-only admins

d50c2d9

fix(site): disambiguate create-only MCP add targets

7cada68

fix(site): disambiguate MCP add target from the selected organization

6c964b9

fix(site/src): include the selected list-only org when disambiguating…

adbe7c9

… MCP picker options

Uh oh!

Conversation

ibetitsmike commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Stack Context

Summary

Testing

Uh oh!

linear-code Bot commented Aug 13, 2026

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 13, 2026

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 13, 2026

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

coderagents Bot commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Documentation Check

Updates Needed

Uh oh!

chatgpt-codex-connector Bot commented Aug 13, 2026

Uh oh!

ibetitsmike commented Aug 13, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 13, 2026

Uh oh!

ibetitsmike commented Aug 14, 2026

Uh oh!

chatgpt-codex-connector Bot commented Aug 14, 2026

Uh oh!

ibetitsmike commented Aug 14, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ibetitsmike commented Aug 13, 2026 •

edited

Loading

coderagents Bot commented Aug 13, 2026 •

edited

Loading