@daghis/teamcity-mcp 1.10.2 → 1.10.4

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.10.2"
+  ".": "1.10.4"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.10.4](https://github.com/Daghis/teamcity-mcp/compare/teamcity-mcp-v1.10.3...teamcity-mcp-v1.10.4) (2025-10-04)
+
+
+### Bug Fixes
+
+* **tools:** normalize branch locators for list_builds ([#228](https://github.com/Daghis/teamcity-mcp/issues/228)) ([16fe7f0](https://github.com/Daghis/teamcity-mcp/commit/16fe7f0e2b46d04e66253ddb3cd9a06c5febf0b6))
+
+## [1.10.3](https://github.com/Daghis/teamcity-mcp/compare/teamcity-mcp-v1.10.2...teamcity-mcp-v1.10.3) (2025-09-27)
+
+
+### Bug Fixes
+
+* **tools:** honor trigger_build branch overrides (210) ([#223](https://github.com/Daghis/teamcity-mcp/issues/223)) ([7222c28](https://github.com/Daghis/teamcity-mcp/commit/7222c28c4fc9a307222ee9a50fa518127f5187de))
+
 ## [1.10.2](https://github.com/Daghis/teamcity-mcp/compare/teamcity-mcp-v1.10.1...teamcity-mcp-v1.10.2) (2025-09-27)
 
 

package/dist/index.js

@@ -610,9 +610,7 @@ function loadConfig() {
 }
 var cachedConfig = null;
 function getConfig() {
-  if (!cachedConfig) {
-    cachedConfig = loadConfig();
-  }
+  cachedConfig ??= loadConfig();
   return cachedConfig;
 }
 function isTest() {
@@ -1756,18 +1754,14 @@ var BuildConfigurationCloneManager = class {
       };
     }
     if (options.copyBuildCounter && source.buildNumberCounter) {
-      if (configPayload.settings == null) {
-        configPayload.settings = { property: [] };
-      }
+      configPayload.settings ??= { property: [] };
       configPayload.settings.property?.push({
         name: "buildNumberCounter",
         value: source.buildNumberCounter.toString()
       });
     }
     if (source.buildNumberFormat) {
-      if (configPayload.settings == null) {
-        configPayload.settings = { property: [] };
-      }
+      configPayload.settings ??= { property: [] };
       configPayload.settings.property?.push({
         name: "buildNumberPattern",
         value: source.buildNumberFormat
@@ -3586,6 +3580,100 @@ async function fetchAllPages(fetchFn, options = {}) {
   return allItems;
 }
 
+// src/utils/list-builds-locator.ts
+var SIMPLE_BRANCH_VALUES = /* @__PURE__ */ new Set([
+  "default:true",
+  "default:false",
+  "default:any",
+  "unspecified:true",
+  "unspecified:false",
+  "unspecified:any",
+  "branched:true",
+  "branched:false",
+  "branched:any"
+]);
+var BRANCH_PREFIXES_ALLOW_UNWRAPPED = ["default:", "unspecified:", "branched:", "policy:"];
+function splitLocatorParts(locator) {
+  const parts = [];
+  let current = "";
+  let depth = 0;
+  for (const char of locator) {
+    if (char === "," && depth === 0) {
+      const piece = current.trim();
+      if (piece.length > 0) {
+        parts.push(piece);
+      }
+      current = "";
+      continue;
+    }
+    if (char === "(") {
+      depth += 1;
+    } else if (char === ")" && depth > 0) {
+      depth -= 1;
+    }
+    current += char;
+  }
+  const finalPiece = current.trim();
+  if (finalPiece.length > 0) {
+    parts.push(finalPiece);
+  }
+  return parts;
+}
+function wrapBranchValue(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return trimmed;
+  }
+  if (trimmed.startsWith("(")) {
+    return trimmed;
+  }
+  const lower = trimmed.toLowerCase();
+  if (SIMPLE_BRANCH_VALUES.has(lower)) {
+    return trimmed;
+  }
+  if (BRANCH_PREFIXES_ALLOW_UNWRAPPED.some((prefix) => lower.startsWith(prefix))) {
+    return trimmed;
+  }
+  if (trimmed.includes("*") && !trimmed.includes(":")) {
+    return trimmed;
+  }
+  if (trimmed.includes("/") || trimmed.includes(":") || /\s/.test(trimmed)) {
+    return `(${trimmed})`;
+  }
+  return trimmed;
+}
+function normalizeBranchSegment(segment) {
+  const trimmed = segment.trim();
+  if (trimmed.length === 0) {
+    return trimmed;
+  }
+  if (!trimmed.toLowerCase().startsWith("branch:")) {
+    return trimmed;
+  }
+  const rawValue = trimmed.slice("branch:".length).trim();
+  if (rawValue.length === 0) {
+    return trimmed;
+  }
+  if (rawValue.startsWith("(")) {
+    return `branch:${rawValue}`;
+  }
+  return `branch:${wrapBranchValue(rawValue)}`;
+}
+function normalizeLocatorSegments(locator) {
+  if (!locator) {
+    return [];
+  }
+  return splitLocatorParts(locator).map((segment) => normalizeBranchSegment(segment)).filter((segment) => segment.length > 0);
+}
+function hasBranchSegment(segments) {
+  return segments.some((segment) => segment.toLowerCase().startsWith("branch:"));
+}
+function buildBranchSegmentInput(branchInput) {
+  const normalized = branchInput.trim();
+  const withPrefix = normalized.toLowerCase().startsWith("branch:") ? normalized : `branch:${normalized}`;
+  return normalizeBranchSegment(withPrefix);
+}
+
 // src/utils/mcp.ts
 var import_zod3 = require("zod");
 
@@ -3686,9 +3774,7 @@ init_errors();
 var ErrorLogger = class _ErrorLogger {
   static instance;
   static getInstance() {
-    if (_ErrorLogger.instance == null) {
-      _ErrorLogger.instance = new _ErrorLogger();
-    }
+    _ErrorLogger.instance ??= new _ErrorLogger();
     return _ErrorLogger.instance;
   }
   /**
@@ -3773,9 +3859,7 @@ var GlobalErrorHandler = class _GlobalErrorHandler {
   }
   static instance;
   static getInstance(options) {
-    if (_GlobalErrorHandler.instance == null) {
-      _GlobalErrorHandler.instance = new _GlobalErrorHandler(options);
-    }
+    _GlobalErrorHandler.instance ??= new _GlobalErrorHandler(options);
     return _GlobalErrorHandler.instance;
   }
   /**
@@ -38447,6 +38531,7 @@ var DEV_TOOLS = [
         locator: { type: "string", description: "Optional build locator to filter builds" },
         projectId: { type: "string", description: "Filter by project ID" },
         buildTypeId: { type: "string", description: "Filter by build type ID" },
+        branch: { type: "string", description: "Filter by branch (logical or VCS name)" },
         status: {
           type: "string",
           enum: ["SUCCESS", "FAILURE", "ERROR"],
@@ -38467,6 +38552,7 @@ var DEV_TOOLS = [
         locator: import_zod4.z.string().min(1).optional(),
         projectId: import_zod4.z.string().min(1).optional(),
         buildTypeId: import_zod4.z.string().min(1).optional(),
+        branch: import_zod4.z.string().min(1).optional(),
         status: import_zod4.z.enum(["SUCCESS", "FAILURE", "ERROR"]).optional(),
         count: import_zod4.z.number().int().min(1).max(1e3).default(10).optional(),
         pageSize: import_zod4.z.number().int().min(1).max(1e3).optional(),
@@ -38479,10 +38565,17 @@ var DEV_TOOLS = [
         schema,
         async (typed) => {
           const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
-          const baseParts = [];
-          if (typed.locator) baseParts.push(typed.locator);
+          const locatorSegments = normalizeLocatorSegments(typed.locator);
+          const hasBranchInLocator = hasBranchSegment(locatorSegments);
+          const baseParts = [...locatorSegments];
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
           if (typed.buildTypeId) baseParts.push(`buildType:(id:${typed.buildTypeId})`);
+          if (typed.branch) {
+            const branchSegment = buildBranchSegmentInput(typed.branch);
+            if (!hasBranchInLocator) {
+              baseParts.push(branchSegment);
+            }
+          }
           if (typed.status) baseParts.push(`status:${typed.status}`);
           const pageSize = typed.pageSize ?? typed.count ?? 100;
           const baseFetch = async ({ count, start }) => {
@@ -38549,7 +38642,12 @@ var DEV_TOOLS = [
       properties: {
         buildTypeId: { type: "string", description: "Build type ID to trigger" },
         branchName: { type: "string", description: "Branch to build (optional)" },
-        comment: { type: "string", description: "Build comment (optional)" }
+        comment: { type: "string", description: "Build comment (optional)" },
+        properties: {
+          type: "object",
+          description: "Optional build parameters to set when triggering the build",
+          additionalProperties: { type: "string" }
+        }
       },
       required: ["buildTypeId"]
     },
@@ -38557,35 +38655,84 @@ var DEV_TOOLS = [
       const schema = import_zod4.z.object({
         buildTypeId: import_zod4.z.string().min(1),
         branchName: import_zod4.z.string().min(1).max(255).optional(),
-        comment: import_zod4.z.string().max(500).optional()
+        comment: import_zod4.z.string().max(500).optional(),
+        properties: import_zod4.z.record(import_zod4.z.string(), import_zod4.z.string()).optional()
       });
       return runTool(
         "trigger_build",
         schema,
         async (typed) => {
           const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
-          try {
-            const build = await adapter.triggerBuild(
-              typed.buildTypeId,
-              typed.branchName,
-              typed.comment
+          const directBranch = typed.branchName?.trim();
+          const normalizedDirectBranch = directBranch && directBranch.length > 0 ? directBranch : void 0;
+          const rawPropertyBranch = typed.properties?.["teamcity.build.branch"];
+          const trimmedPropertyBranch = rawPropertyBranch?.trim();
+          const normalizedPropertyBranch = trimmedPropertyBranch && trimmedPropertyBranch.length > 0 ? trimmedPropertyBranch : void 0;
+          const branchName = normalizedDirectBranch ?? normalizedPropertyBranch;
+          if (normalizedDirectBranch && normalizedPropertyBranch && normalizedDirectBranch !== normalizedPropertyBranch) {
+            const errorPayload = {
+              success: false,
+              action: "trigger_build",
+              error: `Conflicting branch overrides: branchName='${normalizedDirectBranch}' vs properties.teamcity.build.branch='${normalizedPropertyBranch}'.`
+            };
+            return {
+              success: false,
+              error: errorPayload.error,
+              content: [{ type: "text", text: JSON.stringify(errorPayload, null, 2) }]
+            };
+          }
+          const propertyEntries = typed.properties ? Object.entries(typed.properties).map(([name, value]) => ({
+            name,
+            value: name === "teamcity.build.branch" && normalizedPropertyBranch ? normalizedPropertyBranch : value
+          })) : [];
+          const propertiesPayload = propertyEntries.length > 0 ? { property: propertyEntries } : void 0;
+          const buildRequest = {
+            buildType: { id: typed.buildTypeId }
+          };
+          if (branchName) {
+            buildRequest.branchName = branchName;
+          }
+          const commentText = typed.comment?.trim();
+          if (commentText && commentText.length > 0) {
+            buildRequest.comment = { text: commentText };
+          }
+          if (propertiesPayload) {
+            buildRequest.properties = propertiesPayload;
+          }
+          const sendXmlFallback = async (error2) => {
+            const escapeXml = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+            const branchPart = branchName ? `<branchName>${escapeXml(branchName)}</branchName>` : "";
+            const commentPart = commentText ? `<comment><text>${escapeXml(commentText)}</text></comment>` : "";
+            const propertiesPart = propertiesPayload ? `<properties>${propertiesPayload.property.map(
+              (prop) => `<property name="${escapeXml(prop.name)}" value="${escapeXml(prop.value)}"/>`
+            ).join("")}</properties>` : "";
+            const xml = `<?xml version="1.0" encoding="UTF-8"?><build><buildType id="${escapeXml(
+              typed.buildTypeId
+            )}"/>${branchPart}${commentPart}${propertiesPart}</build>`;
+            const response = await adapter.modules.buildQueue.addBuildToQueue(
+              false,
+              xml,
+              {
+                headers: { "Content-Type": "application/xml", Accept: "application/json" }
+              }
             );
+            const build = response.data;
             return json({
               success: true,
               action: "trigger_build",
               buildId: String(build.id ?? ""),
               state: build.state ?? void 0,
-              status: build.status ?? void 0
+              status: build.status ?? void 0,
+              branchName: build.branchName ?? branchName,
+              fallback: { mode: "xml", reason: error2?.message }
             });
-          } catch (e) {
-            const branchPart = typed.branchName ? `<branchName>${typed.branchName}</branchName>` : "";
-            const commentPart = typed.comment ? `<comment><text>${typed.comment.replace(/</g, "&lt;").replace(/>/g, "&gt;")}</text></comment>` : "";
-            const xml = `<?xml version="1.0" encoding="UTF-8"?><build><buildType id="${typed.buildTypeId}"/>${branchPart}${commentPart}</build>`;
+          };
+          try {
             const response = await adapter.modules.buildQueue.addBuildToQueue(
               false,
-              xml,
+              buildRequest,
               {
-                headers: { "Content-Type": "application/xml", Accept: "application/json" }
+                headers: { "Content-Type": "application/json", Accept: "application/json" }
               }
             );
             const build = response.data;
@@ -38594,8 +38741,11 @@ var DEV_TOOLS = [
               action: "trigger_build",
               buildId: String(build.id ?? ""),
               state: build.state ?? void 0,
-              status: build.status ?? void 0
+              status: build.status ?? void 0,
+              branchName: build.branchName ?? branchName
             });
+          } catch (error2) {
+            return sendXmlFallback(error2);
           }
         },
         args