n8n 2.33.2 → 2.34.0

package/dist/executions/execution-recovery.service.js

@@ -16,6 +16,8 @@ const db_1 = require("@n8n/db");
 const db_2 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
+const sleep_1 = require("@n8n/utils/sleep");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const constants_1 = require("../constants");
@@ -58,17 +60,26 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
                     continue;
                 }
                 if (workflow.activeVersionId !== null) {
-                    await this.workflowRepository.updateActiveState(workflowId, false);
-                    this.logger.warn(`Autodeactivated workflow ${workflowId} due to too many crashed executions.`);
-                    const recipient = await this.getAutodeactivationRecipient(workflow);
-                    await this.userManagementMailer.notifyWorkflowAutodeactivated({
-                        recipient,
-                        workflow,
-                    });
-                    this.push.once('editorUiConnected', async () => {
-                        await (0, n8n_workflow_1.sleep)(1000);
-                        this.push.broadcast({ type: 'workflowAutoDeactivated', data: { workflowId } });
-                    });
+                    try {
+                        const { WorkflowService } = await import('../workflows/workflow.service.js');
+                        await di_1.Container.get(WorkflowService).deactivateWorkflowAsSystem(workflowId);
+                        this.logger.warn(`Autodeactivated workflow ${workflowId} due to too many crashed executions.`);
+                        const recipient = await this.getAutodeactivationRecipient(workflow);
+                        await this.userManagementMailer.notifyWorkflowAutodeactivated({
+                            recipient,
+                            workflow,
+                        });
+                        this.push.once('editorUiConnected', async () => {
+                            await (0, sleep_1.sleep)(1000);
+                            this.push.broadcast({ type: 'workflowAutoDeactivated', data: { workflowId } });
+                        });
+                    }
+                    catch (error) {
+                        this.logger.error(`Failed to auto-deactivate workflow ${workflowId}`, {
+                            workflowId,
+                            error: (0, ensure_error_1.ensureError)(error),
+                        });
+                    }
                 }
                 await this.executionRepository.update({ workflowId, status: (0, db_1.In)(['running', 'new']) }, { status: 'crashed', stoppedAt: new Date() });
             }
@@ -86,7 +97,7 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
         await this.executionPersistence.updateExistingExecution(executionId, amendedExecution);
         await this.runHooks(amendedExecution);
         this.push.once('editorUiConnected', async () => {
-            await (0, n8n_workflow_1.sleep)(1000);
+            await (0, sleep_1.sleep)(1000);
             this.push.broadcast({ type: 'executionRecovered', data: { executionId } });
         });
         return amendedExecution;

package/dist/executions/execution-recovery.service.js.map

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

package/dist/external-hooks.d.ts

@@ -5,7 +5,7 @@ import { GlobalConfig } from '@n8n/config';
 import type { TagEntity, User, ICredentialsDb, PublicUser } from '@n8n/db';
 import { CredentialsRepository, WorkflowRepository, SettingsRepository, UserRepository } from '@n8n/db';
 import { ErrorReporter } from 'n8n-core';
-import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
+import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode, WorkflowExecutionSource } from 'n8n-workflow';
 import type clientOAuth1 from 'oauth-1.0a';
 import type { AbstractServer } from './abstract-server';
 import type { Config } from './config';
@@ -92,7 +92,8 @@ type ExternalHooksMap = {
     'workflow.preExecute': [
         workflow: Workflow,
         mode: WorkflowExecuteMode,
-        workflowContext: WorkflowHookContextService
+        workflowContext: WorkflowHookContextService,
+        source?: WorkflowExecutionSource
     ];
     'workflow.postExecute': [
         fullRunData: IRun | undefined,

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/instance-settings-loader/loaders/sso/oidc.instance-settings-loader.js

@@ -35,6 +35,8 @@ const oidcEnvSchema = zod_1.z
         }),
     }),
     oidcAcrValues: zod_1.z.string(),
