Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions docs/copilot/customization/mcp-servers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -482,6 +466,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?
Expand Down
18 changes: 18 additions & 0 deletions docs/setup/enterprise.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ 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 and retrieves the list of MCP servers in the Extensions view from the GitHub MCP registry.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub MCP registry is still behind preview flag therefore most of the users do not see it unless they opt in. So might confuse users if the registry is mentioned as they might have not seen it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sandy081 Isn't the MCP gallery (from GH MCP registry) available to all users in 1.106? In that case, it does make sense to mention that in the Extensions view the MCP servers are coming from there.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet. It is kept behind the flag still in 1.106

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the docs


Organizations can restrict which MCP servers are allowed to be used by developers in VS Code. The following configuration options are available:

* Configure from which source MCP servers can be added (controls the `setting(chat.mcp.access)` VS Code setting)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not about adding MCP servers. Irrespective of what value this setting is set, users can add MCP servers from any source. This setting controls which MCP servers are enabled in VS Code.


* **All**: developers can add MCP servers from any source
* **Registry**: developers can only add and 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 instead of the default GitHub MCP registry

VS Code fetches the list of MCP servers from the custom MCP registry for the Extensions view. When only the registry source is allowed, developers can only use MCP servers from the custom MCP registry.

Organizations can configure these settings in their GitHub Copilot settings. 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.
Expand Down