The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Use native workspace records throughout chat history (#26760)
Félix Malfait32858267a68d
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.tsindex 436e554b2e0..42ab28da212 100644--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts@@ -1,15 +1,16 @@+import { LinkChatMessageSendersToWorkspaceMembersCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command';import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { withWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';-import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';-import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import {- AgentMessageEntity,AgentMessageRole,AgentMessageStatus,} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';+import { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender';import { AgentHistoryMigrationDataService } from 'src/database/commands/agent-history/agent-history-migration-data.service';import { AgentHistoryMigrationValidationService } from 'src/database/commands/agent-history/agent-history-migration-validation.service';@@ -33,7 +34,7 @@ import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-objectimport { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { DataSource, IsNull, type Repository } from 'typeorm';import { Pool } from 'pg';import { type FeatureFlagKey } from 'twenty-shared/types';@@ -53,6 +54,7 @@ const OWNER_ID = '20202020-2222-4222-8222-222222222222';const THREAD_ID = '20202020-3333-4333-8333-333333333333';const TURN_ID = '20202020-4444-4444-8444-444444444444';const MESSAGE_ID = '20202020-5555-4555-8555-555555555555';+const MEMBER_ID = '20202020-7777-4777-8777-777777777777';const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);(DATABASE_URL ? describe : describe.skip)(@@ -148,12 +150,12 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);};};const orm = createOrm();- const threads = new AgentHistoryRepository<AgentChatThreadEntity>(+ const threads = new AgentHistoryRepository<AgentChatThreadWorkspaceEntity>('agentChatThread',storage,orm,);- const messages = new AgentHistoryRepository<AgentMessageEntity>(+ const messages = new AgentHistoryRepository<AgentMessageWorkspaceEntity>('agentMessage',storage,orm,@@ -194,7 +196,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);`ALTER TABLE "${SCHEMA}"."agentMessage" DROP COLUMN "${name}"`,);}- return new AgentHistoryRepository<AgentMessageEntity>(+ return new AgentHistoryRepository<AgentMessageWorkspaceEntity>('agentMessage',storage,createOrm(legacyMetadata),@@ -214,9 +216,13 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);const createChatService = (messageRepository: typeof messages) =>new AgentChatService(threads,- new AgentHistoryRepository<AgentTurnEntity>('agentTurn', storage, orm),+ new AgentHistoryRepository<AgentTurnWorkspaceEntity>(+ 'agentTurn',+ storage,+ orm,+ ),messageRepository,- new AgentHistoryRepository<AgentMessagePartEntity>(+ new AgentHistoryRepository<AgentMessagePartWorkspaceEntity>('agentMessagePart',storage,orm,@@ -287,6 +293,17 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);'INSERT INTO core."userWorkspace" (id, "workspaceId") VALUES ($1, $2)',[OWNER_ID, WORKSPACE_ID],);+ await dataSource.query(+ `CREATE TABLE "${SCHEMA}"."workspaceMember" (id uuid PRIMARY KEY, "userId" uuid, "deletedAt" timestamptz)`,+ );+ await dataSource.query(+ 'UPDATE core."userWorkspace" SET "userId" = $1 WHERE id = $1',+ [OWNER_ID],+ );+ await dataSource.query(+ `INSERT INTO "${SCHEMA}"."workspaceMember" (id, "userId") VALUES ($1, $2)`,+ [MEMBER_ID, OWNER_ID],+ );await dataSource.query('CREATE UNIQUE INDEX global_state_key ON core."keyValuePair" (key) WHERE "workspaceId" IS NULL AND "userId" IS NULL AND "applicationId" IS NULL',);@@ -641,7 +658,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);it('preserves the legacy upgrade fence for history still stored in core', async () => {await expect(- threads.find(WORKSPACE_ID, { where: { id: THREAD_ID } }),+ storage.run(WORKSPACE_ID, async () => undefined),).rejects.toBeInstanceOf(ServiceUnavailableException);expect((@@ -696,35 +713,35 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);target: 'workspace',});expect(- await threads.find(WORKSPACE_ID, { where: { deletedAt: IsNull() } }),+ await threads.find(WORKSPACE_ID, { where: { archivedAt: IsNull() } }),).toEqual([]);const archived = await threads.findOneOrFail(WORKSPACE_ID, {where: { id: THREAD_ID },});- expect(archived.deletedAt).toEqual(new Date('2026-01-01T00:00:00Z'));+ expect(archived.archivedAt).toEqual(new Date('2026-01-01T00:00:00Z'));expect(archived.createdAt).toBeInstanceOf(Date);- expect(archived.activeStreamId).toBeNull();+ expect(archived.activeStreamId).toBe('');expect(archived.pendingQuestionMessageId).toBeNull();const selected = await threads.findOneOrFail(WORKSPACE_ID, {where: { id: THREAD_ID },- select: ['id', 'deletedAt', 'activeStreamId'],+ select: ['id', 'archivedAt', 'activeStreamId'],});- expect(selected.deletedAt).toEqual(new Date('2026-01-01T00:00:00Z'));- expect(selected.activeStreamId).toBeNull();+ expect(selected.archivedAt).toEqual(new Date('2026-01-01T00:00:00Z'));+ expect(selected.activeStreamId).toBe('');const selectedWithObject = await threads.findOneOrFail(WORKSPACE_ID, {where: { id: THREAD_ID },- select: { id: true, deletedAt: true },+ select: { id: true, archivedAt: true },});- expect(selectedWithObject.deletedAt).toEqual(+ expect(selectedWithObject.archivedAt).toEqual(new Date('2026-01-01T00:00:00Z'),);await threads.update(WORKSPACE_ID,{ id: THREAD_ID },- { deletedAt: null },+ { archivedAt: null },);expect(- await threads.count(WORKSPACE_ID, { where: { deletedAt: IsNull() } }),+ await threads.count(WORKSPACE_ID, { where: { archivedAt: IsNull() } }),).toBe(1);const results = await Promise.all(['first', 'second'].map((stream) =>@@ -752,8 +769,8 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);});expect(created.createdAt).toBeInstanceOf(Date);expect(created.activeStreamId).toBeNull();- expect(created.totalInputCredits).toBe(0);- expect(created.workspaceId).toBe(WORKSPACE_ID);+ expect(created.totalInputCredits).toBe('0');+ expect(created).not.toHaveProperty('workspaceId');const checkpointId = '20202020-8888-4888-8888-888888888888';await Promise.all([1, 2].map(() =>@@ -763,7 +780,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);id: checkpointId,threadId: THREAD_ID,turnId: TURN_ID,- role: 'assistant' as AgentMessageEntity['role'],+ role: 'assistant' as AgentMessageWorkspaceEntity['role'],},['id'],),@@ -827,6 +844,16 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);relations: { parts: true },});expect(saved.senderUserWorkspaceId).toBe(OWNER_ID);+ expect(+ await dataSource.query(+ `SELECT "senderWorkspaceMemberId" FROM "${SCHEMA}"."agentMessage" WHERE id = ANY($1::uuid[])`,+ [[kickoff.id, message.id, queued.id]],+ ),+ ).toEqual([+ { senderWorkspaceMemberId: MEMBER_ID },+ { senderWorkspaceMemberId: MEMBER_ID },+ { senderWorkspaceMemberId: MEMBER_ID },+ ]);expect(saved.parts[0].textContent).toBe('Live message after upgrade');expect(await messages.findOneOrFail(WORKSPACE_ID, {@@ -893,6 +920,85 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);});});+ it('backfills sender members idempotently and retains legacy attribution when a member is deleted', async () => {+ await migration.migrate({+ workspaceId: WORKSPACE_ID,+ target: 'workspace',+ });+ await dataSource.query(+ `UPDATE "${SCHEMA}"."agentMessage" SET "senderUserWorkspaceId" = $1`,+ [OWNER_ID],+ );+ const command = new LinkChatMessageSendersToWorkspaceMembersCommand(+ {} as never,+ {+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: async () => ({+ twentyStandardFlatApplication: {+ id: OWNER_ID,+ universalIdentifier: OWNER_ID,+ },+ }),+ } as never,+ { getOrRecompute: async () => metadata } as never,+ {} as never,+ storage,+ );+ await command.up({+ workspaceId: WORKSPACE_ID,+ options: { dryRun: true },+ index: 0,+ total: 1,+ });+ expect(+ await dataSource.query(+ `SELECT "senderWorkspaceMemberId" FROM "${SCHEMA}"."agentMessage"`,+ ),+ ).toEqual([{ senderWorkspaceMemberId: null }]);+ await command.up({+ workspaceId: WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+ });+ await command.up({+ workspaceId: WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+ });+ expect(+ await dataSource.query(+ `SELECT "senderWorkspaceMemberId" FROM "${SCHEMA}"."agentMessage"`,+ ),+ ).toEqual([{ senderWorkspaceMemberId: MEMBER_ID }]);+ await dataSource.query(+ `ALTER TABLE "${SCHEMA}"."agentMessage" ADD CONSTRAINT sender_member FOREIGN KEY ("senderWorkspaceMemberId") REFERENCES "${SCHEMA}"."workspaceMember" (id) ON DELETE SET NULL`,+ );+ await dataSource.query(+ `DELETE FROM "${SCHEMA}"."workspaceMember" WHERE id = $1`,+ [MEMBER_ID],+ );+ await command.up({+ workspaceId: WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+ });+ await command.down({+ workspaceId: WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+ });+ expect(+ await dataSource.query(+ `SELECT "senderUserWorkspaceId", "senderWorkspaceMemberId" FROM "${SCHEMA}"."agentMessage"`,+ ),+ ).toEqual([+ { senderUserWorkspaceId: OWNER_ID, senderWorkspaceMemberId: null },+ ]);+ });+it('preserves the owner fallback for historical null-sender messages', async () => {await migration.migrate({workspaceId: WORKSPACE_ID,@@ -925,7 +1031,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID););});- it('loads messages chronologically and finds the latest processed message with TypeORM ordering', async () => {+ it('loads messages chronologically and finds the latest processed message with native workspace ordering', async () => {await migration.migrate({workspaceId: WORKSPACE_ID,target: 'workspace',@@ -937,20 +1043,20 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);{id: laterId,threadId: THREAD_ID,- role: 'assistant' as AgentMessageEntity['role'],- processedAt: new Date('2026-09-20T12:00:00Z'),+ role: 'assistant' as AgentMessageWorkspaceEntity['role'],+ processedAt: '2026-09-20T12:00:00Z',},{id: earlierId,threadId: THREAD_ID,- role: 'user' as AgentMessageEntity['role'],- processedAt: new Date('2026-09-20T11:00:00Z'),+ role: 'user' as AgentMessageWorkspaceEntity['role'],+ processedAt: '2026-09-20T11:00:00Z',},]);const chronological = await messages.find(WORKSPACE_ID, {where: { threadId: THREAD_ID },- order: { processedAt: { direction: 'ASC', nulls: 'LAST' } },+ order: { processedAt: { order: 'ASC', nulls: 'NULLS LAST' } },relations: { parts: true },});@@ -967,7 +1073,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);await messages.findOneOrFail(WORKSPACE_ID, {where: { threadId: THREAD_ID },order: {- processedAt: { direction: 'DESC', nulls: 'LAST' },+ processedAt: { order: 'DESC', nulls: 'NULLS LAST' },createdAt: 'DESC',id: 'DESC',},@@ -979,7 +1085,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);(await messages.find(WORKSPACE_ID, {where: { threadId: THREAD_ID },- order: { processedAt: { direction: 'desc', nulls: 'first' } },+ order: { processedAt: { order: 'DESC', nulls: 'NULLS FIRST' } },})).map(({ id }) => id),).toEqual([MESSAGE_ID, laterId, earlierId]);@@ -1463,7 +1569,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);).rejects.toMatchObject({ code: 'INVALID_WORKSPACE' });await expect(threads.find(WORKSPACE_ID, { where: { workspaceId: WORKSPACE_ID } }),- ).rejects.toMatchObject({ code: 'INVALID_CRITERIA' });+ ).rejects.toMatchObject({ code: 'UNKNOWN_COLUMN' });});it('previews abort without discarding destination rows or changing the route', async () => {diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.tsindex d9071f7df90..271401daba6 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts@@ -5,13 +5,18 @@ import { RenameCallRecordingTabsToTranscriptCommand } from 'src/database/commandimport { VerifyCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790590808102-verify-common-record-sharing.command';import { DeleteFieldLessIndexMetadataCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790595494562-delete-field-less-index-metadata.command';import { FollowWorkflowVisibilityOnRunsCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790595877162-follow-workflow-visibility-on-runs.command';-import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';+import { AgentHistoryMigrationModule } from 'src/database/commands/agent-history/agent-history-migration.module';+import { LinkChatMessageSendersToWorkspaceMembersCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command';+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';@Module({imports: [+ AgentHistoryMigrationModule,ApplicationModule,+ WorkspaceMigrationRunnerModule,WorkspaceCacheModule,WorkspaceIteratorModule,WorkspaceMigrationModule,@@ -21,6 +26,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceVerifyCommonRecordSharingCommand,DeleteFieldLessIndexMetadataCommand,FollowWorkflowVisibilityOnRunsCommand,+ LinkChatMessageSendersToWorkspaceMembersCommand,],})export class V2_44_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command.tsnew file mode 100644index 00000000000..48c59ca4bf0--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command.ts@@ -0,0 +1,158 @@+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';+import { backfillChatMessageSenderWorkspaceMembers } from 'src/database/commands/upgrade-version-command/2-44/utils/backfill-chat-message-sender-workspace-members.util';+import { Command } from 'nest-commander';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { isDefined } from 'twenty-shared/utils';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { getStandardFlatEntitiesToCreateOrThrow } from 'src/database/commands/upgrade-version-command/2-10/utils/get-standard-flat-entities-to-create-or-throw.util';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';+import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';++const WORKSPACE_MEMBER_SENDER_FIELD_UNIVERSAL_IDENTIFIERS = [+ STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember+ .universalIdentifier,+ STANDARD_OBJECTS.workspaceMember.fields.agentMessages.universalIdentifier,+];++const WORKSPACE_MEMBER_SENDER_INDEX_UNIVERSAL_IDENTIFIERS = [+ STANDARD_OBJECTS.agentMessage.indexes.senderWorkspaceMemberIndex+ .universalIdentifier,+];++// Keep legacy sender attribution throughout the expand release so older servers+// can still read messages created by this version.+@RegisteredWorkspaceCommand('2.44.0', 1790605326331)+@Command({+ name: 'upgrade:2-44:link-chat-message-senders-to-workspace-members',+ description:+ 'Add the chat message senderWorkspaceMember relation and backfill it from senderUserWorkspaceId',+})+export class LinkChatMessageSendersToWorkspaceMembersCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,+ private readonly storage: AgentHistoryUpgradeStorageService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {+ await this.up(args);+ }++ async up({ workspaceId, options }: RunOnWorkspaceArgs): Promise<void> {+ const isDryRun = options.dryRun ?? false;+ const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatObjectMetadataMaps',+ 'flatFieldMetadataMaps',+ 'flatIndexMaps',+ ]);++ // Workspaces without chat history objects get the new shape when the+ // 2.42 history move provisions them.+ if (+ !isDefined(+ flatObjectMetadataMaps.byUniversalIdentifier[+ STANDARD_OBJECTS.agentMessage.universalIdentifier+ ],+ )+ ) {+ this.logger.log(+ `agentMessage object not found for workspace ${workspaceId}, skipping`,+ );++ return;+ }++ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =+ computeTwentyStandardApplicationAllFlatEntityMaps({+ now: new Date().toISOString(),+ workspaceId,+ twentyStandardApplicationId: twentyStandardFlatApplication.id,+ });+ const allFlatEntityOperationByMetadataName = {+ fieldMetadata: {+ flatEntityToCreate:+ getStandardFlatEntitiesToCreateOrThrow<FlatFieldMetadata>({+ standardFlatEntityMaps:+ standardAllFlatEntityMaps.flatFieldMetadataMaps,+ existingFlatEntityMaps: flatFieldMetadataMaps,+ universalIdentifiers:+ WORKSPACE_MEMBER_SENDER_FIELD_UNIVERSAL_IDENTIFIERS,+ }),+ flatEntityToDelete: [],+ flatEntityToUpdate: [],+ },+ index: {+ flatEntityToCreate:+ getStandardFlatEntitiesToCreateOrThrow<FlatIndexMetadata>({+ standardFlatEntityMaps: standardAllFlatEntityMaps.flatIndexMaps,+ existingFlatEntityMaps: flatIndexMaps,+ universalIdentifiers:+ WORKSPACE_MEMBER_SENDER_INDEX_UNIVERSAL_IDENTIFIERS,+ }),+ flatEntityToDelete: [],+ flatEntityToUpdate: [],+ },+ };+ const fieldCount =+ allFlatEntityOperationByMetadataName.fieldMetadata.flatEntityToCreate+ .length;+ const indexCount =+ allFlatEntityOperationByMetadataName.index.flatEntityToCreate.length;++ if (isDryRun) {+ this.logger.log(+ `[DRY RUN] Would create ${fieldCount} field(s) and ${indexCount} index(es), then link chat message senders to workspace members for workspace ${workspaceId}`,+ );++ return;+ }++ if (fieldCount + indexCount > 0) {+ const result =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(+ {+ allFlatEntityOperationByMetadataName,+ workspaceId,+ isSystemBuild: true,+ applicationUniversalIdentifier:+ twentyStandardFlatApplication.universalIdentifier,+ },+ );++ if (result.status === 'fail') {+ throw new Error(+ `Failed to create the chat message workspace member sender for workspace ${workspaceId}: ${JSON.stringify(result, null, 2)}`,+ );+ }+ }++ const linkedCount = await this.storage.run(workspaceId, ({ manager }) =>+ backfillChatMessageSenderWorkspaceMembers({ manager, workspaceId }),+ );++ this.logger.log(+ `Linked ${linkedCount} chat message sender(s) to workspace members for workspace ${workspaceId}`,+ );+ }++ async down(_args: RunOnWorkspaceArgs): Promise<void> {+ // The expand step only adds data next to the untouched legacy column.+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/backfill-chat-message-sender-workspace-members.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/backfill-chat-message-sender-workspace-members.util.tsnew file mode 100644index 00000000000..f85c4baff97--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/backfill-chat-message-sender-workspace-members.util.ts@@ -0,0 +1,28 @@+import { type EntityManager } from 'typeorm';+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';++// Older pods can write legacy-only senders after expansion. The sender contract+// must rerun this backfill under the history fence before dropping the legacy column.+export const backfillChatMessageSenderWorkspaceMembers = async ({+ manager,+ workspaceId,+}: {+ manager: EntityManager;+ workspaceId: string;+}): Promise<number> => {+ const schemaName = escapeIdentifier(getWorkspaceSchemaName(workspaceId));+ const [, linkedCount]: [unknown[], number] = await manager.query(+ `UPDATE ${schemaName}."agentMessage" message+ SET "senderWorkspaceMemberId" = member.id+ FROM core."userWorkspace" membership+ JOIN ${schemaName}."workspaceMember" member+ ON member."userId" = membership."userId" AND member."deletedAt" IS NULL+ WHERE membership.id = message."senderUserWorkspaceId"+ AND membership."workspaceId" = $1+ AND message."senderWorkspaceMemberId" IS NULL`,+ [workspaceId],+ );++ return linkedCount;+};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.tsindex f07eed17bf3..1e8fa0e21a1 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@@ -11,8 +11,8 @@ import { type AdminChatMessageDTO } from 'src/engine/core-modules/admin-panel/dtimport { type AdminWorkspaceChatThreadDTO } from 'src/engine/core-modules/admin-panel/dtos/admin-workspace-chat-thread.dto';import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';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 { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';@Injectable()export class AdminPanelChatService {@@ -25,9 +25,9 @@ export class AdminPanelChatService {@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,@InjectAgentHistoryRepository('agentChatThread')- private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@InjectAgentHistoryRepository('agentMessage')- private readonly agentMessageRepository: AgentHistoryRepository<AgentMessageEntity>,+ private readonly agentMessageRepository: AgentHistoryRepository<AgentMessageWorkspaceEntity>,) {}private async assertWorkspaceAllowsImpersonation(@@ -69,8 +69,8 @@ export class AdminPanelChatService {totalOutputTokens: thread.totalOutputTokens,conversationSize: thread.conversationSize,messageCount: messageCountByThreadId.get(thread.id) ?? 0,- createdAt: thread.createdAt,- updatedAt: thread.updatedAt,+ createdAt: new Date(thread.createdAt),+ updatedAt: new Date(thread.updatedAt),}));}@@ -139,20 +139,17 @@ export class AdminPanelChatService {}): null;- if (!isDefined(thread)) {+ if (!isDefined(thread) || !isDefined(workspaceId)) {throw new UserInputError('Thread not found');}- await this.assertWorkspaceAllowsImpersonation(thread.workspaceId);+ await this.assertWorkspaceAllowsImpersonation(workspaceId);- const messages = await this.agentMessageRepository.find(- thread.workspaceId,- {- where: { threadId },- relations: { parts: true },- order: { createdAt: 'ASC' },- },- );+ const messages = await this.agentMessageRepository.find(workspaceId, {+ where: { threadId },+ relations: { parts: true },+ order: { createdAt: 'ASC' },+ });return {thread: {@@ -162,8 +159,8 @@ export class AdminPanelChatService {totalOutputTokens: thread.totalOutputTokens,conversationSize: thread.conversationSize,messageCount: messages.filter((message) => !message.isHidden).length,- createdAt: thread.createdAt,- updatedAt: thread.updatedAt,+ createdAt: new Date(thread.createdAt),+ updatedAt: new Date(thread.updatedAt),},messages: messages.map((message) => ({id: message.id,@@ -183,7 +180,7 @@ export class AdminPanelChatService {state: part.state,errorMessage: part.errorMessage,})),- createdAt: message.createdAt,+ createdAt: new Date(message.createdAt),})),};}diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.tsindex 8c352cf9b19..31fd953f823 100644--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts@@ -44,7 +44,7 @@ import {PermissionsExceptionMessage,} from 'src/engine/metadata-modules/permissions/permissions.exception';import { ConnectedAccountOwnershipTransferService } from 'src/engine/metadata-modules/connected-account/services/connected-account-ownership-transfer.service';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';@@ -70,7 +70,7 @@ export class UserService {private readonly workspaceMemberTranspiler: WorkspaceMemberTranspiler,private readonly twentyConfigService: TwentyConfigService,@InjectAgentHistoryRepository('agentChatThread')- private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,) {}async refreshWorkspaceIfPendingOrOngoingCreation<diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.tsindex 5cc32185ba7..d08cf703b85 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts@@ -1,3 +1,4 @@+import { AgentMessageResolver } from 'src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message.resolver';import { forwardRef, Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';@@ -61,6 +62,7 @@ import { RunAgentAttachmentService } from './services/run-agent-attachment.serviAgentActorContextService,AiGraphqlApiExceptionInterceptor,AgentMessagePartResolver,+ AgentMessageResolver,AgentRunResolver,AgentRunService,RunAgentAttachmentService,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message-part.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message-part.resolver.tsindex 70892f72dc1..069b1c0629f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message-part.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message-part.resolver.ts@@ -6,15 +6,20 @@ import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.simport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AgentMessagePartDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-part.dto';-import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';@Resolver(() => AgentMessagePartDTO)export class AgentMessagePartResolver {constructor(private readonly fileUrlService: FileUrlService) {}+ @ResolveField(() => Date)+ createdAt(@Parent() part: AgentMessagePartWorkspaceEntity): Date {+ return new Date(part.createdAt);+ }+@ResolveField(() => String, { nullable: true })async fileUrl(- @Parent() part: AgentMessagePartEntity,+ @Parent() part: AgentMessagePartWorkspaceEntity,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<string | null> {if (!part.fileId) {@@ -29,7 +34,9 @@ export class AgentMessagePartResolver {}@ResolveField(() => String, { nullable: true })- fileMediaType(@Parent() part: AgentMessagePartEntity): string | null {+ fileMediaType(+ @Parent() part: AgentMessagePartWorkspaceEntity,+ ): string | null {return part.file?.mimeType ?? null;}}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message.resolver.tsnew file mode 100644index 00000000000..2058d9de3d4--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message.resolver.ts@@ -0,0 +1,19 @@+import { Parent, ResolveField, Resolver } from '@nestjs/graphql';+import { isDefined } from 'twenty-shared/utils';+import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';+import { type AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';++@Resolver(() => AgentMessageDTO)+export class AgentMessageResolver {+ @ResolveField(() => Date)+ createdAt(@Parent() message: AgentMessageWorkspaceEntity): Date {+ return new Date(message.createdAt);+ }++ @ResolveField(() => Date, { nullable: true })+ processedAt(@Parent() message: AgentMessageWorkspaceEntity): Date | null {+ return isDefined(message.processedAt)+ ? new Date(message.processedAt)+ : null;+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.tsindex 4946d301415..2c37d74c01c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts@@ -1,7 +1,7 @@import { convertToModelMessages, type UIMessage } from 'ai';import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart';import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts';@@ -21,7 +21,9 @@ const persistAndReload = (parts: ExtendedUIMessagePart[],): ExtendedUIMessagePart[] =>mapUIMessagePartsToDBParts(parts, 'message-1', 'workspace-1')- .map((dbPart) => mapDBPartToUIMessagePart(dbPart as AgentMessagePartEntity))+ .map((dbPart) =>+ mapDBPartToUIMessagePart(dbPart as AgentMessagePartWorkspaceEntity),+ ).filter((part): part is ExtendedUIMessagePart => part !== null);const buildThread = (assistantParts: ExtendedUIMessagePart[]): UIMessage[] =>diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.tsindex 8e1541b1efd..1b548da720b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart';import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts';@@ -95,7 +95,9 @@ describe('AgentMessagePart mappers — dynamic-tool support', () => {'message-1','workspace-1',);- const reloaded = mapDBPartToUIMessagePart(row as AgentMessagePartEntity);+ const reloaded = mapDBPartToUIMessagePart(+ row as AgentMessagePartWorkspaceEntity,+ );expect(reloaded).toEqual({type: 'dynamic-tool',@@ -125,7 +127,9 @@ describe('AgentMessagePart mappers — dynamic-tool support', () => {providerMetadata: { anthropic: { encryptedContent: 'abc123' } },});- const reloaded = mapDBPartToUIMessagePart(row as AgentMessagePartEntity);+ const reloaded = mapDBPartToUIMessagePart(+ row as AgentMessagePartWorkspaceEntity,+ );expect(reloaded).toMatchObject({providerExecuted: true,@@ -141,7 +145,9 @@ describe('AgentMessagePart mappers — dynamic-tool support', () => {'message-1','workspace-1',);- const reloaded = mapDBPartToUIMessagePart(row as AgentMessagePartEntity);+ const reloaded = mapDBPartToUIMessagePart(+ row as AgentMessagePartWorkspaceEntity,+ );expect(reloaded).toMatchObject({type: 'tool-execute_tool',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.tsindex 598ea7c5fb9..0705a29604c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart';import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts';@@ -35,7 +35,7 @@ describe('message part provider metadata mapping', () => {]);expect(- mapDBPartToUIMessagePart(dbParts[0] as AgentMessagePartEntity),+ mapDBPartToUIMessagePart(dbParts[0] as AgentMessagePartWorkspaceEntity),).toEqual({type: 'reasoning',text: 'reasoning summary',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart.tsindex be7dbcbcec8..a265a64949b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart.ts@@ -3,14 +3,14 @@ import {type ExtendedUIMessagePart,} from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';// Maps TypeORM entity fields to UI message parts.// A parallel mapping for GraphQL DTOs exists in the frontend at:// packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.tsexport const mapDBPartToUIMessagePart = (- part: AgentMessagePartEntity,+ part: AgentMessagePartWorkspaceEntity,): ExtendedUIMessagePart | null => {switch (part.type) {case 'text':diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts.tsindex 8a0d8b5c97e..d2a7671cfd8 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts.ts@@ -1,10 +1,10 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartToUIMessagePart';export const mapDBPartsToUIMessageParts = (- parts: AgentMessagePartEntity[],+ parts: AgentMessagePartWorkspaceEntity[],): ExtendedUIMessagePart[] => {return parts.sort((a, b) => a.orderIndex - b.orderIndex)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.tsindex de46de0c1a0..9d76aab2eca 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts@@ -4,20 +4,19 @@ import {type ExtendedUIMessagePart,} from 'twenty-shared/ai';-import { type AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';export const mapUIMessagePartsToDBParts = (uiMessageParts: ExtendedUIMessagePart[],messageId: string,- workspaceId: string,-): Partial<AgentMessagePartEntity>[] => {+ _workspaceId: string,+): Partial<AgentMessagePartWorkspaceEntity>[] => {return uiMessageParts.map((part, index) => {- const basePart: Partial<AgentMessagePartEntity> = {+ const basePart: Partial<AgentMessagePartWorkspaceEntity> = {messageId,orderIndex: index,type: part.type,- workspaceId,};switch (part.type) {@@ -99,5 +98,7 @@ export const mapUIMessagePartsToDBParts = (}}})- .filter((part): part is Partial<AgentMessagePartEntity> => part !== null);+ .filter(+ (part): part is Partial<AgentMessagePartWorkspaceEntity> => part !== null,+ );};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-schema.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-schema.spec.tsnew file mode 100644index 00000000000..edb0168067b--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-schema.spec.ts@@ -0,0 +1,27 @@+import { NestFactory } from '@nestjs/core';+import {+ GraphQLSchemaBuilderModule,+ GraphQLSchemaFactory,+} from '@nestjs/graphql';+import { validateSchema } from 'graphql';++import { AgentTurnResolver } from 'src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver';++it('builds the agent turn schema with its field resolvers', async () => {+ const application = await NestFactory.createApplicationContext(+ GraphQLSchemaBuilderModule,+ { logger: false },+ );+ try {+ const schema = await application+ .get(GraphQLSchemaFactory)+ .create([AgentTurnResolver]);+ expect(validateSchema(schema)).toEqual([]);+ expect(schema.getQueryType()?.getFields()).toHaveProperty('agentTurns');+ expect(schema.getMutationType()?.getFields()).toHaveProperty(+ 'runEvaluationInput',+ );+ } finally {+ await application.close();+ }+});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.tsindex f844b502963..da01b4cf934 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,7 +1,7 @@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';+import { Args, Mutation, Query, Parent, ResolveField } from '@nestjs/graphql';import { msg } from '@lingui/core/macro';import { PermissionFlagType } from 'twenty-shared/constants';@@ -18,38 +18,53 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { AgentTurnDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto';-import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';+import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';import { AgentTurnEvaluationDTO } from 'src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto';import { RunEvaluationInputJob } from 'src/engine/metadata-modules/ai/ai-agent-monitor/jobs/run-evaluation-input.job';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 { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';@UseGuards(WorkspaceAuthGuard,SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),)-@MetadataResolver()+@MetadataResolver(() => AgentTurnDTO)@UseFilters(AuthGraphqlApiExceptionFilter)export class AgentTurnResolver {private readonly logger = new Logger(AgentTurnResolver.name);constructor(@InjectAgentHistoryRepository('agentTurn')- private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,+ private readonly turnRepository: AgentHistoryRepository<AgentTurnWorkspaceEntity>,@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@InjectMessageQueue(MessageQueue.aiQueue)private readonly messageQueueService: MessageQueueService,private readonly graderService: AgentTurnGraderService,private readonly agentService: AgentService,) {}+ @ResolveField(() => Date)+ createdAt(@Parent() turn: AgentTurnWorkspaceEntity): Date {+ return new Date(turn.createdAt);+ }++ @ResolveField(() => [AgentTurnEvaluationDTO])+ evaluations(+ @Parent() turn: AgentTurnWorkspaceEntity,+ ): AgentTurnEvaluationDTO[] {+ return (turn.evaluations ?? []).map((evaluation) => ({+ ...evaluation,+ createdAt: new Date(evaluation.createdAt),+ }));+ }+@Query(() => [AgentTurnDTO])async agentTurns(@Args('agentId', { type: () => UUIDScalarType }) agentId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<AgentTurnEntity[]> {+ ): Promise<AgentTurnWorkspaceEntity[]> {return this.turnRepository.find(workspaceId, {where: { agentId },relations: ['evaluations', 'messages', 'messages.parts'],@@ -62,7 +77,11 @@ export class AgentTurnResolver {@Args('turnId', { type: () => UUIDScalarType }) turnId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<AgentTurnEvaluationDTO> {- return this.graderService.evaluateTurn({ turnId, workspaceId });+ const evaluation = await this.graderService.evaluateTurn({+ turnId,+ workspaceId,+ });+ return { ...evaluation, createdAt: new Date(evaluation.createdAt) };}@Mutation(() => AgentTurnDTO)@@ -71,7 +90,7 @@ export class AgentTurnResolver {@Args('input') input: string,@AuthWorkspace() workspace: WorkspaceEntity,@AuthUserWorkspaceId() userWorkspaceId: string,- ): Promise<AgentTurnEntity> {+ ): Promise<AgentTurnWorkspaceEntity> {// Defense in depth: the job also re-fetches the agent through a// workspace-scoped repository.await this.agentService.findOneAgentById({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.tsindex 810ec78aa35..6f2e23b1151 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@@ -6,9 +6,9 @@ import { msg } from '@lingui/core/macro';import { generateText } from 'ai';import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';-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 { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';+import { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';+import { AgentTurnEvaluationWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn-evaluation.workspace-entity';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';@@ -18,9 +18,9 @@ export class AgentTurnGraderService {constructor(@InjectAgentHistoryRepository('agentTurn')- private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,+ private readonly turnRepository: AgentHistoryRepository<AgentTurnWorkspaceEntity>,@InjectAgentHistoryRepository('agentTurnEvaluation')- private readonly evaluationRepository: AgentHistoryRepository<AgentTurnEvaluationEntity>,+ private readonly evaluationRepository: AgentHistoryRepository<AgentTurnEvaluationWorkspaceEntity>,private readonly aiModelRegistryService: AiModelRegistryService,) {}@@ -30,7 +30,7 @@ export class AgentTurnGraderService {}: {turnId: string;workspaceId: string;- }): Promise<AgentTurnEvaluationEntity> {+ }): Promise<AgentTurnEvaluationWorkspaceEntity> {const turn = await this.turnRepository.findOne(workspaceId, {where: { id: turnId },relations: ['messages', 'messages.parts'],@@ -42,7 +42,7 @@ export class AgentTurnGraderService {});}- const { score, comment } = await this.evaluateWithAI(turn);+ const { score, comment } = await this.evaluateWithAI(turn, workspaceId);return this.evaluationRepository.insertAndReturnOne(workspaceId, {turnId,@@ -52,7 +52,10 @@ export class AgentTurnGraderService {}private async evaluateWithAI(- turn: AgentTurnEntity & { messages: AgentMessageEntity[] },+ turn: AgentTurnWorkspaceEntity & {+ messages: AgentMessageWorkspaceEntity[];+ },+ workspaceId: string,): Promise<{ score: number; comment: string }> {try {const defaultModel =@@ -90,7 +93,7 @@ Respond ONLY with valid JSON in this exact format:temperature: 0.3,...buildAiTelemetry({functionId: 'agent-turn-grading',- workspaceId: turn.workspaceId,+ workspaceId,agentId: turn.agentId,threadId: turn.threadId,turnId: turn.id,@@ -111,7 +114,9 @@ Respond ONLY with valid JSON in this exact format:}private buildEvaluationContext(- turn: AgentTurnEntity & { messages: AgentMessageEntity[] },+ turn: AgentTurnWorkspaceEntity & {+ messages: AgentMessageWorkspaceEntity[];+ },): string {const userMessages = turn.messages.filter((m) => m.role === 'user');const assistantMessages = turn.messages.filter(@@ -159,7 +164,9 @@ Respond ONLY with valid JSON in this exact format:}private getFallbackEvaluation(- turn: AgentTurnEntity & { messages: AgentMessageEntity[] },+ turn: AgentTurnWorkspaceEntity & {+ messages: AgentMessageWorkspaceEntity[];+ },): {score: number;comment: string;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.tsindex 7e2acb9105a..992761da60a 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@@ -35,7 +35,7 @@ import {AiException,AiExceptionCode,} from 'src/engine/metadata-modules/ai/ai.exception';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatCancelSubscriberService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-cancel-subscriber.service';import { AgentChatEventPublisherService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-event-publisher.service';import { AgentChatStreamHeartbeatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-heartbeat.service';@@ -77,7 +77,7 @@ export class StreamAgentChatJob {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,private readonly agentChatService: AgentChatService,@@ -838,10 +838,10 @@ export class StreamAgentChatJob {const threadStatus = await this.threadRepository.findOne(workspaceId, {where: { id: threadId },- select: ['id', 'deletedAt'],+ select: ['id', 'archivedAt'],});- if (!threadStatus || threadStatus.deletedAt) {+ if (!threadStatus || threadStatus.archivedAt) {return resolveSupersededTurnOutcome(outcome);}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-history-graphql-fields.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-history-graphql-fields.spec.tsnew file mode 100644index 00000000000..9e9c8ff582f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-history-graphql-fields.spec.ts@@ -0,0 +1,51 @@+import { GraphQLISODateTime } from '@nestjs/graphql';+import { AgentChatResolver } from 'src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver';+import { AgentMessageResolver } from 'src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message.resolver';+import { AgentMessagePartResolver } from 'src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-message-part.resolver';+import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';+import { type AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { type AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';++const timestamp = '2026-09-27T12:00:00.000Z';++it('serializes native workspace timestamps through the existing GraphQL Date scalar', () => {+ const thread = {+ createdAt: timestamp,+ updatedAt: timestamp,+ archivedAt: timestamp,+ } as AgentChatThreadWorkspaceEntity;+ const message = {+ createdAt: timestamp,+ processedAt: timestamp,+ } as AgentMessageWorkspaceEntity;+ const part = { createdAt: timestamp } as AgentMessagePartWorkspaceEntity;+ const values = [+ AgentChatResolver.prototype.createdAt(thread),+ AgentChatResolver.prototype.updatedAt(thread),+ AgentChatResolver.prototype.deletedAt(thread),+ AgentMessageResolver.prototype.createdAt(message),+ AgentMessageResolver.prototype.processedAt(message),+ AgentMessagePartResolver.prototype.createdAt(part),+ ];+ expect(values.map((value) => GraphQLISODateTime.serialize(value))).toEqual(+ Array(6).fill(timestamp),+ );+ expect(+ AgentChatResolver.prototype.deletedAt({ ...thread, archivedAt: null }),+ ).toBeNull();+ expect(+ AgentMessageResolver.prototype.processedAt({+ ...message,+ processedAt: null,+ }),+ ).toBeNull();+});++it('converts exact stored credit strings to display credits only at the API boundary', () => {+ const thread = {+ totalInputCredits: '12345',+ totalOutputCredits: '67890',+ } as AgentChatThreadWorkspaceEntity;+ expect(AgentChatResolver.prototype.totalInputCredits(thread)).toBe(0.012345);+ expect(AgentChatResolver.prototype.totalOutputCredits(thread)).toBe(0.06789);+});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.tsindex a738153d328..81355c65ad1 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@@ -8,7 +8,7 @@ import { UseGuards, UseInterceptors } from '@nestjs/common';import { Args, Subscription } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';@@ -22,7 +22,7 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/aiimport { AGENT_CHAT_KEEPALIVE_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-keepalive-interval-ms.constant';import { AGENT_CHAT_STREAM_REAP_CHECK_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-stream-reap-check-interval-ms.constant';import { AgentChatEventDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-event.dto';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';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';@@ -35,7 +35,7 @@ export class AgentChatSubscriptionResolver {private readonly agentChatStreamingService: AgentChatStreamingService,private readonly sharingService: AgentChatSharingService,@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,) {}@Subscription(() => AgentChatEventDTO, {@@ -118,7 +118,7 @@ export class AgentChatSubscriptionResolver {}).catch(() => null);- if (!isDefined(thread) || !isDefined(thread.activeStreamId)) {+ if (!isDefined(thread) || !isNonEmptyString(thread.activeStreamId)) {return;}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.tsindex a577b6bb2bd..953db0d5338 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@@ -15,7 +15,7 @@ import {import GraphQLJSON from 'graphql-type-json';import { PermissionFlagType } from 'twenty-shared/constants';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';@@ -39,7 +39,7 @@ import { FileAttachmentInput } from 'src/engine/metadata-modules/ai/ai-chat/dtosimport { AiSystemPromptPreviewDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/ai-system-prompt-preview.dto';import { ChatStreamCatchupChunksDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/chat-stream-catchup-chunks.dto';import { SendChatMessageResultDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/send-chat-message-result.dto';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatEventPublisherService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-event-publisher.service';import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';@@ -84,7 +84,7 @@ export class AgentChatResolver {private readonly aiModelRegistryService: AiModelRegistryService,private readonly redisClientService: RedisClientService,@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,) {}@Query(() => [AgentChatThreadDTO])@@ -290,7 +290,7 @@ export class AgentChatResolver {spenders: { userWorkspaceId },});- if (isDefined(thread.deletedAt)) {+ if (isDefined(thread.archivedAt)) {await this.agentChatService.unarchiveThread({threadId,userWorkspaceId,@@ -298,7 +298,7 @@ export class AgentChatResolver {});}- if (isDefined(thread.activeStreamId)) {+ if (isNonEmptyString(thread.activeStreamId)) {const interruptedError =await this.agentChatStreamingService.reapDeadStream({thread,@@ -312,7 +312,7 @@ export class AgentChatResolver {}if (- isDefined(thread.activeStreamId) ||+ isNonEmptyString(thread.activeStreamId) ||isDefined(thread.pendingQuestionMessageId)) {const queuedMessage = await this.agentChatService.queueMessage({@@ -496,7 +496,7 @@ export class AgentChatResolver {userWorkspaceId,workspaceId,});- if (!isDefined(thread.activeStreamId)) {+ if (!isNonEmptyString(thread.activeStreamId)) {return true;}@@ -522,7 +522,7 @@ export class AgentChatResolver {@Args('title') title: string,@AuthUserWorkspaceId() userWorkspaceId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<AgentChatThreadEntity> {+ ): Promise<AgentChatThreadWorkspaceEntity> {return this.agentChatService.updateThreadTitle({threadId: id,userWorkspaceId,@@ -536,7 +536,7 @@ export class AgentChatResolver {@Args('id', { type: () => UUIDScalarType }) id: string,@AuthUserWorkspaceId() userWorkspaceId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<AgentChatThreadEntity> {+ ): Promise<AgentChatThreadWorkspaceEntity> {await this.sharingService.getThreadWithAccess({threadId: id,userWorkspaceId,@@ -557,7 +557,7 @@ export class AgentChatResolver {@Args('id', { type: () => UUIDScalarType }) id: string,@AuthUserWorkspaceId() userWorkspaceId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<AgentChatThreadEntity> {+ ): Promise<AgentChatThreadWorkspaceEntity> {return this.agentChatService.unarchiveThread({threadId: id,userWorkspaceId,@@ -596,7 +596,7 @@ export class AgentChatResolver {where: { id: threadId },});- if (!isDefined(thread) || !isDefined(thread.activeStreamId)) {+ if (!isDefined(thread) || !isNonEmptyString(thread.activeStreamId)) {return;}@@ -659,20 +659,36 @@ export class AgentChatResolver {);}+ @ResolveField(() => Date)+ createdAt(@Parent() thread: AgentChatThreadWorkspaceEntity): Date {+ return new Date(thread.createdAt);+ }++ @ResolveField(() => Date)+ updatedAt(@Parent() thread: AgentChatThreadWorkspaceEntity): Date {+ return new Date(thread.updatedAt);+ }++ @ResolveField(() => Date, { nullable: true })+ deletedAt(@Parent() thread: AgentChatThreadWorkspaceEntity): Date | null {+ return isDefined(thread.archivedAt) ? new Date(thread.archivedAt) : null;+ }+@ResolveField(() => Float)- totalInputCredits(@Parent() thread: AgentChatThreadEntity): number {- return toDisplayCredits(thread.totalInputCredits);+ totalInputCredits(@Parent() thread: AgentChatThreadWorkspaceEntity): number {+ return toDisplayCredits(Number(thread.totalInputCredits));}@ResolveField(() => Float)- totalOutputCredits(@Parent() thread: AgentChatThreadEntity): number {- return toDisplayCredits(thread.totalOutputCredits);+ totalOutputCredits(@Parent() thread: AgentChatThreadWorkspaceEntity): number {+ return toDisplayCredits(Number(thread.totalOutputCredits));}@ResolveField('lastMessageAt', () => Date, { nullable: true })async lastMessageAt(@Parent()- thread: AgentChatThreadEntity & { lastMessageAt?: Date | null },+ thread: AgentChatThreadWorkspaceEntity & { lastMessageAt?: Date | null },+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<Date | null> {if (thread.lastMessageAt !== undefined) {return thread.lastMessageAt;@@ -680,7 +696,7 @@ export class AgentChatResolver {return this.agentChatService.getLastMessageAtForThread({threadId: thread.id,- workspaceId: thread.workspaceId,+ workspaceId,});}}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.tsindex d8ad81f34a2..abf8af35710 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.ts@@ -172,7 +172,7 @@ describe('Chat execution sender', () => {const { service, chat } = build();chat.getWritableThread.mockResolvedValue({id: threadId,- deletedAt: new Date(),+ archivedAt: new Date().toISOString(),} as never);await expect(service.authorizeJob(job)).rejects.toMatchObject({code: 'THREAD_NOT_FOUND',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.tsindex 8770c1925e6..4acbdbb81d7 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts@@ -3,9 +3,9 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport {AgentMessageRole,AgentMessageStatus,- type AgentMessageEntity,} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';import { AiExceptionCode } from 'src/engine/metadata-modules/ai/ai.exception';@@ -20,7 +20,7 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {activeStreamId: null,lastStreamError: null,pendingQuestionMessageId: null,- } as unknown as AgentChatThreadEntity;+ } as unknown as AgentChatThreadWorkspaceEntity;const hiddenKickoffMessageEntity = {id: 'kickoff-message-id',@@ -28,7 +28,7 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {status: AgentMessageStatus.SENT,isHidden: true,parts: [{ type: 'text', textContent: kickoffText, orderIndex: 0 }],- } as unknown as AgentMessageEntity;+ } as unknown as AgentMessageWorkspaceEntity;const buildService = ({claimAffected = 1,@@ -197,7 +197,7 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {const staleMessageEntity = {...hiddenKickoffMessageEntity,id: 'other-message-id',- } as unknown as AgentMessageEntity;+ } as unknown as AgentMessageWorkspaceEntity;const { service, threadRepository, messageQueueService } = buildService({threadMessages: [staleMessageEntity],});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.tsindex 85d217ab6a6..a98356ffaf6 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts@@ -3,9 +3,9 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport {AgentMessageRole,AgentMessageStatus,- type AgentMessageEntity,} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';import { AiExceptionCode } from 'src/engine/metadata-modules/ai/ai.exception';@@ -22,7 +22,7 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {message: 'Provider timed out',failedAt: '2026-01-01T00:00:00.000Z',},- } as unknown as AgentChatThreadEntity;+ } as unknown as AgentChatThreadWorkspaceEntity;const userMessageEntity = {id: 'user-message-id',@@ -30,7 +30,7 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {status: AgentMessageStatus.SENT,parts: [{ type: 'text', textContent: 'hello', orderIndex: 0 }],createdAt: new Date('2026-01-01T00:00:00.000Z'),- } as unknown as AgentMessageEntity;+ } as unknown as AgentMessageWorkspaceEntity;const buildService = ({thread = failedThread,@@ -160,7 +160,7 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {...userMessageEntity,id: 'newer-message-id',role: AgentMessageRole.ASSISTANT,- } as unknown as AgentMessageEntity;+ } as unknown as AgentMessageWorkspaceEntity;const { service, threadRepository, messageQueueService } = buildService({threadMessages: [userMessageEntity, newerAssistantMessage],});@@ -220,7 +220,7 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {status: AgentMessageStatus.SENT,isHidden: true,parts: [{ type: 'text', textContent: 'kickoff prompt', orderIndex: 0 }],- } as unknown as AgentMessageEntity;+ } as unknown as AgentMessageWorkspaceEntity;const { service, threadRepository, messageQueueService, agentChatService } =buildService({lastUserMessage: {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.tsindex 0480f86ac7f..07992bf8d14 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts@@ -87,8 +87,8 @@ describe('AgentChatService ensureHiddenKickoffMessage', () => {const [, insertedMessage] = messageRepository.insert.mock.calls[0];- expect(insertedMessage.processedAt).toBeInstanceOf(Date);- expect(insertedMessage.processedAt.getTime()).toBeGreaterThan(0);+ expect(typeof insertedMessage.processedAt).toBe('string');+ expect(new Date(insertedMessage.processedAt).getTime()).toBeGreaterThan(0);const [, insertedParts] = messagePartRepository.insert.mock.calls[0];@@ -184,7 +184,7 @@ describe('AgentChatService findLatestSentUserMessage', () => {status: AgentMessageStatus.SENT,},order: {- processedAt: { direction: 'DESC', nulls: 'LAST' },+ processedAt: { order: 'DESC', nulls: 'NULLS LAST' },createdAt: 'DESC',id: 'DESC',},diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.tsindex e5571dd7421..15536015b7d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts@@ -7,13 +7,13 @@ import { Injectable } from '@nestjs/common';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import {- AgentMessageEntity,AgentMessageRole,AgentMessageStatus,} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';+import { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';@@ -29,9 +29,9 @@ import {export class AgentChatActorService {constructor(@InjectAgentHistoryRepository('agentMessage')- private readonly messages: AgentHistoryRepository<AgentMessageEntity>,+ private readonly messages: AgentHistoryRepository<AgentMessageWorkspaceEntity>,@InjectAgentHistoryRepository('agentChatThread')- private readonly threads: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threads: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,private readonly chatService: AgentChatService,private readonly userAuthContextService: UserWorkspaceAuthContextService,private readonly permissionsService: PermissionsService,@@ -108,7 +108,7 @@ export class AgentChatActorService {userWorkspaceId: sender.userWorkspaceId,}),);- if (isDefined(thread.deletedAt)) {+ if (isDefined(thread.archivedAt)) {throw new AiException('Thread is archived',AiExceptionCode.THREAD_NOT_FOUND,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.tsindex e3665e48e41..486ff3f477f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts@@ -1,11 +1,9 @@import { lockAgentChatThread } from 'src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util';-import { mapAgentHistoryFieldNameToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util';import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';import { AuthException } from 'src/engine/core-modules/auth/auth.exception';import { randomUUID } from 'node:crypto';import { backfillChatThreadOwnerGrants } from 'src/engine/metadata-modules/ai/ai-chat/utils/backfill-chat-thread-owner-grants.util';-import { normalizeAgentHistoryRecord } from 'src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util';import { Injectable } from '@nestjs/common';import { PermissionFlagType } from 'twenty-shared/constants';@@ -16,7 +14,7 @@ import { RecordShareStorageService } from 'src/engine/core-modules/record-share/import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';import { type RecordPermissionsDTO } from 'src/engine/core-modules/record-share/dtos/record-permissions.dto';import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';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 {@@ -40,7 +38,7 @@ type ThreadAccessArgs = {export class AgentChatSharingService {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,private readonly userAuthContextService: UserWorkspaceAuthContextService,private readonly recordShareStorageService: RecordShareStorageService,private readonly workspaceCacheService: WorkspaceCacheService,@@ -129,7 +127,7 @@ export class AgentChatSharingService {userWorkspaceId: string;id?: string;title?: string;- }): Promise<AgentChatThreadEntity> {+ }): Promise<AgentChatThreadWorkspaceEntity> {const authContext = await this.getAuthContext(args);const objectMetadata = await this.getThreadObjectMetadata(args.workspaceId);const writesWorkspaceMember = await this.hasWorkspaceMemberOwnerField(@@ -151,7 +149,7 @@ export class AgentChatSharingService {return this.threadRepository.query(args.workspaceId,async ({ manager, table }) => {- const records = await manager.query<AgentChatThreadEntity[]>(+ const records = await manager.query<AgentChatThreadWorkspaceEntity[]>(`INSERT INTO ${table('agentChatThread')} (id, title, "userWorkspaceId"${writesWorkspaceMember ? ', "workspaceMemberId"' : ''})VALUES ($1, $2, $3${writesWorkspaceMember ? ', $4' : ''}) RETURNING *`,[@@ -180,11 +178,7 @@ export class AgentChatSharingService {AiExceptionCode.THREAD_NOT_FOUND,);}- return normalizeAgentHistoryRecord({- record,- workspaceId: args.workspaceId,- objectName: 'agentChatThread',- }) as AgentChatThreadEntity;+ return record;},);}@@ -197,24 +191,20 @@ export class AgentChatSharingService {operationType: 'update' | 'soft-delete' | 'restore';changes:| { title: string }- | { deletedAt: Date | null; activeStreamId?: null };- }): Promise<AgentChatThreadEntity> {+ | { archivedAt: Date | null; activeStreamId?: null };+ }): Promise<AgentChatThreadWorkspaceEntity> {return this.mutateThreadWithAccess({...args,operationType,updatedColumns: operationType === 'update' ? Object.keys(changes) : [],mutate: async ({ manager, table }, thread) => {- if (operationType === 'soft-delete' && isDefined(thread.deletedAt)) {+ if (operationType === 'soft-delete' && isDefined(thread.archivedAt)) {return thread;}const entries = Object.entries(changes).map(- ([fieldName, value]) =>- [- mapAgentHistoryFieldNameToWorkspace('agentChatThread', fieldName),- value,- ] as const,+ ([fieldName, value]) => [fieldName, value] as const,);- const records = await manager.query<AgentChatThreadEntity[]>(+ const records = await manager.query<AgentChatThreadWorkspaceEntity[]>(`WITH updated_thread AS (UPDATE ${table('agentChatThread')} SET ${entries.map(([key], index) => `${escapeIdentifier(key)} = $${index + 2}`).join(', ')}, "updatedAt" = NOW() WHERE id = $1 RETURNING *) SELECT * FROM updated_thread`,[args.threadId, ...entries.map(([, value]) => value)],);@@ -222,11 +212,7 @@ export class AgentChatSharingService {if (!isDefined(record)) {return this.throwNotFound();}- return normalizeAgentHistoryRecord({- record,- workspaceId: args.workspaceId,- objectName: 'agentChatThread',- }) as AgentChatThreadEntity;+ return record;},});}@@ -263,7 +249,7 @@ export class AgentChatSharingService {updatedColumns: string[];mutate: (context: AgentHistoryStorageContext,- thread: AgentChatThreadEntity,+ thread: AgentChatThreadWorkspaceEntity,) => Promise<TResult>;}): Promise<TResult> {const authContext = await this.getAuthContext(args);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.tsindex dbeee866038..969e64efd30 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts@@ -1,9 +1,9 @@import { Injectable } from '@nestjs/common';-import { isDefined } from 'twenty-shared/utils';+import { isNonEmptyString } from 'twenty-shared/utils';import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentChatEventPublisherService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-event-publisher.service';import { AgentChatStreamHeartbeatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-heartbeat.service';import { type AgentChatThreadLastStreamError } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type';@@ -16,7 +16,7 @@ import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-export class AgentChatStreamRecoveryService {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,private readonly streamHeartbeatService: AgentChatStreamHeartbeatService,private readonly eventPublisherService: AgentChatEventPublisherService,private readonly metricsService: MetricsService,@@ -26,10 +26,10 @@ export class AgentChatStreamRecoveryService {thread,workspaceId,}: {- thread: Pick<AgentChatThreadEntity, 'id' | 'activeStreamId'>;+ thread: Pick<AgentChatThreadWorkspaceEntity, 'id' | 'activeStreamId'>;workspaceId: string;}): Promise<AgentChatThreadLastStreamError | null> {- if (!isDefined(thread.activeStreamId)) {+ if (!isNonEmptyString(thread.activeStreamId)) {return null;}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.tsindex f3ab589b68b..e61d7a0bbc1 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@@ -32,7 +32,7 @@ import {} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts';import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentChatThreadLastStreamError } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type';import { STREAM_AGENT_CHAT_JOB_NAME } from 'src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job-name.constant';import { type StreamAgentChatJobData } from 'src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types';@@ -64,7 +64,7 @@ export class AgentChatStreamingService {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@InjectWorkspaceScopedRepository(FileEntity)private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,@InjectMessageQueue(MessageQueue.aiStreamQueue)@@ -82,7 +82,7 @@ export class AgentChatStreamingService {thread,workspaceId,}: {- thread: Pick<AgentChatThreadEntity, 'id' | 'activeStreamId'>;+ thread: Pick<AgentChatThreadWorkspaceEntity, 'id' | 'activeStreamId'>;workspaceId: string;}): Promise<AgentChatThreadLastStreamError | null> {return this.streamRecoveryService.reapDeadStream({@@ -100,7 +100,7 @@ export class AgentChatStreamingService {threadId: string;workspaceId: string;streamId: string;- where: FindOptionsWhere<AgentChatThreadEntity>;+ where: FindOptionsWhere<AgentChatThreadWorkspaceEntity>;}): Promise<boolean> {await this.streamHeartbeatService.markClaimed(streamId);@@ -268,7 +268,7 @@ export class AgentChatStreamingService {text,modelId,}: {- thread: AgentChatThreadEntity;+ thread: AgentChatThreadWorkspaceEntity;userWorkspaceId: string;workspace: WorkspaceEntity;text: string;@@ -384,7 +384,7 @@ export class AgentChatStreamingService {if (!isDefined(thread.lastStreamError) ||- isDefined(thread.activeStreamId)+ isNonEmptyString(thread.activeStreamId)) {throw new AiException('There is no failed turn to retry on this thread',@@ -703,10 +703,10 @@ export class AgentChatStreamingService {}): Promise<void> {const threadStatus = await this.threadRepository.findOne(workspaceId, {where: { id: threadId },- select: ['id', 'deletedAt', 'pendingQuestionMessageId'],+ select: ['id', 'archivedAt', 'pendingQuestionMessageId'],});- if (!threadStatus || threadStatus.deletedAt) {+ if (!threadStatus || threadStatus.archivedAt) {return;}@@ -936,7 +936,7 @@ export class AgentChatStreamingService {? {}: {metadata: {- createdAt: message.createdAt.toISOString(),+ createdAt: new Date(message.createdAt).toISOString(),senderUserWorkspaceId: message.senderUserWorkspaceId,},}),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.tsindex aa9465fbaae..4cc7d8afad5 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@@ -23,16 +23,16 @@ import type { UIDataTypes, UIMessagePart, UITools } from 'ai';import { CodeInterpreterService } from 'src/engine/core-modules/code-interpreter/code-interpreter.service';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';-import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';+import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';import {- AgentMessageEntity,AgentMessageRole,AgentMessageStatus,} 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 { AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';+import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import {AiException,AiExceptionCode,@@ -51,13 +51,13 @@ export class AgentChatService {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@InjectAgentHistoryRepository('agentTurn')- private readonly turnRepository: AgentHistoryRepository<AgentTurnEntity>,+ private readonly turnRepository: AgentHistoryRepository<AgentTurnWorkspaceEntity>,@InjectAgentHistoryRepository('agentMessage')- private readonly messageRepository: AgentHistoryRepository<AgentMessageEntity>,+ private readonly messageRepository: AgentHistoryRepository<AgentMessageWorkspaceEntity>,@InjectAgentHistoryRepository('agentMessagePart')- private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartEntity>,+ private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartWorkspaceEntity>,@InjectWorkspaceScopedRepository(FileEntity)private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,private readonly titleGenerationService: AgentTitleGenerationService,@@ -149,7 +149,9 @@ export class AgentChatService {}: {userWorkspaceId: string;workspaceId: string;- }): Promise<(AgentChatThreadEntity & { lastMessageAt: Date | null })[]> {+ }): Promise<+ (AgentChatThreadWorkspaceEntity & { lastMessageAt: Date | null })[]+ > {return this.getRankedThreads({ userWorkspaceId, workspaceId });}@@ -171,7 +173,9 @@ export class AgentChatService {workspaceId: string;limit?: number;offset?: number;- }): Promise<(AgentChatThreadEntity & { lastMessageAt: Date | null })[]> {+ }): Promise<+ (AgentChatThreadWorkspaceEntity & { lastMessageAt: Date | null })[]+ > {return this.getRankedThreads({attachedToRecord: { joinColumnName, recordId },userWorkspaceId,@@ -193,7 +197,9 @@ export class AgentChatService {workspaceId: string;limit?: number;offset?: number;- }): Promise<(AgentChatThreadEntity & { lastMessageAt: Date | null })[]> {+ }): Promise<+ (AgentChatThreadWorkspaceEntity & { lastMessageAt: Date | null })[]+ > {const readableThreadIds = await this.sharingService.getReadableThreadIds({workspaceId,userWorkspaceId,@@ -349,7 +355,7 @@ export class AgentChatService {turnId: actualTurnId,role: uiMessage.role as AgentMessageRole,agentId: agentId ?? null,- processedAt: processedAt ?? new Date(),+ processedAt: (processedAt ?? new Date()).toISOString(),...this.getMessageSenderValues({ workspaceId, userWorkspaceId }),...(isDefined(isHidden) ? { isHidden } : {}),};@@ -371,7 +377,7 @@ export class AgentChatService {if (dbParts.length > 0) {await this.messagePartRepository.insert(workspaceId,- dbParts as QueryDeepPartialEntity<AgentMessagePartEntity>[],+ dbParts as QueryDeepPartialEntity<AgentMessagePartWorkspaceEntity>[],);}}@@ -385,8 +391,7 @@ export class AgentChatService {processedAt: messageValues.processedAt,senderUserWorkspaceId: messageValues.senderUserWorkspaceId,senderApplicationId: messageValues.senderApplicationId,- workspaceId,- } as AgentMessageEntity;+ };}async upsertAssistantMessage({@@ -409,7 +414,7 @@ export class AgentChatService {threadId,turnId,role: AgentMessageRole.ASSISTANT,- processedAt: new Date(),+ processedAt: new Date().toISOString(),},['id'],);@@ -425,7 +430,7 @@ export class AgentChatService {if (dbParts.length > 0) {await this.messagePartRepository.insert(workspaceId,- dbParts as QueryDeepPartialEntity<AgentMessagePartEntity>[],+ dbParts as QueryDeepPartialEntity<AgentMessagePartWorkspaceEntity>[],);}}@@ -436,7 +441,7 @@ export class AgentChatService {}: {threadId: string;workspaceId: string;- }): Promise<Pick<AgentMessageEntity, 'id' | 'turnId'> | null> {+ }): Promise<Pick<AgentMessageWorkspaceEntity, 'id' | 'turnId'> | null> {return this.messageRepository.findOne(workspaceId, {where: {threadId,@@ -444,7 +449,7 @@ export class AgentChatService {status: AgentMessageStatus.SENT,},order: {- processedAt: { direction: 'DESC', nulls: 'LAST' },+ processedAt: { order: 'DESC', nulls: 'NULLS LAST' },createdAt: 'DESC',id: 'DESC',},@@ -518,7 +523,7 @@ export class AgentChatService {return this.messageRepository.find(workspaceId, {where: { threadId, ...(includeHidden ? {} : { isHidden: false }) },- order: { processedAt: { direction: 'ASC', nulls: 'LAST' } },+ order: { processedAt: { order: 'ASC', nulls: 'NULLS LAST' } },relations: ['parts', 'parts.file'],});}@@ -599,7 +604,7 @@ export class AgentChatService {fileAttachments?: AiChatFileAttachment[];workspaceId: string;userWorkspaceId: string;- }): Promise<AgentMessageEntity> {+ }) {const messageValues = {...(id ? { id } : {}),threadId,@@ -658,8 +663,7 @@ export class AgentChatService {return {id: savedMessageId,...messageValues,- workspaceId,- } as AgentMessageEntity;+ };}async hasQueuedMessages({@@ -681,7 +685,7 @@ export class AgentChatService {}: {threadId: string;workspaceId: string;- }): Promise<AgentMessageEntity[]> {+ }): Promise<AgentMessageWorkspaceEntity[]> {return this.messageRepository.find(workspaceId, {where: {threadId,@@ -698,7 +702,7 @@ export class AgentChatService {}: {messageId: string;workspaceId: string;- }): Promise<AgentMessageEntity | null> {+ }): Promise<AgentMessageWorkspaceEntity | null> {return this.messageRepository.findOne(workspaceId, {where: { id: messageId, status: AgentMessageStatus.QUEUED },});@@ -750,7 +754,7 @@ export class AgentChatService {{ id: messageId, threadId, status: AgentMessageStatus.QUEUED },{status: AgentMessageStatus.SENT,- processedAt: new Date(),+ processedAt: new Date().toISOString(),turnId: savedTurnId,},);@@ -909,7 +913,7 @@ export class AgentChatService {{where: { threadId, role: AgentMessageRole.ASSISTANT },order: {- processedAt: { direction: 'DESC', nulls: 'LAST' },+ processedAt: { order: 'DESC', nulls: 'NULLS LAST' },createdAt: 'DESC',id: 'DESC',},@@ -1012,7 +1016,7 @@ export class AgentChatService {userWorkspaceId: string;workspaceId: string;title: string;- }): Promise<AgentChatThreadEntity> {+ }): Promise<AgentChatThreadWorkspaceEntity> {const trimmed = title.trim();if (trimmed.length === 0) {@@ -1030,7 +1034,12 @@ export class AgentChatService {changes: { title: trimmed },});- await this.broadcastThreadUpdated(updated, ['title'], userWorkspaceId);+ await this.broadcastThreadUpdated(+ updated,+ workspaceId,+ ['title'],+ userWorkspaceId,+ );return updated;}@@ -1043,16 +1052,21 @@ export class AgentChatService {threadId: string;userWorkspaceId: string;workspaceId: string;- }): Promise<AgentChatThreadEntity> {+ }): Promise<AgentChatThreadWorkspaceEntity> {const thread = await this.sharingService.updateThreadWithAccess({threadId,userWorkspaceId,workspaceId,operationType: 'soft-delete',- changes: { deletedAt: new Date(), activeStreamId: null },+ changes: { archivedAt: new Date(), activeStreamId: null },});- await this.broadcastThreadUpdated(thread, ['deletedAt'], userWorkspaceId);+ await this.broadcastThreadUpdated(+ thread,+ workspaceId,+ ['deletedAt'],+ userWorkspaceId,+ );this.releaseThreadSandboxBestEffort(workspaceId, threadId);@@ -1067,16 +1081,21 @@ export class AgentChatService {threadId: string;userWorkspaceId: string;workspaceId: string;- }): Promise<AgentChatThreadEntity> {+ }): Promise<AgentChatThreadWorkspaceEntity> {const thread = await this.sharingService.updateThreadWithAccess({threadId,userWorkspaceId,workspaceId,operationType: 'restore',- changes: { deletedAt: null },+ changes: { archivedAt: null },});- await this.broadcastThreadUpdated(thread, ['deletedAt'], userWorkspaceId);+ await this.broadcastThreadUpdated(+ thread,+ workspaceId,+ ['deletedAt'],+ userWorkspaceId,+ );return thread;}@@ -1111,7 +1130,7 @@ export class AgentChatService {}await this.workspaceEventBroadcaster.broadcast({- workspaceId: thread.workspaceId,+ workspaceId,events: [{type: 'deleted',@@ -1163,6 +1182,7 @@ export class AgentChatService {await this.broadcastThreadUpdated(thread,+ workspaceId,['lastMessageAt'],userWorkspaceId,);@@ -1185,6 +1205,7 @@ export class AgentChatService {await this.broadcastThreadUpdated(thread,+ workspaceId,['totalInputTokens','totalOutputTokens',@@ -1198,12 +1219,13 @@ export class AgentChatService {}private async broadcastThreadUpdated(- thread: AgentChatThreadEntity,+ thread: AgentChatThreadWorkspaceEntity,+ workspaceId: string,updatedFields: (keyof AgentChatThreadDTO)[],userWorkspaceId: string,): Promise<void> {const permissions = await this.sharingService.getPermissions({- workspaceId: thread.workspaceId,+ workspaceId,userWorkspaceId,threadId: thread.id,});@@ -1212,11 +1234,11 @@ export class AgentChatService {}const lastMessageAt = await this.getLastMessageAtForThread({threadId: thread.id,- workspaceId: thread.workspaceId,+ workspaceId,});await this.workspaceEventBroadcaster.broadcast({- workspaceId: thread.workspaceId,+ workspaceId,events: [{type: 'updated',@@ -1268,6 +1290,7 @@ export class AgentChatService {await this.broadcastThreadUpdated({ ...thread, title },+ workspaceId,['title'],thread.userWorkspaceId,);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.tsindex 3249b5d05ce..97b2e972cf7 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service.ts@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';import { msg } from '@lingui/core/macro';import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';import {type WorkspaceCompanyEnrichment,type WorkspacePersonEnrichment,@@ -15,7 +15,7 @@ import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { WorkspaceSetupChatOutcome } from 'src/engine/metadata-modules/ai/ai-chat/enums/workspace-setup-chat-outcome.enum';import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';@@ -34,7 +34,7 @@ type StartWorkspaceSetupChatServiceResult =outcome:| WorkspaceSetupChatOutcome.STARTED| WorkspaceSetupChatOutcome.ALREADY_STARTED;- thread: AgentChatThreadEntity;+ thread: AgentChatThreadWorkspaceEntity;}| {outcome: WorkspaceSetupChatOutcome.UNAVAILABLE;@@ -110,7 +110,7 @@ export class WorkspaceSetupChatService {});if (isDefined(thread)) {- if (isDefined(thread.deletedAt)) {+ if (isDefined(thread.archivedAt)) {thread = await this.agentChatService.unarchiveThread({threadId,userWorkspaceId,@@ -118,7 +118,7 @@ export class WorkspaceSetupChatService {});}- if (isDefined(thread.activeStreamId)) {+ if (isNonEmptyString(thread.activeStreamId)) {const interruptedError =await this.agentChatStreamingService.reapDeadStream({thread,@@ -202,7 +202,7 @@ export class WorkspaceSetupChatService {userWorkspaceId: string;workspaceId: string;locale: string;- }): Promise<AgentChatThreadEntity> {+ }): Promise<AgentChatThreadWorkspaceEntity> {const safeLocale = (locale as keyof typeof APP_LOCALES) ?? SOURCE_LOCALE;const title = this.i18nService.getI18nInstance(safeLocale)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/serialize-agent-chat-thread-for-broadcast.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/serialize-agent-chat-thread-for-broadcast.util.spec.tsindex f45dd6991d8..4950b1664a6 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/serialize-agent-chat-thread-for-broadcast.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/serialize-agent-chat-thread-for-broadcast.util.spec.ts@@ -1,9 +1,9 @@-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { serializeAgentChatThreadForBroadcast } from 'src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util';describe('Thread broadcasts', () => {it('contains thread data without viewer-specific permissions', () => {- const thread = Object.assign(new AgentChatThreadEntity(), {+ const thread = Object.assign(new AgentChatThreadWorkspaceEntity(), {id: 'thread',userWorkspaceId: 'owner',totalInputCredits: 0,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util.tsindex 05f59d5fa1d..6f61b6af523 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util.ts@@ -1,7 +1,6 @@import { buildRecordShareLockKey } from 'src/engine/core-modules/record-share/utils/build-record-share-lock-key.util';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';-import { normalizeAgentHistoryRecord } from 'src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util';import {AiException,AiExceptionCode,@@ -17,7 +16,7 @@ export const lockAgentChatThread = async ({workspaceId: string;objectMetadataId: string;threadId: string;-}): Promise<AgentChatThreadEntity> => {+}): Promise<AgentChatThreadWorkspaceEntity> => {// Match generic sharing's lock order so concurrent revocations and domain// writes cannot authorize against different grant/record snapshots.await manager.query('SELECT pg_advisory_xact_lock(hashtextextended($1, 0))', [@@ -27,16 +26,12 @@ export const lockAgentChatThread = async ({recordId: threadId,}),]);- const records = await manager.query<AgentChatThreadEntity[]>(+ const records = await manager.query<AgentChatThreadWorkspaceEntity[]>(`SELECT * FROM ${table('agentChatThread')} WHERE id = $1 FOR UPDATE`,[threadId],);if (records.length !== 1) {throw new AiException('Thread not found', AiExceptionCode.THREAD_NOT_FOUND);}- return normalizeAgentHistoryRecord({- record: records[0],- workspaceId,- objectName: 'agentChatThread',- }) as AgentChatThreadEntity;+ return records[0];};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util.tsindex 44f09b89d7e..7f342aba816 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util.ts@@ -1,11 +1,11 @@-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { toDisplayCredits } from 'src/engine/core-modules/usage/utils/to-display-credits.util';export const serializeAgentChatThreadForBroadcast = ({thread,lastMessageAt,}: {- thread: AgentChatThreadEntity;+ thread: AgentChatThreadWorkspaceEntity;lastMessageAt: Date | null;}) => ({id: thread.id,@@ -13,13 +13,13 @@ export const serializeAgentChatThreadForBroadcast = ({title: thread.title,totalInputTokens: thread.totalInputTokens,totalOutputTokens: thread.totalOutputTokens,- totalCacheReadTokens: thread.totalCacheReadTokens,- totalCacheCreationTokens: thread.totalCacheCreationTokens,+ totalCacheReadTokens: Number(thread.totalCacheReadTokens),+ totalCacheCreationTokens: Number(thread.totalCacheCreationTokens),contextWindowTokens: thread.contextWindowTokens,conversationSize: thread.conversationSize,- totalInputCredits: toDisplayCredits(thread.totalInputCredits),- totalOutputCredits: toDisplayCredits(thread.totalOutputCredits),- deletedAt: thread.deletedAt,+ totalInputCredits: toDisplayCredits(Number(thread.totalInputCredits)),+ totalOutputCredits: toDisplayCredits(Number(thread.totalOutputCredits)),+ deletedAt: thread.archivedAt,lastMessageAt,createdAt: thread.createdAt,updatedAt: thread.updatedAt,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.tsindex f0e9590fcdb..147cf7b1cd4 100644--- 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@@ -1,18 +1,17 @@-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-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'->;+type ThreadUsageUpdate = {+ totalInputTokens: number;+ totalOutputTokens: number;+ totalInputCredits: number;+ totalOutputCredits: number;+ totalCacheReadTokens: number;+ totalCacheCreationTokens: number;+ contextWindowTokens: number | null;+ conversationSize: number;+ pendingQuestionMessageId: string | null;+};export const updateAgentChatThreadUsage = async ({repository,@@ -21,7 +20,7 @@ export const updateAgentChatThreadUsage = async ({streamId,usage,}: {- repository: AgentHistoryRepository<AgentChatThreadEntity>;+ repository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>;workspaceId: string;threadId: string;streamId: string;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.tsnew file mode 100644index 00000000000..43b7d1d8490--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts@@ -0,0 +1,44 @@+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';+import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';++it('reads native workspace fields and precision behind the upgrade readiness fence', async () => {+ const record = {+ id: 'thread',+ archivedAt: '2026-01-01T00:00:00.000Z',+ totalInputCredits: '9007199254740993',+ activeStreamId: '',+ };+ const storage = {+ run: jest+ .fn()+ .mockImplementation(+ async (_workspaceId: string, work: () => Promise<unknown>) => work(),+ ),+ };+ const find = jest.fn().mockResolvedValue([record]);+ const count = jest.fn().mockResolvedValue(1);+ const orm = {+ executeInWorkspaceContext: jest+ .fn()+ .mockImplementation(async (work: () => Promise<unknown>) => work()),+ getRepository: jest.fn().mockReturnValue({ find, count }),+ };+ const repository = new AgentHistoryRepository<AgentChatThreadWorkspaceEntity>(+ 'agentChatThread',+ storage,+ orm as never,+ );+ await expect(+ repository.find('workspace', {+ where: { id: 'thread' },+ order: { archivedAt: { order: 'DESC', nulls: 'NULLS LAST' } },+ }),+ ).resolves.toEqual([record]);+ await expect(repository.count('workspace')).resolves.toBe(1);+ expect(find).toHaveBeenCalledWith(+ expect.objectContaining({+ order: { archivedAt: { order: 'DESC', nulls: 'NULLS LAST' } },+ }),+ );+ expect(storage.run).toHaveBeenCalledTimes(2);+});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.tsindex 4e51a907962..e319240bdbb 100644--- 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@@ -1,11 +1,5 @@import { assertAgentMessageSenderFields } from 'src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util';-import {- mapAgentHistorySelectToWorkspace,- 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 { mapAgentHistoryOrderToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.util';+import { addAgentMessageSenderWorkspaceMember } from 'src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.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 {@@ -14,14 +8,9 @@ import {} 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 FindManyOptions,- type FindOneOptions,- type FindOptionsWhere,- type ObjectLiteral,-} from 'typeorm';+import { type FindOptionsWhere, type ObjectLiteral } from 'typeorm';import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';import {type AgentHistoryWorkspaceStorageService,@@ -35,9 +24,7 @@ import {} 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';-export class AgentHistoryRepository<- TRecord extends { id: string; workspaceId: string },-> {+export class AgentHistoryRepository<TRecord extends { id: string }> {constructor(private readonly name: AgentHistoryObjectName,private readonly storageService: Pick<@@ -57,14 +44,9 @@ export class AgentHistoryRepository<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) =>+ return this.storageService.run(workspaceId, (context) =>+ this.workspaceOrmManager.executeInWorkspaceContext(+ () =>work(this.workspaceOrmManager.getRepository<TRecord>(this.name,@@ -73,59 +55,44 @@ export class AgentHistoryRepository<),context,),- ),- buildSystemAuthContext(workspaceId),- { lite: true },+ buildSystemAuthContext(workspaceId),+ { lite: true },+ ),);}async find(workspaceId: string,- options?: FindManyOptions<TRecord>,+ options?: WorkspaceFindOptions,): Promise<TRecord[]> {return this.run(workspaceId, async (repository, context) => {- const relations = normalizeFindOptionsRelations(- (options?.relations ?? {}) as WorkspaceFindOptions['relations'] & {},- );+ const relations = normalizeFindOptionsRelations(options?.relations ?? {});const records = await repository.find({...options,- select: mapAgentHistorySelectToWorkspace(this.name, options?.select),- order: mapAgentHistoryOrderToWorkspace(this.name, options?.order),- 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,+ records,manager: context.manager,workspaceId,});}- return normalized as TRecord[];+ return records as TRecord[];});}async findOne(workspaceId: string,- options: FindOneOptions<TRecord>,+ options: WorkspaceFindOptions,): Promise<TRecord | null> {return (await this.find(workspaceId, { ...options, take: 1 }))[0] ?? null;}async findOneOrFail(workspaceId: string,- options: FindOneOptions<TRecord>,+ options: WorkspaceFindOptions,): Promise<TRecord> {const record = await this.findOne(workspaceId, options);if (!isDefined(record)) {@@ -149,20 +116,12 @@ export class AgentHistoryRepository<return record;}- count(- workspaceId: string,- options?: FindManyOptions<TRecord>,- ): Promise<number> {+ count(workspaceId: string, options?: WorkspaceFindOptions): Promise<number> {return this.run(workspaceId, (repository) =>repository.count({...options,- order: mapAgentHistoryOrderToWorkspace(this.name, options?.order),- where: mapAgentHistoryWhereToWorkspace<TRecord>(- this.name,- options?.where,- ),withDeleted: true,- } as WorkspaceFindOptions),+ }),);}@@ -172,7 +131,7 @@ export class AgentHistoryRepository<): Promise<boolean> {return this.run(workspaceId, (repository) =>repository.exists({- where: mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where),+ where,withDeleted: true,}),);@@ -182,10 +141,10 @@ export class AgentHistoryRepository<workspaceId: string,values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],) {- return this.run(workspaceId, (repository) => {+ return this.run(workspaceId, async (repository, context) => {if (this.name === 'agentMessage') assertAgentMessageSenderFields();return repository.insert(- mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),+ await this.addSenderRelation(values, workspaceId, context),);});}@@ -194,19 +153,27 @@ export class AgentHistoryRepository<workspaceId: string,values: QueryDeepPartialEntity<TRecord>,): Promise<TRecord> {- return this.run(workspaceId, async (repository) => {+ return this.run(workspaceId, async (repository, context) => {if (this.name === 'agentMessage') assertAgentMessageSenderFields();const result = await repository.insert(- mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),+ await this.addSenderRelation(values, workspaceId, context),);- return normalizeAgentHistoryRecord({- record: result.raw[0],- workspaceId,- objectName: this.name,- }) as TRecord;+ return result.raw[0] as TRecord;});}+ private async addSenderRelation(+ values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],+ workspaceId: string,+ context: AgentHistoryStorageContext,+ ) {+ const records: ObjectLiteral[] = Array.isArray(values) ? values : [values];+ return this.name === 'agentMessage' &&+ records.some((record) => isNonEmptyString(record.senderUserWorkspaceId))+ ? await addAgentMessageSenderWorkspaceMember(values, workspaceId, context)+ : values;+ }+update(workspaceId: string,where: FindOptionsWhere<TRecord>,@@ -216,9 +183,9 @@ export class AgentHistoryRepository<const result = await repository.createQueryBuilder().withDeleted()- .where(mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where) ?? {})+ .where(where).update()- .set(mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values))+ .set(values).returning(['id']).execute();return {@@ -234,7 +201,7 @@ export class AgentHistoryRepository<const result = await repository.createQueryBuilder().withDeleted()- .where(mapAgentHistoryWhereToWorkspace<TRecord>(this.name, where) ?? {})+ .where(where).delete().returning(['id']).execute();@@ -252,6 +219,7 @@ export class AgentHistoryRepository<conflictPaths: string[],) {return this.run(workspaceId, async (repository, context) => {+ if (this.name === 'agentMessage') assertAgentMessageSenderFields();// Workspace upsert selects before inserting. Serialize concurrent stream// checkpoints for the same identity so both cannot take the insert path.const valuesByField: ObjectLiteral = values;@@ -264,9 +232,12 @@ export class AgentHistoryRepository<`agent-history-upsert:${workspaceId}:${this.name}:${JSON.stringify(identity)}`,],);- if (this.name === 'agentMessage') assertAgentMessageSenderFields();return repository.upsert(- mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),+ (await this.addSenderRelation(+ values,+ workspaceId,+ context,+ )) as QueryDeepPartialEntity<TRecord>,conflictPaths,);});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity.tsindex ea051922709..4858fe9ac7b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity.ts@@ -1,3 +1,4 @@+import { type FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';import { type AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';@@ -28,5 +29,6 @@ export class AgentMessagePartWorkspaceEntity extends BaseWorkspaceEntity {sourceDocumentFilename: string | null;fileFilename: string | null;fileId: string | null;+ file?: FileEntity | null;providerMetadata: Record<string, Record<string, JSONValue>> | null;}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.tsindex 99256d39e74..c8cca416aca 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts@@ -1,3 +1,4 @@+import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';@@ -16,6 +17,8 @@ export class AgentMessageWorkspaceEntity extends BaseWorkspaceEntity {threadId: string;turnId: string | null;agentId: string | null;+ senderWorkspaceMember: EntityRelation<WorkspaceMemberWorkspaceEntity> | null;+ senderWorkspaceMemberId: string | null;senderUserWorkspaceId: string | null;senderApplicationId: string | null;role: AgentMessageRole;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.tsnew file mode 100644index 00000000000..345bcb002c0--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/add-agent-message-sender-workspace-member.util.spec.ts@@ -0,0 +1,72 @@+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { addAgentMessageSenderWorkspaceMember } from 'src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util';+import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';++jest.mock(+ 'src/engine/twenty-orm/storage/orm-workspace-context.storage',+ () => ({ getWorkspaceContext: jest.fn() }),+);++const setup = (hasRelation = true) => {+ jest.mocked(getWorkspaceContext).mockReturnValue({+ flatFieldMetadataMaps: {+ byUniversalIdentifier: hasRelation+ ? {+ [STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember+ .universalIdentifier]: {},+ }+ : {},+ },+ } as never);+ const query = jest+ .fn()+ .mockResolvedValue([{ membershipId: 'sender', memberId: 'member' }]);+ const expand = (+ values: Record<string, unknown> | Record<string, unknown>[],+ ) =>+ addAgentMessageSenderWorkspaceMember(+ values,+ '20202020-1111-4111-8111-111111111111',+ { manager: { query } } as never,+ );+ return { query, expand };+};++describe('sender workspace member expansion', () => {+ it('preserves complete legacy attribution before the relation is available', async () => {+ const { query, expand } = setup(false);+ const message = {+ senderUserWorkspaceId: 'sender',+ senderApplicationId: 'application',+ };+ expect(await expand(message)).toEqual(message);+ expect(query).not.toHaveBeenCalled();+ });+ it('dual-writes members in a batch without changing sender or application IDs', async () => {+ const { query, expand } = setup();+ const messages = [+ { senderUserWorkspaceId: 'sender', senderApplicationId: 'application' },+ { senderUserWorkspaceId: 'sender', isHidden: true },+ { senderUserWorkspaceId: 'removed' },+ ];+ expect(await expand(messages)).toEqual(+ messages.map((message) => ({+ ...message,+ senderWorkspaceMemberId:+ message.senderUserWorkspaceId === 'sender' ? 'member' : null,+ })),+ );+ expect(query).toHaveBeenCalledTimes(1);+ expect(query).toHaveBeenCalledWith(+ expect.stringContaining('membership."workspaceId" = $1'),+ ['20202020-1111-4111-8111-111111111111', ['sender', 'removed']],+ );+ });+ it('does not invent a sender for historical or assistant messages', async () => {+ const { query, expand } = setup();+ expect(await expand({ senderUserWorkspaceId: null })).toEqual({+ senderUserWorkspaceId: null,+ });+ expect(query).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/agent-history-workspace-mapping.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/agent-history-workspace-mapping.util.spec.tsdeleted file mode 100644index d944f378444..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/agent-history-workspace-mapping.util.spec.ts+++ /dev/null@@ -1,47 +0,0 @@-import { mapAgentHistorySelectToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util';--describe('mapAgentHistorySelectToWorkspace', () => {- it('leaves an absent selection unset', () => {- expect(- mapAgentHistorySelectToWorkspace('agentChatThread', undefined),- ).toBeUndefined();- });-- it('maps the archive field in array projections without mutating the input', () => {- const select = ['id', 'deletedAt'];- expect(mapAgentHistorySelectToWorkspace('agentChatThread', select)).toEqual(- ['id', 'archivedAt'],- );- expect(select).toEqual(['id', 'deletedAt']);- });-- it('preserves included and excluded fields in object projections', () => {- expect(- mapAgentHistorySelectToWorkspace('agentChatThread', {- id: true,- deletedAt: true,- title: false,- activeStreamId: undefined,- }),- ).toEqual({- id: true,- archivedAt: true,- title: false,- activeStreamId: false,- });- expect(- mapAgentHistorySelectToWorkspace('agentMessage', { deletedAt: true }),- ).toEqual({ deletedAt: true });- });-- it.each([- '{"id":1}',- '{"title":"true"}',- '{"parts":{"id":true}}',- '{"id":null}',- ])('rejects a non-boolean runtime projection %s', (json) => {- expect(() =>- mapAgentHistorySelectToWorkspace('agentChatThread', JSON.parse(json)),- ).toThrow('History field selections must be boolean');- });-});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-agent-history-order-to-workspace.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-agent-history-order-to-workspace.util.spec.tsdeleted file mode 100644index 8c7ef28ff78..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-agent-history-order-to-workspace.util.spec.ts+++ /dev/null@@ -1,83 +0,0 @@-import { type FindOptionsOrderValue } from 'typeorm';--import { mapAgentHistoryOrderToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.util';--describe('mapAgentHistoryOrderToWorkspace', () => {- it.each<{ value: FindOptionsOrderValue; expected: 'ASC' | 'DESC' }>([- { value: 'ASC', expected: 'ASC' },- { value: 'asc', expected: 'ASC' },- { value: 1, expected: 'ASC' },- { value: 'DESC', expected: 'DESC' },- { value: 'desc', expected: 'DESC' },- { value: -1, expected: 'DESC' },- { value: {}, expected: 'ASC' },- ])('accepts TypeORM direction $value', ({ value, expected }) => {- expect(- mapAgentHistoryOrderToWorkspace('agentMessage', { createdAt: value }),- ).toEqual({ createdAt: { order: expected } });- });-- it.each(['first', 'FIRST', 'last', 'LAST'] as const)(- 'maps null placement %s',- (nulls) => {- expect(- mapAgentHistoryOrderToWorkspace('agentMessage', {- processedAt: { direction: 'desc', nulls },- }),- ).toEqual({- processedAt: {- order: 'DESC',- nulls: nulls.toUpperCase() === 'FIRST' ? 'NULLS FIRST' : 'NULLS LAST',- },- });- },- );-- it('preserves relation order and maps thread archives without mutating the input', () => {- const order = {- deletedAt: { direction: 'DESC', nulls: 'LAST' },- messages: { createdAt: 1 },- } as const;- expect(mapAgentHistoryOrderToWorkspace('agentChatThread', order)).toEqual({- archivedAt: { order: 'DESC', nulls: 'NULLS LAST' },- messages: { createdAt: { order: 'ASC' } },- });- expect(order.deletedAt).toEqual({ direction: 'DESC', nulls: 'LAST' });- expect(- mapAgentHistoryOrderToWorkspace('agentMessage', { deletedAt: 'ASC' }),- ).toEqual({ deletedAt: { order: 'ASC' } });- });-- it('leaves absent ordering unset and omits undefined fields', () => {- expect(- mapAgentHistoryOrderToWorkspace('agentMessage', undefined),- ).toBeUndefined();- expect(- mapAgentHistoryOrderToWorkspace('agentMessage', { createdAt: undefined }),- ).toEqual({});- });-- it('rejects deeper relation ordering before generating a query', () => {- expect(() =>- mapAgentHistoryOrderToWorkspace('agentChatThread', {- messages: { parts: { createdAt: 'ASC' } },- }),- ).toThrow('Nested history relation ordering is not supported');- });-- it.each([- ['{"createdAt":"sideways"}', 'Invalid history sort direction'],- [- '{"processedAt":{"direction":"DESC; SELECT 1"}}',- 'Invalid history sort direction',- ],- [- '{"processedAt":{"nulls":"LAST; SELECT 1"}}',- 'Invalid history null ordering',- ],- ])('rejects malformed runtime sort options %s', (json, message) => {- expect(() =>- mapAgentHistoryOrderToWorkspace('agentMessage', JSON.parse(json)),- ).toThrow(message);- });-});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.tsdeleted file mode 100644index c92faa88080..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/normalize-agent-history-record.util.spec.ts+++ /dev/null@@ -1,89 +0,0 @@-import { normalizeAgentHistoryRecord } from 'src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util';--describe('normalizeAgentHistoryRecord', () => {- it.each([- ['', null],- [null, null],- [undefined, undefined],- ['active-stream-id', 'active-stream-id'],- ])('normalizes the stream claim %p to %p', (activeStreamId, expected) => {- const record = { activeStreamId, title: '' };- expect(- normalizeAgentHistoryRecord({- record,- workspaceId: 'workspace-id',- objectName: 'agentChatThread',- }),- ).toMatchObject({ activeStreamId: expected, title: '' });- expect(record.activeStreamId).toBe(activeStreamId);- });-- 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/add-agent-message-sender-workspace-member.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.tsnew file mode 100644index 00000000000..85d1b458f21--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/add-agent-message-sender-workspace-member.util.ts@@ -0,0 +1,62 @@+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';+import { type ObjectLiteral } from 'typeorm';++import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';+import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';+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 const addAgentMessageSenderWorkspaceMember = async (+ values: ObjectLiteral | ObjectLiteral[],+ workspaceId: string,+ { manager }: AgentHistoryStorageContext,+): Promise<ObjectLiteral | ObjectLiteral[]> => {+ const { flatFieldMetadataMaps } = getWorkspaceContext();++ // The nullable relation is an expansion. Legacy attribution stays complete+ // while a workspace is still waiting for its relation migration.+ if (+ !isDefined(+ flatFieldMetadataMaps.byUniversalIdentifier[+ STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember+ .universalIdentifier+ ],+ )+ ) {+ return values;+ }++ const messages = Array.isArray(values) ? values : [values];+ const senderIds = [+ ...new Set(+ messages+ .map((message) => message.senderUserWorkspaceId)+ .filter(isNonEmptyString),+ ),+ ];+ if (senderIds.length === 0) {+ return values;+ }+ const schemaName = escapeIdentifier(getWorkspaceSchemaName(workspaceId));+ const members = await manager.query<+ { membershipId: string; memberId: string }[]+ >(+ `SELECT membership.id AS "membershipId", member.id AS "memberId"+ FROM core."userWorkspace" membership+ JOIN ${schemaName}."workspaceMember" member+ ON member."userId" = membership."userId" AND member."deletedAt" IS NULL+ WHERE membership."workspaceId" = $1 AND membership.id = ANY($2::uuid[])`,+ [workspaceId, senderIds],+ );+ const memberIdByMembershipId = new Map(+ members.map(({ membershipId, memberId }) => [membershipId, memberId]),+ );+ const expandedMessages = messages.map((message) => ({+ ...message,+ senderWorkspaceMemberId:+ memberIdByMembershipId.get(message.senderUserWorkspaceId) ?? null,+ }));++ return Array.isArray(values) ? expandedMessages : expandedMessages[0];+};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.tsdeleted file mode 100644index fedfa0e604f..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/agent-history-workspace-mapping.util.ts+++ /dev/null@@ -1,118 +0,0 @@-import { isDefined } from 'twenty-shared/utils';-import { mapAgentHistoryFieldNameToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util';-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 };- return Object.fromEntries(- Object.entries(fields).map(([fieldName, value]) => [- mapAgentHistoryFieldNameToWorkspace(objectName, fieldName),- value,- ]),- );-}--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',- );- }- return Object.fromEntries(- Object.entries(where).map(([fieldName, value]) => [- mapAgentHistoryFieldNameToWorkspace(objectName, fieldName),- value,- ]),- );-}--export const mapAgentHistorySelectToWorkspace = <TRecord>(- objectName: AgentHistoryObjectName,- select: FindManyOptions<TRecord>['select'],-): WorkspaceFindOptions['select'] => {- if (!isDefined(select)) {- return undefined;- }- if (Array.isArray(select)) {- return select.map((fieldName) =>- mapAgentHistoryFieldNameToWorkspace(objectName, String(fieldName)),- );- }-- return Object.fromEntries(- Object.entries(select).map(([fieldName, value]) => {- if (value !== undefined && typeof value !== 'boolean') {- throw new AgentHistoryStorageException(- 'INVALID_CRITERIA',- 'History field selections must be boolean',- );- }- return [- mapAgentHistoryFieldNameToWorkspace(objectName, fieldName),- value === true,- ];- }),- );-};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util.tsdeleted file mode 100644index 868c894b3fd..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util.ts+++ /dev/null@@ -1,9 +0,0 @@-import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';--export const mapAgentHistoryFieldNameToWorkspace = (- objectName: AgentHistoryObjectName,- fieldName: string,-): string =>- objectName === 'agentChatThread' && fieldName === 'deletedAt'- ? 'archivedAt'- : fieldName;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.util.tsdeleted file mode 100644index 4552606bfee..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.util.ts+++ /dev/null@@ -1,95 +0,0 @@-import { mapAgentHistoryFieldNameToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-field-name-to-workspace.util';-import { isDefined } from 'twenty-shared/utils';-import { isObject } from '@sniptt/guards';-import { type FindOptionsOrder, type FindOptionsOrderValue } from 'typeorm';--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';-import { type OrderByValueLike } from 'src/engine/twenty-orm/query-builder/types/query-builder.type';-import { type WorkspaceFindOptionsOrder } from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';--type HistoryOrderValue =- | FindOptionsOrderValue- | Record<string, FindOptionsOrderValue>;--const isRelationOrder = (- value: HistoryOrderValue,-): value is Record<string, FindOptionsOrderValue> =>- isObject(value) &&- Object.keys(value).some((key) => key !== 'direction' && key !== 'nulls');--const mapOrderValue = (value: FindOptionsOrderValue): OrderByValueLike => {- // Workspace find options support only one level of relation ordering.- if (isRelationOrder(value)) {- throw new AgentHistoryStorageException(- 'INVALID_CRITERIA',- 'Nested history relation ordering is not supported',- );- }-- const direction = isObject(value) ? value.direction : value;- const nulls = isObject(value) ? value.nulls : undefined;-- if (- isDefined(direction) &&- !['ASC', 'DESC', 'asc', 'desc', 1, -1].includes(direction)- ) {- throw new AgentHistoryStorageException(- 'INVALID_CRITERIA',- 'Invalid history sort direction',- );- }- if (isDefined(nulls) && !['FIRST', 'LAST', 'first', 'last'].includes(nulls)) {- throw new AgentHistoryStorageException(- 'INVALID_CRITERIA',- 'Invalid history null ordering',- );- }-- return {- order:- direction === -1 || direction === 'DESC' || direction === 'desc'- ? 'DESC'- : 'ASC',- ...(isDefined(nulls)- ? {- nulls:- nulls === 'FIRST' || nulls === 'first'- ? 'NULLS FIRST'- : 'NULLS LAST',- }- : {}),- };-};--export const mapAgentHistoryOrderToWorkspace = <TRecord>(- objectName: AgentHistoryObjectName,- order: FindOptionsOrder<TRecord> | undefined,-): WorkspaceFindOptionsOrder | undefined => {- if (!isDefined(order)) {- return undefined;- }-- const entries: [string, HistoryOrderValue | undefined][] =- Object.entries(order);-- return Object.fromEntries(- entries- .filter((entry): entry is [string, HistoryOrderValue] =>- isDefined(entry[1]),- )- .map(([fieldName, value]) => [- mapAgentHistoryFieldNameToWorkspace(objectName, fieldName),- isRelationOrder(value)- ? Object.fromEntries(- Object.entries(value).map(- ([relationFieldName, relationOrder]) => [- relationFieldName,- mapOrderValue(relationOrder),- ],- ),- )- : mapOrderValue(value),- ]),- );-};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.tsdeleted file mode 100644index 543a097c283..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/normalize-agent-history-record.util.ts+++ /dev/null@@ -1,59 +0,0 @@-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;- // Workspace text formatting turns SQL NULL into an empty string, which- // chat stream coordination must not interpret as an active stream claim.- if (normalized.activeStreamId === '') {- normalized.activeStreamId = 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-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.tsindex e325275d05e..a03f617b924 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@@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';-import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-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';@@ -13,7 +13,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadatexport class AiWorkspaceStatsService {constructor(@InjectAgentHistoryRepository('agentChatThread')- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly toolRegistryService: ToolRegistryService,) {}diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snapindex c49e90e25cc..823d0867ec1 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap@@ -5,298 +5,301 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"agentChatThread": {"fields": {"activeStreamId": {- "id": "00000000-0000-0000-0000-000000001016",+ "id": "00000000-0000-0000-0000-000000001017",},"archivedAt": {- "id": "00000000-0000-0000-0000-000000001004",+ "id": "00000000-0000-0000-0000-000000001005",},"attachments": {- "id": "00000000-0000-0000-0000-000000001021",+ "id": "00000000-0000-0000-0000-000000001022",},"contextWindowTokens": {- "id": "00000000-0000-0000-0000-000000001010",+ "id": "00000000-0000-0000-0000-000000001011",},"conversationSize": {- "id": "00000000-0000-0000-0000-000000001011",+ "id": "00000000-0000-0000-0000-000000001012",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001001",+ "id": "00000000-0000-0000-0000-000000001002",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001003",+ "id": "00000000-0000-0000-0000-000000001004",},"id": {- "id": "00000000-0000-0000-0000-000000001000",+ "id": "00000000-0000-0000-0000-000000001001",},"lastStreamError": {- "id": "00000000-0000-0000-0000-000000001018",+ "id": "00000000-0000-0000-0000-000000001019",},"messages": {- "id": "00000000-0000-0000-0000-000000001020",+ "id": "00000000-0000-0000-0000-000000001021",},"pendingQuestionMessageId": {- "id": "00000000-0000-0000-0000-000000001017",+ "id": "00000000-0000-0000-0000-000000001018",},"recordTargets": {- "id": "00000000-0000-0000-0000-000000001022",+ "id": "00000000-0000-0000-0000-000000001023",},"title": {- "id": "00000000-0000-0000-0000-000000001007",+ "id": "00000000-0000-0000-0000-000000001008",},"totalCacheCreationTokens": {- "id": "00000000-0000-0000-0000-000000001015",+ "id": "00000000-0000-0000-0000-000000001016",},"totalCacheReadTokens": {- "id": "00000000-0000-0000-0000-000000001014",+ "id": "00000000-0000-0000-0000-000000001015",},"totalInputCredits": {- "id": "00000000-0000-0000-0000-000000001012",+ "id": "00000000-0000-0000-0000-000000001013",},"totalInputTokens": {- "id": "00000000-0000-0000-0000-000000001008",+ "id": "00000000-0000-0000-0000-000000001009",},"totalOutputCredits": {- "id": "00000000-0000-0000-0000-000000001013",+ "id": "00000000-0000-0000-0000-000000001014",},"totalOutputTokens": {- "id": "00000000-0000-0000-0000-000000001009",+ "id": "00000000-0000-0000-0000-000000001010",},"turns": {- "id": "00000000-0000-0000-0000-000000001019",+ "id": "00000000-0000-0000-0000-000000001020",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001002",+ "id": "00000000-0000-0000-0000-000000001003",},"userWorkspaceId": {- "id": "00000000-0000-0000-0000-000000001005",+ "id": "00000000-0000-0000-0000-000000001006",},"workspaceMember": {- "id": "00000000-0000-0000-0000-000000001006",+ "id": "00000000-0000-0000-0000-000000001007",},},- "id": "00000000-0000-0000-0000-000000001023",+ "id": "00000000-0000-0000-0000-000000001024","views": undefined,},"agentChatThreadTarget": {"fields": {"createdAt": {- "id": "00000000-0000-0000-0000-000000001025",+ "id": "00000000-0000-0000-0000-000000001026",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001027",+ "id": "00000000-0000-0000-0000-000000001028",},"id": {- "id": "00000000-0000-0000-0000-000000001024",+ "id": "00000000-0000-0000-0000-000000001025",},"targetCompany": {- "id": "00000000-0000-0000-0000-000000001030",+ "id": "00000000-0000-0000-0000-000000001031",},"targetOpportunity": {- "id": "00000000-0000-0000-0000-000000001031",+ "id": "00000000-0000-0000-0000-000000001032",},"targetPerson": {- "id": "00000000-0000-0000-0000-000000001029",+ "id": "00000000-0000-0000-0000-000000001030",},"thread": {- "id": "00000000-0000-0000-0000-000000001028",+ "id": "00000000-0000-0000-0000-000000001029",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001026",+ "id": "00000000-0000-0000-0000-000000001027",},},- "id": "00000000-0000-0000-0000-000000001032",+ "id": "00000000-0000-0000-0000-000000001033","views": {},},"agentMessage": {"fields": {"agentId": {- "id": "00000000-0000-0000-0000-000000001046",+ "id": "00000000-0000-0000-0000-000000001047",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001043",+ "id": "00000000-0000-0000-0000-000000001044",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001045",+ "id": "00000000-0000-0000-0000-000000001046",},"id": {- "id": "00000000-0000-0000-0000-000000001042",+ "id": "00000000-0000-0000-0000-000000001043",},"isHidden": {- "id": "00000000-0000-0000-0000-000000001051",+ "id": "00000000-0000-0000-0000-000000001053",},"parts": {- "id": "00000000-0000-0000-0000-000000001055",+ "id": "00000000-0000-0000-0000-000000001057",},"processedAt": {- "id": "00000000-0000-0000-0000-000000001052",+ "id": "00000000-0000-0000-0000-000000001054",},"role": {- "id": "00000000-0000-0000-0000-000000001049",+ "id": "00000000-0000-0000-0000-000000001051",},"senderApplicationId": {- "id": "00000000-0000-0000-0000-000000001048",+ "id": "00000000-0000-0000-0000-000000001050",},"senderUserWorkspaceId": {- "id": "00000000-0000-0000-0000-000000001047",+ "id": "00000000-0000-0000-0000-000000001049",+ },+ "senderWorkspaceMember": {+ "id": "00000000-0000-0000-0000-000000001048",},"status": {- "id": "00000000-0000-0000-0000-000000001050",+ "id": "00000000-0000-0000-0000-000000001052",},"thread": {- "id": "00000000-0000-0000-0000-000000001053",+ "id": "00000000-0000-0000-0000-000000001055",},"turn": {- "id": "00000000-0000-0000-0000-000000001054",+ "id": "00000000-0000-0000-0000-000000001056",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001044",+ "id": "00000000-0000-0000-0000-000000001045",},},- "id": "00000000-0000-0000-0000-000000001056",+ "id": "00000000-0000-0000-0000-000000001058","views": undefined,},"agentMessagePart": {"fields": {"createdAt": {- "id": "00000000-0000-0000-0000-000000001058",+ "id": "00000000-0000-0000-0000-000000001060",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001060",+ "id": "00000000-0000-0000-0000-000000001062",},"errorDetails": {- "id": "00000000-0000-0000-0000-000000001072",+ "id": "00000000-0000-0000-0000-000000001074",},"errorMessage": {- "id": "00000000-0000-0000-0000-000000001071",+ "id": "00000000-0000-0000-0000-000000001073",},"fileFilename": {- "id": "00000000-0000-0000-0000-000000001080",+ "id": "00000000-0000-0000-0000-000000001082",},"fileId": {- "id": "00000000-0000-0000-0000-000000001081",+ "id": "00000000-0000-0000-0000-000000001083",},"id": {- "id": "00000000-0000-0000-0000-000000001057",+ "id": "00000000-0000-0000-0000-000000001059",},"message": {- "id": "00000000-0000-0000-0000-000000001083",+ "id": "00000000-0000-0000-0000-000000001085",},"orderIndex": {- "id": "00000000-0000-0000-0000-000000001061",+ "id": "00000000-0000-0000-0000-000000001063",},"providerExecuted": {- "id": "00000000-0000-0000-0000-000000001070",+ "id": "00000000-0000-0000-0000-000000001072",},"providerMetadata": {- "id": "00000000-0000-0000-0000-000000001082",+ "id": "00000000-0000-0000-0000-000000001084",},"reasoningContent": {- "id": "00000000-0000-0000-0000-000000001064",+ "id": "00000000-0000-0000-0000-000000001066",},"sourceDocumentFilename": {- "id": "00000000-0000-0000-0000-000000001079",+ "id": "00000000-0000-0000-0000-000000001081",},"sourceDocumentMediaType": {- "id": "00000000-0000-0000-0000-000000001077",+ "id": "00000000-0000-0000-0000-000000001079",},"sourceDocumentSourceId": {- "id": "00000000-0000-0000-0000-000000001076",+ "id": "00000000-0000-0000-0000-000000001078",},"sourceDocumentTitle": {- "id": "00000000-0000-0000-0000-000000001078",+ "id": "00000000-0000-0000-0000-000000001080",},"sourceUrlSourceId": {- "id": "00000000-0000-0000-0000-000000001073",+ "id": "00000000-0000-0000-0000-000000001075",},"sourceUrlTitle": {- "id": "00000000-0000-0000-0000-000000001075",+ "id": "00000000-0000-0000-0000-000000001077",},"sourceUrlUrl": {- "id": "00000000-0000-0000-0000-000000001074",+ "id": "00000000-0000-0000-0000-000000001076",},"state": {- "id": "00000000-0000-0000-0000-000000001069",+ "id": "00000000-0000-0000-0000-000000001071",},"textContent": {- "id": "00000000-0000-0000-0000-000000001063",+ "id": "00000000-0000-0000-0000-000000001065",},"toolCallId": {- "id": "00000000-0000-0000-0000-000000001066",+ "id": "00000000-0000-0000-0000-000000001068",},"toolInput": {- "id": "00000000-0000-0000-0000-000000001067",+ "id": "00000000-0000-0000-0000-000000001069",},"toolName": {- "id": "00000000-0000-0000-0000-000000001065",+ "id": "00000000-0000-0000-0000-000000001067",},"toolOutput": {- "id": "00000000-0000-0000-0000-000000001068",+ "id": "00000000-0000-0000-0000-000000001070",},"type": {- "id": "00000000-0000-0000-0000-000000001062",+ "id": "00000000-0000-0000-0000-000000001064",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001059",+ "id": "00000000-0000-0000-0000-000000001061",},},- "id": "00000000-0000-0000-0000-000000001084",+ "id": "00000000-0000-0000-0000-000000001086","views": undefined,},"agentTurn": {"fields": {"agentId": {- "id": "00000000-0000-0000-0000-000000001037",+ "id": "00000000-0000-0000-0000-000000001038",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001034",+ "id": "00000000-0000-0000-0000-000000001035",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001036",+ "id": "00000000-0000-0000-0000-000000001037",},"evaluations": {- "id": "00000000-0000-0000-0000-000000001040",+ "id": "00000000-0000-0000-0000-000000001041",},"id": {- "id": "00000000-0000-0000-0000-000000001033",+ "id": "00000000-0000-0000-0000-000000001034",},"messages": {- "id": "00000000-0000-0000-0000-000000001039",+ "id": "00000000-0000-0000-0000-000000001040",},"thread": {- "id": "00000000-0000-0000-0000-000000001038",+ "id": "00000000-0000-0000-0000-000000001039",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001035",+ "id": "00000000-0000-0000-0000-000000001036",},},- "id": "00000000-0000-0000-0000-000000001041",+ "id": "00000000-0000-0000-0000-000000001042","views": undefined,},"agentTurnEvaluation": {"fields": {"comment": {- "id": "00000000-0000-0000-0000-000000001090",+ "id": "00000000-0000-0000-0000-000000001092",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001086",+ "id": "00000000-0000-0000-0000-000000001088",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001088",+ "id": "00000000-0000-0000-0000-000000001090",},"id": {- "id": "00000000-0000-0000-0000-000000001085",+ "id": "00000000-0000-0000-0000-000000001087",},"score": {- "id": "00000000-0000-0000-0000-000000001089",+ "id": "00000000-0000-0000-0000-000000001091",},"turn": {- "id": "00000000-0000-0000-0000-000000001091",+ "id": "00000000-0000-0000-0000-000000001093",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001087",+ "id": "00000000-0000-0000-0000-000000001089",},},- "id": "00000000-0000-0000-0000-000000001092",+ "id": "00000000-0000-0000-0000-000000001094","views": undefined,},"attachment": {@@ -1054,64 +1057,64 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"campaignDelivery": {"fields": {"bouncedAt": {- "id": "00000000-0000-0000-0000-000000001108",+ "id": "00000000-0000-0000-0000-000000001110",},"campaignId": {- "id": "00000000-0000-0000-0000-000000001097",+ "id": "00000000-0000-0000-0000-000000001099",},"claimExpiresAt": {- "id": "00000000-0000-0000-0000-000000001104",+ "id": "00000000-0000-0000-0000-000000001106",},"claimToken": {- "id": "00000000-0000-0000-0000-000000001103",+ "id": "00000000-0000-0000-0000-000000001105",},"complainedAt": {- "id": "00000000-0000-0000-0000-000000001109",+ "id": "00000000-0000-0000-0000-000000001111",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001094",+ "id": "00000000-0000-0000-0000-000000001096",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001096",+ "id": "00000000-0000-0000-0000-000000001098",},"deliveredAt": {- "id": "00000000-0000-0000-0000-000000001107",+ "id": "00000000-0000-0000-0000-000000001109",},"failureReason": {- "id": "00000000-0000-0000-0000-000000001102",+ "id": "00000000-0000-0000-0000-000000001104",},"id": {- "id": "00000000-0000-0000-0000-000000001093",+ "id": "00000000-0000-0000-0000-000000001095",},"personId": {- "id": "00000000-0000-0000-0000-000000001098",+ "id": "00000000-0000-0000-0000-000000001100",},"providerMessageId": {- "id": "00000000-0000-0000-0000-000000001105",+ "id": "00000000-0000-0000-0000-000000001107",},"recipientEmail": {- "id": "00000000-0000-0000-0000-000000001099",+ "id": "00000000-0000-0000-0000-000000001101",},"rejectedAt": {- "id": "00000000-0000-0000-0000-000000001110",+ "id": "00000000-0000-0000-0000-000000001112",},"renderingFailedAt": {- "id": "00000000-0000-0000-0000-000000001111",+ "id": "00000000-0000-0000-0000-000000001113",},"sentAt": {- "id": "00000000-0000-0000-0000-000000001106",+ "id": "00000000-0000-0000-0000-000000001108",},"skipReason": {- "id": "00000000-0000-0000-0000-000000001101",+ "id": "00000000-0000-0000-0000-000000001103",},"state": {- "id": "00000000-0000-0000-0000-000000001100",+ "id": "00000000-0000-0000-0000-000000001102",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001095",+ "id": "00000000-0000-0000-0000-000000001097",},},- "id": "00000000-0000-0000-0000-000000001112",+ "id": "00000000-0000-0000-0000-000000001114","views": undefined,},"company": {@@ -2068,34 +2071,34 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"messageSuppression": {"fields": {"createdAt": {- "id": "00000000-0000-0000-0000-000000001114",+ "id": "00000000-0000-0000-0000-000000001116",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001116",+ "id": "00000000-0000-0000-0000-000000001118",},"emailAddress": {- "id": "00000000-0000-0000-0000-000000001117",+ "id": "00000000-0000-0000-0000-000000001119",},"id": {- "id": "00000000-0000-0000-0000-000000001113",+ "id": "00000000-0000-0000-0000-000000001115",},"providerEventId": {- "id": "00000000-0000-0000-0000-000000001120",+ "id": "00000000-0000-0000-0000-000000001122",},"reason": {- "id": "00000000-0000-0000-0000-000000001118",+ "id": "00000000-0000-0000-0000-000000001120",},"source": {- "id": "00000000-0000-0000-0000-000000001119",+ "id": "00000000-0000-0000-0000-000000001121",},"unsubscribeTopicId": {- "id": "00000000-0000-0000-0000-000000001121",+ "id": "00000000-0000-0000-0000-000000001123",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001115",+ "id": "00000000-0000-0000-0000-000000001117",},},- "id": "00000000-0000-0000-0000-000000001122",+ "id": "00000000-0000-0000-0000-000000001124","views": undefined,},"messageThread": {@@ -3628,6 +3631,9 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000983",},"agentChatThreads": {+ "id": "00000000-0000-0000-0000-000000000989",+ },+ "agentMessages": {"id": "00000000-0000-0000-0000-000000000988",},"assignedTasks": {@@ -3643,7 +3649,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000986",},"calendarStartDay": {- "id": "00000000-0000-0000-0000-000000000992",+ "id": "00000000-0000-0000-0000-000000000993",},"colorScheme": {"id": "00000000-0000-0000-0000-000000000973",@@ -3655,7 +3661,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000968",},"dateFormat": {- "id": "00000000-0000-0000-0000-000000000990",+ "id": "00000000-0000-0000-0000-000000000991",},"deletedAt": {"id": "00000000-0000-0000-0000-000000000967",@@ -3676,7 +3682,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000972",},"numberFormat": {- "id": "00000000-0000-0000-0000-000000000993",+ "id": "00000000-0000-0000-0000-000000000994",},"openRecordIn": {"id": "00000000-0000-0000-0000-000000000975",@@ -3691,10 +3697,10 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000971",},"timeFormat": {- "id": "00000000-0000-0000-0000-000000000991",+ "id": "00000000-0000-0000-0000-000000000992",},"timeZone": {- "id": "00000000-0000-0000-0000-000000000989",+ "id": "00000000-0000-0000-0000-000000000990",},"timelineActivities": {"id": "00000000-0000-0000-0000-000000000987",@@ -3715,23 +3721,23 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000000980",},},- "id": "00000000-0000-0000-0000-000000000999",+ "id": "00000000-0000-0000-0000-000000001000","views": {"allWorkspaceMembers": {- "id": "00000000-0000-0000-0000-000000000998",+ "id": "00000000-0000-0000-0000-000000000999","viewFieldGroups": {},"viewFields": {"assignedTasks": {- "id": "00000000-0000-0000-0000-000000000997",+ "id": "00000000-0000-0000-0000-000000000998",},"createdAt": {- "id": "00000000-0000-0000-0000-000000000995",+ "id": "00000000-0000-0000-0000-000000000996",},"name": {- "id": "00000000-0000-0000-0000-000000000994",+ "id": "00000000-0000-0000-0000-000000000995",},"ownedOpportunities": {- "id": "00000000-0000-0000-0000-000000000996",+ "id": "00000000-0000-0000-0000-000000000997",},},"viewGroups": {},diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-agent-history-standard-metadata.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-agent-history-standard-metadata.spec.tsindex c25eb75cae3..97f3907f423 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-agent-history-standard-metadata.spec.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/compute-agent-history-standard-metadata.spec.ts@@ -126,6 +126,21 @@ describe('agent history workspace metadata', () => {});});+ it('retains messages when a sender member is deleted', () => {+ expect(+ allFlatEntityMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ STANDARD_OBJECTS.agentMessage.fields.senderWorkspaceMember+ .universalIdentifier+ ],+ ).toMatchObject({+ isNullable: true,+ settings: {+ onDelete: 'SET_NULL',+ joinColumnName: 'senderWorkspaceMemberId',+ },+ });+ });+it('retains exact precision for credits and cache token counts', () => {for (const name of ['totalInputCredits',diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.tsindex 2c669b611cf..1939758ee5a 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts@@ -63,6 +63,37 @@ export const buildAgentMessageStandardFlatFieldMetadatas = (writability: MetadataWritability.SYSTEM,isAuditLogged: false,},+ senderWorkspaceMember: {+ ...createStandardRelationFieldFlatMetadata({+ ...args,+ context: {+ fieldName: 'senderWorkspaceMember',+ type: FieldMetadataType.RELATION,+ label: i18nLabel(+ msg({ message: 'Sender', context: 'fieldMetadata.label' }),+ ),+ description: i18nLabel(+ msg({+ message: 'Workspace member who sent this message',+ context: 'fieldMetadata.description',+ }),+ ),+ icon: 'IconUser',+ isUIEditable: false,+ isNullable: true,+ targetObjectName: 'workspaceMember',+ targetFieldName: 'agentMessages',+ morphId: null,+ settings: {+ relationType: RelationType.MANY_TO_ONE,+ onDelete: RelationOnDeleteAction.SET_NULL,+ joinColumnName: 'senderWorkspaceMemberId',+ },+ },+ }),+ writability: MetadataWritability.SYSTEM,+ isAuditLogged: false,+ },senderUserWorkspaceId: {...createStandardFieldFlatMetadata({...args,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-workspace-member-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-workspace-member-standard-flat-field-metadata.util.tsindex 3e43f093d07..cf43b889e8a 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-workspace-member-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-workspace-member-standard-flat-field-metadata.util.ts@@ -851,6 +851,36 @@ export const buildWorkspaceMemberStandardFlatFieldMetadatas = ({twentyStandardApplicationId,now,}),+ agentMessages: createStandardRelationFieldFlatMetadata({+ objectName,+ workspaceId,+ context: {+ type: FieldMetadataType.RELATION,+ morphId: null,+ fieldName: 'agentMessages',+ label: i18nLabel(+ msg({ message: `Chat messages`, context: 'fieldMetadata.label' }),+ ),+ description: i18nLabel(+ msg({+ message: `AI chat messages sent by the workspace member`,+ context: 'fieldMetadata.description',+ }),+ ),+ icon: 'IconMessage',+ isNullable: true,+ isUIEditable: false,+ targetObjectName: 'agentMessage',+ targetFieldName: 'senderWorkspaceMember',+ settings: {+ relationType: RelationType.ONE_TO_MANY,+ },+ },+ standardObjectMetadataRelatedEntityIds,+ dependencyFlatEntityMaps,+ twentyStandardApplicationId,+ now,+ }),agentChatThreads: createStandardRelationFieldFlatMetadata({objectName,workspaceId,diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-standard-flat-index-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-standard-flat-index-metadata.util.tsindex 229bbdb0155..030394d04d7 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-standard-flat-index-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-standard-flat-index-metadata.util.ts@@ -7,6 +7,15 @@ import {export const buildAgentMessageStandardFlatIndexMetadatas = (args: Omit<CreateStandardIndexArgs<'agentMessage'>, 'context'>,): Record<string, FlatIndexMetadata> => ({+ senderWorkspaceMemberIndex: createStandardIndexFlatMetadata({+ ...args,+ context: {+ indexName: 'senderWorkspaceMemberIndex',+ relatedFieldNames: ['senderWorkspaceMember'],+ isUnique: false,+ indexWhereClause: null,+ },+ }),agentIndex: createStandardIndexFlatMetadata({...args,context: {diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.tsindex 0ed3e3ad477..c1c03ea376d 100644--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts@@ -12,7 +12,7 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/userimport { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace/workspace.exception';import { ConnectedAccountOwnershipTransferService } from 'src/engine/metadata-modules/connected-account/services/connected-account-ownership-transfer.service';-import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import {@@ -34,7 +34,7 @@ export class WorkspaceMemberDeleteOnePostQueryHook implements WorkspacePostQueryprivate readonly userWorkspaceService: UserWorkspaceService,private readonly connectedAccountOwnershipTransferService: ConnectedAccountOwnershipTransferService,@InjectAgentHistoryRepository('agentChatThread')- private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,) {}async execute(diff --git a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.tsindex 720aefb7f9b..e487e3f9b23 100644--- a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts+++ b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts@@ -1,3 +1,4 @@+import { type AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';import { registerEnumType } from '@nestjs/graphql';import { type APP_LOCALES } from 'twenty-shared/translations';@@ -76,6 +77,8 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {CalendarEventParticipantWorkspaceEntity[]>;timelineActivities: Relation<TimelineActivityWorkspaceEntity[]>;+ agentMessages: Relation<AgentMessageWorkspaceEntity[]>;+agentChatThreads: Relation<AgentChatThreadWorkspaceEntity[]>;ownedOpportunities: Relation<OpportunityWorkspaceEntity[]>;searchVector: string;diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.tsindex cf7fc63fa29..54cff0f10fb 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts@@ -484,12 +484,14 @@ describe('Conversation sharing through the authenticated API', () => {chatService.archiveThread(owner),]);for (const retried of retriedArchives) {- expect(retried.deletedAt).toEqual(archived.deletedAt);+ expect(retried.archivedAt).toEqual(archived.archivedAt);expect(retried.updatedAt).toEqual(archived.updatedAt);}- expect(archived.deletedAt?.toISOString()).toMatch(/^\d{4}-\d{2}-\d{2}T/);- expect((await chatService.getWritableThread(owner)).deletedAt).toEqual(- archived.deletedAt,+ expect(new Date(archived.archivedAt!).toISOString()).toMatch(+ /^\d{4}-\d{2}-\d{2}T/,+ );+ expect((await chatService.getWritableThread(owner)).archivedAt).toEqual(+ archived.archivedAt,);expect((await chatService.getThreadsForUser(owner)).some(diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.tsindex 2fd53a5d0b0..1ad52431562 100644--- a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts+++ b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789914239896-migrate-agent-history-to-workspace.integration-spec.ts@@ -1,3 +1,4 @@+import { type EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command';import { randomUUID } from 'node:crypto';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';@@ -207,6 +208,15 @@ describe('versioned agent history upgrade (integration)', () => {await dataSource.query('DELETE FROM core."agentChatThread" WHERE id = $1', [threadId,]);+ await getAppProviderByClassName<EnableCommonRecordSharingCommand>(+ 'EnableCommonRecordSharingCommand',+ ).up({+ workspaceId: WORKSPACE_ID,+ dataSource,+ index: 0,+ total: 1,+ options: {},+ });expect(await describeAgentChatThreadTarget(dataSource)).toEqual(seededAgentChatThreadTarget,);diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-44-command-registration.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-44-command-registration.integration-spec.tsnew file mode 100644index 00000000000..80a411ab77e--- /dev/null+++ b/packages/twenty-server/test/integration/upgrade/suites/2-44-command-registration.integration-spec.ts@@ -0,0 +1,19 @@+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { type UpgradeCommandRegistryService } from 'src/engine/core-modules/upgrade/services/upgrade-command-registry.service';+import { type LinkChatMessageSendersToWorkspaceMembersCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790605326331-link-chat-message-senders-to-workspace-members.command';++it('discovers sender expansion through the application upgrade runner', () => {+ const registry = getAppProviderByClassName<UpgradeCommandRegistryService>(+ 'UpgradeCommandRegistryService',+ );+ const command =+ getAppProviderByClassName<LinkChatMessageSendersToWorkspaceMembersCommand>(+ 'LinkChatMessageSendersToWorkspaceMembersCommand',+ );+ expect(registry.getBundleForVersion('2.44.0').workspaceCommands).toEqual(+ expect.arrayContaining([+ expect.objectContaining({ command, timestamp: 1790605326331 }),+ ]),+ );+});diff --git a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snapindex c1306075a28..9093a426496 100644--- a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap+++ b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap@@ -174,6 +174,9 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e"senderUserWorkspaceId": {"universalIdentifier": "f4184c3a-b85c-4cef-8181-b2fefdf98fda",},+ "senderWorkspaceMember": {+ "universalIdentifier": "69bea8e1-451d-4c3c-9d34-505b5a67e06e",+ },"status": {"universalIdentifier": "3845ccfa-9394-4cb9-a75c-4ca704414b83",},@@ -194,6 +197,9 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e"hiddenKickoffIndex": {"universalIdentifier": "1d423c31-007a-4fcd-8514-dcb1f7a8fa78",},+ "senderWorkspaceMemberIndex": {+ "universalIdentifier": "8ecdac01-7bbe-411e-8461-6ff265c90759",+ },"threadIndex": {"universalIdentifier": "2054f1a5-554f-42ac-a41a-b8ccd6ba72ec",},@@ -4027,6 +4033,9 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e"agentChatThreads": {"universalIdentifier": "fbaf92a6-44ae-4b6d-9d10-2c15d84eaea1",},+ "agentMessages": {+ "universalIdentifier": "211b2717-450a-4f5f-808f-39695c819319",+ },"assignedTasks": {"universalIdentifier": "20202020-61dc-4a1c-99e8-38ebf8d2bbeb",},diff --git a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.tsindex a48f3ba0e5d..aa341b61e8e 100644--- a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts+++ b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts@@ -134,6 +134,9 @@ export const STANDARD_OBJECT_FIELDS = {STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.agentMessage,),agentId: { universalIdentifier: '880a91ad-4ab1-4067-87f6-970a53aa2234' },+ senderWorkspaceMember: {+ universalIdentifier: '69bea8e1-451d-4c3c-9d34-505b5a67e06e',+ },senderUserWorkspaceId: {universalIdentifier: 'f4184c3a-b85c-4cef-8181-b2fefdf98fda',},@@ -1557,6 +1560,9 @@ export const STANDARD_OBJECT_FIELDS = {timelineActivities: {universalIdentifier: '20202020-e15b-47b8-94fe-8200e3c66615',},+ agentMessages: {+ universalIdentifier: '211b2717-450a-4f5f-808f-39695c819319',+ },agentChatThreads: {universalIdentifier: 'fbaf92a6-44ae-4b6d-9d10-2c15d84eaea1',},diff --git a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object.constant.tsindex 9a71aa57c03..8fcdd5b6a72 100644--- a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts+++ b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts@@ -1477,6 +1477,9 @@ export const STANDARD_OBJECTS = {turnIndex: {universalIdentifier: 'dc46f804-a55f-4283-884e-9cb938741da3',},+ senderWorkspaceMemberIndex: {+ universalIdentifier: '8ecdac01-7bbe-411e-8461-6ff265c90759',+ },hiddenKickoffIndex: {universalIdentifier: '1d423c31-007a-4fcd-8514-dcb1f7a8fa78',},