n8n 2.43.4 → 2.44.0

package/dist/modules/instance-reporting.ee/instance-reporting.service.d.ts

@@ -4,8 +4,8 @@ import { EventService } from '@n8n/backend-services';
 import { LicenseMetricsRepository } from '@n8n/db';
 import { InstanceSettings } from 'n8n-core';
 import { License } from '../../license';
-import { InsightsConfig } from '../../modules/insights/insights.config';
-import { InsightsService } from '../../modules/insights/insights.service';
+import { InsightsService } from '@n8n/backend-module-insights';
+import { InsightsConfig } from '@n8n/backend-module-insights/config';
 import type { InstanceMonitoringReport } from './database/entities/instance-monitoring-report';
 import { InstanceMonitoringReportRepository } from './database/repositories/instance-monitoring-report.repository';
 import { InstanceReportingSettingsService } from './instance-reporting-settings.service';
@@ -37,4 +37,5 @@ export declare class InstanceReportingService {
     private missedDays;
     private firstOwedDay;
     private collectDataPoints;
+    private readDays;
 }

package/dist/modules/instance-reporting.ee/instance-reporting.service.js

@@ -21,8 +21,8 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const constants_2 = require("../../constants");
 const license_1 = require("../../license");
-const insights_config_1 = require("../../modules/insights/insights.config");
-const insights_service_1 = require("../../modules/insights/insights.service");
+const backend_module_insights_1 = require("@n8n/backend-module-insights");
+const config_1 = require("@n8n/backend-module-insights/config");
 const instance_monitoring_report_repository_1 = require("./database/repositories/instance-monitoring-report.repository");
 const instance_reporting_settings_service_1 = require("./instance-reporting-settings.service");
 const instance_reporting_config_1 = require("./instance-reporting.config");
@@ -221,28 +221,36 @@ let InstanceReportingService = class InstanceReportingService {
         return maxDay(dayAfterCovered ?? dataStart ?? yesterday, dataStart);
     }
     async collectDataPoints(days) {
-        const [totals, { productionRootExecutions }] = await Promise.all([
-            this.insightsService.getDailyExecutionTotals({
-                startDate: new Date(`${days[0]}T00:00:00.000Z`),
-                endDate: new Date(`${days.at(-1)}T00:00:00.000Z`),
-            }),
+        const firstBillableDay = await this.insightsService.getFirstBillableDay();
+        const totalDays = days.filter((day) => firstBillableDay === null || day <= firstBillableDay);
+        const billableDays = days.slice(totalDays.length);
+        const [totalsByDay, billableByDay, { productionRootExecutions }] = await Promise.all([
+            this.readDays(totalDays, async (range) => await this.insightsService.getDailyExecutionTotals(range)),
+            this.readDays(billableDays, async (range) => await this.insightsService.getDailyBillableExecutions(range)),
             this.licenseMetricsRepository.getLicenseRenewalMetrics(),
         ]);
+        const executionsByDay = new Map([...totalsByDay, ...billableByDay]);
         return [
             { kind: 'cumulative', name: 'billableExecutions', value: productionRootExecutions },
             ...days.map((date) => ({
                 kind: 'daily',
                 name: 'billableExecutions',
-                value: totals.get(date) ?? 0,
+                value: executionsByDay.get(date) ?? 0,
                 date,
             })),
         ];
     }
+    async readDays(days, read) {
+        if (days.length === 0) {
+            return new Map();
+        }
+        return await read(utcDayRange(days));
+    }
 };
 exports.InstanceReportingService = InstanceReportingService;
 exports.InstanceReportingService = InstanceReportingService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [instance_reporting_config_1.InstanceReportingConfig, instance_monitoring_report_repository_1.InstanceMonitoringReportRepository, instance_reporting_settings_service_1.InstanceReportingSettingsService, insights_service_1.InsightsService, insights_config_1.InsightsConfig, n8n_core_1.InstanceSettings, db_1.LicenseMetricsRepository, license_1.License, backend_common_1.Logger, backend_services_1.EventService, backend_network_1.OutboundHttp])
