n8n 2.43.4 → 2.44.1

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

@@ -22,20 +22,19 @@ const prom_client_1 = __importDefault(require("prom-client"));
 const backend_services_1 = require("@n8n/backend-services");
 const cached_metric_query_1 = require("./cached-metric-query");
 const constant_1 = require("./constant");
+const database_metric_query_service_1 = require("./database-metric-query.service");
 const ALL_STATUSES = Object.values(db_1.WorkflowPublicationOutboxStatus);
 const ACTIVE_STATUSES = [
     db_1.WorkflowPublicationOutboxStatus.Pending,
     db_1.WorkflowPublicationOutboxStatus.InProgress,
 ];
-const RECORD_STATS_CACHE_KEY = 'metrics:workflow-publication:outbox-record-stats:v2';
 let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublicationMetricsService {
-    constructor(config, workflowsConfig, instanceSettings, eventService, outboxRepository, cacheService) {
+    constructor(config, workflowsConfig, instanceSettings, eventService, databaseQueries) {
         this.config = config;
         this.workflowsConfig = workflowsConfig;
         this.instanceSettings = instanceSettings;
         this.eventService = eventService;
-        this.outboxRepository = outboxRepository;
-        this.cacheService = cacheService;
+        this.databaseQueries = databaseQueries;
     }
     get enabled() {
         return (this.config.includeWorkflowPublicationMetrics &&
@@ -51,22 +50,9 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
         this.initGhostSweepMetrics();
     }
     initOutboxGauges() {
-        const repository = this.outboxRepository;
         const prefix = this.config.prefix;
         const cacheTtl = this.config.workflowPublicationMetricInterval * constants_1.Time.seconds.toMilliseconds;
-        const query = new cached_metric_query_1.CachedMetricQuery({
-            cacheService: this.cacheService,
-            cacheKey: RECORD_STATS_CACHE_KEY,
-            ttlMs: cacheTtl,
-            query: async () => {
-                const stats = await repository.getRecordStatsByStatus();
-                const byStatus = {};
-                for (const [status, { count, oldestCreatedAt }] of stats) {
-                    byStatus[status] = { count, oldestMs: oldestCreatedAt.getTime() };
-                }
-                return byStatus;
-            },
-        });
+        const query = this.databaseQueries.workflowPublication(cacheTtl);
         new prom_client_1.default.Gauge({
             name: `${prefix}workflow_publication_outbox_records`,
             help: 'Number of workflow publication outbox records by status.',
@@ -74,7 +60,7 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
             async collect() {
                 const byStatus = await query.get();
                 for (const status of ALL_STATUSES) {
-                    this.set({ status }, byStatus[status]?.count ?? 0);
+                    this.set({ status }, (0, cached_metric_query_1.toGaugeValue)(byStatus, (stats) => stats[status]?.count ?? 0));
                 }
             },
         });
@@ -86,8 +72,10 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
                 const byStatus = await query.get();
                 const now = Date.now();
                 for (const status of ACTIVE_STATUSES) {
-                    const oldestMs = byStatus[status]?.oldestMs;
-                    this.set({ status }, oldestMs !== undefined ? (now - oldestMs) * constants_1.Time.milliseconds.toSeconds : 0);
+                    this.set({ status }, (0, cached_metric_query_1.toGaugeValue)(byStatus, (stats) => {
+                        const oldestMs = stats[status]?.oldestMs;
+                        return oldestMs !== undefined ? (now - oldestMs) * constants_1.Time.milliseconds.toSeconds : 0;
+                    }));
                 }
             },
         });
@@ -198,6 +186,6 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
 exports.PrometheusWorkflowPublicationMetricsService = PrometheusWorkflowPublicationMetricsService;
 exports.PrometheusWorkflowPublicationMetricsService = PrometheusWorkflowPublicationMetricsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, config_1.WorkflowsConfig, n8n_core_1.InstanceSettings, backend_services_1.EventService, db_1.WorkflowPublicationOutboxRepository, backend_services_1.CacheService])
+    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, config_1.WorkflowsConfig, n8n_core_1.InstanceSettings, backend_services_1.EventService, database_metric_query_service_1.DatabaseMetricQueryService])
 ], PrometheusWorkflowPublicationMetricsService);
 //# sourceMappingURL=workflow-publication-metrics.service.js.map

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/metrics/prometheus/workflow-statistics-metrics.service.d.ts

