n8n 2.35.2 → 2.36.0

package/dist/modules/agents/agent-integration-management.service.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentIntegrationManagementService = void 0;
 const api_types_1 = require("@n8n/api-types");
+const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const credentials_service_1 = require("../../credentials/credentials.service");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
@@ -18,25 +19,191 @@ const not_found_error_1 = require("../../errors/response-errors/not-found.error"
 const agent_integration_persistence_service_1 = require("./agent-integration-persistence.service");
 const agent_chat_integration_1 = require("./integrations/agent-chat-integration");
 const chat_integration_service_1 = require("./integrations/chat-integration.service");
+const agent_repository_1 = require("./repositories/agent.repository");
 let AgentIntegrationManagementService = class AgentIntegrationManagementService {
-    constructor(persistenceService, credentialsService, chatService, registry) {
+    constructor(persistenceService, credentialsService, chatService, registry, logger, agentRepository) {
         this.persistenceService = persistenceService;
         this.credentialsService = credentialsService;
         this.chatService = chatService;
         this.registry = registry;
+        this.logger = logger;
+        this.agentRepository = agentRepository;
+        this.mutations = new Map();
     }
-    async validateConfig(input) {
-        const parsed = await api_types_1.AgentIntegrationSchema.safeParseAsync(input);
+    async validateConfig(integration) {
+        const parsed = await api_types_1.AgentIntegrationSchema.safeParseAsync(integration);
         if (!parsed.success)
             throw new bad_request_error_1.BadRequestError(parsed.error.message);
-        const integration = parsed.data;
-        this.registry.require(integration.type).validateConfig?.(integration);
-        return integration;
+        const result = parsed.data;
+        this.registry.require(result.type).validateConfig?.(result);
+        return result;
     }
     async connect(options) {
         const integration = await this.validateConfig(options.integration);
+        await this.assertUsableCredential(options.agent, options.user, integration);
+        const result = await this.applyChange({
+            agent: options.agent,
+            user: options.user,
+            add: integration,
+            ...(options.replaces ? { remove: options.replaces } : {}),
+            modifiedBy: options.modifiedBy ?? 'user',
+        });
+        return { integration, savedAgent: result.agent };
+    }
+    async disconnect(options) {
+        const result = await this.applyChange({
+            agent: options.agent,
+            user: options.user,
+            remove: { type: options.type, credentialId: options.credentialId },
+            cleanupRemovedIntegration: true,
+            deleteExternalResource: options.deleteExternalResource,
+            modifiedBy: options.modifiedBy ?? 'user',
+        });
+        return {
+            savedAgent: result.agent,
+            ...(result.warning ? { warning: result.warning } : {}),
+        };
+    }
+    async applyChange(options) {
+        return await this.serializePerAgent(options.agent.id, async () => await this.runChange(options));
+    }
+    async serializePerAgent(agentId, work) {
+        const previous = this.mutations.get(agentId) ?? Promise.resolve();
+        const run = previous.catch(() => { }).then(work);
+        this.mutations.set(agentId, run);
+        try {
+            return await run;
+        }
+        finally {
+            if (this.mutations.get(agentId) === run)
+                this.mutations.delete(agentId);
+        }
+    }
+    async runChange(options) {
+        const { agent, add } = options;
+        const remove = options.remove && add && (0, agent_integration_persistence_service_1.matchesIntegrationRef)(add, options.remove)
+            ? undefined
+            : options.remove;
+        const state = add || options.cleanupRemovedIntegration
+            ? await this.agentRepository.findIntegrationState(agent.id)
+            : null;
+        const publishedBefore = state ? state.activeVersionId !== null : agent.activeVersionId !== null;
+        const wasLive = !!add && this.chatService.getChatInstance(agent.id, add) !== undefined;
+        const persistedBefore = add && state
+            ? (state.integrations ?? []).find((entry) => (0, agent_integration_persistence_service_1.matchesIntegrationRef)(entry, add))
+            : undefined;
+        let connected;
+        try {
+            connected = add ? await this.startRuntime(agent, add, publishedBefore) : false;
+        }
+        catch (error) {
+            if (wasLive)
+                await this.restorePersistedRuntime(agent, persistedBefore);
+            throw error;
+        }
+        let result;
+        try {
+            result = await this.persistenceService.applyIntegrationDelta(agent, { add, remove }, { user: options.user, modifiedBy: options.modifiedBy });
+        }
+        catch (error) {
+            if (connected && add) {
+                if (wasLive && persistedBefore) {
+                    await this.restorePersistedRuntime(agent, persistedBefore);
+                }
+                else {
+                    await this.chatService.disconnect(agent.id, add);
+                }
+            }
+            throw error;
+        }
+        if (add && result.published !== undefined) {
+            connected = await this.reconcileRuntimeWithPublication(agent, add, connected, result.published);
+        }
+        const isPublished = result.published ?? publishedBefore;
+        let warning;
+        try {
+            warning =
+                result.removed && options.cleanupRemovedIntegration
+                    ? await this.registry.get(result.removed.type)?.onRemove?.({
+                        agentId: agent.id,
+                        projectId: agent.projectId,
+                        credentialId: result.removed.credentialId,
+                        user: options.user,
+                        deleteExternalResource: options.deleteExternalResource ?? !isPublished,
+                    })
+                    : undefined;
+        }
+        finally {
+            if (remove)
+                await this.releaseRemoved(agent, remove, result);
+        }
+        if (connected && add) {
+            await this.chatService.broadcastIntegrationChange(agent.id, add, 'connect');
+        }
+        return { ...result, ...(warning ? { warning } : {}) };
+    }
+    async reconcileRuntimeWithPublication(agent, add, connected, published) {
+        if (connected && !published) {
+            this.logger.info('[AgentIntegrationManagementService] Agent was unpublished while its channel connected — releasing the runtime', { agentId: agent.id, type: add.type });
+            await this.chatService.disconnectChannel(agent.id, add, { deleteSubscriptions: false });
+            return false;
+        }
+        if (connected && published && this.chatService.getChatInstance(agent.id, add) === undefined) {
+            this.logger.info('[AgentIntegrationManagementService] Channel runtime went away while the mutation was in flight — restarting it', { agentId: agent.id, type: add.type });
+            return await this.startRuntimeQuietly(agent, add);
+        }
+        if (!connected && published) {
+            this.logger.info('[AgentIntegrationManagementService] Agent was published while its channel persisted — starting the runtime', { agentId: agent.id, type: add.type });
+            return await this.startRuntimeQuietly(agent, add);
+        }
+        return connected;
+    }
+    async startRuntimeQuietly(agent, add) {
+        try {
+            return await this.startRuntime(agent, add, true);
+        }
+        catch (error) {
+            this.logger.warn('[AgentIntegrationManagementService] Could not start the channel runtime', {
+                agentId: agent.id,
+                type: add.type,
+                error,
+            });
+            return false;
+        }
+    }
+    async startRuntime(agent, add, published) {
+        if (!published) {
+            await this.chatService.validateBeforeConnect(agent.id, add, agent.projectId);
+            return false;
+        }
+        await this.chatService.connect(agent.id, add, agent.projectId);
+        return true;
+    }
+    async restorePersistedRuntime(agent, persisted) {
+        if (!persisted)
+            return;
+        try {
+            await this.chatService.connect(agent.id, persisted, agent.projectId);
+        }
+        catch (error) {
+            this.logger.warn('[AgentIntegrationManagementService] Could not restore the previous channel runtime', { agentId: agent.id, type: persisted.type, error });
+        }
+    }
+    async releaseRemoved(agent, remove, result) {
+        if (result.removed) {
+            await this.chatService.disconnectChannel(agent.id, result.removed);
+            return;
+        }
+        this.logger.debug('[AgentIntegrationManagementService] No persisted channel matched the removal — clearing runtime only', { agentId: agent.id, type: remove.type });
+        await this.chatService.disconnect(agent.id, remove);
+        const parsed = api_types_1.AgentIntegrationSchema.safeParse(remove);
+        if (parsed.success) {
+            await this.chatService.broadcastIntegrationChange(agent.id, parsed.data, 'disconnect');
+        }
+    }
+    async assertUsableCredential(agent, user, integration) {
         const implementation = this.registry.require(integration.type);
-        const usableCredentials = await this.credentialsService.getCredentialsAUserCanUseInAWorkflow(options.user, { projectId: options.agent.projectId });
+        const usableCredentials = await this.credentialsService.getCredentialsAUserCanUseInAWorkflow(user, { projectId: agent.projectId });
         const credential = usableCredentials.find((item) => item.id === integration.credentialId);
         if (!credential) {
             throw new not_found_error_1.NotFoundError(`Credential "${integration.credentialId}" not found`);
@@ -44,37 +211,11 @@ let AgentIntegrationManagementService = class AgentIntegrationManagementService
         if (!implementation.credentialTypes.includes(credential.type)) {
             throw new bad_request_error_1.BadRequestError(`${implementation.displayLabel} integrations do not support ${credential.type} credentials`);
         }
-        await this.chatService.validateBeforeConnect(options.agent.id, integration, options.agent.projectId);
-        const savedAgent = await this.persistenceService.saveCredentialIntegration(options.agent, integration, { user: options.user, modifiedBy: options.modifiedBy ?? 'user', broadcast: false });
-        if (savedAgent.activeVersionId === null)
-            return { integration, savedAgent };
-        await this.chatService.connect(options.agent.id, integration, options.agent.projectId);
-        await this.chatService.broadcastIntegrationChange(options.agent.id, integration, 'connect');
-        return { integration, savedAgent };
-    }
-    async disconnect(options) {
-        const persisted = (options.agent.integrations ?? []).find((item) => item.type === options.type && item.credentialId === options.credentialId);
-        const parsed = api_types_1.AgentIntegrationSchema.safeParse({
-            type: options.type,
-            credentialId: options.credentialId,
-        });
-        const integration = persisted ?? (parsed.success ? parsed.data : undefined);
-        if (integration) {
-            await this.chatService.disconnectChannel(options.agent.id, integration);
-        }
-        else {
-            await this.chatService.disconnect(options.agent.id, {
-                type: options.type,
-                credentialId: options.credentialId,
-            });
-        }
-        const savedAgent = await this.persistenceService.removeCredentialIntegration(options.agent, options.type, options.credentialId, { user: options.user, modifiedBy: options.modifiedBy ?? 'user', broadcast: false });
-        return { savedAgent };
     }
 };
 exports.AgentIntegrationManagementService = AgentIntegrationManagementService;
 exports.AgentIntegrationManagementService = AgentIntegrationManagementService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [agent_integration_persistence_service_1.AgentIntegrationPersistenceService, credentials_service_1.CredentialsService, chat_integration_service_1.ChatIntegrationService, agent_chat_integration_1.ChatIntegrationRegistry])
+    __metadata("design:paramtypes", [agent_integration_persistence_service_1.AgentIntegrationPersistenceService, credentials_service_1.CredentialsService, chat_integration_service_1.ChatIntegrationService, agent_chat_integration_1.ChatIntegrationRegistry, backend_common_1.Logger, agent_repository_1.AgentRepository])
 ], AgentIntegrationManagementService);
 //# sourceMappingURL=agent-integration-management.service.js.map

package/dist/modules/agents/agent-integration-management.service.js.map

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

package/dist/modules/agents/agent-integration-persistence.service.d.ts

@@ -7,25 +7,40 @@ import { AgentRuntimeCacheService } from './agent-runtime-cache.service';
 import { AgentSetupCompletionService } from './agent-setup-completion.service';
 import type { Agent } from './entities/agent.entity';
 import { ChatIntegrationRegistry } from './integrations/agent-chat-integration';
-import { ChatIntegrationService } from './integrations/chat-integration.service';
 import { AgentRepository } from './repositories/agent.repository';
 export interface CredentialIntegrationMutationContext {
     user: User;
     modifiedBy: AgentActor;
-    broadcast?: boolean;
 }
+export interface IntegrationRef {
+    type: string;
+    credentialId: string;
+}
+export interface IntegrationDelta {
+    add?: AgentIntegrationConfig;
+    remove?: IntegrationRef;
+}
+export interface IntegrationDeltaResult {
+    agent: Agent;
+    changed: boolean;
+    removed?: AgentIntegrationConfig;
+    published?: boolean;
+}
+export declare function matchesIntegrationRef(integration: {
+    type: string;
+    credentialId: string;
+}, ref: IntegrationRef): boolean;
 export declare class AgentIntegrationPersistenceService {
     private readonly agentRepository;
-    private readonly chatIntegrationService;
     private readonly runtimeCacheService;
     private readonly chatIntegrationRegistry;
     private readonly eventService;
     private readonly modificationTelemetry;
     private readonly credentialsService;
     private readonly setupCompletionService;
-    constructor(agentRepository: AgentRepository, chatIntegrationService: ChatIntegrationService, runtimeCacheService: AgentRuntimeCacheService, chatIntegrationRegistry: ChatIntegrationRegistry, eventService: EventService, modificationTelemetry: AgentModificationTelemetryService, credentialsService: CredentialsService, setupCompletionService: AgentSetupCompletionService);
+    constructor(agentRepository: AgentRepository, runtimeCacheService: AgentRuntimeCacheService, chatIntegrationRegistry: ChatIntegrationRegistry, eventService: EventService, modificationTelemetry: AgentModificationTelemetryService, credentialsService: CredentialsService, setupCompletionService: AgentSetupCompletionService);
     listChatIntegrations(): ChatIntegrationDescriptor[];
-    saveCredentialIntegration(agent: Agent, integration: AgentIntegrationConfig, context: CredentialIntegrationMutationContext): Promise<Agent>;
-    removeCredentialIntegration(agent: Agent, type: string, credentialId: string, context: CredentialIntegrationMutationContext): Promise<Agent>;
+    applyIntegrationDelta(agent: Agent, delta: IntegrationDelta, context: CredentialIntegrationMutationContext): Promise<IntegrationDeltaResult>;
+    private validateAddition;
     private recordIntegrationMutation;
 }

package/dist/modules/agents/agent-integration-persistence.service.js

@@ -10,23 +10,38 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentIntegrationPersistenceService = void 0;
+exports.matchesIntegrationRef = matchesIntegrationRef;
 const api_types_1 = require("@n8n/api-types");
 const di_1 = require("@n8n/di");
 const n8n_workflow_1 = require("n8n-workflow");
+const uuid_1 = require("uuid");
 const credentials_service_1 = require("../../credentials/credentials.service");
 const event_service_1 = require("../../events/event.service");
 const agent_modification_telemetry_service_1 = require("./agent-modification-telemetry.service");
 const agent_runtime_cache_service_1 = require("./agent-runtime-cache.service");
 const agent_setup_completion_service_1 = require("./agent-setup-completion.service");
 const agent_chat_integration_1 = require("./integrations/agent-chat-integration");
-const chat_integration_service_1 = require("./integrations/chat-integration.service");
 const agent_repository_1 = require("./repositories/agent.repository");
 const agent_credential_provider_1 = require("./utils/agent-credential-provider");
-const agent_draft_utils_1 = require("./utils/agent-draft.utils");
+const MAX_WRITE_ATTEMPTS = 3;
+function matchesIntegrationRef(integration, ref) {
+    return integration.type === ref.type && integration.credentialId === ref.credentialId;
+}
+function projectIntegrations(current, delta) {
+    let next = delta.remove
+        ? current.filter((entry) => !matchesIntegrationRef(entry, delta.remove))
+        : [...current];
+    const { add } = delta;
+    if (!add)
+        return next;
+    next = next.filter((entry) => !(entry.type === add.type && (0, api_types_1.isDraftIntegration)(entry)));
+    return next.some((entry) => matchesIntegrationRef(entry, add))
+        ? next.map((entry) => (matchesIntegrationRef(entry, add) ? add : entry))
+        : [...next, add];
+}
 let AgentIntegrationPersistenceService = class AgentIntegrationPersistenceService {
-    constructor(agentRepository, chatIntegrationService, runtimeCacheService, chatIntegrationRegistry, eventService, modificationTelemetry, credentialsService, setupCompletionService) {
+    constructor(agentRepository, runtimeCacheService, chatIntegrationRegistry, eventService, modificationTelemetry, credentialsService, setupCompletionService) {
         this.agentRepository = agentRepository;
-        this.chatIntegrationService = chatIntegrationService;
         this.runtimeCacheService = runtimeCacheService;
         this.chatIntegrationRegistry = chatIntegrationRegistry;
         this.eventService = eventService;
@@ -49,60 +64,56 @@ let AgentIntegrationPersistenceService = class AgentIntegrationPersistenceServic
                 : {}),
         }));
     }