+    __metadata("design:paramtypes", [instance_reporting_config_1.InstanceReportingConfig, instance_monitoring_report_repository_1.InstanceMonitoringReportRepository, instance_reporting_settings_service_1.InstanceReportingSettingsService, backend_module_insights_1.InsightsService, config_1.InsightsConfig, n8n_core_1.InstanceSettings, db_1.LicenseMetricsRepository, license_1.License, backend_common_1.Logger, backend_services_1.EventService, backend_network_1.OutboundHttp])
 ], InstanceReportingService);
 function slotOn(reportTime, day) {
     const [hour, minute] = reportTime.split(':').map(Number);
@@ -268,6 +276,12 @@ function utcDayBefore(instant, count) {
 function addUtcDays(day, count) {
     return utcDayBefore(new Date(`${day}T00:00:00.000Z`), -count);
 }
+function utcDayRange(days) {
+    return {
+        startDate: new Date(`${days[0]}T00:00:00.000Z`),
+        endDate: new Date(`${days.at(-1)}T00:00:00.000Z`),
+    };
+}
 function maxDay(day, other) {
     return other && other > day ? other : day;
 }

package/dist/modules/instance-reporting.ee/instance-reporting.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-reporting.service.js","sourceRoot":"","sources":["../../../src/modules/instance-reporting.ee/instance-reporting.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-reporting.service.js","sourceRoot":"","sources":["../../../src/modules/instance-reporting.ee/instance-reporting.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/tools/agents/agent-reference.js

@@ -55,9 +55,10 @@ a Chat Trigger plus an AI Agent node for a requested n8n Agent.
 
 call_agent verifies the draft Agent's behavior through built-in Preview chat, not configured channel
 triggers, platform context, message delivery, or replies. Real tools and credentials are used, so
-side effects are possible. If the test exposes errors, report them and ask whether to fix them rather
-than mutating the Agent automatically. Every approval decision must come from the human; resume each
-returned approval individually.
+side effects are possible. Omit sessionId to start a new test conversation. To continue one, pass the
+exact sessionId from an earlier call_agent result; never make one up. If the test exposes errors,
+report them and ask whether to fix them rather than mutating the Agent automatically. Every approval
+decision must come from the human; resume each returned approval individually.
 
 ## Publication approval
 

package/dist/modules/mcp/tools/agents/agent-reference.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-reference.js","sourceRoot":"","sources":["../../../../../src/modules/mcp/tools/agents/agent-reference.ts"],"names":[],"mappings":";;;AAAA,8CAA+F;AAC/F,+CAAkE;AAClE,2DAAqD;AAExC,QAAA,2BAA2B,GAAG,wBAAwB,CAAC;AAIpE,MAAM,6BAA6B,GAAG,qCAAyB,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;AAEhF,QAAA,wBAAwB,GAAG,IAAA,oCAAe,EAAC,6BAA6B,EAAE;IACtF,IAAI,EAAE,iBAAiB;CACvB,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAwHI,8CAAkC;KACpE,iDAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4EtC,CAAC;AAEW,QAAA,uBAAuB,GAAG,GAAG,QAAA,mBAAmB;;;;;EAK3D,IAAI,CAAC,SAAS,CAAC,QAAA,wBAAwB,EAAE,IAAI,EAAE,CAAC,CAAC;;CAElD,CAAC"}
+{"version":3,"file":"agent-reference.js","sourceRoot":"","sources":["../../../../../src/modules/mcp/tools/agents/agent-reference.ts"],"names":[],"mappings":";;;AAAA,8CAA+F;AAC/F,+CAAkE;AAClE,2DAAqD;AAExC,QAAA,2BAA2B,GAAG,wBAAwB,CAAC;AAIpE,MAAM,6BAA6B,GAAG,qCAAyB,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;AAEhF,QAAA,wBAAwB,GAAG,IAAA,oCAAe,EAAC,6BAA6B,EAAE;IACtF,IAAI,EAAE,iBAAiB;CACvB,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAyHI,8CAAkC;KACpE,iDAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4EtC,CAAC;AAEW,QAAA,uBAAuB,GAAG,GAAG,QAAA,mBAAmB;;;;;EAK3D,IAAI,CAAC,SAAS,CAAC,QAAA,wBAAwB,EAAE,IAAI,EAAE,CAAC,CAAC;;CAElD,CAAC"}

package/dist/modules/mcp/tools/agents/agent-slack-setup.d.ts

@@ -49,9 +49,9 @@ export declare class McpAgentSlackSetup {
         status?: undefined;
         managerCredentials?: undefined;
     } | {
-        error?: undefined;
         slackApp?: undefined;
         code?: undefined;
+        error?: undefined;
         agentUrl?: undefined;
         ok: boolean;
         status: string;

package/dist/modules/mcp/tools/agents/agent-tools.service.d.ts

@@ -7,6 +7,7 @@ import { AgentIntegrationManagementService } from '../../../../modules/agents/ag
 import { AgentIntegrationPersistenceService } from '../../../../modules/agents/agent-integration-persistence.service';
 import { AgentModelCatalogService } from '../../../../modules/agents/agent-model-catalog.service';
 import { AgentPublishService } from '../../../../modules/agents/agent-publish.service';
+import { AgentSkillRefsService } from '../../../../modules/agents/agent-skill-refs.service';
 import { AgentSkillsService } from '../../../../modules/agents/agent-skills.service';
 import { AgentTaskService } from '../../../../modules/agents/agent-task.service';
 import { AgentTestRunService } from '../../../../modules/agents/agent-test-run.service';
@@ -44,7 +45,8 @@ export declare class McpAgentToolsService {
     private readonly urlService;
     private readonly projectScopeService;
     private readonly slackSetup;
-    constructor(telemetry: Telemetry, credentialsService: CredentialsService, agentsService: AgentsService, agentConfigService: AgentConfigService, agentValidationService: AgentValidationService, agentPublishService: AgentPublishService, agentSkillsService: AgentSkillsService, agentTaskService: AgentTaskService, agentTestRunService: AgentTestRunService, agentCustomToolsService: AgentCustomToolsService, agentSecureRuntime: AgentSecureRuntime, integrationPersistenceService: AgentIntegrationPersistenceService, integrationManagementService: AgentIntegrationManagementService, agentModelCatalogService: AgentModelCatalogService, attachableWorkflowsService: AttachableWorkflowsService, mcpRegistryService: McpRegistryService, nodeTypes: NodeTypes, oauthService: OauthService, outboundHttp: OutboundHttp, urlService: UrlService, projectScopeService: ProjectScopeService, slackSetup: McpAgentSlackSetup);
+    private readonly agentSkillRefs;
+    constructor(telemetry: Telemetry, credentialsService: CredentialsService, agentsService: AgentsService, agentConfigService: AgentConfigService, agentValidationService: AgentValidationService, agentPublishService: AgentPublishService, agentSkillsService: AgentSkillsService, agentTaskService: AgentTaskService, agentTestRunService: AgentTestRunService, agentCustomToolsService: AgentCustomToolsService, agentSecureRuntime: AgentSecureRuntime, integrationPersistenceService: AgentIntegrationPersistenceService, integrationManagementService: AgentIntegrationManagementService, agentModelCatalogService: AgentModelCatalogService, attachableWorkflowsService: AttachableWorkflowsService, mcpRegistryService: McpRegistryService, nodeTypes: NodeTypes, oauthService: OauthService, outboundHttp: OutboundHttp, urlService: UrlService, projectScopeService: ProjectScopeService, slackSetup: McpAgentSlackSetup, agentSkillRefs: AgentSkillRefsService);
     registerTools(registerTool: RegisterToolFn, registerResource: RegisterResourceFn, user: User, allowedToolNames?: Set<string>): void;
     private searchAgentsTool;
     private getAgentTool;

package/dist/modules/mcp/tools/agents/agent-tools.service.js

@@ -26,6 +26,7 @@ const agent_integration_management_service_1 = require("../../../../modules/agen
 const agent_integration_persistence_service_1 = require("../../../../modules/agents/agent-integration-persistence.service");
 const agent_model_catalog_service_1 = require("../../../../modules/agents/agent-model-catalog.service");
 const agent_publish_service_1 = require("../../../../modules/agents/agent-publish.service");
+const agent_skill_refs_service_1 = require("../../../../modules/agents/agent-skill-refs.service");
 const agent_skills_service_1 = require("../../../../modules/agents/agent-skills.service");
 const agent_task_service_1 = require("../../../../modules/agents/agent-task.service");
 const agent_test_run_service_1 = require("../../../../modules/agents/agent-test-run.service");
@@ -276,7 +277,11 @@ const callAgentRequestSchema = zod_1.z.discriminatedUnion('type', [
         .object({
         type: zod_1.z.literal('message'),
         message: zod_1.z.string().trim().min(1),
-        sessionId: zod_1.z.string().trim().min(1).optional(),
+        sessionId: zod_1.z
+            .string()
+            .trim()
+            .optional()
+            .describe('Exact sessionId from an earlier call_agent result. Omit it to start a new conversation. An unknown sessionId starts a new conversation and the result has a sessionNote.'),
     })
         .strict(),
     zod_1.z
@@ -305,7 +310,7 @@ function toolResult(data, isError = false) {
     };
 }
 let McpAgentToolsService = class McpAgentToolsService {
-    constructor(telemetry, credentialsService, agentsService, agentConfigService, agentValidationService, agentPublishService, agentSkillsService, agentTaskService, agentTestRunService, agentCustomToolsService, agentSecureRuntime, integrationPersistenceService, integrationManagementService, agentModelCatalogService, attachableWorkflowsService, mcpRegistryService, nodeTypes, oauthService, outboundHttp, urlService, projectScopeService, slackSetup) {
+    constructor(telemetry, credentialsService, agentsService, agentConfigService, agentValidationService, agentPublishService, agentSkillsService, agentTaskService, agentTestRunService, agentCustomToolsService, agentSecureRuntime, integrationPersistenceService, integrationManagementService, agentModelCatalogService, attachableWorkflowsService, mcpRegistryService, nodeTypes, oauthService, outboundHttp, urlService, projectScopeService, slackSetup, agentSkillRefs) {
         this.telemetry = telemetry;
         this.credentialsService = credentialsService;
         this.agentsService = agentsService;
@@ -328,6 +333,7 @@ let McpAgentToolsService = class McpAgentToolsService {
         this.urlService = urlService;
         this.projectScopeService = projectScopeService;
         this.slackSetup = slackSetup;
+        this.agentSkillRefs = agentSkillRefs;
     }
     registerTools(registerTool, registerResource, user, allowedToolNames) {
         const isCallAgentAvailable = allowedToolNames?.has(mcp_constants_1.MCP_CALL_AGENT_TOOL_NAME) ?? true;
@@ -458,6 +464,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                     await this.assertAccessibleCredentials(initialConfig, user, projectId);
                 }
                 const agent = await this.agentsService.create(projectId, name, {
+                    actor: { kind: 'user', user },
                     availableInMCP: true,
                 });
                 let configHash;
@@ -465,7 +472,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                 try {
                     if (initialConfig) {
                         const result = await this.agentConfigService.updateConfig(agent.id, projectId, initialConfig, user, {
-                            baseConfigHash: (0, agent_config_hash_1.getAgentConfigHash)(this.configFromEntity(agent)),
+                            baseConfigHash: (0, agent_config_hash_1.getAgentConfigHash)(await this.configFromEntity(agent)),
                             modifiedBy: 'mcp',
                         });
                         configHash = (0, agent_config_hash_1.getAgentConfigHash)(result.config);
@@ -513,7 +520,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                 const agent = await this.resolveAgent(user, input.agentId);
                 const projectId = agent.projectId;
                 await this.assertScope(user, projectId, 'agent:update');
-                const config = this.configFromEntity(agent);
+                const config = await this.configFromEntity(agent);
                 const configHash = (0, agent_config_hash_1.getAgentConfigHash)(config);
                 if (configHash !== input.baseConfigHash) {
                     return {
@@ -677,7 +684,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                     agentId,
                     versionId: agent.versionId,
                     activeVersionId: agent.activeVersionId,
-                    configHash: (0, agent_config_hash_1.getAgentConfigHash)(this.configFromEntity(agent)),
+                    configHash: (0, agent_config_hash_1.getAgentConfigHash)(await this.configFromEntity(agent)),
                     url: this.getAgentUrl(projectId, agentId),
                 };
             }),
@@ -844,7 +851,7 @@ let McpAgentToolsService = class McpAgentToolsService {
     }
     async getAgentSnapshot(user, agent) {
         const { id: agentId, projectId } = agent;
-        const config = this.configFromEntity(agent);
+        const config = await this.configFromEntity(agent);
         const credentialProvider = this.credentialProvider(user, projectId);
         const [runnable, skills, tasks] = await Promise.all([
             this.agentValidationService.validateAgentIsRunnable(agentId, projectId, credentialProvider),
@@ -879,10 +886,11 @@ let McpAgentToolsService = class McpAgentToolsService {
         };
     }
     async getAgentVersionSnapshot(projectId, agentId, versionId) {
-        const { agent, version, tasks } = await this.agentPublishService.getVersion(agentId, projectId, versionId);
-        if (!version.schema)
+        const { agent, version, definition } = await this.agentPublishService.getVersion(agentId, projectId, versionId);
+        if (!definition.schema)
             throw new n8n_workflow_1.UserError(`Version "${versionId}" has no JSON config.`);
-        const { integrations: _integrations, ...editableConfig } = version.schema;
+        const { integrations: _integrations, ...editableConfig } = definition.schema;
+        const enabledTasks = new Map((editableConfig.tasks ?? []).map((ref) => [ref.id, ref.enabled]));
         return {
             agent: {
                 id: agent.id,
@@ -899,16 +907,16 @@ let McpAgentToolsService = class McpAgentToolsService {
                 isActive: version.versionId === agent.activeVersionId,
             },
             config: editableConfig,
-            skills: version.skills ?? {},
-            tasks: tasks.map((task) => ({
-                id: task.taskId,
+            skills: definition.skills,
+            tasks: [...definition.tasks].map(([id, task]) => ({
+                id,
                 name: task.name,
                 objective: task.objective,
                 cronExpression: task.cronExpression,
                 timezone: task.timezone,
-                enabled: task.enabled,
+                enabled: enabledTasks.get(id) ?? false,
             })),
-            customTools: Object.entries(version.tools ?? {}).map(([id, tool]) => ({
+            customTools: Object.entries(definition.tools).map(([id, tool]) => ({
                 id,
                 descriptor: tool.descriptor,
             })),
@@ -917,8 +925,8 @@ let McpAgentToolsService = class McpAgentToolsService {
     async fetchConfigHash(projectId, agentId) {
         return (0, agent_config_hash_1.getAgentConfigHash)(await this.agentConfigService.getConfig(agentId, projectId));
     }
-    configFromEntity(agent) {
-        const config = (0, agent_config_composition_1.composeJsonConfig)(agent);
+    async configFromEntity(agent) {
+        const config = (0, agent_config_composition_1.composeJsonConfig)(agent, await this.agentSkillRefs.refsForDraft(agent, {}));
         if (!config)
             throw new n8n_workflow_1.UserError('Agent has no JSON config yet.');
         return config;
@@ -931,17 +939,27 @@ let McpAgentToolsService = class McpAgentToolsService {
         const previewUrl = `${this.getAgentUrl(projectId, agentId)}?openPreview=true`;
         try {
             let result;
+            let note = {};
             if (request.type === 'message') {
-                result = await this.agentTestRunService.executeDraftRun({
+                const execute = async (sessionId) => await this.agentTestRunService.executeDraftRun({
                     agentId,
                     projectId,
                     message: request.message,
-                    sessionId: request.sessionId,
+                    sessionId,
                     credentialProvider: this.credentialProvider(user, projectId),
                     user,
                     source: 'mcp',
                     abortSignal,
                 });
+                const sessionId = request.sessionId?.trim() || undefined;
+                result = await execute(sessionId);
+                if (result.status === 'session_not_found' && sessionId !== undefined) {
+                    result = await execute(undefined);
+                    note = {
+                        sessionNote: 'The sessionId you passed was not found, so this test started a new conversation. ' +
+                            'To continue this conversation, pass the sessionId from this result.',
+                    };
+                }
             }
             else {
                 result = await this.agentTestRunService.resumeDraftApproval({
@@ -959,7 +977,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                     ok: false,
                     status: 'error',
                     code: 'session_not_found',
-                    message: 'Session not found.',
+                    message: 'This test session is no longer available. Send a message request without sessionId to start a new test.',
                 };
             }
             if (result.status === 'agent_misconfigured') {
@@ -972,7 +990,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                 };
             }
             if (result.status === 'completed')
-                return { ok: true, ...result };
+                return { ok: true, ...result, ...note };
             const approvals = (0, agent_test_run_service_1.collectStandardApprovals)(result);
             if (approvals) {
                 return {
@@ -982,6 +1000,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                     sessionId: result.sessionId,
                     ...(result.executionId ? { executionId: result.executionId } : {}),
                     approvals,
+                    ...note,
                 };
             }
             const canOpenPreview = await (0, check_access_1.userHasScopes)(user, ['project:read', 'agent:read'], false, {
@@ -1004,6 +1023,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                     sessionId: result.sessionId,
                     previewUrl,
                     ...(previewAccessNote ? { previewAccessNote } : {}),
+                    ...note,
                 };
             }
             return {
@@ -1019,6 +1039,7 @@ let McpAgentToolsService = class McpAgentToolsService {
                 })),
                 previewUrl,
                 ...(previewAccessNote ? { previewAccessNote } : {}),
+                ...note,
             };
         }
         catch (error) {
@@ -1180,7 +1201,7 @@ let McpAgentToolsService = class McpAgentToolsService {
     }
     async validateAgent(user, agent) {
         const projectId = agent.projectId;
-        const config = this.configFromEntity(agent);
+        const config = await this.configFromEntity(agent);
         const credentialProvider = this.credentialProvider(user, projectId);
         const [schema, configuration] = await Promise.all([
             this.agentConfigService.validateConfig(config),
@@ -1268,24 +1289,32 @@ let McpAgentToolsService = class McpAgentToolsService {
             }
             await this.requireAccessibleCredential(credentialProvider, input.credential);
         }
-        const tools = await (0, mcp_client_factory_1.listMcpServerTools)({
-            name: input.name,
-            url: input.url,
-            transport: input.transport,
-            authentication: input.authentication,
-            credential: input.credential,
-            metadata: input.metadata,
-            ...(input.connectionTimeoutMs !== undefined
-                ? { connectionTimeoutMs: input.connectionTimeoutMs }
-                : {}),
-        }, {
-            credentialProvider,
-            oauthService: this.oauthService,
-            projectId: input.projectId,
-            proxyFetch: (0, ai_proxy_fetch_1.createAiMcpFetch)(this.outboundHttp),
-            resolveRegistryConnection: async (nodeTypeName) => await this.mcpRegistryService.getConnection(nodeTypeName),
-        });
-        return { ok: true, tools };
+        try {
+            const tools = await (0, mcp_client_factory_1.listMcpServerTools)({
+                name: input.name,
+                url: input.url,
+                transport: input.transport,
+                authentication: input.authentication,
+                credential: input.credential,
+                metadata: input.metadata,
+                ...(input.connectionTimeoutMs !== undefined
+                    ? { connectionTimeoutMs: input.connectionTimeoutMs }
+                    : {}),
+            }, {
+                credentialProvider,
+                oauthService: this.oauthService,
+                projectId: input.projectId,
+                proxyFetch: (0, ai_proxy_fetch_1.createAiMcpFetch)(this.outboundHttp),
+                resolveRegistryConnection: async (nodeTypeName) => await this.mcpRegistryService.getConnection(nodeTypeName),
+            });
+            return { ok: true, tools };
+        }
+        catch (error) {
+            if (error instanceof n8n_workflow_1.OperationalError) {
+                return { ok: false, error: error.message };
+            }
+            throw error;
+        }
     }
     async updateIntegration(user, input) {
         const agent = await this.resolveAgent(user, input.agentId);
@@ -1317,7 +1346,7 @@ let McpAgentToolsService = class McpAgentToolsService {
             ...(warning ? { warning } : {}),
             published: saved.activeVersionId !== null,
             activeVersionId: saved.activeVersionId,
-            configHash: (0, agent_config_hash_1.getAgentConfigHash)(this.configFromEntity(saved)),
+            configHash: (0, agent_config_hash_1.getAgentConfigHash)(await this.configFromEntity(saved)),
         };
     }
     async connectIntegration(user, input, agent) {
@@ -1397,7 +1426,7 @@ let McpAgentToolsService = class McpAgentToolsService {
             connected: published,
             published,
             activeVersionId: saved.activeVersionId,
-            configHash: (0, agent_config_hash_1.getAgentConfigHash)(this.configFromEntity(saved)),
+            configHash: (0, agent_config_hash_1.getAgentConfigHash)(await this.configFromEntity(saved)),
         };
     }
     async connectWithCredential(user, input, agent, credentialId) {
@@ -1422,7 +1451,7 @@ let McpAgentToolsService = class McpAgentToolsService {
             configured: true,
             published: saved.activeVersionId !== null,
             activeVersionId: saved.activeVersionId,
-            configHash: (0, agent_config_hash_1.getAgentConfigHash)(this.configFromEntity(saved)),
+            configHash: (0, agent_config_hash_1.getAgentConfigHash)(await this.configFromEntity(saved)),
         };
         if (saved.activeVersionId === null)
             return { ...result, connected: false };
@@ -1477,6 +1506,6 @@ let McpAgentToolsService = class McpAgentToolsService {
 exports.McpAgentToolsService = McpAgentToolsService;
 exports.McpAgentToolsService = McpAgentToolsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [telemetry_1.Telemetry, credentials_service_1.CredentialsService, agents_service_1.AgentsService, agent_config_service_1.AgentConfigService, agent_validation_service_1.AgentValidationService, agent_publish_service_1.AgentPublishService, agent_skills_service_1.AgentSkillsService, agent_task_service_1.AgentTaskService, agent_test_run_service_1.AgentTestRunService, agent_custom_tools_service_1.AgentCustomToolsService, agent_secure_runtime_1.AgentSecureRuntime, agent_integration_persistence_service_1.AgentIntegrationPersistenceService, agent_integration_management_service_1.AgentIntegrationManagementService, agent_model_catalog_service_1.AgentModelCatalogService, attachable_workflows_service_1.AttachableWorkflowsService, mcp_registry_service_1.McpRegistryService, node_types_1.NodeTypes, oauth_service_1.OauthService, backend_network_1.OutboundHttp, backend_services_1.UrlService, backend_services_1.ProjectScopeService, agent_slack_setup_1.McpAgentSlackSetup])
+    __metadata("design:paramtypes", [telemetry_1.Telemetry, credentials_service_1.CredentialsService, agents_service_1.AgentsService, agent_config_service_1.AgentConfigService, agent_validation_service_1.AgentValidationService, agent_publish_service_1.AgentPublishService, agent_skills_service_1.AgentSkillsService, agent_task_service_1.AgentTaskService, agent_test_run_service_1.AgentTestRunService, agent_custom_tools_service_1.AgentCustomToolsService, agent_secure_runtime_1.AgentSecureRuntime, agent_integration_persistence_service_1.AgentIntegrationPersistenceService, agent_integration_management_service_1.AgentIntegrationManagementService, agent_model_catalog_service_1.AgentModelCatalogService, attachable_workflows_service_1.AttachableWorkflowsService, mcp_registry_service_1.McpRegistryService, node_types_1.NodeTypes, oauth_service_1.OauthService, backend_network_1.OutboundHttp, backend_services_1.UrlService, backend_services_1.ProjectScopeService, agent_slack_setup_1.McpAgentSlackSetup, agent_skill_refs_service_1.AgentSkillRefsService])
 ], McpAgentToolsService);
 //# sourceMappingURL=agent-tools.service.js.map