n8n 2.41.4 → 2.42.1

package/dist/modules/agents/repositories/agent-execution.repository.js

@@ -10,15 +10,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentExecutionRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const agent_execution_entity_1 = require("../entities/agent-execution.entity");
-let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(agent_execution_entity_1.AgentExecution, dataSource.manager);
+const agent_execution_message_link_entity_1 = require("../entities/agent-execution-message-link.entity");
+const agent_message_entity_1 = require("../entities/agent-message.entity");
+let AgentExecutionRepository = class AgentExecutionRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(agent_execution_entity_1.AgentExecution, dataSource.manager, transactionRunner);
+    }
+    async saveInContext(execution, ctx) {
+        return await this.managerFor(ctx).save(execution);
     }
     async findByThreadIdOrdered(threadId) {
-        return await this.find({ where: { threadId }, order: { createdAt: 'ASC' } });
+        return await this.find({ where: { threadId }, order: { createdAt: 'ASC', id: 'ASC' } });
     }
     async findRunning() {
         return await this.find({
@@ -26,11 +32,21 @@ let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.
             where: { status: 'running' },
         });
     }
-    async existsRunningByThread(threadId) {
-        return await this.existsBy({ threadId, status: 'running' });
+    async existsRunningByThread(threadId, ctx = {}) {
+        return await this.managerFor(ctx).existsBy(agent_execution_entity_1.AgentExecution, { threadId, status: 'running' });
+    }
+    async findRunningByThread(threadId, ctx) {
+        return await this.managerFor(ctx).findBy(agent_execution_entity_1.AgentExecution, { threadId, status: 'running' });
+    }
+    async findExecution(executionId, ctx = {}) {
+        return await this.managerFor(ctx).findOneBy(agent_execution_entity_1.AgentExecution, { id: executionId });
+    }
+    async findLatestByThreadId(threadId) {
+        return await this.findOne({ where: { threadId }, order: { createdAt: 'DESC', id: 'DESC' } });
     }
     async touchRunning(executionId) {
-        await this.update({ id: executionId, status: 'running' }, { updatedAt: new Date() });
+        const result = await this.update({ id: executionId, status: 'running' }, { updatedAt: new Date() });
+        return result.affected === 1;
     }
     async updateTimelineIfRunning(executionId, timeline) {
         const result = await this.update({ id: executionId, status: 'running' }, {
@@ -39,8 +55,12 @@ let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.
         });
         return result.affected === 1;
     }
-    async updateIfRunning(executionId, values) {
-        const result = await this.update({ id: executionId, status: 'running' }, values);
+    async updateIfRunning(executionId, values, staleBefore, ctx = {}) {
+        const result = await this.managerFor(ctx).update(agent_execution_entity_1.AgentExecution, {
+            id: executionId,
+            status: 'running',
+            ...(staleBefore ? { updatedAt: (0, typeorm_1.LessThanOrEqual)(staleBefore) } : {}),
+        }, values);
         return result.affected === 1;
     }
     async moveTimelineToBlob(executionId, storedAt) {
@@ -53,23 +73,39 @@ let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.
     async findFirstUserMessageByThreadIds(threadIds) {
         if (threadIds.length === 0)
             return new Map();
-        const tableName = this.metadata.tablePath;
-        const rows = await this.createQueryBuilder('e')
-            .select(['e."threadId" AS "threadId"', 'e."userMessage" AS "userMessage"'])
-            .where('e."threadId" IN (:...threadIds)', { threadIds })
-            .andWhere('e."userMessage" IS NOT NULL')
-            .andWhere('e."userMessage" != \'\'')
-            .andWhere(`e."createdAt" = (SELECT MIN(e2."createdAt") FROM ${tableName} e2 ` +
-            'WHERE e2."threadId" = e."threadId" AND e2."userMessage" IS NOT NULL ' +
-            'AND e2."userMessage" != \'\')')
+        const isPostgres = this.manager.connection.options.type === 'postgres';
+        const originalText = isPostgres
+            ? "message.content->'content'->0->>'text'"
+            : "json_extract(message.content, '$.content[0].text')";
+        const hidden = isPostgres
+            ? "message.origin->>'hidden'"
+            : "json_extract(message.origin, '$.hidden')";
+        const input = `CASE WHEN input.messageId IS NULL THEN e.userMessage WHEN CAST(${hidden} AS TEXT) IN ('true', '1') THEN NULL ELSE ${originalText} END`;
+        const candidates = this.createQueryBuilder('e')
+            .leftJoin(agent_execution_message_link_entity_1.AgentExecutionMessageLink, 'input', "input.executionId = e.id AND input.direction = 'input' AND input.position = 0")
+            .leftJoin(agent_message_entity_1.AgentMessageEntity, 'message', 'message.id = input.messageId')
+            .select('e.threadId', 'threadId')
+            .addSelect(input, 'userMessage')
+            .addSelect('ROW_NUMBER() OVER (PARTITION BY e.threadId ORDER BY e.createdAt, e.id)', 'rowNumber')
+            .where('e.threadId IN (:...threadIds)', { threadIds })
+            .andWhere(`${input} IS NOT NULL AND TRIM(${input}) != ''`);
+        const rows = await this.manager
+            .createQueryBuilder()
+            .select('preview."threadId"', 'threadId')
+            .addSelect('preview."userMessage"', 'userMessage')
+            .from(`(${candidates.getQuery()})`, 'preview')
+            .where('preview."rowNumber" = 1')
+            .setParameters(candidates.getParameters())
             .getRawMany();
         return new Map(rows.map((r) => [r.threadId, r.userMessage]));
     }
-    async findFirstSourceByThreadIds(threadIds) {
+    async findFirstSourceByThreadIds(threadIds, ctx = {}) {
         if (threadIds.length === 0)
             return new Map();
         const tableName = this.metadata.tablePath;
-        const rows = await this.createQueryBuilder('e')
+        const rows = await this.managerFor(ctx)
+            .getRepository(agent_execution_entity_1.AgentExecution)
+            .createQueryBuilder('e')
             .select(['e."threadId" AS "threadId"', 'e."source" AS "source"'])
             .where('e."threadId" IN (:...threadIds)', { threadIds })
             .andWhere('e."source" IS NOT NULL')
@@ -137,15 +173,6 @@ let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.
             .whereInIds(executionIds)
             .execute();
     }
-    async deleteByThreadId(threadId) {
-        await this.delete({ threadId });
-    }
-    async findBlobRefsByThreadId(threadId) {
-        return await this.find({
-            select: ['id', 'storedAt'],
-            where: { threadId, storedAt: (0, typeorm_1.Not)('db') },
-        });
-    }
     async findBlobRefsByAgentId(agentId) {
         return await this.find({
             select: ['id', 'threadId', 'storedAt'],
@@ -156,6 +183,6 @@ let AgentExecutionRepository = class AgentExecutionRepository extends typeorm_1.
 exports.AgentExecutionRepository = AgentExecutionRepository;
 exports.AgentExecutionRepository = AgentExecutionRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
 ], AgentExecutionRepository);
 //# sourceMappingURL=agent-execution.repository.js.map

package/dist/modules/agents/repositories/agent-execution.repository.js.map

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

package/dist/modules/agents/repositories/agent-message-queue.repository.d.ts

@@ -0,0 +1,91 @@
+import { BaseRepository, TransactionRunner, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
+import { AgentMessageQueue } from '../entities/agent-message-queue.entity';
+import type { AgentQueuedMessage } from '../types/agent-queued-message';
+export declare class AgentMessageQueueRepository extends BaseRepository<AgentMessageQueue> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
+    enqueue(threadId: string, source: string, payload: AgentQueuedMessage, ctx: OperationContext): Promise<AgentMessageQueue>;
+    listPending(threadId: string): Promise<AgentMessageQueue[]>;
+    findItem(threadId: string, id: string, ctx: OperationContext): Promise<AgentMessageQueue | null>;
+    removePending(threadId: string, id: string, ctx: OperationContext): Promise<boolean>;
+    updatePendingPayload(threadId: string, id: string, payload: AgentQueuedMessage, ctx: OperationContext): Promise<boolean>;
+    findHead(threadId: string, ctx: OperationContext): Promise<AgentMessageQueue | null>;
+    findActive(threadId: string, ctx: OperationContext): Promise<AgentMessageQueue | null>;
+    findThreadIds(): Promise<string[]>;
+    linkExecution(id: string, previousId: string | null, executionId: string, ctx: OperationContext): Promise<boolean>;
+    removeActive(threadId: string, executionId: string, ctx: OperationContext): Promise<boolean>;
+    findDeliveryState(id: string): Promise<AgentMessageQueue | null>;
+    findPublishedConnection(agentId: string, projectId: string, source: string, credentialId: string, ctx?: OperationContext): Promise<{
+        type: "telegram";
+        credentialId: string;
+        approval?: {
+            mode: "global";
+        } | {
+            mode: "selected";
+            tools: string[];
+        } | undefined;
+        settings?: {
+            accessMode: "private" | "public";
+            allowedUsers: string[];
+            sessionIdleTimeoutMinutes?: number | null | undefined;
+        } | undefined;
+    } | {
+        type: "slack";
+        credentialId: string;
+        approval?: {
+            mode: "global";
+        } | {
+            mode: "selected";
+            tools: string[];
+        } | undefined;
+        settings?: {
+            messagingExperience: "agent" | "assistant";
+            sessionIdleTimeoutMinutes?: number | null | undefined;
+        } | undefined;
+    } | {
+        type: "linear";
+        credentialId: string;
+        approval?: {
+            mode: "global";
+        } | {
+            mode: "selected";
+            tools: string[];
+        } | undefined;
+        settings?: {
+            sessionIdleTimeoutMinutes?: number | null | undefined;
+        } | undefined;
+    } | {
+        type: "discord";
+        credentialId: string;
+        approval?: {
+            mode: "global";
+        } | {
+            mode: "selected";
+            tools: string[];
+        } | undefined;
+        settings?: {
+            sessionIdleTimeoutMinutes?: number | null | undefined;
+        } | undefined;
+    } | {
+        type: "teams";
+        credentialId: string;
+        approval?: {
+            mode: "global";
+        } | {
+            mode: "selected";
+            tools: string[];
+        } | undefined;
+        settings?: {
+            sessionIdleTimeoutMinutes?: number | null | undefined;
+            displayName?: string | undefined;
+            description?: string | undefined;
+            teamChannels?: boolean | undefined;
+            groupChats?: boolean | undefined;
+            readAllChannelMessages?: boolean | undefined;
+            readAllGroupMessages?: boolean | undefined;
+        } | undefined;
+    } | {
+        type: "n8n_chat";
+        credentialId: "";
+    } | undefined>;
+}

package/dist/modules/agents/repositories/agent-message-queue.repository.js

@@ -0,0 +1,92 @@
+"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.AgentMessageQueueRepository = void 0;
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const typeorm_1 = require("@n8n/typeorm");
+const api_types_1 = require("@n8n/api-types");
+const agent_message_queue_entity_1 = require("../entities/agent-message-queue.entity");
+const agent_entity_1 = require("../entities/agent.entity");
+let AgentMessageQueueRepository = class AgentMessageQueueRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(agent_message_queue_entity_1.AgentMessageQueue, dataSource.manager, transactionRunner);
+    }
+    async enqueue(threadId, source, payload, ctx) {
+        const repository = this.managerFor(ctx).getRepository(agent_message_queue_entity_1.AgentMessageQueue);
+        return await repository.save(repository.create({ threadId, source, payload, executionId: null }));
+    }
+    async listPending(threadId) {
+        return await this.find({ where: { threadId, executionId: (0, typeorm_1.IsNull)() }, order: { id: 'ASC' } });
+    }
+    async findItem(threadId, id, ctx) {
+        return await this.managerFor(ctx).findOneBy(agent_message_queue_entity_1.AgentMessageQueue, { threadId, id });
+    }
+    async removePending(threadId, id, ctx) {
+        const result = await this.managerFor(ctx).delete(agent_message_queue_entity_1.AgentMessageQueue, {
+            threadId,
+            id,
+            executionId: (0, typeorm_1.IsNull)(),
+        });
+        return result.affected === 1;
+    }
+    async updatePendingPayload(threadId, id, payload, ctx) {
+        const result = await this.managerFor(ctx).update(agent_message_queue_entity_1.AgentMessageQueue, { threadId, id, executionId: (0, typeorm_1.IsNull)() }, { payload });
+        return result.affected === 1;
+    }
+    async findHead(threadId, ctx) {
+        return await this.managerFor(ctx).findOne(agent_message_queue_entity_1.AgentMessageQueue, {
+            where: { threadId },
+            order: { id: 'ASC' },
+        });
+    }
+    async findActive(threadId, ctx) {
+        return await this.managerFor(ctx).findOneBy(agent_message_queue_entity_1.AgentMessageQueue, {
+            threadId,
+            executionId: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
+        });
+    }
+    async findThreadIds() {
+        const rows = await this.createQueryBuilder('queue')
+            .select('queue.threadId', 'threadId')
+            .distinct(true)
+            .getRawMany();
+        return rows.map(({ threadId }) => threadId);
+    }
+    async linkExecution(id, previousId, executionId, ctx) {
+        const result = await this.managerFor(ctx).update(agent_message_queue_entity_1.AgentMessageQueue, { id, executionId: previousId ?? (0, typeorm_1.IsNull)() }, { executionId });
+        return result.affected === 1;
+    }
+    async removeActive(threadId, executionId, ctx) {
+        const result = await this.managerFor(ctx).delete(agent_message_queue_entity_1.AgentMessageQueue, { threadId, executionId });
+        return result.affected === 1;
+    }
+    async findDeliveryState(id) {
+        return await this.findOne({ where: { id }, relations: { execution: true } });
+    }
+    async findPublishedConnection(agentId, projectId, source, credentialId, ctx = {}) {
+        const agent = await this.managerFor(ctx).findOne(agent_entity_1.Agent, {
+            select: ['integrations', 'activeVersionId'],
+            where: { id: agentId, projectId },
+        });
+        if (!agent?.activeVersionId)
+            return undefined;
+        return agent.integrations?.find((connection) => connection.type === source &&
+            connection.credentialId === credentialId &&
+            !(0, api_types_1.isDraftIntegration)(connection));
+    }
+};
+exports.AgentMessageQueueRepository = AgentMessageQueueRepository;
+exports.AgentMessageQueueRepository = AgentMessageQueueRepository = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
+], AgentMessageQueueRepository);
+//# sourceMappingURL=agent-message-queue.repository.js.map

package/dist/modules/agents/repositories/agent-message-queue.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-message-queue.repository.js","sourceRoot":"","sources":["../../../../src/modules/agents/repositories/agent-message-queue.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/agents/repositories/agent-message.repository.d.ts

@@ -1,6 +1,39 @@
-import { DataSource, Repository } from '@n8n/typeorm';
-import { AgentMessageEntity } from '../entities/agent-message.entity';
-export declare class AgentMessageRepository extends Repository<AgentMessageEntity> {
-    constructor(dataSource: DataSource);
+import { type AgentDbMessage, type AgentMessage } from '@n8n/agents';
+import type { AgentMessageAuthor } from '@n8n/api-types';
+import { BaseRepository, TransactionRunner, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
+import { AgentMessageEntity, type AgentMessageOrigin } from '../entities/agent-message.entity';
+interface RuntimeMessageScope {
+    threadId: string;
+    resourceId?: string;
+}
+export declare class AgentMessageRepository extends BaseRepository<AgentMessageEntity> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
+    createExecutionInput(params: {
+        executionId: string;
+        threadId: string;
+        resourceId: string;
+        content: AgentMessage;
+        author?: AgentMessageAuthor;
+        origin: AgentMessageOrigin;
+    }, ctx: OperationContext): Promise<string>;
+    copyExecutionInputs(executionId: string, predecessorId: string, threadId: string, ctx: OperationContext): Promise<string[]>;
+    findExecutionInputs(executionIds: string[]): Promise<Map<string, AgentMessageEntity[]>>;
+    saveRuntimeMessages(params: RuntimeMessageScope & {
+        resourceId: string;
+        messages: AgentDbMessage[];
+        executionId?: string;
+    }): Promise<void>;
+    private runtimeMessageEntity;
+    discardRuntimeInput(ids: string[]): Promise<void>;
+    findRuntimeMessages(scope: RuntimeMessageScope, opts?: {
+        limit?: number;
+        before?: Date;
+        since?: {
+            sinceCreatedAt: Date;
+            sinceMessageId: string;
+        };
+    }): Promise<AgentMessageEntity[]>;
     findRecentThreadIdsByResourceId(agentId: string, resourceId: string, limit: number): Promise<string[]>;
 }
+export {};

package/dist/modules/agents/repositories/agent-message.repository.js

@@ -10,12 +10,203 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentMessageRepository = void 0;
+const agents_1 = require("@n8n/agents");
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
+const n8n_workflow_1 = require("n8n-workflow");
+const node_crypto_1 = require("node:crypto");
+const node_util_1 = require("node:util");
+const agent_execution_message_link_entity_1 = require("../entities/agent-execution-message-link.entity");
+const agent_execution_entity_1 = require("../entities/agent-execution.entity");
 const agent_message_entity_1 = require("../entities/agent-message.entity");
-let AgentMessageRepository = class AgentMessageRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(agent_message_entity_1.AgentMessageEntity, dataSource.manager);
+const agent_resource_entity_1 = require("../entities/agent-resource.entity");
+const agent_thread_entity_1 = require("../entities/agent-thread.entity");
+let AgentMessageRepository = class AgentMessageRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(agent_message_entity_1.AgentMessageEntity, dataSource.manager, transactionRunner);
+    }
+    async createExecutionInput(params, ctx) {
+        const manager = this.managerFor(ctx);
+        await manager
+            .createQueryBuilder()
+            .insert()
+            .into(agent_resource_entity_1.AgentResourceEntity)
+            .values({ id: params.resourceId, metadata: null })
+            .orIgnore()
+            .execute();
+        await manager
+            .createQueryBuilder()
+            .insert()
+            .into(agent_thread_entity_1.AgentThreadEntity)
+            .values({ id: params.threadId, resourceId: params.resourceId, title: null, metadata: null })
+            .orIgnore()
+            .execute();
+        const message = manager.create(agent_message_entity_1.AgentMessageEntity, {
+            id: (0, node_crypto_1.randomUUID)(),
+            threadId: params.threadId,
+            resourceId: params.resourceId,
+            role: 'user',
+            type: null,
+            content: params.content,
+            author: params.author ?? null,
+            origin: params.origin,
+            modelContent: null,
+            modelContextAt: null,
+        });
+        await manager.save(message);
+        await manager.insert(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+            executionId: params.executionId,
+            messageId: message.id,
+            direction: 'input',
+            position: 0,
+        });
+        return message.id;
+    }
+    async copyExecutionInputs(executionId, predecessorId, threadId, ctx) {
+        const manager = this.managerFor(ctx);
+        const inputs = await manager.find(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+            where: { executionId: predecessorId, direction: 'input' },
+            order: { position: 'ASC' },
+        });
+        if (inputs.length === 0)
+            return [];
+        if (!(await manager.existsBy(agent_execution_entity_1.AgentExecution, { id: predecessorId, threadId }))) {
+            throw new n8n_workflow_1.UnexpectedError('The preceding execution does not belong to this session');
+        }
+        await manager.insert(agent_execution_message_link_entity_1.AgentExecutionMessageLink, inputs.map(({ messageId, position }) => ({
+            executionId,
+            messageId,
+            position,
+            direction: 'input',
+        })));
+        return inputs.map(({ messageId }) => messageId);
+    }
+    async findExecutionInputs(executionIds) {
+        const inputs = new Map();
+        for (const ids of (0, db_1.chunkIds)(executionIds)) {
+            const links = await this.manager.find(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+                where: { executionId: (0, typeorm_1.In)(ids), direction: 'input' },
+                relations: { message: true },
+                order: { position: 'ASC' },
+            });
+            for (const link of links) {
+                const messages = inputs.get(link.executionId) ?? [];
+                messages.push(link.message);
+                inputs.set(link.executionId, messages);
+            }
+        }
+        return inputs;
+    }
+    async saveRuntimeMessages(params) {
+        if (params.messages.length === 0)
+            return;
+        await this.runInTransaction({}, async (manager) => {
+            const now = new Date();
+            if (params.executionId) {
+                const ownership = await manager.update(agent_execution_entity_1.AgentExecution, { id: params.executionId, threadId: params.threadId, status: 'running' }, { updatedAt: now });
+                if (ownership.affected !== 1)
+                    throw new n8n_workflow_1.OperationalError('Execution no longer owns message persistence');
+            }
+            const ids = params.messages.map(({ id }) => id);
+            const existing = new Map((await manager.findBy(agent_message_entity_1.AgentMessageEntity, { id: (0, typeorm_1.In)(ids) })).map((message) => [
+                message.id,
+                message,
+            ]));
+            const inputLinks = await manager.findBy(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+                messageId: (0, typeorm_1.In)(ids),
+                direction: 'input',
+            });
+            const inputIds = new Set(inputLinks.map(({ messageId }) => messageId));
+            const messages = params.messages.map((message) => this.runtimeMessageEntity(message, existing.get(message.id), inputIds.has(message.id), params, now));
+            await manager.upsert(agent_message_entity_1.AgentMessageEntity, messages, ['id']);
+            if (!params.executionId)
+                return;
+            const executionLinks = await manager.find(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+                where: { executionId: params.executionId },
+                order: { position: 'ASC' },
+            });
+            if (!executionLinks.some(({ direction }) => direction === 'input'))
+                return;
+            const outputs = executionLinks.filter(({ direction }) => direction === 'output');
+            const outputIds = new Set(outputs.map(({ messageId }) => messageId));
+            let position = (outputs.at(-1)?.position ?? -1) + 1;
+            const links = [];
+            for (const id of ids) {
+                if (inputIds.has(id) || outputIds.has(id))
+                    continue;
+                links.push({
+                    executionId: params.executionId,
+                    messageId: id,
+                    direction: 'output',
+                    position: position++,
+                });
+                outputIds.add(id);
+            }
+            if (links.length > 0)
+                await manager.insert(agent_execution_message_link_entity_1.AgentExecutionMessageLink, links);
+        });
+    }
+    runtimeMessageEntity(message, existing, isInput, scope, now) {
+        if (existing && existing.threadId !== scope.threadId) {
+            throw new n8n_workflow_1.UnexpectedError('The message does not belong to this session');
+        }
+        const { id, createdAt, ...content } = (0, agents_1.stripHydratedFileData)(message);
+        if (existing && isInput) {
+            existing.modelContent = (0, node_util_1.isDeepStrictEqual)(existing.content, content) ? null : content;
+            existing.modelContextAt = existing.modelContextAt ?? createdAt;
+            existing.updatedAt = now;
+            return existing;
+        }
+        return this.create({
+            id,
+            threadId: scope.threadId,
+            resourceId: scope.resourceId,
+            role: 'role' in content ? content.role : 'custom',
+            type: content.type ?? null,
+            content,
+            createdAt: existing?.createdAt ?? createdAt,
+            updatedAt: now,
+            modelContextAt: existing?.modelContextAt ?? createdAt,
+            modelContent: null,
+            author: existing?.author ?? null,
+            origin: existing?.origin ?? null,
+        });
+    }
+    async discardRuntimeInput(ids) {
+        if (ids.length === 0)
+            return;
+        await this.runInTransaction({}, async (manager) => {
+            const inputs = await manager.findBy(agent_execution_message_link_entity_1.AgentExecutionMessageLink, {
+                messageId: (0, typeorm_1.In)(ids),
+                direction: 'input',
+            });
+            const retainedIds = new Set(inputs.map(({ messageId }) => messageId));
+            if (retainedIds.size > 0) {
+                await manager.update(agent_message_entity_1.AgentMessageEntity, { id: (0, typeorm_1.In)([...retainedIds]) }, { modelContextAt: null, modelContent: null });
+            }
+            const deletedIds = ids.filter((id) => !retainedIds.has(id));
+            if (deletedIds.length > 0)
+                await manager.delete(agent_message_entity_1.AgentMessageEntity, deletedIds);
+        });
+    }
+    async findRuntimeMessages(scope, opts) {
+        const query = this.createQueryBuilder('message').where('message.threadId = :threadId', scope);
+        query.andWhere('(message.modelContextAt IS NOT NULL OR message.origin IS NULL)');
+        const timestamp = 'COALESCE(message.modelContextAt, message.createdAt)';
+        if (scope.resourceId !== undefined)
+            query.andWhere('message.resourceId = :resourceId', scope);
+        if (opts?.before)
+            query.andWhere(`${timestamp} < :before`, { before: opts.before });
+        if (opts?.since) {
+            query.andWhere(`(${timestamp} > :sinceCreatedAt OR (${timestamp} = :sinceCreatedAt AND message.id > :sinceMessageId))`, opts.since);
+        }
+        const direction = opts?.limit !== undefined ? 'DESC' : 'ASC';
+        query.orderBy(timestamp, direction).addOrderBy('message.id', direction);
+        if (opts?.limit !== undefined)
+            query.take(opts.limit);
+        const messages = await query.getMany();
+        return opts?.limit !== undefined ? messages.reverse() : messages;
     }
     async findRecentThreadIdsByResourceId(agentId, resourceId, limit) {
         const rows = await this.createQueryBuilder('message')
@@ -32,6 +223,6 @@ let AgentMessageRepository = class AgentMessageRepository extends typeorm_1.Repo
 exports.AgentMessageRepository = AgentMessageRepository;
 exports.AgentMessageRepository = AgentMessageRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
 ], AgentMessageRepository);
 //# sourceMappingURL=agent-message.repository.js.map