@@ -6,6 +6,9 @@ import { apiVersion, getEnumKeys, safeEnumConvert } from "../utils.js";
 import { WebApi } from "azure-devops-node-api";
 import { BuildQueryOrder, DefinitionQueryOrder } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
 import { z } from "zod";
+
+const buildQueryOrderKeys = getEnumKeys(BuildQueryOrder) as [string, ...string[]];
+const definitionQueryOrderKeys = getEnumKeys(DefinitionQueryOrder) as [string, ...string[]];
 import { StageUpdateType } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
 import { ConfigurationType, RepositoryType } from "azure-devops-node-api/interfaces/PipelinesInterfaces.js";
 import { mkdirSync, createWriteStream } from "fs";
@@ -169,7 +172,7 @@ function configurePipelineTools(server: McpServer, tokenProvider: () => Promise<
       continuationToken: z.string().optional().describe("Token for continuing paged results. Used for: list, get_changes."),
       maxBuildsPerDefinition: z.number().optional().describe("Maximum number of builds per definition. Used for: list."),
       deletedFilter: z.number().optional().describe("Filter for deleted builds (see QueryDeletedOption enum). Used for: list."),
-      queryOrder: z.string().optional().describe("Order in which builds are returned (BuildQueryOrder values). Used for: list."),
+      queryOrder: z.enum(buildQueryOrderKeys).optional().describe("Order in which builds are returned. Used for: list."),
       branchName: z.string().optional().describe("Branch name to filter builds. Used for: list."),
       buildIds: z.array(z.coerce.number().min(1)).optional().describe("Array of specific build IDs to retrieve. Used for: list."),
       repositoryId: z.string().optional().describe("Repository ID to filter builds. Used for: list."),
@@ -314,7 +317,7 @@ function configurePipelineTools(server: McpServer, tokenProvider: () => Promise<
       repositoryType: z.enum(["TfsGit", "GitHub", "BitbucketCloud"]).optional().describe("Repository type to filter definitions. Used for: list."),
       name: z.string().optional().describe("Name filter for build definitions. Used for: list."),
       path: z.string().optional().describe("Path filter for build definitions. Used for: list."),
-      queryOrder: z.string().optional().describe("Order in which definitions are returned (DefinitionQueryOrder values). Used for: list."),
+      queryOrder: z.enum(definitionQueryOrderKeys).optional().describe("Order in which definitions are returned. Used for: list."),
       top: z.number().optional().describe("Maximum number of definitions to return. Used for: list."),
       continuationToken: z.string().optional().describe("Token for continuing paged results. Used for: list."),
       minMetricsTime: z.coerce.date().optional().describe("Minimum metrics time to filter definitions. Used for: list."),
 
@@ -4,7 +4,7 @@
 import { describe, expect, it, beforeEach } from "@jest/globals";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { WebApi } from "azure-devops-node-api";
-import { StageUpdateType } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
+import { BuildQueryOrder, DefinitionQueryOrder, StageUpdateType } from "azure-devops-node-api/interfaces/BuildInterfaces.js";
 import { configurePipelineTools, runPipeline as runPipelineAction, createPipeline as createPipelineAction, updateBuildStage as updateBuildStageAction } from "../../../src/tools/pipelines";
 import { apiVersion } from "../../../src/utils.js";
 import { mockUpdateBuildStageResponse, mockMultipleArtifacts, mockArtifact } from "../../mocks/pipelines";
@@ -46,6 +46,21 @@ describe("configurePipelineTools", () => {
       configurePipelineTools(server, tokenProvider, connectionProvider, userAgentProvider);
       expect(server.tool as jest.Mock).toHaveBeenCalled();
     });
+
+    it("registers queryOrder parameters as SDK enum keys", () => {
+      configurePipelineTools(server, tokenProvider, connectionProvider, userAgentProvider);
+      const buildCall = (server.tool as jest.Mock).mock.calls.find(([toolName]) => toolName === "pipelines_build");
+      const definitionCall = (server.tool as jest.Mock).mock.calls.find(([toolName]) => toolName === "pipelines_definition");
+      if (!buildCall || !definitionCall) throw new Error("pipeline tools not registered");
+
+      const buildQueryOrder = buildCall[2].queryOrder;
+      expect(buildQueryOrder.safeParse("FinishTimeAscending").success).toBe(true);
+      expect(buildQueryOrder.safeParse("finishTimeAscending").success).toBe(false);
+
+      const definitionQueryOrder = definitionCall[2].queryOrder;
+      expect(definitionQueryOrder.safeParse("LastModifiedDescending").success).toBe(true);
+      expect(definitionQueryOrder.safeParse("lastModifiedDescending").success).toBe(false);
+    });
   });
 
   describe("update_build_stage tool", () => {
@@ -406,6 +421,7 @@ describe("configurePipelineTools", () => {
         repositoryId: "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
         repositoryType: "TfsGit" as const,
         name: "test-build",
+        queryOrder: "LastModifiedDescending",
         top: 10,
       };
 
@@ -416,7 +432,7 @@ describe("configurePipelineTools", () => {
         "test-build",
         "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
         "TfsGit",
-        undefined, // queryOrder
+        DefinitionQueryOrder.LastModifiedDescending,
         10, // top
         undefined, // continuationToken
         undefined, // minMetricsTime
@@ -760,6 +776,7 @@ describe("configurePipelineTools", () => {
         project: "test-project",
         definitions: [1, 2],
         top: 5,
+        queryOrder: "FinishTimeAscending",
         branchName: "refs/heads/main",
       };
 
@@ -782,7 +799,7 @@ describe("configurePipelineTools", () => {
         undefined, // continuationToken
         undefined, // maxBuildsPerDefinition
         undefined, // deletedFilter
-        undefined, // queryOrder (default BuildQueryOrder.QueueTimeDescending)
+        BuildQueryOrder.FinishTimeAscending,
         "refs/heads/main", // branchName
         undefined, // buildIds
         undefined, // repositoryId