@azure-devops/mcp 1.2.0-daily.20250715 → 1.2.1

package/README.md

@@ -5,20 +5,20 @@ Easily install the Azure DevOps MCP Server for VS Code or VS Code Insiders:
 [![Install with NPX in VS Code](https://img.shields.io/badge/VS_Code-Install_AzureDevops_MCP_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=ado&config=%7B%20%22type%22%3A%20%22stdio%22%2C%20%22command%22%3A%20%22npx%22%2C%20%22args%22%3A%20%5B%22-y%22%2C%20%22%40azure-devops%2Fmcp%22%2C%20%22%24%7Binput%3Aado_org%7D%22%5D%7D&inputs=%5B%7B%22id%22%3A%20%22ado_org%22%2C%20%22type%22%3A%20%22promptString%22%2C%20%22description%22%3A%20%22Azure%20DevOps%20organization%20name%20%20%28e.g.%20%27contoso%27%29%22%7D%5D)
 [![Install with NPX in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install_AzureDevops_MCP_Server-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=ado&quality=insiders&config=%7B%20%22type%22%3A%20%22stdio%22%2C%20%22command%22%3A%20%22npx%22%2C%20%22args%22%3A%20%5B%22-y%22%2C%20%22%40azure-devops%2Fmcp%22%2C%20%22%24%7Binput%3Aado_org%7D%22%5D%7D&inputs=%5B%7B%22id%22%3A%20%22ado_org%22%2C%20%22type%22%3A%20%22promptString%22%2C%20%22description%22%3A%20%22Azure%20DevOps%20organization%20name%20%20%28e.g.%20%27contoso%27%29%22%7D%5D)
 
-This TypeScript project defines the **local** MCP server for Azure DevOps, enabling you to perform a wide range of Azure DevOps tasks directly from your code editor.
+This TypeScript project provides a **local** MCP server for Azure DevOps, enabling you to perform a wide range of Azure DevOps tasks directly from your code editor.
 
-> 🚨 **Public Preview:** This project is in public preview. You can expect that the tools will change before general availability.
+> 🚨 **Public Preview:** This project is in public preview. Tools and features may change before general availability.
 
-## 📄 Table of contents
+## 📄 Table of Contents
 
 1. [📺 Overview](#-overview)
 2. [🏆 Expectations](#-expectations)
-3. [⚙️ Supported tools](#️-supported-tools)
-4. [🔌 Installation & getting started](#-installation--getting-started)
+3. [⚙️ Supported Tools](#️-supported-tools)
+4. [🔌 Installation & Getting Started](#-installation--getting-started)
 5. [🔦 Usage](#-usage)
 6. [📝 Troubleshooting](#-troubleshooting)
-7. [🎩 Samples & best practices](#-samples--best-practices)
-8. [🙋‍♀️ Frequently asked questions](#️-frequently-asked-questions)
+7. [🎩 Samples & Best Practices](#-samples--best-practices)
+8. [🙋‍♀️ Frequently Asked Questions](#️-frequently-asked-questions)
 9. [📌 Contributing](#-contributing)
 
 ## 📺 Overview
@@ -37,9 +37,9 @@ The Azure DevOps MCP Server brings Azure DevOps context to your agents. Try prom
 
 ## 🏆 Expectations
 
-The Azure DevOps MCP Server is built from tools that are concise, simple, focused, and easy to use. Each designed for a specific scenario. We intentionally avoid complex tools that try to do too much. The goal is to provide a thin abstraction layer over the REST APIs, making data access straightforward and letting the language model handle the complex reasoning.
+The Azure DevOps MCP Server is built from tools that are concise, simple, focused, and easy to use—each designed for a specific scenario. We intentionally avoid complex tools that try to do too much. The goal is to provide a thin abstraction layer over the REST APIs, making data access straightforward and letting the language model handle complex reasoning.
 
-## ⚙️ Supported tools
+## ⚙️ Supported Tools
 
 Interact with these Azure DevOps services:
 
@@ -61,32 +61,32 @@ Interact with these Azure DevOps services:
 - **wit_list_backlogs**: Retrieve a list of backlogs for a given project and team.
 - **wit_list_backlog_work_items**: Retrieve a list of backlogs for a given project, team, and backlog category.
 - **wit_get_work_item**: Get a single work item by ID.
-- **wit_get_work_items_batch_by_ids**: Retrieves a list of work items by IDs in batch.
+- **wit_get_work_items_batch_by_ids**: Retrieve a list of work items by IDs in batch.
 - **wit_update_work_item**: Update a work item by ID with specified fields.
 - **wit_create_work_item**: Create a new work item in a specified project and work item type.
-- **wit_list_work_item_comments**: Retrieves a list of comments for a work item by ID.
-- **wit_get_work_items_for_iteration**: Retrieves a list of work items for a specified iteration.
-- **wit_add_work_item_comment**: Add comment to a work item by ID.
-- **wit_add_child_work_items**: Create one or many child work items of a specific work item type for the given parent Id
+- **wit_list_work_item_comments**: Retrieve a list of comments for a work item by ID.
+- **wit_get_work_items_for_iteration**: Retrieve a list of work items for a specified iteration.
+- **wit_add_work_item_comment**: Add a comment to a work item by ID.
+- **wit_add_child_work_items**: Create one or more child work items of a specific work item type for the given parent ID.
 - **wit_link_work_item_to_pull_request**: Link a single work item to an existing pull request.
 - **wit_get_work_item_type**: Get a specific work item type.
 - **wit_get_query**: Get a query by its ID or path.
 - **wit_get_query_results_by_id**: Retrieve the results of a work item query given the query ID.
 - **wit_update_work_items_batch**: Update work items in batch.
-- **wit_close_and_link_workitem_duplicates**: Close duplicate work items by id.
 - **wit_work_items_link**: Link work items together in batch.
 
-#### Deprecated tools
+#### Deprecated Tools
 
-- **wit_add_child_work_item**: Replaced by `wit_add_child_work_items` so that you can create one or many child items per call.
+- **wit_add_child_work_item**: Replaced by `wit_add_child_work_items` to allow creating one or more child items per call.
+- **wit_close_and_link_workitem_duplicates**: This tool is no longer needed. Finding and marking duplicates can be done with other tools.
 
 ### 📁 Repositories
 
 - **repo_list_repos_by_project**: Retrieve a list of repositories for a given project.
 - **repo_list_pull_requests_by_repo**: Retrieve a list of pull requests for a given repository.
-- **repo_list_pull_requests_by_project**: Retrieve a list of pull requests for a given project Id or Name.
+- **repo_list_pull_requests_by_project**: Retrieve a list of pull requests for a given project ID or name.
 - **repo_list_branches_by_repo**: Retrieve a list of branches for a given repository.
-- **repo_list_my_branches_by_repo**: Retrieve a list of my branches for a given repository Id.
+- **repo_list_my_branches_by_repo**: Retrieve a list of your branches for a given repository ID.
 - **repo_list_pull_requests_by_commits**: List pull requests associated with commits.
 - **repo_list_pull_request_threads**: Retrieve a list of comment threads for a pull request.
 - **repo_list_pull_request_thread_comments**: Retrieve a list of comments in a pull request thread.
@@ -94,49 +94,53 @@ Interact with these Azure DevOps services:
 - **repo_get_branch_by_name**: Get a branch by its name.
 - **repo_get_pull_request_by_id**: Get a pull request by its ID.
 - **repo_create_pull_request**: Create a new pull request.
-- **repo_update_pull_request_status**: Update status of an existing pull request to active or abandoned.
+- **repo_update_pull_request_status**: Update the status of an existing pull request to active or abandoned.
 - **repo_update_pull_request_reviewers**: Add or remove reviewers for an existing pull request.
 - **repo_reply_to_comment**: Replies to a specific comment on a pull request.
 - **repo_resolve_comment**: Resolves a specific comment thread on a pull request.
 - **repo_search_commits**: Searches for commits.
+- **repo_create_pull_request_thread**: Creates a new comment thread on a pull request.
 
 ### 🛰️ Builds
 
-- **build_get_definitions**: Retrieves a list of build definitions for a given project.
-- **build_get_definition_revisions**: Retrieves a list of revisions for a specific build definition.
-- **build_get_builds**: Retrieves a list of builds for a given project.
-- **build_get_log**: Retrieves the logs for a specific build.
+- **build_get_definitions**: Retrieve a list of build definitions for a given project.
+- **build_get_definition_revisions**: Retrieve a list of revisions for a specific build definition.
+- **build_get_builds**: Retrieve a list of builds for a given project.
+- **build_get_log**: Retrieve the logs for a specific build.
 - **build_get_log_by_id**: Get a specific build log by log ID.
 - **build_get_changes**: Get the changes associated with a specific build.
-- **build_run_build**: Triggers a new build for a specified definition.
-- **build_get_status**: Fetches the status of a specific build.
-- **build_update_build_stage**: Updates the stage of a specific build.
+- **build_run_build**: Trigger a new build for a specified definition.
+- **build_get_status**: Fetch the status of a specific build.
+- **build_update_build_stage**: Update the stage of a specific build.
 
 ### 🚀 Releases
 
-- **release_get_definitions**: Retrieves a list of release definitions for a given project.
-- **release_get_releases**: Retrieves a list of releases for a given project.
+- **release_get_definitions**: Retrieve a list of release definitions for a given project.
+- **release_get_releases**: Retrieve a list of releases for a given project.
 
 ### 🧪 Test Plans
 
-- **testplan_create_test_plan**: Creates a new test plan in the project.
-- **testplan_create_test_case**: Creates a new test case work item.
-- **testplan_add_test_cases_to_suite**: Adds existing test cases to a test suite.
+- **testplan_create_test_plan**: Create a new test plan in the project.
+- **testplan_create_test_case**: Create a new test case work item.
+- **testplan_add_test_cases_to_suite**: Add existing test cases to a test suite.
 - **testplan_list_test_plans**: Retrieve a paginated list of test plans from an Azure DevOps project. Allows filtering for active plans and toggling detailed information.
-- **testplan_list_test_cases**: Gets a list of test cases in the test plan.
-- **testplan_show_test_results_from_build_id**: Gets a list of test results for a given project and build ID.
+- **testplan_list_test_cases**: Get a list of test cases in the test plan.
+- **testplan_show_test_results_from_build_id**: Get a list of test results for a given project and build ID.
 
 ### 🔎 Search
 
-- **search_code**: Get the code search results for a given search text.
+- **search_code**: Get code search results for a given search text.
 - **search_wiki**: Get wiki search results for a given search text.
 - **search_workitem**: Get work item search results for a given search text.
 
-## 🔌 Installation & getting started
+## 🔌 Installation & Getting Started
 
 Clone the repository, install dependencies, and add it to your MCP client configuration.
 
-### Visual Studio Code & GitHub Copilot
+[VS Code and GitHub Copilot](#%EF%B8%8F-visual-studio-code--github-copilot)<br/>
+[Visual Studio 2022 and GitHub Copilot](#%EF%B8%8F-visual-studio-2022--github-copilot)
+
+### ➡️ Visual Studio Code & GitHub Copilot
 
 For the best experience, use Visual Studio Code and GitHub Copilot.
 
@@ -157,51 +161,51 @@ az login
 
 ### Installation
 
-#### ✨ One-Click install
+#### ✨ One-Click Install
 
 [![Install with NPX in VS Code](https://img.shields.io/badge/VS_Code-Install_AzureDevops_MCP_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=ado&config=%7B%20%22type%22%3A%20%22stdio%22%2C%20%22command%22%3A%20%22npx%22%2C%20%22args%22%3A%20%5B%22-y%22%2C%20%22%40azure-devops%2Fmcp%22%2C%20%22%24%7Binput%3Aado_org%7D%22%5D%7D&inputs=%5B%7B%22id%22%3A%20%22ado_org%22%2C%20%22type%22%3A%20%22promptString%22%2C%20%22description%22%3A%20%22Azure%20DevOps%20organization%20name%20%20%28e.g.%20%27contoso%27%29%22%7D%5D)
 [![Install with NPX in VS Code Insiders](https://img.shields.io/badge/VS_Code_Insiders-Install_AzureDevops_MCP_Server-24bfa5?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=ado&quality=insiders&config=%7B%20%22type%22%3A%20%22stdio%22%2C%20%22command%22%3A%20%22npx%22%2C%20%22args%22%3A%20%5B%22-y%22%2C%20%22%40azure-devops%2Fmcp%22%2C%20%22%24%7Binput%3Aado_org%7D%22%5D%7D&inputs=%5B%7B%22id%22%3A%20%22ado_org%22%2C%20%22type%22%3A%20%22promptString%22%2C%20%22description%22%3A%20%22Azure%20DevOps%20organization%20name%20%20%28e.g.%20%27contoso%27%29%22%7D%5D)
 
 After installation, select GitHub Copilot Agent Mode and refresh the tools list. Learn more about Agent Mode in the [VS Code Documentation](https://code.visualstudio.com/docs/copilot/chat/chat-agent-mode).
 
-#### 🧨 Installing from public feed (recommended)
+#### 🧨 Install from Public Feed (Recommended)
 
-This installation method is the easiest for all users using Visual Studio Code.
+This installation method is the easiest for all users of Visual Studio Code.
 
 🎥 [Watch this quick start video to get up and running in under two minutes!](https://youtu.be/EUmFM6qXoYk)
 
 ##### Steps
 
-1. In your project, add a `.vscode\mcp.json` file and add the following:
-
-   ```json
-   {
-     "inputs": [
-       {
-         "id": "ado_org",
-         "type": "promptString",
-         "description": "Azure DevOps organization name  (e.g. 'contoso')"
-       }
-     ],
-     "servers": {
-       "ado": {
-         "type": "stdio",
-         "command": "npx",
-         "args": ["-y", "@azure-devops/mcp", "${input:ado_org}"]
-       }
-     }
-   }
-   ```
-
-2. Save the file, then click 'Start`
-
-   <img src="./docs/media/start-mcp-server.gif" alt="start mcp server" width="250"/>
+1. In your project, add a `.vscode\mcp.json` file with the following content:
+
+```json
+{
+  "inputs": [
+    {
+      "id": "ado_org",
+      "type": "promptString",
+      "description": "Azure DevOps organization name  (e.g. 'contoso')"
+    }
+  ],
+  "servers": {
+    "ado": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@azure-devops/mcp", "${input:ado_org}"]
+    }
+  }
+}
+```
+
+2. Save the file, then click 'Start'.
+
+  <img src="./docs/media/start-mcp-server.gif" alt="start mcp server" width="250"/>
 
 3. In chat, switch to [Agent Mode](https://code.visualstudio.com/blogs/2025/02/24/introducing-copilot-agent-mode).
 4. Click "Select Tools" and choose the available tools.
-5. We strongly recommend that you create a `.github\copilot-instructions.md` in your project and copy and paste the contents from this [copilot-instructions.md](./.github/copilot-instructions.md) file. This will enhance your experience using the Azure DevOps MCP Server with GitHub Copilot Chat.
+5. We strongly recommend creating a `.github\copilot-instructions.md` in your project and copying the contents from this [copilot-instructions.md](./.github/copilot-instructions.md) file. This will enhance your experience using the Azure DevOps MCP Server with GitHub Copilot Chat.
 
-#### 🛠️ Installing from source (dev mode)
+#### 🛠️ Install from Source (Dev Mode)
 
 This installation method is recommended for advanced users and contributors who want immediate access to the latest updates from the main branch. It is ideal if you are developing new tools, enhancing existing features, or maintaining a custom fork.
 
@@ -211,39 +215,100 @@ This installation method is recommended for advanced users and contributors who
 
 1. Clone the repository.
 2. Install dependencies:
-   ```sh
-   npm install
-   ```
+
+```sh
+npm install
+```
+
 3. Edit or add `.vscode/mcp.json`:
 
-   ```json
-   {
-     "inputs": [
-       {
-         "id": "ado_org",
-         "type": "promptString",
-         "description": "Azure DevOps organization's name  (e.g. 'contoso')"
-       }
-     ],
-     "servers": {
-       "ado": {
-         "type": "stdio",
-         "command": "mcp-server-azuredevops",
-         "args": ["${input:ado_org}"]
-       }
-     }
-   }
-   ```
-
-4. Start the Azure DevOps MCP Server
-
-   <img src="./docs/media/start-mcp-server.gif" alt="start mcp server" width="250"/>
+```json
+{
+  "inputs": [
+    {
+      "id": "ado_org",
+      "type": "promptString",
+      "description": "Azure DevOps organization's name  (e.g. 'contoso')"
+    }
+  ],
+  "servers": {
+    "ado": {
+      "type": "stdio",
+      "command": "mcp-server-azuredevops",
+      "args": ["${input:ado_org}"]
+    }
+  }
+}
+```
+
+4. Start the Azure DevOps MCP Server.
+
+  <img src="./docs/media/start-mcp-server.gif" alt="start mcp server" width="250"/>
 
 5. In chat, switch to [Agent Mode](https://code.visualstudio.com/blogs/2025/02/24/introducing-copilot-agent-mode).
 6. Click "Select Tools" and choose the available tools.
-7. We strongly recommend that you create a `.github\copilot-instructions.md` in your project and copy and paste the contents from this [copilot-instructions.md](./.github/copilot-instructions.md) file. This will help your experience when it comes to using the Azure DevOps MCP Server in GitHub Copilot Chat.
+7. We strongly recommend creating a `.github\copilot-instructions.md` in your project and copying the contents from this [copilot-instructions.md](./.github/copilot-instructions.md) file. This will help you get the best experience using the Azure DevOps MCP Server in GitHub Copilot Chat.
+
+See the [How To](./docs/HOWTO.md) section for details.
+
+### ➡️ Visual Studio 2022 & GitHub Copilot
+
+For the best experience, use Visual Studio Code and GitHub Copilot 👆.
+
+### Prerequisites
+
+1. Install [VS Studio 2022 version 17.14](https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history) or later
+2. Install [Azure CLI](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest)
+3. Open a project in Visual Studio.
+
+### Azure Login
+
+Ensure you are logged in to Azure DevOps via the Azure CLI:
+
+```sh
+az login
+```
+
+#### 🧨 Install from Public Feed (Recommended)
+
+This installation method is the easiest for all users of Visual Studio 2022.
+
+🎥 [Watch this quick start video to get up and running in under two minutes!](https://youtu.be/nz_Gn-WL7j0)
+
+##### Steps
+
+1. Add a `.mcp.json` file to the solution folder with the following content:
+
+```json
+{
+  "inputs": [
+    {
+      "id": "ado_org",
+      "type": "promptString",
+      "description": "Azure DevOps organization name  (e.g. 'contoso')"
+    }
+  ],
+  "servers": {
+    "ado": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@azure-devops/mcp", "${input:ado_org}"]
+    }
+  }
+}
+```
+
+2. Save the file.
+3. Add your organization name by clicking on the `input` option.
+
+   <img src="./docs/media/start-mcp-server-from-vs.png" alt="start mcp server from visual studio 2022" width="250"/>
+
+4. Open Copilot chat and switch to [Agent Mode](https://learn.microsoft.com/en-us/visualstudio/ide/copilot-agent-mode?view=vs-2022).
+5. Click the "Tools" icon and choose the available tools.
+
+   <img src="./docs/media/set-tools-from-vs.png" alt="set tools to use in visual studio 2022" width="250"/>
 
-See [How To](./docs/HOWTO.md) section for details
+6. We strongly recommend creating a `.github\copilot-instructions.md` in your project and copying the contents from this [copilot-instructions.md](./.github/copilot-instructions.md) file. This will enhance your experience using the Azure DevOps MCP Server with GitHub Copilot Chat.
 
 ## 🔦 Usage
 
@@ -263,23 +328,23 @@ See [How To](./docs/HOWTO.md) section for details
 3. Select desired `ado` tools.
 4. Try prompts like "List ADO projects".
 
-For more details, see [Visual Studio MCP Servers documentation](https://learn.microsoft.com/en-us/visualstudio/ide/mcp-servers?view=vs-2022) and [Getting Started Video](https://www.youtube.com/watch?v=oPFecZHBCkg).
+For more details, see [Visual Studio MCP Servers documentation](https://learn.microsoft.com/en-us/visualstudio/ide/mcp-servers?view=vs-2022) and the [Getting Started Video](https://www.youtube.com/watch?v=oPFecZHBCkg).
 
 ## 📝 Troubleshooting
 
 See the [Troubleshooting guide](./docs/TROUBLESHOOTING.md) for help with common issues and logging.
 
-## 🎩 Samples & best practices
+## 🎩 Samples & Best Practices
 
 Find sample prompts and best practices in our [How-to Guide](./docs/HOWTO.md).
 
-## 🙋‍♀️ Frequently asked questions
+## 🙋‍♀️ Frequently Asked Questions
 
 For answers to common questions about the Azure DevOps MCP Server, see the [Frequently Asked Questions](./docs/FAQ.md).
 
 ## 📌 Contributing
 
-We welcome contributions! During preview, please file Issues for bugs, enhancements, or documentation improvements.
+We welcome contributions! During preview, please file issues for bugs, enhancements, or documentation improvements.
 
 See our [Contributions Guide](./CONTRIBUTING.md) for:
 
@@ -288,7 +353,7 @@ See our [Contributions Guide](./CONTRIBUTING.md) for:
 - 📝 Code style & testing
 - 🔄 Pull request process
 
-## 🤝 Code of conduct
+## 🤝 Code of Conduct
 
 This project follows the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 For questions, see the [FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [open@microsoft.com](mailto:open@microsoft.com).

package/dist/index.js

@@ -4,17 +4,33 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import * as azdev from "azure-devops-node-api";
-import { DefaultAzureCredential } from "@azure/identity";
+import { AzureCliCredential, ChainedTokenCredential, DefaultAzureCredential } from "@azure/identity";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
 import { configurePrompts } from "./prompts.js";
 import { configureAllTools } from "./tools.js";
 import { UserAgentComposer } from "./useragent.js";
 import { packageVersion } from "./version.js";
-const args = process.argv.slice(2);
-if (args.length === 0) {
-    console.error("Usage: mcp-server-azuredevops <organization_name>");
-    process.exit(1);
-}
-export const orgName = args[0];
+// Parse command line arguments using yargs
+const argv = yargs(hideBin(process.argv))
+    .scriptName("mcp-server-azuredevops")
+    .usage("Usage: $0 <organization> [options]")
+    .version(packageVersion)
+    .command("$0 <organization>", "Azure DevOps MCP Server", (yargs) => {
+    yargs.positional("organization", {
+        describe: "Azure DevOps organization name",
+        type: "string",
+    });
+})
+    .option("tenant", {
+    alias: "t",
+    describe: "Azure tenant ID (optional, required for multi-tenant scenarios)",
+    type: "string",
+})
+    .help()
+    .parseSync();
+export const orgName = argv.organization;
+const tenantId = argv.tenant;
 const orgUrl = "https://dev.azure.com/" + orgName;
 async function getAzureDevOpsToken() {
     if (process.env.ADO_MCP_AZURE_TOKEN_CREDENTIALS) {
@@ -23,8 +39,16 @@ async function getAzureDevOpsToken() {
     else {
         process.env.AZURE_TOKEN_CREDENTIALS = "dev";
     }
-    const credential = new DefaultAzureCredential(); // CodeQL [SM05138] resolved by explicitly setting AZURE_TOKEN_CREDENTIALS
+    let credential = new DefaultAzureCredential(); // CodeQL [SM05138] resolved by explicitly setting AZURE_TOKEN_CREDENTIALS
+    if (tenantId) {
+        // Use Azure CLI credential if tenantId is provided for multi-tenant scenarios
+        const azureCliCredential = new AzureCliCredential({ tenantId });
+        credential = new ChainedTokenCredential(azureCliCredential, credential);
+    }
     const token = await credential.getToken("499b84ac-1321-427f-aa17-267ca6975798/.default");
+    if (!token) {
+        throw new Error("Failed to obtain Azure DevOps token. Ensure you have Azure CLI logged in or another token source setup correctly.");
+    }
     return token;
 }
 function getAzureDevOpsClient(userAgentComposer) {

package/dist/tools/builds.js

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { apiVersion } from "../utils.js";
+import { apiVersion, getEnumKeys, safeEnumConvert } from "../utils.js";
 import { BuildQueryOrder, DefinitionQueryOrder } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
 import { z } from "zod";
 import { StageUpdateType } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
@@ -22,7 +22,10 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
         repositoryType: z.enum(["TfsGit", "GitHub", "BitbucketCloud"]).optional().describe("Type of repository to filter build definitions"),
         name: z.string().optional().describe("Name of the build definition to filter"),
         path: z.string().optional().describe("Path of the build definition to filter"),
-        queryOrder: z.nativeEnum(DefinitionQueryOrder).optional().describe("Order in which build definitions are returned"),
+        queryOrder: z
+            .enum(getEnumKeys(DefinitionQueryOrder))
+            .optional()
+            .describe("Order in which build definitions are returned"),
         top: z.number().optional().describe("Maximum number of build definitions to return"),
         continuationToken: z.string().optional().describe("Token for continuing paged results"),
         minMetricsTime: z.coerce.date().optional().describe("Minimum metrics time to filter build definitions"),
@@ -37,7 +40,7 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
     }, async ({ project, repositoryId, repositoryType, name, path, queryOrder, top, continuationToken, minMetricsTime, definitionIds, builtAfter, notBuiltAfter, includeAllProperties, includeLatestBuilds, taskIdFilter, processType, yamlFilename, }) => {
         const connection = await connectionProvider();
         const buildApi = await connection.getBuildApi();
-        const buildDefinitions = await buildApi.getDefinitions(project, name, repositoryId, repositoryType, queryOrder, top, continuationToken, minMetricsTime, definitionIds, path, builtAfter, notBuiltAfter, includeAllProperties, includeLatestBuilds, taskIdFilter, processType, yamlFilename);
+        const buildDefinitions = await buildApi.getDefinitions(project, name, repositoryId, repositoryType, safeEnumConvert(DefinitionQueryOrder, queryOrder), top, continuationToken, minMetricsTime, definitionIds, path, builtAfter, notBuiltAfter, includeAllProperties, includeLatestBuilds, taskIdFilter, processType, yamlFilename);
         return {
             content: [{ type: "text", text: JSON.stringify(buildDefinitions, null, 2) }],
         };
@@ -70,7 +73,11 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
         continuationToken: z.string().optional().describe("Token for continuing paged results"),
         maxBuildsPerDefinition: z.number().optional().describe("Maximum number of builds per definition"),
         deletedFilter: z.number().optional().describe("Filter for deleted builds (see QueryDeletedOption enum)"),
-        queryOrder: z.nativeEnum(BuildQueryOrder).default(BuildQueryOrder.QueueTimeDescending).optional().describe("Order in which builds are returned"),
+        queryOrder: z
+            .enum(getEnumKeys(BuildQueryOrder))
+            .default("QueueTimeDescending")
+            .optional()
+            .describe("Order in which builds are returned"),
         branchName: z.string().optional().describe("Branch name to filter builds"),
         buildIds: z.array(z.number()).optional().describe("Array of build IDs to retrieve"),
         repositoryId: z.string().optional().describe("Repository ID to filter builds"),
@@ -78,7 +85,7 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
     }, async ({ project, definitions, queues, buildNumber, minTime, maxTime, requestedFor, reasonFilter, statusFilter, resultFilter, tagFilters, properties, top, continuationToken, maxBuildsPerDefinition, deletedFilter, queryOrder, branchName, buildIds, repositoryId, repositoryType, }) => {
         const connection = await connectionProvider();
         const buildApi = await connection.getBuildApi();
-        const builds = await buildApi.getBuilds(project, definitions, queues, buildNumber, minTime, maxTime, requestedFor, reasonFilter, statusFilter, resultFilter, tagFilters, properties, top, continuationToken, maxBuildsPerDefinition, deletedFilter, queryOrder, branchName, buildIds, repositoryId, repositoryType);
+        const builds = await buildApi.getBuilds(project, definitions, queues, buildNumber, minTime, maxTime, requestedFor, reasonFilter, statusFilter, resultFilter, tagFilters, properties, top, continuationToken, maxBuildsPerDefinition, deletedFilter, safeEnumConvert(BuildQueryOrder, queryOrder), branchName, buildIds, repositoryId, repositoryType);
         return {
             content: [{ type: "text", text: JSON.stringify(builds, null, 2) }],
         };
@@ -168,7 +175,7 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
         project: z.string().describe("Project ID or name to update the build stage for"),
         buildId: z.number().describe("ID of the build to update"),
         stageName: z.string().describe("Name of the stage to update"),
-        status: z.nativeEnum(StageUpdateType).describe("New status for the stage"),
+        status: z.enum(getEnumKeys(StageUpdateType)).describe("New status for the stage"),
         forceRetryAllJobs: z.boolean().default(false).describe("Whether to force retry all jobs in the stage."),
     }, async ({ project, buildId, stageName, status, forceRetryAllJobs }) => {
         const connection = await connectionProvider();
@@ -177,7 +184,7 @@ function configureBuildTools(server, tokenProvider, connectionProvider) {
         const token = await tokenProvider();
         const body = {
             forceRetryAllJobs: forceRetryAllJobs,
-            state: status.valueOf(),
+            state: safeEnumConvert(StageUpdateType, status),
         };
         const response = await fetch(endpoint, {
             method: "PATCH",

package/dist/tools/releases.js

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 import { ReleaseDefinitionExpands, ReleaseDefinitionQueryOrder, ReleaseExpands, ReleaseStatus, ReleaseQueryOrder } from "azure-devops-node-api/interfaces/ReleaseInterfaces.js";
 import { z } from "zod";
+import { getEnumKeys, safeEnumConvert } from "../utils.js";
 const RELEASE_TOOLS = {
     get_release_definitions: "release_get_definitions",
     get_releases: "release_get_releases",
@@ -10,12 +11,18 @@ function configureReleaseTools(server, tokenProvider, connectionProvider) {
     server.tool(RELEASE_TOOLS.get_release_definitions, "Retrieves list of release definitions for a given project.", {
         project: z.string().describe("Project ID or name to get release definitions for"),
         searchText: z.string().optional().describe("Search text to filter release definitions"),
-        expand: z.nativeEnum(ReleaseDefinitionExpands).default(ReleaseDefinitionExpands.None).describe("Expand options for release definitions"),
+        expand: z
+            .enum(getEnumKeys(ReleaseDefinitionExpands))
+            .default("None")
+            .describe("Expand options for release definitions"),
         artifactType: z.string().optional().describe("Filter by artifact type"),
         artifactSourceId: z.string().optional().describe("Filter by artifact source ID"),
         top: z.number().optional().describe("Number of results to return (for pagination)"),
         continuationToken: z.string().optional().describe("Continuation token for pagination"),
-        queryOrder: z.nativeEnum(ReleaseDefinitionQueryOrder).default(ReleaseDefinitionQueryOrder.NameAscending).describe("Order of the results"),
+        queryOrder: z
+            .enum(getEnumKeys(ReleaseDefinitionQueryOrder))
+            .default("NameAscending")
+            .describe("Order of the results"),
         path: z.string().optional().describe("Path to filter release definitions"),
         isExactNameMatch: z.boolean().optional().default(false).describe("Whether to match the exact name of the release definition. Default is false."),
         tagFilter: z.array(z.string()).optional().describe("Filter by tags associated with the release definitions"),
@@ -26,7 +33,7 @@ function configureReleaseTools(server, tokenProvider, connectionProvider) {
     }, async ({ project, searchText, expand, artifactType, artifactSourceId, top, continuationToken, queryOrder, path, isExactNameMatch, tagFilter, propertyFilters, definitionIdFilter, isDeleted, searchTextContainsFolderName, }) => {
         const connection = await connectionProvider();
         const releaseApi = await connection.getReleaseApi();
-        const releaseDefinitions = await releaseApi.getReleaseDefinitions(project, searchText, expand, artifactType, artifactSourceId, top, continuationToken, queryOrder, path, isExactNameMatch, tagFilter, propertyFilters, definitionIdFilter, isDeleted, searchTextContainsFolderName);
+        const releaseDefinitions = await releaseApi.getReleaseDefinitions(project, searchText, safeEnumConvert(ReleaseDefinitionExpands, expand), artifactType, artifactSourceId, top, continuationToken, safeEnumConvert(ReleaseDefinitionQueryOrder, queryOrder), path, isExactNameMatch, tagFilter, propertyFilters, definitionIdFilter, isDeleted, searchTextContainsFolderName);
         return {
             content: [{ type: "text", text: JSON.stringify(releaseDefinitions, null, 2) }],
         };
@@ -37,7 +44,11 @@ function configureReleaseTools(server, tokenProvider, connectionProvider) {
         definitionEnvironmentId: z.number().optional().describe("ID of the definition environment to filter releases"),
         searchText: z.string().optional().describe("Search text to filter releases"),
         createdBy: z.string().optional().describe("User ID or name who created the release"),
-        statusFilter: z.nativeEnum(ReleaseStatus).optional().default(ReleaseStatus.Active).describe("Status of the releases to filter (default: Active)"),
+        statusFilter: z
+            .enum(getEnumKeys(ReleaseStatus))
+            .optional()
+            .default("Active")
+            .describe("Status of the releases to filter (default: Active)"),
         environmentStatusFilter: z.number().optional().describe("Environment status to filter releases"),
         minCreatedTime: z.coerce
             .date()
@@ -53,10 +64,18 @@ function configureReleaseTools(server, tokenProvider, connectionProvider) {
             .optional()
             .default(() => new Date())
             .describe("Maximum created time for releases (default: now)"),
-        queryOrder: z.nativeEnum(ReleaseQueryOrder).optional().default(ReleaseQueryOrder.Ascending).describe("Order in which to return releases (default: Ascending)"),
+        queryOrder: z
+            .enum(getEnumKeys(ReleaseQueryOrder))
+            .optional()
+            .default("Ascending")
+            .describe("Order in which to return releases (default: Ascending)"),
         top: z.number().optional().describe("Number of releases to return"),
         continuationToken: z.number().optional().describe("Continuation token for pagination"),
-        expand: z.nativeEnum(ReleaseExpands).optional().default(ReleaseExpands.None).describe("Expand options for releases"),
+        expand: z
+            .enum(getEnumKeys(ReleaseExpands))
+            .optional()
+            .default("None")
+            .describe("Expand options for releases"),
         artifactTypeId: z.string().optional().describe("Filter releases by artifact type ID"),
         sourceId: z.string().optional().describe("Filter releases by artifact source ID"),
         artifactVersionId: z.string().optional().describe("Filter releases by artifact version ID"),
@@ -69,7 +88,7 @@ function configureReleaseTools(server, tokenProvider, connectionProvider) {
     }, async ({ project, definitionId, definitionEnvironmentId, searchText, createdBy, statusFilter, environmentStatusFilter, minCreatedTime, maxCreatedTime, queryOrder, top, continuationToken, expand, artifactTypeId, sourceId, artifactVersionId, sourceBranchFilter, isDeleted, tagFilter, propertyFilters, releaseIdFilter, path, }) => {
         const connection = await connectionProvider();
         const releaseApi = await connection.getReleaseApi();
-        const releases = await releaseApi.getReleases(project, definitionId, definitionEnvironmentId, searchText, createdBy, statusFilter, environmentStatusFilter, minCreatedTime, maxCreatedTime, queryOrder, top, continuationToken, expand, artifactTypeId, sourceId, artifactVersionId, sourceBranchFilter, isDeleted, tagFilter, propertyFilters, releaseIdFilter, path);
+        const releases = await releaseApi.getReleases(project, definitionId, definitionEnvironmentId, searchText, createdBy, safeEnumConvert(ReleaseStatus, statusFilter), environmentStatusFilter, minCreatedTime, maxCreatedTime, safeEnumConvert(ReleaseQueryOrder, queryOrder), top, continuationToken, safeEnumConvert(ReleaseExpands, expand), artifactTypeId, sourceId, artifactVersionId, sourceBranchFilter, isDeleted, tagFilter, propertyFilters, releaseIdFilter, path);
         return {
             content: [{ type: "text", text: JSON.stringify(releases, null, 2) }],
         };