Merge pull request #9032 from microsoft/ntrogh/vnext/mcp-registry

MCP server gallery

Author: ntrogh

docs/copilot/customization/mcp-servers.md

@@ -57,22 +57,6 @@ VS Code supports the following MCP capabilities:
 * Install the latest version of [Visual Studio Code](/download)
 * Access to [Copilot](/docs/copilot/setup.md)
 
-## Enable MCP support in VS Code
-
-The `setting(chat.mcp.access)` setting controls which MCP servers can be installed and run in VS Code:
-
-* `all` (default): All MCP servers are allowed
-* `registry`: Only MCP servers from the registry are allowed
-* `none`: No MCP servers are allowed
-
-### Centrally manage MCP support
-
-You have two options to centrally manage MCP support in your organization:
-
-* **Device management**: Centrally enable or disable MCP support in your organization via group policies or configuration profiles. Learn more about [managing VS Code settings with device management](/docs/setup/enterprise.md#centrally-manage-vs-code-settings).
-
-* **GitHub Copilot policy**: Control the availability of MCP servers in your organization with a GitHub Copilot policy. Learn more about [Managing policies and features for Copilot in your enterprise](https://docs.github.com/en/enterprise-cloud@latest/copilot/how-tos/administer/enterprises/managing-policies-and-features-for-copilot-in-your-enterprise) in the GitHub Copilot documentation.
-
 ## Add an MCP server
 
 > [!CAUTION]
@@ -84,6 +68,8 @@ You can install an MCP server directly from the [GitHub MCP server registry](htt
 
 To install an MCP server from the Extensions view:
 
+1. Enable the MCP server gallery with the `setting(chat.mcp.gallery.enabled)` setting.
+
 1. Open the Extensions view (`kb(workbench.view.extensions)`)
 
 1. Enter `@mcp` in the search field to show the list of MCP servers or run the **MCP: Browse Servers** command from the Command Palette.
@@ -482,6 +468,10 @@ You can enable _development mode_ for MCP servers by adding a `dev` key to the M
 
 Learn more about [MCP development mode](/api/extension-guides/ai/mcp.md#mcp-development-mode-in-vs-code) in the MCP Dev Guide.
 
+## Centrally control MCP access
+
+Organizations can centrally manage access to MCP servers via GitHub policies. Learn more about [enterprise management of MCP servers](/docs/setup/enterprise.md#configure-mcp-server-access).
+
 ## Frequently asked questions
 
 ### Can I control which MCP tools are used?

docs/setup/enterprise.md

@@ -94,6 +94,22 @@ Duplicate key values are not supported. For example, including both `"microsoft"
 
 If you want to learn more about extensions in VS Code, refer to the [extensions documentation](/docs/configure/extensions/extension-marketplace.md).
 
+## Configure MCP server access
+
+By default, VS Code allows developers to [add any MCP server](/docs/copilot/customization/mcp-servers.md) to their environment. Organizations can restrict which MCP servers are allowed to be used by developers in VS Code. The following configuration options are available in their [GitHub Copilot settings](https://docs.github.com/en/copilot/how-tos/administer-copilot/configure-mcp-server-access):
+
+* Configure from which source MCP servers are enabled to run (controls the `setting(chat.mcp.access)` VS Code setting)
+
+    * **All**: developers can run MCP servers from any source
+    * **Registry**: developers can only run MCP servers from the MCP registry, other MCP servers are blocked from running
+    * **None**: MCP server support is disabled
+
+* Configure a custom MCP registry URL
+
+    When the `setting(chat.mcp.gallery.enabled)` VS Code setting is enabled, developers can view the list of MCP servers in the Extensions view. By default, VS Code fetches the list of MCP servers from the [GitHub MCP registry](https://github.com/mcp). Organizations can configure a custom MCP registry URL to fetch the list of MCP servers from a different source.
+
+Learn how to [configure MCP server access](https://docs.github.com/en/copilot/how-tos/administer-copilot/configure-mcp-server-access) in the GitHub Copilot documentation.
+
 ## Configure automatic updates
 
 The `update.mode` VS Code setting controls whether VS Code automatically updates when a new version is released. The updates are fetched from a Microsoft online service.