+    oidcAdditionalScopes: zod_1.z.string(),
+    oidcRpInitiatedLogoutEnabled: zod_1.z.boolean(),
 })
     .transform((input) => ({
     clientId: input.oidcClientId,
@@ -48,6 +50,8 @@ const oidcEnvSchema = zod_1.z
             .map((v) => v.trim())
             .filter(Boolean)
         : [],
+    additionalScopes: input.oidcAdditionalScopes,
+    rpInitiatedLogoutEnabled: input.oidcRpInitiatedLogoutEnabled,
 }));
 let OidcInstanceSettingsLoader = class OidcInstanceSettingsLoader {
     constructor(config, settingsRepository, cipher, logger) {

package/dist/instance-settings-loader/loaders/sso/oidc.instance-settings-loader.js.map

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

package/dist/interfaces.d.ts

@@ -70,6 +70,10 @@ export interface IExecutionsCurrentSummary {
     workflowId: string;
     status: ExecutionStatus;
 }
+export interface ResumableExecution {
+    executionId: string;
+    expectedStatus: Extract<ExecutionStatus, 'new' | 'waiting'>;
+}
 export interface IExecutingWorkflowData {
     executionData: IWorkflowExecutionDataProcess;
     startedAt: Date;
@@ -124,6 +128,7 @@ export interface IExecutionTrackProperties extends ITelemetryTrackProperties {
 export interface IAgentExecutionTrackProperties extends ITelemetryTrackProperties {
     agent_id: string;
     user_id?: string;
+    run_type: AgentRunTelemetryType;
     message_count?: number;
     token_count?: number;
     tool_call_count?: number;
@@ -148,6 +153,7 @@ export interface IAgentTurnFinishedTrackProperties extends ITelemetryTrackProper
     configuration: IAgentConfigurationTelemetryProperties;
     latency_ms: number;
     cost: number;
+    token_count: number;
     tool_call_count: number;
 }
 export interface ILicenseReadResponse {

package/dist/metrics/prometheus/scheduler-metrics.service.d.ts

@@ -1,6 +1,6 @@
 import { PrometheusMetricsConfig } from '@n8n/config';
 import { ScheduledTaskRepository } from '@n8n/db';
-import type { SchedulerMetrics } from '@n8n/scheduler';
+import type { MisfireCount, SchedulerMetrics } from '@n8n/scheduler';
 import { InstanceSettings } from 'n8n-core';
 import { CacheService } from '../../services/cache/cache.service';
 import type { PrometheusMetricsCollector } from './base';
@@ -15,6 +15,9 @@ export declare class PrometheusSchedulerMetricsService implements PrometheusMetr
     private taskRetries;
     private occurrencesMaterialized;
     private jobsDeferred;
+    private occurrencesMisfired;
+    private occurrencesRetired;
+    private occurrencesMissed;
     private tasksReclaimed;
     private tasksDeadLettered;
     private tasksPruned;
@@ -29,7 +32,9 @@ export declare class PrometheusSchedulerMetricsService implements PrometheusMetr
     recordRetry(taskType: string): void;
     observeDispatchLagSeconds(taskType: string, seconds: number): void;
     recordMaterialized(occurrences: number, deferredJobs: number): void;
-    recordReaped(reclaimed: number, deadLettered: number): void;
+    recordMisfired(discarded: MisfireCount[]): void;
+    recordRetired(retired: number): void;
+    recordReaped(reclaimed: number, deadLettered: number, missed: number): void;
     recordDeadLettered(): void;
     recordPruned(deleted: number): void;
 }

package/dist/metrics/prometheus/scheduler-metrics.service.js

@@ -64,6 +64,19 @@ let PrometheusSchedulerMetricsService = class PrometheusSchedulerMetricsService
             name: `${prefix}scheduler_jobs_deferred_total`,
             help: 'Total number of jobs deferred for retry during materialization.',
         });
+        this.occurrencesMisfired = new prom_client_1.default.Counter({
+            name: `${prefix}scheduler_occurrences_misfired_total`,
+            help: "Total number of due occurrences a schedule's misfire policy discarded rather than record, by task type and policy.",
+            labelNames: ['task_type', 'policy'],
+        });
+        this.occurrencesRetired = new prom_client_1.default.Counter({
+            name: `${prefix}scheduler_occurrences_retired_total`,
+            help: 'Total number of already-recorded occurrences retired because a catch-up run superseded them.',
+        });
+        this.occurrencesMissed = new prom_client_1.default.Counter({
+            name: `${prefix}scheduler_occurrences_missed_total`,
+            help: 'Total number of pending occurrences the reaper marked missed after they went past their deadline unclaimed.',
+        });
         this.tasksReclaimed = new prom_client_1.default.Counter({
             name: `${prefix}scheduler_tasks_reclaimed_total`,
             help: 'Total number of expired scheduler tasks reclaimed by the reaper.',
@@ -84,6 +97,8 @@ let PrometheusSchedulerMetricsService = class PrometheusSchedulerMetricsService
         });
         this.occurrencesMaterialized.inc(0);
         this.jobsDeferred.inc(0);
+        this.occurrencesRetired.inc(0);
+        this.occurrencesMissed.inc(0);
         this.tasksReclaimed.inc(0);
         this.tasksDeadLettered.inc(0);
         this.tasksPruned.inc(0);
@@ -159,10 +174,23 @@ let PrometheusSchedulerMetricsService = class PrometheusSchedulerMetricsService
             this.jobsDeferred.inc(deferredJobs);
         }
     }