@@ -1,12 +1,10 @@
 import { PrometheusMetricsConfig } from '@n8n/config';
-import { LicenseMetricsRepository } from '@n8n/db';
-import { CacheService } from '@n8n/backend-services';
 import type { PrometheusMetricsCollector } from './base';
+import { DatabaseMetricQueryService } from './database-metric-query.service';
 export declare class PrometheusWorkflowStatisticsMetricsService implements PrometheusMetricsCollector {
     private readonly config;
-    private readonly cacheService;
-    private readonly licenseMetricsRepository;
-    constructor(config: PrometheusMetricsConfig, cacheService: CacheService, licenseMetricsRepository: LicenseMetricsRepository);
+    private readonly databaseQueries;
+    constructor(config: PrometheusMetricsConfig, databaseQueries: DatabaseMetricQueryService);
     get enabled(): boolean;
     init(): void;
     private createWorkflowStatisticsGauge;

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

@@ -15,28 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrometheusWorkflowStatisticsMetricsService = void 0;
 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 prom_client_1 = __importDefault(require("prom-client"));
-const backend_services_1 = require("@n8n/backend-services");
 const cached_metric_query_1 = require("./cached-metric-query");
+const database_metric_query_service_1 = require("./database-metric-query.service");
 let PrometheusWorkflowStatisticsMetricsService = class PrometheusWorkflowStatisticsMetricsService {
-    constructor(config, cacheService, licenseMetricsRepository) {
+    constructor(config, databaseQueries) {
         this.config = config;
-        this.cacheService = cacheService;
-        this.licenseMetricsRepository = licenseMetricsRepository;
+        this.databaseQueries = databaseQueries;
     }
     get enabled() {
         return this.config.includeWorkflowStatistics;
     }
     init() {
         const cacheTtl = this.config.workflowStatisticsInterval * constants_1.Time.seconds.toMilliseconds;
-        const query = new cached_metric_query_1.CachedMetricQuery({
-            cacheService: this.cacheService,
-            cacheKey: 'metrics:workflow-statistics:shared:v2',
-            ttlMs: cacheTtl,
-            query: async () => await this.licenseMetricsRepository.getLicenseRenewalMetrics(),
-        });
+        const query = this.databaseQueries.workflowStatistics(cacheTtl);
         const metricsConfig = [
             {
                 name: 'production_executions',
@@ -83,7 +76,7 @@ let PrometheusWorkflowStatisticsMetricsService = class PrometheusWorkflowStatist
             name: `${this.config.prefix}${metricName}`,
             help,
             async collect() {
-                this.set(getMetricValue(await query.get()));
+                this.set((0, cached_metric_query_1.toGaugeValue)(await query.get(), getMetricValue));
             },
         });
     }
@@ -91,6 +84,6 @@ let PrometheusWorkflowStatisticsMetricsService = class PrometheusWorkflowStatist
 exports.PrometheusWorkflowStatisticsMetricsService = PrometheusWorkflowStatisticsMetricsService;
 exports.PrometheusWorkflowStatisticsMetricsService = PrometheusWorkflowStatisticsMetricsService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, backend_services_1.CacheService, db_1.LicenseMetricsRepository])
+    __metadata("design:paramtypes", [config_1.PrometheusMetricsConfig, database_metric_query_service_1.DatabaseMetricQueryService])
 ], PrometheusWorkflowStatisticsMetricsService);
 //# sourceMappingURL=workflow-statistics-metrics.service.js.map

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

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

package/dist/middlewares/content-security-policy.js

@@ -5,22 +5,56 @@ const node_crypto_1 = require("node:crypto");
 const content_security_policy_1 = require("../security/content-security-policy");
 const ENFORCED_HEADER = 'Content-Security-Policy';
 const REPORT_ONLY_HEADER = 'Content-Security-Policy-Report-Only';
