From 54d67cb43cd7580b8708d894ad179bc505b433c7 Mon Sep 17 00:00:00 2001
From: Manoj Singaperumal <manos@microsoft.com>
Date: Wed, 7 Oct 2026 11:31:33 +0530
Subject: [PATCH] Update MCP registry manifest for remote server

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 README.md                    |  6 ++++--
 server.json                  | 24 ++++--------------------
 test/src/server-json.test.ts | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 test/src/server-json.test.ts

diff --git a/README.md b/README.md
index 6ef0e02a..d6fd0643 100644
--- a/README.md
+++ b/README.md
@@ -52,13 +52,13 @@ If you encounter issues with tools, need support, or have a feature request, you
 
 ### Quick Start
 
-Create `.vscode/mcp.json` in your project and add this configuration. Replace `{organization}` with your Azure DevOps organization name.
+Create `.vscode/mcp.json` in your project and add this configuration:
 
 ```json
 {
   "servers": {
     "ado-remote-mcp": {
-      "url": "https://mcp.dev.azure.com/{organization}",
+      "url": "https://mcp.dev.azure.com",
       "type": "http"
     }
   },
@@ -66,6 +66,8 @@ Create `.vscode/mcp.json` in your project and add this configuration. Replace `{
 }
 ```
 
+The organization-neutral endpoint is recommended because it lets users and agents work across Azure DevOps organizations without reconnecting. To restrict the connection to one organization, use the optional organization-specific URL `https://mcp.dev.azure.com/{organization}` and replace `{organization}` with your Azure DevOps organization name.
+
 See the [remote server configuration documentation](https://learn.microsoft.com/en-us/azure/devops/mcp-server/remote-mcp-server?view=azure-devops#mcpjson-configuration) for more options.
 
 After saving `.vscode/mcp.json`, start the server from the MCP view in VS Code, then run a prompt like `List ADO projects`.
diff --git a/server.json b/server.json
index 7b54348a..bfb6007e 100644
--- a/server.json
+++ b/server.json
@@ -1,34 +1,18 @@
 {
-  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
   "name": "com.microsoft/azure-devops",
   "description": "The MCP server for Azure DevOps, bringing the power of Azure DevOps directly to your agents.",
-  "version": "2.4.0",
+  "version": "2.10.0",
   "title": "Azure DevOps",
   "remotes": [
     {
       "type": "streamable-http",
-      "url": "https://mcp.dev.azure.com/{organization}",
-      "variables": {
-        "organization": {
-          "description": "Your Azure DevOps organization identifier (e.g., 'contoso', 'fabrikam')",
-          "isRequired": false
-        }
-      }
-    }
-  ],
-  "packages": [
-    {
-      "registryType": "npm",
-      "identifier": "@microsoft/azure-devops",
-      "version": "2.4.0",
-      "transport": {
-        "type": "stdio"
-      }
+      "url": "https://mcp.dev.azure.com"
     }
   ],
   "repository": {
     "url": "https://github.com/microsoft/azure-devops-mcp",
     "source": "github"
   },
-  "websiteUrl": "https://learn.microsoft.com/en-us/azure/devops/mcp-server/mcp-server-overview"
+  "websiteUrl": "https://learn.microsoft.com/en-us/azure/devops/mcp-server/remote-mcp-server"
 }
diff --git a/test/src/server-json.test.ts b/test/src/server-json.test.ts
new file mode 100644
index 00000000..52d00611
--- /dev/null
+++ b/test/src/server-json.test.ts
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { readFileSync } from "fs";
+import { join } from "path";
+
+const SERVER_JSON = join(__dirname, "..", "..", "server.json");
+
+describe("Official MCP Registry manifest", () => {
+  const manifest = JSON.parse(readFileSync(SERVER_JSON, "utf8"));
+
+  it("publishes the hosted server as a remote-only installation", () => {
+    expect(manifest).toMatchObject({
+      $schema: "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
+      name: "com.microsoft/azure-devops",
+      remotes: [
+        {
+          type: "streamable-http",
+          url: "https://mcp.dev.azure.com",
+        },
+      ],
+      repository: {
+        url: "https://github.com/microsoft/azure-devops-mcp",
+        source: "github",
+      },
+      websiteUrl: "https://learn.microsoft.com/en-us/azure/devops/mcp-server/remote-mcp-server",
+    });
+    expect(manifest).not.toHaveProperty("packages");
+  });
+
+  it("uses a valid, current registry metadata version", () => {
+    expect(manifest.version).toMatch(/^\d+\.\d+\.\d+$/);
+    expect(manifest.version).not.toBe("2.4.0");
+  });
+});