@azure-devops/mcp 2.7.0 → 2.8.0-nightly.20260624

package/dist/tools/repositories.js

@@ -3,7 +3,7 @@
 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, streamToString } from "../utils.js";
+import { extractAdoStreamError, 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",
@@ -91,11 +91,13 @@ function trimPullRequest(pr, includeDescription = false) {
     if (!pr) {
         return null;
     }
+    const statusName = typeof pr.status === "number" ? (PullRequestStatus[pr.status] ?? "Unknown") : "Unknown";
     return {
         pullRequestId: pr.pullRequestId,
         codeReviewId: pr.codeReviewId,
         repository: pr.repository?.name,
         status: pr.status,
+        statusName,
         createdBy: {
             displayName: pr.createdBy?.displayName,
             uniqueName: pr.createdBy?.uniqueName,
@@ -144,6 +146,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
             const workItemRefs = workItems ? workItems.split(" ").map((id) => ({ id: id.trim() })) : [];
+            const noDataErrorMessage = `Pull request creation returned no data and no matching PR was found. This often means repositoryId=\"${repositoryId}\" was not resolvable. ` +
+                "Try the repository GUID from repo_list_repos_by_project instead of the Project/RepoName slash format.";
             const forkSource = forkSourceRepositoryId
                 ? {
                     repository: {
@@ -170,14 +174,16 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 }
                 else {
                     return {
-                        content: [{ type: "text", text: "Pull request created but API returned no data." }],
+                        content: [{ type: "text", text: noDataErrorMessage }],
+                        isError: true,
                     };
                 }
             }
             const trimmedPullRequest = trimPullRequest(pullRequest, true);
             if (!trimmedPullRequest) {
                 return {
-                    content: [{ type: "text", text: "Pull request created but API returned no data." }],
+                    content: [{ type: "text", text: noDataErrorMessage }],
+                    isError: true,
                 };
             }
             return {
@@ -303,11 +309,12 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             .enum(getEnumKeys(GitPullRequestMergeStrategy))
             .optional()
             .describe("The merge strategy to use when the pull request autocompletes. Defaults to 'NoFastForward'."),
+        mergeCommitMessage: z.string().optional().describe("Commit message to use when the pull request is completed."),
         deleteSourceBranch: z.boolean().optional().default(false).describe("Whether to delete the source branch when the pull request autocompletes. Defaults to false."),
         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, project, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, deleteSourceBranch, transitionWorkItems, bypassReason, labels, }) => {
+    }, async ({ repositoryId, pullRequestId, project, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, mergeCommitMessage, deleteSourceBranch, transitionWorkItems, bypassReason, labels, }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -337,6 +344,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                     if (mergeStrategy) {
                         completionOptions.mergeStrategy = GitPullRequestMergeStrategy[mergeStrategy];
                     }
+                    if (mergeCommitMessage) {
+                        completionOptions.mergeCommitMessage = mergeCommitMessage;
+                    }
                     if (bypassReason) {
                         completionOptions.bypassReason = bypassReason;
                     }
@@ -618,33 +628,33 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
-            const threads = await gitApi.getThreads(repositoryId, pullRequestId, project, iteration, baseIteration);
+            const threads = (await gitApi.getThreads(repositoryId, pullRequestId, project, iteration, baseIteration)) ?? [];
             let filteredThreads = threads;
             if (status !== undefined) {
                 const statusValue = CommentThreadStatus[status];
-                filteredThreads = filteredThreads?.filter((thread) => thread.status === statusValue);
+                filteredThreads = filteredThreads.filter((thread) => thread.status === statusValue);
             }
             if (authorEmail !== undefined) {
-                filteredThreads = filteredThreads?.filter((thread) => {
+                filteredThreads = filteredThreads.filter((thread) => {
                     const firstComment = thread.comments?.[0];
                     return firstComment?.author?.uniqueName?.toLowerCase() === authorEmail.toLowerCase();
                 });
             }
             if (authorDisplayName !== undefined) {
                 const lowerAuthorName = authorDisplayName.toLowerCase();
-                filteredThreads = filteredThreads?.filter((thread) => {
+                filteredThreads = filteredThreads.filter((thread) => {
                     const firstComment = thread.comments?.[0];
                     return firstComment?.author?.displayName?.toLowerCase().includes(lowerAuthorName);
                 });
             }
-            const paginatedThreads = filteredThreads?.sort((a, b) => (a.id ?? 0) - (b.id ?? 0)).slice(skip, skip + top);
+            const paginatedThreads = filteredThreads.sort((a, b) => (a.id ?? 0) - (b.id ?? 0)).slice(skip, skip + top);
             if (fullResponse) {
                 return {
                     content: [{ type: "text", text: JSON.stringify(paginatedThreads, null, 2) }],
                 };
             }
             // Return trimmed thread data focusing on essential information
-            const trimmedThreads = paginatedThreads?.map((thread) => trimPullRequestThread(thread));
+            const trimmedThreads = paginatedThreads.map((thread) => trimPullRequestThread(thread));
             return {
                 content: [{ type: "text", text: JSON.stringify(trimmedThreads, null, 2) }],
             };
@@ -693,7 +703,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
     });
-    server.tool(REPO_TOOLS.list_branches_by_repo, "Retrieve a list of branches for a given repository.", {
+    server.tool(REPO_TOOLS.list_branches_by_repo, "Retrieve a list of branch names for a given repository. Returns an array of branch name strings, not full branch objects. Use repo_get_branch_by_name to get full details for a specific branch.", {
         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."),
@@ -718,7 +728,7 @@ 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.", {
+    server.tool(REPO_TOOLS.list_my_branches_by_repo, "Retrieve a list of my branch names for a given repository Id. Returns an array of branch name strings, not full branch objects. Use repo_get_branch_by_name to get full details for a specific branch.", {
         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."),
@@ -770,7 +780,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
     });
-    server.tool(REPO_TOOLS.get_branch_by_name, "Get a branch by its name.", {
+    server.tool(REPO_TOOLS.get_branch_by_name, "Get a branch by its name. Returns isError: true if the branch is not found.", {
         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'."),
         project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a repository name instead of a GUID."),
@@ -976,11 +986,14 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                             originalPath: origPath,
                         };
                     });
-                    if (fileDiffParams.length > 0) {
-                        try {
+                    try {
+                        // Fetch diffs for modified files. Add/Delete files are excluded from getFileDiffs
+                        // because they don't have two versions to compare; their content is fetched
+                        // separately below via getItemText when includeLineContent is true.
+                        let fileDiffs = [];
+                        if (fileDiffParams.length > 0) {
                             // 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({
@@ -990,207 +1003,215 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                                 }, 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) {
+                        }
+                        // Merge diff content with change metadata.
+                        // Added/deleted entries get diff: null here and are enriched below.
+                        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 ? (entry.item.path.startsWith("/") ? entry.item.path.substring(1) : entry.item.path) : undefined;
+                                    // For deleted files ADO sets item.path to null and puts the path in originalPath only.
+                                    // Normalise originalPath once and use it as the fallback throughout.
+                                    const normalizedOriginalPath = entry.originalPath ? (entry.originalPath.startsWith("/") ? entry.originalPath.substring(1) : entry.originalPath) : undefined;
+                                    // effectivePath is what we use as the "current" path for API calls / early-exit guard.
+                                    // For additions/modifications it's item.path; for deletions it's originalPath.
+                                    const effectivePath = entryPath ?? normalizedOriginalPath;
+                                    if (!effectivePath) {
+                                        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, effectivePath, 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,
-                                                    _contentFetchError: `Failed to fetch added file content: ${addError instanceof Error ? addError.message : "Unknown error"}`,
+                                                    diff: {
+                                                        path: effectivePath,
+                                                        originalPath: null,
+                                                        lineDiffBlocks: [
+                                                            {
+                                                                changeType: 1, // Add
+                                                                originalLineNumberStart: 0,
+                                                                originalLinesCount: 0,
+                                                                modifiedLineNumberStart: 1,
+                                                                modifiedLinesCount: targetLines.length,
+                                                                modifiedLines: targetLines,
+                                                            },
+                                                        ],
+                                                    },
                                                 };
                                             }
-                                            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) {
+                                        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.
+                                    // basePath prefers originalPath (the pre-deletion path); falls back to effectivePath.
+                                    if (isDelete && !entry.diff) {
+                                        try {
+                                            const basePath = normalizedOriginalPath ?? effectivePath;
+                                            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,
-                                                    _contentFetchError: `Failed to fetch deleted file content: ${delError instanceof Error ? delError.message : "Unknown error"}`,
+                                                    diff: {
+                                                        path: null,
+                                                        originalPath: basePath,
+                                                        lineDiffBlocks: [
+                                                            {
+                                                                changeType: 2, // Delete
+                                                                originalLineNumberStart: 1,
+                                                                originalLinesCount: baseLines.length,
+                                                                modifiedLineNumberStart: 0,
+                                                                modifiedLinesCount: 0,
+                                                                originalLines: baseLines,
+                                                            },
+                                                        ],
+                                                    },
                                                 };
                                             }
-                                            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
+                                        catch (delError) {
                                             return {
                                                 ...entry,
-                                                _contentFetchError: `Failed to fetch line content: ${contentError instanceof Error ? contentError.message : "Unknown error"}`,
+                                                _contentFetchError: `Failed to fetch deleted file content: ${delError instanceof Error ? delError.message : "Unknown error"}`,
                                             };
                                         }
-                                    }));
-                                    // Write batch results back into the array
-                                    for (let j = 0; j < batchResults.length; j++) {
-                                        entriesWithContent[i + j] = batchResults[j];
+                                        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 = normalizedOriginalPath ?? effectivePath;
+                                    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, effectivePath, 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),
-                                    },
-                                ],
-                            };
+                            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),
+                                },
+                            ],
+                        };
                     }
                 }
             }
