n8n 2.41.4 → 2.42.1

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.d.ts

@@ -1,4 +1,4 @@
-import type { InstanceAiEvent, InstanceAiSetupItem } from '@n8n/api-types';
+import type { AiPreferencesAppliedPayload, InstanceAiEvent, InstanceAiSetupItem } from '@n8n/api-types';
 import type { StoredEvent } from '@n8n/instance-ai';
 import { DataSource, Repository } from '@n8n/typeorm';
 import { InstanceAiEventLogEntry } from '../entities/instance-ai-event-log-entry.entity';
@@ -34,6 +34,9 @@ export declare class InstanceAiEventLogRepository extends Repository<InstanceAiE
         workflowId: string;
         items: InstanceAiSetupItem[];
     }>>;
+    getLastPreferencesInjectionRunId(threadId: string): Promise<string | undefined>;
+    getLastAppliedPreferences(threadId: string): Promise<AiPreferencesAppliedPayload | undefined>;
+    private findLastPreferencesApplied;
     lastFactAt(threadId: string, runId: string): Promise<Date | null>;
     findUnfinishedRuns(threadId?: string): Promise<UnfinishedRun[]>;
     private toEvent;

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.js

@@ -134,6 +134,25 @@ let InstanceAiEventLogRepository = class InstanceAiEventLogRepository extends ty
         }
         return [...latest.entries()].map(([workflowId, items]) => ({ workflowId, items }));
     }
