@azure-devops/mcp 2.9.0 → 2.10.0

package/dist/tools/pipelines.js

@@ -8,111 +8,102 @@ import { ConfigurationType, RepositoryType } from "azure-devops-node-api/interfa
 import { mkdirSync, createWriteStream } from "fs";
 import { createExternalContentResponse } from "../shared/content-safety.js";
 import { join, posix, resolve, win32 } from "path";
-import { dispatchAction, errorResult } from "../shared/command.js";
 import { pipelinesWriteShape } from "./pipelines.dto.js";
-// ─── pipelines_write commands ────────────────────────────────────────────────
-// Each write action is a self-contained command. Shared infrastructure arrives
-// via `CommandContext`; the action-specific input arrives via a single typed
-// args object (see pipelines.dto.ts). This keeps the dispatcher agnostic of
-// individual argument lists.
-const runPipelineCommand = {
-    async execute(context, args) {
-        if (!args.pipelineId)
-            return errorResult("pipelineId is required for run_pipeline");
-        if (!args.previewRun && args.yamlOverride)
-            throw new Error("Parameter 'yamlOverride' can only be specified together with parameter 'previewRun'.");
-        const connection = await context.connectionProvider();
-        const pipelinesApi = await connection.getPipelinesApi();
-        const runRequest = {
-            previewRun: args.previewRun,
-            resources: { ...args.resources },
-            stagesToSkip: args.stagesToSkip,
-            templateParameters: args.templateParameters,
-            variables: args.variables,
-            yamlOverride: args.yamlOverride,
-        };
-        const pipelineRun = await pipelinesApi.runPipeline(runRequest, args.project, args.pipelineId, args.pipelineVersion);
-        if (pipelineRun.id === undefined)
-            throw new Error("Failed to get build ID from pipeline run");
-        return { content: [{ type: "text", text: JSON.stringify(pipelineRun, null, 2) }] };
-    },
-};
-const createPipelineCommand = {
-    async execute(context, args) {
-        if (!args.name)
-            return errorResult("name is required for create_pipeline");
-        if (!args.yamlPath)
-            return errorResult("yamlPath is required for create_pipeline");
-        if (!args.repositoryType)
-            return errorResult("repositoryType is required for create_pipeline");
-        if (!args.repositoryName)
-            return errorResult("repositoryName is required for create_pipeline");
-        const connection = await context.connectionProvider();
-        const pipelinesApi = await connection.getPipelinesApi();
-        const repositoryTypeEnumValue = safeEnumConvert(RepositoryType, args.repositoryType);
-        const repositoryPayload = { type: args.repositoryType };
-        if (repositoryTypeEnumValue === RepositoryType.AzureReposGit) {
-            repositoryPayload.id = args.repositoryId;
-            repositoryPayload.name = args.repositoryName;
-        }
-        else if (repositoryTypeEnumValue === RepositoryType.GitHub) {
-            if (!args.repositoryConnectionId)
-                throw new Error("Parameter 'repositoryConnectionId' is required for GitHub repositories.");
-            repositoryPayload.connection = { id: args.repositoryConnectionId };
-            repositoryPayload.fullname = args.repositoryName;
-        }
-        else {
-            throw new Error("Unsupported repository type");
-        }
-        const yamlConfigurationType = getEnumKeys(ConfigurationType).find((k) => ConfigurationType[k] === ConfigurationType.Yaml);
-        const createParams = {
-            name: args.name,
-            folder: args.folder || "\\",
-            configuration: { type: yamlConfigurationType, path: args.yamlPath, repository: repositoryPayload, variables: undefined },
-        };
-        const newPipeline = await pipelinesApi.createPipeline(createParams, args.project);
-        return { content: [{ type: "text", text: JSON.stringify(newPipeline, null, 2) }] };
-    },
-};
-const updateBuildStageCommand = {
-    async execute(context, args) {
-        if (!args.buildId)
-            return errorResult("buildId is required for update_build_stage");
-        if (!args.stageName)
-            return errorResult("stageName is required for update_build_stage");
-        if (!args.status)
-            return errorResult("status is required for update_build_stage");
-        const connection = await context.connectionProvider();
-        const orgUrl = connection.serverUrl;
-        const endpoint = `${orgUrl}/${encodeURIComponent(args.project)}/_apis/build/builds/${args.buildId}/stages/${encodeURIComponent(args.stageName)}?api-version=${apiVersion}`;
-        const token = await context.tokenProvider();
-        const body = { forceRetryAllJobs: args.forceRetryAllJobs, state: safeEnumConvert(StageUpdateType, args.status) };
-        const response = await fetch(endpoint, {
-            method: "PATCH",
-            headers: { "Content-Type": "application/json", "Authorization": `Bearer ${token}`, "User-Agent": context.userAgentProvider() },
-            body: JSON.stringify(body),
-        });
-        if (!response.ok) {
-            const errorText = await response.text();
-            throw new Error(`Failed to update build stage: ${response.status} ${errorText}`);
-        }
-        const updatedBuild = await response.text();
-        return { content: [{ type: "text", text: JSON.stringify(updatedBuild, null, 2) }] };
-    },
-};
-/**
- * The registry is the lookup table that couples each action to its command.
- * Adding a new write action means registering one entry here — the dispatcher
- * (`dispatchAction`) never changes.
- */
-const pipelinesWriteCommands = {
-    run_pipeline: runPipelineCommand,
-    create_pipeline: createPipelineCommand,
-    update_build_stage: updateBuildStageCommand,
-};
+const errorResult = (text) => ({ content: [{ type: "text", text }], isError: true });
+async function runPipeline(args, connectionProvider) {
+    if (!args.pipelineId)
+        return errorResult("pipelineId is required for run_pipeline");
+    if (!args.previewRun && args.yamlOverride)
+        throw new Error("Parameter 'yamlOverride' can only be specified together with parameter 'previewRun'.");
+    const connection = await connectionProvider();
+    const pipelinesApi = await connection.getPipelinesApi();
+    const runRequest = {
+        previewRun: args.previewRun,
+        resources: { ...args.resources },
+        stagesToSkip: args.stagesToSkip,
+        templateParameters: args.templateParameters,
+        variables: args.variables,
+        yamlOverride: args.yamlOverride,
+    };
+    const pipelineRun = await pipelinesApi.runPipeline(runRequest, args.project, args.pipelineId, args.pipelineVersion);
+    if (pipelineRun.id === undefined)
+        throw new Error("Failed to get build ID from pipeline run");
+    return { content: [{ type: "text", text: JSON.stringify(pipelineRun, null, 2) }] };
+}
+async function createPipeline(args, connectionProvider) {
+    if (!args.name)
+        return errorResult("name is required for create_pipeline");
+    if (!args.yamlPath)
+        return errorResult("yamlPath is required for create_pipeline");
+    if (!args.repositoryType)
+        return errorResult("repositoryType is required for create_pipeline");
+    if (!args.repositoryName)
+        return errorResult("repositoryName is required for create_pipeline");
+    const connection = await connectionProvider();
+    const pipelinesApi = await connection.getPipelinesApi();
+    const repositoryTypeEnumValue = safeEnumConvert(RepositoryType, args.repositoryType);
+    const repositoryPayload = { type: args.repositoryType };
+    if (repositoryTypeEnumValue === RepositoryType.AzureReposGit) {
+        repositoryPayload.id = args.repositoryId;
+        repositoryPayload.name = args.repositoryName;
+    }
+    else if (repositoryTypeEnumValue === RepositoryType.GitHub) {
+        if (!args.repositoryConnectionId)
+            throw new Error("Parameter 'repositoryConnectionId' is required for GitHub repositories.");
+        repositoryPayload.connection = { id: args.repositoryConnectionId };
+        repositoryPayload.fullname = args.repositoryName;
+    }
+    else {
+        throw new Error("Unsupported repository type");
+    }
+    const yamlConfigurationType = getEnumKeys(ConfigurationType).find((k) => ConfigurationType[k] === ConfigurationType.Yaml);
+    const createParams = {
+        name: args.name,
+        folder: args.folder || "\\",
+        configuration: { type: yamlConfigurationType, path: args.yamlPath, repository: repositoryPayload, variables: undefined },
+    };
+    const newPipeline = await pipelinesApi.createPipeline(createParams, args.project);
+    return { content: [{ type: "text", text: JSON.stringify(newPipeline, null, 2) }] };
+}
+async function renamePipeline(args, connectionProvider) {
+    if (!args.pipelineId)
+        return errorResult("pipelineId is required for rename_pipeline");
+    if (!args.name)
+        return errorResult("name is required for rename_pipeline");
+    const connection = await connectionProvider();
+    const buildApi = await connection.getBuildApi();
+    const definition = await buildApi.getDefinition(args.project, args.pipelineId);
+    const updatedDefinition = await buildApi.updateDefinition({ ...definition, name: args.name }, args.project, args.pipelineId);
+    return { content: [{ type: "text", text: JSON.stringify(updatedDefinition, null, 2) }] };
+}
+async function updateBuildStage(args, connectionProvider, tokenProvider, userAgentProvider) {
+    if (!args.buildId)
+        return errorResult("buildId is required for update_build_stage");
+    if (!args.stageName)
+        return errorResult("stageName is required for update_build_stage");
+    if (!args.status)
+        return errorResult("status is required for update_build_stage");
+    const connection = await connectionProvider();
+    const orgUrl = connection.serverUrl;
+    const endpoint = `${orgUrl}/${encodeURIComponent(args.project)}/_apis/build/builds/${args.buildId}/stages/${encodeURIComponent(args.stageName)}?api-version=${apiVersion}`;
+    const token = await tokenProvider();
+    const body = { forceRetryAllJobs: args.forceRetryAllJobs, state: safeEnumConvert(StageUpdateType, args.status) };
+    const response = await fetch(endpoint, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json", "Authorization": `Bearer ${token}`, "User-Agent": userAgentProvider() },
+        body: JSON.stringify(body),
+    });
+    if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`Failed to update build stage: ${response.status} ${errorText}`);
+    }
+    const updatedBuild = await response.text();
+    return { content: [{ type: "text", text: JSON.stringify(updatedBuild, null, 2) }] };
+}
 const pipelinesWriteErrorPrefixes = {
     run_pipeline: "Error running pipeline: ",
     create_pipeline: "Error creating pipeline: ",
+    rename_pipeline: "Error renaming pipeline: ",
     update_build_stage: "Error updating build stage: ",
 };
 const PIPELINE_TOOLS = {
@@ -385,8 +376,26 @@ function configurePipelineTools(server, tokenProvider, connectionProvider, userA
     });
     // ─── pipelines_write ────────────────────────────────────────────────────────
     server.tool(PIPELINE_TOOLS.pipelines_write, "Write operations for pipelines and builds. Use the action parameter to specify the operation.", pipelinesWriteShape, async (args) => {
-        const context = { connectionProvider, tokenProvider, userAgentProvider };
-        return dispatchAction(pipelinesWriteCommands, context, args, pipelinesWriteErrorPrefixes);
+        try {
+            switch (args.action) {
+                case "run_pipeline":
+                    return await runPipeline(args, connectionProvider);
+                case "create_pipeline":
+                    return await createPipeline(args, connectionProvider);
+                case "rename_pipeline":
+                    return await renamePipeline(args, connectionProvider);
+                case "update_build_stage":
+                    return await updateBuildStage(args, connectionProvider, tokenProvider, userAgentProvider);
+                default: {
+                    const unsupportedAction = args.action;
+                    return errorResult(`Unknown action: ${unsupportedAction}. Supported actions: ${Object.keys(pipelinesWriteErrorPrefixes).sort().join(", ")}`);
+                }
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : "Unknown error occurred";
+            return errorResult(`${pipelinesWriteErrorPrefixes[args.action]}${message}`);
+        }
     });
 }