@@ -1220,7 +1241,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
-            const comment = await gitApi.createComment({ content }, repositoryId, pullRequestId, threadId, project);
+            const comment = await gitApi.createComment({ content, commentType: 1 }, repositoryId, pullRequestId, threadId, project);
             // Check if the comment was successfully created
             if (!comment) {
                 return {
@@ -1266,7 +1287,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         rightFileStartOffset: z
             .number()
             .optional()
-            .describe("Position of first character of the thread's span in right file. The line number of a thread's position. The character offset of a thread's position inside of a line. Starts at 1. Must be set if rightFileStartLine is also specified. (optional)"),
+            .describe("Start character offset of the thread's span within the line in the right file. The character offset of a thread's position inside of a line. Starts at 1. Must be set if rightFileStartLine is also specified. (optional)"),
         rightFileEndLine: z
             .number()
             .optional()
@@ -1274,7 +1295,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         rightFileEndOffset: z
             .number()
             .optional()
-            .describe("Position of last character of the thread's span in right file. The character offset of a thread's position inside of a line. Must be set if rightFileEndLine is also specified. (optional)"),
+            .describe("Exclusive end character offset of the thread's span within the line in the right file. This value is exclusive: to cover the entire line, set it to (length of the original line text) + 1. When posting a suggestion, always calculate this from the existing file content being replaced, not from the suggestion or replacement text. Must be set if rightFileEndLine is also specified. (optional)"),
     }, async ({ repositoryId, pullRequestId, content, project, filePath, status, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset }) => {
         try {
             const connection = await connectionProvider();
@@ -1351,7 +1372,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                     };
                 }
             }
