@daghis/teamcity-mcp 1.3.3 → 1.3.4

package/dist/index.js

@@ -1692,6 +1692,7 @@ var BuildResultsManager = class _BuildResultsManager {
 
 // src/teamcity/client-adapter.ts
 var import_axios = __toESM(require("axios"));
+var FALLBACK_BASE_URL = "http://not-configured";
 var resolveModules = (api) => {
   const candidate = api.modules;
   if (candidate != null) {
@@ -1735,9 +1736,11 @@ var resolveModules = (api) => {
 };
 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 getBaseUrl = api.getBaseUrl;
+  const inferredBaseUrl = typeof getBaseUrl === "function" ? getBaseUrl.call(api) : void 0;
+  const fallbackBaseUrl = inferredBaseUrl ?? options.apiConfig?.baseUrl ?? api.http?.defaults?.baseURL ?? FALLBACK_BASE_URL;
+  const httpInstance = api.http ?? import_axios.default.create({ baseURL: fallbackBaseUrl });
+  const fallbackApiConfig = resolveApiClientConfigFromApi(api, httpInstance, fallbackBaseUrl);
   const resolvedApiConfig = {
     baseUrl: options.apiConfig?.baseUrl ?? fallbackApiConfig.baseUrl,
     token: options.apiConfig?.token ?? fallbackApiConfig.token,
@@ -1750,7 +1753,13 @@ function createAdapterFromTeamCityAPI(api, options = {}) {
       timeout: resolvedApiConfig.timeout
     }
   };
-  const request = async (fn) => fn({ axios: httpInstance, baseUrl, requestId: void 0 });
+  if (fallbackBaseUrl === FALLBACK_BASE_URL && resolvedApiConfig.baseUrl === FALLBACK_BASE_URL) {
+    warn("TeamCity adapter using fallback baseUrl placeholder", {
+      reason: "missing_base_url",
+      hasApiConfig: Boolean(options.apiConfig)
+    });
+  }
+  const request = async (fn) => fn({ axios: httpInstance, baseUrl: resolvedApiConfig.baseUrl, requestId: void 0 });
   const buildApi = modules.builds;
   return {
     modules,
@@ -1759,7 +1768,7 @@ function createAdapterFromTeamCityAPI(api, options = {}) {
     getConfig: () => resolvedFullConfig,
     getApiConfig: () => resolvedApiConfig,
     getAxios: () => httpInstance,
-    testConnection: () => api.testConnection(),
+    testConnection: () => typeof api.testConnection === "function" ? api.testConnection() : Promise.resolve(true),
     listProjects: (locator) => api.listProjects(locator),
     getProject: (projectId) => api.getProject(projectId),
     listBuilds: (locator) => api.listBuilds(locator),
@@ -1779,16 +1788,18 @@ function createAdapterFromTeamCityAPI(api, options = {}) {
     listVcsRoots: (projectId) => api.listVcsRoots(projectId),
     listAgents: () => api.listAgents(),
     listAgentPools: () => api.listAgentPools(),
-    baseUrl
+    baseUrl: resolvedApiConfig.baseUrl
   };
 }
 var isAxiosHeadersRecord = (value) => typeof value === "object" && value !== null;
-var resolveApiClientConfigFromApi = (api, http) => {
+var resolveApiClientConfigFromApi = (api, http, baseUrlFallback) => {
   const timeout = resolveTimeout(http);
   const authHeader = getAuthorizationHeader(http);
   const token = stripBearerPrefix(authHeader);
+  const getBaseUrl = api.getBaseUrl;
+  const resolvedBaseUrl = typeof getBaseUrl === "function" ? getBaseUrl.call(api) : http.defaults.baseURL ?? baseUrlFallback;
   return {
-    baseUrl: api.getBaseUrl(),
+    baseUrl: typeof resolvedBaseUrl === "string" && resolvedBaseUrl.length > 0 ? resolvedBaseUrl : baseUrlFallback,
     token: token ?? "",
     timeout
   };
@@ -36470,7 +36481,7 @@ var DEV_TOOLS = [
         "list_projects",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.parentProjectId) baseParts.push(`parent:(id:${typed.parentProjectId})`);
@@ -36480,7 +36491,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.projects.getAllProjects(locator, typed.fields);
+            return adapter.modules.projects.getAllProjects(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -36520,8 +36534,8 @@ var DEV_TOOLS = [
         "get_project",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const project = await api.getProject(typed.projectId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const project = await adapter.getProject(typed.projectId);
           return json(project);
         },
         args
@@ -36569,7 +36583,7 @@ var DEV_TOOLS = [
         "list_builds",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
@@ -36581,7 +36595,7 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.builds.getAllBuilds(locator, typed.fields);
+            return adapter.modules.builds.getAllBuilds(locator, typed.fields);
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -36624,8 +36638,8 @@ var DEV_TOOLS = [
         "get_build",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const build = await api.getBuild(typed.buildId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const build = await adapter.getBuild(typed.buildId);
           return json(build);
         },
         args
@@ -36654,9 +36668,9 @@ var DEV_TOOLS = [
         "trigger_build",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           try {
-            const build = await api.triggerBuild(
+            const build = await adapter.triggerBuild(
               typed.buildTypeId,
               typed.branchName,
               typed.comment
@@ -36672,9 +36686,13 @@ var DEV_TOOLS = [
             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>`;
-            const response = await api.buildQueue.addBuildToQueue(false, xml, {
-              headers: { "Content-Type": "application/xml", Accept: "application/json" }
-            });
+            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,
@@ -36705,8 +36723,8 @@ var DEV_TOOLS = [
         "cancel_queued_build",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          await api.buildQueue.deleteQueuedBuild(typed.buildId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          await adapter.modules.buildQueue.deleteQueuedBuild(typed.buildId);
           return json({ success: true, action: "cancel_queued_build", buildId: typed.buildId });
         },
         args
@@ -36746,8 +36764,8 @@ var DEV_TOOLS = [
         "get_build_status",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const statusManager = new (await Promise.resolve().then(() => (init_build_status_manager(), build_status_manager_exports))).BuildStatusManager(createAdapterFromTeamCityAPI(api));
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const statusManager = new (await Promise.resolve().then(() => (init_build_status_manager(), build_status_manager_exports))).BuildStatusManager(adapter);
           const result = await statusManager.getBuildStatus({
             buildId: typed.buildId,
             includeTests: typed.includeTests,
@@ -36760,14 +36778,17 @@ var DEV_TOOLS = [
             }
             if (typed.includeQueueTotals) {
               try {
-                const countResp = await api.buildQueue.getAllQueuedBuilds(void 0, "count");
+                const countResp = await adapter.modules.buildQueue.getAllQueuedBuilds(
+                  void 0,
+                  "count"
+                );
                 enrich.totalQueued = countResp.data.count;
               } catch {
               }
             }
             if (typed.includeQueueReason) {
               try {
-                const qb = await api.buildQueue.getQueuedBuild(typed.buildId);
+                const qb = await adapter.modules.buildQueue.getQueuedBuild(typed.buildId);
                 enrich.waitReason = qb.data.waitReason;
               } catch {
               }
@@ -36820,7 +36841,7 @@ var DEV_TOOLS = [
         "fetch_build_log",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           let effectiveBuildId;
           if (typed.buildId) {
             effectiveBuildId = typed.buildId;
@@ -36832,11 +36853,11 @@ var DEV_TOOLS = [
             baseLocatorParts.push(`number:${numberStr}`);
             baseLocatorParts.push("count:10");
             const locator = baseLocatorParts.join(",");
-            const resp = await api.listBuilds(locator);
+            const resp = await adapter.listBuilds(locator);
             const builds = Array.isArray(resp.build) ? resp.build : [];
             if (builds.length === 0) {
               if (typed.buildTypeId) {
-                const recent = await api.listBuilds(
+                const recent = await adapter.listBuilds(
                   `buildType:(id:${typed.buildTypeId}),branch:default:any,count:100`
                 );
                 const items = Array.isArray(recent.build) ? recent.build : [];
@@ -36897,7 +36918,7 @@ var DEV_TOOLS = [
           const attemptFetch = async () => {
             if (typed.tail) {
               const count = typed.lineCount ?? typed.pageSize ?? 500;
-              const full = await api.getBuildLog(effectiveBuildId);
+              const full = await adapter.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;
@@ -36919,7 +36940,7 @@ var DEV_TOOLS = [
             }
             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, {
+            const chunk = await adapter.getBuildLogChunk(effectiveBuildId, {
               startLine,
               lineCount: effectivePageSize
             });
@@ -36991,7 +37012,7 @@ var DEV_TOOLS = [
         "list_build_configs",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`affectedProject:(id:${typed.projectId})`);
@@ -37001,7 +37022,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.buildTypes.getAllBuildTypes(locator, typed.fields);
+            return adapter.modules.buildTypes.getAllBuildTypes(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37041,8 +37065,8 @@ var DEV_TOOLS = [
         "get_build_config",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const buildType = await api.getBuildType(typed.buildTypeId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const buildType = await adapter.getBuildType(typed.buildTypeId);
           return json(buildType);
         },
         args
@@ -37079,14 +37103,14 @@ var DEV_TOOLS = [
         "list_test_failures",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const pageSize = typed.pageSize ?? 100;
           const baseFetch = async ({ count, start }) => {
             const parts = [`build:(id:${typed.buildId})`, "status:FAILURE"];
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.join(",");
-            return api.tests.getAllTestOccurrences(locator, typed.fields);
+            return adapter.modules.tests.getAllTestOccurrences(locator, typed.fields);
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37139,7 +37163,7 @@ var DEV_TOOLS = [
         "list_vcs_roots",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.projectId) baseParts.push(`affectedProject:(id:${typed.projectId})`);
           const pageSize = typed.pageSize ?? 100;
@@ -37148,7 +37172,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.vcsRoots.getAllVcsRoots(locator, typed.fields);
+            return adapter.modules.vcsRoots.getAllVcsRoots(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37188,10 +37215,10 @@ var DEV_TOOLS = [
         "get_vcs_root",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const listing = await api.vcsRoots.getAllVcsRoots(`id:${typed.id}`);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const listing = await adapter.modules.vcsRoots.getAllVcsRoots(`id:${typed.id}`);
           const rootEntry = listing.data.vcsRoot?.[0];
-          const props = await api.vcsRoots.getAllVcsRootProperties(typed.id);
+          const props = await adapter.modules.vcsRoots.getAllVcsRootProperties(typed.id);
           return json({
             id: rootEntry?.id ?? typed.id,
             name: rootEntry?.name,
@@ -37225,8 +37252,8 @@ var DEV_TOOLS = [
         "set_vcs_root_property",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          await api.vcsRoots.setVcsRootProperty(typed.id, typed.name, typed.value, {
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          await adapter.modules.vcsRoots.setVcsRootProperty(typed.id, typed.name, typed.value, {
             headers: { "Content-Type": "text/plain", Accept: "text/plain" }
           });
           return json({
@@ -37258,8 +37285,8 @@ var DEV_TOOLS = [
         "delete_vcs_root_property",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          await api.vcsRoots.deleteVcsRootProperty(typed.id, typed.name);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          await adapter.modules.vcsRoots.deleteVcsRootProperty(typed.id, typed.name);
           return json({
             success: true,
             action: "delete_vcs_root_property",
@@ -37303,7 +37330,7 @@ var DEV_TOOLS = [
         "update_vcs_root_properties",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const properties = [];
           if (typeof typed.url === "string") properties.push({ name: "url", value: typed.url });
           if (typeof typed.branch === "string")
@@ -37322,7 +37349,7 @@ var DEV_TOOLS = [
               updated: 0
             });
           }
-          await api.vcsRoots.setVcsRootProperties(
+          await adapter.modules.vcsRoots.setVcsRootProperties(
             typed.id,
             void 0,
             { property: properties },
@@ -37372,7 +37399,7 @@ var DEV_TOOLS = [
         "list_queued_builds",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           const pageSize = typed.pageSize ?? 100;
@@ -37381,7 +37408,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.buildQueue.getAllQueuedBuilds(locator, typed.fields);
+            return adapter.modules.buildQueue.getAllQueuedBuilds(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37415,8 +37445,8 @@ var DEV_TOOLS = [
         "get_server_metrics",
         null,
         async () => {
-          const api = TeamCityAPI.getInstance();
-          const metrics = await api.server.getAllMetrics();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const metrics = await adapter.modules.server.getAllMetrics();
           return json(metrics.data);
         },
         {}
@@ -37433,8 +37463,8 @@ var DEV_TOOLS = [
         "get_server_info",
         null,
         async () => {
-          const api = TeamCityAPI.getInstance();
-          const info2 = await api.server.getServerInfo();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const info2 = await adapter.modules.server.getServerInfo();
           return json(info2.data);
         },
         {}
@@ -37459,19 +37489,19 @@ var DEV_TOOLS = [
         "list_server_health_items",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const normalized = (() => {
             const raw = typeof typed.locator === "string" ? typed.locator.trim() : void 0;
             if (!raw || raw.length === 0) return void 0;
             return raw.replace(/category:\s*\((ERROR|WARNING|INFO)\)/g, "category:$1");
           })();
           try {
-            const response = await api.health.getHealthItems(normalized);
+            const response = await adapter.modules.health.getHealthItems(normalized);
             return json(response.data);
           } catch (err) {
             const isHttp400 = err?.statusCode === 400 || err?.code === "VALIDATION_ERROR";
             if (!isHttp400) throw err;
-            const all = await api.health.getHealthItems();
+            const all = await adapter.modules.health.getHealthItems();
             const rawItems = all.data?.healthItem ?? [];
             const filter = (item) => {
               if (!normalized) return true;
@@ -37520,8 +37550,8 @@ var DEV_TOOLS = [
         "get_server_health_item",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const response = await api.health.getSingleHealthItem(typed.locator);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const response = await adapter.modules.health.getSingleHealthItem(typed.locator);
           return json(response.data);
         },
         args
@@ -37548,8 +37578,8 @@ var DEV_TOOLS = [
         "check_availability_guard",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const resp = await api.health.getHealthItems();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const resp = await adapter.modules.health.getHealthItems();
           const items = resp.data?.healthItem ?? [];
           const critical = items.filter((i) => i.severity === "ERROR");
           const warnings = items.filter((i) => i.severity === "WARNING");
@@ -37575,8 +37605,8 @@ var DEV_TOOLS = [
         "get_compatible_build_types_for_agent",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const resp = await api.agents.getCompatibleBuildTypes(typed.agentId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const resp = await adapter.modules.agents.getCompatibleBuildTypes(typed.agentId);
           return json(resp.data);
         },
         args
@@ -37597,8 +37627,8 @@ var DEV_TOOLS = [
         "get_incompatible_build_types_for_agent",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const resp = await api.agents.getIncompatibleBuildTypes(typed.agentId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const resp = await adapter.modules.agents.getIncompatibleBuildTypes(typed.agentId);
           return json(resp.data);
         },
         args
@@ -37619,8 +37649,8 @@ var DEV_TOOLS = [
         "get_agent_enabled_info",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const resp = await api.agents.getEnabledInfo(typed.agentId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const resp = await adapter.modules.agents.getEnabledInfo(typed.agentId);
           return json(resp.data);
         },
         args
@@ -37650,11 +37680,11 @@ var DEV_TOOLS = [
         "get_compatible_agents_for_build_type",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const filters = [`compatible:(buildType:${typed.buildTypeId})`];
           if (!typed.includeDisabled) filters.push("enabled:true");
           const locator = filters.join(",");
-          const resp = await api.agents.getAllAgents(locator);
+          const resp = await adapter.modules.agents.getAllAgents(locator);
           return json(resp.data);
         },
         args
@@ -37684,11 +37714,11 @@ var DEV_TOOLS = [
         "count_compatible_agents_for_build_type",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const parts = [`compatible:(buildType:${typed.buildTypeId})`];
           if (!typed.includeDisabled) parts.push("enabled:true");
           const locator = parts.join(",");
-          const resp = await api.agents.getAllAgents(locator, "count");
+          const resp = await adapter.modules.agents.getAllAgents(locator, "count");
           const count = resp.data.count ?? 0;
           return json({ count });
         },
@@ -37719,14 +37749,14 @@ var DEV_TOOLS = [
         "get_compatible_agents_for_queued_build",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const build = await api.getBuild(typed.buildId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const build = await adapter.getBuild(typed.buildId);
           const buildTypeId = build.buildTypeId;
           if (!buildTypeId) return json({ items: [], count: 0, note: "Build type ID not found" });
           const parts = [`compatible:(buildType:${buildTypeId})`];
           if (!typed.includeDisabled) parts.push("enabled:true");
           const locator = parts.join(",");
-          const resp = await api.agents.getAllAgents(locator);
+          const resp = await adapter.modules.agents.getAllAgents(locator);
           return json(resp.data);
         },
         args
@@ -37738,7 +37768,8 @@ var DEV_TOOLS = [
     description: "Check connectivity to TeamCity server and basic readiness",
     inputSchema: { type: "object", properties: {} },
     handler: async (_args) => {
-      const ok = await TeamCityAPI.getInstance().testConnection();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      const ok = await adapter.testConnection();
       return json({ ok });
     }
   },
@@ -37771,7 +37802,7 @@ var DEV_TOOLS = [
         "list_agents",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const pageSize = typed.pageSize ?? 100;
           const baseFetch = async ({ count, start }) => {
             const parts = [];
@@ -37779,7 +37810,7 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.agents.getAllAgents(locator, typed.fields);
+            return adapter.modules.agents.getAllAgents(locator, typed.fields);
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37829,14 +37860,17 @@ var DEV_TOOLS = [
         "list_agent_pools",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const pageSize = typed.pageSize ?? 100;
           const baseFetch = async ({ count, start }) => {
             const parts = [];
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.agentPools.getAllAgentPools(locator, typed.fields);
+            return adapter.modules.agentPools.getAllAgentPools(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -37898,8 +37932,8 @@ var DEV_TOOLS = [
         "get_build_results",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const manager = new BuildResultsManager(createAdapterFromTeamCityAPI(api));
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const manager = new BuildResultsManager(adapter);
           const result = await manager.getBuildResults(typed.buildId, {
             includeArtifacts: typed.includeArtifacts,
             includeStatistics: typed.includeStatistics,
@@ -37934,10 +37968,10 @@ var DEV_TOOLS = [
         "get_test_details",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           let locator = `build:(id:${typed.buildId})`;
           if (typed.testNameId) locator += `,test:(id:${typed.testNameId})`;
-          const response = await api.tests.getAllTestOccurrences(locator);
+          const response = await adapter.modules.tests.getAllTestOccurrences(locator);
           return json(response.data);
         },
         args
@@ -37960,10 +37994,10 @@ var DEV_TOOLS = [
         "analyze_build_problems",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const build = await api.getBuild(typed.buildId);
-          const problems = await api.builds.getBuildProblems(`id:${typed.buildId}`);
-          const failures = await api.listTestFailures(typed.buildId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const build = await adapter.getBuild(typed.buildId);
+          const problems = await adapter.modules.builds.getBuildProblems(`id:${typed.buildId}`);
+          const failures = await adapter.listTestFailures(typed.buildId);
           return json({
             buildStatus: build.status,
             statusText: build.statusText,
@@ -38008,7 +38042,7 @@ var DEV_TOOLS = [
         "list_changes",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
@@ -38019,7 +38053,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.changes.getAllChanges(locator, typed.fields);
+            return adapter.modules.changes.getAllChanges(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -38075,7 +38112,7 @@ var DEV_TOOLS = [
         "list_problems",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
@@ -38086,7 +38123,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.problems.getAllBuildProblems(locator, typed.fields);
+            return adapter.modules.problems.getAllBuildProblems(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -38148,7 +38188,7 @@ var DEV_TOOLS = [
         "list_problem_occurrences",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.buildId) baseParts.push(`build:(id:${typed.buildId})`);
@@ -38159,7 +38199,7 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.problemOccurrences.getAllBuildProblemOccurrences(
+            return adapter.modules.problemOccurrences.getAllBuildProblemOccurrences(
               locator,
               typed.fields
             );
@@ -38229,7 +38269,7 @@ var DEV_TOOLS = [
         "list_investigations",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
@@ -38242,7 +38282,7 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.investigations.getAllInvestigations(
+            return adapter.modules.investigations.getAllInvestigations(
               locator,
               typed.fields
             );
@@ -38306,7 +38346,7 @@ var DEV_TOOLS = [
         "list_muted_tests",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.projectId) baseParts.push(`project:(id:${typed.projectId})`);
@@ -38318,7 +38358,10 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.mutes.getAllMutedTests(locator, typed.fields);
+            return adapter.modules.mutes.getAllMutedTests(
+              locator,
+              typed.fields
+            );
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -38368,8 +38411,8 @@ var DEV_TOOLS = [
         "get_versioned_settings_status",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const response = await api.versionedSettings.getVersionedSettingsStatus(
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const response = await adapter.modules.versionedSettings.getVersionedSettingsStatus(
             typed.locator,
             typed.fields
           );
@@ -38409,7 +38452,7 @@ var DEV_TOOLS = [
         "list_users",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const baseParts = [];
           if (typed.locator) baseParts.push(typed.locator);
           if (typed.groupId) baseParts.push(`group:(id:${typed.groupId})`);
@@ -38419,7 +38462,7 @@ var DEV_TOOLS = [
             if (typeof count === "number") parts.push(`count:${count}`);
             if (typeof start === "number") parts.push(`start:${start}`);
             const locator = parts.length > 0 ? parts.join(",") : void 0;
-            return api.users.getAllUsers(locator, typed.fields);
+            return adapter.modules.users.getAllUsers(locator, typed.fields);
           };
           const fetcher = createPaginatedFetcher(
             baseFetch,
@@ -38461,8 +38504,8 @@ var DEV_TOOLS = [
         "list_roles",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const response = await api.roles.getRoles(typed.fields);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const response = await adapter.modules.roles.getRoles(typed.fields);
           const roles = response.data?.role ?? [];
           return json({ items: roles, count: roles.length });
         },
@@ -38492,9 +38535,9 @@ var DEV_TOOLS = [
         "list_branches",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const locator = typed.buildTypeId ? `buildType:(id:${typed.buildTypeId})` : `project:(id:${typed.projectId})`;
-          const builds = await api.listBuilds(`${locator},count:100}`);
+          const builds = await adapter.listBuilds(`${locator},count:100}`);
           const items = Array.isArray(builds.build) ? builds.build : [];
           const branchNames = items.map((b) => b.branchName).filter((n) => typeof n === "string" && n.length > 0);
           const branches = new Set(branchNames);
@@ -38520,8 +38563,8 @@ var DEV_TOOLS = [
         "list_parameters",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const buildType = await api.getBuildType(typed.buildTypeId);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const buildType = await adapter.getBuildType(typed.buildTypeId);
           return json({
             parameters: buildType.parameters?.property ?? [],
             count: buildType.parameters?.property?.length ?? 0
@@ -38546,10 +38589,10 @@ var DEV_TOOLS = [
         "list_project_hierarchy",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const rootId = typed.rootProjectId ?? "_Root";
           async function buildHierarchy(projectId, depth = 0) {
-            const response = await api.projects.getProject(projectId);
+            const response = await adapter.modules.projects.getProject(projectId);
             const project = response.data;
             const children = [];
             const maybeChildren = project.projects?.project ?? [];
@@ -38605,14 +38648,14 @@ var FULL_MODE_TOOLS = [
         "create_project",
         schema,
         async (typedArgs) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const project = {
             name: typedArgs.name,
             id: typedArgs.id,
             parentProject: { id: typedArgs.parentProjectId ?? "_Root" },
             description: typedArgs.description
           };
-          const response = await api.projects.addProject(project, {
+          const response = await adapter.modules.projects.addProject(project, {
             headers: { "Content-Type": "application/json", Accept: "application/json" }
           });
           return json({ success: true, action: "create_project", id: response.data.id });
@@ -38634,8 +38677,8 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      await api.projects.deleteProject(typedArgs.projectId);
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      await adapter.modules.projects.deleteProject(typedArgs.projectId);
       return json({ success: true, action: "delete_project", id: typedArgs.projectId });
     },
     mode: "full"
@@ -38664,7 +38707,7 @@ var FULL_MODE_TOOLS = [
         "update_project_settings",
         schema,
         async (typedArgs) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           debug("update_project_settings invoked", {
             projectId: typedArgs.projectId,
             // Only log which fields are present to reduce noise
@@ -38680,7 +38723,11 @@ var FULL_MODE_TOOLS = [
               field: "name",
               valuePreview: typedArgs.name
             });
-            await api.projects.setProjectField(typedArgs.projectId, "name", typedArgs.name);
+            await adapter.modules.projects.setProjectField(
+              typedArgs.projectId,
+              "name",
+              typedArgs.name
+            );
           }
           if (typedArgs.description !== void 0) {
             debug("Setting project field", {
@@ -38688,7 +38735,7 @@ var FULL_MODE_TOOLS = [
               field: "description",
               valuePreview: typedArgs.description
             });
-            await api.projects.setProjectField(
+            await adapter.modules.projects.setProjectField(
               typedArgs.projectId,
               "description",
               typedArgs.description
@@ -38700,7 +38747,7 @@ var FULL_MODE_TOOLS = [
               field: "archived",
               valuePreview: String(typedArgs.archived)
             });
-            await api.projects.setProjectField(
+            await adapter.modules.projects.setProjectField(
               typedArgs.projectId,
               "archived",
               String(typedArgs.archived)
@@ -38741,14 +38788,14 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       const buildType = {
         name: typedArgs.name,
         id: typedArgs.id,
         project: { id: typedArgs.projectId },
         description: typedArgs.description
       };
-      const response = await api.buildTypes.createBuildType(void 0, buildType, {
+      const response = await adapter.modules.buildTypes.createBuildType(void 0, buildType, {
         headers: { "Content-Type": "application/json", Accept: "application/json" }
       });
       return json({ success: true, action: "create_build_config", id: response.data.id });
@@ -38770,15 +38817,15 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      const source = await api.getBuildType(typedArgs.sourceBuildTypeId);
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      const source = await adapter.getBuildType(typedArgs.sourceBuildTypeId);
       const buildType = {
         ...source,
         name: typedArgs.name,
         id: typedArgs.id,
         project: { id: typedArgs.projectId ?? source.project?.id ?? "_Root" }
       };
-      const response = await api.buildTypes.createBuildType(void 0, buildType);
+      const response = await adapter.modules.buildTypes.createBuildType(void 0, buildType);
       return json({ success: true, action: "clone_build_config", id: response.data.id });
     },
     mode: "full"
@@ -38799,9 +38846,8 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       try {
-        const adapter = createAdapterFromTeamCityAPI(api);
         const manager = new BuildConfigurationUpdateManager(adapter);
         const current = await manager.retrieveConfiguration(typedArgs.buildTypeId);
         if (current) {
@@ -38816,17 +38862,21 @@ var FULL_MODE_TOOLS = [
           }
         } else {
           if (typedArgs.name != null && typedArgs.name !== "") {
-            await api.buildTypes.setBuildTypeField(typedArgs.buildTypeId, "name", typedArgs.name);
+            await adapter.modules.buildTypes.setBuildTypeField(
+              typedArgs.buildTypeId,
+              "name",
+              typedArgs.name
+            );
           }
           if (typedArgs.description !== void 0) {
-            await api.buildTypes.setBuildTypeField(
+            await adapter.modules.buildTypes.setBuildTypeField(
               typedArgs.buildTypeId,
               "description",
               typedArgs.description
             );
           }
           if (typedArgs.artifactRules !== void 0) {
-            await api.buildTypes.setBuildTypeField(
+            await adapter.modules.buildTypes.setBuildTypeField(
               typedArgs.buildTypeId,
               "settings/artifactRules",
               typedArgs.artifactRules
@@ -38835,17 +38885,21 @@ var FULL_MODE_TOOLS = [
         }
       } catch {
         if (typedArgs.name != null && typedArgs.name !== "") {
-          await api.buildTypes.setBuildTypeField(typedArgs.buildTypeId, "name", typedArgs.name);
+          await adapter.modules.buildTypes.setBuildTypeField(
+            typedArgs.buildTypeId,
+            "name",
+            typedArgs.name
+          );
         }
         if (typedArgs.description !== void 0) {
-          await api.buildTypes.setBuildTypeField(
+          await adapter.modules.buildTypes.setBuildTypeField(
             typedArgs.buildTypeId,
             "description",
             typedArgs.description
           );
         }
         if (typedArgs.artifactRules !== void 0) {
-          await api.buildTypes.setBuildTypeField(
+          await adapter.modules.buildTypes.setBuildTypeField(
             typedArgs.buildTypeId,
             "settings/artifactRules",
             typedArgs.artifactRules
@@ -38853,7 +38907,7 @@ var FULL_MODE_TOOLS = [
         }
       }
       if (typedArgs.paused !== void 0) {
-        await api.buildTypes.setBuildTypeField(
+        await adapter.modules.buildTypes.setBuildTypeField(
           typedArgs.buildTypeId,
           "paused",
           String(typedArgs.paused)
@@ -38886,14 +38940,19 @@ var FULL_MODE_TOOLS = [
         "add_vcs_root_to_build",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const body = {
             "vcs-root": { id: typed.vcsRootId },
             "checkout-rules": typed.checkoutRules
           };
-          await api.buildTypes.addVcsRootToBuildType(typed.buildTypeId, void 0, body, {
-            headers: { "Content-Type": "application/json", Accept: "application/json" }
-          });
+          await adapter.modules.buildTypes.addVcsRootToBuildType(
+            typed.buildTypeId,
+            void 0,
+            body,
+            {
+              headers: { "Content-Type": "application/json", Accept: "application/json" }
+            }
+          );
           return json({
             success: true,
             action: "add_vcs_root_to_build",
@@ -38921,12 +38980,12 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       const parameter = {
         name: typedArgs.name,
         value: typedArgs.value
       };
-      await api.buildTypes.createBuildParameterOfBuildType(
+      await adapter.modules.buildTypes.createBuildParameterOfBuildType(
         typedArgs.buildTypeId,
         void 0,
         parameter,
@@ -38955,8 +39014,8 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      await api.buildTypes.updateBuildParameterOfBuildType(
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      await adapter.modules.buildTypes.updateBuildParameterOfBuildType(
         typedArgs.name,
         typedArgs.buildTypeId,
         void 0,
@@ -38988,8 +39047,11 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      await api.buildTypes.deleteBuildParameterOfBuildType_2(typedArgs.name, typedArgs.buildTypeId);
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      await adapter.modules.buildTypes.deleteBuildParameterOfBuildType_2(
+        typedArgs.name,
+        typedArgs.buildTypeId
+      );
       return json({
         success: true,
         action: "delete_parameter",
@@ -39017,7 +39079,7 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       const vcsRoot = {
         name: typedArgs.name,
         id: typedArgs.id,
@@ -39030,7 +39092,7 @@ var FULL_MODE_TOOLS = [
           ]
         }
       };
-      const response = await api.vcsRoots.addVcsRoot(void 0, vcsRoot, {
+      const response = await adapter.modules.vcsRoots.addVcsRoot(void 0, vcsRoot, {
         headers: { "Content-Type": "application/json", Accept: "application/json" }
       });
       return json({ success: true, action: "create_vcs_root", id: response.data.id });
@@ -39051,8 +39113,8 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      await api.agents.setAuthorizedInfo(
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      await adapter.modules.agents.setAuthorizedInfo(
         typedArgs.agentId,
         void 0,
         { status: Boolean(typedArgs.authorize) },
@@ -39080,8 +39142,8 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
-      await api.agents.setAgentPool(typedArgs.agentId, void 0, {
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+      await adapter.modules.agents.setAgentPool(typedArgs.agentId, void 0, {
         id: parseInt(typedArgs.poolId)
       });
       return json({
@@ -39115,7 +39177,7 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       switch (typedArgs.action) {
         case "add": {
           const stepProps = Object.fromEntries(
@@ -39131,9 +39193,14 @@ var FULL_MODE_TOOLS = [
               property: Object.entries(stepProps).map(([k, v]) => ({ name: k, value: v }))
             }
           };
-          await api.buildTypes.addBuildStepToBuildType(typedArgs.buildTypeId, void 0, step, {
-            headers: { "Content-Type": "application/json", Accept: "application/json" }
-          });
+          await adapter.modules.buildTypes.addBuildStepToBuildType(
+            typedArgs.buildTypeId,
+            void 0,
+            step,
+            {
+              headers: { "Content-Type": "application/json", Accept: "application/json" }
+            }
+          );
           return json({
             success: true,
             action: "add_build_step",
@@ -39150,7 +39217,7 @@ var FULL_MODE_TOOLS = [
           }
           const props = Object.entries(typedArgs.properties ?? {});
           for (const [k, v] of props) {
-            await api.buildTypes.setBuildStepParameter(
+            await adapter.modules.buildTypes.setBuildStepParameter(
               typedArgs.buildTypeId,
               typedArgs.stepId,
               k,
@@ -39173,7 +39240,7 @@ var FULL_MODE_TOOLS = [
               error: "Step ID is required for delete action"
             });
           }
-          await api.buildTypes.deleteBuildStep(typedArgs.buildTypeId, typedArgs.stepId);
+          await adapter.modules.buildTypes.deleteBuildStep(typedArgs.buildTypeId, typedArgs.stepId);
           return json({
             success: true,
             action: "delete_build_step",
@@ -39203,7 +39270,7 @@ var FULL_MODE_TOOLS = [
     },
     handler: async (args) => {
       const typedArgs = args;
-      const api = TeamCityAPI.getInstance();
+      const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
       switch (typedArgs.action) {
         case "add": {
           const trigger = {
@@ -39215,9 +39282,14 @@ var FULL_MODE_TOOLS = [
               }))
             }
           };
-          await api.buildTypes.addTriggerToBuildType(typedArgs.buildTypeId, void 0, trigger, {
-            headers: { "Content-Type": "application/json", Accept: "application/json" }
-          });
+          await adapter.modules.buildTypes.addTriggerToBuildType(
+            typedArgs.buildTypeId,
+            void 0,
+            trigger,
+            {
+              headers: { "Content-Type": "application/json", Accept: "application/json" }
+            }
+          );
           return json({
             success: true,
             action: "add_build_trigger",
@@ -39232,7 +39304,10 @@ var FULL_MODE_TOOLS = [
               error: "Trigger ID is required for delete action"
             });
           }
-          await api.buildTypes.deleteTrigger(typedArgs.buildTypeId, typedArgs.triggerId);
+          await adapter.modules.buildTypes.deleteTrigger(
+            typedArgs.buildTypeId,
+            typedArgs.triggerId
+          );
           return json({
             success: true,
             action: "delete_build_trigger",
@@ -39272,21 +39347,21 @@ var FULL_MODE_TOOLS = [
         "set_build_configs_paused",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           let updated = 0;
           for (const id of typed.buildTypeIds) {
-            await api.buildTypes.setBuildTypeField(id, "paused", String(typed.paused));
+            await adapter.modules.buildTypes.setBuildTypeField(id, "paused", String(typed.paused));
             updated += 1;
           }
           let canceled = 0;
           if (typed.cancelQueued) {
-            const queue = await api.buildQueue.getAllQueuedBuilds();
+            const queue = await adapter.modules.buildQueue.getAllQueuedBuilds();
             const builds = queue.data?.build ?? [];
             const ids = new Set(typed.buildTypeIds);
             const toCancel = builds.filter((b) => b.buildTypeId && ids.has(b.buildTypeId));
             for (const b of toCancel) {
               if (b.id == null) continue;
-              await api.buildQueue.deleteQueuedBuild(String(b.id));
+              await adapter.modules.buildQueue.deleteQueuedBuild(String(b.id));
               canceled += 1;
             }
           }
@@ -39352,7 +39427,7 @@ var FULL_MODE_TOOLS = [
         "mute_tests",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           let scope;
           if (typed.buildTypeId) {
             scope = { buildType: { id: typed.buildTypeId } };
@@ -39375,7 +39450,7 @@ var FULL_MODE_TOOLS = [
               }
             ]
           };
-          const response = await api.mutes.muteMultipleTests(typed.fields, payload, {
+          const response = await adapter.modules.mutes.muteMultipleTests(typed.fields, payload, {
             headers: {
               "Content-Type": "application/json",
               Accept: "application/json"
@@ -39410,8 +39485,8 @@ var FULL_MODE_TOOLS = [
         "move_queued_build_to_top",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          await api.buildQueue.setQueuedBuildsOrder(void 0, {
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          await adapter.modules.buildQueue.setQueuedBuildsOrder(void 0, {
             build: [{ id: parseInt(typed.buildId) }]
           });
           return json({
@@ -39439,8 +39514,8 @@ var FULL_MODE_TOOLS = [
         "reorder_queued_builds",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          await api.buildQueue.setQueuedBuildsOrder(void 0, {
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          await adapter.modules.buildQueue.setQueuedBuildsOrder(void 0, {
             build: typed.buildIds.map((id) => ({ id: parseInt(id) }))
           });
           return json({
@@ -39468,14 +39543,14 @@ var FULL_MODE_TOOLS = [
         "cancel_queued_builds_for_build_type",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const queue = await api.buildQueue.getAllQueuedBuilds();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const queue = await adapter.modules.buildQueue.getAllQueuedBuilds();
           const builds = queue.data?.build ?? [];
           const toCancel = builds.filter((b) => b.buildTypeId === typed.buildTypeId);
           let canceled = 0;
           for (const b of toCancel) {
             if (b.id == null) continue;
-            await api.buildQueue.deleteQueuedBuild(String(b.id));
+            await adapter.modules.buildQueue.deleteQueuedBuild(String(b.id));
             canceled += 1;
           }
           return json({
@@ -39504,13 +39579,13 @@ var FULL_MODE_TOOLS = [
         "cancel_queued_builds_by_locator",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const queue = await api.buildQueue.getAllQueuedBuilds(typed.locator);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const queue = await adapter.modules.buildQueue.getAllQueuedBuilds(typed.locator);
           const builds = queue.data?.build ?? [];
           let canceled = 0;
           for (const b of builds) {
             if (b.id == null) continue;
-            await api.buildQueue.deleteQueuedBuild(String(b.id));
+            await adapter.modules.buildQueue.deleteQueuedBuild(String(b.id));
             canceled += 1;
           }
           return json({
@@ -39553,8 +39628,10 @@ var FULL_MODE_TOOLS = [
         "pause_queue_for_pool",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const agentsResp = await api.agents.getAllAgents(`agentPool:(id:${typed.poolId})`);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const agentsResp = await adapter.modules.agents.getAllAgents(
+            `agentPool:(id:${typed.poolId})`
+          );
           const agents = agentsResp.data?.agent ?? [];
           const body = {
             status: false
@@ -39565,21 +39642,21 @@ var FULL_MODE_TOOLS = [
           for (const a of agents) {
             const id = a.id;
             if (!id) continue;
-            await api.agents.setEnabledInfo(id, void 0, body, {
+            await adapter.modules.agents.setEnabledInfo(id, void 0, body, {
               headers: { "Content-Type": "application/json", Accept: "application/json" }
             });
             disabled += 1;
           }
           let canceled = 0;
           if (typed.cancelQueuedForBuildTypeId) {
-            const queue = await api.buildQueue.getAllQueuedBuilds();
+            const queue = await adapter.modules.buildQueue.getAllQueuedBuilds();
             const builds = queue.data?.build ?? [];
             const toCancel = builds.filter(
               (b) => b.buildTypeId === typed.cancelQueuedForBuildTypeId
             );
             for (const b of toCancel) {
               if (b.id == null) continue;
-              await api.buildQueue.deleteQueuedBuild(String(b.id));
+              await adapter.modules.buildQueue.deleteQueuedBuild(String(b.id));
               canceled += 1;
             }
           }
@@ -39610,14 +39687,16 @@ var FULL_MODE_TOOLS = [
         "resume_queue_for_pool",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
-          const agentsResp = await api.agents.getAllAgents(`agentPool:(id:${typed.poolId})`);
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
+          const agentsResp = await adapter.modules.agents.getAllAgents(
+            `agentPool:(id:${typed.poolId})`
+          );
           const agents = agentsResp.data?.agent ?? [];
           let enabled = 0;
           for (const a of agents) {
             const id = a.id;
             if (!id) continue;
-            await api.agents.setEnabledInfo(
+            await adapter.modules.agents.setEnabledInfo(
               id,
               void 0,
               { status: true },
@@ -39665,11 +39744,11 @@ var FULL_MODE_TOOLS = [
         "set_agent_enabled",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const body = { status: typed.enabled };
           if (typed.comment) body.comment = { text: typed.comment };
           if (typed.until) body.statusSwitchTime = typed.until;
-          const resp = await api.agents.setEnabledInfo(typed.agentId, void 0, body, {
+          const resp = await adapter.modules.agents.setEnabledInfo(typed.agentId, void 0, body, {
             headers: { "Content-Type": "application/json", Accept: "application/json" }
           });
           return json({
@@ -39724,13 +39803,13 @@ var FULL_MODE_TOOLS = [
         "bulk_set_agents_enabled",
         schema,
         async (typed) => {
-          const api = TeamCityAPI.getInstance();
+          const adapter = createAdapterFromTeamCityAPI(TeamCityAPI.getInstance());
           const filters = [];
           if (typed.poolId) filters.push(`agentPool:(id:${typed.poolId})`);
           if (typed.locator) filters.push(typed.locator);
           if (typed.includeDisabled === false) filters.push("enabled:true");
           const locator = filters.join(",");
-          const list = await api.agents.getAllAgents(locator);
+          const list = await adapter.modules.agents.getAllAgents(locator);
           const agents = list.data?.agent ?? [];
           const body = { status: typed.enabled };
           if (typed.comment) body.comment = { text: typed.comment };
@@ -39740,7 +39819,7 @@ var FULL_MODE_TOOLS = [
             const id = String(a.id ?? "");
             if (!id) continue;
             try {
-              await api.agents.setEnabledInfo(id, void 0, body, {
+              await adapter.modules.agents.setEnabledInfo(id, void 0, body, {
                 headers: {
                   "Content-Type": "application/json",
                   Accept: "application/json"