@azure-devops/mcp 2.2.2-nightly.20251125 → 2.2.2-nightly.20251127

package/dist/tools/repositories.js

@@ -114,31 +114,40 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         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 }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const workItemRefs = workItems ? workItems.split(" ").map((id) => ({ id: id.trim() })) : [];
-        const forkSource = forkSourceRepositoryId
-            ? {
-                repository: {
-                    id: forkSourceRepositoryId,
-                },
-            }
-            : undefined;
-        const labelDefinitions = labels ? labels.map((label) => ({ name: label })) : undefined;
-        const pullRequest = await gitApi.createPullRequest({
-            sourceRefName,
-            targetRefName,
-            title,
-            description,
-            isDraft,
-            workItemRefs: workItemRefs,
-            forkSource,
-            labels: labelDefinitions,
-        }, repositoryId);
-        const trimmedPullRequest = trimPullRequest(pullRequest, true);
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedPullRequest, null, 2) }],
-        };
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const workItemRefs = workItems ? workItems.split(" ").map((id) => ({ id: id.trim() })) : [];
+            const forkSource = forkSourceRepositoryId
+                ? {
+                    repository: {
+                        id: forkSourceRepositoryId,
+                    },
+                }
+                : undefined;
+            const labelDefinitions = labels ? labels.map((label) => ({ name: label })) : undefined;
+            const pullRequest = await gitApi.createPullRequest({
+                sourceRefName,
+                targetRefName,
+                title,
+                description,
+                isDraft,
+                workItemRefs: workItemRefs,
+                forkSource,
+                labels: labelDefinitions,
+            }, repositoryId);
+            const trimmedPullRequest = trimPullRequest(pullRequest, true);
+            return {
+                content: [{ type: "text", text: JSON.stringify(trimmedPullRequest, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error creating pull request: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     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."),
@@ -146,67 +155,80 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         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 }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        let commitId = sourceCommitId;
-        // If no commit ID is provided, get the latest commit from the source branch
-        if (!commitId) {
-            const sourceRefName = `refs/heads/${sourceBranchName}`;
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            let commitId = sourceCommitId;
+            // If no commit ID is provided, get the latest commit from the source branch
+            if (!commitId) {
+                const sourceRefName = `refs/heads/${sourceBranchName}`;
+                try {
+                    const sourceBranch = await gitApi.getRefs(repositoryId, undefined, "heads/", false, false, undefined, false, undefined, sourceBranchName);
+                    const branch = sourceBranch.find((b) => b.name === sourceRefName);
+                    if (!branch || !branch.objectId) {
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `Error: Source branch '${sourceBranchName}' not found in repository ${repositoryId}`,
+                                },
+                            ],
+                            isError: true,
+                        };
+                    }
+                    commitId = branch.objectId;
+                }
+                catch (error) {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Error retrieving source branch '${sourceBranchName}': ${error instanceof Error ? error.message : String(error)}`,
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
+            }
+            // Create the new branch using updateRefs
+            const newRefName = `refs/heads/${branchName}`;
+            const refUpdate = {
+                name: newRefName,
+                newObjectId: commitId,
+                oldObjectId: "0000000000000000000000000000000000000000", // All zeros indicates creating a new ref
+            };
             try {
-                const sourceBranch = await gitApi.getRefs(repositoryId, undefined, "heads/", false, false, undefined, false, undefined, sourceBranchName);
-                const branch = sourceBranch.find((b) => b.name === sourceRefName);
-                if (!branch || !branch.objectId) {
+                const result = await gitApi.updateRefs([refUpdate], repositoryId);
+                // Check if the branch creation was successful
+                if (result && result.length > 0 && result[0].success) {
                     return {
                         content: [
                             {
                                 type: "text",
-                                text: `Error: Source branch '${sourceBranchName}' not found in repository ${repositoryId}`,
+                                text: `Branch '${branchName}' created successfully from '${sourceBranchName}' (${commitId})`,
+                            },
+                        ],
+                    };
+                }
+                else {
+                    const errorMessage = result && result.length > 0 && result[0].customMessage ? result[0].customMessage : "Unknown error occurred during branch creation";
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Error creating branch '${branchName}': ${errorMessage}`,
                             },
                         ],
                         isError: true,
                     };
                 }
