n8n 2.7.2 → 2.8.0

package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js

@@ -0,0 +1,205 @@
+"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.ChatHubExecutionWatcherService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const db_1 = require("@n8n/db");
+const decorators_1 = require("@n8n/decorators");
+const di_1 = require("@n8n/di");
+const uuid_1 = require("uuid");
+const chat_execution_manager_1 = require("../../chat/chat-execution-manager");
+const chat_hub_execution_store_service_1 = require("./chat-hub-execution-store.service");
+const chat_hub_execution_service_1 = require("./chat-hub-execution.service");
+const chat_message_repository_1 = require("./chat-message.repository");
+const chat_stream_service_1 = require("./chat-stream.service");
+const utils_1 = require("../../chat/utils");
+let ChatHubExecutionWatcherService = class ChatHubExecutionWatcherService {
+    constructor(logger, executionStore, messageRepository, chatHubExecutionService, executionRepository, chatStreamService, executionManager) {
+        this.logger = logger;
+        this.executionStore = executionStore;
+        this.messageRepository = messageRepository;
+        this.chatHubExecutionService = chatHubExecutionService;
+        this.executionRepository = executionRepository;
+        this.chatStreamService = chatStreamService;
+        this.executionManager = executionManager;
+        this.logger = this.logger.scoped('chat-hub');
+    }
+    async handleExecutionResumed(ctx) {
+        const { executionId } = ctx;
+        const context = await this.executionStore.get(executionId);
+        if (!context)
+            return;
+        if (!context.awaitingResume)
+            return;
+        this.logger.debug('Chat hub execution resumed, notifying frontend', { executionId });
+        await this.chatStreamService.startExecution(context.userId, context.sessionId);
+        if (context.createMessageOnResume) {
+            const newMessageId = (0, uuid_1.v4)();
+            await this.messageRepository.updateChatMessage(context.messageId, { status: 'success' });
+            await this.createNextMessage(context, newMessageId, executionId);
+            await this.executionStore.update(executionId, {
+                previousMessageId: context.messageId,
+                messageId: newMessageId,
+                createMessageOnResume: false,
+                awaitingResume: false,
+            });
+            await this.chatStreamService.startStream({
+                userId: context.userId,
+                sessionId: context.sessionId,
+                messageId: newMessageId,
+                previousMessageId: context.messageId,
+                retryOfMessageId: null,
+                executionId: parseInt(executionId, 10),
+            });
+            return;
+        }
+        await this.executionStore.update(executionId, { awaitingResume: false });
+        await this.chatStreamService.startStream({
+            userId: context.userId,
+            sessionId: context.sessionId,
+            messageId: context.messageId,
+            previousMessageId: context.previousMessageId,
+            retryOfMessageId: null,
+            executionId: parseInt(executionId, 10),
+        });
+    }
+    async handleWorkflowExecuteAfter(ctx) {
+        const { runData, executionId } = ctx;
+        const context = await this.executionStore.get(executionId);
+        if (!context)
+            return;
+        this.logger.debug('Handling workflow execution completion', { executionId });
+        if (!['success', 'waiting', 'canceled'].includes(runData.status)) {
+            const errorMessage = this.chatHubExecutionService.extractErrorMessage(runData) ??
+                'Failed to generate a response';
+            await this.pushErrorResults(context, errorMessage);
+            await this.executionStore.remove(executionId);
+            return;
+        }
+        if (runData.status === 'canceled') {
+            await this.chatStreamService.endExecution(context.userId, context.sessionId, 'cancelled');
+            await this.executionStore.remove(executionId);
+            return;
+        }
+        const message = this.chatHubExecutionService.extractMessage(runData, context.responseMode);
+        if (runData.status === 'waiting') {
+            await this.handleWaitingExecution(context, executionId, message);
+            return;
+        }
+        if (runData.finished) {
+            await this.pushFinalResults(context, message);
+            await this.executionStore.remove(executionId);
+        }
+    }
+    async handleWaitingExecution(context, executionId, message) {
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: message ?? '',
+            status: 'waiting',
+        });
+        if (message) {
+            await this.chatStreamService.sendChunk(context.sessionId, context.messageId, message);
+        }
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'waiting');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'success');
+        if (context.responseMode === 'responseNodes') {
+            const execution = await this.executionRepository.findSingleExecution(executionId, {
+                includeData: true,
+                unflattenData: true,
+            });
+            if (execution) {
+                const lastNode = (0, utils_1.getLastNodeExecuted)(execution);
+                if (lastNode && (0, utils_1.shouldResumeImmediately)(lastNode)) {
+                    await this.triggerAutoResume(context, execution);
+                    return;
+                }
+            }
+        }
+        await this.executionStore.update(executionId, {
+            awaitingResume: true,
+            createMessageOnResume: true,
+        });
+    }
+    async triggerAutoResume(context, execution) {
+        this.logger.debug('Triggering auto-resume of execution', { executionId: execution.id });
+        await this.messageRepository.updateChatMessage(context.messageId, { status: 'success' });
+        const newMessageId = (0, uuid_1.v4)();
+        await this.createNextMessage(context, newMessageId, execution.id);
+        await this.executionStore.update(execution.id, {
+            previousMessageId: context.messageId,
+            messageId: newMessageId,
+            awaitingResume: true,
+            createMessageOnResume: false,
+        });
+        void this.executionManager.runWorkflow(execution, {
+            action: 'sendMessage',
+            chatInput: '',
+            sessionId: context.sessionId,
+        });
+    }
+    async createNextMessage(context, messageId, executionId) {
+        await this.messageRepository.createChatMessage({
+            id: messageId,
+            sessionId: context.sessionId,
+            previousMessageId: context.messageId,
+            executionId: parseInt(executionId, 10),
+            type: 'ai',
+            name: 'AI',
+            status: 'running',
+            content: '',
+            retryOfMessageId: null,
+            ...context.model,
+        });
+    }
+    async pushFinalResults(context, message) {
+        if (message) {
+            await this.chatStreamService.sendChunk(context.sessionId, context.messageId, message);
+        }
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'success');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'success');
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: message ?? '',
+            status: 'success',
+        });
+    }
+    async pushErrorResults(context, errorMessage) {
+        await this.chatStreamService.sendChunk(context.sessionId, context.messageId, errorMessage);
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'error');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'error');
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: errorMessage,
+            status: 'error',
+        });
+    }
+};
+exports.ChatHubExecutionWatcherService = ChatHubExecutionWatcherService;
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('workflowExecuteResume'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ChatHubExecutionWatcherService.prototype, "handleExecutionResumed", null);
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('workflowExecuteAfter'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ChatHubExecutionWatcherService.prototype, "handleWorkflowExecuteAfter", null);
+exports.ChatHubExecutionWatcherService = ChatHubExecutionWatcherService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        chat_hub_execution_store_service_1.ChatHubExecutionStore,
+        chat_message_repository_1.ChatHubMessageRepository,
+        chat_hub_execution_service_1.ChatHubExecutionService,
+        db_1.ExecutionRepository,
+        chat_stream_service_1.ChatStreamService,
+        chat_execution_manager_1.ChatExecutionManager])
+], ChatHubExecutionWatcherService);
+//# sourceMappingURL=chat-hub-execution-watcher.service.js.map

