n8n 2.32.4 → 2.33.0

package/dist/executions/execution-data/execution-data-json-store.d.ts

@@ -1,7 +1,9 @@
-import { ErrorReporter } from 'n8n-core';
-import { FsByteStore } from '../../blob-storage/fs-byte-store';
-import { JsonStore } from '../../blob-storage/json-store';
+import { FsByteStore, JsonStore } from '@n8n/blob-storage';
+import { ErrorReporter, StorageConfig } from 'n8n-core';
 import type { ExecutionDataPayload, ExecutionRef } from './types';
+export declare class ExecutionDataFsByteStore extends FsByteStore {
+    constructor(storageConfig: StorageConfig, errorReporter: ErrorReporter);
+}
 export declare class ExecutionDataJsonStore extends JsonStore<ExecutionRef, ExecutionDataPayload> {
-    constructor(fsByteStore: FsByteStore, errorReporter: ErrorReporter);
+    constructor(fsByteStore: ExecutionDataFsByteStore, errorReporter: ErrorReporter);
 }

package/dist/executions/execution-data/execution-data-json-store.js

@@ -9,15 +9,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExecutionDataJsonStore = void 0;
+exports.ExecutionDataJsonStore = exports.ExecutionDataFsByteStore = void 0;
+const blob_storage_1 = require("@n8n/blob-storage");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
-const fs_byte_store_1 = require("../../blob-storage/fs-byte-store");
-const json_store_1 = require("../../blob-storage/json-store");
 const constants_1 = require("./constants");
 const corrupted_execution_data_error_1 = require("./corrupted-execution-data.error");
 const execution_data_write_error_1 = require("./execution-data-write.error");
-let ExecutionDataJsonStore = class ExecutionDataJsonStore extends json_store_1.JsonStore {
+let ExecutionDataFsByteStore = class ExecutionDataFsByteStore extends blob_storage_1.FsByteStore {
+    constructor(storageConfig, errorReporter) {
+        super({
+            storagePath: storageConfig.storagePath,
+            reportError: (error) => errorReporter.error(error),
+        });
+    }
+};
+exports.ExecutionDataFsByteStore = ExecutionDataFsByteStore;
+exports.ExecutionDataFsByteStore = ExecutionDataFsByteStore = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.StorageConfig, n8n_core_1.ErrorReporter])
+], ExecutionDataFsByteStore);
+let ExecutionDataJsonStore = class ExecutionDataJsonStore extends blob_storage_1.JsonStore {
     constructor(fsByteStore, errorReporter) {
         super({
             byteStores: { fs: fsByteStore },
@@ -40,6 +52,6 @@ let ExecutionDataJsonStore = class ExecutionDataJsonStore extends json_store_1.J
 exports.ExecutionDataJsonStore = ExecutionDataJsonStore;
 exports.ExecutionDataJsonStore = ExecutionDataJsonStore = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [fs_byte_store_1.FsByteStore, n8n_core_1.ErrorReporter])
+    __metadata("design:paramtypes", [ExecutionDataFsByteStore, n8n_core_1.ErrorReporter])
 ], ExecutionDataJsonStore);
 //# sourceMappingURL=execution-data-json-store.js.map

package/dist/executions/execution-data/execution-data-json-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"execution-data-json-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/execution-data-json-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,uCAAyC;AAEzC,gEAA2D;AAC3D,0DAAsD;AAEtD,2CAA4F;AAC5F,qFAA+E;AAC/E,6EAAuE;AAQhE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAA6C;IACxF,YAAY,WAAwB,EAAE,aAA4B;QACjE,KAAK,CAAC;YACL,UAAU,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;YAC/B,OAAO,EAAE,yCAA6B;YACtC,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACpC;gBACC,WAAW;gBACX,UAAU;gBACV,YAAY;gBACZ,WAAW;gBACX,gBAAgB;gBAChB,0CAA8B;aAC9B,CAAC,IAAI,CAAC,GAAG,CAAC;YACZ,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW;YAC/B,gBAAgB,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,oDAAuB,CAAC,GAAG,EAAE,KAAK,CAAC;YACzE,oBAAoB,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,4DAA2B,CAAC,GAAG,EAAE,KAAK,CAAC;YACjF,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;iCApBY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEgB,2BAAW,EAAiB,wBAAa;GADtD,sBAAsB,CAoBlC"}
+{"version":3,"file":"execution-data-json-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/execution-data-json-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA2D;AAC3D,gCAAkC;AAClC,uCAAwD;AAExD,2CAA4F;AAC5F,qFAA+E;AAC/E,6EAAuE;AAIhE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,0BAAW;IACxD,YAAY,aAA4B,EAAE,aAA4B;QACrE,KAAK,CAAC;YACL,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;mCAPY,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAEkB,wBAAa,EAAiB,wBAAa;GAD1D,wBAAwB,CAOpC;AAOM,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,wBAA6C;IACxF,YAAY,WAAqC,EAAE,aAA4B;QAC9E,KAAK,CAAC;YACL,UAAU,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;YAC/B,OAAO,EAAE,yCAA6B;YACtC,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CACpC;gBACC,WAAW;gBACX,UAAU;gBACV,YAAY;gBACZ,WAAW;gBACX,gBAAgB;gBAChB,0CAA8B;aAC9B,CAAC,IAAI,CAAC,GAAG,CAAC;YACZ,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW;YAC/B,gBAAgB,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,oDAAuB,CAAC,GAAG,EAAE,KAAK,CAAC;YACzE,oBAAoB,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,4DAA2B,CAAC,GAAG,EAAE,KAAK,CAAC;YACjF,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;iCApBY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEgB,wBAAwB,EAAiB,wBAAa;GADnE,sBAAsB,CAoBlC"}

