Skip to content

The open alternative to Salesforce, designed for AI.

[3/5] Route agent history through workspace-aware persistence (#26246)

Félix Malfaitfdd0964c3e5a
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts
index 71cc72ee320..2af6dc1e662 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts
@@ -1,3 +1,4 @@
+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { Module } from '@nestjs/common';
import { TerminusModule } from '@nestjs/terminus';
import { TypeOrmModule } from '@nestjs/typeorm';
@@ -56,6 +57,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@Module({
imports: [
+ AgentHistoryModule,
TypeOrmModule.forFeature([
UserEntity,
WorkspaceEntity,
@@ -112,7 +114,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
WorkerHealthIndicator,
ConnectedAccountHealth,
AppHealthIndicator,
- provideWorkspaceScopedRepository(AgentMessageEntity),
provideWorkspaceScopedRepository(FeatureFlagEntity),
provideWorkspaceScopedRepository(BillingCustomerEntity),
],
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts
index f6c542838d8..731c1094d1d 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts
@@ -1,3 +1,6 @@
+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
@@ -10,21 +13,17 @@ import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-er
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@Injectable()
export class AdminPanelChatService {
constructor(
+ private readonly historyStorage: AgentHistoryStorageService,
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
- // Thread lookup is by id alone; the admin does not know the workspaceId
- // upfront. assertWorkspaceAllowsImpersonation gates every other read.
- // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
- @InjectRepository(AgentChatThreadEntity)
- private readonly agentChatThreadRepository: Repository<AgentChatThreadEntity>,
- @InjectWorkspaceScopedRepository(AgentMessageEntity)
- private readonly agentMessageRepository: WorkspaceScopedRepository<AgentMessageEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentMessage')
+ private readonly agentMessageRepository: AgentHistoryRepository<AgentMessageEntity>,
) {}
private async assertWorkspaceAllowsImpersonation(
@@ -49,8 +48,7 @@ export class AdminPanelChatService {
): Promise<AdminWorkspaceChatThreadDTO[]> {
await this.assertWorkspaceAllowsImpersonation(workspaceId);
- const threads = await this.agentChatThreadRepository.find({
- where: { workspaceId },
+ const threads = await this.agentChatThreadRepository.find(workspaceId, {
order: { updatedAt: 'DESC' },
take: 100,
});
@@ -83,16 +81,16 @@ export class AdminPanelChatService {
return new Map();
}
- const rows = await this.agentMessageRepository
- .createQueryBuilder('message')
- .select('"message"."threadId"', 'threadId')
- .addSelect('COUNT(*)::int', 'messageCount')
- .where(
- '"message"."workspaceId" = :workspaceId AND "message"."threadId" IN (:...threadIds) AND "message"."isHidden" = false',
- { workspaceId, threadIds },
- )
- .groupBy('"message"."threadId"')
- .getRawMany<{ threadId: string; messageCount: number }>();
+ const rows = await this.agentMessageRepository.query(
+ workspaceId,
+ ({ manager, table, storage }) =>
+ manager.query<{ threadId: string; messageCount: number }[]>(
+ `SELECT "threadId", COUNT(*)::int AS "messageCount" FROM ${table('agentMessage')}
+ WHERE "threadId" = ANY($1::uuid[]) AND "isHidden" = false ${storage === 'core' ? 'AND "workspaceId" = $2' : ''}
+ GROUP BY "threadId"`,
+ storage === 'core' ? [threadIds, workspaceId] : [threadIds],
+ ),
+ );
return new Map(rows.map((row) => [row.threadId, row.messageCount]));
}
@@ -101,9 +99,42 @@ export class AdminPanelChatService {
thread: AdminWorkspaceChatThreadDTO;
messages: AdminChatMessageDTO[];
}> {
- const thread = await this.agentChatThreadRepository.findOne({
- where: { id: threadId },
+ const workspaces = await this.workspaceRepository.find({
+ where: { allowImpersonation: true },
+ select: { id: true },
});
+ const workspaceId = await this.historyStorage.runReadOnlyReport(
+ workspaces.map((workspace) => workspace.id),
+ async ({ manager, partitions }) => {
+ for (let offset = 0; offset < partitions.length; offset += 25) {
+ const parameters: unknown[] = [threadId];
+ const queries = partitions
+ .slice(offset, offset + 25)
+ .map(({ workspaceIds, storage, table }) => {
+ parameters.push(workspaceIds);
+ return `(SELECT workspace.id AS "workspaceId"
+ FROM ${table('agentChatThread')} thread
+ JOIN core.workspace workspace ON workspace.id = ANY($${parameters.length}::uuid[])
+ AND workspace."allowImpersonation" = true AND workspace."deletedAt" IS NULL
+ ${storage === 'core' ? 'AND thread."workspaceId" = workspace.id' : ''}
+ WHERE thread.id = $1 LIMIT 1)`;
+ });
+ const matches = await manager.query<{ workspaceId: string }[]>(
+ `SELECT * FROM (${queries.join(' UNION ALL ')}) matches LIMIT 1`,
+ parameters,
+ );
+ if (isNonEmptyArray(matches)) {
+ return matches[0].workspaceId;
+ }
+ }
+ return null;
+ },
+ );
+ const thread = isDefined(workspaceId)
+ ? await this.agentChatThreadRepository.findOne(workspaceId, {
+ where: { id: threadId },
+ })
+ : null;
if (!isDefined(thread)) {
throw new UserInputError('Thread not found');
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts
index bce8f618ec1..5b56b7189d9 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts
@@ -1,43 +1,15 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
-
-import {
- ASK_QUESTIONS_TOOL_NAME,
- type AskQuestionsToolStatus,
-} from 'twenty-shared/ai';
-import { isNonEmptyString } from '@sniptt/guards';
-import { Brackets, Repository, type SelectQueryBuilder } from 'typeorm';
-
+import { Repository } from 'typeorm';
+import { ASK_QUESTIONS_TOOL_NAME } from 'twenty-shared/ai';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
import { ADMIN_CHAT_THREADS_MAX_PAGE_SIZE } from 'src/engine/core-modules/admin-panel/constants/admin-chat-threads-max-page-size.constant';
-import { type AdminChatThreadListItemDTO } from 'src/engine/core-modules/admin-panel/dtos/admin-chat-thread-list-item.dto';
import { type PaginatedAdminChatThreadsDTO } from 'src/engine/core-modules/admin-panel/dtos/paginated-admin-chat-threads.dto';
import { AdminChatThreadScope } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-scope.enum';
import { AdminChatThreadSortDirection } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-sort-direction.enum';
import { AdminChatThreadSortField } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-sort-field.enum';
-import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
-import {
- AgentMessageEntity,
- AgentMessageRole,
-} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
import { WORKSPACE_SETUP_CHAT_THREAD_ID_NAMESPACE } from 'src/engine/metadata-modules/ai/ai-chat/constants/workspace-setup-chat-thread-id-namespace.constant';
-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
-
-const WORKSPACE_SETUP_THREAD_ID_EXPRESSION = `public.uuid_generate_v5(
- :setupThreadNamespace::uuid,
- "thread"."workspaceId"::text || ':' || "thread"."userWorkspaceId"::text
-)`;
-
-const ANSWERED_ASK_QUESTIONS_STATUS: AskQuestionsToolStatus = 'answered';
-
-const ANSWERED_ASK_QUESTIONS_PART_EXPRESSION = `"answeredQuestionPart"."toolOutput" -> 'result' ->> 'status' = :answeredQuestionStatus`;
-
-const ORDER_EXPRESSION_BY_SORT_FIELD: Record<AdminChatThreadSortField, string> =
- {
- [AdminChatThreadSortField.MESSAGE_COUNT]: '"messageCount"',
- [AdminChatThreadSortField.REPLY_COUNT]: '"userReplyCount"',
- [AdminChatThreadSortField.CREATED_AT]: '"thread"."createdAt"',
- [AdminChatThreadSortField.UPDATED_AT]: '"thread"."updatedAt"',
- };
type GlobalChatThreadsArgs = {
scope: AdminChatThreadScope;
@@ -68,224 +40,128 @@ type GlobalChatThreadRawRow = {
updatedAt: Date;
};
+const COLUMN_BY_SORT_FIELD: Record<
+ AdminChatThreadSortField,
+ 'messageCount' | 'userReplyCount' | 'createdAt' | 'updatedAt'
+> = {
+ [AdminChatThreadSortField.MESSAGE_COUNT]: 'messageCount',
+ [AdminChatThreadSortField.REPLY_COUNT]: 'userReplyCount',
+ [AdminChatThreadSortField.CREATED_AT]: 'createdAt',
+ [AdminChatThreadSortField.UPDATED_AT]: 'updatedAt',
+};
+
@Injectable()
export class AdminPanelGlobalChatThreadsService {
constructor(
- // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
- @InjectRepository(AgentChatThreadEntity)
- private readonly agentChatThreadRepository: Repository<AgentChatThreadEntity>,
+ @InjectRepository(WorkspaceEntity)
+ private readonly workspaceRepository: Repository<WorkspaceEntity>,
+ private readonly historyStorage: AgentHistoryStorageService,
) {}
- private buildOnboardingThreadPredicate(
- queryBuilder: SelectQueryBuilder<AgentChatThreadEntity>,
- ): string {
- const hiddenKickoffMessageSubQuery = queryBuilder
- .subQuery()
- .select('1')
- .from(AgentMessageEntity, 'hiddenMessage')
- .where('hiddenMessage.threadId = thread.id')
- .andWhere('hiddenMessage.isHidden = true')
- .getQuery();
-
- return `(EXISTS (${hiddenKickoffMessageSubQuery}) OR "thread"."id" = ${WORKSPACE_SETUP_THREAD_ID_EXPRESSION})`;
- }
-
- private buildAnsweredQuestionSubQuery(
- queryBuilder: SelectQueryBuilder<AgentChatThreadEntity>,
- selection: string,
- ): string {
- return queryBuilder
- .subQuery()
- .select(selection)
- .from(AgentMessagePartEntity, 'answeredQuestionPart')
- .innerJoin(
- AgentMessageEntity,
- 'questionMessage',
- 'questionMessage.id = answeredQuestionPart.messageId',
- )
- .where('questionMessage.threadId = thread.id')
- .andWhere('questionMessage.isHidden = false')
- .andWhere('answeredQuestionPart.toolName = :askQuestionsToolName')
- .andWhere(ANSWERED_ASK_QUESTIONS_PART_EXPRESSION)
- .getQuery();
- }
-
- private buildUserNeverEngagedPredicate(
- queryBuilder: SelectQueryBuilder<AgentChatThreadEntity>,
- ): string {
- const visibleUserMessageSubQuery = queryBuilder
- .subQuery()
- .select('1')
- .from(AgentMessageEntity, 'userMessage')
- .where('userMessage.threadId = thread.id')
- .andWhere('userMessage.isHidden = false')
- .andWhere('userMessage.role = :userMessageRole')
- .getQuery();
-
- const answeredQuestionSubQuery = this.buildAnsweredQuestionSubQuery(
- queryBuilder,
- '1',
- );
-
- return `(NOT EXISTS (${visibleUserMessageSubQuery}) AND NOT EXISTS (${answeredQuestionSubQuery}))`;
- }
-
- private applyFilters(
- queryBuilder: SelectQueryBuilder<AgentChatThreadEntity>,
- {
- scope,
- hasErrorOnly,
- userNeverEngagedOnly,
- searchTerm,
- }: Pick<
- GlobalChatThreadsArgs,
- 'scope' | 'hasErrorOnly' | 'userNeverEngagedOnly' | 'searchTerm'
- >,
- ): SelectQueryBuilder<AgentChatThreadEntity> {
- queryBuilder
- .innerJoin(
- 'thread.workspace',
- 'workspace',
- '"workspace"."allowImpersonation" = true AND "workspace"."deletedAt" IS NULL',
- )
- .leftJoin('thread.userWorkspace', 'userWorkspace')
- .leftJoin('userWorkspace.user', 'user')
- .withDeleted()
- .setParameter(
- 'setupThreadNamespace',
- WORKSPACE_SETUP_CHAT_THREAD_ID_NAMESPACE,
- )
- .setParameter('userMessageRole', AgentMessageRole.USER)
- .setParameter('askQuestionsToolName', ASK_QUESTIONS_TOOL_NAME)
- .setParameter('answeredQuestionStatus', ANSWERED_ASK_QUESTIONS_STATUS);
-
- if (scope === AdminChatThreadScope.ONBOARDING) {
- queryBuilder.andWhere(this.buildOnboardingThreadPredicate(queryBuilder));
- }
-
- if (hasErrorOnly) {
- queryBuilder.andWhere('"thread"."lastStreamError" IS NOT NULL');
- }
-
- if (userNeverEngagedOnly) {
- queryBuilder.andWhere(this.buildUserNeverEngagedPredicate(queryBuilder));
- }
-
- const trimmedSearchTerm = searchTerm?.trim();
-
- if (isNonEmptyString(trimmedSearchTerm)) {
- const escapedSearchTerm = trimmedSearchTerm.replace(/[\\%_]/g, '\\$&');
-
- queryBuilder.andWhere(
- new Brackets((subQuery) => {
- subQuery
- .where('"workspace"."displayName" ILIKE :searchPattern')
- .orWhere('"user"."email" ILIKE :searchPattern')
- .orWhere('"thread"."id"::text ILIKE :searchPattern');
- }),
- { searchPattern: `%${escapedSearchTerm}%` },
- );
- }
-
- return queryBuilder;
- }
-
- async getGlobalChatThreads({
- scope,
- hasErrorOnly,
- userNeverEngagedOnly,
- searchTerm,
- sortBy,
- sortDirection,
- limit,
- offset,
- }: GlobalChatThreadsArgs): Promise<PaginatedAdminChatThreadsDTO> {
- const sanitizedLimit = Math.min(
- Math.max(limit, 1),
+ async getGlobalChatThreads(
+ args: GlobalChatThreadsArgs,
+ ): Promise<PaginatedAdminChatThreadsDTO> {
+ const limit = Math.min(
+ Math.max(args.limit, 1),
ADMIN_CHAT_THREADS_MAX_PAGE_SIZE,
);
- const sanitizedOffset = Math.max(offset, 0);
-
- const filterArgs = {
- scope,
- hasErrorOnly,
- userNeverEngagedOnly,
- searchTerm,
+ const offset = Math.max(args.offset, 0);
+ const field = COLUMN_BY_SORT_FIELD[args.sortBy];
+ const direction =
+ args.sortDirection === AdminChatThreadSortDirection.ASC ? 1 : -1;
+ const workspaces = await this.workspaceRepository.find({
+ where: { allowImpersonation: true },
+ select: { id: true },
+ order: { id: 'ASC' },
+ });
+ let candidates: GlobalChatThreadRawRow[] = [];
+ let totalCount = 0;
+ const compare = (
+ left: GlobalChatThreadRawRow,
+ right: GlobalChatThreadRawRow,
+ ) => {
+ const leftValue = Number(left[field]);
+ const rightValue = Number(right[field]);
+ return (
+ direction * (leftValue - rightValue) || left.id.localeCompare(right.id)
+ );
};
- const orderExpression = ORDER_EXPRESSION_BY_SORT_FIELD[sortBy];
-
- const orderDirection: 'ASC' | 'DESC' =
- sortDirection === AdminChatThreadSortDirection.ASC ? 'ASC' : 'DESC';
-
- const listQueryBuilder = this.applyFilters(
- this.agentChatThreadRepository.createQueryBuilder('thread'),
- filterArgs,
+ await this.historyStorage.runReadOnlyReport(
+ workspaces.map((workspace) => workspace.id),
+ async ({ manager, partitions }) => {
+ // Bound each statement's size and keep only the global page candidates.
+ for (
+ let offsetIndex = 0;
+ offsetIndex < partitions.length;
+ offsetIndex += 25
+ ) {
+ const parameters: unknown[] = [];
+ const queries = partitions
+ .slice(offsetIndex, offsetIndex + 25)
+ .map(({ workspaceIds, storage, table }, partitionIndex) => {
+ const workspaceCondition =
+ storage === 'core'
+ ? 'AND thread."workspaceId" = workspace.id'
+ : '';
+ const search = args.searchTerm?.trim().replace(/[\\%_]/g, '\\$&');
+ const query = `
+ WITH candidates AS (
+ SELECT thread.id, thread.title, workspace.id AS "workspaceId", workspace."displayName" AS "workspaceDisplayName",
+ thread."userWorkspaceId", owner.email AS "userEmail", owner."firstName" AS "userFirstName", owner."lastName" AS "userLastName",
+ ${storage === 'core' ? 'thread."deletedAt"' : 'thread."archivedAt"'} AS "deletedAt", thread."createdAt", thread."updatedAt", thread."lastStreamError" IS NOT NULL AS "hasError",
+ (EXISTS (SELECT 1 FROM ${table('agentMessage')} hidden WHERE hidden."threadId" = thread.id AND hidden."isHidden" = true)
+ OR thread.id = public.uuid_generate_v5($2::uuid, workspace.id::text || ':' || thread."userWorkspaceId"::text)) AS "isOnboardingThread",
+ (SELECT COUNT(*)::int FROM ${table('agentMessage')} message WHERE message."threadId" = thread.id AND message."isHidden" = false) AS "messageCount",
+ ((SELECT COUNT(*) FROM ${table('agentMessage')} message WHERE message."threadId" = thread.id AND message."isHidden" = false AND message.role = 'user')
+ + (SELECT COUNT(*) FROM ${table('agentMessagePart')} part JOIN ${table('agentMessage')} message ON message.id = part."messageId"
+ WHERE message."threadId" = thread.id AND message."isHidden" = false AND part."toolName" = $3 AND part."toolOutput"->'result'->>'status' = 'answered'))::int AS "userReplyCount"
+ FROM ${table('agentChatThread')} thread
+ JOIN core.workspace workspace ON workspace.id = ANY($1::uuid[]) AND workspace."allowImpersonation" = true AND workspace."deletedAt" IS NULL
+ LEFT JOIN core."userWorkspace" membership ON membership.id = thread."userWorkspaceId" AND membership."workspaceId" = workspace.id
+ LEFT JOIN core."user" owner ON owner.id = membership."userId"
+ WHERE true ${workspaceCondition}
+ AND ($4::text IS NULL OR workspace."displayName" ILIKE $4 OR owner.email ILIKE $4 OR thread.id::text ILIKE $4)
+ )
+ SELECT *, COUNT(*) OVER () AS "totalCount", $9::int AS "partitionIndex" FROM candidates
+ WHERE ($5::boolean = false OR "isOnboardingThread") AND ($6::boolean = false OR "hasError") AND ($7::boolean = false OR "userReplyCount" = 0)
+ ORDER BY "${field}" ${direction === 1 ? 'ASC' : 'DESC'}, id ASC LIMIT $8`;
+ const parameterOffset = parameters.length;
+ parameters.push(
+ workspaceIds,
+ WORKSPACE_SETUP_CHAT_THREAD_ID_NAMESPACE,
+ ASK_QUESTIONS_TOOL_NAME,
+ search ? `%${search}%` : null,
+ args.scope === AdminChatThreadScope.ONBOARDING,
+ args.hasErrorOnly,
+ args.userNeverEngagedOnly,
+ offset + limit,
+ partitionIndex,
+ );
+ return `(${query.replace(/\$(\d+)/g, (_, position: string) => `$${Number(position) + parameterOffset}`)})`;
+ });
+ const rows = await manager.query<
+ (GlobalChatThreadRawRow & {
+ totalCount: string;
+ partitionIndex: number;
+ })[]
+ >(queries.join(' UNION ALL '), parameters);
+ totalCount += [
+ ...new Map(
+ rows.map((row) => [row.partitionIndex, Number(row.totalCount)]),
+ ).values(),
+ ].reduce((total, count) => total + count, 0);
+ candidates = [...candidates, ...rows]
+ .sort(compare)
+ .slice(0, offset + limit);
+ }
+ },
);
-
- const rows = await listQueryBuilder
- .leftJoin('thread.messages', 'message', '"message"."isHidden" = false')
- .select('thread.id', 'id')
- .addSelect('thread.title', 'title')
- .addSelect('thread.workspaceId', 'workspaceId')
- .addSelect('thread.userWorkspaceId', 'userWorkspaceId')
- .addSelect('thread.deletedAt', 'deletedAt')
- .addSelect('thread.createdAt', 'createdAt')
- .addSelect('thread.updatedAt', 'updatedAt')
- .addSelect('workspace.displayName', 'workspaceDisplayName')
- .addSelect('user.email', 'userEmail')
- .addSelect('user.firstName', 'userFirstName')
- .addSelect('user.lastName', 'userLastName')
- .addSelect('"thread"."lastStreamError" IS NOT NULL', 'hasError')
- .addSelect(
- this.buildOnboardingThreadPredicate(listQueryBuilder),
- 'isOnboardingThread',
- )
- .addSelect('COUNT("message"."id")::int', 'messageCount')
- .addSelect(
- `(
- (COUNT("message"."id") FILTER (WHERE "message"."role" = :userMessageRole))
- + (${this.buildAnsweredQuestionSubQuery(listQueryBuilder, 'COUNT(*)')})
- )::int`,
- 'userReplyCount',
- )
- .groupBy('"thread"."id"')
- .addGroupBy('"workspace"."id"')
- .addGroupBy('"userWorkspace"."id"')
- .addGroupBy('"user"."id"')
- .orderBy(orderExpression, orderDirection)
- .addOrderBy('"thread"."id"', 'ASC')
- .limit(sanitizedLimit)
- .offset(sanitizedOffset)
- .getRawMany<GlobalChatThreadRawRow>();
-
- const totalCount = await this.applyFilters(
- this.agentChatThreadRepository.createQueryBuilder('thread'),
- filterArgs,
- ).getCount();
-
- const threads: AdminChatThreadListItemDTO[] = rows.map((row) => ({
- id: row.id,
- title: row.title,
- workspaceId: row.workspaceId,
- workspaceDisplayName: row.workspaceDisplayName,
- userWorkspaceId: row.userWorkspaceId,
- userEmail: row.userEmail,
- userFirstName: row.userFirstName,
- userLastName: row.userLastName,
- messageCount: row.messageCount,
- userReplyCount: row.userReplyCount,
- hasError: row.hasError,
- isOnboardingThread: row.isOnboardingThread,
- deletedAt: row.deletedAt,
- createdAt: row.createdAt,
- updatedAt: row.updatedAt,
- }));
-
+ const threads = candidates.slice(offset, offset + limit);
return {
threads,
totalCount,
- hasMore: sanitizedOffset + threads.length < totalCount,
+ hasMore: offset + threads.length < totalCount,
};
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts
index 185821ff9e3..971d065eb9f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/ai-agent-monitor.module.ts
@@ -1,3 +1,4 @@
+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
@@ -18,6 +19,7 @@ import { AgentTurnGraderService } from './services/agent-turn-grader.service';
@Module({
imports: [
+ AgentHistoryModule,
TypeOrmModule.forFeature([
AgentTurnEvaluationEntity,
AgentTurnEntity,
@@ -35,9 +37,6 @@ import { AgentTurnGraderService } from './services/agent-turn-grader.service';
AgentTurnResolver,
EvaluateAgentTurnJob,
RunEvaluationInputJob,
- provideWorkspaceScopedRepository(AgentTurnEvaluationEntity),
- provideWorkspaceScopedRepository(AgentTurnEntity),
- provideWorkspaceScopedRepository(AgentChatThreadEntity),
provideWorkspaceScopedRepository(AgentEntity),
],
exports: [AgentTurnGraderService],
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
index 06a7fa2237d..f844b502963 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Logger, UseGuards, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
@@ -22,8 +24,6 @@ import { RunEvaluationInputJob } from 'src/engine/metadata-modules/ai/ai-agent-m
import { AgentTurnGraderService } from 'src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service';
import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
@@ -35,10 +35,10 @@ export class AgentTurnResolver {
private readonly logger = new Logger(AgentTurnResolver.name);
constructor(
- @InjectWorkspaceScopedRepository(AgentTurnEntity)
- private readonly turnRepository: WorkspaceScopedRepository<AgentTurnEntity>,
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentTurn')
+ private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
@InjectMessageQueue(MessageQueue.aiQueue)
private readonly messageQueueService: MessageQueueService,
private readonly graderService: AgentTurnGraderService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
index eb3b566feb6..810ec78aa35 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable, Logger } from '@nestjs/common';
import { msg } from '@lingui/core/macro';
@@ -10,17 +12,15 @@ import { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-age
import { buildAiTelemetry } from 'src/engine/metadata-modules/ai/ai-models/utils/build-ai-telemetry.util';
import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
import { buildReasoningProviderOptions } from 'src/engine/metadata-modules/ai/ai-models/utils/build-reasoning-provider-options.util';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@Injectable()
export class AgentTurnGraderService {
private readonly logger = new Logger(AgentTurnGraderService.name);
constructor(
- @InjectWorkspaceScopedRepository(AgentTurnEntity)
- private readonly turnRepository: WorkspaceScopedRepository<AgentTurnEntity>,
- @InjectWorkspaceScopedRepository(AgentTurnEvaluationEntity)
- private readonly evaluationRepository: WorkspaceScopedRepository<AgentTurnEvaluationEntity>,
+ @InjectAgentHistoryRepository('agentTurn')
+ private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,
+ @InjectAgentHistoryRepository('agentTurnEvaluation')
+ private readonly evaluationRepository: AgentHistoryRepository<AgentTurnEvaluationEntity>,
private readonly aiModelRegistryService: AiModelRegistryService,
) {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
index 37743f4e1ba..52313ad28b8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
@@ -1,3 +1,4 @@
+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { UsageLimitModule } from 'src/engine/core-modules/usage-limit/usage-limit.module';
import { AiChatUsageService } from 'src/engine/metadata-modules/ai/ai-chat/services/ai-chat-usage.service';
import { AiChatUsageResolver } from 'src/engine/metadata-modules/ai/ai-chat/resolvers/ai-chat-usage.resolver';
@@ -15,9 +16,6 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user
import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
-import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
-import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
-import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
@@ -47,6 +45,7 @@ import { SystemPromptBuilderService } from './services/system-prompt-builder.ser
@Module({
imports: [
+ AgentHistoryModule,
UsageLimitModule,
TypeOrmModule.forFeature([
AgentChatThreadEntity,
@@ -89,10 +88,6 @@ import { SystemPromptBuilderService } from './services/system-prompt-builder.ser
StreamAgentChatJob,
SystemPromptBuilderService,
AiGraphqlApiExceptionInterceptor,
- provideWorkspaceScopedRepository(AgentChatThreadEntity),
- provideWorkspaceScopedRepository(AgentTurnEntity),
- provideWorkspaceScopedRepository(AgentMessageEntity),
- provideWorkspaceScopedRepository(AgentMessagePartEntity),
provideWorkspaceScopedRepository(FileEntity),
],
exports: [
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts
index a3c424819e1..2ef0d4c6de4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts
@@ -178,12 +178,17 @@ describe('StreamAgentChatJob', () => {
deletedAt: null,
activeStreamId: 'stream-id',
}),
- update: jest.fn().mockImplementation((_workspaceId, _criteria, values) =>
- Promise.resolve({
- affected:
- values && typeof values.totalInputTokens === 'function'
- ? totalsUpdateAffected
- : 1,
+ update: jest.fn().mockResolvedValue({ affected: 1 }),
+ query: jest.fn().mockImplementation(async (_workspaceId, work) =>
+ work({
+ storage: 'core',
+ table: () => 'core."agentChatThread"',
+ manager: {
+ query: async () =>
+ Array.from({ length: totalsUpdateAffected }, () => ({
+ id: 'thread-id',
+ })),
+ },
}),
),
};
@@ -317,10 +322,9 @@ describe('StreamAgentChatJob', () => {
]),
}),
);
- expect(threadRepository.update).toHaveBeenCalledWith(
+ expect(threadRepository.query).toHaveBeenCalledWith(
'workspace-id',
- { id: 'thread-id', activeStreamId: 'stream-id' },
- expect.objectContaining({ lastStreamError: null }),
+ expect.any(Function),
);
expect(threadRepository.update).toHaveBeenCalledWith(
'workspace-id',
@@ -340,10 +344,9 @@ describe('StreamAgentChatJob', () => {
expect(agentChatService.upsertAssistantMessage).toHaveBeenCalledWith(
expect.objectContaining({ turnId: 'turn-id' }),
);
- expect(threadRepository.update).toHaveBeenCalledWith(
+ expect(threadRepository.query).toHaveBeenCalledWith(
'workspace-id',
- { id: 'thread-id', activeStreamId: 'stream-id' },
- expect.objectContaining({ lastStreamError: null }),
+ expect.any(Function),
);
expect(agentChatService.notifyThreadUsageUpdated).not.toHaveBeenCalled();
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
index a284d36d1fe..8a64d489ad6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
@@ -1,3 +1,6 @@
+import { updateAgentChatThreadUsage } from 'src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util';
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Logger, Scope } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
@@ -52,8 +55,6 @@ import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/ut
import { tagAiChatStreamScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-stream-scope.util';
import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
import type { AiModelConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-config.type';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { STREAM_AGENT_CHAT_JOB_NAME } from './stream-agent-chat-job-name.constant';
import { type StreamAgentChatJobData } from './stream-agent-chat-job.types';
@@ -76,8 +77,8 @@ export class StreamAgentChatJob {
private hasRecordedTurnOutcome = false;
constructor(
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
private readonly agentChatService: AgentChatService,
@@ -873,30 +874,25 @@ export class StreamAgentChatJob {
});
}
- const totalsUpdate = await this.threadRepository.update(
+ const totalsUpdate = await updateAgentChatThreadUsage({
+ repository: this.threadRepository,
workspaceId,
- { id: threadId, activeStreamId: streamId },
- {
- totalInputTokens: () =>
- `"totalInputTokens" + ${streamUsage.inputTokens}`,
- totalOutputTokens: () =>
- `"totalOutputTokens" + ${streamUsage.outputTokens}`,
- totalInputCredits: () =>
- `"totalInputCredits" + ${streamUsage.inputCredits}`,
- totalOutputCredits: () =>
- `"totalOutputCredits" + ${streamUsage.outputCredits}`,
- totalCacheReadTokens: () =>
- `"totalCacheReadTokens" + ${streamUsage.cacheReadTokens}`,
- totalCacheCreationTokens: () =>
- `"totalCacheCreationTokens" + ${totalCacheCreationTokens}`,
+ threadId,
+ streamId,
+ usage: {
+ totalInputTokens: streamUsage.inputTokens,
+ totalOutputTokens: streamUsage.outputTokens,
+ totalInputCredits: streamUsage.inputCredits,
+ totalOutputCredits: streamUsage.outputCredits,
+ totalCacheReadTokens: streamUsage.cacheReadTokens,
+ totalCacheCreationTokens,
contextWindowTokens: modelConfig.contextWindowTokens,
conversationSize: lastStepConversationSize,
pendingQuestionMessageId: isDefined(pendingQuestionPart)
? assistantMessageId
: null,
- lastStreamError: null,
},
- );
+ });
if (!totalsUpdate.affected) {
return resolveSupersededTurnOutcome(outcome);
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts
index e05ac100c48..a267fa814b7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { UseGuards, UseInterceptors } from '@nestjs/common';
import { Args, Subscription } from '@nestjs/graphql';
@@ -24,8 +26,6 @@ import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/en
import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';
import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@MetadataResolver()
@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@@ -33,8 +33,8 @@ export class AgentChatSubscriptionResolver {
constructor(
private readonly subscriptionService: SubscriptionService,
private readonly agentChatStreamingService: AgentChatStreamingService,
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
) {}
@Subscription(() => AgentChatEventDTO, {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
index 778d660a929..2b9b7aa8291 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
import {
Args,
@@ -47,8 +49,6 @@ import {
import { BillingGraphqlApiExceptionFilter } from 'src/engine/core-modules/billing/filters/billing-graphql-api-exception.filter';
import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';
import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { getChatModelId } from 'src/engine/metadata-modules/ai/ai-models/utils/get-chat-model-id.util';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -69,8 +69,8 @@ export class AgentChatResolver {
private readonly aiBillingService: AiBillingService,
private readonly aiModelRegistryService: AiModelRegistryService,
private readonly redisClientService: RedisClientService,
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
) {}
@Query(() => [AgentChatThreadDTO])
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
index 115ab0aa399..082a2c23c9b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable, Logger } from '@nestjs/common';
import { generateId } from 'ai';
@@ -56,8 +58,8 @@ export class AgentChatStreamingService {
private readonly logger = new Logger(AgentChatStreamingService.name);
constructor(
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
@InjectWorkspaceScopedRepository(FileEntity)
private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,
@InjectMessageQueue(MessageQueue.aiStreamQueue)
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
index a42f948682d..a9f916581f7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable, Logger } from '@nestjs/common';
import {
@@ -62,14 +64,14 @@ export class AgentChatService {
private readonly logger = new Logger(AgentChatService.name);
constructor(
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
- @InjectWorkspaceScopedRepository(AgentTurnEntity)
- private readonly turnRepository: WorkspaceScopedRepository<AgentTurnEntity>,
- @InjectWorkspaceScopedRepository(AgentMessageEntity)
- private readonly messageRepository: WorkspaceScopedRepository<AgentMessageEntity>,
- @InjectWorkspaceScopedRepository(AgentMessagePartEntity)
- private readonly messagePartRepository: WorkspaceScopedRepository<AgentMessagePartEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentTurn')
+ private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,
+ @InjectAgentHistoryRepository('agentMessage')
+ private readonly messageRepository: AgentHistoryRepository<AgentMessageEntity>,
+ @InjectAgentHistoryRepository('agentMessagePart')
+ private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartEntity>,
@InjectWorkspaceScopedRepository(FileEntity)
private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,
private readonly titleGenerationService: AgentTitleGenerationService,
@@ -164,19 +166,20 @@ export class AgentChatService {
userWorkspaceId: string;
workspaceId: string;
}): Promise<(AgentChatThreadEntity & { lastMessageAt: Date | null })[]> {
- const rankedThreads = await this.threadRepository
- .createQueryBuilder('thread')
- .select('thread.id', 'id')
- .addSelect('MAX(message.createdAt)', 'last_message_at')
- .leftJoin('thread.messages', 'message', 'message.isHidden = false')
- .where(
- 'thread.userWorkspaceId = :userWorkspaceId AND thread.workspaceId = :workspaceId',
- { userWorkspaceId, workspaceId },
- )
- .groupBy('thread.id')
- .orderBy('last_message_at', 'DESC', 'NULLS LAST')
- .addOrderBy('thread.updatedAt', 'DESC')
- .getRawMany<{ id: string; last_message_at: Date | null }>();
+ const rankedThreads = await this.threadRepository.query(
+ workspaceId,
+ ({ manager, table, storage }) =>
+ manager.query<{ id: string; last_message_at: Date | null }[]>(
+ `SELECT thread.id, MAX(message."createdAt") AS last_message_at
+ FROM ${table('agentChatThread')} thread
+ LEFT JOIN ${table('agentMessage')} message ON message."threadId" = thread.id AND message."isHidden" = false
+ WHERE thread."userWorkspaceId" = $1 ${storage === 'core' ? 'AND thread."workspaceId" = $2' : ''}
+ GROUP BY thread.id ORDER BY last_message_at DESC NULLS LAST, thread."updatedAt" DESC`,
+ storage === 'core'
+ ? [userWorkspaceId, workspaceId]
+ : [userWorkspaceId],
+ ),
+ );
if (rankedThreads.length === 0) {
return [];
@@ -208,14 +211,15 @@ export class AgentChatService {
threadId: string;
workspaceId: string;
}): Promise<Date | null> {
- const result = await this.messageRepository
- .createQueryBuilder('message')
- .select('MAX(message.createdAt)', 'last_message_at')
- .where(
- 'message.threadId = :threadId AND message.workspaceId = :workspaceId AND message.isHidden = false',
- { threadId, workspaceId },
- )
- .getRawOne<{ last_message_at: Date | null }>();
+ const [result] = await this.messageRepository.query(
+ workspaceId,
+ ({ manager, table, storage }) =>
+ manager.query<{ last_message_at: Date | null }[]>(
+ `SELECT MAX("createdAt") AS last_message_at FROM ${table('agentMessage')}
+ WHERE "threadId" = $1 AND "isHidden" = false ${storage === 'core' ? 'AND "workspaceId" = $2' : ''}`,
+ storage === 'core' ? [threadId, workspaceId] : [threadId],
+ ),
+ );
return result?.last_message_at ?? null;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util.ts
new file mode 100644
index 00000000000..29b7f2ae1b1
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util.ts
@@ -0,0 +1,64 @@
+import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+import { type AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
+
+type ThreadUsageUpdate = Pick<
+ AgentChatThreadEntity,
+ | 'totalInputTokens'
+ | 'totalOutputTokens'
+ | 'totalInputCredits'
+ | 'totalOutputCredits'
+ | 'totalCacheReadTokens'
+ | 'totalCacheCreationTokens'
+ | 'contextWindowTokens'
+ | 'conversationSize'
+ | 'pendingQuestionMessageId'
+>;
+
+export const updateAgentChatThreadUsage = async ({
+ repository,
+ workspaceId,
+ threadId,
+ streamId,
+ usage,
+}: {
+ repository: AgentHistoryRepository<AgentChatThreadEntity>;
+ workspaceId: string;
+ threadId: string;
+ streamId: string;
+ usage: ThreadUsageUpdate;
+}): Promise<{ affected: number }> =>
+ repository.query(workspaceId, async ({ manager, table, storage }) => {
+ // Keep arithmetic in PostgreSQL and ownership in the same UPDATE. DTO numbers
+ // must never be read back and added to exact NUMERIC totals in JavaScript.
+ const rows = await manager.query<{ id: string }[]>(
+ `
+ WITH updated AS (
+ UPDATE ${table('agentChatThread')} SET
+ "totalInputTokens" = "totalInputTokens" + $3,
+ "totalOutputTokens" = "totalOutputTokens" + $4,
+ "totalInputCredits" = "totalInputCredits" + $5,
+ "totalOutputCredits" = "totalOutputCredits" + $6,
+ "totalCacheReadTokens" = "totalCacheReadTokens" + $7,
+ "totalCacheCreationTokens" = "totalCacheCreationTokens" + $8,
+ "contextWindowTokens" = $9, "conversationSize" = $10,
+ "pendingQuestionMessageId" = $11, "lastStreamError" = NULL, "updatedAt" = now()
+ WHERE id = $1 AND "activeStreamId" = $2 ${storage === 'core' ? 'AND "workspaceId" = $12' : ''}
+ RETURNING id
+ ) SELECT id FROM updated`,
+ [
+ threadId,
+ streamId,
+ usage.totalInputTokens,
+ usage.totalOutputTokens,
+ usage.totalInputCredits,
+ usage.totalOutputCredits,
+ usage.totalCacheReadTokens,
+ usage.totalCacheCreationTokens,
+ usage.contextWindowTokens,
+ usage.conversationSize,
+ usage.pendingQuestionMessageId,
+ ...(storage === 'core' ? [workspaceId] : []),
+ ],
+ );
+ return { affected: rows.length };
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts
new file mode 100644
index 00000000000..98728935985
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts
@@ -0,0 +1,45 @@
+import { type EntityTarget } from 'typeorm';
+import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+import { Module } from '@nestjs/common';
+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
+import { getAgentHistoryRepositoryToken } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
+import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
+import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
+import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
+import { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';
+
+const ENTITY_BY_OBJECT_NAME: Record<
+ AgentHistoryObjectName,
+ EntityTarget<{ id: string; workspaceId: string }>
+> = {
+ agentChatThread: AgentChatThreadEntity,
+ agentMessage: AgentMessageEntity,
+ agentMessagePart: AgentMessagePartEntity,
+ agentTurn: AgentTurnEntity,
+ agentTurnEvaluation: AgentTurnEvaluationEntity,
+};
+
+const REPOSITORY_PROVIDERS = AGENT_HISTORY_OBJECT_NAMES.map((objectName) => ({
+ provide: getAgentHistoryRepositoryToken(objectName),
+ useFactory: (
+ storageService: AgentHistoryStorageService,
+ workspaceOrmManager: WorkspaceOrmManager,
+ ) =>
+ new AgentHistoryRepository(
+ objectName,
+ ENTITY_BY_OBJECT_NAME[objectName],
+ storageService,
+ workspaceOrmManager,
+ ),
+ inject: [AgentHistoryStorageService, WorkspaceOrmManager],
+}));
+
+@Module({
+ providers: [AgentHistoryStorageService, ...REPOSITORY_PROVIDERS],
+ exports: [AgentHistoryStorageService, ...REPOSITORY_PROVIDERS],
+})
+export class AgentHistoryModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant.ts
new file mode 100644
index 00000000000..8ef0f676e5a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant.ts
@@ -0,0 +1,8 @@
+// Parent-first order is also the durable migration cursor order. Append only.
+export const AGENT_HISTORY_OBJECT_NAMES = [
+ 'agentChatThread',
+ 'agentTurn',
+ 'agentMessage',
+ 'agentMessagePart',
+ 'agentTurnEvaluation',
+] as const;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts
new file mode 100644
index 00000000000..a710ecceded
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts
@@ -0,0 +1 @@
+export const AGENT_HISTORY_STORAGE_KEY = 'agent-history-storage-v1';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception.ts
new file mode 100644
index 00000000000..196be4727b8
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception.ts
@@ -0,0 +1,21 @@
+import { msg } from '@lingui/core/macro';
+import { CustomException } from 'src/utils/custom-exception';
+
+type AgentHistoryStorageExceptionCode =
+ | 'INVALID_STATE'
+ | 'MISSING_STATE'
+ | 'INVALID_WORKSPACE'
+ | 'INVALID_CRITERIA'
+ | 'RECORD_NOT_FOUND';
+
+export class AgentHistoryStorageException extends CustomException<AgentHistoryStorageExceptionCode> {
+ constructor(code: AgentHistoryStorageExceptionCode, message: string) {
+ super(message, code, {
+ userFriendlyMessage:
+ code === 'RECORD_NOT_FOUND'
+ ? msg`AI history record not found.`
+ : msg`Unable to access AI history. Please try again.`,
+ statusCode: code === 'RECORD_NOT_FOUND' ? 404 : undefined,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
new file mode 100644
index 00000000000..9a55bbea99d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
@@ -0,0 +1,313 @@
+import {
+ mapAgentHistoryValuesToWorkspace,
+ mapAgentHistoryWhereToWorkspace,
+} from 'src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util';
+import { normalizeAgentHistoryRecord } from 'src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util';
+import { hydrateAgentHistoryFiles } from 'src/engine/metadata-modules/ai/ai-history/utils/hydrate-agent-history-files.util';
+import { removeAgentHistoryFileRelations } from 'src/engine/metadata-modules/ai/ai-history/utils/remove-agent-history-file-relations.util';
+import {
+ AiException,
+ AiExceptionCode,
+} from 'src/engine/metadata-modules/ai/ai.exception';
+import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+import {
+ type EntityTarget,
+ type FindManyOptions,
+ type FindOneOptions,
+ type FindOptionsWhere,
+ type ObjectLiteral,
+} from 'typeorm';
+import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+ type AgentHistoryStorageService,
+ type AgentHistoryStorageContext,
+} from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
+import {
+ type WorkspaceFindOptions,
+ normalizeFindOptionsRelations,
+} from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+
+export class AgentHistoryRepository<
+ TRecord extends { id: string; workspaceId: string },
+> {
+ constructor(
+ private readonly name: AgentHistoryObjectName,
+ private readonly legacyEntity: EntityTarget<TRecord>,
+ private readonly storageService: AgentHistoryStorageService,
+ private readonly workspaceOrmManager: Pick<
+ WorkspaceOrmManager,
+ 'executeInWorkspaceContext' | 'getRepository'
+ >,
+ ) {}
+
+ private run<TResult>(
+ workspaceId: string,
+ core: (repository: WorkspaceScopedRepository<TRecord>) => Promise<TResult>,
+ workspace: (
+ repository: WorkspaceRepository<TRecord>,
+ context: AgentHistoryStorageContext,
+ ) => Promise<TResult>,
+ ): Promise<TResult> {
+ // Load metadata before reserving a core connection: a cold cache may itself
+ // need the core pool. Holding every pool slot here would deadlock startup.
+ // WorkspaceDataSourceService owns a separate pg pool. Keep the fence until
+ // its write commits; the core transaction contains only coordination reads.
+ // A later core COMMIT failure does not roll back an already committed write.
+ return this.workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ this.storageService.run(workspaceId, (context) => {
+ if (context.storage === 'core') {
+ return core(
+ new WorkspaceScopedRepository(
+ context.manager.getRepository(this.legacyEntity),
+ ),
+ );
+ }
+ return workspace(
+ this.workspaceOrmManager.getRepository<TRecord>(
+ this.name,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ ),
+ context,
+ );
+ }),
+ buildSystemAuthContext(workspaceId),
+ { lite: true },
+ );
+ }
+
+ async find(
+ workspaceId: string,
+ options?: FindManyOptions<TRecord>,
+ ): Promise<TRecord[]> {
+ return this.run(
+ workspaceId,
+ (repository) => repository.find(workspaceId, options),
+ async (repository, context) => {
+ const relations = normalizeFindOptionsRelations(
+ (options?.relations ?? {}) as WorkspaceFindOptions['relations'] & {},
+ );
+ const records = await repository.find({
+ ...options,
+ where: mapAgentHistoryWhereToWorkspace<TRecord>(
+ this.name,
+ options?.where,
+ ),
+ withDeleted: true,
+ relations: removeAgentHistoryFileRelations(relations),
+ } as WorkspaceFindOptions);
+ const normalized = records.map((record) =>
+ normalizeAgentHistoryRecord({
+ record,
+ workspaceId,
+ objectName: this.name,
+ }),
+ );
+ if (JSON.stringify(relations).includes('"file"')) {
+ await hydrateAgentHistoryFiles({
+ records: normalized,
+ manager: context.manager,
+ workspaceId,
+ });
+ }
+ return normalized as TRecord[];
+ },
+ );
+ }
+
+ async findOne(
+ workspaceId: string,
+ options: FindOneOptions<TRecord>,
+ ): Promise<TRecord | null> {
+ return (await this.find(workspaceId, { ...options, take: 1 }))[0] ?? null;
+ }
+
+ async findOneOrFail(
+ workspaceId: string,
+ options: FindOneOptions<TRecord>,
+ ): Promise<TRecord> {
+ const record = await this.findOne(workspaceId, options);
+ if (!isDefined(record)) {
+ if (this.name === 'agentChatThread') {
+ throw new AiException(
+ 'Chat thread not found',
+ AiExceptionCode.THREAD_NOT_FOUND,
+ );
+ }
+ if (this.name === 'agentMessage') {
+ throw new AiException(
+ 'Chat message not found',
+ AiExceptionCode.MESSAGE_NOT_FOUND,
+ );
+ }
+ throw new AgentHistoryStorageException(
+ 'RECORD_NOT_FOUND',
+ `${this.name} not found`,
+ );
+ }
+ return record;
+ }
+
+ count(
+ workspaceId: string,
+ options?: FindManyOptions<TRecord>,
+ ): Promise<number> {
+ return this.run(
+ workspaceId,
+ (repository) => repository.count(workspaceId, options),
+ (repository) =>
+ repository.count({
+ ...options,
+ where: mapAgentHistoryWhereToWorkspace<TRecord>(
+ this.name,
+ options?.where,
+ ),
+ withDeleted: true,
+ } as WorkspaceFindOptions),
+ );
+ }
+
+ existsBy(
+ workspaceId: string,
+ where: FindOptionsWhere<TRecord>,
+ ): Promise<boolean> {
+ return this.run(
+ workspaceId,
+ (repository) => repository.existsBy(workspaceId, where),
+ (repository) =>
+ repository.exists({
+ where: mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where),
+ withDeleted: true,
+ }),
+ );
+ }
+
+ insert(
+ workspaceId: string,
+ values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
+ ) {
+ return this.run(
+ workspaceId,
+ (repository) => repository.insert(workspaceId, values),
+ (repository) =>
+ repository.insert(
+ mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),
+ ),
+ );
+ }
+
+ insertAndReturnOne(
+ workspaceId: string,
+ values: QueryDeepPartialEntity<TRecord>,
+ ): Promise<TRecord> {
+ return this.run(
+ workspaceId,
+ (repository) => repository.insertAndReturnOne(workspaceId, values),
+ async (repository) => {
+ const result = await repository.insert(
+ mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),
+ );
+ return normalizeAgentHistoryRecord({
+ record: result.raw[0],
+ workspaceId,
+ objectName: this.name,
+ }) as TRecord;
+ },
+ );
+ }
+
+ update(
+ workspaceId: string,
+ where: FindOptionsWhere<TRecord>,
+ values: QueryDeepPartialEntity<TRecord>,
+ ) {
+ return this.run(
+ workspaceId,
+ (repository) => repository.update(workspaceId, where, values),
+ async (repository) => {
+ const result = await repository
+ .createQueryBuilder()
+ .withDeleted()
+ .where(
+ mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where) ?? {},
+ )
+ .update()
+ .set(mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values))
+ .returning(['id'])
+ .execute();
+ return {
+ affected: result.generatedMaps.length,
+ generatedMaps: result.generatedMaps,
+ raw: result.generatedMaps,
+ };
+ },
+ );
+ }
+
+ delete(workspaceId: string, where: FindOptionsWhere<TRecord>) {
+ return this.run(
+ workspaceId,
+ (repository) => repository.delete(workspaceId, where),
+ async (repository) => {
+ const result = await repository
+ .createQueryBuilder()
+ .withDeleted()
+ .where(
+ mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where) ?? {},
+ )
+ .delete()
+ .returning(['id'])
+ .execute();
+ return {
+ affected: result.generatedMaps.length,
+ generatedMaps: result.generatedMaps,
+ raw: result.generatedMaps,
+ };
+ },
+ );
+ }
+
+ upsert(
+ workspaceId: string,
+ values: QueryDeepPartialEntity<TRecord>,
+ conflictPaths: string[],
+ ) {
+ return this.run(
+ workspaceId,
+ (repository) => repository.upsert(workspaceId, values, conflictPaths),
+ async (repository, context) => {
+ // Workspace upsert selects before inserting. Serialize concurrent stream
+ // checkpoints for the same identity to preserve core ON CONFLICT behavior.
+ const valuesByField: ObjectLiteral = values;
+ const identity = [...conflictPaths]
+ .sort()
+ .map((field) => [field, valuesByField[field]]);
+ await context.manager.query(
+ 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',
+ [
+ `agent-history-upsert:${workspaceId}:${this.name}:${JSON.stringify(identity)}`,
+ ],
+ );
+ return repository.upsert(
+ mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),
+ conflictPaths,
+ );
+ },
+ );
+ }
+
+ query<TResult>(
+ workspaceId: string,
+ work: (context: AgentHistoryStorageContext) => Promise<TResult>,
+ ): Promise<TResult> {
+ return this.storageService.run(workspaceId, work);
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator.ts
new file mode 100644
index 00000000000..2eb2129de34
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator.ts
@@ -0,0 +1,10 @@
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+import { Inject } from '@nestjs/common';
+
+export const getAgentHistoryRepositoryToken = (
+ name: AgentHistoryObjectName,
+): string => `AgentHistoryRepository:${name}`;
+
+export const InjectAgentHistoryRepository = (
+ name: AgentHistoryObjectName,
+): ParameterDecorator => Inject(getAgentHistoryRepositoryToken(name));
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts
new file mode 100644
index 00000000000..2f68e14b658
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts
@@ -0,0 +1,76 @@
+import { type DataSource, type QueryRunner } from 'typeorm';
+import { ServiceUnavailableException } from '@nestjs/common';
+
+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+
+describe('AgentHistoryStorageService', () => {
+ const workspaceId = '20202020-1111-4111-8111-111111111111';
+ const runner = {
+ connect: jest.fn(),
+ startTransaction: jest.fn(),
+ commitTransaction: jest.fn(),
+ rollbackTransaction: jest.fn(),
+ release: jest.fn(),
+ query: jest.fn(),
+ manager: {},
+ isTransactionActive: true,
+ };
+ const service = new AgentHistoryStorageService({
+ createQueryRunner: () => runner,
+ } as unknown as DataSource);
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ runner.query.mockReset();
+ });
+
+ it('reads the authoritative route on every operation and keeps the fence through completion', async () => {
+ runner.query
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([
+ { workspaceId, type: 'CONFIG_VARIABLE', value: { storage: 'core' } },
+ ]);
+ await service.run(workspaceId, async ({ storage, table }) => {
+ expect(storage).toBe('core');
+ expect(table('agentMessage')).toBe('"core"."agentMessage"');
+ expect(runner.commitTransaction).not.toHaveBeenCalled();
+ });
+ expect(runner.query.mock.calls[0][0]).toContain(
+ 'pg_advisory_xact_lock_shared',
+ );
+ expect(runner.commitTransaction).toHaveBeenCalledTimes(1);
+ expect(runner.release).toHaveBeenCalledTimes(1);
+ });
+
+ it('does not fall back or execute writes while a migration is incomplete', async () => {
+ runner.query.mockResolvedValueOnce([]).mockResolvedValueOnce([
+ {
+ workspaceId,
+ type: 'CONFIG_VARIABLE',
+ value: {
+ storage: 'core',
+ migration: {
+ phase: 'copying',
+ target: 'workspace',
+ tableIndex: 2,
+ lastId: null,
+ },
+ },
+ },
+ ]);
+ const operation = jest.fn();
+ await expect(service.run(workspaceId, operation)).rejects.toBeInstanceOf(
+ ServiceUnavailableException,
+ );
+ expect(operation).not.toHaveBeenCalled();
+ expect(runner.rollbackTransaction).toHaveBeenCalledTimes(1);
+ expect(runner.release).toHaveBeenCalledTimes(1);
+ });
+
+ it('fails closed on a corrupt route', async () => {
+ runner.query.mockResolvedValue([{ value: { storage: 'unknown' } }]);
+ await expect(
+ service.readState(runner as unknown as QueryRunner, workspaceId),
+ ).rejects.toThrow('Invalid agent history storage state');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts
new file mode 100644
index 00000000000..ccdf492bd2e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts
@@ -0,0 +1,216 @@
+import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+import { Injectable, ServiceUnavailableException } from '@nestjs/common';
+import { InjectDataSource } from '@nestjs/typeorm';
+import { DataSource, type EntityManager, type QueryRunner } from 'typeorm';
+import { isNonEmptyString } from '@sniptt/guards';
+
+import { AGENT_HISTORY_STORAGE_KEY } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant';
+import {
+ agentHistoryStorageStateSchema,
+ type AgentHistoryStorageState,
+} from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
+
+export type AgentHistoryStorageContext = {
+ manager: EntityManager;
+ storage: 'core' | 'workspace';
+ table: (name: AgentHistoryObjectName) => string;
+};
+
+@Injectable()
+export class AgentHistoryStorageService {
+ constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
+
+ async run<TResult>(
+ workspaceId: string,
+ work: (context: AgentHistoryStorageContext) => Promise<TResult>,
+ ): Promise<TResult> {
+ if (!isNonEmptyString(workspaceId)) {
+ throw new AgentHistoryStorageException(
+ 'INVALID_WORKSPACE',
+ 'Agent history requires a workspace ID',
+ );
+ }
+
+ const runner = this.dataSource.createQueryRunner('master');
+ try {
+ await runner.connect();
+ await runner.startTransaction();
+ // The route cannot change between this primary read and the operation.
+ await runner.query(
+ 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',
+ [`${AGENT_HISTORY_STORAGE_KEY}:${workspaceId}`],
+ );
+ const state = await this.readState(runner, workspaceId);
+ if (state.migration) {
+ throw new ServiceUnavailableException(
+ 'AI history is being migrated. Please retry shortly.',
+ );
+ }
+ const schema =
+ state.storage === 'core' ? 'core' : getWorkspaceSchemaName(workspaceId);
+ const result = await work({
+ manager: runner.manager,
+ storage: state.storage,
+ table: (name) =>
+ `${escapeIdentifier(schema)}.${escapeIdentifier(name)}`,
+ });
+ await runner.commitTransaction();
+ return result;
+ } catch (error) {
+ if (runner.isTransactionActive) {
+ await runner.rollbackTransaction();
+ }
+ throw error;
+ } finally {
+ await runner.release();
+ }
+ }
+
+ async readState(
+ runner: QueryRunner,
+ workspaceId: string,
+ ): Promise<AgentHistoryStorageState> {
+ return (await this.readStates(runner, [workspaceId])).get(workspaceId)!;
+ }
+
+ private async readStates(
+ runner: QueryRunner,
+ workspaceIds: string[],
+ ): Promise<Map<string, AgentHistoryStorageState>> {
+ const rows: { workspaceId: string; type: string; value: unknown }[] =
+ await runner.query(
+ `SELECT "workspaceId", type, value FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = ANY($2::uuid[]) AND "userId" IS NULL AND "applicationId" IS NULL`,
+ [AGENT_HISTORY_STORAGE_KEY, workspaceIds],
+ );
+ const states = new Map<string, AgentHistoryStorageState>();
+ for (const row of rows) {
+ const parsed = agentHistoryStorageStateSchema.safeParse(row.value);
+ if (row.type !== 'CONFIG_VARIABLE' || !parsed.success) {
+ throw new AgentHistoryStorageException(
+ 'INVALID_STATE',
+ `Invalid agent history storage state for ${row.workspaceId}`,
+ );
+ }
+ states.set(row.workspaceId, parsed.data);
+ }
+ const missing = workspaceIds.filter((id) => !states.has(id));
+ if (missing.length) {
+ const prepared: { workspaceId: string; tableName: string }[] =
+ await runner.query(
+ `SELECT id AS "workspaceId", table_name AS "tableName" FROM unnest($1::uuid[], $2::text[]) AS candidate(id, table_name) WHERE to_regclass(table_name) IS NOT NULL`,
+ [
+ missing,
+ missing.map(
+ (id) =>
+ `${escapeIdentifier(getWorkspaceSchemaName(id))}."agentChatThread"`,
+ ),
+ ],
+ );
+ // A lost route must never silently expose an empty legacy snapshot after cleanup.
+ // Empty, never-routed stores remain indistinguishable during the expand release.
+ for (let offset = 0; offset < prepared.length; offset += 50) {
+ const batch = prepared.slice(offset, offset + 50);
+ const populated: { workspaceId: string }[] = await runner.query(
+ batch
+ .map(
+ ({ tableName }, index) =>
+ `SELECT $${index + 1}::uuid AS "workspaceId" WHERE EXISTS (SELECT 1 FROM ${tableName})`,
+ )
+ .join(' UNION ALL '),
+ batch.map(({ workspaceId }) => workspaceId),
+ );
+ if (populated.length) {
+ throw new AgentHistoryStorageException(
+ 'MISSING_STATE',
+ `Agent history route is missing for ${populated[0].workspaceId}; restore its durable state before serving traffic`,
+ );
+ }
+ }
+ for (const workspaceId of missing)
+ states.set(workspaceId, { storage: 'core' });
+ }
+ return states;
+ }
+
+ async runReadOnlyReport<TResult>(
+ workspaceIds: string[],
+ work: (context: {
+ manager: EntityManager;
+ partitions: {
+ workspaceIds: string[];
+ storage: 'core' | 'workspace';
+ table: AgentHistoryStorageContext['table'];
+ }[];
+ }) => Promise<TResult>,
+ ): Promise<TResult> {
+ const runner = this.dataSource.createQueryRunner('master');
+ try {
+ await runner.connect();
+ // One MVCC snapshot sees both the route and its data before or after a
+ // cutover/cleanup. Reports need no per-workspace locks or second pool.
+ await runner.startTransaction('REPEATABLE READ');
+ await runner.query('SET TRANSACTION READ ONLY');
+ const states = await this.readStates(runner, workspaceIds);
+ const coreIds: string[] = [];
+ const partitions: {
+ workspaceIds: string[];
+ storage: 'core' | 'workspace';
+ table: AgentHistoryStorageContext['table'];
+ }[] = [];
+ for (const [workspaceId, state] of states) {
+ if (state.migration) {
+ continue;
+ }
+ if (state.storage === 'core') {
+ coreIds.push(workspaceId);
+ } else {
+ partitions.push({
+ workspaceIds: [workspaceId],
+ storage: 'workspace',
+ table: (name) =>
+ `${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier(name)}`,
+ });
+ }
+ }
+ if (coreIds.length) {
+ partitions.unshift({
+ workspaceIds: coreIds,
+ storage: 'core',
+ table: (name) => `core.${escapeIdentifier(name)}`,
+ });
+ }
+ const result = await work({ manager: runner.manager, partitions });
+ await runner.commitTransaction();
+ return result;
+ } catch (error) {
+ if (runner.isTransactionActive) {
+ await runner.rollbackTransaction();
+ }
+ throw error;
+ } finally {
+ await runner.release();
+ }
+ }
+
+ async writeState(
+ runner: QueryRunner,
+ workspaceId: string,
+ state: AgentHistoryStorageState,
+ ): Promise<void> {
+ const rows = await runner.query(
+ `INSERT INTO core."keyValuePair" ("key", "workspaceId", "type", "value") VALUES ($1, $2, 'CONFIG_VARIABLE', $3::jsonb)
+ ON CONFLICT ("key", "workspaceId") WHERE "userId" IS NULL AND "applicationId" IS NULL
+ DO UPDATE SET "value" = EXCLUDED."value", "updatedAt" = now() WHERE "keyValuePair".type = 'CONFIG_VARIABLE' RETURNING "key"`,
+ [AGENT_HISTORY_STORAGE_KEY, workspaceId, JSON.stringify(state)],
+ );
+ if (!rows.length) {
+ throw new AgentHistoryStorageException(
+ 'INVALID_STATE',
+ 'Agent history route conflicts with a non-configuration key',
+ );
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type.ts
new file mode 100644
index 00000000000..1131fc1102d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type.ts
@@ -0,0 +1,4 @@
+import { type AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';
+
+export type AgentHistoryObjectName =
+ (typeof AGENT_HISTORY_OBJECT_NAMES)[number];
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts
new file mode 100644
index 00000000000..e3964171f7d
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts
@@ -0,0 +1,28 @@
+import { z } from 'zod';
+import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';
+
+export const agentHistoryStorageStateSchema = z
+ .object({
+ storage: z.enum(['core', 'workspace']),
+ migration: z
+ .object({
+ phase: z.enum(['clearing', 'copying', 'aborting']),
+ target: z.enum(['core', 'workspace']),
+ tableIndex: z
+ .number()
+ .int()
+ .min(0)
+ .max(AGENT_HISTORY_OBJECT_NAMES.length),
+ lastId: z.string().uuid().nullable(),
+ })
+ .optional(),
+ verifiedAt: z.string().datetime().optional(),
+ cleanedAt: z.string().datetime().optional(),
+ })
+ .refine(
+ (state) => !state.migration || state.migration.target !== state.storage,
+ );
+
+export type AgentHistoryStorageState = z.infer<
+ typeof agentHistoryStorageStateSchema
+>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/normalize-agent-history-record.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/normalize-agent-history-record.util.spec.ts
new file mode 100644
index 00000000000..38851adb934
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/normalize-agent-history-record.util.spec.ts
@@ -0,0 +1,72 @@
+import { normalizeAgentHistoryRecord } from 'src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util';
+
+describe('normalizeAgentHistoryRecord', () => {
+ it('preserves nested record deletion dates independently of the thread archive', () => {
+ const archivedAt = '2026-09-10T10:00:00.000Z';
+ const deletedAt = '2026-09-11T10:00:00.000Z';
+ const normalized = normalizeAgentHistoryRecord({
+ record: {
+ archivedAt,
+ deletedAt: null,
+ messages: [
+ {
+ deletedAt,
+ parts: [{ deletedAt }],
+ },
+ ],
+ turns: [
+ {
+ deletedAt,
+ totalInputCredits: '123',
+ evaluations: [{ deletedAt }],
+ },
+ ],
+ },
+ workspaceId: 'workspace-id',
+ objectName: 'agentChatThread',
+ });
+
+ expect(normalized).toMatchObject({
+ workspaceId: 'workspace-id',
+ deletedAt: new Date(archivedAt),
+ messages: [
+ {
+ workspaceId: 'workspace-id',
+ deletedAt: new Date(deletedAt),
+ parts: [
+ { workspaceId: 'workspace-id', deletedAt: new Date(deletedAt) },
+ ],
+ },
+ ],
+ turns: [
+ {
+ workspaceId: 'workspace-id',
+ deletedAt: new Date(deletedAt),
+ totalInputCredits: 123,
+ evaluations: [
+ { workspaceId: 'workspace-id', deletedAt: new Date(deletedAt) },
+ ],
+ },
+ ],
+ });
+ });
+
+ it('leaves tool payloads and the source record unchanged', () => {
+ const toolOutput = {
+ createdAt: '2026-09-10T10:00:00.000Z',
+ totalInputCredits: '9007199254740993',
+ messages: [{ deletedAt: '2026-09-11T10:00:00.000Z' }],
+ };
+ const record = { createdAt: toolOutput.createdAt, toolOutput };
+
+ const normalized = normalizeAgentHistoryRecord({
+ record,
+ workspaceId: 'workspace-id',
+ objectName: 'agentMessagePart',
+ });
+
+ expect(normalized.createdAt).toEqual(new Date(record.createdAt));
+ expect(normalized.toolOutput).toEqual(toolOutput);
+ expect(record).toEqual({ createdAt: toolOutput.createdAt, toolOutput });
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util.ts
new file mode 100644
index 00000000000..ce7dedb923c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util.ts
@@ -0,0 +1,85 @@
+import {
+ type FindManyOptions,
+ type FindOptionsWhere,
+ type ObjectLiteral,
+} from 'typeorm';
+import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
+import { type WorkspaceFindOptions } from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';
+
+export function mapAgentHistoryValuesToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ values: QueryDeepPartialEntity<TRecord>,
+): ObjectLiteral;
+export function mapAgentHistoryValuesToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ values: QueryDeepPartialEntity<TRecord>[],
+): ObjectLiteral[];
+export function mapAgentHistoryValuesToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
+): ObjectLiteral | ObjectLiteral[];
+export function mapAgentHistoryValuesToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
+): ObjectLiteral | ObjectLiteral[] {
+ if (Array.isArray(values)) {
+ return values.map((value) =>
+ mapAgentHistoryValuesToWorkspace<TRecord>(objectName, value),
+ );
+ }
+ const { workspaceId: _workspaceId, ...fields }: ObjectLiteral = { ...values };
+ if (objectName === 'agentChatThread' && 'deletedAt' in fields) {
+ const { deletedAt, ...remainingFields } = fields;
+ return { ...remainingFields, archivedAt: deletedAt };
+ }
+ return fields;
+}
+
+export function mapAgentHistoryWhereToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ where: FindOptionsWhere<TRecord>,
+): ObjectLiteral;
+export function mapAgentHistoryWhereToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ where: FindManyOptions<TRecord>['where'],
+): WorkspaceFindOptions['where'];
+export function mapAgentHistoryWhereToWorkspace<
+ TRecord extends { id: string; workspaceId: string },
+>(
+ objectName: AgentHistoryObjectName,
+ where: FindManyOptions<TRecord>['where'],
+): WorkspaceFindOptions['where'] {
+ if (!where) {
+ return undefined;
+ }
+ if (Array.isArray(where)) {
+ return where.map((clause) =>
+ mapAgentHistoryWhereToWorkspace<TRecord>(objectName, clause),
+ );
+ }
+ if ('workspaceId' in where) {
+ throw new AgentHistoryStorageException(
+ 'INVALID_CRITERIA',
+ 'Pass workspaceId separately from history query criteria',
+ );
+ }
+ if (objectName !== 'agentChatThread' || !('deletedAt' in where)) {
+ return where;
+ }
+ const { deletedAt, ...rest } = where;
+ return { ...rest, archivedAt: deletedAt };
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/hydrate-agent-history-files.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/hydrate-agent-history-files.util.ts
new file mode 100644
index 00000000000..475de087c61
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/hydrate-agent-history-files.util.ts
@@ -0,0 +1,36 @@
+import { type EntityManager, type ObjectLiteral, In } from 'typeorm';
+import { isNonEmptyString } from 'twenty-shared/utils';
+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
+
+export const hydrateAgentHistoryFiles = async ({
+ records,
+ manager,
+ workspaceId,
+}: {
+ records: ObjectLiteral[];
+ manager: EntityManager;
+ workspaceId: string;
+}): Promise<void> => {
+ const parts: ObjectLiteral[] = [];
+ const collectParts = (record: ObjectLiteral) => {
+ if ('fileId' in record) {
+ parts.push(record);
+ }
+ for (const relation of ['parts', 'messages', 'turns', 'evaluations']) {
+ if (Array.isArray(record[relation])) {
+ record[relation].forEach(collectParts);
+ }
+ }
+ };
+ records.forEach(collectParts);
+ const fileIds = [
+ ...new Set(parts.map((part) => part.fileId).filter(isNonEmptyString)),
+ ];
+ const files = fileIds.length
+ ? await manager
+ .getRepository(FileEntity)
+ .find({ where: { id: In(fileIds), workspaceId } })
+ : [];
+ const filesById = new Map(files.map((file) => [file.id, file]));
+ for (const part of parts) part.file = filesById.get(part.fileId) ?? null;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util.ts
new file mode 100644
index 00000000000..7694850d106
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util.ts
@@ -0,0 +1,54 @@
+import { type ObjectLiteral } from 'typeorm';
+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';
+
+const OBJECT_NAME_BY_RELATION_FIELD: Record<string, AgentHistoryObjectName> = {
+ parts: 'agentMessagePart',
+ messages: 'agentMessage',
+ turns: 'agentTurn',
+ evaluations: 'agentTurnEvaluation',
+};
+
+export const normalizeAgentHistoryRecord = ({
+ record,
+ workspaceId,
+ objectName,
+}: {
+ record: ObjectLiteral;
+ workspaceId: string;
+ objectName: AgentHistoryObjectName;
+}): ObjectLiteral => {
+ const normalized: ObjectLiteral = { ...record, workspaceId };
+ if (objectName === 'agentChatThread') {
+ normalized.deletedAt = record.archivedAt ?? null;
+ }
+ for (const field of ['createdAt', 'updatedAt', 'deletedAt', 'processedAt']) {
+ if (typeof normalized[field] === 'string') {
+ normalized[field] = new Date(normalized[field]);
+ }
+ }
+ // Existing GraphQL DTOs use numbers; durable totals are incremented in SQL.
+ for (const field of [
+ 'totalInputCredits',
+ 'totalOutputCredits',
+ 'totalCacheReadTokens',
+ 'totalCacheCreationTokens',
+ ]) {
+ if (typeof normalized[field] === 'string') {
+ normalized[field] = Number(normalized[field]);
+ }
+ }
+ for (const [field, childObjectName] of Object.entries(
+ OBJECT_NAME_BY_RELATION_FIELD,
+ )) {
+ if (Array.isArray(normalized[field])) {
+ normalized[field] = normalized[field].map((child: ObjectLiteral) =>
+ normalizeAgentHistoryRecord({
+ record: child,
+ workspaceId,
+ objectName: childObjectName,
+ }),
+ );
+ }
+ }
+ return normalized;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/remove-agent-history-file-relations.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/remove-agent-history-file-relations.util.ts
new file mode 100644
index 00000000000..337d4f6dea2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/remove-agent-history-file-relations.util.ts
@@ -0,0 +1,15 @@
+import { type normalizeFindOptionsRelations } from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';
+
+export const removeAgentHistoryFileRelations = (
+ value: ReturnType<typeof normalizeFindOptionsRelations>,
+): ReturnType<typeof normalizeFindOptionsRelations> =>
+ Object.fromEntries(
+ Object.entries(value)
+ .filter(([name]) => name !== 'file')
+ .map(([name, nested]) => [
+ name,
+ typeof nested === 'object'
+ ? removeAgentHistoryFileRelations(nested)
+ : nested,
+ ]),
+ );
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/ai-workspace-stats.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/ai-workspace-stats.module.ts
index f70542a21f4..3fb2838a672 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/ai-workspace-stats.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/ai-workspace-stats.module.ts
@@ -1,3 +1,4 @@
+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
@@ -8,21 +9,17 @@ import { AiWorkspaceStatsService } from 'src/engine/metadata-modules/ai/ai-works
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
-import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@Module({
imports: [
+ AgentHistoryModule,
TypeOrmModule.forFeature([AgentChatThreadEntity]),
WorkspaceManyOrAllFlatEntityMapsCacheModule,
PermissionsModule,
ToolProviderModule,
UserRoleModule,
],
- providers: [
- AiWorkspaceStatsResolver,
- AiWorkspaceStatsService,
- provideWorkspaceScopedRepository(AgentChatThreadEntity),
- ],
+ providers: [AiWorkspaceStatsResolver, AiWorkspaceStatsService],
exports: [AiWorkspaceStatsService],
})
export class AiWorkspaceStatsModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
index ec1df03aec0..e325275d05e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts
@@ -1,3 +1,5 @@
+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
@@ -6,14 +8,12 @@ import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/servi
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
import { WorkspaceAiStatsDTO } from 'src/engine/metadata-modules/ai/ai-workspace-stats/dtos/workspace-ai-stats.dto';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@Injectable()
export class AiWorkspaceStatsService {
constructor(
- @InjectWorkspaceScopedRepository(AgentChatThreadEntity)
- private readonly threadRepository: WorkspaceScopedRepository<AgentChatThreadEntity>,
+ @InjectAgentHistoryRepository('agentChatThread')
+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly toolRegistryService: ToolRegistryService,
) {}
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
index b94ab68ab75..81c99b954c7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-agents.util.ts
@@ -78,7 +78,7 @@ const seedChatThreads = async ({
.insert()
.into(`${schemaName}.${agentChatThreadTableName}`, [
'id',
- 'workspaceId',
+ ...(schemaName === 'core' ? ['workspaceId'] : []),
'userWorkspaceId',
'title',
'createdAt',
@@ -88,7 +88,7 @@ const seedChatThreads = async ({
.values([
{
id: threadId,
- workspaceId,
+ ...(schemaName === 'core' ? { workspaceId } : {}),
userWorkspaceId,
title,
createdAt: now,
@@ -101,10 +101,15 @@ const seedChatThreads = async ({
.createQueryBuilder()
.update(`${schemaName}.${agentChatThreadTableName}`)
.set({ title })
- .where('id = :threadId AND "workspaceId" = :workspaceId', {
- threadId,
- workspaceId,
- })
+ .where(
+ schemaName === 'core'
+ ? 'id = :threadId AND "workspaceId" = :workspaceId'
+ : 'id = :threadId',
+ {
+ threadId,
+ workspaceId,
+ },
+ )
.andWhere('title IS NULL')
.execute();
@@ -126,7 +131,7 @@ const seedChatThreads = async ({
},
].map((thread) => ({
...thread,
- workspaceId,
+ ...(schemaName === 'core' ? { workspaceId } : {}),
userWorkspaceId,
createdAt: now,
updatedAt: now,
@@ -378,12 +383,17 @@ const seedChatMessages = async ({
.insert()
.into(`${schemaName}.${agentTurnTableName}`, [
'id',
- 'workspaceId',
+ ...(schemaName === 'core' ? ['workspaceId'] : []),
'threadId',
'createdAt',
])
.orIgnore()
- .values(turns)
+ .values(
+ turns.map(({ workspaceId: ownerWorkspaceId, ...fields }) => ({
+ ...fields,
+ ...(schemaName === 'core' ? { workspaceId: ownerWorkspaceId } : {}),
+ })),
+ )
.execute();
await queryRunner.manager
@@ -391,14 +401,19 @@ const seedChatMessages = async ({
.insert()
.into(`${schemaName}.${agentMessageTableName}`, [
'id',
- 'workspaceId',
+ ...(schemaName === 'core' ? ['workspaceId'] : []),
'threadId',
'turnId',
'role',
'createdAt',
])
.orIgnore()
- .values(messages)
+ .values(
+ messages.map(({ workspaceId: ownerWorkspaceId, ...fields }) => ({
+ ...fields,
+ ...(schemaName === 'core' ? { workspaceId: ownerWorkspaceId } : {}),
+ })),
+ )
.execute();
await queryRunner.manager
@@ -406,7 +421,7 @@ const seedChatMessages = async ({
.insert()
.into(`${schemaName}.${agentMessagePartTableName}`, [
'id',
- 'workspaceId',
+ ...(schemaName === 'core' ? ['workspaceId'] : []),
'messageId',
'orderIndex',
'type',
@@ -414,7 +429,12 @@ const seedChatMessages = async ({
'createdAt',
])
.orIgnore()
- .values(messageParts)
+ .values(
+ messageParts.map(({ workspaceId: ownerWorkspaceId, ...fields }) => ({
+ ...fields,
+ ...(schemaName === 'core' ? { workspaceId: ownerWorkspaceId } : {}),
+ })),
+ )
.execute();
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
index 3167021b549..b4afa1d0f1a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
@@ -1,3 +1,4 @@
+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
@@ -37,6 +38,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
@Module({
imports: [
+ AgentHistoryModule,
TimelineActivityModule,
ObjectMetadataModule,
FieldMetadataModule,
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
index 8231617a125..5259dbaa998 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
@@ -1,3 +1,5 @@
+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { Injectable } from '@nestjs/common';
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
@@ -59,6 +61,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspa
@Injectable()
export class DevSeederService {
constructor(
+ private readonly agentHistoryStorageService: AgentHistoryStorageService,
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
private readonly twentyConfigService: TwentyConfigService,
private readonly workspaceSchemaService: WorkspaceSchemaService,
@@ -239,26 +242,18 @@ export class DevSeederService {
workspaceId: SeededWorkspacesIds;
chatReferenceIds: ChatReferenceIds;
}) {
- const queryRunner = this.coreDataSource.createQueryRunner();
-
- await queryRunner.connect();
- await queryRunner.startTransaction();
-
- try {
- await seedAgents({
- queryRunner,
- schemaName: 'core',
- workspaceId,
- chatReferenceIds,
- });
-
- await queryRunner.commitTransaction();
- } catch (error) {
- await queryRunner.rollbackTransaction();
- throw error;
- } finally {
- await queryRunner.release();
- }
+ await this.agentHistoryStorageService.run(
+ workspaceId,
+ async ({ manager, storage }) => {
+ await seedAgents({
+ queryRunner: manager.queryRunner!,
+ schemaName:
+ storage === 'core' ? 'core' : getWorkspaceSchemaName(workspaceId),
+ workspaceId,
+ chatReferenceIds,
+ });
+ },
+ );
}
private async seedCoreSchema({