-    recordReaped(reclaimed, deadLettered) {
+    recordMisfired(discarded) {
+        if (this.initialized) {
+            for (const group of discarded) {
+                this.occurrencesMisfired.inc({ task_type: group.taskType, policy: group.policy }, group.discarded);
+            }
+        }
+    }
+    recordRetired(retired) {
+        if (this.initialized) {
+            this.occurrencesRetired.inc(retired);
+        }
+    }
+    recordReaped(reclaimed, deadLettered, missed) {
         if (this.initialized) {
             this.tasksReclaimed.inc(reclaimed);
             this.tasksDeadLettered.inc(deadLettered);
+            this.occurrencesMissed.inc(missed);
         }
     }
     recordDeadLettered() {

package/dist/metrics/prometheus/scheduler-metrics.service.js.map

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

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

@@ -19,4 +19,5 @@ export declare class PrometheusWorkflowPublicationMetricsService implements Prom
     private initTriggerMetrics;
     private initCleanupMetrics;
     private initReconciliationMetrics;
+    private initGhostSweepMetrics;
 }

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

@@ -49,6 +49,7 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
         this.initTriggerMetrics();
         this.initCleanupMetrics();
         this.initReconciliationMetrics();
+        this.initGhostSweepMetrics();
     }
     initOutboxGauges() {
         const repository = this.outboxRepository;
@@ -161,19 +162,39 @@ let PrometheusWorkflowPublicationMetricsService = class PrometheusWorkflowPublic
             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 statusDrift = new prom_client_1.default.Counter({
+            name: `${prefix}workflow_publication_reconciliation_status_drift_workflows_total`,
+            help: 'Total number of workflows re-enqueued by reconciliation because a trigger-status row was recorded for a version other than the active one.',
+        });
+        const unreported = new prom_client_1.default.Counter({
+            name: `${prefix}workflow_publication_reconciliation_unreported_workflows_total`,
+            help: 'Total number of published workflows re-enqueued by reconciliation because no publication had reported trigger statuses for them.',
+        });
         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, surplusCount, versionSkewCount, durationMs }) => {
+        this.eventService.on('workflow-publication-reconciliation', ({ result, deficientCount, surplusCount, versionSkewCount, statusDriftCount, unreportedCount, durationMs, }) => {
             deficient.inc(deficientCount);
             surplus.inc(surplusCount);
             versionSkew.inc(versionSkewCount);
+            statusDrift.inc(statusDriftCount);
+            unreported.inc(unreportedCount);
             duration.observe({ result }, durationMs * constants_1.Time.milliseconds.toSeconds);
         });
     }
