@azure-devops/mcp 2.9.0-nightly.20260823 → 2.9.0-nightly.20260901

package/dist/auth.js

@@ -2,15 +2,41 @@
 // Licensed under the MIT License.
 import { AzureCliCredential, ChainedTokenCredential, DefaultAzureCredential } from "@azure/identity";
 import { PublicClientApplication } from "@azure/msal-node";
+import { NativeBrokerPlugin } from "@azure/msal-node-extensions";
 import open from "open";
 import { logger } from "./logger.js";
 const scopes = ["499b84ac-1321-427f-aa17-267ca6975798/.default"];
+const patAllowedHosts = new Set(["dev.azure.com", "vssps.dev.azure.com", "almsearch.dev.azure.com"]);
+function isPatAllowedHost(hostname) {
+    const normalizedHostname = hostname.toLowerCase();
+    return patAllowedHosts.has(normalizedHostname) || normalizedHostname.endsWith(".visualstudio.com");
+}
+function installPatFetchInterceptor(basicValue) {
+    const originalFetch = globalThis.fetch;
+    const patBearerValue = `Bearer ${basicValue}`;
+    globalThis.fetch = async (input, init) => {
+        const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
+        if (headers.get("Authorization") !== patBearerValue) {
+            return originalFetch(input, init);
+        }
+        const requestUrl = new URL(input instanceof Request ? input.url : input.toString());
+        if (requestUrl.protocol !== "https:" || !isPatAllowedHost(requestUrl.hostname)) {
+            throw new Error(`Refusing to send a Personal Access Token to untrusted destination '${requestUrl.origin}'`);
+        }
+        headers.set("Authorization", `Basic ${basicValue}`);
+        if (input instanceof Request) {
+            return originalFetch(new Request(input, { ...init, headers }));
+        }
+        return originalFetch(input, { ...init, headers });
+    };
+}
 class OAuthAuthenticator {
     static clientId = "0d50963b-7bb9-4fe7-94c7-a99af00b5136";
     static defaultAuthority = "https://login.microsoftonline.com/common";
     static zeroTenantId = "00000000-0000-0000-0000-000000000000";
     accountId;
     publicClientApp;
+    publicClientAppFallback;
     constructor(tenantId) {
         this.accountId = null;
         let authority = OAuthAuthenticator.defaultAuthority;
@@ -26,6 +52,22 @@ class OAuthAuthenticator {
                 clientId: OAuthAuthenticator.clientId,
                 authority,
             },
+            broker: {
+                nativeBrokerPlugin: new NativeBrokerPlugin(),
+            },
+            system: {
+                loggerOptions: {
+                    loggerCallback: (level, message) => {
+                        logger.debug(`MSALClient[${level}]: ${message}`);
+                    },
+                },
+            },
+        });
+        this.publicClientAppFallback = new PublicClientApplication({
+            auth: {
+                clientId: OAuthAuthenticator.clientId,
+                authority,
+            },
         });
         logger.debug(`OAuthAuthenticator: Initialized with clientId='${OAuthAuthenticator.clientId}'`);
     }
