@achieveai/azuredevops-mcp 1.3.5 → 1.3.6

package/dist/index.js

@@ -17,7 +17,39 @@ const WikiTools_1 = require("./Tools/WikiTools");
 const zod_1 = require("zod");
 const Common_1 = require("./Interfaces/Common");
 /** Wrap a value so string-encoded JSON arrays are auto-parsed (some MCP clients send arrays as strings). */
-const coerceArray = (val) => typeof val === 'string' ? JSON.parse(val) : val;
+const coerceArray = (val) => {
+    if (typeof val !== 'string')
+        return val;
+    try {
+        return JSON.parse(val);
+    }
+    catch {
+        throw new Error(`Expected a JSON array (e.g. [1, 2, 3]) but received: "${val.length > 50 ? val.slice(0, 50) + '...' : val}"`);
+    }
+};
+/**
+ * Strip common prefixes/symbols from ID values so LLMs can pass
+ * "123", "#123", "WI#123", "PR 456", "BUILD#789", etc.
+ * Returns a number or NaN (which z.number() will reject with a clear error).
+ */
+const coerceId = (val) => {
+    if (typeof val === 'number')
+        return val;
+    if (typeof val !== 'string')
+        return NaN;
+    // Strip known prefixes: WI#, PR#, BUILD#, leading #, or any "Word " / "Word#" prefix
+    const cleaned = val.trim().replace(/^(?:[A-Za-z]+[#\s])?#?/, '');
+    if (cleaned === '')
+        return NaN;
+    const num = Number(cleaned);
+    return Number.isSafeInteger(num) && num > 0 ? num : NaN;
+};
+/** Zod schema for an ID parameter — accepts numbers and common LLM string formats like "#123", "WI#123", "PR 456" */
+const zId = () => zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).transform(coerceId).pipe(zod_1.z.number().int().min(1));
+/** Zod schema for an optional ID parameter */
+const zIdOptional = () => zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).transform(coerceId).pipe(zod_1.z.number().int().min(1)).optional();
+/** Zod schema for an array of IDs */
+const zIdArray = () => zod_1.z.preprocess(coerceArray, zod_1.z.array(zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).transform(coerceId).pipe(zod_1.z.number().int().min(1))));
 const EntraAuthHandler_1 = require("./Services/EntraAuthHandler");
 async function main() {
     try {
@@ -71,7 +103,7 @@ async function main() {
             };
         });
         allowedTools.has("getWorkItemById") && server.tool("getWorkItemById", "Get a specific work item by ID with summary and detailed view", {
-            id: zod_1.z.coerce.number().describe("Work item ID")
+            id: zId().describe("Work item ID")
         }, async (params, extra) => {
             const result = await workItemTools.getWorkItemById({ id: params.id });
             return {
@@ -134,7 +166,7 @@ async function main() {
             };
         });
         allowedTools.has("updateWorkItem") && server.tool("updateWorkItem", "Update an existing work item", {
-            id: zod_1.z.coerce.number().describe("ID of the work item to update"),
+            id: zId().describe("ID of the work item to update"),
             fields: zod_1.z.record(zod_1.z.any()).describe("Fields to update on the work item")
         }, async (params, extra) => {
             const result = await workItemTools.updateWorkItem(params);
@@ -146,7 +178,7 @@ async function main() {
             };
         });
         allowedTools.has("getWorkItemComments") && server.tool("getWorkItemComments", "Get comments on a work item", {
-            id: zod_1.z.coerce.number().describe("ID of the work item"),
+            id: zId().describe("ID of the work item"),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of comments to return"),
             order: zod_1.z.enum(['asc', 'desc']).optional().default('desc').describe("Sort order: 'asc' (oldest first) or 'desc' (newest first)"),
             includeDeleted: zod_1.z.boolean().optional().describe("Include deleted comments")
@@ -160,7 +192,7 @@ async function main() {
             };
         });
         allowedTools.has("addWorkItemComment") && server.tool("addWorkItemComment", "Add a comment to a work item. Supports markdown formatting by default.", {
-            id: zod_1.z.coerce.number().describe("ID of the work item"),
+            id: zId().describe("ID of the work item"),
             text: zod_1.z.string().describe("Comment text (supports markdown when format is 'markdown')"),
             format: zod_1.z.enum(['markdown', 'html']).optional().default('markdown').describe("Comment format: 'markdown' (default) or 'html'")
         }, async (params, extra) => {
@@ -173,7 +205,7 @@ async function main() {
             };
         });
         allowedTools.has("updateWorkItemState") && server.tool("updateWorkItemState", "Update the state of a work item", {
-            id: zod_1.z.coerce.number().describe("ID of the work item"),
+            id: zId().describe("ID of the work item"),
             state: zod_1.z.string().describe("New state for the work item"),
             comment: zod_1.z.string().optional().describe("Comment explaining the state change")
         }, async (params, extra) => {
@@ -185,7 +217,7 @@ async function main() {
             };
         });
         allowedTools.has("assignWorkItem") && server.tool("assignWorkItem", "Assign a work item to a user", {
-            id: zod_1.z.coerce.number().describe("ID of the work item"),
+            id: zId().describe("ID of the work item"),
             assignedTo: zod_1.z.string().describe("User to assign the work item to")
         }, async (params, extra) => {
             const result = await workItemTools.assignWorkItem(params);
@@ -199,7 +231,7 @@ async function main() {
             "Use prefixes for targetId: WI#123 (work item), PR#456 (pull request), " +
             "BUILD#789 (build), BRANCH#main (branch), COMMIT#abc123 (commit). " +
             "Plain numbers default to work item.", {
-            sourceId: zod_1.z.coerce.number().describe("ID of the source work item"),
+            sourceId: zId().describe("ID of the source work item"),
             targetId: zod_1.z.string().describe("Target with prefix: WI#123, PR#456, BUILD#789, BRANCH#main, COMMIT#abc, or plain number for work item"),
             linkType: zod_1.z.string().describe("Link type (e.g., System.LinkTypes.Related). For artifact prefixes, this is still required but the actual rel type is auto-set to ArtifactLink."),
             comment: zod_1.z.string().optional().describe("Comment explaining the link"),
@@ -226,7 +258,7 @@ async function main() {
                     additionalFields: zod_1.z.record(zod_1.z.any()).optional().describe("Additional fields to set on the work item")
                 }),
                 zod_1.z.object({
-                    id: zod_1.z.coerce.number().describe("ID of work item to update"),
+                    id: zId().describe("ID of work item to update"),
                     fields: zod_1.z.record(zod_1.z.any()).describe("Fields to update on the work item")
                 })
             ])).min(1).describe("Array of work items to create or update")
@@ -239,14 +271,14 @@ async function main() {
             };
         });
         allowedTools.has("getWorkItemsBatch") && server.tool("getWorkItemsBatch", "Get multiple work items by their IDs in a single efficient call", {
-            ids: zod_1.z.preprocess(coerceArray, zod_1.z.array(zod_1.z.coerce.number())).describe("Array of work item IDs to retrieve"),
+            ids: zIdArray().describe("Array of work item IDs to retrieve"),
             fields: zod_1.z.preprocess(coerceArray, zod_1.z.array(zod_1.z.string()).optional()).describe("Specific fields to return (e.g., ['System.Title', 'System.State'])"),
         }, async (params) => {
             const result = await workItemTools.getWorkItemsBatch(params);
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getWorkItemRevisions") && server.tool("getWorkItemRevisions", "Get revision/change history for a work item showing all field changes over time", {
-            id: zod_1.z.coerce.number().describe("Work item ID"),
+            id: zId().describe("Work item ID"),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of revisions to return"),
             skip: zod_1.z.coerce.number().optional().describe("Number of revisions to skip"),
         }, async (params) => {
@@ -260,7 +292,7 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("addChildWorkItem") && server.tool("addChildWorkItem", "Create a new work item and link it as a child of an existing parent work item", {
-            parentId: zod_1.z.coerce.number().describe("Parent work item ID"),
+            parentId: zId().describe("Parent work item ID"),
             workItemType: zod_1.z.string().describe("Type of child work item (e.g., 'Task', 'Bug')"),
             title: zod_1.z.string().describe("Title of the child work item"),
             description: zod_1.z.string().optional().describe("Description"),
@@ -274,7 +306,7 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("unlinkWorkItem") && server.tool("unlinkWorkItem", "Remove a link/relation from a work item by its relation index. Use getWorkItemById first to see the relations and their indices.", {
-            id: zod_1.z.coerce.number().describe("Work item ID"),
+            id: zId().describe("Work item ID"),
             relationIndex: zod_1.z.coerce.number().describe("Index of the relation to remove (0-based, from the relations array)"),
         }, async (params) => {
             const result = await workItemTools.unlinkWorkItem(params);
@@ -316,7 +348,7 @@ async function main() {
         allowedTools.has("moveCardOnBoard") && server.tool("moveCardOnBoard", "Move a card on a board", {
             teamId: zod_1.z.string().optional().describe("Team ID (uses default team if not specified)"),
             boardId: zod_1.z.string().describe("ID of the board"),
-            workItemId: zod_1.z.coerce.number().describe("ID of the work item to move"),
+            workItemId: zId().describe("ID of the work item to move"),
             columnId: zod_1.z.string().describe("ID of the column to move to"),
             position: zod_1.z.coerce.number().optional().describe("Position within the column")
         }, async (params, extra) => {
@@ -446,8 +478,7 @@ async function main() {
         allowedTools.has("getIterations") && server.tool("getIterations", "Get iterations for a project. Use 'path' to drill into a subtree instead of fetching the entire hierarchy.", {
             projectId: zod_1.z.string().describe("ID or name of the project"),
             path: zod_1.z.string().optional().describe("Iteration path to start from (e.g., 'Sprint 1'). Omit for root."),
-            depth: zod_1.z.coerce.number().optional().describe("Maximum depth of children to return (default: 2)"),
-            includeDeleted: zod_1.z.boolean().optional().describe("Include deleted iterations")
+            depth: zod_1.z.coerce.number().optional().describe("Maximum depth of children to return (default: 2)")
         }, async (params, extra) => {
             const result = await projectTools.getIterations(params);
             return {
@@ -661,7 +692,7 @@ async function main() {
             "'files' (changed file list — prefer getAllPullRequestChanges for large diffs). " +
             "Supports both repository names and IDs.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to retrieve. This is the PR number shown in the Azure DevOps UI (e.g., PR #123)."),
+            pullRequestId: zId().describe("The numeric ID of the pull request to retrieve. This is the PR number shown in the Azure DevOps UI (e.g., PR #123)."),
             include: zod_1.z.array(zod_1.z.enum(['policies', 'description', 'reviewers', 'workItems', 'completionOptions', 'files'])).optional().describe("Sections to return in full detail. When omitted, returns compact overview with all sections truncated. Specify sections you need full data for.")
         }, async (params, extra) => {
             const result = await gitTools.getPullRequest(params);
@@ -673,8 +704,8 @@ async function main() {
         });
         allowedTools.has("getPullRequestComments") && server.tool("getPullRequestComments", "Retrieve all comment threads and associated comments for a pull request. Returns a summary and organized list of threads including code review comments (with file/line context) and general discussions. Optionally filter by thread status (e.g., only 'active' unresolved threads), author name, specific thread ID, or use pagination. Supports both repository names and IDs.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to retrieve comments from. This is the PR number shown in the Azure DevOps UI."),
-            threadId: zod_1.z.coerce.number().optional().describe("Optional ID of a specific comment thread to retrieve. If provided, only returns the specified thread rather than all threads."),
+            pullRequestId: zId().describe("The numeric ID of the pull request to retrieve comments from. This is the PR number shown in the Azure DevOps UI."),
+            threadId: zIdOptional().describe("Optional ID of a specific comment thread to retrieve. If provided, only returns the specified thread rather than all threads."),
             status: zod_1.z.enum(['active', 'fixed', 'wontFix', 'closed', 'byDesign', 'pending']).optional().describe("Filter threads by status. Use 'active' to see only unresolved threads, 'fixed' for resolved ones, etc."),
             authorName: zod_1.z.string().optional().describe("Filter threads by author display name or email (case-insensitive partial match). Only threads where the root comment was authored by a matching user are returned."),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of comment threads to return in the response. Use this for pagination in PRs with many comments."),
@@ -690,7 +721,7 @@ async function main() {
         });
         allowedTools.has("approvePullRequest") && server.tool("approvePullRequest", "Cast an 'Approve' vote on a pull request on behalf of the current authenticated user. This marks the PR as approved by the user and contributes toward satisfying approval requirements defined in branch policies. Equivalent to clicking 'Approve' in the Azure DevOps UI. Supports both repository names and IDs.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to approve. This is the PR number shown in the Azure DevOps UI (e.g., PR #123).")
+            pullRequestId: zId().describe("The numeric ID of the pull request to approve. This is the PR number shown in the Azure DevOps UI (e.g., PR #123).")
         }, async (params, extra) => {
             const result = await gitTools.approvePullRequest(params);
             return {
@@ -701,7 +732,7 @@ async function main() {
         });
         allowedTools.has("mergePullRequest") && server.tool("mergePullRequest", "Complete a pull request by merging the source branch changes into the target branch. This operation requires that all required reviewers have approved the PR and all branch policies are satisfied. Supports different merge strategies (squash, rebase, etc.) and allows adding a custom commit message. Supports both repository names and IDs.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to merge. This is the PR number shown in the Azure DevOps UI (e.g., PR #123)."),
+            pullRequestId: zId().describe("The numeric ID of the pull request to merge. This is the PR number shown in the Azure DevOps UI (e.g., PR #123)."),
             mergeStrategy: zod_1.z.enum(['noFastForward', 'rebase', 'rebaseMerge', 'squash']).optional().describe("The strategy to use when merging changes: 'noFastForward' creates a merge commit, 'rebase' updates the source branch commits onto the target branch, 'rebaseMerge' combines rebase with a merge commit, 'squash' combines all changes into a single commit."),
             comment: zod_1.z.string().optional().describe("Optional comment to include in the merge commit message. Use this to provide additional context about the merge beyond the default message.")
         }, async (params, extra) => {
@@ -715,7 +746,7 @@ async function main() {
         // Register new Pull Request Comment Tools
         allowedTools.has("addPullRequestInlineComment") && server.tool("addPullRequestInlineComment", "Add an inline code comment anchored to a SPECIFIC LINE of code in a file. The comment appears directly on that line in the Files tab. WHEN TO USE: Point out specific code issues, suggest improvements to a particular line, or ask questions about specific implementation details. EXAMPLES: 'This variable should be null-checked here', 'Consider using async/await on line 45', 'Why is this hardcoded?'. The system automatically retrieves the correct change tracking ID from the PR diff.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
+            pullRequestId: zId().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
             comment: zod_1.z.string().describe("The text content of the comment to add. Can include markdown formatting. Should be specific to the line of code being commented on."),
             position: zod_1.z.object({
                 line: zod_1.z.coerce.number().describe("The 1-based line number in the file where the comment starts. Must be a line visible in the PR diff (added, removed, or context line)."),
@@ -734,7 +765,7 @@ async function main() {
         });
         allowedTools.has("addPullRequestFileComment") && server.tool("addPullRequestFileComment", "Add a comment about an ENTIRE FILE (not a specific line). The comment appears at the file level in the Files tab. WHEN TO USE: Discuss overall file structure, architecture decisions, naming conventions, or when feedback applies to the whole file. EXAMPLES: 'This file should be split into smaller modules', 'Consider moving this to a different namespace', 'Great refactoring of this entire service!', 'This file needs unit tests'.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
+            pullRequestId: zId().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
             path: zod_1.z.string().describe("The full path to the file within the repository that the comment relates to. Must be a file changed in the PR (e.g., '/src/Models/User.cs')."),
             comment: zod_1.z.string().describe("The text content of the comment about the entire file. Can include markdown formatting. Should address file-level concerns, not specific lines.")
         }, async (params, extra) => {
@@ -747,7 +778,7 @@ async function main() {
         });
         allowedTools.has("addPullRequestComment") && server.tool("addPullRequestComment", "Add a GENERAL comment about the entire pull request (not tied to any file or code). Appears in the Overview/Conversation tab. WHEN TO USE: Provide overall feedback, discuss architecture, approve/reject the PR, ask general questions, or comment on the PR description. EXAMPLES: 'This feature looks great! LGTM after CI passes', 'Can you add integration tests for this feature?', 'What's the performance impact of these changes?', 'Please update the documentation before merging'.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
+            pullRequestId: zId().describe("The numeric ID of the pull request where the comment will be added. This is the PR number shown in the Azure DevOps UI."),
             comment: zod_1.z.string().describe("The text content of the general comment about the PR. Can include markdown formatting for rich text, code blocks, links, etc. Should address PR-level concerns, not specific files or lines.")
         }, async (params, extra) => {
             const result = await gitTools.addPullRequestComment(params);
@@ -760,7 +791,7 @@ async function main() {
         // Register new Pull Request Diff Tools
         allowedTools.has("getPullRequestFileChanges") && server.tool("getPullRequestFileChanges", "Retrieve detailed file diff information for a specific file changed within a pull request. Returns change metadata including change type (add, edit, delete), before/after content identifiers, and file path information. Optionally filter to a specific file path.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to examine. This is the PR number shown in the Azure DevOps UI."),
+            pullRequestId: zId().describe("The numeric ID of the pull request to examine. This is the PR number shown in the Azure DevOps UI."),
             path: zod_1.z.string().optional().describe("Optional path to a specific file to return changes for. If omitted, changes for all files will be returned but filtered to match this specific path.")
         }, async (params, extra) => {
             const result = await gitTools.getPullRequestFileChanges(params);
@@ -772,7 +803,7 @@ async function main() {
         });
         allowedTools.has("getPullRequestChangesCount") && server.tool("getPullRequestChangesCount", "Get statistical summary of changes in a pull request, including total count of files changed and breakdowns by change type (added, modified, deleted). Useful for understanding the scope of changes in a PR at a glance.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to analyze. This is the PR number shown in the Azure DevOps UI.")
+            pullRequestId: zId().describe("The numeric ID of the pull request to analyze. This is the PR number shown in the Azure DevOps UI.")
         }, async (params, extra) => {
             const result = await gitTools.getPullRequestChangesCount(params);
             return {
@@ -783,7 +814,7 @@ async function main() {
         });
         allowedTools.has("getAllPullRequestChanges") && server.tool("getAllPullRequestChanges", "Retrieve a comprehensive list of all file changes in a pull request with pagination support. Returns a summary and table of changed files with change types. Use pagination parameters (top/skip) to handle large PRs with many file changes. This does NOT include diff content - use getPullRequestFileChanges for detailed diffs.", {
             repository: zod_1.z.string().describe("The repository name (e.g., 'MyProject') or ID (GUID) containing the pull request. Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().describe("The numeric ID of the pull request to retrieve changes for. This is the PR number shown in the Azure DevOps UI."),
+            pullRequestId: zId().describe("The numeric ID of the pull request to retrieve changes for. This is the PR number shown in the Azure DevOps UI."),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of change entries to return in a single request. Use this for pagination to avoid large response payloads."),
             skip: zod_1.z.coerce.number().optional().describe("Number of change entries to skip before starting to return results. Use with 'top' for implementing pagination.")
         }, async (params, extra) => {
@@ -797,7 +828,7 @@ async function main() {
         });
         allowedTools.has("updatePullRequest") && server.tool("updatePullRequest", "Update pull request properties (title, description, status, auto-complete, draft mode, target branch)", {
             repository: zod_1.z.string().describe("Repository name or ID"),
-            pullRequestId: zod_1.z.coerce.number().describe("Pull request ID"),
+            pullRequestId: zId().describe("Pull request ID"),
             title: zod_1.z.string().optional().describe("New title for the PR"),
             description: zod_1.z.string().optional().describe("New description for the PR"),
             status: zod_1.z.enum(['active', 'abandoned', 'completed']).optional().describe("New status"),
@@ -812,7 +843,7 @@ async function main() {
         });
         allowedTools.has("updatePullRequestReviewers") && server.tool("updatePullRequestReviewers", "Add or remove reviewers on an existing pull request", {
             repository: zod_1.z.string().describe("Repository name or ID"),
-            pullRequestId: zod_1.z.coerce.number().describe("Pull request ID"),
+            pullRequestId: zId().describe("Pull request ID"),
             reviewersToAdd: zod_1.z.array(zod_1.z.string()).optional().describe("User IDs or email addresses to add as reviewers"),
             reviewersToRemove: zod_1.z.array(zod_1.z.string()).optional().describe("User IDs or email addresses to remove from reviewers"),
             makeRequired: zod_1.z.boolean().optional().describe("Make added reviewers required (default false)"),
@@ -822,8 +853,8 @@ async function main() {
         });
         allowedTools.has("replyToComment") && server.tool("replyToComment", "Reply to an existing comment thread on a pull request", {
             repository: zod_1.z.string().describe("Repository name or ID"),
-            pullRequestId: zod_1.z.coerce.number().describe("Pull request ID"),
-            threadId: zod_1.z.coerce.number().describe("Thread ID to reply to"),
+            pullRequestId: zId().describe("Pull request ID"),
+            threadId: zId().describe("Thread ID to reply to"),
             comment: zod_1.z.string().describe("Reply text content (supports markdown)"),
         }, async (params) => {
             const result = await gitTools.replyToComment(params);
@@ -831,8 +862,8 @@ async function main() {
         });
         allowedTools.has("updatePullRequestThread") && server.tool("updatePullRequestThread", "Update a comment thread's status (resolve, reactivate, close, etc.)", {
             repository: zod_1.z.string().describe("Repository name or ID"),
-            pullRequestId: zod_1.z.coerce.number().describe("Pull request ID"),
-            threadId: zod_1.z.coerce.number().describe("Thread ID to update"),
+            pullRequestId: zId().describe("Pull request ID"),
+            threadId: zId().describe("Thread ID to update"),
             status: zod_1.z.enum(['active', 'byDesign', 'closed', 'fixed', 'pending', 'unknown', 'wontFix']).describe("New thread status"),
         }, async (params) => {
             const result = await gitTools.updatePullRequestThread(params);
@@ -848,8 +879,8 @@ async function main() {
         });
         // Register Testing Capabilities Tools
         allowedTools.has("runAutomatedTests") && server.tool("runAutomatedTests", "Execute automated test suites", {
-            testSuiteId: zod_1.z.coerce.number().optional().describe("ID of the test suite to run"),
-            testPlanId: zod_1.z.coerce.number().optional().describe("ID of the test plan to run"),
+            testSuiteId: zIdOptional().describe("ID of the test suite to run"),
+            testPlanId: zIdOptional().describe("ID of the test plan to run"),
             testEnvironment: zod_1.z.string().optional().describe("Environment to run tests in"),
             parallelExecution: zod_1.z.boolean().optional().describe("Whether to run tests in parallel")
         }, async (params, extra) => {
@@ -861,7 +892,7 @@ async function main() {
             };
         });
         allowedTools.has("getTestAutomationStatus") && server.tool("getTestAutomationStatus", "Check status of automated test execution", {
-            testRunId: zod_1.z.coerce.number().describe("ID of the test run to check status for")
+            testRunId: zId().describe("ID of the test run to check status for")
         }, async (params, extra) => {
             const result = await testingCapabilitiesTools.getTestAutomationStatus(params);
             return {
@@ -907,8 +938,8 @@ async function main() {
             };
         });
         allowedTools.has("getTestFlakiness") && server.tool("getTestFlakiness", "Analyze and report on test flakiness", {
-            testId: zod_1.z.coerce.number().optional().describe("ID of a specific test to analyze"),
-            testRunIds: zod_1.z.array(zod_1.z.coerce.number()).optional().describe("Specific test runs to analyze"),
+            testId: zIdOptional().describe("ID of a specific test to analyze"),
+            testRunIds: zIdArray().optional().describe("Specific test runs to analyze"),
             timeRange: zod_1.z.string().optional().describe("Time range for analysis (e.g., '30d')")
         }, async (params, extra) => {
             const result = await testingCapabilitiesTools.getTestFlakiness(params);
@@ -930,7 +961,7 @@ async function main() {
             };
         });
         allowedTools.has("runTestImpactAnalysis") && server.tool("runTestImpactAnalysis", "Determine which tests to run based on code changes", {
-            buildId: zod_1.z.coerce.number().describe("ID of the build to analyze"),
+            buildId: zId().describe("ID of the build to analyze"),
             changedFiles: zod_1.z.array(zod_1.z.string()).optional().describe("List of changed files")
         }, async (params, extra) => {
             const result = await testingCapabilitiesTools.runTestImpactAnalysis(params);
@@ -952,7 +983,7 @@ async function main() {
             };
         });
         allowedTools.has("runTestOptimization") && server.tool("runTestOptimization", "Optimize test suite execution for faster feedback", {
-            testPlanId: zod_1.z.coerce.number().describe("ID of the test plan to optimize"),
+            testPlanId: zId().describe("ID of the test plan to optimize"),
             optimizationGoal: zod_1.z.enum(['time', 'coverage', 'reliability']).describe("Optimization goal")
         }, async (params, extra) => {
             const result = await testingCapabilitiesTools.runTestOptimization(params);
@@ -975,7 +1006,7 @@ async function main() {
             };
         });
         allowedTools.has("recordExploratoryTestResults") && server.tool("recordExploratoryTestResults", "Record findings during exploratory testing", {
-            sessionId: zod_1.z.coerce.number().describe("ID of the exploratory session"),
+            sessionId: zId().describe("ID of the exploratory session"),
             findings: zod_1.z.array(zod_1.z.string()).describe("List of findings to record"),
             attachments: zod_1.z.array(zod_1.z.object({
                 name: zod_1.z.string().describe("Name of the attachment"),
@@ -991,8 +1022,8 @@ async function main() {
             };
         });
         allowedTools.has("convertFindingsToWorkItems") && server.tool("convertFindingsToWorkItems", "Convert exploratory test findings to work items", {
-            sessionId: zod_1.z.coerce.number().describe("ID of the exploratory session"),
-            findingIds: zod_1.z.array(zod_1.z.coerce.number()).describe("IDs of findings to convert"),
+            sessionId: zId().describe("ID of the exploratory session"),
+            findingIds: zIdArray().describe("IDs of findings to convert"),
             workItemType: zod_1.z.string().optional().describe("Type of work item to create")
         }, async (params, extra) => {
             const result = await testingCapabilitiesTools.convertFindingsToWorkItems(params);
@@ -1318,7 +1349,7 @@ async function main() {
         });
         // AI Assisted Development Tools
         allowedTools.has("getAICodeReview") && server.tool("getAICodeReview", "Get AI-based code review suggestions", {
-            pullRequestId: zod_1.z.coerce.number().optional().describe("ID of the pull request to review"),
+            pullRequestId: zIdOptional().describe("ID of the pull request to review"),
             repositoryId: zod_1.z.string().optional().describe("ID of the repository"),
             commitId: zod_1.z.string().optional().describe("ID of the commit to review"),
             filePath: zod_1.z.string().optional().describe("Path to the file to review")
@@ -1359,7 +1390,7 @@ async function main() {
         });
         allowedTools.has("getPredictiveBugAnalysis") && server.tool("getPredictiveBugAnalysis", "Predict potential bugs in code changes. Supports both repository names and IDs.", {
             repository: zod_1.z.string().describe("Repository name (e.g., 'MyProject') or ID (GUID). Repository names are case-insensitive."),
-            pullRequestId: zod_1.z.coerce.number().optional().describe("ID of the pull request"),
+            pullRequestId: zIdOptional().describe("ID of the pull request"),
             branch: zod_1.z.string().optional().describe("Branch to analyze"),
             filePath: zod_1.z.string().optional().describe("Path to the file to analyze")
         }, async (params, extra) => {
@@ -1384,7 +1415,7 @@ async function main() {
             };
         });
         allowedTools.has("getPredictiveEffortEstimation") && server.tool("getPredictiveEffortEstimation", "AI-based effort estimation for work items", {
-            workItemIds: zod_1.z.array(zod_1.z.coerce.number()).optional().describe("IDs of work items to estimate"),
+            workItemIds: zIdArray().optional().describe("IDs of work items to estimate"),
             workItemType: zod_1.z.string().optional().describe("Type of work items to estimate"),
             areaPath: zod_1.z.string().optional().describe("Area path to filter work items")
         }, async (params, extra) => {
@@ -1409,7 +1440,7 @@ async function main() {
             };
         });
         allowedTools.has("suggestWorkItemRefinements") && server.tool("suggestWorkItemRefinements", "Get AI suggestions for work item refinements", {
-            workItemId: zod_1.z.coerce.number().optional().describe("ID of the work item to refine"),
+            workItemId: zIdOptional().describe("ID of the work item to refine"),
             workItemType: zod_1.z.string().optional().describe("Type of work item"),
             areaPath: zod_1.z.string().optional().describe("Area path to filter work items")
         }, async (params, extra) => {
@@ -1445,7 +1476,7 @@ async function main() {
             };
         });
         allowedTools.has("predictBuildFailures") && server.tool("predictBuildFailures", "Predict potential build failures before they occur", {
-            buildDefinitionId: zod_1.z.coerce.number().describe("ID of the build definition"),
+            buildDefinitionId: zId().describe("ID of the build definition"),
             lookbackPeriod: zod_1.z.string().optional().describe("Period to analyze for patterns (e.g., '30d')")
         }, async (params, extra) => {
             const result = await aiAssistedDevelopmentTools.predictBuildFailures(params);
@@ -1456,7 +1487,7 @@ async function main() {
             };
         });
         allowedTools.has("optimizeTestSelection") && server.tool("optimizeTestSelection", "Intelligently select tests to run based on changes", {
-            buildId: zod_1.z.coerce.number().describe("ID of the build"),
+            buildId: zId().describe("ID of the build"),
             changedFiles: zod_1.z.array(zod_1.z.string()).optional().describe("List of changed files"),
             maxTestCount: zod_1.z.coerce.number().optional().describe("Maximum number of tests to select")
         }, async (params, extra) => {
@@ -1510,7 +1541,7 @@ async function main() {
         });
         // Register Build/Pipeline Tools
         allowedTools.has("getBuilds") && server.tool("getBuilds", "List builds with optional filters (status, result, branch, definition, tags)", {
-            definitions: zod_1.z.preprocess(coerceArray, zod_1.z.array(zod_1.z.coerce.number()).optional()).describe("Filter by definition IDs"),
+            definitions: zIdArray().optional().describe("Filter by definition IDs"),
             statusFilter: zod_1.z.string().optional().describe("Filter by status: inProgress, completed, cancelling, postponed, notStarted, all"),
             resultFilter: zod_1.z.string().optional().describe("Filter by result: succeeded, partiallySucceeded, failed, canceled"),
             branchName: zod_1.z.string().optional().describe("Filter by source branch (e.g., 'refs/heads/main')"),
@@ -1525,14 +1556,14 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuild") && server.tool("getBuild", "Get detailed information about a specific build by ID", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
+            buildId: zId().describe("Build ID"),
         }, async (params) => {
             const result = await buildTools.getBuild(params);
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuildLog") && server.tool("getBuildLog", "Get build logs. Without logId returns log metadata list; with logId returns specific log content", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
-            logId: zod_1.z.coerce.number().optional().describe("Specific log ID to retrieve content for"),
+            buildId: zId().describe("Build ID"),
+            logId: zIdOptional().describe("Specific log ID to retrieve content for"),
             startLine: zod_1.z.coerce.number().optional().describe("Start line for log content"),
             endLine: zod_1.z.coerce.number().optional().describe("End line for log content"),
         }, async (params) => {
@@ -1540,7 +1571,7 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuildChanges") && server.tool("getBuildChanges", "Get changes (commits) associated with a build", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
+            buildId: zId().describe("Build ID"),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of changes to return (default 50)"),
         }, async (params) => {
             const result = await buildTools.getBuildChanges(params);
@@ -1558,14 +1589,14 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getDefinition") && server.tool("getDefinition", "Get detailed information about a specific pipeline/build definition", {
-            definitionId: zod_1.z.coerce.number().describe("Definition ID"),
+            definitionId: zId().describe("Definition ID"),
             includeLatestBuilds: zod_1.z.boolean().optional().describe("Include latest build info"),
         }, async (params) => {
             const result = await buildTools.getDefinition(params);
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("runPipeline") && server.tool("runPipeline", "Queue/trigger a pipeline run", {
-            definitionId: zod_1.z.coerce.number().describe("Pipeline definition ID to run"),
+            definitionId: zId().describe("Pipeline definition ID to run"),
             sourceBranch: zod_1.z.string().optional().describe("Source branch (e.g., 'refs/heads/main')"),
             parameters: zod_1.z.record(zod_1.z.string()).optional().describe("Pipeline parameters as key-value pairs"),
         }, async (params) => {
@@ -1573,19 +1604,19 @@ async function main() {
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuildArtifacts") && server.tool("getBuildArtifacts", "List artifacts produced by a build", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
+            buildId: zId().describe("Build ID"),
         }, async (params) => {
             const result = await buildTools.getBuildArtifacts(params);
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuildTimeline") && server.tool("getBuildTimeline", "Get build timeline showing stages, jobs, and tasks with their status", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
+            buildId: zId().describe("Build ID"),
         }, async (params) => {
             const result = await buildTools.getBuildTimeline(params);
             return { content: result.content, rawData: result.rawData, structuredContent: result.structuredContent };
         });
         allowedTools.has("getBuildWorkItems") && server.tool("getBuildWorkItems", "Get work items associated with a build", {
-            buildId: zod_1.z.coerce.number().describe("Build ID"),
+            buildId: zId().describe("Build ID"),
             top: zod_1.z.coerce.number().optional().describe("Maximum number of work items to return (default 50)"),
         }, async (params) => {
             const result = await buildTools.getBuildWorkItems(params);