+    async getLastPreferencesInjectionRunId(threadId) {
+        const event = await this.findLastPreferencesApplied(threadId);
+        if (!event)
+            return undefined;
+        return event.payload.injectedThisTurn ? event.runId : event.payload.carriedFromRunId;
+    }
+    async getLastAppliedPreferences(threadId) {
+        return (await this.findLastPreferencesApplied(threadId))?.payload;
+    }
+    async findLastPreferencesApplied(threadId) {
+        const row = await this.findOne({
+            where: { threadId, type: 'preferences-applied' },
+            order: { seq: 'DESC' },
+        });
+        if (!row)
+            return undefined;
+        const event = this.toEvent(row);
+        return event.type === 'preferences-applied' ? event : undefined;
+    }
     async lastFactAt(threadId, runId) {
         const row = await this.createQueryBuilder('e')
             .select('MAX(e.createdAt)', 'max')

package/dist/modules/instance-ai/repositories/instance-ai-event-log.repository.js.map

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

package/dist/modules/instance-ai/repositories/instance-ai-observation-cursor.repository.d.ts

@@ -2,4 +2,5 @@ import { DataSource, Repository } from '@n8n/typeorm';
 import { InstanceAiObservationCursor } from '../entities/instance-ai-observation-cursor.entity';
 export declare class InstanceAiObservationCursorRepository extends Repository<InstanceAiObservationCursor> {
     constructor(dataSource: DataSource);
+    findForThread(threadId: string): Promise<InstanceAiObservationCursor | null>;
 }

package/dist/modules/instance-ai/repositories/instance-ai-observation-cursor.repository.js

@@ -17,6 +17,9 @@ let InstanceAiObservationCursorRepository = class InstanceAiObservationCursorRep
     constructor(dataSource) {
         super(instance_ai_observation_cursor_entity_1.InstanceAiObservationCursor, dataSource.manager);
     }
+    async findForThread(threadId) {
+        return await this.findOneBy({ observationScopeId: threadId });
+    }
 };
 exports.InstanceAiObservationCursorRepository = InstanceAiObservationCursorRepository;
 exports.InstanceAiObservationCursorRepository = InstanceAiObservationCursorRepository = __decorate([

package/dist/modules/instance-ai/repositories/instance-ai-observation-cursor.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-observation-cursor.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-observation-cursor.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,6GAAgG;AAGzF,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,oBAAuC;IACjG,YAAY,UAAsB;QACjC,KAAK,CAAC,mEAA2B,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;CACD,CAAA;;gDAJY,qCAAqC;IADjD,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,qCAAqC,CAIjD"}
+{"version":3,"file":"instance-ai-observation-cursor.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-observation-cursor.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,6GAAgG;AAGzF,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,oBAAuC;IACjG,YAAY,UAAsB;QACjC,KAAK,CAAC,mEAA2B,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAID,KAAK,CAAC,aAAa,CAAC,QAAgB;QACnC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;CACD,CAAA;;gDAVY,qCAAqC;IADjD,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,qCAAqC,CAUjD"}

package/dist/modules/instance-ai/repositories/instance-ai-observation.repository.d.ts

@@ -2,4 +2,5 @@ import { DataSource, Repository } from '@n8n/typeorm';
 import { InstanceAiObservation } from '../entities/instance-ai-observation.entity';
 export declare class InstanceAiObservationRepository extends Repository<InstanceAiObservation> {
     constructor(dataSource: DataSource);
+    findActiveForThread(threadId: string): Promise<InstanceAiObservation[]>;
 }

package/dist/modules/instance-ai/repositories/instance-ai-observation.repository.js

@@ -17,6 +17,12 @@ let InstanceAiObservationRepository = class InstanceAiObservationRepository exte
     constructor(dataSource) {
         super(instance_ai_observation_entity_1.InstanceAiObservation, dataSource.manager);
     }
+    async findActiveForThread(threadId) {
+        return await this.find({
+            where: { observationScopeId: threadId, status: 'active' },
+            order: { createdAt: 'ASC', id: 'ASC' },
+        });
+    }
 };
 exports.InstanceAiObservationRepository = InstanceAiObservationRepository;
 exports.InstanceAiObservationRepository = InstanceAiObservationRepository = __decorate([

package/dist/modules/instance-ai/repositories/instance-ai-observation.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-observation.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-observation.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,+FAAmF;AAG5E,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,oBAAiC;IACrF,YAAY,UAAsB;QACjC,KAAK,CAAC,sDAAqB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;CACD,CAAA;;0CAJY,+BAA+B;IAD3C,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,+BAA+B,CAI3C"}
+{"version":3,"file":"instance-ai-observation.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-observation.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,+FAAmF;AAG5E,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,oBAAiC;IACrF,YAAY,UAAsB;QACjC,KAAK,CAAC,sDAAqB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAID,KAAK,CAAC,mBAAmB,CAAC,QAAgB;QACzC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE;YACzD,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE;SACtC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;0CAbY,+BAA+B;IAD3C,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,+BAA+B,CAa3C"}

package/dist/modules/instance-ai/repositories/instance-ai-thread-tabs.repository.d.ts

@@ -0,0 +1,8 @@
+import type { InstanceAiThreadTabsState } from '@n8n/api-types';
+import { DataSource, Repository } from '@n8n/typeorm';
+import { InstanceAiThreadTabs } from '../entities/instance-ai-thread-tabs.entity';
+export declare class InstanceAiThreadTabsRepository extends Repository<InstanceAiThreadTabs> {
+    constructor(dataSource: DataSource);
+    findState(threadId: string, userId: string): Promise<unknown>;
+    saveState(threadId: string, userId: string, state: InstanceAiThreadTabsState): Promise<void>;
+}

package/dist/modules/instance-ai/repositories/instance-ai-thread-tabs.repository.js

@@ -0,0 +1,33 @@
+"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.InstanceAiThreadTabsRepository = void 0;
+const di_1 = require("@n8n/di");
+const typeorm_1 = require("@n8n/typeorm");
+const instance_ai_thread_tabs_entity_1 = require("../entities/instance-ai-thread-tabs.entity");
+let InstanceAiThreadTabsRepository = class InstanceAiThreadTabsRepository extends typeorm_1.Repository {
+    constructor(dataSource) {
+        super(instance_ai_thread_tabs_entity_1.InstanceAiThreadTabs, dataSource.manager);
+    }
+    async findState(threadId, userId) {
+        const row = await this.findOne({ where: { threadId, userId }, select: ['state'] });
+        return row?.state ?? null;
+    }
+    async saveState(threadId, userId, state) {
+        await this.upsert({ threadId, userId, state, updatedAt: new Date() }, ['threadId', 'userId']);
+    }
+};
+exports.InstanceAiThreadTabsRepository = InstanceAiThreadTabsRepository;
+exports.InstanceAiThreadTabsRepository = InstanceAiThreadTabsRepository = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
+], InstanceAiThreadTabsRepository);
+//# sourceMappingURL=instance-ai-thread-tabs.repository.js.map

package/dist/modules/instance-ai/repositories/instance-ai-thread-tabs.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instance-ai-thread-tabs.repository.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/repositories/instance-ai-thread-tabs.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAClC,0CAAsD;AAEtD,+FAAkF;AAG3E,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,oBAAgC;IACnF,YAAY,UAAsB;QACjC,KAAK,CAAC,qDAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAGD,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,MAAc;QAC/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnF,OAAO,GAAG,EAAE,KAAK,IAAI,IAAI,CAAC;IAC3B,CAAC;IAGD,KAAK,CAAC,SAAS,CACd,QAAgB,EAChB,MAAc,EACd,KAAgC;QAEhC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/F,CAAC;CACD,CAAA;;yCAnBY,8BAA8B;IAD1C,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,8BAA8B,CAmB1C"}

package/dist/modules/instance-registry/checks/instance-registry-reconciliation.task.d.ts

@@ -1,13 +1,12 @@
 import { SystemTask } from '@n8n/decorators';
-import type { SystemTaskEffects, SystemTaskSchedule } from '@n8n/decorators';
+import type { SystemTaskEffects, SystemTaskPlacement, SystemTaskSchedule } from '@n8n/decorators';
 import { CheckService } from './check.service';
 export declare class InstanceRegistryReconciliationTask implements SystemTask {
     private readonly checkService;
     readonly name = "instance-registry-reconciliation";
     readonly schedule: SystemTaskSchedule;
     readonly effects: SystemTaskEffects;
-    readonly durable = false;
-    readonly runOnTakeover = true;
+    readonly placement: SystemTaskPlacement;
     constructor(checkService: CheckService);
     run(signal: AbortSignal): Promise<void>;
 }

package/dist/modules/instance-registry/checks/instance-registry-reconciliation.task.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceRegistryReconciliationTask = void 0;
-const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
 const check_service_1 = require("./check.service");
 const instance_registry_types_1 = require("../instance-registry.types");
@@ -18,13 +17,13 @@ let InstanceRegistryReconciliationTask = class InstanceRegistryReconciliationTas
     constructor(checkService) {
         this.checkService = checkService;
         this.name = 'instance-registry-reconciliation';
-        this.schedule = {
-            kind: 'interval',
-            intervalSeconds: instance_registry_types_1.REGISTRY_CONSTANTS.RECONCILIATION_INTERVAL_MS / constants_1.Time.seconds.toMilliseconds,
-        };
+        this.schedule = (0, decorators_1.intervalFromMilliseconds)(instance_registry_types_1.REGISTRY_CONSTANTS.RECONCILIATION_INTERVAL_MS);
         this.effects = 'idempotent';
-        this.durable = false;
-        this.runOnTakeover = true;
+        this.placement = {
+            scope: 'cluster',
+            durable: false,
+            runOnTakeover: true,
+        };
     }
     async run(signal) {
         await this.checkService.reconcile(signal);

package/dist/modules/instance-registry/checks/instance-registry-reconciliation.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-registry-reconciliation.task.js","sourceRoot":"","sources":["../../../../src/modules/instance-registry/checks/instance-registry-reconciliation.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AACtC,gDAA6C;AAG7C,mDAA+C;AAC/C,wEAAgE;AAQzD,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAc9C,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAb9C,SAAI,GAAG,kCAAkC,CAAC;QAE1C,aAAQ,GAAuB;YACvC,IAAI,EAAE,UAAU;YAChB,eAAe,EAAE,4CAAkB,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;SAC5F,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,YAAO,GAAG,KAAK,CAAC;QAEhB,kBAAa,GAAG,IAAI,CAAC;IAE4B,CAAC;IAE3D,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;CACD,CAAA;;6CAnBY,kCAAkC;IAD9C,IAAA,uBAAU,GAAE;qCAe+B,4BAAY;GAd3C,kCAAkC,CAmB9C"}
+{"version":3,"file":"instance-registry-reconciliation.task.js","sourceRoot":"","sources":["../../../../src/modules/instance-registry/checks/instance-registry-reconciliation.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAuE;AAGvE,mDAA+C;AAC/C,wEAAgE;AAQzD,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAe9C,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAd9C,SAAI,GAAG,kCAAkC,CAAC;QAE1C,aAAQ,GAAuB,IAAA,qCAAwB,EAC/D,4CAAkB,CAAC,0BAA0B,CAC7C,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB;YACzC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;SACnB,CAAC;IAEwD,CAAC;IAE3D,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;CACD,CAAA;;6CApBY,kCAAkC;IAD9C,IAAA,uBAAU,GAAE;qCAgB+B,4BAAY;GAf3C,kCAAkC,CAoB9C"}

package/dist/modules/instance-registry/stale-member-cleanup.task.d.ts

@@ -1,13 +1,13 @@
 import { Logger } from '@n8n/backend-common';
 import { SystemTask } from '@n8n/decorators';
-import type { SystemTaskEffects, SystemTaskSchedule } from '@n8n/decorators';
+import type { SystemTaskEffects, SystemTaskPlacement, SystemTaskSchedule } from '@n8n/decorators';
 import { InstanceRegistryService } from './instance-registry.service';
 export declare class StaleMemberCleanupTask implements SystemTask {
     private readonly instanceRegistryService;
     readonly name = "instance-registry-stale-member-cleanup";
     readonly schedule: SystemTaskSchedule;
     readonly effects: SystemTaskEffects;
-    readonly durable = true;
+    readonly placement: SystemTaskPlacement;
     private readonly logger;
     constructor(logger: Logger, instanceRegistryService: InstanceRegistryService);
     run(): Promise<void>;

package/dist/modules/instance-registry/stale-member-cleanup.task.js

@@ -11,7 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StaleMemberCleanupTask = void 0;
 const backend_common_1 = require("@n8n/backend-common");
-const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
 const instance_registry_service_1 = require("./instance-registry.service");
 const instance_registry_types_1 = require("./instance-registry.types");
@@ -19,12 +18,9 @@ let StaleMemberCleanupTask = class StaleMemberCleanupTask {
     constructor(logger, instanceRegistryService) {
         this.instanceRegistryService = instanceRegistryService;
         this.name = 'instance-registry-stale-member-cleanup';
-        this.schedule = {
-            kind: 'interval',
-            intervalSeconds: instance_registry_types_1.REGISTRY_CONSTANTS.RECONCILIATION_INTERVAL_MS / constants_1.Time.seconds.toMilliseconds,
-        };
+        this.schedule = (0, decorators_1.intervalFromMilliseconds)(instance_registry_types_1.REGISTRY_CONSTANTS.RECONCILIATION_INTERVAL_MS);
         this.effects = 'idempotent';
-        this.durable = true;
+        this.placement = { scope: 'cluster', durable: true };
         this.logger = logger.scoped('instance-registry');
     }
     async run() {

package/dist/modules/instance-registry/stale-member-cleanup.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"stale-member-cleanup.task.js","sourceRoot":"","sources":["../../../src/modules/instance-registry/stale-member-cleanup.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,8CAAsC;AACtC,gDAA6C;AAG7C,2EAAsE;AACtE,uEAA+D;AAOxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAclC,YACC,MAAc,EACG,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAfzD,SAAI,GAAG,wCAAwC,CAAC;QAEhD,aAAQ,GAAuB;YACvC,IAAI,EAAE,UAAU;YAChB,eAAe,EAAE,4CAAkB,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;SAC5F,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,YAAO,GAAG,IAAI,CAAC;QAQvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,GAAG;QACR,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;QACzE,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;CACD,CAAA;;iCA3BY,sBAAsB;IADlC,IAAA,uBAAU,GAAE;qCAgBH,uBAAM,EAC4B,mDAAuB;GAhBtD,sBAAsB,CA2BlC"}
+{"version":3,"file":"stale-member-cleanup.task.js","sourceRoot":"","sources":["../../../src/modules/instance-registry/stale-member-cleanup.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gDAAuE;AAGvE,2EAAsE;AACtE,uEAA+D;AAOxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAalC,YACC,MAAc,EACG,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAdzD,SAAI,GAAG,wCAAwC,CAAC;QAEhD,aAAQ,GAAuB,IAAA,qCAAwB,EAC/D,4CAAkB,CAAC,0BAA0B,CAC7C,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAQ7E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,GAAG;QACR,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;QACzE,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;CACD,CAAA;;iCA1BY,sBAAsB;IADlC,IAAA,uBAAU,GAAE;qCAeH,uBAAM,EAC4B,mDAAuB;GAftD,sBAAsB,CA0BlC"}

package/dist/modules/instance-reporting.ee/database/entities/instance-monitoring-report.d.ts

@@ -12,6 +12,7 @@ export type InstanceReportDataPoint = {
 export type InstanceReportStatus = 'pending' | 'delivered' | 'skipped_after_max_retries';
 export declare class InstanceMonitoringReport extends WithTimestamps {
     id: string;
+    reportDate: string | null;
     dataPoints: InstanceReportDataPoint[];
     status: InstanceReportStatus;
     deliveredAt: Date | null;

package/dist/modules/instance-reporting.ee/database/entities/instance-monitoring-report.js

@@ -19,6 +19,10 @@ __decorate([
     (0, typeorm_1.PrimaryColumn)('uuid'),
     __metadata("design:type", String)
 ], InstanceMonitoringReport.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true }),
+    __metadata("design:type", Object)
+], InstanceMonitoringReport.prototype, "reportDate", void 0);
 __decorate([
     (0, db_1.JsonColumn)(),
     __metadata("design:type", Array)
@@ -44,6 +48,7 @@ __decorate([
     __metadata("design:type", Object)
 ], InstanceMonitoringReport.prototype, "lastError", void 0);
 exports.InstanceMonitoringReport = InstanceMonitoringReport = __decorate([
-    (0, typeorm_1.Entity)()
+    (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)(['reportDate'], { unique: true, where: '"reportDate" IS NOT NULL' })
 ], InstanceMonitoringReport);
 //# sourceMappingURL=instance-monitoring-report.js.map

package/dist/modules/instance-reporting.ee/database/entities/instance-monitoring-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-monitoring-report.js","sourceRoot":"","sources":["../../../../../src/modules/instance-reporting.ee/database/entities/instance-monitoring-report.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAqE;AACrE,0CAA6D;AAgCtD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mBAAc;CA+B3D,CAAA;;AA7BA;IADC,IAAA,uBAAa,EAAC,MAAM,CAAC;;oDACX;AAIX;IADC,IAAA,eAAU,GAAE;;4DACyB;AAItC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;;wDAC/B;AAI7B;IADC,IAAA,mBAAc,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACV;AAIzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACnB;AAQjB;IADC,IAAA,mBAAc,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+DACR;AAI3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAChB;mCA9Bb,wBAAwB;IADpC,IAAA,gBAAM,GAAE;GACI,wBAAwB,CA+BpC"}
+{"version":3,"file":"instance-monitoring-report.js","sourceRoot":"","sources":["../../../../../src/modules/instance-reporting.ee/database/entities/instance-monitoring-report.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAqE;AACrE,0CAAoE;AAmC7D,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mBAAc;CAmC3D,CAAA;;AAjCA;IADC,IAAA,uBAAa,EAAC,MAAM,CAAC;;oDACX;AAIX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC9B;AAI1B;IADC,IAAA,eAAU,GAAE;;4DACyB;AAItC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;;wDAC/B;AAI7B;IADC,IAAA,mBAAc,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACV;AAIzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACnB;AAQjB;IADC,IAAA,mBAAc,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+DACR;AAI3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAChB;mCAlCb,wBAAwB;IAFpC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,CAAC,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;GAC9D,wBAAwB,CAmCpC"}

package/dist/modules/instance-reporting.ee/database/repositories/instance-monitoring-report.repository.d.ts

@@ -5,7 +5,7 @@ export declare class InstanceMonitoringReportRepository extends Repository<Insta
     constructor(dataSource: DataSource);
     findPending(): Promise<InstanceMonitoringReport | null>;
     hasSettledToday(now: Date): Promise<boolean>;
-    createPending(dataPoints: InstanceReportDataPoint[]): Promise<InstanceMonitoringReport>;
+    createPending(dataPoints: InstanceReportDataPoint[], now: Date): Promise<InstanceMonitoringReport | null>;
     findLastCoveredDay(): Promise<string | null>;
     findLastDeliveryTime(): Promise<Date | null>;
     markDelivered(id: string, deliveredAt: Date): Promise<void>;

package/dist/modules/instance-reporting.ee/database/repositories/instance-monitoring-report.repository.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceMonitoringReportRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const uuid_1 = require("uuid");
@@ -23,13 +24,23 @@ let InstanceMonitoringReportRepository = class InstanceMonitoringReportRepositor
         return latest?.status === 'pending' ? latest : null;
     }
     async hasSettledToday(now) {
-        return await this.existsBy({
-            createdAt: (0, typeorm_1.MoreThanOrEqual)(startOfUtcDay(now)),
-            status: (0, typeorm_1.Not)('pending'),
-        });
+        return await this.existsBy({ reportDate: utcDay(now), status: (0, typeorm_1.Not)('pending') });
     }
-    async createPending(dataPoints) {
-        return await this.save(this.create({ id: (0, uuid_1.v4)(), dataPoints, status: 'pending', deliveredAt: null }));
+    async createPending(dataPoints, now) {
+        try {
+            return await this.save(this.create({
+                id: (0, uuid_1.v4)(),
+                reportDate: utcDay(now),
+                dataPoints,
+                status: 'pending',
+                deliveredAt: null,
+            }));
+        }
+        catch (error) {
+            if ((0, db_1.isUniqueConstraintError)(error))
+                return null;
+            throw error;
+        }
     }
     async findLastCoveredDay() {
         const delivered = await this.find({ where: { status: 'delivered' }, select: ['dataPoints'] });
@@ -53,7 +64,7 @@ let InstanceMonitoringReportRepository = class InstanceMonitoringReportRepositor
         await this.update({ id }, { lastAttemptAt: failedAt, lastError: error });
     }
     async markSkipped(id) {
-        await this.update({ id }, { status: 'skipped_after_max_retries' });
+        await this.update({ id, status: 'pending' }, { status: 'skipped_after_max_retries' });
     }
 };
 exports.InstanceMonitoringReportRepository = InstanceMonitoringReportRepository;
@@ -61,7 +72,7 @@ exports.InstanceMonitoringReportRepository = InstanceMonitoringReportRepository
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource])
 ], InstanceMonitoringReportRepository);
-function startOfUtcDay(instant) {
-    return new Date(Date.UTC(instant.getUTCFullYear(), instant.getUTCMonth(), instant.getUTCDate(), 0, 0, 0, 0));
+function utcDay(instant) {
+    return instant.toISOString().slice(0, 10);
 }
 //# sourceMappingURL=instance-monitoring-report.repository.js.map

package/dist/modules/instance-reporting.ee/database/repositories/instance-monitoring-report.repository.js.map

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

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

@@ -25,4 +25,5 @@ export declare class InstanceReportingScheduler {
     private msUntilNextSlot;
     private trySend;
     private scheduleNext;
+    private msUntilRetryAllowed;
 }

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

@@ -21,6 +21,7 @@ const instance_monitoring_report_repository_1 = require("./database/repositories
 const instance_reporting_settings_service_1 = require("./instance-reporting-settings.service");
 const instance_reporting_service_1 = require("./instance-reporting.service");
 const MINUTES_PER_DAY = 24 * 60;
+const RETRY_DELAY_MS = 5 * constants_1.Time.minutes.toMilliseconds;
 let InstanceReportingScheduler = class InstanceReportingScheduler {
     constructor(reportingService, reportRepository, settingsService, instanceSettings, eventService, logger) {
         this.reportingService = reportingService;
@@ -63,20 +64,20 @@ let InstanceReportingScheduler = class InstanceReportingScheduler {
     async tick() {
         try {
             const reportTime = await this.settingsService.getReportTime();
-            const waitMs = Math.min(await this.reportingService.msUntilRetryAllowed(new Date()), await this.msUntilNextSlot(reportTime));
+            const waitMs = Math.min(await this.msUntilRetryAllowed(new Date()), await this.msUntilNextSlot(reportTime));
             if (waitMs > 0) {
                 this.scheduleNext(waitMs);
                 return;
             }
             if ((await this.reportIfDue(reportTime)) === 'failed') {
-                this.scheduleNext(Math.min(instance_reporting_service_1.RETRY_DELAY_MS, await this.msUntilNextSlot(reportTime)));
+                this.scheduleNext(Math.min(RETRY_DELAY_MS, await this.msUntilNextSlot(reportTime)));
                 return;
             }
             this.scheduleNext(msUntilNext(reportTime, new Date()));
         }
         catch (error) {
             this.logger.error('Instance reporting pass failed', { error });
-            this.scheduleNext(instance_reporting_service_1.RETRY_DELAY_MS);
+            this.scheduleNext(RETRY_DELAY_MS);
         }
     }
     async reportIfDue(reportTime) {
@@ -84,7 +85,7 @@ let InstanceReportingScheduler = class InstanceReportingScheduler {
         const pending = await this.reportRepository.findPending();
         if (pending) {
             if (pendingIsStale(pending, reportTime, now)) {
-                await this.reportingService.skip(pending.id, pending.attempts, 'slot-passed');
+                await this.reportingService.skip(pending.id, pending.attempts, 'slot-passed', pending.lastError);
             }
             else {
                 return await this.trySend();
@@ -109,6 +110,10 @@ let InstanceReportingScheduler = class InstanceReportingScheduler {
             return 'sent';
         }
         catch (error) {
+            if (error instanceof instance_reporting_service_1.InstanceReportAlreadyCreatedError) {
+                this.logger.info('Unexpected second instance report triggered for today, ignored because there is already a report for today');
+                return 'failed';
+            }
             this.logger.warn('Failed to deliver the instance report', { error });
             return 'failed';
         }
@@ -118,6 +123,13 @@ let InstanceReportingScheduler = class InstanceReportingScheduler {
             return;
         this.timeout = setTimeout(async () => await this.tick(), delayMs);
     }
+    async msUntilRetryAllowed(now) {
+        const pending = await this.reportRepository.findPending();
+        if (!pending?.lastAttemptAt)
+            return 0;
+        const elapsed = now.getTime() - pending.lastAttemptAt.getTime();
+        return Math.max(0, RETRY_DELAY_MS - elapsed);
+    }
 };
 exports.InstanceReportingScheduler = InstanceReportingScheduler;
 __decorate([

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

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

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

@@ -2,28 +2,33 @@ import { Logger } from '@n8n/backend-common';
 import { OutboundHttp } from '@n8n/backend-network';
 import { LicenseMetricsRepository } from '@n8n/db';
 import { InstanceSettings } from 'n8n-core';
+import { OperationalError } from 'n8n-workflow';
 import { EventService } from '../../events/event.service';
 import { License } from '../../license';
+import { InsightsConfig } from '../../modules/insights/insights.config';
 import { InsightsService } from '../../modules/insights/insights.service';
-import { OwnershipService } from '../../services/ownership.service';
 import { InstanceMonitoringReportRepository } from './database/repositories/instance-monitoring-report.repository';
 import { InstanceReportingConfig } from './instance-reporting.config';
-export declare const RETRY_DELAY_MS: number;
+export declare class InstanceReportAlreadyCreatedError extends OperationalError {
+    constructor();
+}
+type SkipReason = 'max-retries' | 'slot-passed' | 'rejected';
 export declare class InstanceReportingService {
     private readonly config;
     private readonly reportRepository;
     private readonly insightsService;
+    private readonly insightsConfig;
     private readonly instanceSettings;
-    private readonly ownershipService;
     private readonly licenseMetricsRepository;
     private readonly license;
     private readonly logger;
     private readonly eventService;
     private readonly http;
-    constructor(config: InstanceReportingConfig, reportRepository: InstanceMonitoringReportRepository, insightsService: InsightsService, instanceSettings: InstanceSettings, ownershipService: OwnershipService, licenseMetricsRepository: LicenseMetricsRepository, license: License, logger: Logger, eventService: EventService, outboundHttp: OutboundHttp);
+    constructor(config: InstanceReportingConfig, reportRepository: InstanceMonitoringReportRepository, insightsService: InsightsService, insightsConfig: InsightsConfig, instanceSettings: InstanceSettings, licenseMetricsRepository: LicenseMetricsRepository, license: License, logger: Logger, eventService: EventService, outboundHttp: OutboundHttp);
     sendReport(): Promise<void>;
-    skip(id: string, attempts: number, reason: 'max-retries' | 'slot-passed'): Promise<void>;
-    msUntilRetryAllowed(now: Date): Promise<number>;
+    skip(id: string, attempts: number, reason: SkipReason, lastError: string | null): Promise<void>;
     private missedDays;
+    private firstOwedDay;
     private collectDataPoints;
 }
+export {};