-const isHtmlResponse = (res) => {
+const JAVASCRIPT_TYPES = new Set(['text/javascript', 'application/javascript']);
+const essenceOf = (contentType) => contentType.split(';')[0].trim().toLowerCase();
+const isJavaScriptResponse = (res) => {
     const contentType = res.getHeader('content-type');
-    return typeof contentType === 'string' && contentType.toLowerCase().includes('text/html');
+    if (contentType === undefined)
+        return false;
+    const values = [contentType].flat().flatMap((value) => String(value).split(','));
+    return values.length > 0 && values.every((value) => JAVASCRIPT_TYPES.has(essenceOf(value)));
 };
-const hasOwnPolicy = (res) => res.hasHeader(ENFORCED_HEADER) || res.hasHeader(REPORT_ONLY_HEADER);
+const hasOwnPolicy = (res) => res.hasHeader(ENFORCED_HEADER);
 const isHeaderValue = (value) => typeof value === 'string' ||
     typeof value === 'number' ||
     (Array.isArray(value) && value.every((entry) => typeof entry === 'string'));
+const isHeaderEntry = (entry) => Array.isArray(entry);
 const copyWriteHeadHeaders = (res, args) => {
-    const headers = typeof args[1] === 'string' ? args[2] : args[1];
-    if (typeof headers !== 'object' || headers === null || Array.isArray(headers))
+    const headersIndex = typeof args[1] === 'string' ? 2 : 1;
+    const headers = args[headersIndex];
+    if (typeof headers !== 'object' || headers === null)
         return;
-    for (const [name, value] of Object.entries(headers)) {
-        if (isHeaderValue(value))
-            res.setHeader(name, value);
+    if (!Array.isArray(headers)) {
+        for (const [name, value] of Object.entries(headers)) {
+            if (isHeaderValue(value))
+                res.setHeader(name, value);
+        }
+        return;
+    }
+    const entries = [];
+    const collect = (name, value) => {
+        if (typeof name === 'string' && isHeaderValue(value))
+            entries.push([name, value]);
+    };
+    if (headers.every(isHeaderEntry)) {
+        for (const [name, value] of headers)
+            collect(name, value);
+    }
+    else {
+        for (let i = 0; i + 1 < headers.length; i += 2)
+            collect(headers[i], headers[i + 1]);
+    }
+    const valuesByName = new Map();
+    for (const [name, value] of entries) {
+        const key = name.toLowerCase();
+        const group = valuesByName.get(key) ?? { name, values: [] };
+        valuesByName.set(key, group);
+        group.values.push(...[value].flat().map(String));
+    }
+    for (const { name, values } of valuesByName.values()) {
+        res.setHeader(name, values.length === 1 ? values[0] : values);
     }
+    args[headersIndex] = {};
 };
 const createContentSecurityPolicyMiddleware = ({ enforced, reportOnly, }) => {
     return (_req, res, next) => {
@@ -36,11 +70,12 @@ const createContentSecurityPolicyMiddleware = ({ enforced, reportOnly, }) => {
             if (res.headersSent)
                 return writeHead(...args);
             copyWriteHeadHeaders(res, args);
-            if (isHtmlResponse(res) && !hasOwnPolicy(res)) {
+            const isNotModified = args[0] === 304;
+            if (!isNotModified && !isJavaScriptResponse(res) && !hasOwnPolicy(res)) {
                 if (enforced) {
                     res.setHeader(ENFORCED_HEADER, (0, content_security_policy_1.renderContentSecurityPolicy)(enforced, getNonce()));
                 }
-                if (reportOnly) {
+                if (reportOnly && !res.hasHeader(REPORT_ONLY_HEADER)) {
                     res.setHeader(REPORT_ONLY_HEADER, (0, content_security_policy_1.renderContentSecurityPolicy)(reportOnly, getNonce()));
                 }
             }

package/dist/middlewares/content-security-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-security-policy.js","sourceRoot":"","sources":["../../src/middlewares/content-security-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"content-security-policy.js","sourceRoot":"","sources":["../../src/middlewares/content-security-policy.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAG1C,gFAAiF;AAWjF,MAAM,eAAe,GAAG,yBAAyB,CAAC;AAClD,MAAM,kBAAkB,GAAG,qCAAqC,CAAC;AAMjE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,CAAC,CAAC;AAGhF,MAAM,SAAS,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAQ1F,MAAM,oBAAoB,GAAG,CAAC,GAAa,EAAE,EAAE;IAC9C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAClD,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAE5C,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACjF,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC7F,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAa,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAEvE,MAAM,aAAa,GAAG,CAAC,KAAc,EAAuC,EAAE,CAC7E,OAAO,KAAK,KAAK,QAAQ;IACzB,OAAO,KAAK,KAAK,QAAQ;IACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;AAE7E,MAAM,aAAa,GAAG,CAAC,KAAc,EAA+B,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAa5F,MAAM,oBAAoB,GAAG,CAAC,GAAa,EAAE,IAAe,EAAE,EAAE;IAC/D,MAAM,YAAY,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IAE5D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACrD,IAAI,aAAa,CAAC,KAAK,CAAC;gBAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;QACD,OAAO;IACR,CAAC;IAED,MAAM,OAAO,GAAgD,EAAE,CAAC;IAChE,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,KAAc,EAAE,EAAE;QACjD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,aAAa,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC;IAEF,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QAElC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,OAAO;YAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QAEP,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAID,MAAM,YAAY,GAAG,IAAI,GAAG,EAA8C,CAAC;IAC3E,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC5D,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;QACtD,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC,CAAC;AAQK,MAAM,qCAAqC,GAAG,CAAC,EACrD,QAAQ,EACR,UAAU,GACe,EAAkB,EAAE;IAC7C,OAAO,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC3D,IAAI,KAAyB,CAAC;QAG9B,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,CAAC,KAAK,KAAK,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QAIzE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE;YAC7C,GAAG,EAAE,QAAQ;YACb,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SAClB,CAAC,CAAC;QAGH,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAI1C,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,IAA2B,EAAE,EAAE;YAEnD,IAAI,GAAG,CAAC,WAAW;gBAAE,OAAO,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;YAE/C,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAMhC,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;YAKtC,IAAI,CAAC,aAAa,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxE,IAAI,QAAQ,EAAE,CAAC;oBACd,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,IAAA,qDAA2B,EAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACnF,CAAC;gBACD,IAAI,UAAU,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACtD,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAA,qDAA2B,EAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACxF,CAAC;YACF,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAc,CAAC;QAEhB,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,qCAAqC,GAArC,qCAAqC,CAoDhD"}

package/dist/middlewares/list-query/dtos/workflow.filter.dto.d.ts

@@ -1,3 +1,4 @@
+import { type WorkflowExecutionBlockCause } from '@n8n/api-types';
 import { BaseFilter } from './base.filter.dto';
 export declare class WorkflowFilter extends BaseFilter {
     ids?: string[];
@@ -10,7 +11,6 @@ export declare class WorkflowFilter extends BaseFilter {
     availableInMCP?: boolean;
     nodeTypes?: string[];
     triggerNodeTypes?: string[];
-    includeCallableSubworkflows?: boolean;
-    parentWorkflowId?: string;
+    executionBlockedBy?: WorkflowExecutionBlockCause[];
     static fromString(rawFilter: string): Promise<Record<string, any>>;
 }

package/dist/middlewares/list-query/dtos/workflow.filter.dto.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowFilter = void 0;
+const api_types_1 = require("@n8n/api-types");
 const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
 const base_filter_dto_1 = require("./base.filter.dto");
@@ -86,15 +87,11 @@ __decorate([
     __metadata("design:type", Array)
 ], WorkflowFilter.prototype, "triggerNodeTypes", void 0);
 __decorate([
-    (0, class_validator_1.IsBoolean)(),
-    (0, class_validator_1.IsOptional)(),
-    (0, class_transformer_1.Expose)(),
-    __metadata("design:type", Boolean)
-], WorkflowFilter.prototype, "includeCallableSubworkflows", void 0);
-__decorate([
-    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsArray)(),
+    (0, class_validator_1.ArrayUnique)(),
+    (0, class_validator_1.IsIn)(api_types_1.WORKFLOW_EXECUTION_BLOCK_CAUSES, { each: true }),
     (0, class_validator_1.IsOptional)(),
     (0, class_transformer_1.Expose)(),
-    __metadata("design:type", String)
-], WorkflowFilter.prototype, "parentWorkflowId", void 0);
+    __metadata("design:type", Array)
+], WorkflowFilter.prototype, "executionBlockedBy", void 0);
 //# sourceMappingURL=workflow.filter.dto.js.map

package/dist/middlewares/list-query/dtos/workflow.filter.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.filter.dto.js","sourceRoot":"","sources":["../../../../src/middlewares/list-query/dtos/workflow.filter.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAOyB;AAEzB,uDAA+C;AAE/C,oBAA4B,SAAQ,4BAAU;IA4E7C,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,SAAiB;QACxC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;CACD;;AAxEA;IANC,IAAA,yBAAO,GAAE;IACT,IAAA,8BAAY,EAAC,EAAE,CAAC;IAChB,IAAA,6BAAW,GAAE;IACb,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;2CACM;AAKf;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;6CACM;AAKf;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;8CACQ;AAKjB;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;kDACY;AAMrB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;4CACO;AAKhB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;iDACU;AAKnB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;sDACe;AAKxB;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;sDACgB;AAMzB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;iDACY;AAMrB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;wDACmB;AAU5B;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;mEAC6B;AAStC;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;wDACiB"}
+{"version":3,"file":"workflow.filter.dto.js","sourceRoot":"","sources":["../../../../src/middlewares/list-query/dtos/workflow.filter.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAmG;AACnG,yDAA2C;AAC3C,qDAQyB;AAEzB,uDAA+C;AAE/C,oBAA4B,SAAQ,4BAAU;IAgE7C,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,SAAiB;QACxC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;CACD;;AA5DA;IANC,IAAA,yBAAO,GAAE;IACT,IAAA,8BAAY,EAAC,EAAE,CAAC;IAChB,IAAA,6BAAW,GAAE;IACb,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;2CACM;AAKf;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;6CACM;AAKf;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;8CACQ;AAKjB;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;kDACY;AAMrB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;4CACO;AAKhB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;iDACU;AAKnB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;sDACe;AAKxB;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;sDACgB;AAMzB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;iDACY;AAMrB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;wDACmB;AAO5B;IALC,IAAA,yBAAO,GAAE;IACT,IAAA,6BAAW,GAAE;IACb,IAAA,sBAAI,EAAC,2CAA+B,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrD,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAM,GAAE;;0DAC0C"}

package/dist/modules/agent-evals/agent-eval-case-generation.service.d.ts

@@ -1,4 +1,4 @@
-import { type GenerateDraftCasesOptions, type GenerateDraftCasesResult } from '@n8n/api-types';
+import { type AgentEvalDraftCase, type CreateDraftDatasetResult, type GenerateDraftCasesOptions, type GenerateDraftCasesResult, type PreviewRunOptions, type PreviewRunResult } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { AgentEvalDatasetRepository } from '@n8n/db';
@@ -6,6 +6,7 @@ import { CredentialsService } from '../../credentials/credentials.service';
 import { InstanceWriteAccessService } from '@n8n/backend-services';
 import { AgentEvalsFlagGate } from './agent-evals-flag-gate';
 import { AgentConfigService } from '../agents/agent-config.service';
+import { AgentTestRunService } from '../agents/agent-test-run.service';
 import { DataTableService } from '../data-table/data-table.service';
 export declare class AgentEvalCaseGenerationService {
     private readonly logger;
@@ -15,11 +16,16 @@ export declare class AgentEvalCaseGenerationService {
     private readonly datasetRepository;
     private readonly flagGate;
     private readonly instanceWriteAccess;
-    constructor(logger: Logger, agentConfigService: AgentConfigService, credentialsService: CredentialsService, dataTableService: DataTableService, datasetRepository: AgentEvalDatasetRepository, flagGate: AgentEvalsFlagGate, instanceWriteAccess: InstanceWriteAccessService);
+    private readonly agentTestRunService;
+    constructor(logger: Logger, agentConfigService: AgentConfigService, credentialsService: CredentialsService, dataTableService: DataTableService, datasetRepository: AgentEvalDatasetRepository, flagGate: AgentEvalsFlagGate, instanceWriteAccess: InstanceWriteAccessService, agentTestRunService: AgentTestRunService);
     generateDraftCases(user: User, projectId: string, agentId: string, options?: GenerateDraftCasesOptions): Promise<GenerateDraftCasesResult>;
+    createEmptyDataset(user: User, projectId: string, agentId: string, datasetName?: string): Promise<CreateDraftDatasetResult>;
+    previewRun(user: User, projectId: string, agentId: string, options?: PreviewRunOptions): Promise<PreviewRunResult>;
+    runPreviewCase(user: User, projectId: string, agentId: string, draftCase: Pick<AgentEvalDraftCase, 'input' | 'whatToCheck' | 'scenario'>): Promise<PreviewRunResult>;
     private assertInstanceWriteAccess;
     private resolveAgentModel;
     private invokeModel;
     private persistDataset;
+    deleteDraftTable(dataTableId: string, projectId: string): Promise<void>;
     private rollBackDataTable;
 }

package/dist/modules/agent-evals/agent-eval-case-generation.service.js

@@ -19,8 +19,11 @@ const n8n_workflow_1 = require("n8n-workflow");
 const credentials_service_1 = require("../../credentials/credentials.service");
 const errors_1 = require("@n8n/errors");
 const backend_services_1 = require("@n8n/backend-services");
+const agent_eval_fix_suggestion_1 = require("./agent-eval-fix-suggestion");
+const agent_eval_judge_1 = require("./agent-eval-judge");
 const agent_evals_flag_gate_1 = require("./agent-evals-flag-gate");
 const agent_config_service_1 = require("../agents/agent-config.service");
+const agent_test_run_service_1 = require("../agents/agent-test-run.service");
 const case_generation_prompt_1 = require("./case-generation/case-generation-prompt");
 const dimensions_1 = require("./case-generation/dimensions");
 const credential_field_mapping_1 = require("../agents/json-config/credential-field-mapping");
@@ -31,12 +34,13 @@ const data_table_name_conflict_error_1 = require("../data-table/errors/data-tabl
 const DEFAULT_CASE_COUNT = 6;
 const MAX_CASE_COUNT = 20;
 const MAX_CASE_TEXT_CHARS = 2_000;
+const MAX_SCENARIO_CHARS = 40;
 const GENERATE_TIMEOUT_MS = 60_000;
 const INPUT_COLUMN = 'input';
 const CRITERIA_COLUMN = 'criteria';
 const MAX_NAME_ATTEMPTS = 20;
 let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
-    constructor(logger, agentConfigService, credentialsService, dataTableService, datasetRepository, flagGate, instanceWriteAccess) {
+    constructor(logger, agentConfigService, credentialsService, dataTableService, datasetRepository, flagGate, instanceWriteAccess, agentTestRunService) {
         this.logger = logger;
         this.agentConfigService = agentConfigService;
         this.credentialsService = credentialsService;
@@ -44,18 +48,29 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
         this.datasetRepository = datasetRepository;
         this.flagGate = flagGate;
         this.instanceWriteAccess = instanceWriteAccess;
+        this.agentTestRunService = agentTestRunService;
     }
     async generateDraftCases(user, projectId, agentId, options = {}) {
         await this.flagGate.assertEnabled(user);
         this.assertInstanceWriteAccess();
         const config = await this.agentConfigService.getConfig(agentId, projectId);
         const modelConfig = await this.resolveAgentModel(config, projectId, user);
-        const count = clampCount(options.count);
+        const revision = toRevisionContext(options);
+        const rule = options.rule?.trim() || undefined;
+        const count = revision || rule ? 1 : clampCount(options.count);
         const capabilities = (0, case_generation_prompt_1.deriveCapabilities)(config);
         const tuples = (0, dimensions_1.sampleDimensionTuples)(capabilities, count);
+        const example = toExampleContext(options);
         const summary = (0, case_generation_prompt_1.buildAgentSummary)(config);
-        const generated = await this.invokeModel(modelConfig, (0, case_generation_prompt_1.buildCaseGenerationUserPrompt)(summary, tuples), tuples.length);
+        const generated = await this.invokeModel(modelConfig, (0, case_generation_prompt_1.buildCaseGenerationUserPrompt)(summary, tuples, revision, example, rule), tuples.length);
         const cases = boundCases(generated, tuples.length);
+        if (options.save === false) {
+            this.logger.debug('Generated draft eval cases (preview, not persisted)', {
+                agentId,
+                caseCount: cases.length,
+            });
+            return { cases };
+        }
         const trimmedName = options.datasetName?.trim();
         const baseName = trimmedName && trimmedName.length > 0 ? trimmedName : defaultDatasetName(config.name);
         const { datasetId, dataTableId } = await this.persistDataset(projectId, agentId, user.id, baseName, cases);
@@ -66,6 +81,64 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
         });
         return { datasetId, dataTableId, cases };
     }
+    async createEmptyDataset(user, projectId, agentId, datasetName) {
+        await this.flagGate.assertEnabled(user);
+        this.assertInstanceWriteAccess();
+        const config = await this.agentConfigService.getConfig(agentId, projectId);
+        const trimmedName = datasetName?.trim();
+        const baseName = trimmedName && trimmedName.length > 0 ? trimmedName : defaultDatasetName(config.name);
+        return await this.persistDataset(projectId, agentId, user.id, baseName, []);
+    }
+    async previewRun(user, projectId, agentId, options = {}) {
+        const drafted = await this.generateDraftCases(user, projectId, agentId, {
+            ...options,
+            count: 1,
+            save: false,
+        });
+        const draftCase = drafted.cases[0];
+        if (!draftCase)
+            return { status: 'failed' };
+        return await this.runPreviewCase(user, projectId, agentId, draftCase);
+    }
+    async runPreviewCase(user, projectId, agentId, draftCase) {
+        const credentialProvider = (0, agent_credential_provider_1.createAgentCredentialProvider)(this.credentialsService, projectId, user, agentId);
+        const result = await this.agentTestRunService.executeDraftRun({
+            agentId,
+            projectId,
+            user,
+            message: draftCase.input,
+            credentialProvider,
+            source: 'agent-eval-preview',
+        });
+        if (result.status !== 'completed' || result.maxIterations)
+            return { status: 'failed' };
+        const verdict = await (0, agent_eval_judge_1.judgeAgentAnswer)({
+            agentConfigService: this.agentConfigService,
+            credentialsService: this.credentialsService,
+            logger: this.logger,
+        }, {
+            input: draftCase.input,
+            output: result.response,
+            criteria: draftCase.whatToCheck.trim() || null,
+            expectedOutput: null,
+        }, { agentId, projectId, user });
+        const rule = draftCase.whatToCheck.trim();
+        const suggestion = verdict.status === 'completed' && verdict.outcome === 'fail' && rule
+            ? await (0, agent_eval_fix_suggestion_1.generateFixSuggestion)({
+                agentConfigService: this.agentConfigService,
+                credentialsService: this.credentialsService,
+                logger: this.logger,
+            }, { input: draftCase.input, output: result.response, rule, reasoning: verdict.reasoning }, { agentId, projectId, user })
+            : null;
+        return {
+            status: 'completed',
+            input: draftCase.input,
+            whatToCheck: draftCase.whatToCheck,
+            scenario: draftCase.scenario,
+            response: result.response,
+            verdict: suggestion ? { ...verdict, suggestion } : verdict,
+        };
+    }
     assertInstanceWriteAccess() {
         if (this.instanceWriteAccess.isReadOnly()) {
             throw new errors_1.ForbiddenError('Cannot generate eval cases on a protected instance. This instance is in read-only mode.');
@@ -80,7 +153,7 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
             throw new n8n_workflow_1.UserError(`The agent's model provider is not supported for case generation ("${model}").`);
         }
         const credentialProvider = (0, agent_credential_provider_1.createAgentCredentialProvider)(this.credentialsService, projectId, user);
-        return await (0, model_config_1.resolveCredentialAwareModelConfig)(model, credential, credentialProvider);
+        return await (0, model_config_1.resolveCredentialAwareModelConfig)(model, credential, credentialProvider, config.modelDeploymentName);
     }
     async invokeModel(modelConfig, userPrompt, expectedCount) {
         const { Agent } = await import('@n8n/agents');
@@ -96,8 +169,12 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
             if (!parsed.success)
                 return null;
             const cases = parsed.data.cases
-                .map((c) => ({ input: c.input.trim(), whatToCheck: c.whatToCheck.trim() }))
-                .filter((c) => c.input.length > 0 && c.whatToCheck.length > 0);
+                .map((c) => ({
+                input: c.input.trim(),
+                whatToCheck: c.whatToCheck.trim(),
+                scenario: c.scenario.trim(),
+            }))
+                .filter((c) => c.input.length > 0 && c.whatToCheck.length > 0 && c.scenario.length > 0);
             return cases.length >= expectedCount ? cases : null;
         };
         const first = await attempt(userPrompt);
@@ -128,26 +205,32 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
             }
         }
         try {
-            const rows = cases.map((c) => ({
-                [INPUT_COLUMN]: c.input,
-                [CRITERIA_COLUMN]: c.whatToCheck,
-            }));
-            await this.dataTableService.insertRows(table.id, projectId, rows);
+            if (cases.length > 0) {
+                const rows = cases.map((c) => ({
+                    [INPUT_COLUMN]: c.input,
+                    [CRITERIA_COLUMN]: c.whatToCheck,
+                }));
+                await this.dataTableService.insertRows(table.id, projectId, rows);
+            }
+            const columnMapping = { input: INPUT_COLUMN, criteria: CRITERIA_COLUMN };
             const dataset = await this.datasetRepository.createDataset({
                 name,
                 agentId,
                 datasetSource: 'data_table',
                 datasetRef: { dataTableId: table.id },
-                columnMapping: { input: INPUT_COLUMN, criteria: CRITERIA_COLUMN },
+                columnMapping,
                 createdById,
             });
-            return { datasetId: dataset.id, dataTableId: table.id };
+            return { datasetId: dataset.id, dataTableId: table.id, columnMapping };
         }
         catch (error) {
             await this.rollBackDataTable(table.id, projectId);
             throw error;
         }
     }
+    async deleteDraftTable(dataTableId, projectId) {
+        await this.dataTableService.deleteDataTable(dataTableId, projectId);
+    }
     async rollBackDataTable(dataTableId, projectId) {
         try {
             await this.dataTableService.deleteDataTable(dataTableId, projectId);
@@ -163,17 +246,33 @@ let AgentEvalCaseGenerationService = class AgentEvalCaseGenerationService {
 exports.AgentEvalCaseGenerationService = AgentEvalCaseGenerationService;
 exports.AgentEvalCaseGenerationService = AgentEvalCaseGenerationService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, agent_config_service_1.AgentConfigService, credentials_service_1.CredentialsService, data_table_service_1.DataTableService, db_1.AgentEvalDatasetRepository, agent_evals_flag_gate_1.AgentEvalsFlagGate, backend_services_1.InstanceWriteAccessService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, agent_config_service_1.AgentConfigService, credentials_service_1.CredentialsService, data_table_service_1.DataTableService, db_1.AgentEvalDatasetRepository, agent_evals_flag_gate_1.AgentEvalsFlagGate, backend_services_1.InstanceWriteAccessService, agent_test_run_service_1.AgentTestRunService])
 ], AgentEvalCaseGenerationService);
 function boundCases(cases, limit) {
     return cases.slice(0, limit).map((c) => ({
         input: truncateText(c.input, MAX_CASE_TEXT_CHARS),
         whatToCheck: truncateText(c.whatToCheck, MAX_CASE_TEXT_CHARS),
+        scenario: truncateText(c.scenario, MAX_SCENARIO_CHARS),
     }));
 }
 function truncateText(text, max) {
     return text.length > max ? text.slice(0, max) : text;
 }
+function toRevisionContext(options) {
+    const suggestion = options.suggestion?.trim();
+    const previousInput = options.previousInput?.trim();
+    if (!suggestion || !previousInput)
+        return undefined;
+    const previousOutput = options.previousOutput?.trim() ?? '';
+    return { suggestion, previousInput, previousOutput };
+}
+function toExampleContext(options) {
+    const input = options.exampleInput?.trim();
+    const output = options.exampleOutput?.trim();
+    if (!input || !output)
+        return undefined;
+    return { input, output };
+}
 function clampCount(count) {
     if (count === undefined || !Number.isFinite(count))
         return DEFAULT_CASE_COUNT;