-            const thread = await gitApi.createThread({ comments: [{ content: content }], threadContext: threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
+            const thread = await gitApi.createThread({ comments: [{ content: content, commentType: 1 }], threadContext: threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
             const trimmedThread = trimPullRequestThread(thread);
             return {
                 content: [{ type: "text", text: JSON.stringify(trimmedThread, null, 2) }],
@@ -1598,7 +1619,18 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             WaitingForAuthor: -5,
             Rejected: -10,
         };
-        await gitApi.createPullRequestReviewer({ vote: voteMap[vote], id: userId }, repositoryId, pullRequestId, userId, project);
+        const existingReviewer = await gitApi.getPullRequestReviewer(repositoryId, pullRequestId, userId, project).catch((error) => {
+            if (!(error instanceof Error) || !/not found|reviewer does not exist/i.test(error.message)) {
+                throw error;
+            }
+            return undefined;
+        });
+        const reviewerPayload = {
+            vote: voteMap[vote],
+            id: userId,
+            ...(existingReviewer?.isRequired !== undefined ? { isRequired: existingReviewer.isRequired } : {}),
+        };
+        await gitApi.createPullRequestReviewer(reviewerPayload, repositoryId, pullRequestId, userId, project);
         return {
             content: [
                 {
@@ -1608,7 +1640,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             ],
         };
     });
-    server.tool(REPO_TOOLS.list_directory, "List files and folders in a directory within a repository. Useful for exploring the structure of a codebase or finding related files.", {
+    server.tool(REPO_TOOLS.list_directory, "List files and folders in a directory within a repository. Useful for exploring the structure of a codebase or finding related files. Returns isError: true if the path is not found.", {
         repositoryId: z.string().describe("The ID or name of the repository."),
         path: z.string().optional().default("/").describe("The directory path to list (e.g., '/src' or '/src/components'). Defaults to repository root."),
         project: z.string().optional().describe("Project ID or name. Required if repositoryId is a name rather than a GUID."),
@@ -1629,7 +1661,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             const items = await gitApi.getItems(repositoryId, project, path, recursionType, true, false, false, false, versionDescriptor);
             if (!items || items.length === 0) {
                 return {
-                    content: [{ type: "text", text: `No items found at path: ${path}` }],
+                    content: [{ type: "text", text: `No items found at path: ${path}. The path may not exist in the repository.` }],
+                    isError: true,
                 };
             }
             let filteredItems = items;
@@ -1677,7 +1710,8 @@ 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.", {
+        "Useful for reading source files from PR branches, specific commits, or tags without having them checked out locally. " +
+        "Returns isError: true if the file is not found.", {
         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."),
@@ -1710,6 +1744,13 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             versionDescriptor, true // includeContent
             );
             const content = await streamToString(stream);
+            const streamError = extractAdoStreamError(content);
+            if (streamError) {
+                return {
+                    content: [{ type: "text", text: `Error getting file content for '${path}': ${streamError}` }],
+                    isError: true,
+                };
+            }
             return {
                 content: [{ type: "text", text: content }],
             };