@mcp-consultant-tools/azure-devops 26.0.0-beta.1 → 27.0.0-beta.10

package/build/index.js

@@ -10,6 +10,14 @@ import { realpathSync } from "node:fs";
 import { createMcpServer, createEnvLoader } from "@mcp-consultant-tools/core";
 import { AzureDevOpsService } from "./AzureDevOpsService.js";
 import { z } from 'zod';
+import { descWithExamples, WIQL_EXAMPLES, PATCH_OP_EXAMPLES, WORK_ITEM_FIELD_EXAMPLES, SYNC_TO_FILE_EXAMPLES, SYNC_FROM_FILE_EXAMPLES, SYNC_TASKS_TO_FILE_EXAMPLES, SYNC_TASKS_FROM_FILE_EXAMPLES, PR_BRANCH_REF_EXAMPLES, PR_MERGE_STRATEGY_EXAMPLES, PR_VOTE_EXAMPLES, } from './tool-examples.js';
+import { checkFieldFormats, workItemToMarkdown, commentsToMarkdown, buildPatchOperations, updateSyncRevision, getSyncConfig, ensureFolderExists, getWorkItemFilePath, getCommentsFilePath, fileExists, writeWorkItemFile, readWorkItemFile, readFileContent, listSyncedWorkItems, validateFolderPath, autoCommitMultipleFiles, 
+// Task sync utilities
+tasksToMarkdown, parseTasksMarkdown, buildTaskPatchOperations, buildNewTaskFields, getTasksFilePath, updateTasksFileAfterCreate, 
+// New work item utilities
+parseNewWorkItemMarkdown, buildNewWorkItemFields, generateNewWorkItemTemplate, convertNewFileToSynced, getNewWorkItemFilePath, findNextNewFileIndex, findNewWorkItemFiles, renameFile, 
+// Markdown format utilities
+getAllLargeTextFields, autoConvertFieldsToMarkdown, isHtmlContent, } from './sync/index.js';
 /**
  * Register azure-devops tools and prompts to an MCP server
  * @param server - The MCP server instance
@@ -38,23 +46,9 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
                 enableWorkItemWrite: process.env.AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE === "true",
                 enableWorkItemDelete: process.env.AZUREDEVOPS_ENABLE_WORK_ITEM_DELETE === "true",
                 enableWikiWrite: process.env.AZUREDEVOPS_ENABLE_WIKI_WRITE === "true",
+                enablePullRequestWrite: process.env.AZUREDEVOPS_ENABLE_PR_WRITE === "true",
                 // Comment format: 'markdown' (default) or 'html' (for legacy orgs without Markdown preview)
                 commentFormat: process.env.AZUREDEVOPS_COMMENT_FORMAT || 'markdown',
-                // DevOps Admin Tools - Three-tier permission model
-                // Tier 1: Read-only (master switch)
-                showDevOpsAdminReadonly: process.env.AZUREDEVOPS_SHOW_DEVOPS_ADMIN_READONLY === "true",
-                // Tier 2: Upsert (create + update)
-                enablePipelineUpsert: process.env.AZUREDEVOPS_ENABLE_PIPELINE_UPSERT === "true",
-                enableServiceConnUpsert: process.env.AZUREDEVOPS_ENABLE_SERVICE_CONN_UPSERT === "true",
-                enableVariableGroupUpsert: process.env.AZUREDEVOPS_ENABLE_VARIABLE_GROUP_UPSERT === "true",
-                enableAgentPoolUpsert: process.env.AZUREDEVOPS_ENABLE_AGENT_POOL_UPSERT === "true",
-                enableEnvironmentUpsert: process.env.AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT === "true",
-                // Tier 3: Delete/Disable (destructive operations)
-                enablePipelineDelete: process.env.AZUREDEVOPS_ENABLE_PIPELINE_DELETE === "true",
-                enableServiceConnDelete: process.env.AZUREDEVOPS_ENABLE_SERVICE_CONN_DELETE === "true",
-                enableVariableGroupDelete: process.env.AZUREDEVOPS_ENABLE_VARIABLE_GROUP_DELETE === "true",
-                enableAgentPoolDisable: process.env.AZUREDEVOPS_ENABLE_AGENT_POOL_DISABLE === "true",
-                enableEnvironmentDelete: process.env.AZUREDEVOPS_ENABLE_ENVIRONMENT_DELETE === "true",
             };
             service = new AzureDevOpsService(config);
             console.error("Azure DevOps service initialized");
@@ -330,6 +324,45 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
     // ========================================
     // TOOLS
     // ========================================
+    server.tool("get-configuration", "Get the configured Azure DevOps organization and projects. Use this to construct correct URLs.", {}, async () => {
+        try {
+            const organization = process.env.AZUREDEVOPS_ORGANIZATION;
+            const projects = process.env.AZUREDEVOPS_PROJECTS?.split(",").map(p => p.trim()).filter(p => p) || [];
+            const syncFolder = process.env.AZUREDEVOPS_SYNC_FOLDER || 'docs/user-stories';
+            if (!organization || projects.length === 0) {
+                return {
+                    content: [{
+                            type: "text",
+                            text: "Azure DevOps not configured. Set AZUREDEVOPS_ORGANIZATION and AZUREDEVOPS_PROJECTS environment variables.",
+                        }],
+                };
+            }
+            const config = {
+                organization,
+                projects,
+                syncFolder,
+                urlPatterns: {
+                    workItem: `https://dev.azure.com/${organization}/{project}/_workitems/edit/{id}`,
+                    pullRequest: `https://dev.azure.com/${organization}/{project}/_git/{repo}/pullrequest/{id}`,
+                    wiki: `https://dev.azure.com/${organization}/{project}/_wiki/wikis/{wikiName}/{pagePath}`,
+                },
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Azure DevOps Configuration:\n\n${JSON.stringify(config, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to get configuration: ${error.message}`,
+                    }],
+            };
+        }
+    });
     server.tool("get-wikis", "Get all wikis in an Azure DevOps project", {
         project: z.string().describe("The project name"),
     }, async ({ project }) => {
@@ -483,7 +516,7 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
             };
         }
     });
-    server.tool("azuredevops-str-replace-wiki-page", "Replace a specific string in an Azure DevOps wiki page without rewriting entire content. More efficient than update-wiki-page for small changes. (requires AZUREDEVOPS_ENABLE_WIKI_WRITE=true)", {
+    server.tool("ado-str-replace-wiki", "Replace a specific string in an Azure DevOps wiki page without rewriting entire content. More efficient than update-wiki-page for small changes. (requires AZUREDEVOPS_ENABLE_WIKI_WRITE=true)", {
         project: z.string().describe("The project name"),
         wikiId: z.string().describe("The wiki identifier (ID or name)"),
         pagePath: z.string().describe("The path to the wiki page (e.g., '/SharePoint-Online/04-DEV-Configuration')"),
@@ -549,7 +582,7 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
     });
     server.tool("query-work-items", "Query work items using WIQL (Work Item Query Language) in Azure DevOps", {
         project: z.string().describe("The project name"),
-        wiql: z.string().describe("The WIQL query string (e.g., \"SELECT [System.Id], [System.Title] FROM WorkItems WHERE [System.State] = 'Active'\")"),
+        wiql: z.string().describe(descWithExamples("The WIQL query string. SQL-like syntax with field names in brackets. Common fields: [System.Id], [System.Title], [System.State], [System.WorkItemType], [System.AssignedTo], [System.Parent]. Use @Me for current user.", WIQL_EXAMPLES)),
         maxResults: z.number().optional().describe("Maximum number of results (default: 200)"),
     }, async ({ project, wiql, maxResults }) => {
         try {
@@ -636,24 +669,53 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
             };
         }
     });
-    server.tool("update-work-item", "Update a work item in Azure DevOps using JSON Patch operations (requires AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE=true)", {
+    server.tool("update-work-item", "Update a work item in Azure DevOps using JSON Patch operations (requires AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE=true). Auto-injects markdown format operations for large text fields.", {
         project: z.string().describe("The project name"),
         workItemId: z.number().describe("The work item ID"),
         patchOperations: z.array(z.object({
-            op: z.string().describe("The operation type (e.g., 'add', 'replace', 'remove')"),
-            path: z.string().describe("The field path (e.g., '/fields/System.State')"),
+            op: z.string().describe("The operation type: 'add' (set value), 'replace' (update existing), or 'remove' (clear field)"),
+            path: z.string().describe("The field path starting with '/fields/' (e.g., '/fields/System.State', '/fields/System.Title')"),
             value: z.any().optional().describe("The value to set (not required for 'remove' operation)")
-        })).describe("Array of JSON Patch operations"),
-    }, async ({ project, workItemId, patchOperations }) => {
+        })).describe(descWithExamples("Array of JSON Patch operations. Each operation specifies what to change.", PATCH_OP_EXAMPLES)),
+        skipAutoConvert: z.boolean().optional().describe("Skip automatic markdown format injection for large text fields. Only use when explicitly requested. Default: false"),
+    }, async ({ project, workItemId, patchOperations, skipAutoConvert }) => {
         try {
             const service = getAzureDevOpsService();
-            const result = await service.updateWorkItem(project, workItemId, patchOperations);
+            // Auto-inject markdown format operations for large text fields
+            let finalOperations = [...patchOperations];
+            const formatOpsAdded = [];
+            if (!skipAutoConvert) {
+                // Find large text fields being updated (includes custom fields)
+                const allLargeTextFields = getAllLargeTextFields();
+                const largeTextFieldsBeingUpdated = patchOperations
+                    .filter((op) => op.path?.startsWith('/fields/'))
+                    .map((op) => op.path.replace('/fields/', ''))
+                    .filter((field) => allLargeTextFields.includes(field));
+                for (const field of largeTextFieldsBeingUpdated) {
+                    // Check if format operation already exists
+                    const hasFormatOp = finalOperations.some((op) => op.path === `/multilineFieldsFormat/${field}`);
+                    if (!hasFormatOp) {
+                        // Add format operation to ensure markdown
+                        finalOperations.push({
+                            op: 'add',
+                            path: `/multilineFieldsFormat/${field}`,
+                            value: 'Markdown'
+                        });
+                        formatOpsAdded.push(field);
+                    }
+                }
+            }
+            const result = await service.updateWorkItem(project, workItemId, finalOperations);
+            let message = `Updated work item ${workItemId}`;
+            if (formatOpsAdded.length > 0) {
+                message += ` (auto-set markdown format for: ${formatOpsAdded.join(', ')})`;
+            }
             const resultStr = JSON.stringify(result, null, 2);
             return {
                 content: [
                     {
                         type: "text",
-                        text: `Updated work item ${workItemId}:\n\n${resultStr}`,
+                        text: `${message}:\n\n${resultStr}`,
                     },
                 ],
             };
@@ -672,8 +734,8 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
     });
     server.tool("create-work-item", "Create a new work item in Azure DevOps with optional parent relationship (requires AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE=true)", {
         project: z.string().describe("The project name"),
-        workItemType: z.string().describe("The work item type (e.g., 'Bug', 'Task', 'User Story')"),
-        fields: z.record(z.any()).describe("Object with field values (e.g., {\"System.Title\": \"Bug title\", \"System.Description\": \"Details\"})"),
+        workItemType: z.string().describe("The work item type: 'Bug', 'Task', 'User Story', 'Feature', 'Epic', or custom types"),
+        fields: z.record(z.any()).describe(descWithExamples("Object with field values. Required: System.Title. Common fields: System.Description, System.State, System.AssignedTo, Microsoft.VSTS.Common.AcceptanceCriteria, Microsoft.VSTS.TCM.ReproSteps (bugs).", WORK_ITEM_FIELD_EXAMPLES)),
         parentId: z.number().optional().describe("Optional parent work item ID (for creating child items). Simplified alternative to relations parameter."),
         relations: z.array(z.object({
             rel: z.string().describe("Relation type (e.g., 'System.LinkTypes.Hierarchy-Reverse' for parent)"),
@@ -736,900 +798,1032 @@ export function registerAzureDevOpsTools(server, azuredevopsService) {
         }
     });
     // ========================================
-    // VARIABLE GROUP TOOLS
+    // PULL REQUEST TOOLS (Read-only - always available)
     // ========================================
-    server.tool("list-variable-groups", "List all variable groups in an Azure DevOps project. Variable groups store values and secrets used in pipelines.", {
+    server.tool("list-repositories", "List all Git repositories in an Azure DevOps project. Returns repository ID, name, default branch, and URLs.", {
         project: z.string().describe("The project name"),
     }, async ({ project }) => {
         try {
             const service = getAzureDevOpsService();
-            const result = await service.getVariableGroups(project);
-            const resultStr = JSON.stringify(result, null, 2);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Variable groups in project '${project}':\n\n${resultStr}`,
-                    },
-                ],
-            };
+            const result = await service.listRepositories(project);
+            return { content: [{ type: "text", text: `Repositories in project '${project}':\n\n${JSON.stringify(result, null, 2)}` }] };
         }
         catch (error) {
-            console.error("Error listing variable groups:", error);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Failed to list variable groups: ${error.message}`,
-                    },
-                ],
-            };
+            console.error("Error listing repositories:", error);
+            return { content: [{ type: "text", text: `Failed to list repositories: ${error.message}` }] };
         }
     });
-    server.tool("get-variable-group", "Get a specific variable group by ID from Azure DevOps. Returns all variables (secrets are masked).", {
+    server.tool("list-pull-requests", "List pull requests in a Git repository. Filter by status (active, completed, abandoned, all). Returns PR ID, title, author, branches, and review status.", {
         project: z.string().describe("The project name"),
-        groupId: z.number().describe("The variable group ID"),
-    }, async ({ project, groupId }) => {
+        repositoryId: z.string().describe("Repository ID (GUID) or name"),
+        status: z.enum(["active", "completed", "abandoned", "all"]).optional().describe("Filter by PR status (default: active)"),
+        top: z.number().optional().describe("Maximum results (default: 25)"),
+    }, async ({ project, repositoryId, status, top }) => {
         try {
             const service = getAzureDevOpsService();
-            const result = await service.getVariableGroup(project, groupId);
-            const resultStr = JSON.stringify(result, null, 2);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Variable group ${groupId} in project '${project}':\n\n${resultStr}`,
-                    },
-                ],
-            };
+            const result = await service.listPullRequests(project, repositoryId, status || 'active', top || 25);
+            return { content: [{ type: "text", text: `Pull requests in '${repositoryId}':\n\n${JSON.stringify(result, null, 2)}` }] };
         }
         catch (error) {
-            console.error("Error getting variable group:", error);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Failed to get variable group: ${error.message}`,
-                    },
-                ],
-            };
+            console.error("Error listing pull requests:", error);
+            return { content: [{ type: "text", text: `Failed to list pull requests: ${error.message}` }] };
+        }
+    });
+    server.tool("get-pull-request", "Get details of a specific pull request including title, description, author, reviewers with votes, and merge status.", {
+        project: z.string().describe("The project name"),
+        repositoryId: z.string().describe("Repository ID (GUID) or name"),
+        pullRequestId: z.number().describe("The pull request ID"),
+    }, async ({ project, repositoryId, pullRequestId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getPullRequest(project, repositoryId, pullRequestId);
+            return { content: [{ type: "text", text: `Pull request #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting pull request:", error);
+            return { content: [{ type: "text", text: `Failed to get pull request: ${error.message}` }] };
+        }
+    });
+    server.tool("get-pull-request-threads", "Get all comment threads and discussions on a pull request. Includes inline code comments with file paths and line numbers.", {
+        project: z.string().describe("The project name"),
+        repositoryId: z.string().describe("Repository ID (GUID) or name"),
+        pullRequestId: z.number().describe("The pull request ID"),
+    }, async ({ project, repositoryId, pullRequestId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getPullRequestThreads(project, repositoryId, pullRequestId);
+            return { content: [{ type: "text", text: `Threads for PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting pull request threads:", error);
+            return { content: [{ type: "text", text: `Failed to get pull request threads: ${error.message}` }] };
+        }
+    });
+    server.tool("get-pull-request-commits", "Get all commits included in a pull request. Shows commit ID, message, author, and date.", {
+        project: z.string().describe("The project name"),
+        repositoryId: z.string().describe("Repository ID (GUID) or name"),
+        pullRequestId: z.number().describe("The pull request ID"),
+    }, async ({ project, repositoryId, pullRequestId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getPullRequestCommits(project, repositoryId, pullRequestId);
+            return { content: [{ type: "text", text: `Commits for PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting pull request commits:", error);
+            return { content: [{ type: "text", text: `Failed to get pull request commits: ${error.message}` }] };
+        }
+    });
+    server.tool("get-pull-request-changes", "Get file changes (diffs) in a pull request. Shows added, modified, deleted, and renamed files with their paths.", {
+        project: z.string().describe("The project name"),
+        repositoryId: z.string().describe("Repository ID (GUID) or name"),
+        pullRequestId: z.number().describe("The pull request ID"),
+        iterationId: z.number().optional().describe("Iteration ID (default: latest)"),
+    }, async ({ project, repositoryId, pullRequestId, iterationId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getPullRequestChanges(project, repositoryId, pullRequestId, iterationId);
+            return { content: [{ type: "text", text: `Changes for PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting pull request changes:", error);
+            return { content: [{ type: "text", text: `Failed to get pull request changes: ${error.message}` }] };
         }
     });
     // ========================================
-    // DEVOPS ADMIN TOOLS - CONDITIONAL REGISTRATION
-    // Tools are only registered when corresponding flags are enabled
-    // ========================================
-    // Helper to check if admin readonly is enabled (master switch)
-    const showAdminReadonly = process.env.AZUREDEVOPS_SHOW_DEVOPS_ADMIN_READONLY === "true";
-    // Tier 2: Upsert flags
-    const enablePipelineUpsert = process.env.AZUREDEVOPS_ENABLE_PIPELINE_UPSERT === "true";
-    const enableServiceConnUpsert = process.env.AZUREDEVOPS_ENABLE_SERVICE_CONN_UPSERT === "true";
-    const enableVariableGroupUpsert = process.env.AZUREDEVOPS_ENABLE_VARIABLE_GROUP_UPSERT === "true";
-    const enableAgentPoolUpsert = process.env.AZUREDEVOPS_ENABLE_AGENT_POOL_UPSERT === "true";
-    const enableEnvironmentUpsert = process.env.AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT === "true";
-    // Tier 3: Delete/Disable flags
-    const enablePipelineDelete = process.env.AZUREDEVOPS_ENABLE_PIPELINE_DELETE === "true";
-    const enableServiceConnDelete = process.env.AZUREDEVOPS_ENABLE_SERVICE_CONN_DELETE === "true";
-    const enableVariableGroupDelete = process.env.AZUREDEVOPS_ENABLE_VARIABLE_GROUP_DELETE === "true";
-    const enableAgentPoolDisable = process.env.AZUREDEVOPS_ENABLE_AGENT_POOL_DISABLE === "true";
-    const enableEnvironmentDelete = process.env.AZUREDEVOPS_ENABLE_ENVIRONMENT_DELETE === "true";
-    // Track registered tools count
-    let adminToolsCount = 0;
-    // ========================================
-    // PIPELINE READ-ONLY TOOLS (Tier 1)
-    // ========================================
-    if (showAdminReadonly) {
-        server.tool("list-pipelines", "List all YAML pipeline definitions in an Azure DevOps project. Returns pipeline ID, name, path, repository, and YAML file path.", {
-            project: z.string().describe("The project name"),
-        }, async ({ project }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listPipelineDefinitions(project);
-                return { content: [{ type: "text", text: `Pipeline definitions in project '${project}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing pipelines:", error);
-                return { content: [{ type: "text", text: `Failed to list pipelines: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-pipeline-definition", "Get detailed YAML pipeline definition including triggers, variables (secrets masked), queue settings, and repository configuration.", {
-            project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-        }, async ({ project, definitionId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getPipelineDefinition(project, definitionId);
-                return { content: [{ type: "text", text: `Pipeline definition ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting pipeline definition:", error);
-                return { content: [{ type: "text", text: `Failed to get pipeline definition: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-pipeline-yaml", "Get the YAML content for a pipeline definition. Returns the raw azure-pipelines.yml content.", {
-            project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-        }, async ({ project, definitionId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getPipelineYaml(project, definitionId);
-                return { content: [{ type: "text", text: `Pipeline YAML for definition ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting pipeline YAML:", error);
-                return { content: [{ type: "text", text: `Failed to get pipeline YAML: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("list-pipeline-runs", "List recent pipeline runs for a definition. Returns build ID, status, result, branch, timestamps, and who triggered it.", {
-            project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-            top: z.number().optional().describe("Maximum number of results (default: 10)"),
-        }, async ({ project, definitionId, top }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listPipelineRuns(project, definitionId, top || 10);
-                return { content: [{ type: "text", text: `Recent runs for pipeline ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing pipeline runs:", error);
-                return { content: [{ type: "text", text: `Failed to list pipeline runs: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-build-status", "Get build status and details. Use detail='summary' for basic status, 'timeline' for step breakdown (default scope='problems' shows only failed/warning items), or 'full' for logs. The timelineScope controls what records are included: 'problems' (default, only errors/warnings), 'stages' (minimal), 'jobs' (moderate), 'all' (everything).", {
-            project: z.string().describe("The project name"),
-            buildId: z.number().describe("The build ID"),
-            detail: z.enum(["summary", "timeline", "full"]).optional().describe("Level of detail: 'summary' (default), 'timeline' (include steps), or 'full' (include logs)"),
-            timelineScope: z.enum(["stages", "jobs", "all", "problems"]).optional().describe("Timeline scope: 'problems' (default, only errors/warnings/failures), 'stages' (minimal), 'jobs' (moderate), 'all' (everything - may be large)"),
-            maxIssues: z.number().optional().describe("Maximum issues per record (default: 5, prioritizes errors over warnings)"),
-        }, async ({ project, buildId, detail, timelineScope, maxIssues }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getBuildStatus(project, buildId, detail || 'summary', timelineScope || 'problems', maxIssues || 5);
-                return { content: [{ type: "text", text: `Build ${buildId} status:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting build status:", error);
-                return { content: [{ type: "text", text: `Failed to get build status: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-build-timeline", "Get step-by-step breakdown of a build. Shows stages, jobs, and tasks with timing, status, and error/warning counts. Use scope to control output size: 'problems' (default, only errors/warnings), 'stages' (minimal), 'jobs' (moderate), 'all' (everything). Always includes summary stats regardless of scope.", {
-            project: z.string().describe("The project name"),
-            buildId: z.number().describe("The build ID"),
-            scope: z.enum(["stages", "jobs", "all", "problems"]).optional().describe("Filter scope: 'problems' (default, only errors/warnings/failures), 'stages' (minimal), 'jobs' (moderate), 'all' (everything - may be large)"),
-            maxIssues: z.number().optional().describe("Maximum issues per record (default: 5, prioritizes errors over warnings)"),
-        }, async ({ project, buildId, scope, maxIssues }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getBuildTimeline(project, buildId, scope || 'problems', maxIssues || 5);
-                return { content: [{ type: "text", text: `Build ${buildId} timeline:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting build timeline:", error);
-                return { content: [{ type: "text", text: `Failed to get build timeline: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-build-logs", "Get build logs. Without logId, returns list of available logs with line counts. With logId, returns that log's content. NOTE: For verbose logs, consider using a sub-agent to analyze the content.", {
-            project: z.string().describe("The project name"),
-            buildId: z.number().describe("The build ID"),
-            logId: z.number().optional().describe("Optional specific log ID to retrieve content"),
-        }, async ({ project, buildId, logId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getBuildLogs(project, buildId, logId);
-                return { content: [{ type: "text", text: `Build ${buildId} logs:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting build logs:", error);
-                return { content: [{ type: "text", text: `Failed to get build logs: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        // ========================================
-        // SERVICE CONNECTION READ-ONLY TOOLS (Tier 1)
-        // ========================================
-        server.tool("list-service-connections", "List all service connections in a project. Shows connection type, URL, authorization scheme, and sharing status. Credentials are masked.", {
-            project: z.string().describe("The project name"),
-        }, async ({ project }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listServiceConnections(project);
-                return { content: [{ type: "text", text: `Service connections in project '${project}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing service connections:", error);
-                return { content: [{ type: "text", text: `Failed to list service connections: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-service-connection", "Get detailed service connection configuration. Returns type, URL, authorization scheme, data fields, and project references. Secrets are masked.", {
-            project: z.string().describe("The project name"),
-            connectionId: z.string().describe("The service connection ID (GUID)"),
-        }, async ({ project, connectionId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getServiceConnection(project, connectionId);
-                return { content: [{ type: "text", text: `Service connection ${connectionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting service connection:", error);
-                return { content: [{ type: "text", text: `Failed to get service connection: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-service-connection-types", "Get all available service connection types (Azure, AWS, Docker, GitHub, etc.) with their authentication schemes and configuration options.", {}, async () => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getServiceConnectionTypes();
-                return { content: [{ type: "text", text: `Available service connection types:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting service connection types:", error);
-                return { content: [{ type: "text", text: `Failed to get service connection types: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        // ========================================
-        // AGENT POOL READ-ONLY TOOLS (Tier 1)
-        // ========================================
-        server.tool("list-agent-pools", "List all agent pools in the organization. Shows pool type (automation/deployment), size, hosted status, and auto-provision settings.", {
-            poolType: z.enum(["automation", "deployment"]).optional().describe("Optional filter: 'automation' or 'deployment'"),
-        }, async ({ poolType }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listAgentPools(poolType);
-                return { content: [{ type: "text", text: `Agent pools:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing agent pools:", error);
-                return { content: [{ type: "text", text: `Failed to list agent pools: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-agent-pool", "Get detailed agent pool configuration including auto-provision, auto-update, auto-size settings, and owner information.", {
-            poolId: z.number().describe("The agent pool ID"),
-        }, async ({ poolId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getAgentPool(poolId);
-                return { content: [{ type: "text", text: `Agent pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting agent pool:", error);
-                return { content: [{ type: "text", text: `Failed to get agent pool: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("list-agents", "List all agents in a pool. Shows agent name, version, OS, enabled status, and current status (online/offline).", {
-            poolId: z.number().describe("The agent pool ID"),
-            includeCapabilities: z.boolean().optional().describe("Include system and user capabilities (default: false)"),
-        }, async ({ poolId, includeCapabilities }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listAgents(poolId, includeCapabilities || false);
-                return { content: [{ type: "text", text: `Agents in pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing agents:", error);
-                return { content: [{ type: "text", text: `Failed to list agents: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-agent", "Get detailed agent information including capabilities, current assignment, and last completed request.", {
-            poolId: z.number().describe("The agent pool ID"),
-            agentId: z.number().describe("The agent ID"),
-        }, async ({ poolId, agentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getAgent(poolId, agentId);
-                return { content: [{ type: "text", text: `Agent ${agentId} in pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting agent:", error);
-                return { content: [{ type: "text", text: `Failed to get agent: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        // ========================================
-        // ENVIRONMENT READ-ONLY TOOLS (Tier 1)
-        // ========================================
-        server.tool("list-environments", "List all deployment environments in a project. Shows environment name, description, and modification info.", {
-            project: z.string().describe("The project name"),
-        }, async ({ project }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.listEnvironments(project);
-                return { content: [{ type: "text", text: `Environments in project '${project}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error listing environments:", error);
-                return { content: [{ type: "text", text: `Failed to list environments: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-environment", "Get detailed environment configuration including associated resources (Kubernetes, VMs, etc.).", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID"),
-        }, async ({ project, environmentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getEnvironment(project, environmentId);
-                return { content: [{ type: "text", text: `Environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting environment:", error);
-                return { content: [{ type: "text", text: `Failed to get environment: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-environment-deployments", "Get deployment history for an environment. Shows pipeline, owner, start/finish times, and result.", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID"),
-            top: z.number().optional().describe("Maximum number of results (default: 10)"),
-        }, async ({ project, environmentId, top }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getEnvironmentDeployments(project, environmentId, top || 10);
-                return { content: [{ type: "text", text: `Deployments to environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting environment deployments:", error);
-                return { content: [{ type: "text", text: `Failed to get environment deployments: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("get-environment-checks", "Get all checks (approvals, business hours, branch control, etc.) configured for an environment. Essential for understanding pipeline approval requirements.", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID"),
-        }, async ({ project, environmentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.getEnvironmentChecks(project, environmentId);
-                return { content: [{ type: "text", text: `Checks for environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error getting environment checks:", error);
-                return { content: [{ type: "text", text: `Failed to get environment checks: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
-    // ========================================
-    // PIPELINE UPSERT TOOLS (Tier 2)
+    // PULL REQUEST WRITE TOOLS (Conditional)
     // ========================================
-    if (enablePipelineUpsert) {
-        server.tool("admin-create-pipeline", "Create a new YAML pipeline definition. Requires repository ID and path to YAML file. (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            name: z.string().describe("Pipeline name"),
-            repositoryId: z.string().describe("Repository ID (GUID from get-repos or Azure DevOps UI)"),
-            yamlPath: z.string().describe("Path to YAML file in repository (e.g., 'azure-pipelines.yml' or 'pipelines/build.yml')"),
-            folder: z.string().optional().describe("Optional folder path (default: root)"),
-        }, async ({ project, name, repositoryId, yamlPath, folder }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.createPipelineDefinition(project, name, repositoryId, yamlPath, folder);
-                return { content: [{ type: "text", text: `Created pipeline '${name}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error creating pipeline:", error);
-                return { content: [{ type: "text", text: `Failed to create pipeline: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-update-pipeline", "Update a pipeline definition (name, path, queue status, triggers, or variables). (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-            name: z.string().optional().describe("New pipeline name"),
-            path: z.string().optional().describe("New folder path"),
-            queueStatus: z.enum(["enabled", "disabled", "paused"]).optional().describe("Queue status"),
-            variables: z.record(z.object({
-                value: z.string(),
-                isSecret: z.boolean().optional(),
-                allowOverride: z.boolean().optional()
-            })).optional().describe("Pipeline variables to set"),
-        }, async ({ project, definitionId, name, path, queueStatus, variables }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (name)
-                    updates.name = name;
-                if (path)
-                    updates.path = path;
-                if (queueStatus)
-                    updates.queueStatus = queueStatus;
-                if (variables)
-                    updates.variables = variables;
-                const result = await service.updatePipelineDefinition(project, definitionId, updates);
-                return { content: [{ type: "text", text: `Updated pipeline ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating pipeline:", error);
-                return { content: [{ type: "text", text: `Failed to update pipeline: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-rename-pipeline", "Rename a pipeline definition. (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-            newName: z.string().describe("The new pipeline name"),
-        }, async ({ project, definitionId, newName }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.renamePipelineDefinition(project, definitionId, newName);
-                return { content: [{ type: "text", text: `Renamed pipeline ${definitionId} to '${newName}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error renaming pipeline:", error);
-                return { content: [{ type: "text", text: `Failed to rename pipeline: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-queue-build", "Queue a new pipeline build/run. Optionally specify branch, variables, or template parameters. (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
+    const enablePullRequestWrite = process.env.AZUREDEVOPS_ENABLE_PR_WRITE === "true";
+    if (enablePullRequestWrite) {
+        server.tool("add-pull-request-thread", "Add a comment or code review feedback to a pull request. Supports both general comments and inline comments on specific files/lines. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID"),
-            branch: z.string().optional().describe("Source branch (e.g., 'refs/heads/main')"),
-            variables: z.record(z.string()).optional().describe("Runtime variables to pass"),
-            parameters: z.record(z.any()).optional().describe("Template parameters for YAML pipelines"),
-        }, async ({ project, definitionId, branch, variables, parameters }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            content: z.string().describe("Comment content (markdown supported)"),
+            filePath: z.string().optional().describe("File path for inline comment (e.g., '/src/file.ts')"),
+            lineNumber: z.number().optional().describe("Line number for inline comment (right side of diff)"),
+            status: z.enum(["active", "fixed", "wontFix", "closed", "byDesign", "pending"]).optional()
+                .describe("Thread status (default: active)"),
+        }, async ({ project, repositoryId, pullRequestId, content, filePath, lineNumber, status }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.queueBuild(project, definitionId, branch, variables, parameters);
-                return { content: [{ type: "text", text: `Queued build for pipeline ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.addPullRequestThread(project, repositoryId, pullRequestId, content, filePath, lineNumber, status || 'active');
+                return { content: [{ type: "text", text: `Added comment to PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error queuing build:", error);
-                return { content: [{ type: "text", text: `Failed to queue build: ${error.message}` }] };
+                console.error("Error adding pull request thread:", error);
+                return { content: [{ type: "text", text: `Failed to add pull request thread: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-        server.tool("admin-cancel-build", "Cancel a running build. The build will finish its current task before stopping. (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
+        server.tool("create-pull-request", "Create a new pull request in a Git repository. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            buildId: z.number().describe("The build ID to cancel"),
-        }, async ({ project, buildId }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            sourceRefName: z.string().describe(descWithExamples("Source branch full ref name", PR_BRANCH_REF_EXAMPLES)),
+            targetRefName: z.string().describe(descWithExamples("Target branch full ref name", PR_BRANCH_REF_EXAMPLES)),
+            title: z.string().describe("Pull request title"),
+            description: z.string().optional().describe("Pull request description (markdown supported)"),
+            reviewerIds: z.array(z.string()).optional().describe("Reviewer GUIDs or unique names"),
+            isDraft: z.boolean().optional().describe("Create as draft PR (default: false)"),
+        }, async ({ project, repositoryId, sourceRefName, targetRefName, title, description, reviewerIds, isDraft }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.cancelBuild(project, buildId);
-                return { content: [{ type: "text", text: `Cancelled build ${buildId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.createPullRequest(project, repositoryId, sourceRefName, targetRefName, title, description, reviewerIds, isDraft);
+                return { content: [{ type: "text", text: `Created PR #${result.pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error cancelling build:", error);
-                return { content: [{ type: "text", text: `Failed to cancel build: ${error.message}` }] };
+                console.error("Error creating pull request:", error);
+                return { content: [{ type: "text", text: `Failed to create pull request: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-        server.tool("admin-retry-build", "Retry a failed build with the same configuration. Creates a new build with same definition, branch, and parameters. (requires AZUREDEVOPS_ENABLE_PIPELINE_UPSERT=true)", {
+        server.tool("update-pull-request", "Update a pull request's title, description, status, or draft state. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            buildId: z.number().describe("The failed build ID to retry"),
-        }, async ({ project, buildId }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            title: z.string().optional().describe("New title"),
+            description: z.string().optional().describe("New description"),
+            status: z.enum(["abandoned", "active"]).optional().describe("Set PR status (abandoned or active)"),
+            isDraft: z.boolean().optional().describe("Set draft state"),
+        }, async ({ project, repositoryId, pullRequestId, title, description, status, isDraft }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.retryBuild(project, buildId);
-                return { content: [{ type: "text", text: `Retried build ${buildId}, new build:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.updatePullRequest(project, repositoryId, pullRequestId, { title, description, status, isDraft });
+                return { content: [{ type: "text", text: `Updated PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error retrying build:", error);
-                return { content: [{ type: "text", text: `Failed to retry build: ${error.message}` }] };
+                console.error("Error updating pull request:", error);
+                return { content: [{ type: "text", text: `Failed to update pull request: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-    }
-    // ========================================
-    // PIPELINE DELETE TOOLS (Tier 3)
-    // ========================================
-    if (enablePipelineDelete) {
-        server.tool("admin-delete-pipeline", "⚠️ DESTRUCTIVE: Delete a pipeline definition. This cannot be undone. (requires AZUREDEVOPS_ENABLE_PIPELINE_DELETE=true)", {
+        server.tool("complete-pull-request", "Complete (merge) a pull request with configurable merge strategy. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            definitionId: z.number().describe("The pipeline definition ID to delete"),
-        }, async ({ project, definitionId }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            mergeStrategy: z.enum(["squash", "noFastForward", "rebase", "rebaseMerge"]).optional()
+                .describe(descWithExamples("Merge strategy (default: squash)", PR_MERGE_STRATEGY_EXAMPLES)),
+            deleteSourceBranch: z.boolean().optional().describe("Delete source branch after merge (default: true)"),
+            transitionWorkItems: z.boolean().optional().describe("Transition linked work items (default: true)"),
+            mergeCommitMessage: z.string().optional().describe("Custom merge commit message"),
+        }, async ({ project, repositoryId, pullRequestId, mergeStrategy, deleteSourceBranch, transitionWorkItems, mergeCommitMessage }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.deletePipelineDefinition(project, definitionId);
-                return { content: [{ type: "text", text: `Deleted pipeline ${definitionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.completePullRequest(project, repositoryId, pullRequestId, mergeStrategy || 'squash', deleteSourceBranch !== undefined ? deleteSourceBranch : true, transitionWorkItems !== undefined ? transitionWorkItems : true, mergeCommitMessage);
+                return { content: [{ type: "text", text: `Completed PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error deleting pipeline:", error);
-                return { content: [{ type: "text", text: `Failed to delete pipeline: ${error.message}` }] };
+                console.error("Error completing pull request:", error);
+                return { content: [{ type: "text", text: `Failed to complete pull request: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-    }
-    // ========================================
-    // SERVICE CONNECTION UPSERT TOOLS (Tier 2)
-    // ========================================
-    if (enableServiceConnUpsert) {
-        server.tool("admin-create-service-connection", "Create a new service connection. Use get-service-connection-types to see available types and auth schemes. (requires AZUREDEVOPS_ENABLE_SERVICE_CONN_UPSERT=true)", {
+        server.tool("add-pr-reviewer", "Add or remove a reviewer from a pull request. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            name: z.string().describe("Connection name"),
-            type: z.string().describe("Connection type (e.g., 'azurerm', 'github', 'docker', 'aws')"),
-            url: z.string().optional().describe("Service URL (required for some types)"),
-            description: z.string().optional().describe("Connection description"),
-            authorization: z.object({
-                scheme: z.string().describe("Auth scheme (e.g., 'ServicePrincipal', 'PersonalAccessToken')"),
-                parameters: z.record(z.string()).optional().describe("Auth parameters (credentials)")
-            }).optional().describe("Authorization configuration"),
-            data: z.record(z.string()).optional().describe("Type-specific configuration data"),
-        }, async ({ project, name, type, url, description, authorization, data }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            reviewerId: z.string().describe("Reviewer GUID or unique name"),
+            isRequired: z.boolean().optional().describe("Whether the reviewer is required (default: false)"),
+            remove: z.boolean().optional().describe("Set to true to remove the reviewer instead of adding"),
+        }, async ({ project, repositoryId, pullRequestId, reviewerId, isRequired, remove }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.createServiceConnection(project, name, type, { url, description, authorization, data });
-                return { content: [{ type: "text", text: `Created service connection '${name}':\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.addOrRemovePrReviewer(project, repositoryId, pullRequestId, reviewerId, isRequired, remove);
+                return { content: [{ type: "text", text: `${remove ? 'Removed' : 'Added'} reviewer on PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error creating service connection:", error);
-                return { content: [{ type: "text", text: `Failed to create service connection: ${error.message}` }] };
+                console.error("Error managing PR reviewer:", error);
+                return { content: [{ type: "text", text: `Failed to manage PR reviewer: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-        server.tool("admin-update-service-connection", "Update a service connection's metadata (name, description, URL, data). Cannot update credentials for security. (requires AZUREDEVOPS_ENABLE_SERVICE_CONN_UPSERT=true)", {
+        server.tool("vote-pull-request", "Submit a vote (approve, reject, etc.) on a pull request. Defaults to authenticated user. (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            connectionId: z.string().describe("The service connection ID (GUID)"),
-            name: z.string().optional().describe("New connection name"),
-            description: z.string().optional().describe("New description"),
-            url: z.string().optional().describe("New service URL"),
-            data: z.record(z.string()).optional().describe("Updated data fields"),
-        }, async ({ project, connectionId, name, description, url, data }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (name)
-                    updates.name = name;
-                if (description)
-                    updates.description = description;
-                if (url)
-                    updates.url = url;
-                if (data)
-                    updates.data = data;
-                const result = await service.updateServiceConnection(project, connectionId, updates);
-                return { content: [{ type: "text", text: `Updated service connection ${connectionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating service connection:", error);
-                return { content: [{ type: "text", text: `Failed to update service connection: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-share-service-connection", "Share a service connection with other projects. (requires AZUREDEVOPS_ENABLE_SERVICE_CONN_UPSERT=true)", {
-            connectionId: z.string().describe("The service connection ID (GUID)"),
-            projectIds: z.array(z.string()).describe("Array of project IDs to share with"),
-        }, async ({ connectionId, projectIds }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            vote: z.enum(["approve", "approveWithSuggestions", "noResponse", "waitForAuthor", "reject"])
+                .describe(descWithExamples("Vote to submit", PR_VOTE_EXAMPLES)),
+            reviewerId: z.string().optional().describe("Reviewer GUID (defaults to authenticated user)"),
+        }, async ({ project, repositoryId, pullRequestId, vote, reviewerId }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.shareServiceConnection(connectionId, projectIds);
-                return { content: [{ type: "text", text: `Shared service connection ${connectionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.votePullRequest(project, repositoryId, pullRequestId, vote, reviewerId);
+                return { content: [{ type: "text", text: `Voted '${vote}' on PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error sharing service connection:", error);
-                return { content: [{ type: "text", text: `Failed to share service connection: ${error.message}` }] };
+                console.error("Error voting on pull request:", error);
+                return { content: [{ type: "text", text: `Failed to vote on pull request: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
-    }
-    // ========================================
-    // SERVICE CONNECTION DELETE TOOLS (Tier 3)
-    // ========================================
-    if (enableServiceConnDelete) {
-        server.tool("admin-delete-service-connection", "⚠️ DESTRUCTIVE: Delete a service connection. Pipelines using this connection will fail. (requires AZUREDEVOPS_ENABLE_SERVICE_CONN_DELETE=true)", {
+        server.tool("reply-to-pr-thread", "Reply to a pull request comment thread and/or update thread status (e.g., resolve). (requires AZUREDEVOPS_ENABLE_PR_WRITE=true)", {
             project: z.string().describe("The project name"),
-            connectionId: z.string().describe("The service connection ID (GUID) to delete"),
-        }, async ({ project, connectionId }) => {
+            repositoryId: z.string().describe("Repository ID (GUID) or name"),
+            pullRequestId: z.number().describe("The pull request ID"),
+            threadId: z.number().describe("The thread ID to reply to"),
+            content: z.string().optional().describe("Reply text (markdown supported)"),
+            status: z.enum(["active", "fixed", "wontFix", "closed", "byDesign", "pending"]).optional()
+                .describe("Update thread status (e.g., 'fixed' to resolve)"),
+        }, async ({ project, repositoryId, pullRequestId, threadId, content, status }) => {
             try {
                 const service = getAzureDevOpsService();
-                const result = await service.deleteServiceConnection(project, connectionId);
-                return { content: [{ type: "text", text: `Deleted service connection ${connectionId}:\n\n${JSON.stringify(result, null, 2)}` }] };
+                const result = await service.replyToPrThread(project, repositoryId, pullRequestId, threadId, content, status);
+                return { content: [{ type: "text", text: `Reply to thread #${threadId} on PR #${pullRequestId}:\n\n${JSON.stringify(result, null, 2)}` }] };
             }
             catch (error) {
-                console.error("Error deleting service connection:", error);
-                return { content: [{ type: "text", text: `Failed to delete service connection: ${error.message}` }] };
+                console.error("Error replying to PR thread:", error);
+                return { content: [{ type: "text", text: `Failed to reply to PR thread: ${error.message}` }] };
             }
         });
-        adminToolsCount++;
     }
     // ========================================
-    // VARIABLE GROUP UPSERT TOOLS (Tier 2)
+    // VARIABLE GROUP TOOLS
     // ========================================
-    if (enableVariableGroupUpsert) {
-        server.tool("admin-create-variable-group", "Create a new variable group. Variables can be marked as secret. (requires AZUREDEVOPS_ENABLE_VARIABLE_GROUP_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            name: z.string().describe("Variable group name"),
-            description: z.string().optional().describe("Variable group description"),
-            variables: z.record(z.object({
-                value: z.string(),
-                isSecret: z.boolean().optional()
-            })).optional().describe("Initial variables to set"),
-        }, async ({ project, name, description, variables }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.createVariableGroup(project, name, description, variables);
-                return { content: [{ type: "text", text: `Created variable group '${name}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error creating variable group:", error);
-                return { content: [{ type: "text", text: `Failed to create variable group: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-update-variable-group", "Update a variable group's name or description. Use admin-set-variable to modify variables. (requires AZUREDEVOPS_ENABLE_VARIABLE_GROUP_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            groupId: z.number().describe("The variable group ID"),
-            name: z.string().optional().describe("New name"),
-            description: z.string().optional().describe("New description"),
-        }, async ({ project, groupId, name, description }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (name)
-                    updates.name = name;
-                if (description)
-                    updates.description = description;
-                const result = await service.updateVariableGroupMetadata(project, groupId, updates);
-                return { content: [{ type: "text", text: `Updated variable group ${groupId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating variable group:", error);
-                return { content: [{ type: "text", text: `Failed to update variable group: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-set-variable", "Set or update a variable in a variable group. Creates the variable if it doesn't exist. (requires AZUREDEVOPS_ENABLE_VARIABLE_GROUP_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            groupId: z.number().describe("The variable group ID"),
-            variableName: z.string().describe("Variable name"),
-            value: z.string().describe("Variable value"),
-            isSecret: z.boolean().optional().describe("Mark as secret (default: false)"),
-        }, async ({ project, groupId, variableName, value, isSecret }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.setVariable(project, groupId, variableName, value, isSecret || false);
-                return { content: [{ type: "text", text: `Set variable '${variableName}' in group ${groupId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error setting variable:", error);
-                return { content: [{ type: "text", text: `Failed to set variable: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
-    // ========================================
-    // VARIABLE GROUP DELETE TOOLS (Tier 3)
-    // ========================================
-    if (enableVariableGroupDelete) {
-        server.tool("admin-remove-variable", "Remove a variable from a variable group. (requires AZUREDEVOPS_ENABLE_VARIABLE_GROUP_DELETE=true)", {
-            project: z.string().describe("The project name"),
-            groupId: z.number().describe("The variable group ID"),
-            variableName: z.string().describe("Variable name to remove"),
-        }, async ({ project, groupId, variableName }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.removeVariable(project, groupId, variableName);
-                return { content: [{ type: "text", text: `Removed variable '${variableName}' from group ${groupId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error removing variable:", error);
-                return { content: [{ type: "text", text: `Failed to remove variable: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-delete-variable-group", "⚠️ DESTRUCTIVE: Delete a variable group. Pipelines using this group will fail. (requires AZUREDEVOPS_ENABLE_VARIABLE_GROUP_DELETE=true)", {
-            project: z.string().describe("The project name"),
-            groupId: z.number().describe("The variable group ID to delete"),
-        }, async ({ project, groupId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.deleteVariableGroup(project, groupId);
-                return { content: [{ type: "text", text: `Deleted variable group ${groupId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error deleting variable group:", error);
-                return { content: [{ type: "text", text: `Failed to delete variable group: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
-    // ========================================
-    // AGENT POOL UPSERT TOOLS (Tier 2)
-    // ========================================
-    if (enableAgentPoolUpsert) {
-        server.tool("admin-update-agent-pool", "Update agent pool settings (auto-provision, auto-update, auto-size, target size). (requires AZUREDEVOPS_ENABLE_AGENT_POOL_UPSERT=true)", {
-            poolId: z.number().describe("The agent pool ID"),
-            autoProvision: z.boolean().optional().describe("Auto-provision pool to new projects"),
-            autoUpdate: z.boolean().optional().describe("Auto-update agents"),
-            autoSize: z.boolean().optional().describe("Auto-size pool based on demand"),
-            targetSize: z.number().optional().describe("Target pool size for auto-scaling"),
-        }, async ({ poolId, autoProvision, autoUpdate, autoSize, targetSize }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (autoProvision !== undefined)
-                    updates.autoProvision = autoProvision;
-                if (autoUpdate !== undefined)
-                    updates.autoUpdate = autoUpdate;
-                if (autoSize !== undefined)
-                    updates.autoSize = autoSize;
-                if (targetSize !== undefined)
-                    updates.targetSize = targetSize;
-                const result = await service.updateAgentPool(poolId, updates);
-                return { content: [{ type: "text", text: `Updated agent pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating agent pool:", error);
-                return { content: [{ type: "text", text: `Failed to update agent pool: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-enable-agent", "Enable a disabled agent to accept new jobs. (requires AZUREDEVOPS_ENABLE_AGENT_POOL_UPSERT=true)", {
-            poolId: z.number().describe("The agent pool ID"),
-            agentId: z.number().describe("The agent ID"),
-        }, async ({ poolId, agentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.enableAgent(poolId, agentId);
-                return { content: [{ type: "text", text: `Enabled agent ${agentId} in pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error enabling agent:", error);
-                return { content: [{ type: "text", text: `Failed to enable agent: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
+    server.tool("list-variable-groups", "List all variable groups in an Azure DevOps project. Variable groups store values and secrets used in pipelines.", {
+        project: z.string().describe("The project name"),
+    }, async ({ project }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getVariableGroups(project);
+            const resultStr = JSON.stringify(result, null, 2);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Variable groups in project '${project}':\n\n${resultStr}`,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            console.error("Error listing variable groups:", error);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Failed to list variable groups: ${error.message}`,
+                    },
+                ],
+            };
+        }
+    });
+    server.tool("get-variable-group", "Get a specific variable group by ID from Azure DevOps. Returns all variables (secrets are masked).", {
+        project: z.string().describe("The project name"),
+        groupId: z.number().describe("The variable group ID"),
+    }, async ({ project, groupId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getVariableGroup(project, groupId);
+            const resultStr = JSON.stringify(result, null, 2);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Variable group ${groupId} in project '${project}':\n\n${resultStr}`,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            console.error("Error getting variable group:", error);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Failed to get variable group: ${error.message}`,
+                    },
+                ],
+            };
+        }
+    });
     // ========================================
-    // AGENT POOL DISABLE TOOLS (Tier 3)
+    // BUILD TROUBLESHOOTING TOOLS (Read-only)
+    // NOTE: These tools are duplicated in azure-devops-admin package.
+    // If you update these, also update packages/azure-devops-admin/src/index.ts
     // ========================================
-    if (enableAgentPoolDisable) {
-        server.tool("admin-disable-agent", "⚠️ Disable an agent. It will complete current job then stop accepting new jobs. (requires AZUREDEVOPS_ENABLE_AGENT_POOL_DISABLE=true)", {
-            poolId: z.number().describe("The agent pool ID"),
-            agentId: z.number().describe("The agent ID to disable"),
-        }, async ({ poolId, agentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.disableAgent(poolId, agentId);
-                return { content: [{ type: "text", text: `Disabled agent ${agentId} in pool ${poolId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error disabling agent:", error);
-                return { content: [{ type: "text", text: `Failed to disable agent: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
+    server.tool("get-build-status", "Get build status and details. Use detail='summary' for basic status, 'timeline' for step breakdown (default scope='problems' shows only failed/warning items), or 'full' for logs. The timelineScope controls what records are included: 'problems' (default, only errors/warnings), 'stages' (minimal), 'jobs' (moderate), 'all' (everything).", {
+        project: z.string().describe("The project name"),
+        buildId: z.number().describe("The build ID"),
+        detail: z.enum(["summary", "timeline", "full"]).optional().describe("Level of detail: 'summary' (default), 'timeline' (include steps), or 'full' (include logs)"),
+        timelineScope: z.enum(["stages", "jobs", "all", "problems"]).optional().describe("Timeline scope: 'problems' (default, only errors/warnings/failures), 'stages' (minimal), 'jobs' (moderate), 'all' (everything - may be large)"),
+        maxIssues: z.number().optional().describe("Maximum issues per record (default: 5, prioritizes errors over warnings)"),
+    }, async ({ project, buildId, detail, timelineScope, maxIssues }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getBuildStatus(project, buildId, detail || 'summary', timelineScope || 'problems', maxIssues || 5);
+            return { content: [{ type: "text", text: `Build ${buildId} status:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting build status:", error);
+            return { content: [{ type: "text", text: `Failed to get build status: ${error.message}` }] };
+        }
+    });
+    server.tool("get-build-timeline", "Get step-by-step breakdown of a build. Shows stages, jobs, and tasks with timing, status, and error/warning counts. Use scope to control output size: 'problems' (default, only errors/warnings), 'stages' (minimal), 'jobs' (moderate), 'all' (everything). Always includes summary stats regardless of scope.", {
+        project: z.string().describe("The project name"),
+        buildId: z.number().describe("The build ID"),
+        scope: z.enum(["stages", "jobs", "all", "problems"]).optional().describe("Filter scope: 'problems' (default, only errors/warnings/failures), 'stages' (minimal), 'jobs' (moderate), 'all' (everything - may be large)"),
+        maxIssues: z.number().optional().describe("Maximum issues per record (default: 5, prioritizes errors over warnings)"),
+    }, async ({ project, buildId, scope, maxIssues }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getBuildTimeline(project, buildId, scope || 'problems', maxIssues || 5);
+            return { content: [{ type: "text", text: `Build ${buildId} timeline:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting build timeline:", error);
+            return { content: [{ type: "text", text: `Failed to get build timeline: ${error.message}` }] };
+        }
+    });
+    server.tool("get-build-logs", "Get build logs. Without logId, returns list of available logs with line counts. With logId, returns that log's content. NOTE: For verbose logs, consider using a sub-agent to analyze the content.", {
+        project: z.string().describe("The project name"),
+        buildId: z.number().describe("The build ID"),
+        logId: z.number().optional().describe("Optional specific log ID to retrieve content"),
+    }, async ({ project, buildId, logId }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const result = await service.getBuildLogs(project, buildId, logId);
+            return { content: [{ type: "text", text: `Build ${buildId} logs:\n\n${JSON.stringify(result, null, 2)}` }] };
+        }
+        catch (error) {
+            console.error("Error getting build logs:", error);
+            return { content: [{ type: "text", text: `Failed to get build logs: ${error.message}` }] };
+        }
+    });
     // ========================================
-    // ENVIRONMENT UPSERT TOOLS (Tier 2)
+    // WORK ITEM SYNC TOOLS (Local Markdown)
     // ========================================
-    if (enableEnvironmentUpsert) {
-        server.tool("admin-create-environment", "Create a new deployment environment. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            name: z.string().describe("Environment name"),
-            description: z.string().optional().describe("Environment description"),
-        }, async ({ project, name, description }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.createEnvironment(project, name, description);
-                return { content: [{ type: "text", text: `Created environment '${name}':\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error creating environment:", error);
-                return { content: [{ type: "text", text: `Failed to create environment: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-update-environment", "Update an environment's name or description. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID"),
-            name: z.string().optional().describe("New name"),
-            description: z.string().optional().describe("New description"),
-        }, async ({ project, environmentId, name, description }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (name)
-                    updates.name = name;
-                if (description)
-                    updates.description = description;
-                const result = await service.updateEnvironment(project, environmentId, updates);
-                return { content: [{ type: "text", text: `Updated environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating environment:", error);
-                return { content: [{ type: "text", text: `Failed to update environment: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-create-environment-check", "Add an approval, business hours, branch control, or other check to an environment. Supports all Azure DevOps check types. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID"),
-            checkType: z.enum([
-                "Approval",
-                "BusinessHours",
-                "BranchControl",
-                "InvokeRESTAPI",
-                "InvokeAzureFunction",
-                "ExclusiveLock",
-                "RequiredTemplate"
-            ]).describe("Check type"),
-            settings: z.any().describe("Check-specific settings. For Approval: {approvers: [{id: 'user-guid'}], minRequiredApprovers: 1, instructions: '...'}. For BusinessHours: {businessHours: {startTime: '09:00', endTime: '17:00', timeZoneId: 'UTC'}}. For BranchControl: {allowedBranches: ['refs/heads/main']}"),
-            timeout: z.number().optional().describe("Timeout in minutes (default: 43200 = 30 days)"),
-        }, async ({ project, environmentId, checkType, settings, timeout }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const configuration = { ...settings };
-                if (timeout)
-                    configuration.timeout = timeout;
-                const result = await service.addEnvironmentCheck(project, environmentId, checkType, configuration);
-                return { content: [{ type: "text", text: `Created ${checkType} check on environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error creating environment check:", error);
-                return { content: [{ type: "text", text: `Failed to create environment check: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-update-environment-check", "Update an existing environment check's settings or timeout. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_UPSERT=true)", {
-            project: z.string().describe("The project name"),
-            checkId: z.number().describe("The check configuration ID to update"),
-            settings: z.any().optional().describe("Updated check-specific settings"),
-            timeout: z.number().optional().describe("Updated timeout in minutes"),
-        }, async ({ project, checkId, settings, timeout }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const updates = {};
-                if (settings !== undefined)
-                    updates.settings = settings;
-                if (timeout !== undefined)
-                    updates.timeout = timeout;
-                const result = await service.updateEnvironmentCheck(project, checkId, updates);
-                return { content: [{ type: "text", text: `Updated check ${checkId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error updating environment check:", error);
-                return { content: [{ type: "text", text: `Failed to update environment check: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
+    server.tool("sync-work-item-to-file", descWithExamples("Download work item(s) from ADO and save as local markdown file(s). Token-efficient for editing. Auto-converts HTML fields to markdown. Can also pull all child work items under a parent (e.g., all User Stories under a Feature).", SYNC_TO_FILE_EXAMPLES), {
+        project: z.string().describe("The project name"),
+        workItemIds: z.array(z.number()).default([]).describe("Work item IDs to pull (optional if using parentId)"),
+        parentId: z.number().optional().describe("Pull all child work items of this parent (e.g., Feature ID to pull all User Stories)"),
+        childType: z.string().optional().describe("Filter by work item type when using parentId (default: 'User Story'). Common values: 'User Story', 'Bug', 'Task'"),
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+        includeComments: z.boolean().optional().describe("Also save comments to {id}-comments.md (default: false)"),
+        skipAutoConvert: z.boolean().optional().describe("Skip automatic HTML-to-markdown conversion. Only use when explicitly requested. Default: false (auto-convert enabled)"),
+    }, async ({ project, workItemIds: providedWorkItemIds, parentId, childType, folder, includeComments, skipAutoConvert }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            // Determine which work items to pull
+            let workItemIds = providedWorkItemIds || [];
+            // If parentId is provided, query for child work items
+            if (parentId) {
+                const type = childType || 'User Story';
+                const wiql = `SELECT [System.Id] FROM WorkItems WHERE [System.Parent] = ${parentId} AND [System.WorkItemType] = '${type}' ORDER BY [System.Id] ASC`;
+                const queryResult = await service.queryWorkItems(project, wiql, 200);
+                if (queryResult.workItems && queryResult.workItems.length > 0) {
+                    const childIds = queryResult.workItems.map((wi) => wi.id);
+                    workItemIds = [...workItemIds, ...childIds];
+                }
+            }
+            // Validate that we have work items to pull
+            if (workItemIds.length === 0) {
+                return {
+                    content: [{
+                            type: "text",
+                            text: parentId
+                                ? `No ${childType || 'User Story'} work items found under parent #${parentId}`
+                                : "No work item IDs provided. Specify workItemIds or parentId.",
+                        }],
+                };
+            }
+            // Remove duplicates
+            workItemIds = [...new Set(workItemIds)];
+            const pulled = [];
+            const skipped = [];
+            const commentsFiles = [];
+            const filesToCommit = [];
+            await ensureFolderExists(syncConfig.folder);
+            for (const workItemId of workItemIds) {
+                try {
+                    // Fetch work item from ADO
+                    let workItem = await service.getWorkItem(project, workItemId);
+                    let revision = workItem.rev || workItem._rev || 1;
+                    let convertedFields = [];
+                    // Check field formats
+                    const formats = checkFieldFormats(workItem);
+                    if (!formats.ready) {
+                        if (skipAutoConvert) {
+                            // User explicitly requested to skip conversion
+                            const htmlFields = [];
+                            if (formats.description === 'html')
+                                htmlFields.push('Description');
+                            if (formats.acceptanceCriteria === 'html')
+                                htmlFields.push('Acceptance Criteria');
+                            skipped.push({
+                                id: workItemId,
+                                reason: `HTML fields: ${htmlFields.join(', ')}. skipAutoConvert=true, skipping.`,
+                            });
+                            continue;
+                        }
+                        // Auto-convert HTML fields to markdown in ADO
+                        const fieldsToConvert = [];
+                        if (formats.description === 'html')
+                            fieldsToConvert.push('System.Description');
+                        if (formats.acceptanceCriteria === 'html')
+                            fieldsToConvert.push('Microsoft.VSTS.Common.AcceptanceCriteria');
+                        try {
+                            convertedFields = await autoConvertFieldsToMarkdown(service, project, workItemId, workItem.fields, fieldsToConvert);
+                            // Re-fetch work item with converted content
+                            workItem = await service.getWorkItem(project, workItemId);
+                            revision = workItem.rev || workItem._rev || 1;
+                        }
+                        catch (convertError) {
+                            skipped.push({
+                                id: workItemId,
+                                reason: `Failed to auto-convert HTML: ${convertError.message}`,
+                            });
+                            continue;
+                        }
+                    }
+                    // Convert to markdown and save
+                    const { content: markdown, skippedFields: secondarySkipped } = workItemToMarkdown(workItem, revision);
+                    const filePath = getWorkItemFilePath(syncConfig.folder, workItemId);
+                    await writeWorkItemFile(filePath, markdown);
+                    pulled.push({
+                        id: workItemId,
+                        file: filePath,
+                        revision,
+                        ...(convertedFields.length > 0 ? { converted: convertedFields } : {}),
+                        ...(secondarySkipped.length > 0 ? { skippedFields: secondarySkipped } : {}),
+                    });
+                    filesToCommit.push({ filePath, workItemId });
+                    // Optionally save comments
+                    if (includeComments) {
+                        const comments = await service.getWorkItemComments(project, workItemId);
+                        const commentsMarkdown = commentsToMarkdown(workItem, comments.comments || []);
+                        const commentsPath = getCommentsFilePath(syncConfig.folder, workItemId);
+                        await writeWorkItemFile(commentsPath, commentsMarkdown);
+                        commentsFiles.push({
+                            id: workItemId,
+                            file: commentsPath,
+                            count: (comments.comments || []).length,
+                        });
+                        filesToCommit.push({ filePath: commentsPath, workItemId });
+                    }
+                }
+                catch (error) {
+                    skipped.push({ id: workItemId, reason: error.message });
+                }
+            }
+            // Auto-commit if enabled
+            let committed = false;
+            if (syncConfig.autoCommit && filesToCommit.length > 0) {
+                const commitResult = await autoCommitMultipleFiles(filesToCommit, 'synced');
+                committed = commitResult.committed;
+            }
+            const result = {
+                pulled,
+                skipped,
+                ...(includeComments ? { commentsFiles } : {}),
+                folder: syncConfig.folder,
+                committed,
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Synced ${pulled.length} work item(s) to local files:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error syncing work items to files:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to sync work items: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    server.tool("sync-work-item-from-file", descWithExamples("Upload local markdown changes back to ADO. Auto-detects new_*.md files and creates them as new work items. Auto-converts HTML fields to markdown. Requires AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE=true.", SYNC_FROM_FILE_EXAMPLES), {
+        project: z.string().describe("The project name"),
+        workItemIds: z.array(z.number()).default([]).describe("Work item IDs to push (optional - new_*.md files are auto-detected)"),
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+        skipAutoConvert: z.boolean().optional().describe("Skip automatic HTML-to-markdown conversion. Only use when explicitly requested. Default: false (auto-convert enabled)"),
+    }, async ({ project, workItemIds, folder, skipAutoConvert }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            const pushed = [];
+            const partial = [];
+            const created = [];
+            const failed = [];
+            // Step 1: Auto-detect and process new_*.md files
+            const newFiles = await findNewWorkItemFiles(syncConfig.folder);
+            for (const filePath of newFiles) {
+                try {
+                    // Parse the new work item file
+                    const content = await readFileContent(filePath);
+                    const parsed = parseNewWorkItemMarkdown(content);
+                    // Fetch parent work item to inherit area/iteration paths
+                    const parentWorkItem = await service.getWorkItem(project, parsed.frontmatter.parent);
+                    // Build fields for creation
+                    const fields = buildNewWorkItemFields(parsed, parentWorkItem);
+                    // Create the work item in ADO with parent link
+                    const createdWorkItem = await service.createWorkItem(project, parsed.frontmatter.type || 'User Story', fields, parsed.frontmatter.parent);
+                    const newId = createdWorkItem.id;
+                    const revision = createdWorkItem.rev || createdWorkItem._rev || 1;
+                    const url = createdWorkItem._links?.html?.href || `https://dev.azure.com/_workitems/edit/${newId}`;
+                    // Convert the file content to synced format
+                    const syncedContent = convertNewFileToSynced(content, newId, revision, url);
+                    // Rename file from new_*.md to {id}.md
+                    const newFilePath = getWorkItemFilePath(syncConfig.folder, newId);
+                    await writeWorkItemFile(newFilePath, syncedContent);
+                    await renameFile(filePath, filePath + '.created'); // Mark original as processed
+                    // Actually delete the .created file (cleanup)
+                    try {
+                        const fs = await import('node:fs/promises');
+                        await fs.unlink(filePath + '.created');
+                    }
+                    catch {
+                        // Ignore cleanup errors
+                    }
+                    created.push({
+                        id: newId,
+                        oldFile: filePath,
+                        newFile: newFilePath,
+                        parentId: parsed.frontmatter.parent,
+                    });
+                }
+                catch (error) {
+                    failed.push({ file: filePath, error: error.message });
+                }
+            }
+            // Step 2: Process existing work items (if workItemIds provided)
+            const idsToProcess = workItemIds || [];
+            for (const workItemId of idsToProcess) {
+                const filePath = getWorkItemFilePath(syncConfig.folder, workItemId);
+                try {
+                    // Check if file exists
+                    if (!await fileExists(filePath)) {
+                        failed.push({ id: workItemId, error: `File not found: ${filePath}` });
+                        continue;
+                    }
+                    // Parse local file
+                    const parsed = await readWorkItemFile(filePath);
+                    const oldRevision = parsed.frontmatter.lastSyncedRevision;
+                    // Fetch current work item from ADO to compare
+                    const currentWorkItem = await service.getWorkItem(project, workItemId);
+                    // Build patch operations (auto-converts HTML fields unless skipAutoConvert)
+                    const { operations, skippedFields, convertedFields } = buildPatchOperations(parsed, currentWorkItem, skipAutoConvert);
+                    if (operations.length === 0 && skippedFields.length === 0) {
+                        // No changes
+                        pushed.push({
+                            id: workItemId,
+                            oldRevision,
+                            newRevision: currentWorkItem.rev || currentWorkItem._rev || oldRevision,
+                            fieldsUpdated: [],
+                        });
+                        continue;
+                    }
+                    // Update ADO if there are operations
+                    let newRevision = oldRevision;
+                    let fieldsUpdated = [];
+                    if (operations.length > 0) {
+                        const updatedWorkItem = await service.updateWorkItem(project, workItemId, operations);
+                        newRevision = updatedWorkItem.rev || updatedWorkItem._rev || oldRevision + 1;
+                        // Filter out format operations from fieldsUpdated
+                        fieldsUpdated = operations
+                            .filter(op => op.path.startsWith('/fields/'))
+                            .map(op => op.path.replace('/fields/', ''));
+                        // Update local file with new revision
+                        const content = await readFileContent(filePath);
+                        const updatedContent = updateSyncRevision(content, newRevision);
+                        await writeWorkItemFile(filePath, updatedContent);
+                    }
+                    if (skippedFields.length > 0) {
+                        partial.push({
+                            id: workItemId,
+                            oldRevision,
+                            newRevision,
+                            fieldsUpdated,
+                            skippedFields,
+                            ...(convertedFields.length > 0 ? { convertedFields } : {}),
+                        });
+                    }
+                    else {
+                        pushed.push({
+                            id: workItemId,
+                            oldRevision,
+                            newRevision,
+                            fieldsUpdated,
+                            ...(convertedFields.length > 0 ? { convertedFields } : {}),
+                        });
+                    }
+                }
+                catch (error) {
+                    failed.push({ id: workItemId, error: error.message });
+                }
+            }
+            const result = {
+                created,
+                pushed,
+                partial,
+                failed,
+                folder: syncConfig.folder,
+            };
+            const summary = [];
+            if (created.length > 0)
+                summary.push(`Created ${created.length} new work item(s)`);
+            if (pushed.length > 0)
+                summary.push(`Updated ${pushed.length} work item(s)`);
+            if (partial.length > 0)
+                summary.push(`Partially updated ${partial.length} work item(s)`);
+            if (failed.length > 0)
+                summary.push(`Failed: ${failed.length}`);
+            return {
+                content: [{
+                        type: "text",
+                        text: `${summary.join(', ')}:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error syncing work items from files:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to push work items: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    server.tool("check-work-item-markdown", "Check if work item fields are markdown (required for sync) or HTML format.", {
+        project: z.string().describe("The project name"),
+        workItemIds: z.array(z.number()).describe("Work item IDs to check"),
+    }, async ({ project, workItemIds }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const results = [];
+            let readyCount = 0;
+            let needsConversionCount = 0;
+            for (const workItemId of workItemIds) {
+                try {
+                    const workItem = await service.getWorkItem(project, workItemId);
+                    const formats = checkFieldFormats(workItem);
+                    results.push({
+                        id: workItemId,
+                        description: formats.description,
+                        acceptanceCriteria: formats.acceptanceCriteria,
+                        howToTest: formats.additionalFields.howToTest,
+                        predeploymentSteps: formats.additionalFields.predeploymentSteps,
+                        postdeploymentSteps: formats.additionalFields.postdeploymentSteps,
+                        deploymentInformation: formats.additionalFields.deploymentInformation,
+                        ready: formats.ready,
+                        ...(formats.warnings.length > 0 ? { warnings: formats.warnings } : {}),
+                    });
+                    if (formats.ready) {
+                        readyCount++;
+                    }
+                    else {
+                        needsConversionCount++;
+                    }
+                }
+                catch (error) {
+                    results.push({
+                        id: workItemId,
+                        description: 'error',
+                        acceptanceCriteria: 'error',
+                        ready: false,
+                        error: error.message || String(error),
+                    });
+                    needsConversionCount++;
+                }
+            }
+            const result = {
+                results,
+                summary: {
+                    ready: readyCount,
+                    needsConversion: needsConversionCount,
+                },
+                autoConvertAvailable: true,
+                message: needsConversionCount === 0
+                    ? 'All work items are markdown format - ready to sync'
+                    : `${needsConversionCount} work item(s) have HTML fields. Will be auto-converted to markdown on sync (unless skipAutoConvert=true).`,
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Work item format check:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error checking work item formats:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to check work item formats: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    server.tool("list-synced-work-items", "List work items that have been synced to local markdown files.", {
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+    }, async ({ folder }) => {
+        try {
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            const workItems = await listSyncedWorkItems(syncConfig.folder);
+            const result = {
+                workItems,
+                folder: syncConfig.folder,
+                count: workItems.length,
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Synced work items in ${syncConfig.folder}:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error listing synced work items:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to list synced work items: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    server.tool("create-user-story-file", "Create a new user story template file locally. The file can be edited and then pushed to ADO using sync-work-item-from-file.", {
+        project: z.string().describe("The project name"),
+        parentId: z.number().describe("Parent Feature ID - the new user story will be created under this feature"),
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+    }, async ({ project, parentId, folder }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            // Fetch parent work item to get title
+            const parentWorkItem = await service.getWorkItem(project, parentId);
+            const parentTitle = parentWorkItem.fields?.['System.Title'] || '';
+            // Find next available index for new file
+            const nextIndex = await findNextNewFileIndex(syncConfig.folder, parentId);
+            const filePath = getNewWorkItemFilePath(syncConfig.folder, parentId, nextIndex);
+            // Generate template content
+            const template = generateNewWorkItemTemplate(parentId, parentTitle, project, 'User Story');
+            // Ensure folder exists and write file
+            await ensureFolderExists(syncConfig.folder);
+            await writeWorkItemFile(filePath, template);
+            const result = {
+                file: filePath,
+                parentId,
+                parentTitle,
+                instructions: [
+                    `1. Edit the file to update title, description, and acceptance criteria`,
+                    `2. Run sync-work-item-from-file(project: "${project}") to create in ADO`,
+                    `3. The file will be renamed to {newId}.md after creation`,
+                ],
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Created new user story template:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error creating user story file:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to create user story file: ${error.message}`,
+                    }],
+            };
+        }
+    });
     // ========================================
-    // ENVIRONMENT DELETE TOOLS (Tier 3)
+    // TASK SYNC TOOLS
     // ========================================
-    if (enableEnvironmentDelete) {
-        server.tool("admin-delete-environment", "⚠️ DESTRUCTIVE: Delete a deployment environment. Pipelines targeting this environment will fail. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_DELETE=true)", {
-            project: z.string().describe("The project name"),
-            environmentId: z.number().describe("The environment ID to delete"),
-        }, async ({ project, environmentId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.deleteEnvironment(project, environmentId);
-                return { content: [{ type: "text", text: `Deleted environment ${environmentId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error deleting environment:", error);
-                return { content: [{ type: "text", text: `Failed to delete environment: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-        server.tool("admin-delete-environment-check", "Delete an approval, business hours, branch control, or other check from an environment. (requires AZUREDEVOPS_ENABLE_ENVIRONMENT_DELETE=true)", {
-            project: z.string().describe("The project name"),
-            checkId: z.number().describe("The check configuration ID to delete (get from get-environment-checks)"),
-        }, async ({ project, checkId }) => {
-            try {
-                const service = getAzureDevOpsService();
-                const result = await service.removeEnvironmentCheck(project, checkId);
-                return { content: [{ type: "text", text: `Deleted check ${checkId}:\n\n${JSON.stringify(result, null, 2)}` }] };
-            }
-            catch (error) {
-                console.error("Error deleting environment check:", error);
-                return { content: [{ type: "text", text: `Failed to delete environment check: ${error.message}` }] };
-            }
-        });
-        adminToolsCount++;
-    }
-    // Log registration summary
-    const baseToolsCount = 15;
-    const totalToolsCount = baseToolsCount + adminToolsCount;
-    console.error(`azure-devops tools registered: ${totalToolsCount} tools (${baseToolsCount} base + ${adminToolsCount} admin), 4 prompts`);
+    server.tool("sync-tasks-to-file", descWithExamples("Download all tasks under a parent work item (User Story) to a local markdown file. Auto-converts HTML descriptions to markdown. Supports pulling tasks for multiple parents at once.", SYNC_TASKS_TO_FILE_EXAMPLES), {
+        project: z.string().describe("The project name"),
+        parentIds: z.array(z.number()).describe("Parent work item IDs (User Stories) to fetch tasks for"),
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+        skipAutoConvert: z.boolean().optional().describe("Skip automatic HTML-to-markdown conversion for task descriptions. Only use when explicitly requested. Default: false"),
+    }, async ({ project, parentIds, folder, skipAutoConvert }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            const pulled = [];
+            const failed = [];
+            const filesToCommit = [];
+            await ensureFolderExists(syncConfig.folder);
+            for (const parentId of parentIds) {
+                try {
+                    // Fetch parent work item to get title and validate existence
+                    const parentWorkItem = await service.getWorkItem(project, parentId);
+                    // Query for child tasks using WIQL
+                    const wiql = `SELECT [System.Id] FROM WorkItems WHERE [System.Parent] = ${parentId} AND [System.WorkItemType] = 'Task' ORDER BY [System.Id] ASC`;
+                    const queryResult = await service.queryWorkItems(project, wiql, 200);
+                    // Fetch full details for each task and auto-convert HTML descriptions
+                    const tasks = [];
+                    let tasksConverted = 0;
+                    if (queryResult.workItems && queryResult.workItems.length > 0) {
+                        for (const wi of queryResult.workItems) {
+                            try {
+                                let task = await service.getWorkItem(project, wi.id);
+                                // Auto-convert HTML description to markdown unless skipAutoConvert
+                                const description = task.fields?.['System.Description'];
+                                if (description && !skipAutoConvert && isHtmlContent(description)) {
+                                    try {
+                                        await autoConvertFieldsToMarkdown(service, project, wi.id, task.fields, ['System.Description']);
+                                        // Re-fetch with converted content
+                                        task = await service.getWorkItem(project, wi.id);
+                                        tasksConverted++;
+                                    }
+                                    catch (convertError) {
+                                        console.error(`Failed to convert HTML description for task ${wi.id}:`, convertError.message);
+                                    }
+                                }
+                                tasks.push(task);
+                            }
+                            catch (taskError) {
+                                console.error(`Error fetching task ${wi.id}:`, taskError.message);
+                            }
+                        }
+                    }
+                    // Convert to markdown and save
+                    const markdown = tasksToMarkdown(parentWorkItem, tasks, project);
+                    const filePath = getTasksFilePath(syncConfig.folder, parentId);
+                    await writeWorkItemFile(filePath, markdown);
+                    pulled.push({
+                        parentId,
+                        file: filePath,
+                        taskCount: tasks.length,
+                    });
+                    filesToCommit.push({ filePath, workItemId: parentId });
+                }
+                catch (error) {
+                    failed.push({ parentId, error: error.message });
+                }
+            }
+            // Auto-commit if enabled
+            let committed = false;
+            if (syncConfig.autoCommit && filesToCommit.length > 0) {
+                const commitResult = await autoCommitMultipleFiles(filesToCommit, 'synced tasks for');
+                committed = commitResult.committed;
+            }
+            const result = {
+                pulled,
+                failed,
+                folder: syncConfig.folder,
+                committed,
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Synced tasks for ${pulled.length} parent(s) to local files:\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error syncing tasks to files:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to sync tasks: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    server.tool("sync-tasks-from-file", descWithExamples("Push local task changes back to ADO with upsert semantics. Existing tasks (## Task #ID) are updated, new tasks (## NEW TASK) are created. Auto-converts HTML fields to markdown. Requires AZUREDEVOPS_ENABLE_WORK_ITEM_WRITE=true.", SYNC_TASKS_FROM_FILE_EXAMPLES), {
+        project: z.string().describe("The project name"),
+        parentIds: z.array(z.number()).describe("Parent work item IDs to sync tasks for"),
+        folder: z.string().optional().describe("Override folder path (default: docs/user-stories or AZUREDEVOPS_SYNC_FOLDER)"),
+        skipAutoConvert: z.boolean().optional().describe("Skip automatic HTML-to-markdown conversion for task descriptions. Only use when explicitly requested. Default: false"),
+    }, async ({ project, parentIds, folder, skipAutoConvert }) => {
+        try {
+            const service = getAzureDevOpsService();
+            const syncConfig = getSyncConfig(folder);
+            // Validate folder path for security
+            validateFolderPath(syncConfig.folder);
+            const updated = [];
+            const created = [];
+            const failed = [];
+            for (const parentId of parentIds) {
+                const filePath = getTasksFilePath(syncConfig.folder, parentId);
+                try {
+                    // Check if file exists
+                    if (!await fileExists(filePath)) {
+                        failed.push({ parentId, error: `File not found: ${filePath}` });
+                        continue;
+                    }
+                    // Parse local file
+                    const content = await readFileContent(filePath);
+                    const parsed = parseTasksMarkdown(content);
+                    // Get parent work item for area/iteration path
+                    const parentWorkItem = await service.getWorkItem(project, parentId);
+                    const parentFields = parentWorkItem.fields || {};
+                    const areaPath = parentFields['System.AreaPath'];
+                    const iterationPath = parentFields['System.IterationPath'];
+                    const createdInThisFile = [];
+                    // Process each task
+                    for (const task of parsed.tasks) {
+                        try {
+                            if (task.id !== null) {
+                                // Existing task - update (auto-converts HTML fields unless skipAutoConvert)
+                                const currentTask = await service.getWorkItem(project, task.id);
+                                const { operations, fieldsUpdated, convertedFields } = buildTaskPatchOperations(task, currentTask, skipAutoConvert);
+                                if (operations.length > 0) {
+                                    await service.updateWorkItem(project, task.id, operations);
+                                    updated.push({
+                                        id: task.id,
+                                        parentId,
+                                        fieldsUpdated,
+                                        ...(convertedFields.length > 0 ? { convertedFields } : {}),
+                                    });
+                                }
+                                else {
+                                    // No changes needed
+                                    updated.push({
+                                        id: task.id,
+                                        parentId,
+                                        fieldsUpdated: [],
+                                    });
+                                }
+                            }
+                            else {
+                                // New task - create
+                                if (!task.title) {
+                                    continue; // Skip tasks without title
+                                }
+                                const fields = buildNewTaskFields(task, areaPath, iterationPath);
+                                const createdTask = await service.createWorkItem(project, 'Task', fields, parentId);
+                                created.push({
+                                    id: createdTask.id,
+                                    parentId,
+                                    title: task.title,
+                                });
+                                createdInThisFile.push({
+                                    title: task.title,
+                                    id: createdTask.id,
+                                });
+                            }
+                        }
+                        catch (taskError) {
+                            failed.push({
+                                parentId,
+                                taskId: task.id || undefined,
+                                error: taskError.message,
+                            });
+                        }
+                    }
+                    // Update the file with new task IDs if any were created
+                    if (createdInThisFile.length > 0) {
+                        const updatedContent = updateTasksFileAfterCreate(content, createdInThisFile);
+                        await writeWorkItemFile(filePath, updatedContent);
+                    }
+                }
+                catch (error) {
+                    failed.push({ parentId, error: error.message });
+                }
+            }
+            const result = {
+                updated,
+                created,
+                failed,
+                folder: syncConfig.folder,
+            };
+            return {
+                content: [{
+                        type: "text",
+                        text: `Pushed tasks to ADO (${updated.length} updated, ${created.length} created):\n\n${JSON.stringify(result, null, 2)}`,
+                    }],
+            };
+        }
+        catch (error) {
+            console.error("Error syncing tasks from files:", error);
+            return {
+                content: [{
+                        type: "text",
+                        text: `Failed to push tasks: ${error.message}`,
+                    }],
+            };
+        }
+    });
+    // Log registration summary (enablePullRequestWrite already defined above)
+    // Tool count breakdown:
+    // - Wiki: 6 (get-wikis, search-wiki-pages, get-wiki-page, create-wiki-page, update-wiki-page, str-replace-wiki-page)
+    // - Work Item: 7 (get-work-item, query-work-items, get-work-item-comments, add-work-item-comment, update-work-item, create-work-item, delete-work-item)
+    // - Variable Group: 2 (list-variable-groups, get-variable-group)
+    // - PR Read-only: 6 (list-repositories, list-pull-requests, get-pull-request, get-pull-request-threads, get-pull-request-commits, get-pull-request-changes)
+    // - Build Troubleshooting: 3 (get-build-status, get-build-timeline, get-build-logs)
+    // - Work Item Sync: 5 (sync-work-item-to-file, sync-work-item-from-file, check-work-item-markdown, list-synced-work-items, create-user-story-file)
+    // - Task Sync: 2 (sync-tasks-to-file, sync-tasks-from-file)
+    // - Config: 1 (get-configuration)
+    // Total base: 6 + 7 + 2 + 6 + 3 + 5 + 2 + 1 = 32
+    // + PR Write: 7 (add-pull-request-thread, create-pull-request, update-pull-request, complete-pull-request, add-pr-reviewer, vote-pull-request, reply-to-pr-thread) - conditional
+    const baseToolsCount = 32;
+    const prWriteToolsCount = enablePullRequestWrite ? 7 : 0;
+    const totalToolsCount = baseToolsCount + prWriteToolsCount;
+    console.error(`azure-devops tools registered: ${totalToolsCount} tools (${baseToolsCount} base + ${prWriteToolsCount} PR write), 4 prompts`);
+    // NOTE: Admin tools (pipelines, service connections, agent pools, environments)
+    // have been moved to the @mcp-consultant-tools/azure-devops-admin package
 }
 /**
  * Export service class for direct usage