[FEATURE] MCP Server Registry Discovery: connect Claude Code to an enterprise MCP server catalog

Open 💬 2 comments Opened Jun 2, 2026 by aarora79

Problem Statement:

Claude Code's MCP support is excellent for connecting to individual servers, but there is no built-in way to discover which servers are available across an organization. Today, teams share server URLs through wikis, Slack, or README files, and each developer manually runs claude mcp add for every server they need.

This is the same problem raised in #30727 (marketplace for Skills, MCP Servers, and Agents) and #53386 (provenance verification). Enterprises need a centralized, governed catalog where developers can search for and connect to approved MCP servers without knowing individual URLs upfront.

Proposed Solution:

We maintain an open-source MCP Gateway Registry that solves this today. It's a centralized catalog of MCP servers, agents, and skills with OAuth/DCR-based access control, and it already works with Claude Code via claude mcp add.

How it works today (zero changes needed on Claude Code side):

claude mcp add --transport http airegistry-tools https://your-enterprise-registry/airegistry-tools/mcp

Once connected, Claude Code gains a search_registry tool that lets it find and connect to any server in the catalog on the user's behalf. The registry supports:

  • Semantic search across all registered MCP servers, agents, and skills
  • OAuth/DCR integration with Keycloak and Microsoft Entra ID (per-user auth, no shared tokens)
  • Per-user authorization with scope-based access control
  • CIMD support (Client ID Metadata Document, draft-parecki-oauth-client-id-metadata-document) for zero-touch client registration

What deeper native integration could look like:

  1. Registry-aware claude mcp add: A --registry <url> flag that searches a registry and presents matching servers for the user to pick from, instead of requiring the full endpoint URL upfront. The registry already implements a /.well-known/registry-card discovery endpoint that describes the registry instance and its capabilities.
  1. Auto-discovery via well-known URL: The registry publishes a /.well-known/mcp-servers endpoint that returns JSON with all discoverable MCP servers. If Claude Code supported fetching this well-known URL from a configured registry, it could auto-populate available servers without the user needing to search manually.
  1. Enterprise registry source in settings: Allow organizations to configure a registry URL in project or user settings, so available MCP servers appear in /mcp alongside manually configured ones.

Use Case Example:

A developer joins a team that has 20+ internal MCP servers (database tools, deployment pipelines, monitoring dashboards, internal APIs). Instead of receiving a wiki page with 20 URLs and running claude mcp add 20 times, they connect to the enterprise registry once and search for what they need in natural language. The registry enforces that they only see servers their team's IAM groups grant access to.

Additional Context:

!AI Gateway Registry Landing Page

This is not a PR submission. Happy to discuss the integration approach and provide technical details.

View original on GitHub ↗

This issue has 2 comments on GitHub. Read the full discussion on GitHub ↗