@@ -50,17 +92,35 @@ class OAuthAuthenticator {
         }
         if (!authResult) {
             logger.debug(`OAuthAuthenticator: Starting interactive token acquisition`);
-            authResult = await this.publicClientApp.acquireTokenInteractive({
+            try {
+                authResult = await this.publicClientApp.acquireTokenInteractive({
+                    scopes,
+                    openBrowser: async (url) => {
+                        logger.debug(`OAuthAuthenticator: Opening browser for authentication with target URL: ${url}`);
+                        open(url);
+                    },
+                });
+                this.accountId = authResult.account;
+                logger.debug(`OAuthAuthenticator: Successfully acquired token interactively, account cached`);
+            }
+            catch (error) {
+                const msalErrorMessage = error.platformBrokerError ? JSON.stringify(error.platformBrokerError) : "";
+                logger.debug(`OAuthAuthenticator: Interactive token acquisition failed: ${error instanceof Error ? error.message + msalErrorMessage : String(error)}`);
+                authResult = null;
+            }
+        }
+        if (!authResult) {
+            logger.debug(`OAuthAuthenticator: Starting interactive token acquisition without broker`);
+            authResult = await this.publicClientAppFallback.acquireTokenInteractive({
                 scopes,
                 openBrowser: async (url) => {
-                    logger.debug(`OAuthAuthenticator: Opening browser for authentication`);
+                    logger.debug(`OAuthAuthenticator: Opening browser for authentication with target URL: ${url}`);
                     open(url);
                 },
             });
-            this.accountId = authResult.account;
-            logger.debug(`OAuthAuthenticator: Successfully acquired token interactively, account cached`);
+            logger.debug(`OAuthAuthenticator: Successfully acquired token interactively without broker`);
         }
-        if (!authResult.accessToken) {
+        if (!authResult?.accessToken) {
             logger.error(`OAuthAuthenticator: Authentication result contains no access token`);
             throw new Error("Failed to obtain Azure DevOps OAuth token.");
         }
@@ -126,4 +186,4 @@ function createAuthenticator(type, tenantId) {
             };
     }
 }
-export { createAuthenticator };
+export { createAuthenticator, installPatFetchInterceptor };

package/dist/index.js

@@ -5,13 +5,13 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { getBearerHandler, getPersonalAccessTokenHandler, WebApi } from "azure-devops-node-api";
 import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
-import { createAuthenticator } from "./auth.js";
+import { createAuthenticator, installPatFetchInterceptor } from "./auth.js";
 import { logger } from "./logger.js";
 import { getOrgTenant } from "./org-tenants.js";
 //import { configurePrompts } from "./prompts.js";
 import { configureAllTools } from "./tools.js";
 import { UserAgentComposer } from "./useragent.js";
+import { getCliArgs } from "./utils.js";
 import { packageVersion } from "./version.js";
 import { DomainsManager } from "./shared/domains.js";
 function isGitHubCodespaceEnv() {
@@ -19,7 +19,7 @@ function isGitHubCodespaceEnv() {
 }
 const defaultAuthenticationType = isGitHubCodespaceEnv() ? "azcli" : "interactive";
 // Parse command line arguments using yargs
-const argv = yargs(hideBin(process.argv))
+const argv = yargs(getCliArgs())
     .scriptName("mcp-server-azuredevops")
     .usage("Usage: $0 <organization> [options]")
     .version(packageVersion)
@@ -97,18 +97,7 @@ async function main() {
     const authenticator = createAuthenticator(argv.authentication, tenantId);
     if (argv.authentication === "pat") {
         const basicValue = await authenticator();
-        // basicValue is already base64("{email}:{token}") — use it directly in the Authorization header
-        const _originalFetch = globalThis.fetch;
-        globalThis.fetch = async (input, init) => {
-            if (init?.headers) {
-                const headers = new Headers(init.headers);
-                if (headers.get("Authorization")?.startsWith("Bearer ")) {
-                    headers.set("Authorization", `Basic ${basicValue}`);
-                    init = { ...init, headers };
-                }
-            }
-            return _originalFetch(input, init);
-        };
+        installPatFetchInterceptor(basicValue);
         logger.debug("PAT mode: global fetch interceptor installed to rewrite Bearer -> Basic auth headers");
     }
     // removing prompts until further notice

package/dist/tools/repositories.js

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { getCurrentUserDetails, getUserIdFromEmail } from "./auth.js";
 import { extractAdoStreamError, getEnumKeys, streamToString, apiVersion } from "../utils.js";
 import { orgName } from "../index.js";
+import { createExternalContentResponse } from "../shared/content-safety.js";
 const REPO_TOOLS = {
     repo_repository: "repo_repository",
     repo_pull_request: "repo_pull_request",
@@ -243,7 +244,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                         enhancedResponse = { ...enhancedResponse, changedFilesSummary: {} };
                     }
                 }
-                return { content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }] };
+                return createExternalContentResponse(enhancedResponse, "pull request");
             }
             if (action === "list") {
                 if (!repositoryId && !project) {
@@ -457,7 +458,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 if (streamError) {
                     return { content: [{ type: "text", text: `Error getting file content for '${path}': ${streamError}` }], isError: true };
                 }
-                return { content: [{ type: "text", text: content }] };
+                return createExternalContentResponse(content, "repository file");
             }
             if (action === "list_directory") {
                 const versionDescriptor = buildVersionDescriptor(version, versionType === "Commit" ? "Branch" : versionType);
@@ -750,20 +751,21 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
     // --- repo_pull_request_thread_write ----------------------------------------
     server.tool(REPO_TOOLS.repo_pull_request_thread_write, "Write operations for pull request comment threads. Use the action parameter to specify the operation.", {
         action: z
-            .enum(["create", "reply", "update_status"])
-            .describe("The action to perform. Options: create (create a new comment thread on a pull request), reply (reply to a comment in a thread), update_status (update the status of a comment thread)."),
+            .enum(["create", "reply", "update", "update_status"])
+            .describe("The action to perform. Options: create (create a new comment thread on a pull request), reply (reply to a comment in a thread), update (update an existing comment), update_status (update the status of a comment thread)."),
         repositoryId: z.string().describe("The ID or name of the repository. When using a name instead of a GUID, project must also be provided."),
         pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request."),
         project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a name instead of a GUID."),
-        threadId: z.coerce.number().min(1).optional().describe("The ID of the thread. Required for reply and update_status."),
-        content: z.string().optional().describe("The content of the comment. Required for create and reply."),
+        threadId: z.coerce.number().min(1).optional().describe("The ID of the thread. Required for reply, update, and update_status."),
+        commentId: z.coerce.number().min(1).optional().describe("The ID of the comment to update. Required for update."),
+        content: z.string().optional().describe("The content of the comment. Required for create, reply, and update."),
         status: z
             .enum(getEnumKeys(CommentThreadStatus))
             .optional()
             .default(CommentThreadStatus[CommentThreadStatus.Active])
             .describe("The thread status. Used for create (defaults to 'Active') and required for update_status."),
         filePath: z.string().optional().describe("The file path for the comment thread. Used for create."),
-        fullResponse: z.boolean().optional().default(false).describe("Return full JSON response. Used for reply."),
+        fullResponse: z.boolean().optional().default(false).describe("Return full JSON response. Used for reply and update."),
         rightFileStartLine: z.coerce.number().min(1).optional().describe("Start line in the right file. Used for create."),
         rightFileStartOffset: z.number().optional().describe("Start character offset in the right file. Used for create."),
         rightFileEndLine: z.number().optional().describe("End line in the right file. Used for create."),
@@ -771,7 +773,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         changeTrackingId: z.coerce.number().int().min(1).optional().describe("The file change tracking ID from the pull request iteration changes. Used for create."),
         firstComparingIteration: z.coerce.number().int().min(0).optional().describe("The iteration on the left side of the diff. Used for create."),
         secondComparingIteration: z.coerce.number().int().min(1).optional().describe("The iteration on the right side of the diff. Used for create."),
-    }, async ({ action, repositoryId, pullRequestId, project, threadId, content, status, filePath, fullResponse, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset, changeTrackingId, firstComparingIteration, secondComparingIteration, }) => {
+    }, async ({ action, repositoryId, pullRequestId, project, threadId, commentId, content, status, filePath, fullResponse, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset, changeTrackingId, firstComparingIteration, secondComparingIteration, }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -847,6 +849,21 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                     return { content: [{ type: "text", text: JSON.stringify(comment, null, 2) }] };
                 return { content: [{ type: "text", text: `Comment successfully added to thread ${threadId}.` }] };
             }
+            if (action === "update") {
+                if (!threadId)
+                    return { content: [{ type: "text", text: "threadId is required for update" }], isError: true };
+                if (!commentId)
+                    return { content: [{ type: "text", text: "commentId is required for update" }], isError: true };
+                if (!content)
+                    return { content: [{ type: "text", text: "content is required for update" }], isError: true };
+                const comment = await gitApi.updateComment({ content }, repositoryId, pullRequestId, threadId, commentId, project);
+                if (!comment) {
+                    return { content: [{ type: "text", text: `Error: Failed to update comment ${commentId} in thread ${threadId}. The comment was not updated successfully.` }], isError: true };
+                }
+                if (fullResponse)
+                    return { content: [{ type: "text", text: JSON.stringify(comment, null, 2) }] };
+                return { content: [{ type: "text", text: `Comment ${commentId} successfully updated in thread ${threadId}.` }] };
+            }
             if (action === "update_status") {
                 if (!threadId)
                     return { content: [{ type: "text", text: "threadId is required for update_status" }], isError: true };

package/dist/tools/search.js

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import { VersionControlRecursionType } from "azure-devops-node-api/interfaces/GitInterfaces.js";
 import { z } from "zod";
 import { apiVersion } from "../utils.js";
 import { orgName } from "../index.js";
-import { VersionControlRecursionType } from "azure-devops-node-api/interfaces/GitInterfaces.js";
+import { createExternalContentResponse } from "../shared/content-safety.js";
 const SEARCH_TOOLS = {
     search_code: "search_code",
     search_wiki: "search_wiki",
@@ -60,9 +61,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
         const resultJson = JSON.parse(resultText);
         const gitApi = await connection.getGitApi();
         const combinedResults = await fetchCombinedResults(resultJson.results ?? [], gitApi);
-        return {
-            content: [{ type: "text", text: resultText + JSON.stringify(combinedResults) }],
-        };
+        return createExternalContentResponse(resultText + JSON.stringify(combinedResults), "code search results");
     });
     server.tool(SEARCH_TOOLS.search_wiki, "Search Azure DevOps Wiki for a given search text", {
         searchText: z.string().describe("Keywords to search for wiki pages"),
@@ -101,9 +100,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
             throw new Error(`Azure DevOps Wiki Search API error: ${response.status} ${response.statusText}`);
         }
         const result = await response.text();
-        return {
-            content: [{ type: "text", text: result }],
-        };
+        return createExternalContentResponse(result, "wiki search results");
     });
     server.tool(SEARCH_TOOLS.search_workitem, "Get Azure DevOps Work Item search results for a given search text", {
         searchText: z.string().describe("Search text to find in work items"),
@@ -151,9 +148,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
             throw new Error(`Azure DevOps Work Item Search API error: ${response.status} ${response.statusText}`);
         }
         const result = await response.text();
-        return {
-            content: [{ type: "text", text: result }],
-        };
+        return createExternalContentResponse(result, "work item search results");
     });
 }
 async function fetchCombinedResults(topSearchResults, gitApi) {
@@ -170,7 +165,7 @@ async function fetchCombinedResults(topSearchResults, gitApi) {
                 });
                 continue;
             }