-                commitId = branch.objectId;
             }
             catch (error) {
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `Error retrieving source branch '${sourceBranchName}': ${error instanceof Error ? error.message : String(error)}`,
-                        },
-                    ],
-                    isError: true,
-                };
-            }
-        }
-        // Create the new branch using updateRefs
-        const newRefName = `refs/heads/${branchName}`;
-        const refUpdate = {
-            name: newRefName,
-            newObjectId: commitId,
-            oldObjectId: "0000000000000000000000000000000000000000", // All zeros indicates creating a new ref
-        };
-        try {
-            const result = await gitApi.updateRefs([refUpdate], repositoryId);
-            // Check if the branch creation was successful
-            if (result && result.length > 0 && result[0].success) {
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Branch '${branchName}' created successfully from '${sourceBranchName}' (${commitId})`,
-                        },
-                    ],
-                };
-            }
-            else {
-                const errorMessage = result && result.length > 0 && result[0].customMessage ? result[0].customMessage : "Unknown error occurred during branch creation";
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Error creating branch '${branchName}': ${errorMessage}`,
+                            text: `Error creating branch '${branchName}': ${error instanceof Error ? error.message : String(error)}`,
                         },
                     ],
                     isError: true,
@@ -214,13 +236,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             }
         }
         catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Error creating branch '${branchName}': ${error instanceof Error ? error.message : String(error)}`,
-                    },
-                ],
+                content: [{ type: "text", text: `Error creating branch: ${errorMessage}` }],
                 isError: true,
             };
         }
@@ -242,56 +260,65 @@ 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."),
     }, async ({ repositoryId, pullRequestId, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, deleteSourceBranch, transitionWorkItems, bypassReason }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        // Build update object with only provided fields
-        const updateRequest = {};
-        if (title !== undefined)
-            updateRequest.title = title;
-        if (description !== undefined)
-            updateRequest.description = description;
-        if (isDraft !== undefined)
-            updateRequest.isDraft = isDraft;
-        if (targetRefName !== undefined)
-            updateRequest.targetRefName = targetRefName;
-        if (status !== undefined) {
-            updateRequest.status = status === "Active" ? PullRequestStatus.Active.valueOf() : PullRequestStatus.Abandoned.valueOf();
-        }
-        if (autoComplete !== undefined) {
-            if (autoComplete) {
-                const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
-                const autoCompleteUserId = data.authenticatedUser.id;
-                updateRequest.autoCompleteSetBy = { id: autoCompleteUserId };
-                const completionOptions = {
-                    deleteSourceBranch: deleteSourceBranch || false,
-                    transitionWorkItems: transitionWorkItems !== false, // Default to true unless explicitly set to false
-                    bypassPolicy: !!bypassReason, // Automatically set to true if bypassReason is provided
-                };
-                if (mergeStrategy) {
-                    completionOptions.mergeStrategy = GitPullRequestMergeStrategy[mergeStrategy];
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            // Build update object with only provided fields
+            const updateRequest = {};
+            if (title !== undefined)
+                updateRequest.title = title;
+            if (description !== undefined)
+                updateRequest.description = description;
+            if (isDraft !== undefined)
+                updateRequest.isDraft = isDraft;
+            if (targetRefName !== undefined)
+                updateRequest.targetRefName = targetRefName;
+            if (status !== undefined) {
+                updateRequest.status = status === "Active" ? PullRequestStatus.Active.valueOf() : PullRequestStatus.Abandoned.valueOf();
+            }
+            if (autoComplete !== undefined) {
+                if (autoComplete) {
+                    const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
+                    const autoCompleteUserId = data.authenticatedUser.id;
+                    updateRequest.autoCompleteSetBy = { id: autoCompleteUserId };
+                    const completionOptions = {
+                        deleteSourceBranch: deleteSourceBranch || false,
+                        transitionWorkItems: transitionWorkItems !== false, // Default to true unless explicitly set to false
+                        bypassPolicy: !!bypassReason, // Automatically set to true if bypassReason is provided
+                    };
+                    if (mergeStrategy) {
+                        completionOptions.mergeStrategy = GitPullRequestMergeStrategy[mergeStrategy];
+                    }
+                    if (bypassReason) {
+                        completionOptions.bypassReason = bypassReason;
+                    }
+                    updateRequest.completionOptions = completionOptions;
                 }
-                if (bypassReason) {
-                    completionOptions.bypassReason = bypassReason;
+                else {
+                    updateRequest.autoCompleteSetBy = null;
+                    updateRequest.completionOptions = null;
                 }
-                updateRequest.completionOptions = completionOptions;
             }
-            else {
-                updateRequest.autoCompleteSetBy = null;
-                updateRequest.completionOptions = null;
+            // Validate that at least one field is provided for update
+            if (Object.keys(updateRequest).length === 0) {
+                return {
+                    content: [{ type: "text", text: "Error: At least one field (title, description, isDraft, targetRefName, status, or autoComplete options) must be provided for update." }],
+                    isError: true,
+                };
             }
+            const updatedPullRequest = await gitApi.updatePullRequest(updateRequest, repositoryId, pullRequestId);
+            const trimmedUpdatedPullRequest = trimPullRequest(updatedPullRequest, true);
+            return {
+                content: [{ type: "text", text: JSON.stringify(trimmedUpdatedPullRequest, null, 2) }],
+            };
         }
-        // Validate that at least one field is provided for update
-        if (Object.keys(updateRequest).length === 0) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [{ type: "text", text: "Error: At least one field (title, description, isDraft, targetRefName, status, or autoComplete options) must be provided for update." }],
+                content: [{ type: "text", text: `Error updating pull request: ${errorMessage}` }],
                 isError: true,
             };
         }
-        const updatedPullRequest = await gitApi.updatePullRequest(updateRequest, repositoryId, pullRequestId);
-        const trimmedUpdatedPullRequest = trimPullRequest(updatedPullRequest, true);
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedUpdatedPullRequest, null, 2) }],
-        };
     });
     server.tool(REPO_TOOLS.update_pull_request_reviewers, "Add or remove reviewers for an existing pull request.", {
         repositoryId: z.string().describe("The ID of the repository where the pull request exists."),
@@ -299,29 +326,38 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         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 }) => {
-        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);
-            const trimmedResponse = updatedPullRequest.map((item) => ({
-                displayName: item.displayName,
-                id: item.id,
-                uniqueName: item.uniqueName,
-                vote: item.vote,
-                hasDeclined: item.hasDeclined,
-                isFlagged: item.isFlagged,
-            }));
-            return {
-                content: [{ type: "text", text: JSON.stringify(trimmedResponse, null, 2) }],
-            };
-        }
-        else {
-            for (const reviewerId of reviewerIds) {
-                await gitApi.deletePullRequestReviewer(repositoryId, pullRequestId, reviewerId);
+        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);
+                const trimmedResponse = updatedPullRequest.map((item) => ({
+                    displayName: item.displayName,
+                    id: item.id,
+                    uniqueName: item.uniqueName,
+                    vote: item.vote,
+                    hasDeclined: item.hasDeclined,
+                    isFlagged: item.isFlagged,
+                }));
+                return {
+                    content: [{ type: "text", text: JSON.stringify(trimmedResponse, null, 2) }],
+                };
             }
+            else {
+                for (const reviewerId of reviewerIds) {
+                    await gitApi.deletePullRequestReviewer(repositoryId, pullRequestId, reviewerId);
+                }
+                return {
+                    content: [{ type: "text", text: `Reviewers with IDs ${reviewerIds.join(", ")} removed from pull request ${pullRequestId}.` }],
+                };
+            }
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [{ type: "text", text: `Reviewers with IDs ${reviewerIds.join(", ")} removed from pull request ${pullRequestId}.` }],
+                content: [{ type: "text", text: `Error updating pull request reviewers: ${errorMessage}` }],
+                isError: true,
             };
         }
     });
@@ -331,24 +367,33 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         skip: z.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 }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const repositories = await gitApi.getRepositories(project, false, false, false);
-        const filteredRepositories = repoNameFilter ? filterReposByName(repositories, repoNameFilter) : repositories;
-        const paginatedRepositories = filteredRepositories?.sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? 0).slice(skip, skip + top);
-        // Filter out the irrelevant properties
-        const trimmedRepositories = paginatedRepositories?.map((repo) => ({
-            id: repo.id,
-            name: repo.name,
-            isDisabled: repo.isDisabled,
-            isFork: repo.isFork,
-            isInMaintenance: repo.isInMaintenance,
-            webUrl: repo.webUrl,
-            size: repo.size,
-        }));
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedRepositories, null, 2) }],
-        };
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const repositories = await gitApi.getRepositories(project, false, false, false);
+            const filteredRepositories = repoNameFilter ? filterReposByName(repositories, repoNameFilter) : repositories;
+            const paginatedRepositories = filteredRepositories?.sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? 0).slice(skip, skip + top);
+            // Filter out the irrelevant properties
+            const trimmedRepositories = paginatedRepositories?.map((repo) => ({
+                id: repo.id,
+                name: repo.name,
+                isDisabled: repo.isDisabled,
+                isFork: repo.isFork,
+                isInMaintenance: repo.isInMaintenance,
+                webUrl: repo.webUrl,
+                size: repo.size,
+            }));
+            return {
+                content: [{ type: "text", text: JSON.stringify(trimmedRepositories, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error listing repositories: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     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."),
@@ -369,103 +414,112 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         sourceRefName: z.string().optional().describe("Filter pull requests from this source branch (e.g., 'refs/heads/feature-branch')."),
         targetRefName: z.string().optional().describe("Filter pull requests into this target branch (e.g., 'refs/heads/main')."),
     }, async ({ repositoryId, project, top, skip, created_by_me, created_by_user, i_am_reviewer, user_is_reviewer, status, sourceRefName, targetRefName }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        // Build the search criteria
-        const searchCriteria = {
-            status: pullRequestStatusStringToInt(status),
-        };
-        if (!repositoryId && !project) {
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: "Either repositoryId or project must be provided.",
-                    },
-                ],
-                isError: true,
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            // Build the search criteria
+            const searchCriteria = {
+                status: pullRequestStatusStringToInt(status),
             };
-        }
-        if (repositoryId) {
-            searchCriteria.repositoryId = repositoryId;
-        }
-        if (sourceRefName) {
-            searchCriteria.sourceRefName = sourceRefName;
-        }
-        if (targetRefName) {
-            searchCriteria.targetRefName = targetRefName;
-        }
-        if (created_by_user) {
-            try {
-                const userId = await getUserIdFromEmail(created_by_user, tokenProvider, connectionProvider, userAgentProvider);
-                searchCriteria.creatorId = userId;
-            }
-            catch (error) {
+            if (!repositoryId && !project) {
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `Error finding user with email ${created_by_user}: ${error instanceof Error ? error.message : String(error)}`,
+                            text: "Either repositoryId or project must be provided.",
                         },
                     ],
                     isError: true,
                 };
             }
-        }
-        else if (created_by_me) {
-            const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
-            const userId = data.authenticatedUser.id;
-            searchCriteria.creatorId = userId;
-        }
-        if (user_is_reviewer) {
-            try {
-                const reviewerUserId = await getUserIdFromEmail(user_is_reviewer, tokenProvider, connectionProvider, userAgentProvider);
-                searchCriteria.reviewerId = reviewerUserId;
+            if (repositoryId) {
+                searchCriteria.repositoryId = repositoryId;
             }
-            catch (error) {
+            if (sourceRefName) {
+                searchCriteria.sourceRefName = sourceRefName;
+            }
+            if (targetRefName) {
+                searchCriteria.targetRefName = targetRefName;
+            }
+            if (created_by_user) {
+                try {
+                    const userId = await getUserIdFromEmail(created_by_user, tokenProvider, connectionProvider, userAgentProvider);
+                    searchCriteria.creatorId = userId;
+                }
+                catch (error) {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Error finding user with email ${created_by_user}: ${error instanceof Error ? error.message : String(error)}`,
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
+            }
+            else if (created_by_me) {
+                const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
+                const userId = data.authenticatedUser.id;
+                searchCriteria.creatorId = userId;
+            }
+            if (user_is_reviewer) {
+                try {
+                    const reviewerUserId = await getUserIdFromEmail(user_is_reviewer, tokenProvider, connectionProvider, userAgentProvider);
+                    searchCriteria.reviewerId = reviewerUserId;
+                }
+                catch (error) {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Error finding reviewer with email ${user_is_reviewer}: ${error instanceof Error ? error.message : String(error)}`,
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
+            }
+            else if (i_am_reviewer) {
+                const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
+                const userId = data.authenticatedUser.id;
+                searchCriteria.reviewerId = userId;
+            }
+            let pullRequests;
+            if (repositoryId) {
+                pullRequests = await gitApi.getPullRequests(repositoryId, searchCriteria, project, // project
+                undefined, // maxCommentLength
+                skip, top);
+            }
+            else if (project) {
+                // If only project is provided, use getPullRequestsByProject
+                pullRequests = await gitApi.getPullRequestsByProject(project, searchCriteria, undefined, // maxCommentLength
+                skip, top);
+            }
+            else {
+                // This case should not occur due to earlier validation, but added for completeness
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `Error finding reviewer with email ${user_is_reviewer}: ${error instanceof Error ? error.message : String(error)}`,
+                            text: "Either repositoryId or project must be provided.",
                         },
                     ],
                     isError: true,
                 };
             }
+            const filteredPullRequests = pullRequests?.map((pr) => trimPullRequest(pr));
+            return {
+                content: [{ type: "text", text: JSON.stringify(filteredPullRequests, null, 2) }],
+            };
         }
-        else if (i_am_reviewer) {
-            const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
-            const userId = data.authenticatedUser.id;
-            searchCriteria.reviewerId = userId;
-        }
-        let pullRequests;
-        if (repositoryId) {
-            pullRequests = await gitApi.getPullRequests(repositoryId, searchCriteria, project, // project
-            undefined, // maxCommentLength
-            skip, top);
-        }
-        else if (project) {
-            // If only project is provided, use getPullRequestsByProject
-            pullRequests = await gitApi.getPullRequestsByProject(project, searchCriteria, undefined, // maxCommentLength
-            skip, top);
-        }
-        else {
-            // This case should not occur due to earlier validation, but added for completeness
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: "Either repositoryId or project must be provided.",
-                    },
-                ],
+                content: [{ type: "text", text: `Error listing pull requests: ${errorMessage}` }],
                 isError: true,
             };
         }
-        const filteredPullRequests = pullRequests?.map((pr) => trimPullRequest(pr));
-        return {
-            content: [{ type: "text", text: JSON.stringify(filteredPullRequests, null, 2) }],
-        };
     });
     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."),
@@ -483,38 +537,47 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         authorEmail: z.string().optional().describe("Filter threads by the email of the thread author (first comment author)."),
         authorDisplayName: z.string().optional().describe("Filter threads by the display name of the thread author (first comment author). Case-insensitive partial matching."),
     }, async ({ repositoryId, pullRequestId, project, iteration, baseIteration, top, skip, fullResponse, status, authorEmail, authorDisplayName }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        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);
-        }
-        if (authorEmail !== undefined) {
-            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) => {
-                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);
-        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));
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedThreads, null, 2) }],
-        };
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            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);
+            }
+            if (authorEmail !== undefined) {
+                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) => {
+                    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);
+            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));
+            return {
+                content: [{ type: "text", text: JSON.stringify(trimmedThreads, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error listing pull request threads: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     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."),
@@ -525,97 +588,184 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         skip: z.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 }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        // Get thread comments - GitApi uses getComments for retrieving comments from a specific thread
-        const comments = await gitApi.getComments(repositoryId, pullRequestId, threadId, project);
-        const paginatedComments = comments?.sort((a, b) => (a.id ?? 0) - (b.id ?? 0)).slice(skip, skip + top);
-        if (fullResponse) {
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            // Get thread comments - GitApi uses getComments for retrieving comments from a specific thread
+            const comments = await gitApi.getComments(repositoryId, pullRequestId, threadId, project);
+            const paginatedComments = comments?.sort((a, b) => (a.id ?? 0) - (b.id ?? 0)).slice(skip, skip + top);
+            if (fullResponse) {
+                return {
+                    content: [{ type: "text", text: JSON.stringify(paginatedComments, null, 2) }],
+                };
+            }
+            // Return trimmed comment data focusing on essential information
+            const trimmedComments = trimComments(paginatedComments);
             return {
-                content: [{ type: "text", text: JSON.stringify(paginatedComments, null, 2) }],
+                content: [{ type: "text", text: JSON.stringify(trimmedComments, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error listing pull request thread comments: ${errorMessage}` }],
+                isError: true,
             };
         }