-    async saveCredentialIntegration(agent, integration, context) {
+    async applyIntegrationDelta(agent, delta, context) {
+        const add = delta.add ? this.validateAddition(delta.add) : undefined;
+        const remove = delta.remove && add && matchesIntegrationRef(add, delta.remove) ? undefined : delta.remove;
+        if (!add && !remove)
+            return { agent, changed: false };
+        const credentialProvider = (0, agent_credential_provider_1.createAgentCredentialProvider)(this.credentialsService, agent.projectId, context.user);
+        for (let attempt = 1; attempt <= MAX_WRITE_ATTEMPTS; attempt++) {
+            const state = await this.agentRepository.findIntegrationState(agent.id);
+            if (!state)
+                throw new n8n_workflow_1.UserError(`Agent "${agent.id}" no longer exists`);
+            const current = state.integrations ?? [];
+            const removed = remove
+                ? current.find((entry) => matchesIntegrationRef(entry, remove))
+                : undefined;
+            const published = state.activeVersionId !== null;
+            agent.activeVersionId = state.activeVersionId;
+            if (!add && !removed) {
+                agent.integrations = current;
+                agent.versionId = state.versionId;
+                return { agent, changed: false, published };
+            }
+            const integrations = projectIntegrations(current, { add, remove });
+            const versionId = (0, uuid_1.v4)();
+            agent.integrations = integrations;
+            const emitSetupCompleted = await this.setupCompletionService.recordIfSetupComplete(agent, agent.projectId, credentialProvider, context.user);
+            const written = await this.agentRepository.updateIntegrations(agent.id, integrations, { versionId: state.versionId, activeVersionId: state.activeVersionId }, versionId);
+            if (!written)
+                continue;
+            agent.versionId = versionId;
+            this.runtimeCacheService.clearRuntimes(agent.id);
+            this.eventService.emit('agent-saved', { agentId: agent.id });
+            await emitSetupCompleted?.();
+            this.recordIntegrationMutation(agent, current, context);
+            return { agent, changed: true, published, ...(removed ? { removed } : {}) };
+        }
+        throw new n8n_workflow_1.OperationalError(`Could not update channels for agent "${agent.id}" — the agent kept changing underneath the write`);
+    }
+    validateAddition(integration) {
         const parseResult = api_types_1.AgentIntegrationSchema.safeParse(integration);
         if (!parseResult.success) {
             throw new n8n_workflow_1.UserError(`Invalid credential integration: ${parseResult.error.message}`);
         }
-        const validated = parseResult.data;
-        const { type, credentialId } = validated;
-        if ((0, api_types_1.isDraftIntegration)(validated)) {
+        if ((0, api_types_1.isDraftIntegration)(parseResult.data)) {
             throw new n8n_workflow_1.UserError('Credential integration requires a credential ID.');
         }
-        const previousSchema = agent.schema ?? null;
-        const previousIntegrations = agent.integrations ?? [];
-        const wasUnconfigured = (0, agent_modification_telemetry_service_1.isUnconfiguredAgent)(previousSchema, previousIntegrations);
-        const existing = previousIntegrations.filter((i) => !(i.type === type && (0, api_types_1.isDraftIntegration)(i)));
-        const alreadyExists = existing.some((i) => i.type === type && i.credentialId === credentialId);
-        agent.integrations = alreadyExists
-            ? existing.map((existingIntegration) => existingIntegration.type === type && existingIntegration.credentialId === credentialId
-                ? validated
-                : existingIntegration)
-            : [...existing, validated];
-        (0, agent_draft_utils_1.markAgentDraftDirty)(agent);
-        this.runtimeCacheService.clearRuntimes(agent.id);
-        const credentialProvider = (0, agent_credential_provider_1.createAgentCredentialProvider)(this.credentialsService, agent.projectId, context.user);
-        const emitSetupCompleted = await this.setupCompletionService.recordIfSetupComplete(agent, agent.projectId, credentialProvider, context.user);
-        const result = await this.agentRepository.save(agent);
-        this.eventService.emit('agent-saved', { agentId: agent.id });
-        await emitSetupCompleted?.();
-        await this.recordIntegrationMutation(result, previousSchema, previousIntegrations, context, wasUnconfigured);
-        if (context.broadcast !== false) {
-            await this.chatIntegrationService.broadcastIntegrationChange(agent.id, integration, 'connect');
-        }
-        return result;
+        return parseResult.data;
     }
-    async removeCredentialIntegration(agent, type, credentialId, context) {
-        if (!agent.integrations?.length)
-            return agent;
-        const integration = agent.integrations.find((i) => i.type === type && i.credentialId === credentialId);
-        if (!integration)
-            return agent;
+    recordIntegrationMutation(agent, previousIntegrations, context) {
         const previousSchema = agent.schema ?? null;
-        const previousIntegrations = agent.integrations ?? [];
         const wasUnconfigured = (0, agent_modification_telemetry_service_1.isUnconfiguredAgent)(previousSchema, previousIntegrations);
-        agent.integrations = agent.integrations.filter((i) => i !== integration);
-        (0, agent_draft_utils_1.markAgentDraftDirty)(agent);
-        this.runtimeCacheService.clearRuntimes(agent.id);
-        const result = await this.agentRepository.save(agent);
-        this.eventService.emit('agent-saved', { agentId: agent.id });
-        await this.recordIntegrationMutation(result, previousSchema, previousIntegrations, context, wasUnconfigured);
-        if (context.broadcast !== false) {
-            await this.chatIntegrationService.broadcastIntegrationChange(agent.id, integration, 'disconnect');
-        }
-        return result;
-    }
-    async recordIntegrationMutation(agent, previousSchema, previousIntegrations, context, wasUnconfigured) {
         this.modificationTelemetry.record({
             agent,
             projectId: agent.projectId,
@@ -116,6 +127,6 @@ let AgentIntegrationPersistenceService = class AgentIntegrationPersistenceServic
 exports.AgentIntegrationPersistenceService = AgentIntegrationPersistenceService;
 exports.AgentIntegrationPersistenceService = AgentIntegrationPersistenceService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [agent_repository_1.AgentRepository, chat_integration_service_1.ChatIntegrationService, agent_runtime_cache_service_1.AgentRuntimeCacheService, agent_chat_integration_1.ChatIntegrationRegistry, event_service_1.EventService, agent_modification_telemetry_service_1.AgentModificationTelemetryService, credentials_service_1.CredentialsService, agent_setup_completion_service_1.AgentSetupCompletionService])
+    __metadata("design:paramtypes", [agent_repository_1.AgentRepository, agent_runtime_cache_service_1.AgentRuntimeCacheService, agent_chat_integration_1.ChatIntegrationRegistry, event_service_1.EventService, agent_modification_telemetry_service_1.AgentModificationTelemetryService, credentials_service_1.CredentialsService, agent_setup_completion_service_1.AgentSetupCompletionService])
 ], AgentIntegrationPersistenceService);
 //# sourceMappingURL=agent-integration-persistence.service.js.map

package/dist/modules/agents/agent-integration-persistence.service.js.map

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

package/dist/modules/agents/agent-integrations.controller.d.ts

@@ -1,4 +1,4 @@
-import { AgentDisconnectIntegrationDto, type AgentIntegrationStatusResponse } from '@n8n/api-types';
+import { AgentConnectIntegrationDto, AgentDisconnectIntegrationDto, type AgentDisconnectIntegrationResponse, type AgentIntegrationStatusResponse } from '@n8n/api-types';
 import type { AuthenticatedRequest } from '@n8n/db';
 import type { Request, Response } from 'express';
 import { AgentIntegrationManagementService } from './agent-integration-management.service';
@@ -13,14 +13,12 @@ export declare class AgentIntegrationsController {
     constructor(integrationManagementService: AgentIntegrationManagementService, chatIntegrationService: ChatIntegrationService, agentRepository: AgentRepository, chatIntegrationRegistry: ChatIntegrationRegistry);
     connectIntegration(req: AuthenticatedRequest<{
         projectId: string;
-    }>, _res: Response, agentId: string): Promise<{
+    }>, _res: Response, agentId: string, payload: AgentConnectIntegrationDto): Promise<{
         status: string;
     }>;
     disconnectIntegration(req: AuthenticatedRequest<{
         projectId: string;
-    }>, _res: Response, agentId: string, payload: AgentDisconnectIntegrationDto): Promise<{
-        status: string;
-    }>;
+    }>, _res: Response, agentId: string, payload: AgentDisconnectIntegrationDto): Promise<AgentDisconnectIntegrationResponse>;
     integrationStatus(req: AuthenticatedRequest<{
         projectId: string;
     }>, _res: Response, agentId: string): Promise<AgentIntegrationStatusResponse>;

package/dist/modules/agents/agent-integrations.controller.js

@@ -15,12 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentIntegrationsController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const decorators_1 = require("@n8n/decorators");
-const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 const agent_integration_management_service_1 = require("./agent-integration-management.service");
 const agent_chat_integration_1 = require("./integrations/agent-chat-integration");
 const chat_integration_service_1 = require("./integrations/chat-integration.service");
 const channel_integration_recorder_1 = require("./integrations/recording/channel-integration-recorder");
 const agent_repository_1 = require("./repositories/agent.repository");
+const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 let AgentIntegrationsController = class AgentIntegrationsController {
     constructor(integrationManagementService, chatIntegrationService, agentRepository, chatIntegrationRegistry) {
         this.integrationManagementService = integrationManagementService;
@@ -28,7 +28,7 @@ let AgentIntegrationsController = class AgentIntegrationsController {
         this.agentRepository = agentRepository;
         this.chatIntegrationRegistry = chatIntegrationRegistry;
     }
-    async connectIntegration(req, _res, agentId) {
+    async connectIntegration(req, _res, agentId, payload) {
         await this.integrationManagementService.validateConfig(req.body);
         const agent = await this.agentRepository.findByIdAndProjectId(agentId, req.params.projectId);
         if (!agent)
@@ -37,23 +37,27 @@ let AgentIntegrationsController = class AgentIntegrationsController {
             agent,
             user: req.user,
             integration: req.body,
+            ...(payload.replaces
+                ? { replaces: { type: payload.type, credentialId: payload.replaces.credentialId } }
+                : {}),
         });
         if (savedAgent.activeVersionId === null)
             return { status: 'configured' };
         return { status: 'connected' };
     }
     async disconnectIntegration(req, _res, agentId, payload) {
-        const { type, credentialId } = payload;
+        const { type, credentialId, deleteExternalResource } = payload;
         const agent = await this.agentRepository.findByIdAndProjectId(agentId, req.params.projectId);
         if (!agent)
             throw new not_found_error_1.NotFoundError(`Agent "${agentId}" not found`);
-        await this.integrationManagementService.disconnect({
+        const { warning } = await this.integrationManagementService.disconnect({
             agent,
             user: req.user,
             type,
             credentialId,
+            deleteExternalResource,
         });
-        return { status: 'disconnected' };
+        return { status: 'disconnected', ...(warning ? { warning } : {}) };
     }
     async integrationStatus(req, _res, agentId) {
         const agent = await this.agentRepository.findByIdAndProjectId(agentId, req.params.projectId);
@@ -156,8 +160,9 @@ __decorate([
     (0, decorators_1.Post)('/:agentId/integrations/connect'),
     (0, decorators_1.ProjectScope)('agent:update'),
     __param(2, (0, decorators_1.Param)('agentId')),
+    __param(3, decorators_1.Body),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:paramtypes", [Object, Object, String, api_types_1.AgentConnectIntegrationDto]),
     __metadata("design:returntype", Promise)
 ], AgentIntegrationsController.prototype, "connectIntegration", null);
 __decorate([