-export { PIPELINE_TOOLS, configurePipelineTools, runPipelineCommand, createPipelineCommand, updateBuildStageCommand };
+export { PIPELINE_TOOLS, configurePipelineTools, runPipeline, createPipeline, renamePipeline, updateBuildStage };

package/dist/tools/repositories.js

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { getCurrentUserDetails, getUserIdFromEmail } from "./auth.js";
 import { extractAdoStreamError, getEnumKeys, streamToString, apiVersion } from "../utils.js";
 import { orgName } from "../index.js";
+import { createExternalContentResponse } from "../shared/content-safety.js";
 const REPO_TOOLS = {
     repo_repository: "repo_repository",
     repo_pull_request: "repo_pull_request",
@@ -32,6 +33,7 @@ function trimPullRequestThread(thread) {
         status: thread.status,
         comments: trimComments(thread.comments),
         threadContext: thread.threadContext,
+        pullRequestThreadContext: thread.pullRequestThreadContext,
     };
 }
 function trimComments(comments) {
@@ -222,6 +224,8 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                                     changedFilesSummary: {
                                         changeEntries: changes?.changeEntries ?? [],
                                         fileCount: changes?.changeEntries?.length ?? 0,
+                                        firstComparingIteration: Math.max(0, latestIteration.id - 1),
+                                        secondComparingIteration: latestIteration.id,
                                         nextSkip: changes?.nextSkip,
                                         nextTop: changes?.nextTop,
                                     },
@@ -240,7 +244,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                         enhancedResponse = { ...enhancedResponse, changedFilesSummary: {} };
                     }
                 }
