diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index 214193049..fdee533ff 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -64,6 +64,12 @@
"description": "Database administration, SQL optimization, and data management tools for PostgreSQL, SQL Server, and general database development best practices.",
"version": "1.0.0"
},
+ {
+ "name": "dataverse",
+ "source": "dataverse",
+ "description": "Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands.",
+ "version": "1.0.0"
+ },
{
"name": "dataverse-sdk-for-python",
"source": "dataverse-sdk-for-python",
diff --git a/docs/README.plugins.md b/docs/README.plugins.md
index 6f679d2da..4aaa87bf1 100644
--- a/docs/README.plugins.md
+++ b/docs/README.plugins.md
@@ -25,6 +25,7 @@ Curated plugins of related prompts, agents, and skills organized around specific
| [csharp-dotnet-development](../plugins/csharp-dotnet-development/README.md) | Essential prompts, instructions, and chat modes for C# and .NET development including testing, documentation, and best practices. | 9 items | csharp, dotnet, aspnet, testing |
| [csharp-mcp-development](../plugins/csharp-mcp-development/README.md) | Complete toolkit for building Model Context Protocol (MCP) servers in C# using the official SDK. Includes instructions for best practices, a prompt for generating servers, and an expert chat mode for guidance. | 2 items | csharp, mcp, model-context-protocol, dotnet, server-development |
| [database-data-management](../plugins/database-data-management/README.md) | Database administration, SQL optimization, and data management tools for PostgreSQL, SQL Server, and general database development best practices. | 6 items | database, sql, postgresql, sql-server, dba, optimization, queries, data-management |
+| [dataverse](../plugins/dataverse/README.md) | Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands. | 1 items | dataverse, mcp |
| [dataverse-sdk-for-python](../plugins/dataverse-sdk-for-python/README.md) | Comprehensive collection for building production-ready Python integrations with Microsoft Dataverse. Includes official documentation, best practices, advanced features, file operations, and code generation prompts. | 4 items | dataverse, python, integration, sdk |
| [devops-oncall](../plugins/devops-oncall/README.md) | A focused set of prompts, instructions, and a chat mode to help triage incidents and respond quickly with DevOps tools and Azure resources. | 3 items | devops, incident-response, oncall, azure |
| [edge-ai-tasks](../plugins/edge-ai-tasks/README.md) | Task Researcher and Task Planner for intermediate to expert users and large codebases - Brought to you by microsoft/edge-ai | 2 items | architecture, planning, research, tasks, implementation |
diff --git a/docs/README.prompts.md b/docs/README.prompts.md
index 190fd5e71..cacc9a4ed 100644
--- a/docs/README.prompts.md
+++ b/docs/README.prompts.md
@@ -95,6 +95,7 @@ Ready-to-use prompt templates for specific development scenarios and tasks, defi
| [Mcp Create Adaptive Cards](../prompts/mcp-create-adaptive-cards.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-create-adaptive-cards.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-create-adaptive-cards.prompt.md) | | |
| [Mcp Create Declarative Agent](../prompts/mcp-create-declarative-agent.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-create-declarative-agent.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-create-declarative-agent.prompt.md) | | |
| [Mcp Deploy Manage Agents](../prompts/mcp-deploy-manage-agents.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-deploy-manage-agents.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-deploy-manage-agents.prompt.md) | | |
+| [Mcp setup](../prompts/mcp-setup.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-setup.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmcp-setup.prompt.md) | Configure an MCP server for GitHub Copilot with your Dataverse environment. |
| [Memory Keeper](../prompts/remember.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fremember.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fremember.prompt.md) | Transforms lessons learned into domain-organized memory instructions (global or workspace). Syntax: `/remember [>domain [scope]] lesson clue` where scope is `global` (default), `user`, `workspace`, or `ws`. |
| [Memory Merger](../prompts/memory-merger.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmemory-merger.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fmemory-merger.prompt.md) | Merges mature lessons from a domain memory file into its instruction file. Syntax: `/memory-merger >domain [scope]` where scope is `global` (default), `user`, `workspace`, or `ws`. |
| [Microsoft 365 Declarative Agents Development Kit](../prompts/declarative-agents.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fdeclarative-agents.prompt.md)
[](https://aka.ms/awesome-copilot/install/prompt?url=vscode-insiders%3Achat-prompt%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fprompts%2Fdeclarative-agents.prompt.md) | Complete development kit for Microsoft 365 Copilot declarative agents with three comprehensive workflows (basic, advanced, validation), TypeSpec support, and Microsoft 365 Agents Toolkit integration |
diff --git a/plugins/dataverse/.github/plugin/plugin.json b/plugins/dataverse/.github/plugin/plugin.json
new file mode 100644
index 000000000..778af04a2
--- /dev/null
+++ b/plugins/dataverse/.github/plugin/plugin.json
@@ -0,0 +1,17 @@
+{
+ "name": "dataverse",
+ "description": "Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands.",
+ "version": "1.0.0",
+ "author": {
+ "name": "Awesome Copilot Community"
+ },
+ "repository": "https://github.com/github/awesome-copilot",
+ "license": "MIT",
+ "keywords": [
+ "dataverse",
+ "mcp"
+ ],
+ "commands": [
+ "./commands/mcp-setup.md"
+ ]
+}
diff --git a/plugins/dataverse/README.md b/plugins/dataverse/README.md
new file mode 100644
index 000000000..6fd49941e
--- /dev/null
+++ b/plugins/dataverse/README.md
@@ -0,0 +1,26 @@
+# Dataverse MCP
+
+Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands that guide you through configuring Dataverse MCP servers for GitHub Copilot.
+
+## Installation
+
+```bash
+# Using Copilot CLI
+copilot plugin install dataverse@awesome-copilot
+```
+
+## What's Included
+
+### Commands (Slash Commands)
+
+| Command | Description |
+|---------|-------------|
+| `/dataverse:mcp-setup` | Configure Dataverse MCP server for GitHub Copilot with global or project-scoped settings. No external scripts required. |
+
+## Source
+
+This plugin is part of [Awesome Copilot](https://github.com/github/awesome-copilot), a community-driven collection of GitHub Copilot extensions.
+
+## License
+
+MIT
diff --git a/prompts/mcp-setup.prompt.md b/prompts/mcp-setup.prompt.md
new file mode 100644
index 000000000..623ff0b17
--- /dev/null
+++ b/prompts/mcp-setup.prompt.md
@@ -0,0 +1,230 @@
+---
+name: mcp setup
+description: Configure an MCP server for GitHub Copilot with your Dataverse environment.
+---
+
+# Setup Dataverse MCP for GitHub Copilot
+
+This skill configures the Dataverse MCP server for GitHub Copilot with your organization's environment URL. Each organization is registered with a unique server name based on the org identifier (e.g., `DataverseMcporgbc9a965c`). If the user provided a URL it is: $ARGUMENTS.
+
+## Instructions
+
+### 0. Ask for MCP scope
+
+Ask the user whether they want to configure the MCP server globally or for this project only:
+
+> Would you like to configure the Dataverse MCP server:
+> 1. **Globally** (available in all projects)
+> 2. **Project-only** (available only in this project)
+
+Based on their choice, set the `CONFIG_PATH` variable:
+- **Global**: `~/.copilot/mcp-config.json` (use the user's home directory)
+- **Project**: `.mcp/copilot/mcp.json` (relative to the current working directory)
+
+Store this path for use in steps 1 and 6.
+
+### 1. Check already-configured MCP servers
+
+Read the MCP configuration file at `CONFIG_PATH` (determined in step 0) to check for already-configured servers.
+
+The configuration file is a JSON file with the following structure:
+
+```json
+{
+ "mcpServers": {
+ "ServerName1": {
+ "type": "http",
+ "url": "https://example.com/api/mcp"
+ }
+ }
+}
+```
+
+Or it may use `"servers"` instead of `"mcpServers"` as the top-level key.
+
+Extract all `url` values from the configured servers and store them as `CONFIGURED_URLS`. For example:
+
+```json
+["https://orgfbb52bb7.crm.dynamics.com/api/mcp"]
+```
+
+If the file doesn't exist or is empty, treat `CONFIGURED_URLS` as empty (`[]`). This step must never block the skill.
+
+### 2. Ask how to get the environment URL
+
+Ask the user:
+
+> How would you like to provide your Dataverse environment URL?
+> 1. **Auto-discover** — List available environments from your Azure account (requires Azure CLI)
+> 2. **Manual entry** — Enter the URL directly
+
+Based on their choice:
+- If **Auto-discover**: Proceed to step 2a
+- If **Manual entry**: Skip to step 2b
+
+### 2a. Auto-discover environments
+
+**Check prerequisites:**
+- Verify Azure CLI (`az`) is installed (check with `which az` or `where az` on Windows)
+- If not installed, inform the user and fall back to step 2b
+
+**Make the API call:**
+
+1. Check if the user is logged into Azure CLI:
+ ```bash
+ az account show
+ ```
+ If this fails, prompt the user to log in:
+ ```bash
+ az login
+ ```
+
+2. Get an access token for the Power Apps API:
+ ```bash
+ az account get-access-token --resource https://service.powerapps.com/ --query accessToken --output tsv
+ ```
+
+3. Call the Power Apps API to list environments:
+ ```
+ GET https://api.powerapps.com/providers/Microsoft.PowerApps/environments?api-version=2016-11-01
+ Authorization: Bearer {token}
+ Accept: application/json
+ ```
+
+4. Parse the JSON response and filter for environments where `properties?.linkedEnvironmentMetadata?.instanceUrl` is not null.
+
+5. For each matching environment, extract:
+ - `properties.displayName` as `displayName`
+ - `properties.linkedEnvironmentMetadata.instanceUrl` (remove trailing slash) as `instanceUrl`
+
+6. Create a list of environments in this format:
+ ```json
+ [
+ { "displayName": "My Org (default)", "instanceUrl": "https://orgfbb52bb7.crm.dynamics.com" },
+ { "displayName": "Another Env", "instanceUrl": "https://orgabc123.crm.dynamics.com" }
+ ]
+ ```
+
+**If the API call succeeds**, proceed to step 3.
+
+**If the API call fails** (user not logged in, network error, no environments found, or any other error), tell the user what went wrong and fall back to step 2b.
+
+### 2b. Manual entry — ask for the URL
+
+Ask the user to provide their environment URL directly:
+
+> Please enter your Dataverse environment URL.
+>
+> Example: `https://myorg.crm10.dynamics.com`
+>
+> You can find this in the Power Platform Admin Center under Environments.
+
+Then skip to step 4.
+
+### 3. Ask the user to select an environment
+
+Present the environments as a numbered list. For each environment, check whether any URL in `CONFIGURED_URLS` starts with that environment's `instanceUrl` — if so, append **(already configured)** to the line.
+
+> I found the following Dataverse environments on your account. Which one would you like to configure?
+>
+> 1. My Org (default) — `https://orgfbb52bb7.crm.dynamics.com` **(already configured)**
+> 2. Another Env — `https://orgabc123.crm.dynamics.com`
+>
+> Enter the number of your choice, or type "manual" to enter a URL yourself.
+
+If the user selects an already-configured environment, confirm that they want to re-register it (e.g. to change the endpoint type) before proceeding.
+
+If the user types "manual", fall back to step 2b.
+
+### 4. Confirm the selected URL
+
+Take the `instanceUrl` from the chosen environment (or the manually entered URL) and strip any trailing slash. This is `USER_URL` for the remainder of the skill.
+
+### 5. Confirm if the user wants "Preview" or "Generally Available (GA)" endpoint
+
+Ask the user:
+
+> Which endpoint would you like to use?
+> 1. **Generally Available (GA)** — `/api/mcp` (recommended)
+> 2. **Preview** — `/api/mcp_preview` (latest features, may be unstable)
+
+Based on their choice:
+- If **GA**: set `MCP_URL` to `{USER_URL}/api/mcp`
+- If **Preview**: set `MCP_URL` to `{USER_URL}/api/mcp_preview`
+
+### 6. Register the MCP server
+
+Update the MCP configuration file at `CONFIG_PATH` (determined in step 0) to add the new server.
+
+**Generate a unique server name** from the `USER_URL`:
+1. Extract the subdomain (organization identifier) from the URL
+ - Example: `https://orgbc9a965c.crm10.dynamics.com` → `orgbc9a965c`
+2. Prepend `DataverseMcp` to create the server name
+ - Example: `DataverseMcporgbc9a965c`
+
+This is the `SERVER_NAME`.
+
+**Update the configuration file:**
+
+1. If `CONFIG_PATH` is for a **project-scoped** configuration (`.mcp/copilot/mcp.json`), ensure the directory exists first:
+ ```bash
+ mkdir -p .mcp/copilot
+ ```
+
+2. Read the existing configuration file at `CONFIG_PATH`, or create a new empty config if it doesn't exist:
+ ```json
+ {}
+ ```
+
+3. Determine which top-level key to use:
+ - If the config already has `"servers"`, use that
+ - Otherwise, use `"mcpServers"`
+
+4. Add or update the server entry:
+ ```json
+ {
+ "mcpServers": {
+ "{SERVER_NAME}": {
+ "type": "http",
+ "url": "{MCP_URL}"
+ }
+ }
+ }
+ ```
+
+5. Write the updated configuration back to `CONFIG_PATH` with proper JSON formatting (2-space indentation).
+
+**Important notes:**
+- Do NOT overwrite other entries in the configuration file
+- Preserve the existing structure and formatting
+- If `SERVER_NAME` already exists, update it with the new `MCP_URL`
+
+Proceed to step 7.
+
+### 7. Confirm success and instruct restart
+
+Tell the user:
+
+> ✅ Dataverse MCP server configured for GitHub Copilot at `{MCP_URL}`.
+>
+> Configuration saved to: `{CONFIG_PATH}`
+>
+> **IMPORTANT: You must restart your editor for the changes to take effect.**
+>
+> Restart your editor or reload the window, then you will be able to:
+> - List all tables in your Dataverse environment
+> - Query records from any table
+> - Create, update, or delete records
+> - Explore your schema and relationships
+
+### 8. Troubleshooting
+
+If something goes wrong, help the user check:
+
+- The URL format is correct (`https://..dynamics.com`)
+- They have access to the Dataverse environment
+- The environment URL matches what's shown in the Power Platform Admin Center
+- Their Environment Admin has enabled "Dataverse CLI MCP" in the Allowed Clients list
+- Their Environment has Dataverse MCP enabled, and if they're trying to use the preview endpoint that is enabled
+- For project-scoped configuration, ensure the `.mcp/copilot/mcp.json` file was created successfully
+- For global configuration, check permissions on the `~/.copilot/` directory