package/dist/executions/pre-execution-checks/credentials-permission-checker.d.ts

@@ -15,6 +15,7 @@ export declare class CredentialsPermissionChecker {
     constructor(sharedCredentialsRepository: SharedCredentialsRepository, credentialsRepository: CredentialsRepository, ownershipService: OwnershipService, projectService: ProjectService, nodeTypes: NodeTypes, userRepository: UserRepository, credentialsFinderService: CredentialsFinderService);
     checkForUser(userId: string, nodes: INode[]): Promise<void>;
     check(workflowId: string, nodes: INode[]): Promise<void>;
+    private ensureOnlyWorkflowCredentials;
     private addGlobalCredentialsToAccessibleSet;
     private mapCredIdsToNodes;
     private getActiveCredentialTypes;

package/dist/executions/pre-execution-checks/credentials-permission-checker.js

@@ -64,6 +64,10 @@ let CredentialsPermissionChecker = class CredentialsPermissionChecker {
         if (!user) {
             throw new InaccessibleCredentialForUserError(credIdsToNodes[workflowCredIds[0]][0]);
         }
+        const unavailableCredentials = await this.credentialsRepository.findNonProjectCredentialsByIds(workflowCredIds);
+        if (unavailableCredentials.length > 0) {
+            throw new InaccessibleCredentialForUserError(credIdsToNodes[unavailableCredentials[0].id][0]);
+        }
         if ((0, permissions_1.hasGlobalScope)(user, 'credential:list'))
             return;
         const accessibleCredentials = await this.credentialsFinderService.findCredentialsForUser(user, [
@@ -78,6 +82,11 @@ let CredentialsPermissionChecker = class CredentialsPermissionChecker {
     }
     async check(workflowId, nodes) {
         const homeProject = await this.ownershipService.getWorkflowProjectCached(workflowId);
+        const credIdsToNodes = this.mapCredIdsToNodes(nodes);
+        const workflowCredIds = Object.keys(credIdsToNodes);
+        if (workflowCredIds.length === 0)
+            return;
+        await this.ensureOnlyWorkflowCredentials(workflowCredIds, credIdsToNodes, homeProject);
         const homeProjectOwner = await this.ownershipService.getPersonalProjectOwnerCached(homeProject.id);
         if (homeProject.type === 'personal' &&
             homeProjectOwner &&
@@ -85,10 +94,6 @@ let CredentialsPermissionChecker = class CredentialsPermissionChecker {
             return;
         }
         const projectIds = await this.projectService.findProjectsWorkflowIsIn(workflowId);
-        const credIdsToNodes = this.mapCredIdsToNodes(nodes);
-        const workflowCredIds = Object.keys(credIdsToNodes);
-        if (workflowCredIds.length === 0)
-            return;
         const accessible = await this.sharedCredentialsRepository.getFilteredAccessibleCredentials(projectIds, workflowCredIds);
         const accessibleSet = await this.addGlobalCredentialsToAccessibleSet(accessible);
         for (const credentialsId of workflowCredIds) {
@@ -98,10 +103,17 @@ let CredentialsPermissionChecker = class CredentialsPermissionChecker {
             }
         }
     }
+    async ensureOnlyWorkflowCredentials(workflowCredIds, credIdsToNodes, homeProject) {
+        const unavailableCredentials = await this.credentialsRepository.findNonProjectCredentialsByIds(workflowCredIds);
+        if (unavailableCredentials.length > 0) {
+            const nodeToFlag = credIdsToNodes[unavailableCredentials[0].id][0];
+            throw new InaccessibleCredentialError(nodeToFlag, homeProject);
+        }
+    }
     async addGlobalCredentialsToAccessibleSet(accessibleCredentialIds) {
         const accessibleSet = new Set(accessibleCredentialIds);
         const globalCredentials = await this.credentialsRepository.find({
-            where: { isGlobal: true },
+            where: { isGlobal: true, usageScope: 'project' },
             select: ['id'],
         });
         for (const globalCred of globalCredentials) {

package/dist/executions/pre-execution-checks/credentials-permission-checker.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials-permission-checker.js","sourceRoot":"","sources":["../../../src/executions/pre-execution-checks/credentials-permission-checker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials-permission-checker.js","sourceRoot":"","sources":["../../../src/executions/pre-execution-checks/credentials-permission-checker.ts"],"names":[],"mappings":"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"}

package/dist/external-hooks.d.ts

@@ -10,6 +10,14 @@ import type clientOAuth1 from 'oauth-1.0a';
 import type { AbstractServer } from './abstract-server';
 import type { Config } from './config';
 import type { WorkflowHookContextService } from './workflow-hook-context.service';
+export type WorkflowLifecycleHookActor = {
+    id: string;
+    email: string | null;
+    firstName: string | null;
+    lastName: string | null;
+    role?: string;
+};
+export declare function toWorkflowLifecycleHookActor(user?: User): WorkflowLifecycleHookActor | undefined;
 type ExternalHooksMap = {
     'n8n.ready': [server: AbstractServer, config: Config];
     'n8n.stop': never;
@@ -47,15 +55,16 @@ type ExternalHooksMap = {
     'user.profile.update': [currentEmail: string, publicUser: PublicUser];
     'user.password.update': [updatedEmail: string, updatedPassword: string | null];
     'user.invited': [emails: string[]];
-    'workflow.create': [createdWorkflow: IWorkflowBase];
-    'workflow.afterCreate': [createdWorkflow: IWorkflowBase];
-    'workflow.activate': [updatedWorkflow: IWorkflowBase];
-    'workflow.update': [updatedWorkflow: IWorkflowBase];
-    'workflow.afterUpdate': [updatedWorkflow: IWorkflowBase];
-    'workflow.delete': [workflowId: string];
-    'workflow.afterDelete': [workflowId: string];
-    'workflow.afterArchive': [workflowId: string];
-    'workflow.afterUnarchive': [workflowId: string];
+    'workflow.create': [createdWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.afterCreate': [createdWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.activate': [updatedWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.deactivate': [deactivatedWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.update': [updatedWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.afterUpdate': [updatedWorkflow: IWorkflowBase, actor?: WorkflowLifecycleHookActor];
+    'workflow.delete': [workflowId: string, actor?: WorkflowLifecycleHookActor];
+    'workflow.afterDelete': [workflowId: string, actor?: WorkflowLifecycleHookActor];
+    'workflow.afterArchive': [workflowId: string, actor?: WorkflowLifecycleHookActor];
+    'workflow.afterUnarchive': [workflowId: string, actor?: WorkflowLifecycleHookActor];
     'workflow.preExecute': [
         workflow: Workflow,
         mode: WorkflowExecuteMode,

package/dist/external-hooks.js

@@ -10,12 +10,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalHooks = void 0;
+exports.toWorkflowLifecycleHookActor = toWorkflowLifecycleHookActor;
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
+function toWorkflowLifecycleHookActor(user) {
+    if (!user) {
+        return undefined;
+    }
+    return {
+        id: user.id,
+        email: user.email,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        role: user.role?.slug,
+    };
+}
 let ExternalHooks = class ExternalHooks {
     constructor(logger, errorReporter, globalConfig, userRepository, settingsRepository, credentialsRepository, workflowRepository) {
         this.logger = logger;

package/dist/external-hooks.js.map

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

package/dist/license.d.ts

@@ -23,11 +23,13 @@ export declare class License implements LicenseProvider {
     private manager;
     private isShuttingDown;
     private refreshCallbacks;
+    private hasWarnedShortDeviceFingerprint;
     constructor(logger: Logger, instanceSettings: InstanceSettings, settingsRepository: SettingsRepository, licenseMetricsService: LicenseMetricsService, globalConfig: GlobalConfig);
     init({ forceRecreate, isCli, }?: {
         forceRecreate?: boolean;
         isCli?: boolean;
     }): Promise<void>;
+    private deviceFingerprint;
     loadCertStr(): Promise<TLicenseBlock>;
     private onFeatureChange;
     private onLicenseRenewed;

package/dist/license.js

@@ -21,6 +21,7 @@ const n8n_core_1 = require("n8n-core");
 const license_metrics_service_1 = require("./metrics/license-metrics.service");
 const constants_2 = require("./constants");
 const LICENSE_RENEWAL_DISABLED_WARNING = 'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!';
+const MIN_DEVICE_FINGERPRINT_LENGTH = 32;
 let License = class License {
     constructor(logger, instanceSettings, settingsRepository, licenseMetricsService, globalConfig) {
         this.logger = logger;
@@ -30,6 +31,7 @@ let License = class License {
         this.globalConfig = globalConfig;
         this.isShuttingDown = false;
         this.refreshCallbacks = [];
+        this.hasWarnedShortDeviceFingerprint = false;
         this.logger = this.logger.scoped('license');
     }
     async init({ forceRecreate = false, isCli = false, } = {}) {
@@ -83,7 +85,7 @@ let License = class License {
                 logger: this.logger,
                 loadCertStr: async () => await this.loadCertStr(),
                 saveCertStr,
-                deviceFingerprint: () => this.instanceSettings.instanceId,
+                deviceFingerprint: () => this.deviceFingerprint(),
                 collectUsageMetrics,
                 collectPassthroughData,
                 onFeatureChange,
@@ -100,6 +102,16 @@ let License = class License {
             }
         }
     }
+    deviceFingerprint() {
+        const { instanceId, derivedInstanceId } = this.instanceSettings;
+        if (instanceId.length >= MIN_DEVICE_FINGERPRINT_LENGTH)
+            return instanceId;
+        if (!this.hasWarnedShortDeviceFingerprint) {
+            this.hasWarnedShortDeviceFingerprint = true;
+            this.logger.warn(`Instance ID is shorter than ${MIN_DEVICE_FINGERPRINT_LENGTH} characters, so it cannot be used as the license device fingerprint. Falling back to the encryption-key-derived ID. Check the N8N_INSTANCE_ID env var and the 'instance.id' deployment key.`);
+        }
+        return derivedInstanceId;
+    }
     async loadCertStr() {
         const ephemeralLicense = this.globalConfig.license.cert;
         if (ephemeralLicense) {

package/dist/license.js.map

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

package/dist/metrics/prometheus/workflow-info-metrics.service.d.ts

@@ -1,12 +1,15 @@
 import { PrometheusMetricsConfig } from '@n8n/config';
 import { WorkflowRepository } from '@n8n/db';
+import { InstanceSettings } from 'n8n-core';
 import { CacheService } from '../../services/cache/cache.service';
 import type { PrometheusMetricsCollector } from './base';
 export declare class PrometheusWorkflowInfoMetricsService implements PrometheusMetricsCollector {
     private readonly config;
     private readonly workflowRepository;
     private readonly cacheService;
-    constructor(config: PrometheusMetricsConfig, workflowRepository: WorkflowRepository, cacheService: CacheService);
+    private readonly instanceSettings;
+    constructor(config: PrometheusMetricsConfig, workflowRepository: WorkflowRepository, cacheService: CacheService, instanceSettings: InstanceSettings);
     get enabled(): boolean;
     init(): void;
+    private initGauge;
 }

package/dist/metrics/prometheus/workflow-info-metrics.service.js

@@ -17,35 +17,54 @@ const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
 const prom_client_1 = __importDefault(require("prom-client"));
 const cache_service_1 = require("../../services/cache/cache.service");
 const cached_metric_query_1 = require("./cached-metric-query");
 let PrometheusWorkflowInfoMetricsService = class PrometheusWorkflowInfoMetricsService {
-    constructor(config, workflowRepository, cacheService) {
+    constructor(config, workflowRepository, cacheService, instanceSettings) {
         this.config = config;
         this.workflowRepository = workflowRepository;
         this.cacheService = cacheService;
+        this.instanceSettings = instanceSettings;
     }
     get enabled() {
         return this.config.includeWorkflowInfoMetrics;
     }
     init() {
+        this.initGauge({
+            name: 'workflow_info',
+            help: 'Map of workflow ID to name. Reported by the leader main only.',
+            cacheKey: 'metrics:workflow-info:v2',
+            activeOnly: false,
+        });
+        this.initGauge({
+            name: 'active_workflow_info',
+            help: 'Map of active workflow ID to name. Reported by the leader main only.',
+            cacheKey: 'metrics:active-workflow-info:v1',
+            activeOnly: true,
+        });
+    }
+    initGauge({ name, help, cacheKey, activeOnly }) {
+        const { instanceSettings } = this;
         const cacheTtl = this.config.workflowInfoMetricInterval * constants_1.Time.seconds.toMilliseconds;
         const query = new cached_metric_query_1.CachedMetricQuery({
             cacheService: this.cacheService,
-            cacheKey: 'metrics:workflow-info:v2',
+            cacheKey,
             ttlMs: cacheTtl,
-            query: async () => await this.workflowRepository.find({ select: ['id', 'name'] }),
+            query: async () => await this.workflowRepository.getWorkflowInfo({ activeOnly }),
         });
         new prom_client_1.default.Gauge({
-            name: `${this.config.prefix}workflow_info`,
-            help: 'Map of workflow ID to name.',
+            name: `${this.config.prefix}${name}`,
+            help,
             labelNames: ['workflow_id', 'workflow_name'],
             async collect() {
                 this.reset();
+                if (!instanceSettings.isLeader)
+                    return;
                 const workflows = await query.get();
-                for (const { id, name } of workflows) {
-                    this.labels({ workflow_id: id, workflow_name: name }).set(1);
+                for (const { id, name: workflowName } of workflows) {
+                    this.labels({ workflow_id: id, workflow_name: workflowName }).set(1);
                 }
             },
         });
@@ -54,6 +73,6 @@ let PrometheusWorkflowInfoMetricsService = class PrometheusWorkflowInfoMetricsSe
 exports.PrometheusWorkflowInfoMetricsService = PrometheusWorkflowInfoMetricsService;
 exports.PrometheusWorkflowInfoMetricsService = PrometheusWorkflowInfoMetricsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, db_1.WorkflowRepository, cache_service_1.CacheService])
+    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, db_1.WorkflowRepository, cache_service_1.CacheService, n8n_core_1.InstanceSettings])
 ], PrometheusWorkflowInfoMetricsService);
 //# sourceMappingURL=workflow-info-metrics.service.js.map

package/dist/metrics/prometheus/workflow-info-metrics.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-info-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-info-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,8DAAqC;AAErC,kEAA8D;AAG9D,+DAA0D;AASnD,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAChD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B;sBAF1B,MAAM;kCACN,kBAAkB;4BAClB,YAAY;IAC3B,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,uCAAiB,CAAsC;YACxE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,0BAA0B;YACpC,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;SACjF,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,eAAe;YAC1C,IAAI,EAAE,6BAA6B;YACnC,UAAU,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;YAC5C,KAAK,CAAC,OAAO;gBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;gBAEb,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;gBACpC,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;+CAlCY,oCAAoC;IADhD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB,EACX,uBAAkB,EACxB,4BAAY;GAJhC,oCAAoC,CAkChD"}
+{"version":3,"file":"workflow-info-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-info-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,uCAA4C;AAC5C,8DAAqC;AAErC,kEAA8D;AAG9D,+DAA0D;AAmBnD,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAChD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B,EAC1B,gBAAkC;sBAHlC,MAAM;kCACN,kBAAkB;4BAClB,YAAY;gCACZ,gBAAgB;IAC/B,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,IAAI,CAAC,SAAS,CAAC;YACd,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,+DAA+D;YACrE,QAAQ,EAAE,0BAA0B;YACpC,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC;YACd,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,sEAAsE;YAC5E,QAAQ,EAAE,iCAAiC;YAC3C,UAAU,EAAE,IAAI;SAChB,CAAC,CAAC;IACJ,CAAC;IAEO,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAA2B;QAC9E,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,uCAAiB,CAAsC;YACxE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ;YACR,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC;SAChF,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE;YACpC,IAAI;YACJ,UAAU,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;YAC5C,KAAK,CAAC,OAAO;gBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;gBAEb,IAAI,CAAC,gBAAgB,CAAC,QAAQ;oBAAE,OAAO;gBAEvC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;gBACpC,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,SAAS,EAAE,CAAC;oBACpD,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtE,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;+CArDY,oCAAoC;IADhD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB,EACX,uBAAkB,EACxB,4BAAY,EACR,2BAAgB;GALxC,oCAAoC,CAqDhD"}

package/dist/metrics/prometheus/workflow-publication-metrics.service.js

@@ -153,14 +153,24 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
             name: `${prefix}workflow_publication_reconciliation_deficient_workflows_total`,
             help: 'Total number of workflows re-enqueued by trigger reconciliation because their in-memory triggers were missing.',
         });
+        const surplus = new prom_client_1.default.Counter({
+            name: `${prefix}workflow_publication_reconciliation_surplus_workflows_total`,
+            help: 'Total number of registered workflows torn down by trigger reconciliation because they were no longer published.',
+        });
+        const versionSkew = new prom_client_1.default.Counter({
+            name: `${prefix}workflow_publication_reconciliation_version_skew_workflows_total`,
+            help: 'Total number of workflows re-enqueued by reconciliation because their published version diverged from the active version.',
+        });
         const duration = new prom_client_1.default.Histogram({
             name: `${prefix}workflow_publication_reconciliation_duration_seconds`,
             help: 'Duration in seconds of a trigger reconciliation pass by result.',
             labelNames: ['result'],
             buckets: constant_1.DURATION_BUCKETS_SECONDS,
         });
-        this.eventService.on('workflow-publication-reconciliation', ({ result, deficientCount, durationMs }) => {
+        this.eventService.on('workflow-publication-reconciliation', ({ result, deficientCount, surplusCount, versionSkewCount, durationMs }) => {
             deficient.inc(deficientCount);
+            surplus.inc(surplusCount);
+            versionSkew.inc(versionSkewCount);
             duration.observe({ result }, durationMs * constants_1.Time.milliseconds.toSeconds);
         });
     }

package/dist/metrics/prometheus/workflow-publication-metrics.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-publication-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-publication-metrics.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-publication-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-publication-metrics.service.ts"],"names":[],"mappings":"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"}

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

@@ -65,6 +65,7 @@ let AgentChatController = class AgentChatController {
             return;
         }
         try {
+            let executionId;
             const suspended = await (0, agent_sse_stream_1.pumpChunks)(this.agentExecutionOrchestratorService.executeForChat({
                 agentId,
                 projectId,
@@ -74,9 +75,12 @@ let AgentChatController = class AgentChatController {
                     threadId,
                     resourceId: (0, agent_memory_scope_1.draftChatMemoryResourceId)(req.user.id),
                 },
+                onExecutionRecorded: (id) => {
+                    executionId = id;
+                },
             }), send);
             if (!suspended) {
-                send({ type: 'done', sessionId: threadId });
+                send({ type: 'done', sessionId: threadId, ...(executionId ? { executionId } : {}) });
             }
         }
         catch (error) {
@@ -90,6 +94,7 @@ let AgentChatController = class AgentChatController {
         const { runId, toolCallId, resumeData } = payload;
         const { send } = (0, agent_sse_stream_1.initSseStream)(res);
         try {
+            let executionId;
             const suspended = await (0, agent_sse_stream_1.pumpChunks)(this.agentExecutionOrchestratorService.resumeForChat({
                 agentId,
                 projectId,
@@ -99,9 +104,12 @@ let AgentChatController = class AgentChatController {
                 user: req.user,
                 usePublishedVersion: false,
                 integrationType: api_types_1.N8N_CHAT_INTEGRATION_TYPE,
+                onExecutionRecorded: (id) => {
+                    executionId = id;
+                },
             }), send);
             if (!suspended) {
-                send({ type: 'done' });
+                send({ type: 'done', ...(executionId ? { executionId } : {}) });
             }
         }
         catch (error) {

package/dist/modules/agents/agent-chat.controller.js.map

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

package/dist/modules/agents/agent-config.service.js

@@ -56,7 +56,7 @@ let AgentConfigService = class AgentConfigService {
         }
         const parsed = api_types_1.AgentJsonConfigSchema.safeParse((0, api_types_1.sanitizeAgentJsonConfig)(raw));
         if (!parsed.success) {
-            return { valid: false, error: parsed.error.message };
+            return { valid: false, error: (0, api_types_1.formatAgentConfigZodError)(parsed.error) };
         }
         const config = parsed.data;
         const toolNameCollisions = (0, api_types_1.findVectorStoreToolNameCollisions)(config);