-                return { content: [{ type: "text", text: JSON.stringify(enhancedResponse, null, 2) }] };
+                return createExternalContentResponse(enhancedResponse, "pull request");
             }
             if (action === "list") {
                 if (!repositoryId && !project) {
@@ -454,7 +458,7 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 if (streamError) {
                     return { content: [{ type: "text", text: `Error getting file content for '${path}': ${streamError}` }], isError: true };
                 }
-                return { content: [{ type: "text", text: content }] };
+                return createExternalContentResponse(content, "repository file");
             }
             if (action === "list_directory") {
                 const versionDescriptor = buildVersionDescriptor(version, versionType === "Commit" ? "Branch" : versionType);
@@ -575,11 +579,12 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
         mergeCommitMessage: z.string().optional().describe("Commit message for autocomplete. Used for update."),
         deleteSourceBranch: z.boolean().optional().default(false).describe("Delete source branch on autocomplete. Used for update."),
         transitionWorkItems: z.boolean().optional().default(true).describe("Transition work items on autocomplete. Used for update."),
-        bypassReason: z.string().optional().describe("Reason for bypassing branch policies. Used for update."),
+        bypassPolicy: z.boolean().optional().default(false).describe("Explicitly bypass branch policies on autocomplete. Used for update and requires bypassReason when true."),
+        bypassReason: z.string().optional().describe("Reason for bypassing branch policies. Used for update only when bypassPolicy is true."),
         reviewerIds: z.array(z.string()).optional().describe("List of reviewer IDs. Required for update_reviewers."),
         reviewerAction: z.enum(["add", "remove"]).optional().describe("Whether to add or remove reviewers. Required for update_reviewers."),
         vote: z.enum(["Approved", "ApprovedWithSuggestions", "NoVote", "WaitingForAuthor", "Rejected"]).optional().describe("The vote to cast. Required for vote."),
-    }, async ({ action, repositoryId, pullRequestId, project, sourceRefName, targetRefName, title, description, isDraft, workItems, forkSourceRepositoryId, labels, status, autoComplete, mergeStrategy, mergeCommitMessage, deleteSourceBranch, transitionWorkItems, bypassReason, reviewerIds, reviewerAction, vote, }) => {
+    }, async ({ action, repositoryId, pullRequestId, project, sourceRefName, targetRefName, title, description, isDraft, workItems, forkSourceRepositoryId, labels, status, autoComplete, mergeStrategy, mergeCommitMessage, deleteSourceBranch, transitionWorkItems, bypassPolicy, bypassReason, reviewerIds, reviewerAction, vote, }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -629,18 +634,21 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                 }
                 if (autoComplete !== undefined) {
                     if (autoComplete) {
+                        if (bypassPolicy && !bypassReason) {
+                            return { content: [{ type: "text", text: "bypassReason is required when bypassPolicy is true" }], isError: true };
+                        }
                         const data = await getCurrentUserDetails(tokenProvider, connectionProvider, userAgentProvider);
                         updateRequest.autoCompleteSetBy = { id: data.authenticatedUser.id };
                         const completionOptions = {
                             deleteSourceBranch: deleteSourceBranch || false,
                             transitionWorkItems: transitionWorkItems !== false,
-                            bypassPolicy: !!bypassReason,
+                            bypassPolicy: bypassPolicy === true,
                         };
                         if (mergeStrategy)
                             completionOptions.mergeStrategy = GitPullRequestMergeStrategy[mergeStrategy];
                         if (mergeCommitMessage)
                             completionOptions.mergeCommitMessage = mergeCommitMessage;
-                        if (bypassReason)
+                        if (bypassPolicy && bypassReason)
                             completionOptions.bypassReason = bypassReason;
                         updateRequest.completionOptions = completionOptions;
                     }
@@ -747,25 +755,29 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
     // --- repo_pull_request_thread_write ----------------------------------------
     server.tool(REPO_TOOLS.repo_pull_request_thread_write, "Write operations for pull request comment threads. Use the action parameter to specify the operation.", {
         action: z
-            .enum(["create", "reply", "update_status"])
-            .describe("The action to perform. Options: create (create a new comment thread on a pull request), reply (reply to a comment in a thread), update_status (update the status of a comment thread)."),
+            .enum(["create", "reply", "update", "update_status"])
+            .describe("The action to perform. Options: create (create a new comment thread on a pull request), reply (reply to a comment in a thread), update (update an existing comment), update_status (update the status of a comment thread)."),
         repositoryId: z.string().describe("The ID or name of the repository. When using a name instead of a GUID, project must also be provided."),
         pullRequestId: z.coerce.number().min(1).describe("The ID of the pull request."),
         project: z.string().optional().describe("Project ID or project name. Required when repositoryId is a name instead of a GUID."),
-        threadId: z.coerce.number().min(1).optional().describe("The ID of the thread. Required for reply and update_status."),
-        content: z.string().optional().describe("The content of the comment. Required for create and reply."),
+        threadId: z.coerce.number().min(1).optional().describe("The ID of the thread. Required for reply, update, and update_status."),
+        commentId: z.coerce.number().min(1).optional().describe("The ID of the comment to update. Required for update."),
+        content: z.string().optional().describe("The content of the comment. Required for create, reply, and update."),
         status: z
             .enum(getEnumKeys(CommentThreadStatus))
             .optional()
             .default(CommentThreadStatus[CommentThreadStatus.Active])
             .describe("The thread status. Used for create (defaults to 'Active') and required for update_status."),
         filePath: z.string().optional().describe("The file path for the comment thread. Used for create."),
-        fullResponse: z.boolean().optional().default(false).describe("Return full JSON response. Used for reply."),
+        fullResponse: z.boolean().optional().default(false).describe("Return full JSON response. Used for reply and update."),
         rightFileStartLine: z.coerce.number().min(1).optional().describe("Start line in the right file. Used for create."),
         rightFileStartOffset: z.number().optional().describe("Start character offset in the right file. Used for create."),
         rightFileEndLine: z.number().optional().describe("End line in the right file. Used for create."),
         rightFileEndOffset: z.number().optional().describe("End character offset in the right file. Used for create."),
-    }, async ({ action, repositoryId, pullRequestId, project, threadId, content, status, filePath, fullResponse, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset }) => {
+        changeTrackingId: z.coerce.number().int().min(1).optional().describe("The file change tracking ID from the pull request iteration changes. Used for create."),
+        firstComparingIteration: z.coerce.number().int().min(0).optional().describe("The iteration on the left side of the diff. Used for create."),
+        secondComparingIteration: z.coerce.number().int().min(1).optional().describe("The iteration on the right side of the diff. Used for create."),
+    }, async ({ action, repositoryId, pullRequestId, project, threadId, commentId, content, status, filePath, fullResponse, rightFileStartLine, rightFileStartOffset, rightFileEndLine, rightFileEndOffset, changeTrackingId, firstComparingIteration, secondComparingIteration, }) => {
         try {
             const connection = await connectionProvider();
             const gitApi = await connection.getGitApi();
@@ -815,7 +827,17 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                         return { content: [{ type: "text", text: "rightFileEndOffset must be greater than or equal to rightFileStartOffset when both are on the same line." }], isError: true };
                     }
                 }
-                const thread = await gitApi.createThread({ comments: [{ content, commentType: 1 }], threadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
+                const iterationContextValues = [changeTrackingId, firstComparingIteration, secondComparingIteration];
+                if (iterationContextValues.some((value) => value !== undefined) && iterationContextValues.some((value) => value === undefined)) {
+                    return {
+                        content: [{ type: "text", text: "changeTrackingId, firstComparingIteration, and secondComparingIteration must all be specified together." }],
+                        isError: true,
+                    };
+                }
+                const pullRequestThreadContext = changeTrackingId !== undefined && firstComparingIteration !== undefined && secondComparingIteration !== undefined
+                    ? { changeTrackingId, iterationContext: { firstComparingIteration, secondComparingIteration } }
+                    : undefined;
+                const thread = await gitApi.createThread({ comments: [{ content, commentType: 1 }], threadContext, pullRequestThreadContext, status: CommentThreadStatus[status] }, repositoryId, pullRequestId, project);
                 return { content: [{ type: "text", text: JSON.stringify(trimPullRequestThread(thread), null, 2) }] };
             }
             if (action === "reply") {
@@ -831,6 +853,21 @@ function configureRepoTools(server, tokenProvider, connectionProvider, userAgent
                     return { content: [{ type: "text", text: JSON.stringify(comment, null, 2) }] };
                 return { content: [{ type: "text", text: `Comment successfully added to thread ${threadId}.` }] };
             }
+            if (action === "update") {
+                if (!threadId)
+                    return { content: [{ type: "text", text: "threadId is required for update" }], isError: true };
+                if (!commentId)
+                    return { content: [{ type: "text", text: "commentId is required for update" }], isError: true };
+                if (!content)
+                    return { content: [{ type: "text", text: "content is required for update" }], isError: true };
+                const comment = await gitApi.updateComment({ content }, repositoryId, pullRequestId, threadId, commentId, project);
+                if (!comment) {
+                    return { content: [{ type: "text", text: `Error: Failed to update comment ${commentId} in thread ${threadId}. The comment was not updated successfully.` }], isError: true };
+                }
+                if (fullResponse)
+                    return { content: [{ type: "text", text: JSON.stringify(comment, null, 2) }] };
+                return { content: [{ type: "text", text: `Comment ${commentId} successfully updated in thread ${threadId}.` }] };
+            }
             if (action === "update_status") {
                 if (!threadId)
                     return { content: [{ type: "text", text: "threadId is required for update_status" }], isError: true };

package/dist/tools/search.js

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import { VersionControlRecursionType } from "azure-devops-node-api/interfaces/GitInterfaces.js";
 import { z } from "zod";
 import { apiVersion } from "../utils.js";
 import { orgName } from "../index.js";
-import { VersionControlRecursionType } from "azure-devops-node-api/interfaces/GitInterfaces.js";
+import { createExternalContentResponse } from "../shared/content-safety.js";
 const SEARCH_TOOLS = {
     search_code: "search_code",
     search_wiki: "search_wiki",
@@ -60,9 +61,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
         const resultJson = JSON.parse(resultText);
         const gitApi = await connection.getGitApi();
         const combinedResults = await fetchCombinedResults(resultJson.results ?? [], gitApi);
-        return {
-            content: [{ type: "text", text: resultText + JSON.stringify(combinedResults) }],
-        };
+        return createExternalContentResponse(resultText + JSON.stringify(combinedResults), "code search results");
     });
     server.tool(SEARCH_TOOLS.search_wiki, "Search Azure DevOps Wiki for a given search text", {
         searchText: z.string().describe("Keywords to search for wiki pages"),
@@ -101,9 +100,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
             throw new Error(`Azure DevOps Wiki Search API error: ${response.status} ${response.statusText}`);
         }
         const result = await response.text();
-        return {
-            content: [{ type: "text", text: result }],
-        };
+        return createExternalContentResponse(result, "wiki search results");
     });
     server.tool(SEARCH_TOOLS.search_workitem, "Get Azure DevOps Work Item search results for a given search text", {
         searchText: z.string().describe("Search text to find in work items"),
@@ -151,9 +148,7 @@ function configureSearchTools(server, tokenProvider, connectionProvider, userAge
             throw new Error(`Azure DevOps Work Item Search API error: ${response.status} ${response.statusText}`);
         }
         const result = await response.text();
-        return {
-            content: [{ type: "text", text: result }],
-        };
+        return createExternalContentResponse(result, "work item search results");
     });
 }
 async function fetchCombinedResults(topSearchResults, gitApi) {
@@ -170,7 +165,7 @@ async function fetchCombinedResults(topSearchResults, gitApi) {
                 });
                 continue;
             }
-            const versionDescriptor = changeId ? { version: changeId, versionType: 2, versionOptions: 0 } : undefined;
+            const versionDescriptor = { version: changeId, versionType: 2, versionOptions: 0 };
             const item = await gitApi.getItem(repositoryId, filePath, projectId, undefined, VersionControlRecursionType.None, true, // includeContentMetadata
             false, // latestProcessedChange
             false, // download