@azure-devops/mcp 2.2.0-nightly.20251008 → 2.2.0-nightly.20251009

package/README.md

@@ -81,8 +81,7 @@ Interact with these Azure DevOps services:
 ### 📁 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_repo_or_project**: Retrieve a list of pull requests for a given repository or project.
 - **repo_list_branches_by_repo**: Retrieve a list of branches for a given repository.
 - **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.

package/dist/tools/repositories.js

@@ -6,8 +6,7 @@ import { getCurrentUserDetails, getUserIdFromEmail } 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",
-    list_pull_requests_by_project: "repo_list_pull_requests_by_project",
+    list_pull_requests_by_repo_or_project: "repo_list_pull_requests_by_repo_or_project",
     list_branches_by_repo: "repo_list_branches_by_repo",
     list_my_branches_by_repo: "repo_list_my_branches_by_repo",
     list_pull_request_threads: "repo_list_pull_request_threads",
@@ -33,6 +32,15 @@ function branchesFilterOutIrrelevantProperties(branches, top) {
         .sort((a, b) => b.localeCompare(a))
         .slice(0, top);
 }
+function trimPullRequestThread(thread) {
+    return {
+        id: thread.id,
+        publishedDate: thread.publishedDate,
+        lastUpdatedDate: thread.lastUpdatedDate,
+        status: thread.status,
+        comments: trimComments(thread.comments),
+    };
+}
 /**
  * Trims comment data to essential properties, filtering out deleted comments
  * @param comments Array of comments to trim (can be undefined/null)
@@ -74,6 +82,24 @@ function filterReposByName(repositories, repoNameFilter) {
     const filteredByName = repositories?.filter((repo) => repo.name?.toLowerCase().includes(lowerCaseFilter));
     return filteredByName;
 }
+function trimPullRequest(pr, includeDescription = false) {
+    return {
+        pullRequestId: pr.pullRequestId,
+        codeReviewId: pr.codeReviewId,
+        repository: pr.repository?.name,
+        status: pr.status,
+        createdBy: {
+            displayName: pr.createdBy?.displayName,
+            uniqueName: pr.createdBy?.uniqueName,
+        },
+        creationDate: pr.creationDate,
+        title: pr.title,
+        ...(includeDescription ? { description: pr.description ?? "" } : {}),
+        isDraft: pr.isDraft,
+        sourceRefName: pr.sourceRefName,
+        targetRefName: pr.targetRefName,
+    };
+}
 function configureRepoTools(server, tokenProvider, connectionProvider, userAgentProvider) {
     server.tool(REPO_TOOLS.create_pull_request, "Create a new pull request.", {
         repositoryId: z.string().describe("The ID of the repository where the pull request will be created."),
@@ -104,8 +130,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             workItemRefs: workItemRefs,
             forkSource,
         }, repositoryId);
+        const trimmedPullRequest = trimPullRequest(pullRequest, true);
         return {
-            content: [{ type: "text", text: JSON.stringify(pullRequest, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(trimmedPullRequest, null, 2) }],
         };
     });
     server.tool(REPO_TOOLS.create_branch, "Create a new branch in the repository.", {
@@ -256,8 +283,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
         const updatedPullRequest = await gitApi.updatePullRequest(updateRequest, repositoryId, pullRequestId);
+        const trimmedUpdatedPullRequest = trimPullRequest(updatedPullRequest, true);
         return {
-            content: [{ type: "text", text: JSON.stringify(updatedPullRequest, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(trimmedUpdatedPullRequest, null, 2) }],
         };
     });
     server.tool(REPO_TOOLS.update_pull_request_reviewers, "Add or remove reviewers for an existing pull request.", {
@@ -271,8 +299,16 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         let updatedPullRequest;
         if (action === "add") {
             updatedPullRequest = await gitApi.createPullRequestReviewers(reviewerIds.map((id) => ({ id: id })), repositoryId, pullRequestId);
+            const trimmedResponse = updatedPullRequest.map((item) => ({
+                displayName: item.displayName,
+                id: item.id,
+                uniqueName: item.uniqueName,
+                vote: item.vote,
+                hasDeclined: item.hasDeclined,
+                isFlagged: item.isFlagged,
+            }));
             return {
-                content: [{ type: "text", text: JSON.stringify(updatedPullRequest, null, 2) }],
+                content: [{ type: "text", text: JSON.stringify(trimmedResponse, null, 2) }],
             };
         }
         else {
@@ -309,8 +345,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             content: [{ type: "text", text: JSON.stringify(trimmedRepositories, null, 2) }],
         };
     });
-    server.tool(REPO_TOOLS.list_pull_requests_by_repo, "Retrieve a list of pull requests for a given repository.", {
-        repositoryId: z.string().describe("The ID of the repository where the pull requests are located."),
+    server.tool(REPO_TOOLS.list_pull_requests_by_repo_or_project, "Retrieve a list of pull requests for a given repository. Either repositoryId or project must be provided.", {
+        repositoryId: z.string().optional().describe("The ID of the repository where the pull requests are located."),
+        project: z.string().optional().describe("The ID of the project where the pull requests are located."),
         top: z.number().default(100).describe("The maximum number of pull requests to return."),
         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."),
@@ -326,14 +363,27 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             .describe("Filter pull requests by status. Defaults to 'Active'."),
         sourceRefName: z.string().optional().describe("Filter pull requests from this source branch (e.g., 'refs/heads/feature-branch')."),
         targetRefName: z.string().optional().describe("Filter pull requests into this target branch (e.g., 'refs/heads/main')."),
-    }, async ({ repositoryId, top, skip, created_by_me, created_by_user, i_am_reviewer, user_is_reviewer, status, sourceRefName, targetRefName }) => {
+    }, async ({ repositoryId, project, top, skip, created_by_me, created_by_user, i_am_reviewer, user_is_reviewer, status, sourceRefName, targetRefName }) => {
         const connection = await connectionProvider();
         const gitApi = await connection.getGitApi();
         // Build the search criteria
         const searchCriteria = {
             status: pullRequestStatusStringToInt(status),
-            repositoryId: repositoryId,
         };
+        if (!repositoryId && !project) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "Either repositoryId or project must be provided.",
+                    },
+                ],
+                isError: true,
+            };
+        }
+        if (repositoryId) {
+            searchCriteria.repositoryId = repositoryId;
+        }
         if (sourceRefName) {
             searchCriteria.sourceRefName = sourceRefName;
         }
@@ -384,120 +434,30 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             const userId = data.authenticatedUser.id;
             searchCriteria.reviewerId = userId;
         }
-        const pullRequests = await gitApi.getPullRequests(repositoryId, searchCriteria, undefined, // project
-        undefined, // maxCommentLength
-        skip, top);
-        // Filter out the irrelevant properties
-        const filteredPullRequests = pullRequests?.map((pr) => ({
-            pullRequestId: pr.pullRequestId,
-            codeReviewId: pr.codeReviewId,
-            status: pr.status,
-            createdBy: {
-                displayName: pr.createdBy?.displayName,
-                uniqueName: pr.createdBy?.uniqueName,
-            },
-            creationDate: pr.creationDate,
-            title: pr.title,
-            isDraft: pr.isDraft,
-            sourceRefName: pr.sourceRefName,
-            targetRefName: pr.targetRefName,
-        }));
-        return {
-            content: [{ type: "text", text: JSON.stringify(filteredPullRequests, null, 2) }],
-        };
-    });
-    server.tool(REPO_TOOLS.list_pull_requests_by_project, "Retrieve a list of pull requests for a given project Id or Name.", {
-        project: z.string().describe("The name or ID of the Azure DevOps project."),
-        top: z.number().default(100).describe("The maximum number of pull requests to return."),
-        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."),
-        created_by_user: z.string().optional().describe("Filter pull requests created by a specific user (provide email or unique name). Takes precedence over created_by_me if both are provided."),
-        i_am_reviewer: z.boolean().default(false).describe("Filter pull requests where the current user is a reviewer."),
-        user_is_reviewer: z
-            .string()
-            .optional()
-            .describe("Filter pull requests where a specific user is a reviewer (provide email or unique name). Takes precedence over i_am_reviewer if both are provided."),
-        status: z
-            .enum(getEnumKeys(PullRequestStatus))
-            .default("Active")
-            .describe("Filter pull requests by status. Defaults to 'Active'."),
-        sourceRefName: z.string().optional().describe("Filter pull requests from this source branch (e.g., 'refs/heads/feature-branch')."),
-        targetRefName: z.string().optional().describe("Filter pull requests into this target branch (e.g., 'refs/heads/main')."),
-    }, async ({ project, top, skip, created_by_me, created_by_user, i_am_reviewer, user_is_reviewer, status, sourceRefName, targetRefName }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        // Build the search criteria
-        const gitPullRequestSearchCriteria = {
-            status: pullRequestStatusStringToInt(status),
-        };
-        if (sourceRefName) {
-            gitPullRequestSearchCriteria.sourceRefName = sourceRefName;
-        }
-        if (targetRefName) {
-            gitPullRequestSearchCriteria.targetRefName = targetRefName;
-        }
-        if (created_by_user) {
-            try {
-                const userId = await getUserIdFromEmail(created_by_user, tokenProvider, connectionProvider, userAgentProvider);
-                gitPullRequestSearchCriteria.creatorId = userId;
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Error finding user with email ${created_by_user}: ${error instanceof Error ? error.message : String(error)}`,
-                        },
-                    ],
-                    isError: true,
-                };
-            }
-        }
-        else if (created_by_me) {
-            const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
-            const userId = data.authenticatedUser.id;
-            gitPullRequestSearchCriteria.creatorId = userId;
+        let pullRequests;
+        if (repositoryId) {
+            pullRequests = await gitApi.getPullRequests(repositoryId, searchCriteria, project, // project
+            undefined, // maxCommentLength
+            skip, top);
         }
-        if (user_is_reviewer) {
-            try {
-                const reviewerUserId = await getUserIdFromEmail(user_is_reviewer, tokenProvider, connectionProvider, userAgentProvider);
-                gitPullRequestSearchCriteria.reviewerId = reviewerUserId;
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Error finding reviewer with email ${user_is_reviewer}: ${error instanceof Error ? error.message : String(error)}`,
-                        },
-                    ],
-                    isError: true,
-                };
-            }
+        else if (project) {
+            // If only project is provided, use getPullRequestsByProject
+            pullRequests = await gitApi.getPullRequestsByProject(project, searchCriteria, undefined, // maxCommentLength
+            skip, top);
         }
-        else if (i_am_reviewer) {
-            const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
-            const userId = data.authenticatedUser.id;
-            gitPullRequestSearchCriteria.reviewerId = userId;
+        else {
+            // This case should not occur due to earlier validation, but added for completeness
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "Either repositoryId or project must be provided.",
+                    },
+                ],
+                isError: true,
+            };
         }
-        const pullRequests = await gitApi.getPullRequestsByProject(project, gitPullRequestSearchCriteria, undefined, // maxCommentLength
-        skip, top);
-        // Filter out the irrelevant properties
-        const filteredPullRequests = pullRequests?.map((pr) => ({
-            pullRequestId: pr.pullRequestId,
-            codeReviewId: pr.codeReviewId,
-            repository: pr.repository?.name,
-            status: pr.status,
-            createdBy: {
-                displayName: pr.createdBy?.displayName,
-                uniqueName: pr.createdBy?.uniqueName,
-            },
-            creationDate: pr.creationDate,
-            title: pr.title,
-            isDraft: pr.isDraft,
-            sourceRefName: pr.sourceRefName,
-            targetRefName: pr.targetRefName,
-        }));
+        const filteredPullRequests = pullRequests?.map((pr) => trimPullRequest(pr));
         return {
             content: [{ type: "text", text: JSON.stringify(filteredPullRequests, null, 2) }],
         };
@@ -522,13 +482,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
         // Return trimmed thread data focusing on essential information
-        const trimmedThreads = paginatedThreads?.map((thread) => ({
-            id: thread.id,
-            publishedDate: thread.publishedDate,
-            lastUpdatedDate: thread.lastUpdatedDate,
-            status: thread.status,
-            comments: trimComments(thread.comments),
-        }));
+        const trimmedThreads = paginatedThreads?.map((thread) => trimPullRequestThread(thread));
         return {
             content: [{ type: "text", text: JSON.stringify(trimmedThreads, null, 2) }],
         };
@@ -718,8 +672,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             }
         }
         const thread = await gitApi.createThread({ comments: [{ content: content }], threadContext: threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
+        const trimmedThread = trimPullRequestThread(thread);
         return {
-            content: [{ type: "text", text: JSON.stringify(thread, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(trimmedThread, null, 2) }],
         };
     });
     server.tool(REPO_TOOLS.resolve_comment, "Resolves a specific comment thread on a pull request.", {

package/dist/version.js

@@ -1 +1 @@
-export const packageVersion = "2.2.0-nightly.20251008";
+export const packageVersion = "2.2.0-nightly.20251009";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-devops/mcp",
-  "version": "2.2.0-nightly.20251008",
+  "version": "2.2.0-nightly.20251009",
   "description": "MCP server for interacting with Azure DevOps",
   "license": "MIT",
   "author": "Microsoft Corporation",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@azure/identity": "^4.10.0",
-    "@modelcontextprotocol/sdk": "1.18.2",
+    "@modelcontextprotocol/sdk": "1.19.1",
     "azure-devops-extension-api": "^4.252.0",
     "azure-devops-extension-sdk": "^4.0.2",
     "azure-devops-node-api": "^15.1.0",