-        // Return trimmed comment data focusing on essential information
-        const trimmedComments = trimComments(paginatedComments);
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedComments, null, 2) }],
-        };
     });
     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."),
         filterContains: z.string().optional().describe("Filter to find branches that contain this string in their name."),
     }, async ({ repositoryId, top, filterContains }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", undefined, undefined, undefined, undefined, undefined, filterContains);
-        const filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
-        return {
-            content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
-        };
+        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 filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
+            return {
+                content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error listing branches: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     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."),
         filterContains: z.string().optional().describe("Filter to find branches that contain this string in their name."),
     }, async ({ repositoryId, top, filterContains }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", undefined, undefined, true, undefined, undefined, filterContains);
-        const filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
-        return {
-            content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
-        };
+        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 filteredBranches = branchesFilterOutIrrelevantProperties(branches, top);
+            return {
+                content: [{ type: "text", text: JSON.stringify(filteredBranches, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error listing my branches: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     server.tool(REPO_TOOLS.get_repo_by_name_or_id, "Get the repository by project and repository name or ID.", {
         project: z.string().describe("Project name or ID where the repository is located."),
         repositoryNameOrId: z.string().describe("Repository name or ID."),
     }, async ({ project, repositoryNameOrId }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const repositories = await gitApi.getRepositories(project);
-        const repository = repositories?.find((repo) => repo.name === repositoryNameOrId || repo.id === repositoryNameOrId);
-        if (!repository) {
-            throw new Error(`Repository ${repositoryNameOrId} not found in project ${project}`);
-        }
-        return {
-            content: [{ type: "text", text: JSON.stringify(repository, null, 2) }],
-        };
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const repositories = await gitApi.getRepositories(project);
+            const repository = repositories?.find((repo) => repo.name === repositoryNameOrId || repo.id === repositoryNameOrId);
+            if (!repository) {
+                return {
+                    content: [{ type: "text", text: `Repository ${repositoryNameOrId} not found in project ${project}` }],
+                    isError: true,
+                };
+            }
+            return {
+                content: [{ type: "text", text: JSON.stringify(repository, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error getting repository: ${errorMessage}` }],
+                isError: true,
+            };
+        }
     });
     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."),
         branchName: z.string().describe("The name of the branch to retrieve, e.g., 'main' or 'feature-branch'."),
     }, async ({ repositoryId, branchName }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const branches = await gitApi.getRefs(repositoryId, undefined, "heads/", false, false, undefined, false, undefined, branchName);
-        const branch = branches.find((branch) => branch.name === `refs/heads/${branchName}` || branch.name === branchName);
-        if (!branch) {
+        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 branch = branches.find((branch) => branch.name === `refs/heads/${branchName}` || branch.name === branchName);
+            if (!branch) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: `Branch ${branchName} not found in repository ${repositoryId}`,
+                        },
+                    ],
+                    isError: true,
+                };
+            }
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Branch ${branchName} not found in repository ${repositoryId}`,
-                    },
-                ],
+                content: [{ type: "text", text: JSON.stringify(branch, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error getting branch: ${errorMessage}` }],
                 isError: true,
             };
         }
-        return {
-            content: [{ type: "text", text: JSON.stringify(branch, null, 2) }],
-        };
     });
     server.tool(REPO_TOOLS.get_pull_request_by_id, "Get a pull request by its ID.", {
         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 to retrieve."),
         includeWorkItemRefs: z.boolean().optional().default(false).describe("Whether to reference work items associated with the pull request."),
-    }, async ({ repositoryId, pullRequestId, includeWorkItemRefs }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const pullRequest = await gitApi.getPullRequest(repositoryId, pullRequestId, undefined, undefined, undefined, undefined, undefined, includeWorkItemRefs);
-        return {
-            content: [{ type: "text", text: JSON.stringify(pullRequest, null, 2) }],
-        };
+        includeLabels: z.boolean().optional().default(false).describe("Whether to include a summary of labels in the response."),
+    }, async ({ repositoryId, pullRequestId, includeWorkItemRefs, includeLabels }) => {
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const pullRequest = await gitApi.getPullRequest(repositoryId, pullRequestId, undefined, undefined, undefined, undefined, undefined, includeWorkItemRefs);
+            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,
+                        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,
+                        labelSummary: {},
+                    };
+                    return {
+                        content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }],
+                    };
+                }
+            }
+            return {
+                content: [{ type: "text", text: JSON.stringify(pullRequest, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error getting pull request: ${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 of the repository where the pull request is located."),
@@ -625,24 +775,33 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         project: z.string().optional().describe("Project ID or project name (optional)"),
         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 }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const comment = await gitApi.createComment({ content }, repositoryId, pullRequestId, threadId, project);
-        // Check if the comment was successfully created
-        if (!comment) {
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const comment = await gitApi.createComment({ content }, repositoryId, pullRequestId, threadId, project);
+            // Check if the comment was successfully created
+            if (!comment) {
+                return {
+                    content: [{ type: "text", text: `Error: Failed to add comment to thread ${threadId}. The comment was not created successfully.` }],
+                    isError: true,
+                };
+            }
+            if (fullResponse) {
+                return {
+                    content: [{ type: "text", text: JSON.stringify(comment, null, 2) }],
+                };
+            }
             return {
-                content: [{ type: "text", text: `Error: Failed to add comment to thread ${threadId}. The comment was not created successfully.` }],
-                isError: true,
+                content: [{ type: "text", text: `Comment successfully added to thread ${threadId}.` }],
             };
         }
-        if (fullResponse) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [{ type: "text", text: JSON.stringify(comment, null, 2) }],
+                content: [{ type: "text", text: `Error replying to comment: ${errorMessage}` }],
+                isError: true,
             };
         }
-        return {
-            content: [{ type: "text", text: `Comment successfully added to thread ${threadId}.` }],
-        };
     });
     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."),
@@ -669,42 +828,66 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             .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 only be set if rightFileEndLine is also specified. (optional)"),
     }, async ({ repositoryId, pullRequestId, content, project, filePath, status, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const normalizedFilePath = filePath && !filePath.startsWith("/") ? `/${filePath}` : filePath;
-        const threadContext = { filePath: normalizedFilePath };
-        if (rightFileStartLine !== undefined) {
-            if (rightFileStartLine < 1) {
-                throw new Error("rightFileStartLine must be greater than or equal to 1.");
-            }
-            threadContext.rightFileStart = { line: rightFileStartLine };
-            if (rightFileStartOffset !== undefined) {
-                if (rightFileStartOffset < 1) {
-                    throw new Error("rightFileStartOffset must be greater than or equal to 1.");
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const normalizedFilePath = filePath && !filePath.startsWith("/") ? `/${filePath}` : filePath;
+            const threadContext = { filePath: normalizedFilePath };
+            if (rightFileStartLine !== undefined) {
+                if (rightFileStartLine < 1) {
+                    return {
+                        content: [{ type: "text", text: "rightFileStartLine must be greater than or equal to 1." }],
+                        isError: true,
+                    };
+                }
+                threadContext.rightFileStart = { line: rightFileStartLine };
+                if (rightFileStartOffset !== undefined) {
+                    if (rightFileStartOffset < 1) {
+                        return {
+                            content: [{ type: "text", text: "rightFileStartOffset must be greater than or equal to 1." }],
+                            isError: true,
+                        };
+                    }
+                    threadContext.rightFileStart.offset = rightFileStartOffset;
                 }
-                threadContext.rightFileStart.offset = rightFileStartOffset;
-            }
-        }
-        if (rightFileEndLine !== undefined) {
-            if (rightFileStartLine === undefined) {
-                throw new Error("rightFileEndLine must only be specified if rightFileStartLine is also specified.");
-            }
-            if (rightFileEndLine < 1) {
-                throw new Error("rightFileEndLine must be greater than or equal to 1.");
             }
-            threadContext.rightFileEnd = { line: rightFileEndLine };
-            if (rightFileEndOffset !== undefined) {
-                if (rightFileEndOffset < 1) {
-                    throw new Error("rightFileEndOffset must be greater than or equal to 1.");
+            if (rightFileEndLine !== undefined) {
+                if (rightFileStartLine === undefined) {
+                    return {
+                        content: [{ type: "text", text: "rightFileEndLine must only be specified if rightFileStartLine is also specified." }],
+                        isError: true,
+                    };
+                }
+                if (rightFileEndLine < 1) {
+                    return {
+                        content: [{ type: "text", text: "rightFileEndLine must be greater than or equal to 1." }],
+                        isError: true,
+                    };
+                }
+                threadContext.rightFileEnd = { line: rightFileEndLine };
+                if (rightFileEndOffset !== undefined) {
+                    if (rightFileEndOffset < 1) {
+                        return {
+                            content: [{ type: "text", text: "rightFileEndOffset must be greater than or equal to 1." }],
+                            isError: true,
+                        };
+                    }
+                    threadContext.rightFileEnd.offset = rightFileEndOffset;
                 }
-                threadContext.rightFileEnd.offset = rightFileEndOffset;
             }
+            const thread = await gitApi.createThread({ comments: [{ content: content }], threadContext: threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
+            const trimmedThread = trimPullRequestThread(thread);
+            return {
+                content: [{ type: "text", text: JSON.stringify(trimmedThread, null, 2) }],
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            return {
+                content: [{ type: "text", text: `Error creating pull request thread: ${errorMessage}` }],
+                isError: true,
+            };
         }
-        const thread = await gitApi.createThread({ comments: [{ content: content }], threadContext: threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
-        const trimmedThread = trimPullRequestThread(thread);
-        return {
-            content: [{ type: "text", text: JSON.stringify(trimmedThread, null, 2) }],
-        };
     });
     server.tool(REPO_TOOLS.resolve_comment, "Resolves a specific comment thread on a pull request.", {
         repositoryId: z.string().describe("The ID of the repository where the pull request is located."),
@@ -712,25 +895,34 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         threadId: z.number().describe("The ID of the thread to be resolved."),
         fullResponse: z.boolean().optional().default(false).describe("Return full thread JSON response instead of a simple confirmation message."),
     }, async ({ repositoryId, pullRequestId, threadId, fullResponse }) => {
-        const connection = await connectionProvider();
-        const gitApi = await connection.getGitApi();
-        const thread = await gitApi.updateThread({ status: 2 }, // 2 corresponds to "Resolved" status
-        repositoryId, pullRequestId, threadId);
-        // Check if the thread was successfully resolved
-        if (!thread) {
-            return {
-                content: [{ type: "text", text: `Error: Failed to resolve thread ${threadId}. The thread status was not updated successfully.` }],
-                isError: true,
+        try {
+            const connection = await connectionProvider();
+            const gitApi = await connection.getGitApi();
+            const thread = await gitApi.updateThread({ status: 2 }, // 2 corresponds to "Resolved" status
+            repositoryId, pullRequestId, threadId);
+            // Check if the thread was successfully resolved
+            if (!thread) {
+                return {
+                    content: [{ type: "text", text: `Error: Failed to resolve thread ${threadId}. The thread status was not updated successfully.` }],
+                    isError: true,
+                };
+            }
+            if (fullResponse) {
+                return {
+                    content: [{ type: "text", text: JSON.stringify(thread, null, 2) }],
+                };
+            }
+            return {
+                content: [{ type: "text", text: `Thread ${threadId} was successfully resolved.` }],
             };
         }
-        if (fullResponse) {
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [{ type: "text", text: JSON.stringify(thread, null, 2) }],
+                content: [{ type: "text", text: `Error resolving comment: ${errorMessage}` }],
+                isError: true,
             };
         }
-        return {
-            content: [{ type: "text", text: `Thread ${threadId} was successfully resolved.` }],
-        };
     });
     const gitVersionTypeStrings = Object.values(GitVersionType).filter((value) => typeof value === "string");
     server.tool(REPO_TOOLS.search_commits, "Search for commits in a repository with comprehensive filtering capabilities. Supports searching by description/comment text, time range, author, committer, specific commit IDs, and more. This is the unified tool for all commit search operations.", {
@@ -820,7 +1012,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             if (historySimplificationMode) {
                 // Note: This parameter might not be directly supported by all ADO API versions
                 // but we'll include it in the criteria for forward compatibility
-                searchCriteria.historySimplificationMode = historySimplificationMode;
+                const extendedCriteria = searchCriteria;
+                extendedCriteria.historySimplificationMode = historySimplificationMode;
             }
             if (version) {
                 const itemVersion = {
@@ -892,13 +1085,9 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
             };
         }
         catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
             return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Error querying pull requests by commits: ${error instanceof Error ? error.message : String(error)}`,
-                    },
-                ],
+                content: [{ type: "text", text: `Error querying pull requests by commits: ${errorMessage}` }],
                 isError: true,
             };
         }