-            const versionDescriptor = changeId ? { version: changeId, versionType: 2, versionOptions: 0 } : undefined;
+            const versionDescriptor = { version: changeId, versionType: 2, versionOptions: 0 };
             const item = await gitApi.getItem(repositoryId, filePath, projectId, undefined, VersionControlRecursionType.None, true, // includeContentMetadata
             false, // latestProcessedChange
             false, // download

package/dist/tools/work-items.js

@@ -458,9 +458,7 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
             }
             const mimeType = getMimeType(fileName);
             if (mimeType.startsWith("text/")) {
-                return {
-                    content: [{ type: "text", text: buffer.toString("utf-8") }],
-                };
+                return createExternalContentResponse(buffer.toString("utf-8"), "work item attachment");
             }
             const base64Data = buffer.toString("base64");
             return {
@@ -505,14 +503,17 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
             op: z
                 .string()
                 .transform((val) => val.toLowerCase())
-                .pipe(z.enum(["add", "replace", "remove"]))
+                .pipe(z.enum(["add", "replace", "remove", "test"]))
                 .default("add")
-                .describe("The operation to perform."),
-            path: z.string().describe("The field path, e.g. '/fields/System.Title'."),
-            value: z.string().describe("The new value for the field."),
+                .describe("The operation to perform. Use 'test' with path '/rev' to enforce optimistic concurrency."),
+            path: z.string().describe("The path to operate on, e.g. '/fields/System.Title' or '/rev' for a revision test."),
+            value: z
+                .union([z.string(), z.number(), z.boolean(), z.null()])
+                .optional()
+                .describe("The operation value. Required for add, replace, and test; omit for remove. For a test on '/rev', pass the numeric revision previously read."),
         }))
             .optional()
