@azure-devops/mcp 2.5.0 → 2.6.0-nightly.20260419

package/dist/tools/repositories.js

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { PullRequestStatus, GitVersionType, GitPullRequestQueryType, CommentThreadStatus, GitPullRequestMergeStrategy, VersionControlRecursionType, } from "azure-devops-node-api/interfaces/GitInterfaces.js";
+import { PullRequestStatus, GitVersionType, GitPullRequestQueryType, CommentThreadStatus, GitPullRequestMergeStrategy, VersionControlChangeType, VersionControlRecursionType, } from "azure-devops-node-api/interfaces/GitInterfaces.js";
 import { z } from "zod";
 import { getCurrentUserDetails, getUserIdFromEmail } from "./auth.js";
-import { getEnumKeys } from "../utils.js";
+import { getEnumKeys, streamToString } from "../utils.js";
 const REPO_TOOLS = {
     list_repos_by_project: "repo_list_repos_by_project",
     list_pull_requests_by_repo_or_project: "repo_list_pull_requests_by_repo_or_project",
@@ -14,6 +14,7 @@ const REPO_TOOLS = {
     get_repo_by_name_or_id: "repo_get_repo_by_name_or_id",
     get_branch_by_name: "repo_get_branch_by_name",
     get_pull_request_by_id: "repo_get_pull_request_by_id",
+    get_pull_request_changes: "repo_get_pull_request_changes",
     create_pull_request: "repo_create_pull_request",
     create_branch: "repo_create_branch",
     update_pull_request: "repo_update_pull_request",
@@ -25,6 +26,7 @@ const REPO_TOOLS = {
     list_pull_requests_by_commits: "repo_list_pull_requests_by_commits",
     vote_pull_request: "repo_vote_pull_request",
     list_directory: "repo_list_directory",
+    get_file_content: "repo_get_file_content",
 };
 function branchesFilterOutIrrelevantProperties(branches, top) {
     return branches
@@ -86,6 +88,9 @@ function filterReposByName(repositories, repoNameFilter) {
     return filteredByName;
 }
 function trimPullRequest(pr, includeDescription = false) {
+    if (!pr) {
+        return null;
+    }
     return {
         pullRequestId: pr.pullRequestId,
         codeReviewId: pr.codeReviewId,
@@ -122,16 +127,19 @@ function buildVersionDescriptor(version, versionType) {
 }
 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."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request will be created. When using a repository name instead of a GUID, the project parameter must also be provided."),
         sourceRefName: z.string().describe("The source branch name for the pull request, e.g., 'refs/heads/feature-branch'."),
         targetRefName: z.string().describe("The target branch name for the pull request, e.g., 'refs/heads/main'."),
         title: z.string().describe("The title of the pull request."),
         description: z.string().max(4000).optional().describe("The description of the pull request. Must not be longer than 4000 characters. Optional."),
         isDraft: z.boolean().optional().default(false).describe("Indicates whether the pull request is a draft. Defaults to false."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         workItems: z.string().optional().describe("Work item IDs to associate with the pull request, space-separated."),
         forkSourceRepositoryId: z.string().optional().describe("The ID of the fork repository that the pull request originates from. Optional, used when creating a pull request from a fork."),
         labels: z.array(z.string()).optional().describe("Array of label names to add to the pull request after creation."),
-    }, async ({ repositoryId, sourceRefName, targetRefName, title, description, isDraft, workItems, forkSourceRepositoryId, labels }) => {
+    }, async ({ repositoryId, sourceRefName, targetRefName, title, description, isDraft, project, workItems, forkSourceRepositoryId, labels }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -154,9 +162,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 forkSource,
                 labels: labelDefinitions,
                 supportsIterations: true,
-            }, repositoryId);
+            }, repositoryId, project);
             if (!pullRequest) {
-                const prs = await gitApi.getPullRequests(repositoryId, { sourceRefName, targetRefName, status: PullRequestStatus.Active }, undefined, undefined, 0, 1);
+                const prs = await gitApi.getPullRequests(repositoryId, { sourceRefName, targetRefName, status: PullRequestStatus.Active }, project, undefined, 0, 1);
                 if (prs && prs.length > 0) {
                     pullRequest = prs[0];
                 }
@@ -167,6 +175,11 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 }
             }
             const trimmedPullRequest = trimPullRequest(pullRequest, true);
+            if (!trimmedPullRequest) {
+                return {
+                    content: [{ type: "text", text: "Pull request created but API returned no data." }],
+                };
+            }
             return {
                 content: [{ type: "text", text: JSON.stringify(trimmedPullRequest, null, 2) }],
             };
