Merged main into live

mijacobs · mijacobs · commit 4005179acdee · 2025-08-19T18:02:40.000Z
diff --git a/docs/ide/copilot-select-add-models.md b/docs/ide/copilot-select-add-models.md
@@ -0,0 +1,80 @@
+---
+title: 'Using AI models in Copilot Chat'
+description: Learn how to use built-in models or bring your own model (BYOM) in GitHub Copilot Chat for Visual Studio.
+ms.date: 8/19/2025
+ms.update-cycle: 180-days
+ms.topic: get-started
+author: anandmeg
+ms.author: meghaanand
+ms.manager: mijacobs
+ms.subservice: ai-tools
+ms.collection: ce-skilling-ai-copilot
+monikerRange: '>= vs-2022'
+---
+# Using AI models in Copilot Chat
+
+With Visual Studio 17.14, Copilot in Visual Studio uses **GPT-4.1** as the default model (previously GPT-4o). GPT-4.1 provides faster response times, higher quality suggestions, and improved efficiency for coding tasks.
+
+However, you are not limited to using this model. You can also select from additional models or add your own, allowing you to choose the model that best fits your workflow requirements.
+
+## Available models
+ 
+Choose from an expanded set of models in the model picker:
+ 
+- Claude Sonnet 4
+- Claude Opus 4
+- GPT-5
+- Claude Sonnet 3.5
+- Claude 3.7 (thinking and non-thinking)
+- OpenAI o3-mini
+- Gemini 2.0 Flash
+- Gemini 2.5 Pro
+
+**Model selection improvements**
+
+- **Persistent selection**: The model you choose remains selected across chat threads.
+- **Enable models directly**: If a model is available in your plan but not yet enabled, you’ll see a prompt in the model picker to activate it.
+
+> Model availability depends on your Copilot subscription and the current status of each model. For Copilot Enterprise and Business, administrators must enable the **Preview** policy in Copilot settings before models are available in Visual Studio.
+
+## Bring your own model (BYOM)
+
+You can add your own language model to Copilot Chat by providing API keys from providers such as Anthropic, Google, or OpenAI. This allows you to select and configure custom AI models to match your workflow or to evaluate new model capabilities.
+
+### Benefits
+
+Using your own model enables you to:
+
+- Expand model selection beyond built-in options, including new or experimental models.
+- Meet infrastructure, security, or performance requirements with models that align to your needs.
+- Control and monitor API usage directly with your chosen provider.
+- Switch models easily between built-in and custom options.
+
+### Get started
+
+To add an API key:
+
+1. In the bottom right of the chat view, select the **model picker** dropdown.
+1. Select your provider (currently supported: **OpenAI**, **Anthropic**, and **Google**; additional providers may be added in future releases).
+1. Enter your **API key**. 
+1. Select:
+    - Any standard model listed, or
+    - Any supported model offered by your provider, even if it doesn't appear in the default list.
+1. Once added, the custom model appears in the model picker.
+1. Start prompting in chat. Chat uses the custom model.
+
+### Limitations and considerations
+
+- Custom model support is limited to the Chat experience in Visual Studio and does not affect code completions or other AI-assisted features, such as commit message generation.
+- Model capabilities depend on the provider; some models may not support features such as tool use, vision inputs, or advanced reasoning.
+- Services like embeddings, intent detection, and repository indexing may continue to use the Copilot API.
+- When using a custom model, output is returned directly from the provider and may bypass Copilot’s responsible AI filtering.
+- Custom model support is **not** available for Copilot Business or Enterprise users.
+
+## Related content
+
+- [Choosing the right AI model for your task](https://docs.github.com/en/copilot/using-github-copilot/ai-models/choosing-the-right-ai-model-for-your-task)
+- [About premium requests](https://docs.github.com/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#premium-requests)
+- [About Copilot billing](https://docs.github.com/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans)
+- [GitHub support](https://support.github.com/)
+- [Manage Copilot usage and models](copilot-usage-and-models.md)
diff --git a/docs/ide/copilot-usage-and-models.md b/docs/ide/copilot-usage-and-models.md
@@ -1,7 +1,7 @@
 ---
 title: 'GitHub Copilot usage and models'
 description: Learn how to manage your GitHub Copilot usage and models directly within Visual Studio.
-ms.date: 6/4/2025
+ms.date: 8/19/2025
 ms.update-cycle: 180-days
 ms.topic: overview 
 author: anandmeg
diff --git a/docs/ide/mcp-servers.md b/docs/ide/mcp-servers.md
@@ -1,7 +1,7 @@
 ---
-title: 'Use MCP servers (Preview)'
-description: Adding MCP servers in Visual Studio to extend GitHub Copilot agent capabilities, setting up mcp.json and managing tool permissions.
-ms.date: 6/18/2025
+title: 'Use MCP servers'
+description: Learn how to add MCP servers in Visual Studio to extend GitHub Copilot agent capabilities, set up mcp.json, and manage tool permissions.
+ms.date: 8/19/2025
 ms.update-cycle: 180-days
 ms.topic: get-started
 author: anandmeg
@@ -11,22 +11,23 @@ ms.subservice: ai-tools
 ms.collection: ce-skilling-ai-copilot
 monikerRange: '>= vs-2022'
 ---
-# Use MCP servers (Preview)
+# Use MCP servers
 
 Model Context Protocol (MCP) is an open standard that enables AI models to interact with external tools and services through a unified interface. In Visual Studio, MCP support enhances GitHub Copilot's agent mode by allowing you to connect any MCP-compatible server to your agentic coding workflow. This article guides you through setting up MCP servers and using tools with agent mode in Visual Studio.
 
 ## Prerequisites
-+ [Visual Studio 2022 version 17.14](/visualstudio/releases/2022/release-history) or later. The latest servicing release of 17.14 is highly recommended as MCP features are actively being added with each release.
++ [Visual Studio 2022 version 17.14](/visualstudio/releases/2022/release-history) or later.
+  The latest servicing release of 17.14 is highly recommended as MCP features are actively being added with each release.
 
 ## How do MCP and Visual Studio extend GitHub Copilot's agent?
 
-* MCP clients, such as Visual Studio connect to MCP servers and request actions on behalf of the AI model
+* MCP clients, such as Visual Studio connect to MCP servers and request actions on behalf of the AI model.
 * MCP servers provide one or more tools that expose specific functionalities through a well-defined interface.
-* The Model Context Protocol (MCP) defines the message format for communication between clients and servers, including tool discovery, invocation, and response handling
+* The Model Context Protocol (MCP) defines the message format for communication between clients and servers, including tool discovery, invocation, and response handling.
 
 For example, a file system MCP server might provide tools for reading, writing, or searching files and directories. [GitHub's official MCP server](https://github.com/github/github-mcp-server) offers tools to list repositories, create pull requests, or manage issues. MCP servers can run locally on your machine or be hosted remotely, and Visual Studio supports both configurations.
 
-By standardizing this interaction, MCP eliminates the need for custom integrations between each AI model and each tool. This allows you to extend your AI assistant's capabilities by simply adding new MCP servers to your workspace. Learn more about the Model Context Protocol specification.
+By standardizing this interaction, MCP eliminates the need for custom integrations between each AI model and each tool. This allows you to extend your AI assistant's capabilities by simply adding new MCP servers to your workspace. Learn more about the [Model Context Protocol specification](https://modelcontextprotocol.io/specification/draft).
 
 ## Configuration example with GitHub MCP server
 
@@ -35,46 +36,122 @@ The following walkthrough requires 17.14.9 or later.
 1. Create a new file: `<SOLUTIONDIR>\.mcp.json` or `%USERPROFILE%\.mcp.json`. Using Visual Studio to edit this file is recommended so its JSON schema is automatically applied.
 2. Paste the following contents into the `.mcp.json` file
 
-  ```json
-  {
-    "servers": {
-      "github": {
-        "url": "https://api.githubcopilot.com/mcp/"
+    ```json
+    {
+      "servers": {
+        "github": {
+          "url": "https://api.githubcopilot.com/mcp/"
+        }
       }
     }
-  }
-  ```
+    ```
 
 3. Save the file, then activate the CodeLens that appears over the new server to authenticate to this server using a GitHub account.
 
-5. In Visual Studio, click the `Ask` dropdown in the GitHub Copilot Chat window, and then select `Agent`.
+4. In Visual Studio, click the `Ask` dropdown in the GitHub Copilot Chat window, and then select `Agent`.
 
     :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png" alt-text="Screenshot that shows Copilot agent mode selector." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-dropdown.png":::
 
-7. Select the tools you'd like to use, for example, `list_issues`
+5. Select the tools you'd like to use, for example, `list_issues`
 
     :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png" alt-text="Screenshot that shows MCP GitHub tools." lightbox="media/vs-2022/mcp-servers/model-context-protocol-github-tools-list.png":::
 
-8. Try a sample prompt: `list issues assigned to me on GitHub`
-9. Copilot asks for permission to use a tool made available to it by the MCP server, select **Allow** with the scope you wish to proceed with.
+6. Try a sample prompt: `list issues assigned to me on GitHub`
+7. Copilot asks for permission to use a tool made available to it by the MCP server, select **Allow** with the scope you wish to proceed with.
 
     :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png" alt-text="Screenshot that shows the agent tools confirmation options." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-approval.png":::
 
 ## Supported MCP capabilities
 
-Visual Studio supports local standard input/output (`stdio`), server-sent events (`sse`), and streamable HTTP (`http`) for MCP server transport. Currently of the three [primitives](https://modelcontextprotocol.io/specification/2025-03-26#features) (tools, prompts, resources), servers can only provide tools to Copilot's agent mode. The list and descriptions of tools can be updated dynamically using list changed events. Visual Studio provides servers with the current solution folders using `roots` [(spec)](https://modelcontextprotocol.io/docs/concepts/roots).
+Visual Studio supports the following MCP capabilities:
+
+- MCP Server transport: Local standard input/output (`stdio`), server-sent events (`sse`), and streamable HTTP (`http`).
+- MCP features: Currently of the three [primitives](https://modelcontextprotocol.io/specification/2025-03-26#features) (tools, prompts, resources), servers can only provide tools to Copilot's agent mode. The list and descriptions of tools can be updated dynamically using list changed events.
+- Visual Studio provides servers with the current solution folders using `roots` [(spec)](https://modelcontextprotocol.io/docs/concepts/roots).
+- [MCP authorization](https://modelcontextprotocol.io/specification/draft/basic/authorization): Visual Studio supports authentication for remote servers with any OAuth provider.
 
 ## Finding MCP servers
 
 MCP's [official server repository](https://github.com/modelcontextprotocol/servers) is a great starting point for reference, official, and community-contributed servers that showcase MCP's versatility. You can explore servers for various functionalities, such as file system operations, database interactions, and web services.
 
 MCP is still a relatively new standard, and the ecosystem is rapidly evolving. As more developers adopt MCP, you can expect to see an increasing number of servers and tools available for integration with your projects.
 
-## Adding an MCP server
+## Add an MCP server
+
+You have multiple options to add an MCP server in Visual Studio:
+
+### One-click install from the web
+
+With the latest servicing release of 17.14, Visual Studio now supports direct installation of MCP Servers. You can click the **Install** button on an MCP server to automatically add it to your Visual Studio instance.
+
+</br>
+<details>
+<summary><strong title="To add a one-click install button for any MCP server in Visual Studio:">Add one-click install button for MCP server</strong></summary>
+
+1. Write your MCP server config in JSON.
+    - **HTTP/SSE server example**
+
+        ```json
+        {"name":"My Server","type":"http","url":"https://example.com/mcp/"} 
+        ```
+
+    - **stdio server example**
+
+        ```json
+        {"name":"My Server","type":"stdio","command":"python","args":["-m","my_mcp.server"]}
+        ```
+
+    Required fields:
+
+    | **Field** | **Description** |
+    |-----------|---------------|
+    | `name` | Friendly name for your server |
+    | `type` | Server connection type, for example, "http" or "stdio" |
+    | `url` | URL of the server, required for "http"|
+    | `command` | Command to start the server executable, required for "stdio" |
+    | `args` |Array of arguments passed to the command, required for "stdio" |
+
+2. URL-encode the JSON, you can use an online encoder or your browser console.
+   
+   Browser console example: 
+   
+   ```js
+   encodeURIComponent('{"name":"My Server","type":"http","url":"https://example.com/mcp/"}')
+   ```
+
+3. Insert the URL-encoded JSON into the MCP URI format to form a Visual Studio install link.
+
+    Format:
+
+    ```bash
+    vsweb+mcp:/install?<ENCODED_JSON>
+    ```
+
+4. Add the markdown badge to your GitHub repo/docs.
+
+    Example:
+
+    ```markdown
+    [![Install MCP Server in Visual Studio](https://img.shields.io/badge/Install%20in%20Visual%20Studio-blue?logo=visualstudio)](vsweb+mcp:/install?<ENCODED_JSON>)
+    ```
+
+When a user clicks the badge, Visual Studio will launch (or prompt to open), and the MCP install dialog will appear, pre-filled with your server details.
+
+<br />
+</details>
+
+### Add from chat view
+
+To add an MCP server in Visual Studio:
+
+1. Select the green plus (`+`) button in the tool picker in the chat window.
+1. Specify the server name and connection details, such as the URL for HTTP servers or the command and arguments for stdio servers.
+
+  :::image type="content" source="media/vs-2022/mcp-servers/configure-server-visual-studio.png" alt-text="Screenshot that shows adding an MCP server from chat view." lightbox="media/vs-2022/mcp-servers/configure-server-visual-studio.png":::
 
 ### Create a file to manage configuration of MCP servers
 
-If you do not already have an `mcp.json` file, you can create it in various locations depending on the repos, users, and IDEs you would like the servers to be available/used for.
+If you do not already have an `mcp.json` file, create one in any of the supported locations based on your repository, user, or IDE requirements. To add an MCP server, locate the server’s JSON configuration online (for example, from the GitHub MCP servers repository) and paste it into your `mcp.json` file.
 
 ### File locations for automatic discovery of MCP configuration
 
@@ -94,7 +171,7 @@ MCP server configurations are read from the following directories, in the follow
 
 Some of these locations require `.mcp.json` while others require `mcp.json`.
 
-### MCP configuration format
+## MCP configuration format
 
 You may define both **remote** (URL and credentials) and **local** (command-line invocation) servers.
 
@@ -110,7 +187,7 @@ When the file is saved with valid syntax, GitHub Copilot's agent restarts and re
 
 :::image type="content" source="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png" alt-text="Screenshot that shows adding the MCP configuration file location to Solution Items." lightbox="media/vs-2022/mcp-servers/model-context-protocol-add-solution-item.png":::
 
-### Tool Lifecycle
+### Tool lifecycle
 
 As soon as a server is discovered or added:
 
@@ -133,11 +210,19 @@ You can reset tool confirmation selections in **Tools** > **Options** > **GitHub
 
 :::image type="content" source="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png" alt-text="Screenshot that shows the tools configuration setting." lightbox="media/vs-2022/copilot-agent-mode/copilot-agent-tool-config.png":::
 
+## Manage authorization 
+
+Visual Studio now supports authentication for remote servers with any OAuth provider, per [MCP authorization spec](https://modelcontextprotocol.io/specification/draft/basic/authorization), in addition to integration with the Visual Studio keychain. 
+
+To manage authentication for an MCP server:
+- Select **Manage Authentication** for that server from CodeLens in the `.mcp.json` file. 
+- Provide credentials for the necessary OAuth provider for that server in the browser pop-up.
+
 ## Frequently asked questions
 
 #### As an administrator, how do I control use of MCP servers in agent mode for Visual Studio users?
 
-Agent mode and MCP usage in Visual Studio are governed by the **Editor preview features** flag in the GitHub Copilot dashboard for administrators.
+Agent mode and MCP usage in Visual Studio are governed by the GitHub policy settings in the GitHub Copilot dashboard for administrators.
 If the administrator turns off this setting, users under that subscription won’t be able to use agent mode or connect to MCP servers in Visual Studio.
 
 For more information, see [managing policies and features for copilot in your enterprise](https://docs.github.com/en/enterprise-cloud@latest/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise#editor-preview-features).
diff --git a/docs/ide/media/vs-2022/mcp-servers/configure-server-visual-studio.png b/docs/ide/media/vs-2022/mcp-servers/configure-server-visual-studio.png
diff --git a/docs/toc.yml b/docs/toc.yml
@@ -157,6 +157,8 @@
       href: ide/mcp-servers.md
     - name: Copilot Edits
       href: ide/copilot-edits.md
+    - name: AI models for chat
+      href: ide/copilot-select-add-models.md
   - name: Chat context
     items:
     - name: Customize responses