package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js.map

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

package/dist/modules/chat-hub/chat-hub-execution.service.d.ts

@@ -2,13 +2,14 @@ import { type ChatMessageId, type ChatSessionId, ChatHubConversationModel } from
 import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository, IExecutionResponse, User } from '@n8n/db';
 import { InstanceSettings } from 'n8n-core';
-import { type IWorkflowBase, IRunExecutionData } from 'n8n-workflow';
+import { type IWorkflowBase, IRunExecutionData, IRun } from 'n8n-workflow';
 import { ActiveExecutions } from '../../active-executions';
 import { ChatExecutionManager } from '../../chat/chat-execution-manager';
 import { ExecutionService } from '../../executions/execution.service';
 import { WorkflowExecutionService } from '../../workflows/workflow-execution.service';
+import { ChatHubExecutionStore } from './chat-hub-execution-store.service';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
-import { ChatTriggerResponseMode } from './chat-hub.types';
+import type { NonStreamingResponseMode, ChatTriggerResponseMode } from './chat-hub.types';
 import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatStreamService } from './chat-stream.service';
 export declare class ChatHubExecutionService {
@@ -21,8 +22,9 @@ export declare class ChatHubExecutionService {
     private readonly instanceSettings;
     private readonly chatStreamService;
     private readonly chatHubWorkflowService;
+    private readonly chatHubExecutionStore;
     private readonly messageRepository;
-    constructor(logger: Logger, executionService: ExecutionService, workflowExecutionService: WorkflowExecutionService, executionRepository: ExecutionRepository, executionManager: ChatExecutionManager, activeExecutions: ActiveExecutions, instanceSettings: InstanceSettings, chatStreamService: ChatStreamService, chatHubWorkflowService: ChatHubWorkflowService, messageRepository: ChatHubMessageRepository);
+    constructor(logger: Logger, executionService: ExecutionService, workflowExecutionService: WorkflowExecutionService, executionRepository: ExecutionRepository, executionManager: ChatExecutionManager, activeExecutions: ActiveExecutions, instanceSettings: InstanceSettings, chatStreamService: ChatStreamService, chatHubWorkflowService: ChatHubWorkflowService, chatHubExecutionStore: ChatHubExecutionStore, messageRepository: ChatHubMessageRepository);
     execute(user: User, workflowData: IWorkflowBase, executionData: IRunExecutionData): Promise<{
         executionId: string;
     }>;
@@ -30,19 +32,15 @@ export declare class ChatHubExecutionService {
     executeChatWorkflowWithCleanup(user: User, model: ChatHubConversationModel, workflowData: IWorkflowBase, executionData: IRunExecutionData, sessionId: ChatSessionId, previousMessageId: ChatMessageId, retryOfMessageId: ChatMessageId | null, responseMode: ChatTriggerResponseMode): Promise<void>;
     private executeChatWorkflow;
     private executeWithStreaming;
-    private executeLastNode;
-    resumeChatExecution(execution: IExecutionResponse, message: string, sessionId: ChatSessionId, user: User, previousMessageId: ChatMessageId, model: ChatHubConversationModel, responseMode: 'responseNodes'): Promise<void>;
-    private resumeExecution;
+    private executeNonStreaming;
+    resumeChatExecution(execution: IExecutionResponse, message: string, sessionId: ChatSessionId, _user: User, previousMessageId: ChatMessageId, model: ChatHubConversationModel, _responseMode: 'responseNodes'): Promise<void>;
     waitForExecutionCompletion(executionId: string): Promise<void>;
     private waitForExecutionPoller;
     private waitForExecutionPromise;
     private waitForErrorDetails;
-    getErrorMessage(execution: IExecutionResponse): string | undefined;
-    getAIOutput(execution: IExecutionResponse, nodeName: string): string | undefined;
-    private getMessageFromExecution;
-    private getLastNodeExecutedName;
-    private getNodeOutputs;
+    private createStreamAdapter;
+    extractErrorMessage(runData: IRun): string | undefined;
+    extractMessage(runData: IRun, responseMode: NonStreamingResponseMode): string | undefined;
     private getFirstOutputEntry;
     private extractMessageFromEntry;
-    private createStreamAdapter;
 }

package/dist/modules/chat-hub/chat-hub-execution.service.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatHubExecutionService = void 0;
+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");
@@ -22,14 +23,14 @@ const execution_not_found_error_1 = require("../../errors/execution-not-found-er
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const execution_service_1 = require("../../executions/execution.service");
 const workflow_execution_service_1 = require("../../workflows/workflow-execution.service");
+const chat_hub_execution_store_service_1 = require("./chat-hub-execution-store.service");
 const chat_hub_workflow_service_1 = require("./chat-hub-workflow.service");
 const chat_hub_constants_1 = require("./chat-hub.constants");
 const chat_message_repository_1 = require("./chat-message.repository");
 const chat_stream_service_1 = require("./chat-stream.service");
 const stream_capturer_1 = require("./stream-capturer");
-const utils_1 = require("../../chat/utils");
 let ChatHubExecutionService = class ChatHubExecutionService {
-    constructor(logger, executionService, workflowExecutionService, executionRepository, executionManager, activeExecutions, instanceSettings, chatStreamService, chatHubWorkflowService, messageRepository) {
+    constructor(logger, executionService, workflowExecutionService, executionRepository, executionManager, activeExecutions, instanceSettings, chatStreamService, chatHubWorkflowService, chatHubExecutionStore, messageRepository) {
         this.logger = logger;
         this.executionService = executionService;
         this.workflowExecutionService = workflowExecutionService;
@@ -39,6 +40,7 @@ let ChatHubExecutionService = class ChatHubExecutionService {
         this.instanceSettings = instanceSettings;
         this.chatStreamService = chatStreamService;
         this.chatHubWorkflowService = chatHubWorkflowService;
+        this.chatHubExecutionStore = chatHubExecutionStore;
         this.messageRepository = messageRepository;
         this.logger = this.logger.scoped('chat-hub');
     }
@@ -49,8 +51,9 @@ let ChatHubExecutionService = class ChatHubExecutionService {
         return await this.executionService.stop(executionId, [workflowId]);
     }
     async executeChatWorkflowWithCleanup(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, responseMode) {
+        const executionMode = model.provider === 'n8n' ? 'webhook' : 'chat';
+        const { id: workflowId } = workflowData;
         try {
-            const executionMode = model.provider === 'n8n' ? 'webhook' : 'chat';
             await this.executeChatWorkflow(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode, responseMode);
         }
         catch (error) {
@@ -71,7 +74,7 @@ let ChatHubExecutionService = class ChatHubExecutionService {
         }
         finally {
             if (model.provider !== 'n8n') {
-                await this.chatHubWorkflowService.deleteChatWorkflow(workflowData.id);
+                await this.chatHubWorkflowService.deleteChatWorkflow(workflowId);
             }
         }
     }
@@ -81,7 +84,7 @@ let ChatHubExecutionService = class ChatHubExecutionService {
             throw new bad_request_error_1.BadRequestError(`Response mode "${responseMode}" is not supported yet.`);
         }
         if (responseMode === 'lastNode' || responseMode === 'responseNodes') {
-            return await this.executeLastNode(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode, responseMode);
+            return await this.executeNonStreaming(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode, responseMode);
         }
         else if (responseMode === 'streaming') {
             return await this.executeWithStreaming(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode);
@@ -182,13 +185,25 @@ let ChatHubExecutionService = class ChatHubExecutionService {
             await this.chatStreamService.endExecution(user.id, sessionId, executionStatus);
         }
     }
-    async executeLastNode(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode, responseMode) {
+    async executeNonStreaming(user, model, workflowData, executionData, sessionId, previousMessageId, retryOfMessageId, executionMode, responseMode) {
         const running = await this.workflowExecutionService.executeChatWorkflow(user, workflowData, executionData, undefined, false, executionMode);
-        const messageId = (0, uuid_1.v4)();
         const executionId = running.executionId;
         if (!executionId) {
             throw new n8n_workflow_1.OperationalError('There was a problem starting the chat execution.');
         }
+        const messageId = (0, uuid_1.v4)();
+        await this.chatHubExecutionStore.register({
+            executionId,
+            sessionId,
+            userId: user.id,
+            messageId,
+            previousMessageId,
+            model,
+            responseMode,
+            awaitingResume: false,
+            createMessageOnResume: false,
+            workflowId: workflowData.id,
+        });
         await this.chatStreamService.startExecution(user.id, sessionId);
         await this.messageRepository.createAIMessage({
             id: messageId,
@@ -208,118 +223,28 @@ let ChatHubExecutionService = class ChatHubExecutionService {
             retryOfMessageId,
             executionId: parseInt(executionId, 10),
         });
-        try {
-            await this.waitForExecutionCompletion(executionId);
-            const execution = await this.executionRepository.findSingleExecution(executionId, {
-                includeData: true,
-                unflattenData: true,
-            });
-            if (!execution) {
-                throw new n8n_workflow_1.OperationalError('Chat execution not found after completion - make sure your instance is saving executions.');
-            }
-            if (!['success', 'waiting', 'canceled'].includes(execution.status)) {
-                const errorMessage = this.getErrorMessage(execution) ?? 'Failed to generate a response';
-                throw new n8n_workflow_1.OperationalError(errorMessage);
-            }
-            const message = this.getMessageFromExecution(execution, responseMode);
-            const status = execution?.status === 'waiting' ? 'waiting' : 'success';
-            if (message) {
-                await this.chatStreamService.sendChunk(sessionId, messageId, message);
-            }
-            await this.messageRepository.updateChatMessage(messageId, {
-                content: message ?? '',
-                status,
-            });
-            await this.chatStreamService.endStream(sessionId, messageId, status);
-            await this.chatStreamService.endExecution(user.id, sessionId, status === 'waiting' ? 'success' : status);
-            if (status === 'waiting' && responseMode === 'responseNodes') {
-                const lastNode = (0, utils_1.getLastNodeExecuted)(execution);
-                if (lastNode && (0, utils_1.shouldResumeImmediately)(lastNode)) {
-                    this.logger.debug(`Resuming execution ${execution.id} immediately after wait in node ${lastNode.name}`);
-                    await this.resumeChatExecution(execution, '', sessionId, user, messageId, model, responseMode);
-                }
-            }
-        }
-        catch (e) {
-            if (e instanceof n8n_workflow_1.ManualExecutionCancelledError) {
-                await this.chatStreamService.endExecution(user.id, sessionId, 'cancelled');
-                return;
-            }
-            const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred during chat execution';
-            await this.messageRepository.updateChatMessage(messageId, {
-                content: errorMessage,
-                status: 'error',
-            });
-            await this.chatStreamService.sendChunk(sessionId, messageId, errorMessage);
-            await this.chatStreamService.endStream(sessionId, messageId, 'error');
-            await this.chatStreamService.endExecution(user.id, sessionId, 'error');
-        }
     }
-    async resumeChatExecution(execution, message, sessionId, user, previousMessageId, model, responseMode) {
-        let currentExecution = execution;
-        let currentMessage = message;
-        let currentPreviousMessageId = previousMessageId;
-        while (true) {
-            await this.resumeExecution(sessionId, currentExecution, currentMessage);
-            const messageId = (0, uuid_1.v4)();
-            await this.chatStreamService.startExecution(user.id, sessionId);
-            await this.messageRepository.createAIMessage({
-                id: messageId,
-                content: '',
-                sessionId,
-                executionId: currentExecution.id,
-                model,
-                previousMessageId: currentPreviousMessageId,
-                retryOfMessageId: null,
-                status: 'running',
-            });
-            await this.chatStreamService.startStream({
-                userId: user.id,
-                sessionId,
-                messageId,
-                previousMessageId: currentPreviousMessageId,
-                retryOfMessageId: null,
-                executionId: parseInt(currentExecution.id, 10),
-            });
-            await this.waitForExecutionCompletion(currentExecution.id);
-            const completed = await this.executionRepository.findSingleExecution(currentExecution.id, {
-                includeData: true,
-                unflattenData: true,
-            });
-            if (!completed) {
-                throw new n8n_workflow_1.OperationalError('Chat execution not found after completion - make sure your instance is saving executions.');
-            }
-            if (!['success', 'waiting', 'canceled'].includes(completed.status)) {
-                const errorMessage = this.getErrorMessage(completed) ?? 'Failed to generate a response';
-                throw new n8n_workflow_1.OperationalError(errorMessage);
-            }
-            const reply = this.getMessageFromExecution(completed, responseMode);
-            const status = completed?.status === 'waiting' ? 'waiting' : 'success';
-            if (reply) {
-                await this.chatStreamService.sendChunk(sessionId, messageId, reply);
-            }
-            await this.messageRepository.updateChatMessage(messageId, {
-                content: reply ?? '',
-                status,
-            });
-            await this.chatStreamService.endStream(sessionId, messageId, status);
-            await this.chatStreamService.endExecution(user.id, sessionId, status === 'waiting' ? 'success' : status);
-            const lastNode = (0, utils_1.getLastNodeExecuted)(completed);
-            if (status === 'waiting' && lastNode && (0, utils_1.shouldResumeImmediately)(lastNode)) {
-                this.logger.debug(`Resuming execution ${completed.id} immediately after wait in node ${lastNode.name}`);
-                await this.messageRepository.updateChatMessage(messageId, {
-                    status: 'success',
-                });
-                currentMessage = '';
-                currentExecution = completed;
-                currentPreviousMessageId = messageId;
-            }
-            else {
-                return;
-            }
-        }
-    }
-    async resumeExecution(sessionId, execution, message) {
+    async resumeChatExecution(execution, message, sessionId, _user, previousMessageId, model, _responseMode) {
+        await this.messageRepository.updateChatMessage(previousMessageId, {
+            status: 'success',
+        });
+        const messageId = (0, uuid_1.v4)();
+        await this.messageRepository.createAIMessage({
+            id: messageId,
+            content: '',
+            sessionId,
+            executionId: execution.id,
+            model,
+            previousMessageId,
+            retryOfMessageId: null,
+            status: 'running',
+        });
+        await this.chatHubExecutionStore.update(execution.id, {
+            previousMessageId,
+            messageId,
+            awaitingResume: true,
+            createMessageOnResume: false,
+        });
         await this.executionManager.runWorkflow(execution, {
             action: 'sendMessage',
             chatInput: message,
@@ -404,7 +329,7 @@ let ChatHubExecutionService = class ChatHubExecutionService {
                     workflowId,
                 ]);
                 if (execution && chat_hub_constants_1.EXECUTION_FINISHED_STATUSES.includes(execution.status)) {
-                    errorText = this.getErrorMessage(execution);
+                    errorText = this.extractErrorMessage(execution);
                     break;
                 }
             }
@@ -419,74 +344,6 @@ let ChatHubExecutionService = class ChatHubExecutionService {
         }
         return errorText;
     }
-    getErrorMessage(execution) {
-        if (execution.data.resultData.error) {
-            return execution.data.resultData.error.description ?? execution.data.resultData.error.message;
-        }
-        return undefined;
-    }
-    getAIOutput(execution, nodeName) {
-        const agent = execution.data.resultData.runData[nodeName];
-        if (!agent || !Array.isArray(agent) || agent.length === 0)
-            return undefined;
-        const runIndex = agent.length - 1;
-        const mainOutputs = agent[runIndex].data?.main;
-        if (mainOutputs && Array.isArray(mainOutputs)) {
-            for (const branch of mainOutputs) {
-                if (branch && Array.isArray(branch) && branch.length > 0 && branch[0].json?.output) {
-                    if (typeof branch[0].json.output === 'string') {
-                        return branch[0].json.output;
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    getMessageFromExecution(execution, responseMode) {
-        const nodeName = this.getLastNodeExecutedName(execution);
-        if (!nodeName)
-            return undefined;
-        const outputs = this.getNodeOutputs(execution, nodeName);
-        const entry = this.getFirstOutputEntry(outputs);
-        if (!entry)
-            return undefined;
-        const message = this.extractMessageFromEntry(entry, responseMode);
-        if (typeof message === 'object' && message !== null) {
-            return (0, n8n_workflow_1.jsonStringify)(message);
-        }
-        return message;
-    }
-    getLastNodeExecutedName(execution) {
-        const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
-        return typeof lastNodeExecuted === 'string' ? lastNodeExecuted : undefined;
-    }
-    getNodeOutputs(execution, nodeName) {
-        const runData = execution.data.resultData.runData[nodeName];
-        if (!runData || runData.length === 0)
-            return [];
-        const runIndex = runData.length - 1;
-        const data = runData[runIndex]?.data;
-        return data?.main ?? data?.[n8n_workflow_1.NodeConnectionTypes.AiTool] ?? [];
-    }
-    getFirstOutputEntry(outputs) {
-        for (const branch of outputs) {
-            if (!Array.isArray(branch) || branch.length === 0)
-                continue;
-            return branch[0];
-        }
-        return undefined;
-    }
-    extractMessageFromEntry(entry, responseMode) {
-        if (responseMode === 'responseNodes') {
-            return entry.sendMessage ?? '';
-        }
-        if (responseMode === 'lastNode') {
-            const response = entry.json ?? {};
-            const message = response.output ?? response.text ?? response.message ?? '';
-            return typeof message === 'string' ? message : (0, n8n_workflow_1.jsonStringify)(message);
-        }
-        return undefined;
-    }
     createStreamAdapter(aggregator) {
         let processingChain = Promise.resolve();
         const adapter = {
@@ -530,6 +387,54 @@ let ChatHubExecutionService = class ChatHubExecutionService {
         };
         return { adapter: adapter, waitForPendingOperations };
     }
+    extractErrorMessage(runData) {
+        if (runData.data.resultData.error) {
+            return runData.data.resultData.error.description ?? runData.data.resultData.error.message;
+        }
+        return undefined;
+    }
+    extractMessage(runData, responseMode) {
+        const lastNodeExecuted = runData.data.resultData.lastNodeExecuted;
+        if (typeof lastNodeExecuted !== 'string')
+            return undefined;
+        const nodeRunData = runData.data.resultData.runData[lastNodeExecuted];
+        if (!nodeRunData || nodeRunData.length === 0)
+            return undefined;
+        const runIndex = nodeRunData.length - 1;
+        const data = nodeRunData[runIndex]?.data;
+        const outputs = data?.main ?? data?.[n8n_workflow_1.NodeConnectionTypes.AiTool] ?? [];
+        const entry = this.getFirstOutputEntry(outputs);
+        if (!entry)
+            return undefined;
+        return this.extractMessageFromEntry(entry, responseMode);
+    }
+    getFirstOutputEntry(outputs) {
+        for (const branch of outputs) {
+            if (!Array.isArray(branch) || branch.length === 0)
+                continue;
+            return branch[0];
+        }
+        return undefined;
+    }
+    extractMessageFromEntry(entry, responseMode) {
+        if (responseMode === 'responseNodes') {
+            const sendMessage = entry.sendMessage;
+            if (typeof sendMessage === 'string') {
+                return sendMessage;
+            }
+            const result = api_types_1.chatHubMessageWithButtonsSchema.safeParse(sendMessage);
+            if (result.success) {
+                return (0, n8n_workflow_1.jsonStringify)(result.data);
+            }
+            return '';
+        }
+        if (responseMode === 'lastNode') {
+            const response = entry.json ?? {};
+            const message = response.output ?? response.text ?? response.message ?? '';
+            return typeof message === 'string' ? message : (0, n8n_workflow_1.jsonStringify)(message);
+        }
+        return undefined;
+    }
 };
 exports.ChatHubExecutionService = ChatHubExecutionService;
 exports.ChatHubExecutionService = ChatHubExecutionService = __decorate([
@@ -543,6 +448,7 @@ exports.ChatHubExecutionService = ChatHubExecutionService = __decorate([
         n8n_core_1.InstanceSettings,
         chat_stream_service_1.ChatStreamService,
         chat_hub_workflow_service_1.ChatHubWorkflowService,
+        chat_hub_execution_store_service_1.ChatHubExecutionStore,
         chat_message_repository_1.ChatHubMessageRepository])
 ], ChatHubExecutionService);
 //# sourceMappingURL=chat-hub-execution.service.js.map