+    initGhostSweepMetrics() {
+        const prefix = this.config.prefix;
+        const removed = new prom_client_1.default.Counter({
+            name: `${prefix}workflow_publication_reconciliation_ghost_trigger_workflows_total`,
+            help: 'Total number of workflows whose ghost triggers were torn down because they were registered on a non-leader instance.',
+        });
+        this.eventService.on('workflow-publication-ghost-trigger-sweep', ({ removedCount }) => {
+            removed.inc(removedCount);
+        });
+    }
 };
 exports.PrometheusWorkflowPublicationMetricsService = PrometheusWorkflowPublicationMetricsService;
 exports.PrometheusWorkflowPublicationMetricsService = PrometheusWorkflowPublicationMetricsService = __decorate([

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":";;;;;;;;;;;;;;;AAAA,wCAAuE;AACvE,8CAAsC;AACtC,gCAA+F;AAC/F,gCAAkC;AAClC,uCAA4C;AAC5C,8DAAqC;AAErC,0DAAsD;AACtD,kEAA8D;AAG9D,+DAA0D;AAC1D,yCAAsD;AAEtD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,oCAA+B,CAAC,CAAC;AACpE,MAAM,eAAe,GAAG;IACvB,oCAA+B,CAAC,OAAO;IACvC,oCAA+B,CAAC,UAAU;CAC1C,CAAC;AAEF,MAAM,sBAAsB,GAAG,qDAAqD,CAAC;AAe9E,IAAM,2CAA2C,GAAjD,MAAM,2CAA2C;IACvD,YACkB,MAA+B,EAC/B,eAAgC,EAChC,gBAAkC,EAClC,YAA0B,EAC1B,gBAAqD,EACrD,YAA0B;sBAL1B,MAAM;+BACN,eAAe;gCACf,gBAAgB;4BAChB,YAAY;gCACZ,gBAAgB;4BAChB,YAAY;IAC3B,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,CACN,IAAI,CAAC,MAAM,CAAC,iCAAiC;YAC7C,IAAI,CAAC,eAAe,CAAC,6BAA6B;YAClD,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,MAAM,CAC7C,CAAC;IACH,CAAC;IAED,IAAI;QACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAChC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAClC,CAAC;IAEO,gBAAgB;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAIlC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,iCAAiC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAE7F,MAAM,KAAK,GAAG,IAAI,uCAAiB,CAAsB;YACxD,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,sBAAsB;YAChC,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK,IAAI,EAAE;gBACjB,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,sBAAsB,EAAE,CAAC;gBACxD,MAAM,QAAQ,GAAwB,EAAE,CAAC;gBACzC,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;oBAC1D,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnE,CAAC;gBACD,OAAO,QAAQ,CAAC;YACjB,CAAC;SACD,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,MAAM,qCAAqC;YACpD,IAAI,EAAE,0DAA0D;YAChE,UAAU,EAAE,CAAC,QAAQ,CAAC;YACtB,KAAK,CAAC,OAAO;gBACZ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;gBACnC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;oBACnC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;gBACpD,CAAC;YACF,CAAC;SACD,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,MAAM,8DAA8D;YAC7E,IAAI,EAAE,yGAAyG;YAC/G,UAAU,EAAE,CAAC,QAAQ,CAAC;YACtB,KAAK,CAAC,OAAO;gBACZ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;gBACnC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;oBACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;oBAC5C,IAAI,CAAC,GAAG,CACP,EAAE,MAAM,EAAE,EACV,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC3E,CAAC;gBACH,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;IAEO,wBAAwB;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YACvC,IAAI,EAAE,GAAG,MAAM,mDAAmD;YAClE,IAAI,EAAE,qFAAqF;YAC3F,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAChC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,SAAS,CAAC;YACzC,IAAI,EAAE,GAAG,MAAM,qDAAqD;YACpE,IAAI,EAAE,8FAA8F;YACpG,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;YAChC,OAAO,EAAE,mCAAwB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,EAAE,CACnB,8CAA8C,EAC9C,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;YAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;YACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAChF,CAAC,CACD,CAAC;IACH,CAAC;IAEO,kBAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,MAAM,iBAAiB,GAAG,IAAI,qBAAU,CAAC,SAAS,CAAC;YAClD,IAAI,EAAE,GAAG,MAAM,yDAAyD;YACxE,IAAI,EAAE,0FAA0F;YAChG,UAAU,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,mCAAwB;SACjC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YAC7C,IAAI,EAAE,GAAG,MAAM,oDAAoD;YACnE,IAAI,EAAE,kGAAkG;YACxG,UAAU,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC;SACnC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,EAAE,CACnB,wCAAwC,EACxC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;YACrC,iBAAiB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC5F,CAAC,CACD,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,EAAE,CACnB,8CAA8C,EAC9C,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YAChC,cAAc,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC,CACD,CAAC;IACH,CAAC;IAEO,kBAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,MAAM,OAAO,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YACtC,IAAI,EAAE,GAAG,MAAM,2DAA2D;YAC1E,IAAI,EAAE,kFAAkF;SACxF,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,SAAS,CAAC;YACzC,IAAI,EAAE,GAAG,MAAM,sDAAsD;YACrE,IAAI,EAAE,6EAA6E;YACnF,UAAU,EAAE,CAAC,QAAQ,CAAC;YACtB,OAAO,EAAE,mCAAwB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,EAAE,CACnB,qCAAqC,EACrC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE;YACxC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC,CACD,CAAC;IACH,CAAC;IAEO,yBAAyB;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElC,MAAM,SAAS,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YACxC,IAAI,EAAE,GAAG,MAAM,+DAA+D;YAC9E,IAAI,EAAE,gHAAgH;SACtH,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YACtC,IAAI,EAAE,GAAG,MAAM,6DAA6D;YAC5E,IAAI,EAAE,iHAAiH;SACvH,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,qBAAU,CAAC,OAAO,CAAC;YAC1C,IAAI,EAAE,GAAG,MAAM,kEAAkE;YACjF,IAAI,EAAE,2HAA2H;SACjI,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,SAAS,CAAC;YACzC,IAAI,EAAE,GAAG,MAAM,sDAAsD;YACrE,IAAI,EAAE,iEAAiE;YACvE,UAAU,EAAE,CAAC,QAAQ,CAAC;YACtB,OAAO,EAAE,mCAAwB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,EAAE,CACnB,qCAAqC,EACrC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1E,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1B,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC,CACD,CAAC;IACH,CAAC;CACD,CAAA;;sDAjMY,2CAA2C;IADvD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB,EACd,wBAAe,EACd,2BAAgB,EACpB,4BAAY,EACR,wCAAmC,EACvC,4BAAY;GAPhC,2CAA2C,CAiMvD"}
+{"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/agent-evals/agent-eval-case-generation.service.d.ts

@@ -0,0 +1,25 @@
+import { type GenerateDraftCasesOptions, type GenerateDraftCasesResult } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
+import type { User } from '@n8n/db';
+import { AgentEvalDatasetRepository } from '@n8n/db';
+import { CredentialsService } from '../../credentials/credentials.service';
+import { SourceControlPreferencesService } from '../../modules/source-control.ee/source-control-preferences.service.ee';
+import { AgentEvalsFlagGate } from './agent-evals-flag-gate';
+import { AgentConfigService } from '../agents/agent-config.service';
+import { DataTableService } from '../data-table/data-table.service';
+export declare class AgentEvalCaseGenerationService {
+    private readonly logger;
+    private readonly agentConfigService;
+    private readonly credentialsService;
+    private readonly dataTableService;
+    private readonly datasetRepository;
+    private readonly flagGate;
+    private readonly sourceControlPreferencesService;
+    constructor(logger: Logger, agentConfigService: AgentConfigService, credentialsService: CredentialsService, dataTableService: DataTableService, datasetRepository: AgentEvalDatasetRepository, flagGate: AgentEvalsFlagGate, sourceControlPreferencesService: SourceControlPreferencesService);
+    generateDraftCases(user: User, projectId: string, agentId: string, options?: GenerateDraftCasesOptions): Promise<GenerateDraftCasesResult>;
+    private assertInstanceWriteAccess;
+    private resolveAgentModel;
+    private invokeModel;
+    private persistDataset;
+    private rollBackDataTable;
+}

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

@@ -0,0 +1,192 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.AgentEvalCaseGenerationService = void 0;
+const agent_config_1 = require("@n8n/ai-utilities/agent-config");
+const api_types_1 = require("@n8n/api-types");
+const backend_common_1 = require("@n8n/backend-common");
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const n8n_workflow_1 = require("n8n-workflow");
+const credentials_service_1 = require("../../credentials/credentials.service");
+const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
+const source_control_preferences_service_ee_1 = require("../../modules/source-control.ee/source-control-preferences.service.ee");
+const agent_evals_flag_gate_1 = require("./agent-evals-flag-gate");
+const agent_config_service_1 = require("../agents/agent-config.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");
+const model_config_1 = require("../agents/json-config/model-config");
+const agent_credential_provider_1 = require("../agents/utils/agent-credential-provider");
+const data_table_service_1 = require("../data-table/data-table.service");
+const data_table_name_conflict_error_1 = require("../data-table/errors/data-table-name-conflict.error");
+const DEFAULT_CASE_COUNT = 6;
+const MAX_CASE_COUNT = 20;
+const MAX_CASE_TEXT_CHARS = 2_000;
+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, sourceControlPreferencesService) {
+        this.logger = logger;
+        this.agentConfigService = agentConfigService;
+        this.credentialsService = credentialsService;
+        this.dataTableService = dataTableService;
+        this.datasetRepository = datasetRepository;
+        this.flagGate = flagGate;
+        this.sourceControlPreferencesService = sourceControlPreferencesService;
+    }
+    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 capabilities = (0, case_generation_prompt_1.deriveCapabilities)(config);
+        const tuples = (0, dimensions_1.sampleDimensionTuples)(capabilities, count);
+        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 cases = boundCases(generated, tuples.length);
+        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);
+        this.logger.debug('Generated draft eval cases', {
+            agentId,
+            datasetId,
+            caseCount: cases.length,
+        });
+        return { datasetId, dataTableId, cases };
+    }
+    assertInstanceWriteAccess() {
+        if (this.sourceControlPreferencesService.getPreferences().branchReadOnly) {
+            throw new forbidden_error_1.ForbiddenError('Cannot generate eval cases on a protected instance. This instance is in read-only mode.');
+        }
+    }
+    async resolveAgentModel(config, projectId, user) {
+        const { model, credential } = config;
+        if (!model || !credential || credential === api_types_1.MANAGED_CREDENTIAL_TOKEN) {
+            throw new n8n_workflow_1.UserError('This agent needs a configured model and API-key credential before draft cases can be generated.');
+        }
+        if (!(0, credential_field_mapping_1.isSupportedAgentProvider)((0, agent_config_1.getProviderPrefix)(model))) {
+            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);
+    }
+    async invokeModel(modelConfig, userPrompt, expectedCount) {
+        const { Agent } = await import('@n8n/agents');
+        const agent = new Agent('agent-eval-case-generation')
+            .model(modelConfig)
+            .instructions(case_generation_prompt_1.CASE_GENERATION_SYSTEM_PROMPT)
+            .structuredOutput(case_generation_prompt_1.generatedCasesSchema);
+        const attempt = async (prompt) => {
+            const result = await agent.generate(prompt, {
+                abortSignal: AbortSignal.timeout(GENERATE_TIMEOUT_MS),
+            });
+            const parsed = case_generation_prompt_1.generatedCasesSchema.safeParse(result.structuredOutput);
+            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);
+            return cases.length >= expectedCount ? cases : null;
+        };
+        const first = await attempt(userPrompt);
+        if (first)
+            return first;
+        const retry = await attempt(`${userPrompt}\n\nReturn ONLY a JSON object with exactly ${expectedCount} cases matching the required schema — no extra keys, no prose.`);
+        if (retry)
+            return retry;
+        throw new n8n_workflow_1.OperationalError('Case generation returned fewer valid cases than requested after a retry');
+    }
+    async persistDataset(projectId, agentId, createdById, baseName, cases) {
+        const columns = [
+            { name: INPUT_COLUMN, type: 'string' },
+            { name: CRITERIA_COLUMN, type: 'string' },
+        ];
+        let table;
+        let name = baseName;
+        for (let attempt = 0; table === undefined; attempt++) {
+            name = attempt === 0 ? baseName : suffixedName(baseName, attempt + 1);
+            try {
+                table = await this.dataTableService.createDataTable(projectId, { name, columns });
+            }
+            catch (error) {
+                if (error instanceof data_table_name_conflict_error_1.DataTableNameConflictError && attempt < MAX_NAME_ATTEMPTS - 1) {
+                    continue;
+                }
+                throw error;
+            }
+        }
+        try {
+            const rows = cases.map((c) => ({
+                [INPUT_COLUMN]: c.input,
+                [CRITERIA_COLUMN]: c.whatToCheck,
+            }));
+            await this.dataTableService.insertRows(table.id, projectId, rows);
+            const dataset = await this.datasetRepository.createDataset({
+                name,
+                agentId,
+                datasetSource: 'data_table',
+                datasetRef: { dataTableId: table.id },
+                columnMapping: { input: INPUT_COLUMN, criteria: CRITERIA_COLUMN },
+                createdById,
+            });
+            return { datasetId: dataset.id, dataTableId: table.id };
+        }
+        catch (error) {
+            await this.rollBackDataTable(table.id, projectId);
+            throw error;
+        }
+    }
+    async rollBackDataTable(dataTableId, projectId) {
+        try {
+            await this.dataTableService.deleteDataTable(dataTableId, projectId);
+        }
+        catch (cleanupError) {
+            this.logger.error('Failed to clean up data table after case-generation failure', {
+                dataTableId,
+                error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
+            });
+        }
+    }
+};
+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, source_control_preferences_service_ee_1.SourceControlPreferencesService])
+], 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),
+    }));
+}
+function truncateText(text, max) {
+    return text.length > max ? text.slice(0, max) : text;
+}
+function clampCount(count) {
+    if (count === undefined || !Number.isFinite(count))
+        return DEFAULT_CASE_COUNT;
+    return Math.min(Math.max(Math.trunc(count), 1), MAX_CASE_COUNT);
+}
+function defaultDatasetName(agentName) {
+    return truncateName(`Draft cases for ${agentName}`);
+}
+function suffixedName(baseName, n) {
+    const suffix = ` (${n})`;
+    return `${truncateName(baseName, 128 - suffix.length)}${suffix}`;
+}
+function truncateName(name, max = 128) {
+    return truncateText(name, max);
+}
+//# sourceMappingURL=agent-eval-case-generation.service.js.map