@daghis/teamcity-mcp 1.3.2 → 1.3.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.3](https://github.com/Daghis/teamcity-mcp/compare/v1.3.2...v1.3.3) (2025-09-19)
+
+
+### Bug Fixes
+
+* **teamcity:** retain adapter api credentials ([#138](https://github.com/Daghis/teamcity-mcp/issues/138)) ([3ad31ed](https://github.com/Daghis/teamcity-mcp/commit/3ad31edf227eac904eee84ec3a80d16455ae37fc)), closes [#135](https://github.com/Daghis/teamcity-mcp/issues/135)
+
 ## [1.3.2](https://github.com/Daghis/teamcity-mcp/compare/v1.3.1...v1.3.2) (2025-09-18)
 
 

package/dist/index.js

@@ -57,7 +57,6 @@ function isRetryableError(error2) {
 var TeamCityAPIError, TeamCityAuthorizationError, TeamCityNotFoundError, TeamCityRateLimitError, TeamCityServerError, TeamCityNetworkError, TeamCityRequestError, TeamCityTimeoutError, BuildNotFoundError, BuildAccessDeniedError;
 var init_errors = __esm({
   "src/teamcity/errors.ts"() {
-    "use strict";
     TeamCityAPIError = class _TeamCityAPIError extends Error {
       code;
       statusCode;
@@ -922,6 +921,7 @@ function debug(message, meta) {
 }
 
 // src/tools.ts
+var import_axios35 = require("axios");
 var import_zod4 = require("zod");
 
 // src/teamcity-client/models/resolution.ts
@@ -942,7 +942,7 @@ var BuildConfigurationUpdateManager = class {
    */
   async retrieveConfiguration(configId) {
     try {
-      const response = await this.client.buildTypes.getBuildType(
+      const response = await this.client.modules.buildTypes.getBuildType(
         configId,
         "$long,parameters($long),settings($long),agent-requirements($long)"
       );
@@ -1125,10 +1125,14 @@ var BuildConfigurationUpdateManager = class {
     try {
       if (updates.name !== void 0 || updates.description !== void 0) {
         if (updates.name) {
-          await this.client.buildTypes.setBuildTypeField(currentConfig.id, "name", updates.name);
+          await this.client.modules.buildTypes.setBuildTypeField(
+            currentConfig.id,
+            "name",
+            updates.name
+          );
         }
         if (updates.description !== void 0) {
-          await this.client.buildTypes.setBuildTypeField(
+          await this.client.modules.buildTypes.setBuildTypeField(
             currentConfig.id,
             "description",
             updates.description ?? ""
@@ -1137,7 +1141,7 @@ var BuildConfigurationUpdateManager = class {
       }
       if (settings.length > 0) {
         for (const setting of settings) {
-          await this.client.buildTypes.setBuildTypeField(
+          await this.client.modules.buildTypes.setBuildTypeField(
             currentConfig.id,
             `settings/${setting.name}`,
             setting.value
@@ -1147,7 +1151,7 @@ var BuildConfigurationUpdateManager = class {
       if (updates.removeParameters) {
         for (const paramName of updates.removeParameters) {
           try {
-            await this.client.buildTypes.deleteBuildParameterOfBuildType_2(
+            await this.client.modules.buildTypes.deleteBuildParameterOfBuildType_2(
               paramName,
               currentConfig.id
             );
@@ -1158,7 +1162,7 @@ var BuildConfigurationUpdateManager = class {
       }
       if (updates.parameters) {
         for (const [name, value] of Object.entries(updates.parameters)) {
-          await this.client.buildTypes.setBuildTypeField(
+          await this.client.modules.buildTypes.setBuildTypeField(
             currentConfig.id,
             `parameters/${name}`,
             value
@@ -1394,7 +1398,10 @@ var BuildResultsManager = class _BuildResultsManager {
    * Fetch build summary data
    */
   async fetchBuildSummary(buildId) {
-    const response = await this.client.builds.getBuild(`id:${buildId}`, _BuildResultsManager.fields);
+    const response = await this.client.modules.builds.getBuild(
+      this.toBuildLocator(buildId),
+      _BuildResultsManager.fields
+    );
     return response.data;
   }
   /**
@@ -1447,7 +1454,9 @@ var BuildResultsManager = class _BuildResultsManager {
    */
   async fetchArtifacts(buildId, options) {
     try {
-      const response = await this.client.listBuildArtifacts(buildId);
+      const response = await this.client.modules.builds.getFilesListOfBuild(
+        this.toBuildLocator(buildId)
+      );
       const artifactListing = response.data;
       let artifacts = artifactListing.file ?? [];
       if (options.artifactFilter) {
@@ -1468,11 +1477,8 @@ var BuildResultsManager = class _BuildResultsManager {
             const maxSize = options.maxArtifactSize ?? _BuildResultsManager.defaultMaxArtifactSize;
             if ((artifact.size ?? 0) <= maxSize) {
               try {
-                const contentResponse = await this.client.downloadArtifactContent(
-                  buildId,
-                  artifactPath
-                );
-                artifactData.content = Buffer.from(contentResponse.data).toString("base64");
+                const contentResponse = await this.downloadArtifactContent(buildId, artifactPath);
+                artifactData.content = Buffer.from(contentResponse).toString("base64");
               } catch (err) {
               }
             }
@@ -1500,7 +1506,9 @@ var BuildResultsManager = class _BuildResultsManager {
    */
   async fetchStatistics(buildId) {
     try {
-      const response = await this.client.getBuildStatistics(buildId);
+      const response = await this.client.modules.builds.getBuildStatisticValues(
+        this.toBuildLocator(buildId)
+      );
       const payload = response.data;
       const properties = payload.property ?? [];
       const stats = {};
@@ -1542,7 +1550,7 @@ var BuildResultsManager = class _BuildResultsManager {
    */
   async fetchChanges(buildId) {
     try {
-      const response = await this.client.listChangesForBuild(buildId);
+      const response = await this.client.modules.changes.getAllChanges(`build:(id:${buildId})`);
       const changePayload = response.data;
       const changes = changePayload.change ?? [];
       return changes.map((change) => ({
@@ -1565,7 +1573,9 @@ var BuildResultsManager = class _BuildResultsManager {
    */
   async fetchDependencies(buildId) {
     try {
-      const response = await this.client.listSnapshotDependencies(buildId);
+      const response = await this.client.request(
+        (ctx) => ctx.axios.get(`${ctx.baseUrl}/app/rest/builds/id:${buildId}/snapshot-dependencies`)
+      );
       const depsData = response.data;
       const builds = depsData.build ?? [];
       return builds.map((build) => ({
@@ -1586,10 +1596,30 @@ var BuildResultsManager = class _BuildResultsManager {
     if (/^https?:/i.test(path)) {
       return path;
     }
+    const baseUrl = this.getBaseUrl();
     if (path.startsWith("/")) {
-      return `${this.client.baseUrl}${path}`;
+      return `${baseUrl}${path}`;
     }
-    return `${this.client.baseUrl}/${path}`;
+    return `${baseUrl}/${path}`;
+  }
+  getBaseUrl() {
+    const baseUrl = this.client.getApiConfig().baseUrl;
+    return baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
+  }
+  toBuildLocator(buildId) {
+    return buildId.includes(":") ? buildId : `id:${buildId}`;
+  }
+  async downloadArtifactContent(buildId, artifactPath) {
+    const normalizedPath = artifactPath.split("/").map((segment) => encodeURIComponent(segment)).join("/");
+    const response = await this.client.request(
+      (ctx) => ctx.axios.get(
+        `${ctx.baseUrl}/app/rest/builds/id:${buildId}/artifacts/content/${normalizedPath}`,
+        {
+          responseType: "arraybuffer"
+        }
+      )
+    );
+    return response.data;
   }
   /**
    * Parse TeamCity date format
@@ -1707,10 +1737,11 @@ function createAdapterFromTeamCityAPI(api, options = {}) {
   const modules = resolveModules(api);
   const baseUrl = api.getBaseUrl();
   const httpInstance = api.http ?? import_axios.default.create({ baseURL: baseUrl });
+  const fallbackApiConfig = resolveApiClientConfigFromApi(api, httpInstance);
   const resolvedApiConfig = {
-    baseUrl: options.apiConfig?.baseUrl ?? baseUrl,
-    token: options.apiConfig?.token ?? "",
-    timeout: options.apiConfig?.timeout ?? void 0
+    baseUrl: options.apiConfig?.baseUrl ?? fallbackApiConfig.baseUrl,
+    token: options.apiConfig?.token ?? fallbackApiConfig.token,
+    timeout: options.apiConfig?.timeout ?? fallbackApiConfig.timeout
   };
   const resolvedFullConfig = options.fullConfig ?? {
     connection: {
@@ -1751,6 +1782,93 @@ function createAdapterFromTeamCityAPI(api, options = {}) {
     baseUrl
   };
 }
+var isAxiosHeadersRecord = (value) => typeof value === "object" && value !== null;
+var resolveApiClientConfigFromApi = (api, http) => {
+  const timeout = resolveTimeout(http);
+  const authHeader = getAuthorizationHeader(http);
+  const token = stripBearerPrefix(authHeader);
+  return {
+    baseUrl: api.getBaseUrl(),
+    token: token ?? "",
+    timeout
+  };
+};
+var getAuthorizationHeader = (http) => {
+  const headers = http.defaults.headers;
+  if (!isAxiosHeadersRecord(headers)) {
+    return void 0;
+  }
+  const direct = pickAuthorization(headers);
+  if (direct !== void 0) {
+    return direct;
+  }
+  const commonRecord = isAxiosHeadersRecord(headers.common) ? headers.common : void 0;
+  if (commonRecord) {
+    const common = pickAuthorization(commonRecord);
+    if (common !== void 0) {
+      return common;
+    }
+  }
+  const getter = resolveHeaderGetter(headers) ?? (commonRecord ? resolveHeaderGetter(commonRecord) : void 0);
+  if (getter) {
+    return readAuthorizationViaGetter(getter, headers);
+  }
+  return void 0;
+};
+var resolveTimeout = (http) => {
+  const raw = http.defaults.timeout;
+  if (typeof raw === "number" && Number.isFinite(raw) && raw > 0) {
+    return raw;
+  }
+  return void 0;
+};
+var pickAuthorization = (record) => {
+  for (const key of Object.keys(record)) {
+    if (key.toLowerCase() !== "authorization") {
+      continue;
+    }
+    const value = record[key];
+    if (typeof value === "string") {
+      return value;
+    }
+    if (Array.isArray(value)) {
+      const [first] = value;
+      if (typeof first === "string") {
+        return first;
+      }
+    }
+  }
+  return void 0;
+};
+var resolveHeaderGetter = (record) => {
+  const candidate = record.get;
+  return typeof candidate === "function" ? candidate : void 0;
+};
+var readAuthorizationViaGetter = (getter, context) => {
+  try {
+    const value = getter.call(context, "Authorization");
+    if (typeof value === "string") {
+      return value;
+    }
+    if (Array.isArray(value)) {
+      const [first] = value;
+      return typeof first === "string" ? first : void 0;
+    }
+  } catch {
+    return void 0;
+  }
+  return void 0;
+};
+var stripBearerPrefix = (header) => {
+  if (typeof header !== "string") {
+    return void 0;
+  }
+  const match = /^Bearer\s+(.+)$/i.exec(header);
+  return match?.[1] ?? header;
+};
+
+// src/tools.ts
+init_errors();
 
 // src/teamcity/pagination.ts
 function createPaginatedFetcher(baseFetch, extractItems, extractTotal) {
@@ -36225,15 +36343,21 @@ var TeamCityAPI = class _TeamCityAPI {
     return this.builds.getBuildStatisticValues(this.toBuildLocator(buildId), fields);
   }
   async listChangesForBuild(buildId, fields) {
-    return this.axiosInstance.get("/app/rest/changes", {
-      params: {
-        locator: `build:(id:${buildId})`,
-        fields
-      }
-    });
+    return this.changes.getAllChanges(`build:(id:${buildId})`, fields);
   }
   async listSnapshotDependencies(buildId) {
-    return this.axiosInstance.get(`/app/rest/builds/id:${buildId}/snapshot-dependencies`);
+    const response = await this.builds.getBuild(
+      this.toBuildLocator(buildId),
+      "snapshot-dependencies"
+    );
+    const dependencies = response.data["snapshot-dependencies"];
+    if (dependencies == null) {
+      return response;
+    }
+    return {
+      ...response,
+      data: dependencies
+    };
   }
   getBaseUrl() {
     return this.baseUrl;
@@ -36746,52 +36870,91 @@ var DEV_TOOLS = [
           if (!effectiveBuildId) {
             throw new Error("Failed to resolve buildId from inputs");
           }
-          if (typed.tail) {
-            const count = typed.lineCount ?? typed.pageSize ?? 500;
-            const full = await api.getBuildLog(effectiveBuildId);
-            const allLines = full.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
-            if (allLines.length > 0 && allLines[allLines.length - 1] === "") allLines.pop();
-            const total = allLines.length;
-            const start = Math.max(0, total - count);
-            const lines = allLines.slice(start);
+          const shouldRetry2 = (error2) => {
+            if (error2 instanceof TeamCityAPIError) {
+              if (error2.code === "HTTP_404") {
+                return true;
+              }
+              return isRetryableError(error2);
+            }
+            if ((0, import_axios35.isAxiosError)(error2)) {
+              const status = error2.response?.status;
+              if (status === 404) {
+                return true;
+              }
+              if (status != null && status >= 500 && status < 600) {
+                return true;
+              }
+              if (!status) {
+                return true;
+              }
+            }
+            return false;
+          };
+          const wait = (ms) => new Promise((resolve) => {
+            setTimeout(resolve, ms);
+          });
+          const attemptFetch = async () => {
+            if (typed.tail) {
+              const count = typed.lineCount ?? typed.pageSize ?? 500;
+              const full = await api.getBuildLog(effectiveBuildId);
+              const allLines = full.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+              if (allLines.length > 0 && allLines[allLines.length - 1] === "") allLines.pop();
+              const total = allLines.length;
+              const start = Math.max(0, total - count);
+              const lines = allLines.slice(start);
+              return json({
+                lines,
+                meta: {
+                  buildId: effectiveBuildId,
+                  buildNumber: typeof typed.buildNumber !== "undefined" ? String(typed.buildNumber) : void 0,
+                  buildTypeId: typed.buildTypeId,
+                  mode: "tail",
+                  pageSize: count,
+                  startLine: start,
+                  hasMore: start > 0,
+                  totalLines: total
+                }
+              });
+            }
+            const effectivePageSize = typed.lineCount ?? typed.pageSize ?? 500;
+            const startLine = typeof typed.startLine === "number" ? typed.startLine : ((typed.page ?? 1) - 1) * effectivePageSize;
+            const chunk = await api.getBuildLogChunk(effectiveBuildId, {
+              startLine,
+              lineCount: effectivePageSize
+            });
+            const page = Math.floor(startLine / effectivePageSize) + 1;
+            const hasMore = chunk.nextStartLine !== void 0;
             return json({
-              lines,
+              lines: chunk.lines,
               meta: {
                 buildId: effectiveBuildId,
                 buildNumber: typeof typed.buildNumber !== "undefined" ? String(typed.buildNumber) : void 0,
                 buildTypeId: typed.buildTypeId,
-                mode: "tail",
-                pageSize: count,
-                startLine: start,
-                hasMore: start > 0,
-                totalLines: total
+                page,
+                pageSize: effectivePageSize,
+                startLine: chunk.startLine,
+                nextPage: hasMore ? page + 1 : void 0,
+                prevPage: page > 1 ? page - 1 : void 0,
+                hasMore,
+                totalLines: chunk.totalLines,
+                nextStartLine: chunk.nextStartLine
               }
             });
-          }
-          const effectivePageSize = typed.lineCount ?? typed.pageSize ?? 500;
-          const startLine = typeof typed.startLine === "number" ? typed.startLine : ((typed.page ?? 1) - 1) * effectivePageSize;
-          const chunk = await api.getBuildLogChunk(effectiveBuildId, {
-            startLine,
-            lineCount: effectivePageSize
-          });
-          const page = Math.floor(startLine / effectivePageSize) + 1;
-          const hasMore = chunk.nextStartLine !== void 0;
-          return json({
-            lines: chunk.lines,
-            meta: {
-              buildId: effectiveBuildId,
-              buildNumber: typeof typed.buildNumber !== "undefined" ? String(typed.buildNumber) : void 0,
-              buildTypeId: typed.buildTypeId,
-              page,
-              pageSize: effectivePageSize,
-              startLine: chunk.startLine,
-              nextPage: hasMore ? page + 1 : void 0,
-              prevPage: page > 1 ? page - 1 : void 0,
-              hasMore,
-              totalLines: chunk.totalLines,
-              nextStartLine: chunk.nextStartLine
+          };
+          const maxAttempts = typed.tail ? 5 : 3;
+          for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+            try {
+              return await attemptFetch();
+            } catch (error2) {
+              if (shouldRetry2(error2) && attempt < maxAttempts - 1) {
+                await wait(500 * (attempt + 1));
+                continue;
+              }
+              throw error2;
             }
-          });
+          }
+          throw new Error("Unable to fetch build log after retries");
         },
         args
       );
@@ -38638,8 +38801,8 @@ var FULL_MODE_TOOLS = [
       const typedArgs = args;
       const api = TeamCityAPI.getInstance();
       try {
-        const clientLike = { buildTypes: api.buildTypes };
-        const manager = new BuildConfigurationUpdateManager(clientLike);
+        const adapter = createAdapterFromTeamCityAPI(api);
+        const manager = new BuildConfigurationUpdateManager(adapter);
         const current = await manager.retrieveConfiguration(typedArgs.buildTypeId);
         if (current) {
           const updates = {};