-            .describe("Field updates for a single work item. Required for: update."),
+            .describe('Field updates for a single work item. Required for: update. For a safe read-modify-write, prepend a test operation on "/rev" with value set to the numeric revision returned by the preceding read; Azure DevOps rejects the entire update if the current revision differs.'),
         batchUpdates: z
             .array(z.object({
             op: z.enum(["Add", "Replace", "Remove"]).default("Add").describe("The operation to perform."),
@@ -575,6 +576,10 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
                     return { content: [{ type: "text", text: "id is required for update" }], isError: true };
                 if (!updates || updates.length === 0)
                     return { content: [{ type: "text", text: "updates is required for update" }], isError: true };
+                const updateWithoutValue = updates.find((update) => update.op !== "remove" && update.value === undefined);
+                if (updateWithoutValue) {
+                    return { content: [{ type: "text", text: `value is required for ${updateWithoutValue.op}` }], isError: true };
+                }
                 const workItemApi = await connection.getWorkItemTrackingApi();
                 const apiUpdates = updates.map((update) => ({ ...update, op: update.op }));
                 const updatedWorkItem = await workItemApi.updateWorkItem(null, apiUpdates, id);
@@ -703,9 +708,12 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            const statusCode = typeof error === "object" && error !== null && "statusCode" in error && typeof error.statusCode === "number" ? error.statusCode : undefined;
+            const statusText = statusCode === 409 ? " Conflict" : statusCode === 412 ? " Precondition Failed" : "";
+            const updateStatus = statusCode !== undefined ? ` [HTTP ${statusCode}${statusText}]` : "";
             const msgs = {
                 create: `Error creating work item: ${errorMessage}`,
-                update: `Error updating work item: ${errorMessage}`,
+                update: `Error updating work item${updateStatus}: ${errorMessage}`,
                 update_batch: `Error updating work items in batch: ${errorMessage}`,
                 add_child: `Error creating child work items: ${errorMessage}`,
             };

package/dist/utils.js

@@ -3,6 +3,19 @@
 export const apiVersion = "7.2-preview.1";
 export const batchApiVersion = "5.0";
 export const markdownCommentsApiVersion = "7.2-preview.4";
+/**
+ * Returns the user-supplied CLI arguments.
+ *
+ * The server is always started script-style — `[runtime, scriptPath, ...args]` — on Node
+ * and on Electron hosts alike, so the first two entries are always dropped.
+ *
+ * Do not replace this with yargs' `hideBin`: it drops a single entry whenever
+ * `process.versions.electron` is set and `process.defaultApp` is not, so on an Electron
+ * host the script path survives and is parsed as the organization name.
+ */
+export function getCliArgs(argv = process.argv) {
+    return argv.slice(2);
+}
 export function createEnumMapping(enumObject) {
     const mapping = {};
     for (const [key, value] of Object.entries(enumObject)) {

package/dist/version.js

@@ -1 +1 @@
-export const packageVersion = "2.9.0-nightly.20260823";
+export const packageVersion = "2.9.0-nightly.20260901";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-devops/mcp",
-  "version": "2.9.0-nightly.20260823",
+  "version": "2.9.0-nightly.20260901",
   "mcpName": "microsoft.com/azure-devops",
   "description": "MCP server for interacting with Azure DevOps",
   "license": "MIT",
@@ -37,12 +37,15 @@
     "test": "jest"
   },
   "dependencies": {
-    "@azure/identity": "^4.10.0",
-    "@azure/msal-node": "^5.0.6",
+    "@azure/identity": "^4.13.0",
+    "@azure/logger": "^1.3.0",
+    "@azure/msal-node": "^5.5.0",
+    "@azure/msal-node-extensions": "^5.3.5",
     "@modelcontextprotocol/sdk": "1.29.0",
     "azure-devops-extension-api": "^5.272.3",
     "azure-devops-extension-sdk": "^4.0.2",
     "azure-devops-node-api": "^15.1.2",
+    "open": "^10.2.0",
     "winston": "^3.18.3",
     "yargs": "^18.0.0",
     "zod": "^3.25.63",
@@ -69,5 +72,9 @@
     "**/*.(js|ts|jsx|tsx|json|css|md)": [
       "npm run format"
     ]
+  },
+  "allowScripts": {
+    "keytar@7.9.0": true,
+    "@azure/msal-node-extensions@5.3.5": true
   }
 }