MCP GA and org/enterprise policy (#56460)

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Sophie <[email protected]>
Co-authored-by: sunbrye <[email protected]>
Co-authored-by: Sunbrye Ly <[email protected]>
Co-authored-by: Dimitrios Philliou <[email protected]>

Author: 5 people

content/copilot/how-tos/administer/enterprises/managing-policies-and-features-for-copilot-in-your-enterprise.md

@@ -40,7 +40,7 @@ You can configure policies for your enterprise. If no policy is chosen at the en
 | [{% data variables.product.prodname_copilot_short %} access to alternative AI models](#copilot-access-to-alternative-ai-models) | least restrictive |
 | [{% data variables.product.prodname_copilot_short %} Metrics API access](#copilot-metrics-api-access) | most restrictive |
 | [{% data variables.copilot.copilot_coding_agent %}](#copilot-coding-agent) | least restrictive |
-| [MCP servers on {% data variables.product.prodname_dotcom_the_website %}](#mcp-servers-on-githubcom) | least restrictive |
+| [MCP servers in {% data variables.product.prodname_copilot_short %}](#mcp-servers-in-copilot) | least restrictive |
 
 ### {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_dotcom_the_website %}
 
@@ -112,11 +112,20 @@ Alternatively, set to "No policy" to leave organization owners to make the decis
 
 > [!TIP] Enabling your license holders to use {% data variables.copilot.copilot_coding_agent %} is the first step in making {% data variables.copilot.copilot_coding_agent %} available for use in repositories in your organizations. For more information, see [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/adding-copilot-coding-agent-to-organization).
 
-### MCP servers on {% data variables.product.prodname_dotcom_the_website %}
+### MCP servers in {% data variables.product.prodname_copilot_short %}
 
-> [!NOTE] Use of MCP servers on {% data variables.product.prodname_dotcom_the_website %} is in public preview and subject to change.
+{% data reusables.copilot.coding-agent.mcp-brief-intro %}
 
-{% data reusables.copilot.coding-agent.mcp-brief-intro %} See [AUTOTITLE](/copilot/using-github-copilot/coding-agent/extending-copilot-coding-agent-with-mcp).
+You can enable this policy to allow users to connect MCP servers to {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode %} and {% data variables.copilot.copilot_coding_agent_short %}.
+
+* By default, this policy is disabled. When disabled, users with a {% data variables.product.prodname_copilot_short %} seat assigned by the enterprise or any child organizations will not be able to access MCP servers (remote or local) in {% data variables.product.prodname_copilot_short %}.
+* If the policy is set to **Disabled** or **Enabled** at the enterprise level, all child organizations will inherit the same policy configuration.
+* This policy only applies to users with a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} seat assigned by the same enterprise (or any of its child organizations) configuring the policy. It does not govern MCP access for any users with a {% data variables.product.prodname_copilot_short %} Free, Pro or Pro+ license.
+
+> [!NOTE]
+> This policy does not apply to {% data variables.product.prodname_copilot_short %} editors where MCP support is still in preview. Instead, you can use the **Editor preview features** policy to disable MCP access in these editors.
+
+For more information on using MCP, see [AUTOTITLE](/copilot/how-tos/context/model-context-protocol/extending-copilot-chat-with-mcp) and [AUTOTITLE](/copilot/using-github-copilot/coding-agent/extending-copilot-coding-agent-with-mcp).
 
 ## Configuring policies for {% data variables.product.prodname_copilot %}
 

content/copilot/how-tos/administer/organizations/managing-policies-for-copilot-in-your-organization.md

@@ -33,8 +33,9 @@ Organization owners can set policies to govern how {% data variables.product.pro
   * Image support in {% data variables.copilot.copilot_chat_short %} (available in {% data variables.product.prodname_vscode_shortname %} and {% data variables.product.prodname_vs %})
     >[!NOTE] This setting only applies to preview features within {% data variables.product.prodname_copilot_short %} and does not control all preview-related settings in {% data variables.product.prodname_vscode_shortname %}.
 * {% data variables.copilot.copilot_coding_agent %} ({% data variables.release-phases.public_preview %})
+* {% data variables.copilot.copilot_spaces %} (public preview)
+* MCP servers in {% data variables.product.prodname_copilot_short %}
 * {% data variables.copilot.copilot_spaces %} ({% data variables.release-phases.public_preview %})
-* MCP servers on {% data variables.product.prodname_dotcom_the_website %} ({% data variables.release-phases.public_preview %})
 * {% data variables.copilot.copilot_mobile_short %}
 * {% data variables.copilot.copilot_cli_short %} and {% data variables.product.prodname_windows_terminal %}
 * {% data variables.copilot.copilot_desktop_short %}
@@ -72,6 +73,23 @@ If an organization member is assigned a seat by multiple organizations with diff
 > [!TIP]
 > If you choose to enable {% data variables.copilot.copilot_coding_agent %} for users, you also need to define which repositories the agent is available in, see [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/adding-copilot-coding-agent-to-organization).
 
+## Setting a policy for MCP servers connecting to {% data variables.product.prodname_copilot_short %} in your organization
+
+{% data reusables.copilot.coding-agent.mcp-brief-intro %}
+
+You can enable this policy to allow users to connect MCP (Model Context Protocol) servers to {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode %} and {% data variables.copilot.copilot_coding_agent_short %}.
+
+* By default, this policy is disabled. When disabled, members with a {% data variables.product.prodname_copilot_short %} seat assigned by the organization will not be able to access MCP servers (remote or local) in {% data variables.product.prodname_copilot_short %}.
+* If there is a parent enterprise with the policy set to **Enabled** or **Disabled**, the organizations will inherit (and cannot change) the configuration set by the parent enterprise.
+* If **No policy** is selected at the enterprise level and multiple organizations within the enterprise assign seats to the same users, each with different policies, the least restrictive policy is applied.
+* This policy only applies to members with a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} license assigned by the same organization configuring or inheriting the policy. It does not govern MCP access for any members with a {% data variables.product.prodname_copilot_short %} Free, Pro or Pro+ plan.
+* For centralized governance across all organizations you can configure the policy at the enterprise level.
+
+> [!NOTE]
+> This policy does not apply to {% data variables.product.prodname_copilot_short %} editors where MCP support is still in preview. Instead, you can use the **Editor preview features** policy to disable MCP access in these editors.
+
+For more information on using MCP, see [AUTOTITLE](/copilot/how-tos/context/model-context-protocol/extending-copilot-chat-with-mcp) and [AUTOTITLE](/copilot/using-github-copilot/coding-agent/extending-copilot-coding-agent-with-mcp).
+
 ## Setting a policy for {% data variables.copilot.copilot_extensions %} in your organization
 
 {% data variables.copilot.copilot_extensions %} integrate external tools with {% data variables.copilot.copilot_chat %}. See [AUTOTITLE](/copilot/using-github-copilot/using-extensions-to-integrate-external-tools-with-copilot-chat).

content/copilot/how-tos/context/model-context-protocol/extending-copilot-chat-with-mcp.md

@@ -14,8 +14,8 @@ redirect_from:
 ---
 
 >[!NOTE]
-> * MCP support is currently in {% data variables.release-phases.public_preview %} and subject to change.
-> * MCP support is available in {% data variables.copilot.copilot_chat_short %} for {% data variables.product.prodname_vscode %}, JetBrains, Eclipse, and Xcode.
+> * MCP support is generally available (GA) in {% data variables.copilot.copilot_chat_short %} for {% data variables.product.prodname_vscode %}.
+> * MCP support for Copilot in {% data variables.product.prodname_vs %}, JetBrains, Eclipse, and Xcode is in {% data variables.release-phases.public_preview %} and is subject to change.
 > * The [AUTOTITLE](/free-pro-team@latest/site-policy/github-terms/github-pre-release-license-terms) apply to your use of this product.
 
 {% vscode %}
@@ -26,6 +26,8 @@ The Model Context Protocol (MCP) is an open standard that defines how applicatio
 
 You can use MCP to extend the capabilities of {% data variables.copilot.copilot_chat_short %} by integrating it with a wide range of existing tools and services. For example, the {% data variables.product.github %} MCP server allows you to use {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode %} to perform tasks on {% data variables.product.github %}. You can also use MCP to create new tools and services that work with {% data variables.copilot.copilot_chat_short %}, allowing you to customize and enhance your experience.
 
+Enterprises and organizations can choose to enable or disable use of MCP for members of their organization or enterprise. See [AUTOTITLE](/copilot/how-tos/administer/enterprises/managing-policies-and-features-for-copilot-in-your-enterprise#mcp-servers-on-githubcom). The MCP policy only applies to members with {% data variables.copilot.copilot_business_short %}, {% data variables.copilot.copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_short %} licenses assigned by the organization or enterprise that configures the policy. {% data variables.copilot.copilot_free_short %}, {% data variables.copilot.copilot_pro_short %}, or {% data variables.copilot.copilot_pro_plus_short %} do not have their MCP access governed by this policy.
+
 For more information on MCP, see [the official MCP documentation](https://modelcontextprotocol.io/introduction).
 
 For information on some of the other currently available MCP servers, see [the MCP servers repository](https://github.com/modelcontextprotocol/servers/tree/main).
@@ -82,7 +84,7 @@ For information on configuring the {% data variables.product.github %} MCP serve
 1. To view your list of available MCP servers, click the tools icon in the top left corner of the chat box. This will open the MCP server list, where you can see all the MCP servers and associated tools that are currently available in your {% data variables.product.prodname_vscode %} instance.
      * Optionally, you can define toolsets, groups of related tools that you can reference in chat. Toolsets make it easier to group related MCP tools together and quickly enable or disable them. For information on how to define and use a toolset, see the [{% data variables.product.prodname_vscode_shortname %} docs](https://code.visualstudio.com/docs/copilot/chat/chat-agent-mode#_define-tool-sets).
 
-For more information on configuring MCP servers in {% data variables.product.prodname_vscode %}, see [Use MCP servers in {% data variables.product.prodname_vscode %} (Preview)](https://aka.ms/vscode-add-mcp) in the {% data variables.product.prodname_vscode %} documentation.
+For more information on configuring MCP servers in {% data variables.product.prodname_vscode %}, see [Use MCP servers in {% data variables.product.prodname_vscode %}](https://aka.ms/vscode-add-mcp) in the {% data variables.product.prodname_vscode %} documentation.
 
 ## Using MCP servers in {% data variables.copilot.copilot_chat_short %}
 
@@ -107,7 +109,7 @@ Optionally, you can use MCP prompts and resources in {% data variables.product.p
   * MCP servers can define preconfigured prompts for interacting with their tools. You can access these prompts in chat with slash commands, using the format `/mcp.servername.promptname`.
   * MCP servers provide resources, which are any kind of data that the server wants to make available. For example, the {% data variables.product.github %} MCP server provides repository content as a resource. To add resources from an MCP server to your chat context, click **Add Context...** in the chat box, then click **MCP Resources**.
 
-For more information on using MCP servers in {% data variables.product.prodname_vscode %}, see [Use MCP servers in {% data variables.product.prodname_vscode %} (Preview)](https://aka.ms/vscode-add-mcp) in the {% data variables.product.prodname_vscode %} documentation.
+For more information on using MCP servers in {% data variables.product.prodname_vscode %}, see [Use MCP servers in {% data variables.product.prodname_vscode %}](https://aka.ms/vscode-add-mcp) in the {% data variables.product.prodname_vscode %} documentation.
 
 ## Using existing MCP configurations
 
@@ -140,13 +142,13 @@ For information on other currently available MCP servers, see [the MCP servers r
 ## Configuring MCP servers in JetBrains IDEs
 
 1. In the lower right corner, click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %}**.
-1. From the menu, select "Edit settings".
-1. Under the MCP section, click "Edit in `mcp.json`".
+1. From the menu, select "Edit settings."
+1. Under the MCP section, click "Edit in `mcp.json`."
 1. Define your MCP servers. You can use the following configuration as an example:
 
    {% data reusables.copilot.mcp-chat-json-snippet-for-other-ides %}
 
-Alternatively, to access the MCP settings, once you're in "Agent Mode", click the tools icon, then click **Add more tools**.
+Alternatively, to access the MCP settings, once you're in "Agent Mode," click the tools icon, then click **Add more tools**.
 
 {% endjetbrains %}
 
@@ -167,7 +169,7 @@ For information on other currently available MCP servers, see [the MCP servers r
 
 1. Open the {% data variables.product.prodname_copilot %} for Xcode extension.
 1. In agent mode, click the tools icon.
-1. Select "Edit config".
+1. Select "Edit config."
 1. Define your MCP servers, editing `mcp.json`. You can use the following configuration as an example:
 
    {% data reusables.copilot.mcp-chat-json-snippet-for-other-ides %}
@@ -191,7 +193,7 @@ For information on other currently available MCP servers, see [the MCP servers r
 ## Configuring MCP servers in Eclipse
 
 1. To open the {% data variables.copilot.copilot_chat_short %} panel, click the {% data variables.product.prodname_copilot_short %} icon ({% octicon "copilot" aria-hidden="true" aria-label="copilot" %}) in the status bar at the bottom of Eclipse.
-1. From the menu, select "Edit preferences".
+1. From the menu, select "Edit preferences."
 1. In the left pane, expand {% data variables.copilot.copilot_chat_short %} and click **MCP**.
 1. Define your MCP servers. You can use the following configuration as an example:
 

content/copilot/tutorials/enhancing-copilot-agent-mode-with-mcp.md

@@ -11,15 +11,15 @@ type: how_to
 ---
 
 >[!NOTE]
-> * MCP support is currently in {% data variables.release-phases.public_preview %} and subject to change.
-> * MCP support is available in {% data variables.copilot.copilot_chat_short %} for {% data variables.product.prodname_vscode %}, {% data variables.product.prodname_vs %}, JetBrains, Eclipse, and Xcode.
+> * MCP support is generally available (GA) in {% data variables.copilot.copilot_chat_short %} for {% data variables.product.prodname_vscode %}.
+> * MCP support for Copilot in {% data variables.product.prodname_vs %}, JetBrains, Eclipse, and Xcode is in {% data variables.release-phases.public_preview %} and is subject to change.
 > * The [AUTOTITLE](/free-pro-team@latest/site-policy/github-terms/github-pre-release-license-terms) apply to your use of this product.
 
 ## About {% data variables.product.prodname_copilot_short %}'s agentic capabilities and MCP
 
 {% data variables.product.prodname_copilot_short %}'s agentic capabilities refer to the ability to **work independently** by executing multi-step workflows without constant guidance, **make decisions** by choosing appropriate tools and approaches based on context, and **iterate and adapt** by adjusting its approach according to feedback and results. You can access these capabilities by using agent mode.
 
-When combined with Model Context Protocol (MCP) servers, agent mode becomes significantly more powerful, giving {% data variables.product.prodname_copilot_short %} access to external resources without switching context. This enables {% data variables.product.prodname_copilot_short %} to complete agentic "loops", where it can dynamically adapt its approach by autonomously finding relevant information, analyzing feedback, and making informed decisions. With MCP, {% data variables.product.prodname_copilot_short %} can complete a task with minimal human intervention, continuously adjusting its strategy based on what it discovers.
+When combined with Model Context Protocol (MCP) servers, agent mode becomes significantly more powerful, giving {% data variables.product.prodname_copilot_short %} access to external resources without switching context. This enables {% data variables.product.prodname_copilot_short %} to complete agentic "loops," where it can dynamically adapt its approach by autonomously finding relevant information, analyzing feedback, and making informed decisions. With MCP, {% data variables.product.prodname_copilot_short %} can complete a task with minimal human intervention, continuously adjusting its strategy based on what it discovers.
 
 ### Benefits of combining MCP with agent mode