@@ -180,11 +193,14 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.create_branch, "Create a new branch in the repository.", {
-        repositoryId: z.string().describe("The ID of the repository where the branch will be created."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the branch will be created. When using a repository name instead of a GUID, the project parameter must also be provided."),
         branchName: z.string().describe("The name of the new branch to create, e.g., 'feature-branch'."),
         sourceBranchName: z.string().optional().default("main").describe("The name of the source branch to create the new branch from. Defaults to 'main'."),
         sourceCommitId: z.string().optional().describe("The commit ID to create the branch from. If not provided, uses the latest commit of the source branch."),
-    }, async ({ repositoryId, branchName, sourceBranchName, sourceCommitId }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, branchName, sourceBranchName, sourceCommitId, project }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -193,7 +209,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             if (!commitId) {
                 const sourceRefName = `refs/heads/${sourceBranchName}`;
                 try {
-                    const sourceBranch = await gitApi.getRefs(repositoryId, undefined, "heads/", false, false, undefined, false, undefined, sourceBranchName);
+                    const sourceBranch = await gitApi.getRefs(repositoryId, project, "heads/", false, false, undefined, false, undefined, sourceBranchName);
                     const branch = sourceBranch.find((b) => b.name === sourceRefName);
                     if (!branch || !branch.objectId) {
                         return {
@@ -228,7 +244,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 oldObjectId: "0000000000000000000000000000000000000000", // All zeros indicates creating a new ref
             };
             try {
-                const result = await gitApi.updateRefs([refUpdate], repositoryId);
+                const result = await gitApi.updateRefs([refUpdate], repositoryId, project);
                 // Check if the branch creation was successful
                 if (result && result.length > 0 && result[0].success) {
                     return {
@@ -274,8 +290,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.update_pull_request, "Update a Pull Request by ID with specified fields, including setting autocomplete with various completion options.", {
-        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 update."),
+        repositoryId: z.string().describe("The ID or name of the repository where the pull request exists. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request to update."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         title: z.string().optional().describe("The new title for the pull request."),
         description: z.string().max(4000).optional().describe("The new description for the pull request. Must not be longer than 4000 characters."),
         isDraft: z.boolean().optional().describe("Whether the pull request should be a draft."),
@@ -290,7 +307,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         transitionWorkItems: z.boolean().optional().default(true).describe("Whether to transition associated work items to the next state when the pull request autocompletes. Defaults to true."),
         bypassReason: z.string().optional().describe("Reason for bypassing branch policies. When provided, branch policies will be automatically bypassed during autocompletion."),
         labels: z.array(z.string()).optional().describe("Array of label names to replace existing labels on the pull request. This will remove all current labels and add the specified ones."),
-    }, async ({ repositoryId, pullRequestId, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, deleteSourceBranch, transitionWorkItems, bypassReason, labels }) => {
+    }, async ({ repositoryId, pullRequestId, project, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, deleteSourceBranch, transitionWorkItems, bypassReason, labels, }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -339,25 +356,30 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             }
             // Update labels if provided
             if (labels) {
-                const currentLabels = await gitApi.getPullRequestLabels(repositoryId, pullRequestId);
+                const currentLabels = await gitApi.getPullRequestLabels(repositoryId, pullRequestId, project);
                 for (const currentLabel of currentLabels) {
                     if (currentLabel.id) {
-                        await gitApi.deletePullRequestLabels(repositoryId, pullRequestId, currentLabel.id);
+                        await gitApi.deletePullRequestLabels(repositoryId, pullRequestId, currentLabel.id, project);
                     }
                 }
                 for (const label of labels) {
-                    await gitApi.createPullRequestLabel({ name: label }, repositoryId, pullRequestId);
+                    await gitApi.createPullRequestLabel({ name: label }, repositoryId, pullRequestId, project);
                 }
             }
             let updatedPullRequest;
             if (Object.keys(updateRequest).length > 0) {
-                updatedPullRequest = await gitApi.updatePullRequest(updateRequest, repositoryId, pullRequestId);
+                updatedPullRequest = await gitApi.updatePullRequest(updateRequest, repositoryId, pullRequestId, project);
             }
             else {
                 // If only labels were updated, get the current pull request
-                updatedPullRequest = await gitApi.getPullRequest(repositoryId, pullRequestId);
+                updatedPullRequest = await gitApi.getPullRequest(repositoryId, pullRequestId, project);
             }
             const trimmedUpdatedPullRequest = trimPullRequest(updatedPullRequest, true);
+            if (!trimmedUpdatedPullRequest) {
+                return {
+                    content: [{ type: "text", text: "Pull request updated but API returned no data." }],
+                };
+            }
             return {
                 content: [{ type: "text", text: JSON.stringify(trimmedUpdatedPullRequest, null, 2) }],
             };
@@ -371,17 +393,18 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.update_pull_request_reviewers, "Add or remove reviewers for an existing pull request.", {
-        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 update."),
+        repositoryId: z.string().describe("The ID or name of the repository where the pull request exists. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request to update."),
         reviewerIds: z.array(z.string()).describe("List of reviewer ids to add or remove from the pull request."),
         action: z.enum(["add", "remove"]).describe("Action to perform on the reviewers. Can be 'add' or 'remove'."),
-    }, async ({ repositoryId, pullRequestId, reviewerIds, action }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, pullRequestId, reviewerIds, action, project }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
             let updatedPullRequest;
             if (action === "add") {
-                updatedPullRequest = await gitApi.createPullRequestReviewers(reviewerIds.map((id) => ({ id: id })), repositoryId, pullRequestId);
+                updatedPullRequest = await gitApi.createPullRequestReviewers(reviewerIds.map((id) => ({ id: id })), repositoryId, pullRequestId, project);
                 const trimmedResponse = updatedPullRequest.map((item) => ({
                     displayName: item.displayName,
                     id: item.id,
@@ -396,7 +419,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             }
             else {
                 for (const reviewerId of reviewerIds) {
-                    await gitApi.deletePullRequestReviewer(repositoryId, pullRequestId, reviewerId);
+                    await gitApi.deletePullRequestReviewer(repositoryId, pullRequestId, reviewerId, project);
                 }
                 return {
                     content: [{ type: "text", text: `Reviewers with IDs ${reviewerIds.join(", ")} removed from pull request ${pullRequestId}.` }],
@@ -413,8 +436,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
     });
     server.tool(REPO_TOOLS.list_repos_by_project, "Retrieve a list of repositories for a given project", {
         project: z.string().describe("The name or ID of the Azure DevOps project."),
-        top: z.number().default(100).describe("The maximum number of repositories to return."),
-        skip: z.number().default(0).describe("The number of repositories to skip. Defaults to 0."),
+        top: z.coerce.number().default(100).describe("The maximum number of repositories to return."),
+        skip: z.coerce.number().default(0).describe("The number of repositories to skip. Defaults to 0."),
         repoNameFilter: z.string().optional().describe("Optional filter to search for repositories by name. If provided, only repositories with names containing this string will be returned."),
     }, async ({ project, top, skip, repoNameFilter }) => {
         try {
@@ -446,10 +469,13 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     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."),
+        repositoryId: z
+            .string()
+            .optional()
+            .describe("The ID or name of the repository where the pull requests are located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID, or to scope the search to a specific project."),
+        top: z.coerce.number().default(100).describe("The maximum number of pull requests to return."),
+        skip: z.coerce.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."),
@@ -572,13 +598,15 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.list_pull_request_threads, "Retrieve a list of comment threads for a pull request.", {
-        repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
-        pullRequestId: z.number().describe("The ID of the pull request for which to retrieve threads."),
-        project: z.string().optional().describe("Project ID or project name (optional)"),
-        iteration: z.number().optional().describe("The iteration ID for which to retrieve threads. Optional, defaults to the latest iteration."),
-        baseIteration: z.number().optional().describe("The base iteration ID for which to retrieve threads. Optional, defaults to the latest base iteration."),
-        top: z.number().default(100).describe("The maximum number of threads to return after filtering."),
-        skip: z.number().default(0).describe("The number of threads to skip after filtering."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request for which to retrieve threads."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+        iteration: z.coerce.number().min(1).optional().describe("The iteration ID for which to retrieve threads. Optional, defaults to the latest iteration."),
+        baseIteration: z.coerce.number().min(1).optional().describe("The base iteration ID for which to retrieve threads. Optional, defaults to the latest base iteration."),
+        top: z.coerce.number().default(100).describe("The maximum number of threads to return after filtering."),
+        skip: z.coerce.number().default(0).describe("The number of threads to skip after filtering."),
         fullResponse: z.boolean().optional().default(false).describe("Return full thread JSON response instead of trimmed data."),
         status: z
             .enum(getEnumKeys(CommentThreadStatus))
@@ -630,12 +658,14 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.list_pull_request_thread_comments, "Retrieve a list of comments in a pull request thread.", {
-        repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
-        pullRequestId: z.number().describe("The ID of the pull request for which to retrieve thread comments."),
-        threadId: z.number().describe("The ID of the thread for which to retrieve comments."),
-        project: z.string().optional().describe("Project ID or project name (optional)"),
-        top: z.number().default(100).describe("The maximum number of comments to return."),
-        skip: z.number().default(0).describe("The number of comments to skip."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request for which to retrieve thread comments."),
+        threadId: z.coerce.number().min(1).describe("The ID of the thread for which to retrieve comments."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+        top: z.coerce.number().default(100).describe("The maximum number of comments to return."),
+        skip: z.coerce.number().default(0).describe("The number of comments to skip."),
         fullResponse: z.boolean().optional().default(false).describe("Return full comment JSON response instead of trimmed data."),
     }, async ({ repositoryId, pullRequestId, threadId, project, top, skip, fullResponse }) => {
         try {
@@ -664,14 +694,17 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.list_branches_by_repo, "Retrieve a list of branches for a given repository.", {
-        repositoryId: z.string().describe("The ID of the repository where the branches are located."),
-        top: z.number().default(100).describe("The maximum number of branches to return. Defaults to 100."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the branches are located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        top: z.coerce.number().default(100).describe("The maximum number of branches to return. Defaults to 100."),
         filterContains: z.string().optional().describe("Filter to find branches that contain this string in their name."),
-    }, async ({ repositoryId, top, filterContains }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, top, filterContains, project }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
-            const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", undefined, undefined, undefined, undefined, undefined, filterContains);
+            const branches = await gitApi.getRefs(repositoryId, project, "heads/", undefined, undefined, undefined, undefined, undefined, filterContains);
             const filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
             return {
                 content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
@@ -686,14 +719,17 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.list_my_branches_by_repo, "Retrieve a list of my branches for a given repository Id.", {
-        repositoryId: z.string().describe("The ID of the repository where the branches are located."),
-        top: z.number().default(100).describe("The maximum number of branches to return."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the branches are located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        top: z.coerce.number().default(100).describe("The maximum number of branches to return."),
         filterContains: z.string().optional().describe("Filter to find branches that contain this string in their name."),
-    }, async ({ repositoryId, top, filterContains }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, top, filterContains, project }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
-            const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", undefined, undefined, true, undefined, undefined, filterContains);
+            const branches = await gitApi.getRefs(repositoryId, project, "heads/", undefined, undefined, true, undefined, undefined, filterContains);
             const filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
             return {
                 content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
@@ -735,13 +771,14 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.get_branch_by_name, "Get a branch by its name.", {
-        repositoryId: z.string().describe("The ID of the repository where the branch is located."),
+        repositoryId: z.string().describe("The ID or name of the repository where the branch is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
         branchName: z.string().describe("The name of the branch to retrieve, e.g., 'main' or 'feature-branch'."),
-    }, async ({ repositoryId, branchName }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, branchName, project }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
-            const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", false, false, undefined, false, undefined, branchName);
+            const branches = await gitApi.getRefs(repositoryId, project, "heads/", false, false, undefined, false, undefined, branchName);
             const branch = branches.find((branch) => branch.name === `refs/heads/${branchName}` || branch.name === branchName);
             if (!branch) {
                 return {
@@ -770,46 +807,80 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         repositoryId: z
             .string()
             .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
-        pullRequestId: z.number().describe("The ID of the pull request to retrieve."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request to retrieve."),
         project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         includeWorkItemRefs: z.boolean().optional().default(false).describe("Whether to reference work items associated with the pull request."),
         includeLabels: z.boolean().optional().default(false).describe("Whether to include a summary of labels in the response."),
-    }, async ({ repositoryId, pullRequestId, project, includeWorkItemRefs, includeLabels }) => {
+        includeChangedFiles: z.boolean().optional().default(false).describe("Whether to include the list of files changed in the pull request."),
+    }, async ({ repositoryId, pullRequestId, project, includeWorkItemRefs, includeLabels, includeChangedFiles }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
             const pullRequest = await gitApi.getPullRequest(repositoryId, pullRequestId, project, undefined, undefined, undefined, undefined, includeWorkItemRefs);
+            let enhancedResponse = { ...pullRequest };
             if (includeLabels) {
                 try {
                     const projectId = pullRequest.repository?.project?.id;
                     const projectName = pullRequest.repository?.project?.name;
                     const labels = await gitApi.getPullRequestLabels(repositoryId, pullRequestId, projectName, projectId);
                     const labelNames = labels.map((label) => label.name).filter((name) => name !== undefined);
-                    const enhancedResponse = {
-                        ...pullRequest,
+                    enhancedResponse = {
+                        ...enhancedResponse,
                         labelSummary: {
                             labels: labelNames,
                             labelCount: labelNames.length,
                         },
                     };
-                    return {
-                        content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }],
-                    };
                 }
                 catch (error) {
                     console.warn(`Error fetching PR labels: ${error instanceof Error ? error.message : "Unknown error"}`);
-                    // Fall back to the original response without labels
-                    const enhancedResponse = {
-                        ...pullRequest,
+                    enhancedResponse = {
+                        ...enhancedResponse,
                         labelSummary: {},
                     };
-                    return {
-                        content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }],
+                }
+            }
+            if (includeChangedFiles) {
+                try {
+                    const iterations = await gitApi.getPullRequestIterations(repositoryId, pullRequestId, project);
+                    if (iterations?.length) {
+                        const latestIteration = iterations[iterations.length - 1];
+                        if (latestIteration.id != null) {
+                            const changes = await gitApi.getPullRequestIterationChanges(repositoryId, pullRequestId, latestIteration.id, project);
+                            enhancedResponse = {
+                                ...enhancedResponse,
+                                changedFilesSummary: {
+                                    changeEntries: changes?.changeEntries ?? [],
+                                    fileCount: changes?.changeEntries?.length ?? 0,
+                                    nextSkip: changes?.nextSkip,
+                                    nextTop: changes?.nextTop,
+                                },
+                            };
+                        }
+                        else {
+                            enhancedResponse = {
+                                ...enhancedResponse,
+                                changedFilesSummary: { changeEntries: [], fileCount: 0 },
+                            };
+                        }
+                    }
+                    else {
+                        enhancedResponse = {
+                            ...enhancedResponse,
+                            changedFilesSummary: { changeEntries: [], fileCount: 0 },
+                        };
+                    }
+                }
+                catch (error) {
+                    console.warn(`Error fetching PR changed files: ${error instanceof Error ? error.message : "Unknown error"}`);
+                    enhancedResponse = {
+                        ...enhancedResponse,
+                        changedFilesSummary: {},
                     };
                 }
             }
             return {
-                content: [{ type: "text", text: JSON.stringify(pullRequest, null, 2) }],
+                content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }],
             };
         }
         catch (error) {
@@ -820,12 +891,330 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
     });
-    server.tool(REPO_TOOLS.reply_to_comment, "Replies to a specific comment on a pull request.", {
+    server.tool(REPO_TOOLS.get_pull_request_changes, "Get the file changes (diff) for a pull request iteration with actual code diff content. Returns the code changes including line-by-line diffs made in the pull request.", {
         repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
-        pullRequestId: z.number().describe("The ID of the pull request where the comment thread exists."),
-        threadId: z.number().describe("The ID of the thread to which the comment will be added."),
-        content: z.string().describe("The content of the comment to be added."),
+        pullRequestId: z.number().describe("The ID of the pull request to retrieve changes for."),
+        iterationId: z.number().optional().describe("The iteration ID to get changes for. If not specified, gets changes for the latest iteration."),
         project: z.string().optional().describe("Project ID or project name (optional)"),
+        top: z.number().optional().describe("Maximum number of files to include diffs for. Default is 100."),
+        skip: z.number().optional().describe("Number of changes to skip for pagination."),
+        compareTo: z.number().optional().describe("Iteration ID to compare against. If specified, returns changes between two iterations."),
+        includeDiffs: z.boolean().optional().describe("Whether to include actual line-by-line diff content. Default is true. Set to false to get only file metadata."),
+        includeLineContent: z
+            .boolean()
+            .optional()
+            .describe("Whether to include the actual line content from the changed files. Default is true. When true, fetches file content and includes the actual code lines that were added/removed/modified."),
+    }, async ({ repositoryId, pullRequestId, iterationId, project, top, skip, compareTo, includeDiffs = true, includeLineContent = true }) => {
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            // If repositoryId is a name (not a GUID), we need a project to resolve it.
+            // GUID pattern: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+            const isGuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(repositoryId);
+            if (!isGuid && !project) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: "Error: When using a repository name instead of a GUID for repositoryId, the 'project' parameter is required. Please either provide the project name/ID, or use repo_get_repo_by_name_or_id to resolve the repository GUID first.",
+                        },
+                    ],
+                    isError: true,
+                };
+            }
+            // If no iteration ID provided, get the latest iteration
+            let targetIterationId = iterationId;
+            let targetIteration;
+            if (targetIterationId == null) {
+                const iterations = await gitApi.getPullRequestIterations(repositoryId, pullRequestId, project);
+                if (!iterations || iterations.length === 0) {
+                    return {
+                        content: [{ type: "text", text: "No iterations found for this pull request." }],
+                        isError: true,
+                    };
+                }
+                // Get the latest iteration
+                targetIteration = iterations[iterations.length - 1];
+                targetIterationId = targetIteration.id;
+            }
+            else {
+                // Get the specific iteration
+                targetIteration = await gitApi.getPullRequestIteration(repositoryId, pullRequestId, targetIterationId, project);
+            }
+            // Get the file change metadata
+            const changes = await gitApi.getPullRequestIterationChanges(repositoryId, pullRequestId, targetIterationId ?? 1, project, top, skip, compareTo);
+            // If includeDiffs is false, just return the metadata
+            if (!includeDiffs) {
+                return {
+                    content: [{ type: "text", text: JSON.stringify(changes, null, 2) }],
+                };
+            }
+            // Get actual diff content using getFileDiffs
+            if (changes.changeEntries && changes.changeEntries.length > 0 && targetIteration) {
+                // Determine base and target commits
+                const baseCommitId = compareTo
+                    ? (await gitApi.getPullRequestIteration(repositoryId, pullRequestId, compareTo, project)).sourceRefCommit?.commitId
+                    : targetIteration.commonRefCommit?.commitId;
+                const targetCommitId = targetIteration.sourceRefCommit?.commitId;
+                if (baseCommitId && targetCommitId) {
+                    // Build FileDiffsCriteria with paths from changeEntries
+                    // Exclude added and deleted files as they don't have both versions to diff
+                    // changeType is a flags enum so use bitwise AND to check
+                    const fileDiffParams = changes.changeEntries
+                        .filter((entry) => {
+                        const ct = entry.changeType ?? 0;
+                        return entry.item?.path && !(ct & VersionControlChangeType.Add) && !(ct & VersionControlChangeType.Delete);
+                    })
+                        .map((entry) => {
+                        // Remove leading slash if present - Azure DevOps API expects relative paths
+                        const itemPath = entry.item?.path ?? "";
+                        const path = itemPath.startsWith("/") ? itemPath.substring(1) : itemPath;
+                        // For renamed/moved files, use the original path from the change entry
+                        const origPath = entry.originalPath ? (entry.originalPath.startsWith("/") ? entry.originalPath.substring(1) : entry.originalPath) : path;
+                        return {
+                            path: path,
+                            originalPath: origPath,
+                        };
+                    });
+                    if (fileDiffParams.length > 0) {
+                        try {
+                            // Azure DevOps getFileDiffs API accepts max 10 files per request
+                            const FILE_DIFF_BATCH_SIZE = 10;
+                            let fileDiffs = [];
+                            for (let i = 0; i < fileDiffParams.length; i += FILE_DIFF_BATCH_SIZE) {
+                                const batch = fileDiffParams.slice(i, i + FILE_DIFF_BATCH_SIZE);
+                                const batchDiffs = await gitApi.getFileDiffs({
+                                    baseVersionCommit: baseCommitId,
+                                    targetVersionCommit: targetCommitId,
+                                    fileDiffParams: batch,
+                                }, project || "", repositoryId);
+                                fileDiffs = fileDiffs.concat(batchDiffs);
+                            }
+                            // Merge diff content with change metadata
+                            const enrichedChanges = {
+                                ...changes,
+                                changeEntries: changes.changeEntries.map((entry) => {
+                                    // Normalize path for comparison (remove leading slash)
+                                    const entryPath = entry.item?.path?.startsWith("/") ? entry.item.path.substring(1) : entry.item?.path;
+                                    const matchingDiff = fileDiffs.find((diff) => diff.path === entryPath);
+                                    return {
+                                        ...entry,
+                                        diff: matchingDiff || null,
+                                    };
+                                }),
+                            };
+                            // If includeLineContent is true, fetch actual file content with concurrency limit
+                            if (includeLineContent && enrichedChanges.changeEntries) {
+                                const CONCURRENCY_LIMIT = 10;
+                                const entriesWithContent = [...enrichedChanges.changeEntries];
+                                for (let i = 0; i < entriesWithContent.length; i += CONCURRENCY_LIMIT) {
+                                    const batch = entriesWithContent.slice(i, i + CONCURRENCY_LIMIT);
+                                    const batchResults = await Promise.all(batch.map(async (entry) => {
+                                        const ct = entry.changeType ?? 0;
+                                        const isAdd = !!(ct & VersionControlChangeType.Add);
+                                        const isDelete = !!(ct & VersionControlChangeType.Delete);
+                                        const entryPath = entry.item?.path?.startsWith("/") ? entry.item.path.substring(1) : entry.item?.path;
+                                        if (!entryPath) {
+                                            return entry;
+                                        }
+                                        // Handle added files: fetch full content at target commit and create synthetic diff
+                                        if (isAdd && !entry.diff) {
+                                            try {
+                                                const targetStream = await gitApi
+                                                    .getItemText(repositoryId, entryPath, project, undefined, undefined, undefined, undefined, undefined, { version: targetCommitId, versionType: GitVersionType.Commit })
+                                                    .catch(() => null);
+                                                if (targetStream) {
+                                                    const targetText = await streamToString(targetStream);
+                                                    const targetLines = targetText.split(/\r?\n/);
+                                                    return {
+                                                        ...entry,
+                                                        diff: {
+                                                            path: entryPath,
+                                                            originalPath: entryPath,
+                                                            lineDiffBlocks: [
+                                                                {
+                                                                    changeType: 1, // Add
+                                                                    originalLineNumberStart: 0,
+                                                                    originalLinesCount: 0,
+                                                                    modifiedLineNumberStart: 1,
+                                                                    modifiedLinesCount: targetLines.length,
+                                                                    modifiedLines: targetLines,
+                                                                },
+                                                            ],
+                                                        },
+                                                    };
+                                                }
+                                            }
+                                            catch (addError) {
+                                                return {
+                                                    ...entry,
+                                                    _contentFetchError: `Failed to fetch added file content: ${addError instanceof Error ? addError.message : "Unknown error"}`,
+                                                };
+                                            }
+                                            return entry;
+                                        }
+                                        // Handle deleted files: fetch full content at base commit and create synthetic diff
+                                        if (isDelete && !entry.diff) {
+                                            try {
+                                                const basePath = entry.originalPath ? (entry.originalPath.startsWith("/") ? entry.originalPath.substring(1) : entry.originalPath) : entryPath;
+                                                const baseStream = await gitApi
+                                                    .getItemText(repositoryId, basePath, project, undefined, undefined, undefined, undefined, undefined, { version: baseCommitId, versionType: GitVersionType.Commit })
+                                                    .catch(() => null);
+                                                if (baseStream) {
+                                                    const baseText = await streamToString(baseStream);
+                                                    const baseLines = baseText.split(/\r?\n/);
+                                                    return {
+                                                        ...entry,
+                                                        diff: {
+                                                            path: entryPath,
+                                                            originalPath: basePath,
+                                                            lineDiffBlocks: [
+                                                                {
+                                                                    changeType: 2, // Delete
+                                                                    originalLineNumberStart: 1,
+                                                                    originalLinesCount: baseLines.length,
+                                                                    modifiedLineNumberStart: 0,
+                                                                    modifiedLinesCount: 0,
+                                                                    originalLines: baseLines,
+                                                                },
+                                                            ],
+                                                        },
+                                                    };
+                                                }
+                                            }
+                                            catch (delError) {
+                                                return {
+                                                    ...entry,
+                                                    _contentFetchError: `Failed to fetch deleted file content: ${delError instanceof Error ? delError.message : "Unknown error"}`,
+                                                };
+                                            }
+                                            return entry;
+                                        }
+                                        // For modified/renamed files, skip if no diff blocks
+                                        if (!entry.diff?.lineDiffBlocks || entry.diff.lineDiffBlocks.length === 0) {
+                                            return entry;
+                                        }
+                                        // For renamed/moved files, the base version is at the original path
+                                        const basePath = entry.originalPath ? (entry.originalPath.startsWith("/") ? entry.originalPath.substring(1) : entry.originalPath) : entryPath;
+                                        try {
+                                            // Fetch file content at both commits
+                                            const [baseContent, targetContent] = await Promise.all([
+                                                // Base version (original) - use basePath for renamed files
+                                                gitApi
+                                                    .getItemText(repositoryId, basePath, project, undefined, undefined, undefined, undefined, undefined, { version: baseCommitId, versionType: GitVersionType.Commit })
+                                                    .catch(() => null),
+                                                // Target version (modified)
+                                                gitApi
+                                                    .getItemText(repositoryId, entryPath, project, undefined, undefined, undefined, undefined, undefined, { version: targetCommitId, versionType: GitVersionType.Commit })
+                                                    .catch(() => null),
+                                            ]);
+                                            // Convert streams to text
+                                            const baseText = baseContent ? await streamToString(baseContent) : "";
+                                            const targetText = targetContent ? await streamToString(targetContent) : "";
+                                            // Check if response is an Azure DevOps error (returned as JSON in the stream)
+                                            const checkForApiError = (text, label) => {
+                                                if (text.startsWith("{")) {
+                                                    try {
+                                                        const parsed = JSON.parse(text);
+                                                        if (parsed.$id && parsed.innerException !== undefined) {
+                                                            throw new Error(`Failed to fetch ${label} file content: ${parsed.message || text}`);
+                                                        }
+                                                    }
+                                                    catch (e) {
+                                                        if (e instanceof Error && e.message.startsWith("Failed to fetch"))
+                                                            throw e;
+                                                        // Not valid JSON or not an error response — treat as legitimate content
+                                                    }
+                                                }
+                                            };
+                                            checkForApiError(baseText, "base");
+                                            checkForApiError(targetText, "target");
+                                            // Split into lines
+                                            const baseLines = baseText.split(/\r?\n/);
+                                            const targetLines = targetText.split(/\r?\n/);
+                                            // Enrich each lineDiffBlock with actual line content
+                                            const enrichedDiff = {
+                                                ...entry.diff,
+                                                lineDiffBlocks: entry.diff.lineDiffBlocks?.map((block) => {
+                                                    const enrichedBlock = { ...block };
+                                                    // Add original (base) lines if they exist
+                                                    if (block.originalLineNumberStart && block.originalLinesCount) {
+                                                        const startIdx = block.originalLineNumberStart - 1;
+                                                        const endIdx = startIdx + block.originalLinesCount;
+                                                        enrichedBlock.originalLines = baseLines.slice(startIdx, endIdx);
+                                                    }
+                                                    // Add modified (target) lines if they exist
+                                                    if (block.modifiedLineNumberStart && block.modifiedLinesCount) {
+                                                        const startIdx = block.modifiedLineNumberStart - 1;
+                                                        const endIdx = startIdx + block.modifiedLinesCount;
+                                                        enrichedBlock.modifiedLines = targetLines.slice(startIdx, endIdx);
+                                                    }
+                                                    return enrichedBlock;
+                                                }),
+                                            };
+                                            return {
+                                                ...entry,
+                                                diff: enrichedDiff,
+                                            };
+                                        }
+                                        catch (contentError) {
+                                            // If content fetch fails, return entry with error
+                                            return {
+                                                ...entry,
+                                                _contentFetchError: `Failed to fetch line content: ${contentError instanceof Error ? contentError.message : "Unknown error"}`,
+                                            };
+                                        }
+                                    }));
+                                    // Write batch results back into the array
+                                    for (let j = 0; j < batchResults.length; j++) {
+                                        entriesWithContent[i + j] = batchResults[j];
+                                    }
+                                }
+                                enrichedChanges.changeEntries = entriesWithContent;
+                            }
+                            return {
+                                content: [{ type: "text", text: JSON.stringify(enrichedChanges, null, 2) }],
+                            };
+                        }
+                        catch (diffError) {
+                            // If diff fetching fails, return metadata with error info
+                            return {
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: JSON.stringify({
+                                            ...changes,
+                                            _diffError: `Failed to fetch diff content: ${diffError instanceof Error ? diffError.message : "Unknown error"}`,
+                                            _note: "Returned metadata only",
+                                        }, null, 2),
+                                    },
+                                ],
+                            };
+                        }
+                    }
+                }
+            }
+            // Fallback: return metadata if we couldn't get diffs
+            return {
+                content: [{ type: "text", text: JSON.stringify(changes, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error getting pull request changes: ${errorMessage}` }],
+                isError: true,
+            };
+        }
+    });
+    server.tool(REPO_TOOLS.reply_to_comment, "Replies to a specific comment on a pull request.", {
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request where the comment thread exists."),
+        threadId: z.coerce.number().min(1).describe("The ID of the thread to which the comment will be added."),
+        content: z.string().describe("The content of the comment to be added."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         fullResponse: z.boolean().optional().default(false).describe("Return full comment JSON response instead of a simple confirmation message."),
     }, async ({ repositoryId, pullRequestId, threadId, content, project, fullResponse }) => {
         try {
@@ -857,17 +1246,23 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.create_pull_request_thread, "Creates a new comment thread on a pull request.", {
-        repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
-        pullRequestId: z.number().describe("The ID of the pull request where the comment thread exists."),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request where the comment thread exists."),
         content: z.string().describe("The content of the comment to be added."),
-        project: z.string().optional().describe("Project ID or project name (optional)"),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         filePath: z.string().optional().describe("The path of the file where the comment thread will be created. (optional)"),
         status: z
             .enum(getEnumKeys(CommentThreadStatus))
             .optional()
             .default(CommentThreadStatus[CommentThreadStatus.Active])
             .describe("The status of the comment thread. Defaults to 'Active'."),
-        rightFileStartLine: z.number().optional().describe("Position of first character of the thread's span in right file. The line number of a thread's position. Starts at 1. (optional)"),
+        rightFileStartLine: z.coerce
+            .number()
+            .min(1)
+            .optional()
+            .describe("Position of first character of the thread's span in right file. The line number of a thread's position. Starts at 1. (optional)"),
         rightFileStartOffset: z
             .number()
             .optional()
@@ -971,10 +1366,12 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.update_pull_request_thread, "Updates an existing comment thread on a pull request.", {
-        repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
-        pullRequestId: z.number().describe("The ID of the pull request where the comment thread exists."),
-        threadId: z.number().describe("The ID of the thread to update."),
-        project: z.string().optional().describe("Project ID or project name (optional)"),
+        repositoryId: z
+            .string()
+            .describe("The ID or name of the repository where the pull request is located. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request where the comment thread exists."),
+        threadId: z.coerce.number().min(1).describe("The ID of the thread to update."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
         status: z
             .enum(getEnumKeys(CommentThreadStatus))
             .optional()
@@ -1026,8 +1423,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             .optional()
             .default(GitVersionType[GitVersionType.Branch])
             .describe("The meaning of the version parameter, e.g., branch, tag or commit"),
-        skip: z.number().optional().default(0).describe("Number of commits to skip"),
-        top: z.number().optional().default(10).describe("Maximum number of commits to return"),
+        skip: z.coerce.number().optional().default(0).describe("Number of commits to skip"),
+        top: z.coerce.number().optional().default(10).describe("Maximum number of commits to return"),
         includeLinks: z.boolean().optional().default(false).describe("Include commit links"),
         includeWorkItems: z.boolean().optional().default(false).describe("Include associated work items"),
         // Enhanced search parameters
@@ -1182,10 +1579,11 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         }
     });
     server.tool(REPO_TOOLS.vote_pull_request, "Cast a vote on a pull request. Automatically adds the current user as a reviewer if they are not already one.", {
-        repositoryId: z.string().describe("The ID of the repository."),
-        pullRequestId: z.number().describe("The ID of the pull request."),
+        repositoryId: z.string().describe("The ID or name of the repository. When using a repository name instead of a GUID, the project parameter must also be provided."),
+        pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request."),
         vote: z.enum(["Approved", "ApprovedWithSuggestions", "NoVote", "WaitingForAuthor", "Rejected"]).describe("The vote to cast: Approved(10), Suggestions(5), None(0), Waiting(-5), Rejected(-10)."),
-    }, async ({ repositoryId, pullRequestId, vote }) => {
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
+    }, async ({ repositoryId, pullRequestId, vote, project }) => {
         const connection = await connectionProvider();
         const gitApi = await connection.getGitApi();
         const userDetails = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
@@ -1200,7 +1598,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             WaitingForAuthor: -5,
             Rejected: -10,
         };
-        await gitApi.createPullRequestReviewer({ vote: voteMap[vote], id: userId }, repositoryId, pullRequestId, userId);
+        await gitApi.createPullRequestReviewer({ vote: voteMap[vote], id: userId }, repositoryId, pullRequestId, userId, project);
         return {
             content: [
                 {
@@ -1217,7 +1615,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         version: z.string().optional().describe("The version identifier - branch name (e.g., 'main'), tag name, or commit SHA. Defaults to the repository's default branch."),
         versionType: z.enum(["Branch", "Commit", "Tag"]).optional().default("Branch").describe("The type of version identifier: 'Branch', 'Commit', or 'Tag'. Defaults to 'Branch'."),
         recursive: z.boolean().optional().default(false).describe("Whether to list items recursively. Defaults to false."),
-        recursionDepth: z.number().optional().default(1).describe("Maximum depth for recursive listing (1-10). Only applies when recursive is true. Defaults to 1."),
+        recursionDepth: z.coerce.number().min(1).optional().default(1).describe("Maximum depth for recursive listing (1-10). Only applies when recursive is true. Defaults to 1."),
     }, async ({ repositoryId, path, project, version, versionType, recursive, recursionDepth }) => {
         try {
             const connection = await connectionProvider();
@@ -1276,5 +1674,58 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
     });
+    // ── Get file content at a specific version (branch, tag, or commit) ──
+    const fileVersionTypeStrings = getEnumKeys(GitVersionType);
+    server.tool(REPO_TOOLS.get_file_content, "Get the content of a file from a Git repository at a specific version (branch, tag, or commit SHA). " +
+        "Useful for reading source files from PR branches, specific commits, or tags without having them checked out locally.", {
+        repositoryId: z.string().describe("The ID (GUID) or name of the repository."),
+        path: z.string().describe("The full path to the file in the repository, e.g., '/src/main.ts' or 'src/main.ts'."),
+        project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a name."),
+        version: z
+            .string()
+            .optional()
+            .describe("Version string: branch name (e.g. 'main'), tag name, or commit SHA. " + "Defaults to the repository's default branch if not specified."),
+        versionType: z
+            .enum(fileVersionTypeStrings)
+            .optional()
+            .default("Commit")
+            .describe("How to interpret the 'version' parameter. Defaults to 'Commit'."),
+    }, async ({ repositoryId, path, project, version, versionType }) => {
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            // Build the version descriptor if a version was specified
+            const versionDescriptor = version
+                ? {
+                    version: version,
+                    versionType: GitVersionType[versionType],
+                }
+                : undefined;
+            // getItemText returns a ReadableStream of the file content as text
+            const stream = await gitApi.getItemText(repositoryId, path, project, undefined, // scopePath
+            undefined, // recursionLevel
+            undefined, // includeContentMetadata
+            undefined, // latestProcessedChange
+            false, // download
+            versionDescriptor, true // includeContent
+            );
+            const content = await streamToString(stream);
+            return {
+                content: [{ type: "text", text: content }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Error getting file content for '${path}': ${errorMessage}`,
+                    },
+                ],
+                isError: true,
+            };
+        }
+    });
 }
 export { REPO_TOOLS, configureRepoTools };