n8n 2.28.1 → 2.28.3

package/dist/modules/instance-ai/instance-ai.service.js

@@ -2814,7 +2814,7 @@ let InstanceAiService = class InstanceAiService {
                     }),
                 };
                 const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(threadId, user, aiCreatedWorkflowIds, this.backgroundTasks.getRunningTasks(threadId).length);
-                this.publishRunFinish(threadId, runId, 'cancelled', cancellationReason, archivedWorkflowIds);
+                this.publishRunFinish(threadId, runId, 'cancelled', cancellationReason, archivedWorkflowIds, user.id);
                 if (activeSnapshotStorage) {
                     await this.saveAgentTreeSnapshot(threadId, runId, activeSnapshotStorage);
                 }
@@ -3400,6 +3400,7 @@ let InstanceAiService = class InstanceAiService {
             };
             const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(opts.threadId, opts.user, undefined, this.backgroundTasks.getRunningTasks(opts.threadId).length);
             await this.finalizeRun(opts.threadId, opts.runId, result.status, opts.snapshotStorage, {
+                userId: opts.user.id,
                 archivedWorkflowIds,
                 workSummary: result.workSummary,
                 usage: result.usage,
@@ -3445,7 +3446,7 @@ let InstanceAiService = class InstanceAiService {
                     }),
                 };
                 const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(opts.threadId, opts.user, undefined, this.backgroundTasks.getRunningTasks(opts.threadId).length);
-                this.publishRunFinish(opts.threadId, opts.runId, 'cancelled', cancellationReason, archivedWorkflowIds);
+                this.publishRunFinish(opts.threadId, opts.runId, 'cancelled', cancellationReason, archivedWorkflowIds, opts.user.id);
                 await this.saveAgentTreeSnapshot(opts.threadId, opts.runId, opts.snapshotStorage);
                 return;
             }
@@ -3762,7 +3763,7 @@ let InstanceAiService = class InstanceAiService {
             reason,
         });
         const archivedWorkflowIds = await this.temporaryWorkflowService.reapForRun(suspended.threadId, suspended.user, undefined, this.backgroundTasks.getRunningTasks(suspended.threadId).length);
-        this.publishRunFinish(suspended.threadId, suspended.runId, 'cancelled', reason, archivedWorkflowIds);
+        this.publishRunFinish(suspended.threadId, suspended.runId, 'cancelled', reason, archivedWorkflowIds, suspended.user.id);
         await this.saveAgentTreeSnapshot(suspended.threadId, suspended.runId, this.dbSnapshotStorage, true);
         await this.maybeFinalizeRunTraceRoot(suspended.runId, {
             status: 'cancelled',
@@ -3775,7 +3776,7 @@ let InstanceAiService = class InstanceAiService {
         });
         void this.suspendedThreads.dropPendingConfirmation(suspended.requestId);
     }
-    publishRunFinish(threadId, runId, status, reason, archivedWorkflowIds) {
+    publishRunFinish(threadId, runId, status, reason, archivedWorkflowIds, userId) {
         const effectiveStatus = status === 'errored' ? 'error' : status;
         const hasArchived = archivedWorkflowIds && archivedWorkflowIds.length > 0;
         this.eventBus.publish(threadId, {
@@ -3792,10 +3793,11 @@ let InstanceAiService = class InstanceAiService {
             thread_id: threadId,
             run_id: runId,
             status: effectiveStatus,
+            ...(userId ? { user_id: userId } : {}),
         });
     }
     async finalizeRun(threadId, runId, status, snapshotStorage, options) {
-        this.publishRunFinish(threadId, runId, status, undefined, options?.archivedWorkflowIds);
+        this.publishRunFinish(threadId, runId, status, undefined, options?.archivedWorkflowIds, options?.userId);
         this.emitRunMetrics(threadId, status, options);
         await this.saveAgentTreeSnapshot(threadId, runId, snapshotStorage);
         if (status === 'completed' && options?.userId && options?.modelId) {