@daghis/teamcity-mcp 1.10.2 → 1.10.3

package/.release-please-manifest.json

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

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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

@@ -38549,7 +38549,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 +38562,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 +38648,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