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

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_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.
 
 ### 📁 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,52 @@ 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_reply_to_comment**: Reply to a specific comment on a pull request.
+- **repo_resolve_comment**: Resolve a specific comment thread on a pull request.
+- **repo_search_commits**: Search for commits.
 
 ### 🛰️ 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 +160,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 +214,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 +327,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 +352,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) }],
         };

package/dist/tools/repos.js

@@ -3,6 +3,7 @@
 import { PullRequestStatus, GitVersionType, GitPullRequestQueryType, } from "azure-devops-node-api/interfaces/GitInterfaces.js";
 import { z } from "zod";
 import { getCurrentUserDetails } from "./auth.js";
+import { getEnumKeys } from "../utils.js";
 const REPO_TOOLS = {
     list_repos_by_project: "repo_list_repos_by_project",
     list_pull_requests_by_repo: "repo_list_pull_requests_by_repo",
@@ -32,15 +33,15 @@ function branchesFilterOutIrrelevantProperties(branches, top) {
 }
 function pullRequestStatusStringToInt(status) {
     switch (status) {
-        case "abandoned":
+        case "Abandoned":
             return PullRequestStatus.Abandoned.valueOf();
-        case "active":
+        case "Active":
             return PullRequestStatus.Active.valueOf();
-        case "all":
+        case "All":
             return PullRequestStatus.All.valueOf();
-        case "completed":
+        case "Completed":
             return PullRequestStatus.Completed.valueOf();
-        case "notSet":
+        case "NotSet":
             return PullRequestStatus.NotSet.valueOf();
         default:
             throw new Error(`Unknown pull request status: ${status}`);
@@ -79,11 +80,11 @@ function configureRepoTools(server, tokenProvider, connectionProvider) {
     server.tool(REPO_TOOLS.update_pull_request_status, "Update status of an existing pull request to active or abandoned.", {
         repositoryId: z.string().describe("The ID of the repository where the pull request exists."),
         pullRequestId: z.number().describe("The ID of the pull request to be published."),
-        status: z.enum(["active", "abandoned"]).describe("The new status of the pull request. Can be 'active' or 'abandoned'."),
+        status: z.enum(["Active", "Abandoned"]).describe("The new status of the pull request. Can be 'Active' or 'Abandoned'."),
     }, async ({ repositoryId, pullRequestId, status }) => {
         const connection = await connectionProvider();
         const gitApi = await connection.getGitApi();
-        const statusValue = status === "active" ? 3 : 2;
+        const statusValue = status === "Active" ? PullRequestStatus.Active.valueOf() : PullRequestStatus.Abandoned.valueOf();
         const updatedPullRequest = await gitApi.updatePullRequest({ status: statusValue }, repositoryId, pullRequestId);
         return {
             content: [{ type: "text", text: JSON.stringify(updatedPullRequest, null, 2) }],
@@ -144,7 +145,10 @@ function configureRepoTools(server, tokenProvider, connectionProvider) {
         skip: z.number().default(0).describe("The number of pull requests to skip."),
         created_by_me: z.boolean().default(false).describe("Filter pull requests created by the current user."),
         i_am_reviewer: z.boolean().default(false).describe("Filter pull requests where the current user is a reviewer."),
-        status: z.enum(["abandoned", "active", "all", "completed", "notSet"]).default("active").describe("Filter pull requests by status. Defaults to 'active'."),
+        status: z
+            .enum(getEnumKeys(PullRequestStatus))
+            .default("Active")
+            .describe("Filter pull requests by status. Defaults to 'Active'."),
     }, async ({ repositoryId, top, skip, created_by_me, i_am_reviewer, status }) => {
         const connection = await connectionProvider();
         const gitApi = await connection.getGitApi();
@@ -189,7 +193,10 @@ function configureRepoTools(server, tokenProvider, connectionProvider) {
         skip: z.number().default(0).describe("The number of pull requests to skip."),
         created_by_me: z.boolean().default(false).describe("Filter pull requests created by the current user."),
         i_am_reviewer: z.boolean().default(false).describe("Filter pull requests where the current user is a reviewer."),
-        status: z.enum(["abandoned", "active", "all", "completed", "notSet"]).default("active").describe("Filter pull requests by status. Defaults to 'active'."),
+        status: z
+            .enum(getEnumKeys(PullRequestStatus))
+            .default("Active")
+            .describe("Filter pull requests by status. Defaults to 'Active'."),
     }, async ({ project, top, skip, created_by_me, i_am_reviewer, status }) => {
         const connection = await connectionProvider();
         const gitApi = await connection.getGitApi();

package/dist/tools/search.js

@@ -10,38 +10,37 @@ const SEARCH_TOOLS = {
     search_workitem: "search_workitem",
 };
 function configureSearchTools(server, tokenProvider, connectionProvider, userAgentProvider) {
-    /*
-      CODE SEARCH
-      Get the code search results for a given search text.
-    */
-    server.tool(SEARCH_TOOLS.search_code, "Get the code search results for a given search text.", {
-        searchRequest: z
-            .object({
-            searchText: z.string().describe("Search text to find in code"),
-            $skip: z.number().default(0).describe("Number of results to skip (for pagination)"),
-            $top: z.number().default(5).describe("Number of results to return (for pagination)"),
-            filters: z
-                .object({
-                Project: z.array(z.string()).optional().describe("Filter in these projects"),
-                Repository: z.array(z.string()).optional().describe("Filter in these repositories"),
-                Path: z.array(z.string()).optional().describe("Filter in these paths"),
-                Branch: z.array(z.string()).optional().describe("Filter in these branches"),
-                CodeElement: z.array(z.string()).optional().describe("Filter for these code elements (e.g., classes, functions, symbols)"),
-                // Note: CodeElement is optional and can be used to filter results by specific code elements.
-                // It can be a string or an array of strings.
-                // If provided, the search will only return results that match the specified code elements.
-                // This is useful for narrowing down the search to specific classes, functions, definitions, or symbols.
-                // Example: CodeElement: ["MyClass", "MyFunction"]
-            })
-                .partial()
-                .optional(),
-            includeFacets: z.boolean().optional(),
-        })
-            .strict(),
-    }, async ({ searchRequest }) => {
+    server.tool(SEARCH_TOOLS.search_code, "Search Azure DevOps Repositories for a given search text", {
+        searchText: z.string().describe("Keywords to search for in code repositories"),
+        project: z.array(z.string()).optional().describe("Filter by projects"),
+        repository: z.array(z.string()).optional().describe("Filter by repositories"),
+        path: z.array(z.string()).optional().describe("Filter by paths"),
+        branch: z.array(z.string()).optional().describe("Filter by branches"),
+        includeFacets: z.boolean().default(false).describe("Include facets in the search results"),
+        $skip: z.number().default(0).describe("Number of results to skip"),
+        $top: z.number().default(5).describe("Maximum number of results to return"),
+    }, async ({ searchText, project, repository, path, branch, includeFacets, $skip, $top }) => {
         const accessToken = await tokenProvider();
         const connection = await connectionProvider();
         const url = `https://almsearch.dev.azure.com/${orgName}/_apis/search/codesearchresults?api-version=${apiVersion}`;
+        const requestBody = {
+            searchText,
+            includeFacets,
+            $skip,
+            $top,
+        };
+        const filters = {};
+        if (project && project.length > 0)
+            filters.Project = project;
+        if (repository && repository.length > 0)
+            filters.Repository = repository;
+        if (path && path.length > 0)
+            filters.Path = path;
+        if (branch && branch.length > 0)
+            filters.Branch = branch;
+        if (Object.keys(filters).length > 0) {
+            requestBody.filters = filters;
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -49,44 +48,43 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
                 "Authorization": `Bearer ${accessToken.token}`,
                 "User-Agent": userAgentProvider(),
             },
-            body: JSON.stringify(searchRequest),
+            body: JSON.stringify(requestBody),
         });
         if (!response.ok) {
             throw new Error(`Azure DevOps Code Search API error: ${response.status} ${response.statusText}`);
         }
         const resultText = await response.text();
         const resultJson = JSON.parse(resultText);
-        const topResults = Array.isArray(resultJson.results) ? resultJson.results.slice(0, Math.min(searchRequest.$top, resultJson.results.length)) : [];
         const gitApi = await connection.getGitApi();
-        const combinedResults = await fetchCombinedResults(topResults, gitApi);
+        const combinedResults = await fetchCombinedResults(resultJson.results ?? [], gitApi);
         return {
             content: [{ type: "text", text: resultText + JSON.stringify(combinedResults) }],
         };
     });
-    /*
-    WIKI SEARCH
-    Get wiki search results for a given search text.
-  */
-    server.tool(SEARCH_TOOLS.search_wiki, "Get wiki search results for a given search text.", {
-        searchRequest: z
-            .object({
-            searchText: z.string().describe("Search text to find in wikis"),
-            $skip: z.number().default(0).describe("Number of results to skip (for pagination)"),
-            $top: z.number().default(10).describe("Number of results to return (for pagination)"),
-            filters: z
-                .object({
-                Project: z.array(z.string()).optional().describe("Filter in these projects"),
-                Wiki: z.array(z.string()).optional().describe("Filter in these wiki names"),
-            })
-                .partial()
-                .optional()
-                .describe("Filters to apply to the search text"),
-            includeFacets: z.boolean().optional(),
-        })
-            .strict(),
-    }, async ({ searchRequest }) => {
+    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"),
+        project: z.array(z.string()).optional().describe("Filter by projects"),
+        wiki: z.array(z.string()).optional().describe("Filter by wiki names"),
+        includeFacets: z.boolean().default(false).describe("Include facets in the search results"),
+        $skip: z.number().default(0).describe("Number of results to skip"),
+        $top: z.number().default(10).describe("Maximum number of results to return"),
+    }, async ({ searchText, project, wiki, includeFacets, $skip, $top }) => {
         const accessToken = await tokenProvider();
         const url = `https://almsearch.dev.azure.com/${orgName}/_apis/search/wikisearchresults?api-version=${apiVersion}`;
+        const requestBody = {
+            searchText,
+            includeFacets,
+            $skip,
+            $top,
+        };
+        const filters = {};
+        if (project && project.length > 0)
+            filters.Project = project;
+        if (wiki && wiki.length > 0)
+            filters.Wiki = wiki;
+        if (Object.keys(filters).length > 0) {
+            requestBody.filters = filters;
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -94,7 +92,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
                 "Authorization": `Bearer ${accessToken.token}`,
                 "User-Agent": userAgentProvider(),
             },
-            body: JSON.stringify(searchRequest),
+            body: JSON.stringify(requestBody),
         });
         if (!response.ok) {
             throw new Error(`Azure DevOps Wiki Search API error: ${response.status} ${response.statusText}`);
@@ -104,32 +102,39 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
             content: [{ type: "text", text: result }],
         };
     });
-    /*
-    WORK ITEM SEARCH
-    Get work item search results for a given search text.
-  */
-    server.tool(SEARCH_TOOLS.search_workitem, "Get work item search results for a given search text.", {
-        searchRequest: z
-            .object({
-            searchText: z.string().describe("Search text to find in work items"),
-            $skip: z.number().default(0).describe("Number of results to skip for pagination"),
-            $top: z.number().default(10).describe("Number of results to return"),
-            filters: z
-                .object({
-                "System.TeamProject": z.array(z.string()).optional().describe("Filter by team project"),
-                "System.AreaPath": z.array(z.string()).optional().describe("Filter by area path"),
-                "System.WorkItemType": z.array(z.string()).optional().describe("Filter by work item type like Bug, Task, User Story"),
-                "System.State": z.array(z.string()).optional().describe("Filter by state"),
-                "System.AssignedTo": z.array(z.string()).optional().describe("Filter by assigned to"),
-            })
-                .partial()
-                .optional(),
-            includeFacets: z.boolean().optional(),
-        })
-            .strict(),
-    }, async ({ searchRequest }) => {
+    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"),
+        project: z.array(z.string()).optional().describe("Filter by projects"),
+        areaPath: z.array(z.string()).optional().describe("Filter by area paths"),
+        workItemType: z.array(z.string()).optional().describe("Filter by work item types"),
+        state: z.array(z.string()).optional().describe("Filter by work item states"),
+        assignedTo: z.array(z.string()).optional().describe("Filter by assigned to users"),
+        includeFacets: z.boolean().default(false).describe("Include facets in the search results"),
+        $skip: z.number().default(0).describe("Number of results to skip for pagination"),
+        $top: z.number().default(10).describe("Number of results to return"),
+    }, async ({ searchText, project, areaPath, workItemType, state, assignedTo, includeFacets, $skip, $top }) => {
         const accessToken = await tokenProvider();
         const url = `https://almsearch.dev.azure.com/${orgName}/_apis/search/workitemsearchresults?api-version=${apiVersion}`;
+        const requestBody = {
+            searchText,
+            includeFacets,
+            $skip,
+            $top,
+        };
+        const filters = {};
+        if (project && project.length > 0)
+            filters["System.TeamProject"] = project;
+        if (areaPath && areaPath.length > 0)
+            filters["System.AreaPath"] = areaPath;
+        if (workItemType && workItemType.length > 0)
+            filters["System.WorkItemType"] = workItemType;
+        if (state && state.length > 0)
+            filters["System.State"] = state;
+        if (assignedTo && assignedTo.length > 0)
+            filters["System.AssignedTo"] = assignedTo;
+        if (Object.keys(filters).length > 0) {
+            requestBody.filters = filters;
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -137,7 +142,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
                 "Authorization": `Bearer ${accessToken.token}`,
                 "User-Agent": userAgentProvider(),
             },
-            body: JSON.stringify(searchRequest),
+            body: JSON.stringify(requestBody),
         });
         if (!response.ok) {
             throw new Error(`Azure DevOps Work Item Search API error: ${response.status} ${response.statusText}`);

package/dist/tools/workitems.js

@@ -1,7 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import { QueryExpand } from "azure-devops-node-api/interfaces/WorkItemTrackingInterfaces.js";
 import { z } from "zod";
-import { batchApiVersion } from "../utils.js";
+import { batchApiVersion, markdownCommentsApiVersion, getEnumKeys, safeEnumConvert } from "../utils.js";
+/**
+ * Converts Operation enum key to lowercase string for API usage
+ * @param operation The Operation enum key (e.g., "Add", "Replace", "Remove")
+ * @returns Lowercase string for API usage (e.g., "add", "replace", "remove")
+ */
+function operationToApiString(operation) {
+    return operation.toLowerCase();
+}
 const WORKITEM_TOOLS = {
     my_work_items: "wit_my_work_items",
     list_backlogs: "wit_list_backlogs",
@@ -42,6 +51,10 @@ function getLinkTypeFromName(name) {
             return "Microsoft.VSTS.Common.TestedBy-Forward";
         case "tests":
             return "Microsoft.VSTS.Common.TestedBy-Reverse";
+        case "affects":
+            return "Microsoft.VSTS.Common.Affects-Forward";
+        case "affected by":
+            return "Microsoft.VSTS.Common.Affects-Reverse";
         default:
             throw new Error(`Unknown link type: ${name}`);
     }
@@ -131,13 +144,30 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         project: z.string().describe("The name or ID of the Azure DevOps project."),
         workItemId: z.number().describe("The ID of the work item to add a comment to."),
         comment: z.string().describe("The text of the comment to add to the work item."),
-    }, async ({ project, workItemId, comment }) => {
+        format: z.enum(["markdown", "html"]).optional().default("html"),
+    }, async ({ project, workItemId, comment, format }) => {
         const connection = await connectionProvider();
-        const workItemApi = await connection.getWorkItemTrackingApi();
-        const commentCreate = { text: comment };
-        const commentResponse = await workItemApi.addComment(commentCreate, project, workItemId);
+        const orgUrl = connection.serverUrl;
+        const accessToken = await tokenProvider();
+        const body = {
+            text: comment,
+        };
+        const formatParameter = format === "markdown" ? 0 : 1;
+        const response = await fetch(`${orgUrl}/${project}/_apis/wit/workItems/${workItemId}/comments?format=${formatParameter}&api-version=${markdownCommentsApiVersion}`, {
+            method: "POST",
+            headers: {
+                "Authorization": `Bearer ${accessToken.token}`,
+                "Content-Type": "application/json",
+                "User-Agent": userAgentProvider(),
+            },
+            body: JSON.stringify(body),
+        });
+        if (!response.ok) {
+            throw new Error(`Failed to add a work item comment: ${response.statusText}}`);
+        }
+        const comments = await response.text();
         return {
-            content: [{ type: "text", text: JSON.stringify(commentResponse, null, 2) }],
+            content: [{ type: "text", text: comments }],
         };
     });
     server.tool(WORKITEM_TOOLS.add_child_work_items, "Create one or many child work items from a parent by work item type and parent id.", {
@@ -200,6 +230,13 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
                         value: item.areaPath,
                     });
                 }
+                if (item.iterationPath && item.iterationPath.trim().length > 0) {
+                    ops.push({
+                        op: "add",
+                        path: "/fields/System.IterationPath",
+                        value: item.iterationPath,
+                    });
+                }
                 if (item.format && item.format === "Markdown") {
                     ops.push({
                         op: "add",
@@ -212,13 +249,6 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
                         value: item.format,
                     });
                 }
-                if (item.iterationPath && item.iterationPath.trim().length > 0) {
-                    ops.push({
-                        op: "add",
-                        path: "/fields/System.IterationPath",
-                        value: item.iterationPath,
-                    });
-                }
                 return {
                     method: "PATCH",
                     uri: `/${project}/_apis/wit/workitems/$${workItemType}?api-version=${batchApiVersion}`,
@@ -254,17 +284,17 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         }
     });
     server.tool(WORKITEM_TOOLS.link_work_item_to_pull_request, "Link a single work item to an existing pull request.", {
-        project: z.string().describe("The name or ID of the Azure DevOps project."),
+        projectId: z.string().describe("The project ID of the Azure DevOps project (note: project name is not valid)."),
         repositoryId: z.string().describe("The ID of the repository containing the pull request. Do not use the repository name here, use the ID instead."),
         pullRequestId: z.number().describe("The ID of the pull request to link to."),
         workItemId: z.number().describe("The ID of the work item to link to the pull request."),
-    }, async ({ project, repositoryId, pullRequestId, workItemId }) => {
+    }, async ({ projectId, repositoryId, pullRequestId, workItemId }) => {
         try {
             const connection = await connectionProvider();
             const workItemTrackingApi = await connection.getWorkItemTrackingApi();
             // Create artifact link relation using vstfs format
             // Format: vstfs:///Git/PullRequestId/{project}/{repositoryId}/{pullRequestId}
-            const artifactPathValue = `${project}/${repositoryId}/${pullRequestId}`;
+            const artifactPathValue = `${projectId}/${repositoryId}/${pullRequestId}`;
             const vstfsUrl = `vstfs:///Git/PullRequestId/${encodeURIComponent(artifactPathValue)}`;
             // Use the PATCH document format for adding a relation
             const patchDocument = [
@@ -281,7 +311,7 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
                 },
             ];
             // Use the WorkItem API to update the work item with the new relation
-            const workItem = await workItemTrackingApi.updateWorkItem({}, patchDocument, workItemId, project);
+            const workItem = await workItemTrackingApi.updateWorkItem({}, patchDocument, workItemId, projectId);
             if (!workItem) {
                 return { content: [{ type: "text", text: "Work item update failed" }], isError: true };
             }
@@ -323,15 +353,20 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         id: z.number().describe("The ID of the work item to update."),
         updates: z
             .array(z.object({
-            op: z.enum(["add", "replace", "remove"]).default("add").describe("The operation to perform on the field."),
+            op: z.enum(["Add", "Replace", "Remove"]).default("Add").describe("The operation to perform on the field."),
             path: z.string().describe("The path of the field to update, e.g., '/fields/System.Title'."),
-            value: z.string().describe("The new value for the field. This is required for 'add' and 'replace' operations, and should be omitted for 'remove' operations."),
+            value: z.string().describe("The new value for the field. This is required for 'Add' and 'Replace' operations, and should be omitted for 'Remove' operations."),
         }))
             .describe("An array of field updates to apply to the work item."),
     }, async ({ id, updates }) => {
         const connection = await connectionProvider();
         const workItemApi = await connection.getWorkItemTrackingApi();
-        const updatedWorkItem = await workItemApi.updateWorkItem(null, updates, id);
+        // Convert operation names to lowercase for API
+        const apiUpdates = updates.map((update) => ({
+            ...update,
+            op: operationToApiString(update.op),
+        }));
+        const updatedWorkItem = await workItemApi.updateWorkItem(null, apiUpdates, id);
         return {
             content: [{ type: "text", text: JSON.stringify(updatedWorkItem, null, 2) }],
         };
@@ -351,17 +386,33 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         project: z.string().describe("The name or ID of the Azure DevOps project."),
         workItemType: z.string().describe("The type of work item to create, e.g., 'Task', 'Bug', etc."),
         fields: z
-            .record(z.string(), z.string())
-            .describe("A record of field names and values to set on the new work item. Each key is a field name, and each value is the corresponding value to set for that field."),
+            .array(z.object({
+            name: z.string().describe("The name of the field, e.g., 'System.Title'."),
+            value: z.string().describe("The value of the field."),
+            format: z.enum(["Html", "Markdown"]).optional().describe("the format of the field value, e.g., 'Html', 'Markdown'. Optional, defaults to 'Html'."),
+        }))
+            .describe("A record of field names and values to set on the new work item. Each fild is the field name and each value is the corresponding value to set for that field."),
     }, async ({ project, workItemType, fields }) => {
         try {
             const connection = await connectionProvider();
             const workItemApi = await connection.getWorkItemTrackingApi();
-            const document = Object.entries(fields).map(([key, value]) => ({
+            const document = fields.map(({ name, value }) => ({
                 op: "add",
-                path: `/fields/${key}`,
-                value,
+                path: `/fields/${name}`,
+                value: value,
             }));
+            // Check if any field has format === "Markdown" and add the multilineFieldsFormat operation
+            // this should only happen for large text fields, but since we dont't know by field name, lets assume if the users
+            // passes a value longer than 50 characters, then we can set the format to Markdown
+            fields.forEach(({ name, value, format }) => {
+                if (value.length > 50 && format === "Markdown") {
+                    document.push({
+                        op: "add",
+                        path: `/multilineFieldsFormat/${name}`,
+                        value: "Markdown",
+                    });
+                }
+            });
             const newWorkItem = await workItemApi.createWorkItem(null, document, project, workItemType);
             if (!newWorkItem) {
                 return { content: [{ type: "text", text: "Work item was not created" }], isError: true };
@@ -381,14 +432,17 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
     server.tool(WORKITEM_TOOLS.get_query, "Get a query by its ID or path.", {
         project: z.string().describe("The name or ID of the Azure DevOps project."),
         query: z.string().describe("The ID or path of the query to retrieve."),
-        expand: z.enum(["all", "clauses", "minimal", "none", "wiql"]).optional().describe("Optional expand parameter to include additional details in the response. Defaults to 'none'."),
+        expand: z
+            .enum(getEnumKeys(QueryExpand))
+            .optional()
+            .describe("Optional expand parameter to include additional details in the response. Defaults to 'None'."),
         depth: z.number().default(0).describe("Optional depth parameter to specify how deep to expand the query. Defaults to 0."),
         includeDeleted: z.boolean().default(false).describe("Whether to include deleted items in the query results. Defaults to false."),
         useIsoDateFormat: z.boolean().default(false).describe("Whether to use ISO date format in the response. Defaults to false."),
     }, async ({ project, query, expand, depth, includeDeleted, useIsoDateFormat }) => {
         const connection = await connectionProvider();
         const workItemApi = await connection.getWorkItemTrackingApi();
-        const queryDetails = await workItemApi.getQuery(project, query, expand, depth, includeDeleted, useIsoDateFormat);
+        const queryDetails = await workItemApi.getQuery(project, query, safeEnumConvert(QueryExpand, expand), depth, includeDeleted, useIsoDateFormat);
         return {
             content: [{ type: "text", text: JSON.stringify(queryDetails, null, 2) }],
         };
@@ -411,10 +465,11 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
     server.tool(WORKITEM_TOOLS.update_work_items_batch, "Update work items in batch", {
         updates: z
             .array(z.object({
-            op: z.enum(["add", "replace", "remove"]).default("add").describe("The operation to perform on the field."),
+            op: z.enum(["Add", "Replace", "Remove"]).default("Add").describe("The operation to perform on the field."),
             id: z.number().describe("The ID of the work item to update."),
             path: z.string().describe("The path of the field to update, e.g., '/fields/System.Title'."),
             value: z.string().describe("The new value for the field. This is required for 'add' and 'replace' operations, and should be omitted for 'remove' operations."),
+            format: z.enum(["Html", "Markdown"]).optional().describe("The format of the field value. Only to be used for large text fields. e.g., 'Html', 'Markdown'. Optional, defaults to 'Html'."),
         }))
             .describe("An array of updates to apply to work items. Each update should include the operation (op), work item ID (id), field path (path), and new value (value)."),
     }, async ({ updates }) => {
@@ -423,20 +478,32 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
         const accessToken = await tokenProvider();
         // Extract unique IDs from the updates array
         const uniqueIds = Array.from(new Set(updates.map((update) => update.id)));
-        const body = uniqueIds.map((id) => ({
-            method: "PATCH",
-            uri: `/_apis/wit/workitems/${id}?api-version=${batchApiVersion}`,
-            headers: {
-                "Content-Type": "application/json-patch+json",
-            },
-            body: updates
-                .filter((update) => update.id === id)
-                .map(({ op, path, value }) => ({
+        const body = uniqueIds.map((id) => {
+            const workItemUpdates = updates.filter((update) => update.id === id);
+            const operations = workItemUpdates.map(({ op, path, value }) => ({
                 op: op,
                 path: path,
                 value: value,
-            })),
-        }));
+            }));
+            // Add format operations for Markdown fields
+            workItemUpdates.forEach(({ path, value, format }) => {
+                if (format === "Markdown" && value && value.length > 50) {
+                    operations.push({
+                        op: "Add",
+                        path: `/multilineFieldsFormat${path.replace("/fields", "")}`,
+                        value: "Markdown",
+                    });
+                }
+            });
+            return {
+                method: "PATCH",
+                uri: `/_apis/wit/workitems/${id}?api-version=${batchApiVersion}`,
+                headers: {
+                    "Content-Type": "application/json-patch+json",
+                },
+                body: operations,
+            };
+        });
         const response = await fetch(`${orgUrl}/_apis/wit/$batch?api-version=${batchApiVersion}`, {
             method: "PATCH",
             headers: {
@@ -461,9 +528,9 @@ function configureWorkItemTools(server, tokenProvider, connectionProvider, userA
             id: z.number().describe("The ID of the work item to update."),
             linkToId: z.number().describe("The ID of the work item to link to."),
             type: z
-                .enum(["parent", "child", "duplicate", "duplicate of", "related", "successor", "predecessor", "tested by", "tests"])
+                .enum(["parent", "child", "duplicate", "duplicate of", "related", "successor", "predecessor", "tested by", "tests", "affects", "affected by"])
                 .default("related")
-                .describe("Type of link to create between the work items. Options include 'parent', 'child', 'duplicate', 'duplicate of', 'related', 'successor', 'predecessor', 'tested by', 'tests', 'referenced by', and 'references'. Defaults to 'related'."),
+                .describe("Type of link to create between the work items. Options include 'parent', 'child', 'duplicate', 'duplicate of', 'related', 'successor', 'predecessor', 'tested by', 'tests', 'affects', and 'affected by'. Defaults to 'related'."),
             comment: z.string().optional().describe("Optional comment to include with the link. This can be used to provide additional context for the link being created."),
         }))
             .describe(""),

package/dist/utils.js

@@ -2,3 +2,29 @@
 // Licensed under the MIT License.
 export const apiVersion = "7.2-preview.1";
 export const batchApiVersion = "5.0";
+export const markdownCommentsApiVersion = "7.2-preview.4";
+/**
+ * Converts a TypeScript numeric enum to an array of string keys for use with z.enum().
+ * This ensures that enum schemas generate string values rather than numeric values.
+ * @param enumObject The TypeScript enum object
+ * @returns Array of string keys from the enum
+ */
+export function getEnumKeys(enumObject) {
+    return Object.keys(enumObject).filter((key) => isNaN(Number(key)));
+}
+/**
+ * Safely converts a string enum key to its corresponding enum value.
+ * Validates that the key exists in the enum before conversion.
+ * @param enumObject The TypeScript enum object
+ * @param key The string key to convert
+ * @returns The enum value if key is valid, undefined otherwise
+ */
+export function safeEnumConvert(enumObject, key) {
+    if (!key)
+        return undefined;
+    const validKeys = getEnumKeys(enumObject);
+    if (!validKeys.includes(key)) {
+        return undefined;
+    }
+    return enumObject[key];
+}

package/dist/version.js

@@ -1 +1 @@
-export const packageVersion = "1.2.0-daily.20250715";
+export const packageVersion = "1.2.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-devops/mcp",
-  "version": "1.2.0-daily.20250715",
+  "version": "1.2.0",
   "description": "MCP server for interacting with Azure DevOps",
   "license": "MIT",
   "author": "Microsoft Corporation",
@@ -26,7 +26,7 @@
     "build": "tsc && shx chmod +x dist/*.js",
     "prepare": "npm run build",
     "watch": "tsc --watch",
-    "inspect": "npx @modelcontextprotocol/inspector node dist/index.js",
+    "inspect": "ALLOWED_ORIGINS=http://127.0.0.1:6274 npx @modelcontextprotocol/inspector node dist/index.js",
     "start": "node -r tsconfig-paths/register dist/index.js",
     "eslint": "eslint",
     "eslint-fix": "eslint --fix",
@@ -37,18 +37,19 @@
   },
   "dependencies": {
     "@azure/identity": "^4.10.0",
-    "@modelcontextprotocol/sdk": "1.13.2",
+    "@modelcontextprotocol/sdk": "1.16.0",
     "azure-devops-extension-api": "^4.252.0",
     "azure-devops-extension-sdk": "^4.0.2",
     "azure-devops-node-api": "^15.1.0",
+    "yargs": "^18.0.0",
     "zod": "^3.25.63",
     "zod-to-json-schema": "^3.24.5"
   },
   "devDependencies": {
-    "@modelcontextprotocol/inspector": "^0.15.0",
+    "@modelcontextprotocol/inspector": "^0.16.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^22",
-    "eslint-config-prettier": "10.1.5",
+    "eslint-config-prettier": "10.1.8",
     "eslint-plugin-header": "^3.1.1",
     "jest": "^30.0.2",
     "jest-extended": "^6.0.0",