The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(ai): retire runtime history routing and lifecycle state (#26754)
Félix Malfait51315ab328bf
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 cb1673189e7..d8545e5cf65 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,3 +1,4 @@+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';@@ -24,7 +25,6 @@ import { AdminPanelGlobalChatThreadsService } from 'src/engine/core-modules/admiimport { AdminChatThreadScope } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-scope.enum';import { AdminChatThreadSortDirection } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-sort-direction.enum';import { AdminChatThreadSortField } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-sort-field.enum';-import { AgentHistoryLifecycleService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service';import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace-data-source';import { WorkspaceSchemaTableManagerService } from 'src/engine/twenty-orm/workspace-schema-manager/services/workspace-schema-table-manager.service';import { generateColumnDefinitions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/generate-column-definitions.util';@@ -65,6 +65,9 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);synchronize: false,});const storage = new AgentHistoryStorageService(dataSource);+ const workspaceStorage = new AgentHistoryWorkspaceStorageService(+ dataSource,+ );const migrationState = new AgentHistoryMigrationStateService();const migration = new AgentHistoryMigrationService(dataSource,@@ -72,7 +75,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);new AgentHistoryMigrationDataService(),new AgentHistoryMigrationValidationService(),);- const lifecycle = new AgentHistoryLifecycleService(dataSource, storage);const pool = new Pool({ connectionString: DATABASE_URL });const { allFlatEntityMaps: metadata } =computeTwentyStandardApplicationAllFlatEntityMaps({@@ -539,6 +541,9 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);await expect(storage.run(WORKSPACE_ID, operation)).rejects.toThrow('being migrated',);+ await expect(+ workspaceStorage.run(WORKSPACE_ID, operation),+ ).rejects.toBeInstanceOf(ServiceUnavailableException);expect(operation).not.toHaveBeenCalled();expect((@@ -596,7 +601,45 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);expect(await readRoute()).toBe('core');});- it('refuses runtime access to history still stored in core', async () => {+ it('fails closed when the durable route is lost', async () => {+ await migration.migrate({+ workspaceId: WORKSPACE_ID,+ target: 'workspace',+ });+ await dataSource.query('DELETE FROM core."keyValuePair"');+ await expect(+ workspaceStorage.run(WORKSPACE_ID, ({ manager, table }) =>+ manager.query(`SELECT id FROM ${table('agentChatThread')}`),+ ),+ ).rejects.toBeInstanceOf(ServiceUnavailableException);+ await expect(+ workspaceStorage.runReadOnlyReport(+ [WORKSPACE_ID],+ async ({ partitions }) =>+ partitions.map(({ workspaceIds }) => workspaceIds),+ ),+ ).resolves.toEqual([]);+ });++ it('initializes empty new workspaces with a durable route for cleanup', async () => {+ await dataSource.query('TRUNCATE core."agentChatThread" CASCADE');+ await workspaceStorage.initializeWorkspace(WORKSPACE_ID);+ expect(await readRoute()).toBe('workspace');+ await expect(+ workspaceStorage.run(WORKSPACE_ID, async () => 'ready'),+ ).resolves.toBe('ready');+ await workspaceStorage.initializeWorkspace(WORKSPACE_ID);+ expect(await readRoute()).toBe('workspace');+ });++ it('does not mark legacy history as migrated during initialization', async () => {+ await workspaceStorage.initializeWorkspace(WORKSPACE_ID);+ await expect(+ workspaceStorage.run(WORKSPACE_ID, jest.fn()),+ ).rejects.toBeInstanceOf(ServiceUnavailableException);+ });++ it('preserves the legacy upgrade fence for history still stored in core', async () => {await expect(threads.find(WORKSPACE_ID, { where: { id: THREAD_ID } }),).rejects.toBeInstanceOf(ServiceUnavailableException);@@ -978,7 +1021,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);});it('does not create constraints referencing core tables', async () => {- await lifecycle.initializeWorkspace(WORKSPACE_ID);await migration.migrate({workspaceId: WORKSPACE_ID,target: 'workspace',@@ -1159,9 +1201,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);await expect(storage.run(WORKSPACE_ID, async () => undefined),).rejects.toThrow('Invalid agent history storage state');- await expect(lifecycle.initializeWorkspace(WORKSPACE_ID)).rejects.toThrow(- 'Invalid agent history storage state',- );await expect(migration.inspect(WORKSPACE_ID)).rejects.toThrow('Invalid agent history storage state',);@@ -1169,9 +1208,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);await expect(storage.run(WORKSPACE_ID, async () => undefined),).rejects.toThrow('route is missing');- await expect(lifecycle.initializeWorkspace(WORKSPACE_ID)).rejects.toThrow(- 'route is missing',- );await expect(migration.inspect(WORKSPACE_ID)).rejects.toThrow('route is missing',);@@ -1499,80 +1535,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);expect(await readRoute()).toBe('workspace');});- it('waits for an active runner before initialization and preserves its migration state', async () => {- const initializationDataSource = new DataSource({- type: 'postgres',- url: DATABASE_URL,- extra: { options: '-c lock_timeout=100ms' },- });- await initializationDataSource.initialize();- const initializer = new AgentHistoryLifecycleService(- initializationDataSource,- storage,- );- const runner = dataSource.createQueryRunner();- const key = `${AGENT_HISTORY_STORAGE_KEY}:runner:${WORKSPACE_ID}`;- await runner.connect();- try {- await runner.query('SELECT pg_advisory_lock(hashtextextended($1, 0))', [- key,- ]);- await expect(- initializer.initializeWorkspace(WORKSPACE_ID),- ).rejects.toThrow('lock timeout');- expect(- await runner.query(- 'SELECT value FROM core."keyValuePair" WHERE "workspaceId" = $1',- [WORKSPACE_ID],- ),- ).toEqual([]);- const state = {- storage: 'core' as const,- migration: {- phase: 'aborting' as const,- target: 'workspace' as const,- tableIndex: 0,- lastId: null,- },- };- await storage.writeState(runner, WORKSPACE_ID, state);- await runner.query(- 'SELECT pg_advisory_unlock(hashtextextended($1, 0))',- [key],- );- await initializer.initializeWorkspace(WORKSPACE_ID);- expect(await storage.readState(runner, WORKSPACE_ID)).toEqual(state);- } finally {- await runner.query('SELECT pg_advisory_unlock_all()');- await runner.release();- await initializationDataSource.destroy();- }- });-- it('defaults new empty workspaces to workspace storage without moving legacy history', async () => {- await lifecycle.initializeWorkspace(WORKSPACE_ID);- expect(await readRoute()).toBe('core');- await dataSource.query(- 'DELETE FROM core."keyValuePair" WHERE "workspaceId" = $1',- [WORKSPACE_ID],- );- for (const table of [...AGENT_HISTORY_TABLES].reverse())- await dataSource.query(`DELETE FROM core."${table.name}"`);- await lifecycle.initializeWorkspace(WORKSPACE_ID);- expect(await readRoute()).toBe('workspace');- await lifecycle.initializeWorkspace(WORKSPACE_ID);- expect(await readRoute()).toBe('workspace');- });-- it('ignores a legacy core default when provisioning a new empty workspace', async () => {- for (const table of [...AGENT_HISTORY_TABLES].reverse())- await dataSource.query(`DELETE FROM core."${table.name}"`);- await dataSource.query(- `INSERT INTO core."keyValuePair" ("key", "type", "value") VALUES ('agent-history-new-workspace-storage-v1', 'CONFIG_VARIABLE', '{"storage":"core"}'::jsonb)`,- );- await lifecycle.initializeWorkspace(WORKSPACE_ID);- expect(await readRoute()).toBe('workspace');- });it('does not allow copy to resume after an interrupted abort', async () => {const writeState = migrationState.writeState.bind(migrationState);const failCopy = jestdiff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migrate.command.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migrate.command.tsdeleted file mode 100644index ed5ed76518b..00000000000--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migrate.command.ts+++ /dev/null@@ -1,102 +0,0 @@-import { Command, Option } from 'nest-commander';--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,- type WorkspaceCommandOptions,-} from 'src/database/commands/command-runners/workspace.command-runner';-import { AgentHistoryMigrationService } from 'src/database/commands/agent-history/agent-history-migration.service';-import { AgentHistorySchemaService } from 'src/database/commands/agent-history/agent-history-schema.service';--type Options = WorkspaceCommandOptions & {- target?: 'core' | 'workspace';- batchSize?: number;- routingDeployed?: boolean;- abort?: boolean;-};--@Command({- name: 'agent-history:migrate',- description:- 'Prepare, copy, verify and switch AI history storage per workspace; rerun to resume',-})-export class AgentHistoryMigrateCommand extends ProvisionedWorkspaceCommandRunner<Options> {- constructor(- protected readonly workspaceIteratorService: WorkspaceIteratorService,- private readonly schema: AgentHistorySchemaService,- private readonly migration: AgentHistoryMigrationService,- ) {- super(workspaceIteratorService);- }-- @Option({- flags: '--target <storage>',- description: 'workspace (default) or core (verified rollback)',- })- parseTarget(value: string): 'core' | 'workspace' {- if (value !== 'core' && value !== 'workspace') {- throw new Error('Target must be core or workspace');- }- return value;- }-- @Option({- flags: '--batch-size <count>',- description: 'Rows per committed batch, from 1 to 10000 (default 1000)',- })- parseBatchSize(value: string): number {- const size = Number(value);- if (!Number.isInteger(size) || size < 1 || size > 10000) {- throw new Error('Invalid batch size');- }- return size;- }-- @Option({- flags: '--routing-deployed',- description:- 'Confirm every API server, worker and command runner runs migration-aware history persistence',- })- parseRoutingDeployed(): boolean {- return true;- }-- @Option({- flags: '--abort',- description:- 'Discard an incomplete destination copy and restore the unchanged source route',- })- parseAbort(): boolean {- return true;- }-- override async runOnWorkspace({- workspaceId,- options,- }: RunOnWorkspaceArgs<Options>): Promise<void> {- const dryRun = options.dryRun ?? false;- if (options.abort) {- await this.migration.abort({ workspaceId, dryRun });- return;- }- if (!dryRun && !options.routingDeployed) {- throw new Error(- 'Deploy all history routing code first, then pass --routing-deployed',- );- }- await this.schema.prepare(workspaceId, dryRun);- if (dryRun) {- await this.migration.inspect(workspaceId);- this.logger.log(- `[DRY RUN] Validated schema preparation for ${workspaceId}; no rows or routes changed`,- );- return;- }- await this.migration.migrate({- workspaceId,- target: options.target ?? 'workspace',- batchSize: options.batchSize ?? 1000,- });- }-}diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.exception.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.exception.tsindex 020c211fce2..7d0d8650a26 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.exception.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.exception.ts@@ -3,9 +3,12 @@ import { msg } from '@lingui/core/macro';import { CustomException } from 'src/utils/custom-exception';export class AgentHistoryMigrationStateException extends CustomException<- 'INVALID_STATE' | 'MISSING_STATE'+ 'INVALID_STATE' | 'MISSING_STATE' | 'INVALID_WORKSPACE'> {- constructor(code: 'INVALID_STATE' | 'MISSING_STATE', message: string) {+ constructor(+ code: 'INVALID_STATE' | 'MISSING_STATE' | 'INVALID_WORKSPACE',+ message: string,+ ) {super(message, code, {userFriendlyMessage: msg`Unable to access AI history. Please try again.`,});diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.service.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.service.tsindex 37c4dfb7405..2f29e141a7c 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.service.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-state.service.ts@@ -21,7 +21,7 @@ export class AgentHistoryMigrationStateService {return (await this.readStates(runner, [workspaceId])).get(workspaceId)!;}- private async readStates(+ protected async readStates(runner: Pick<QueryRunner, 'query'>,workspaceIds: string[],): Promise<Map<string, AgentHistoryMigrationState>> {diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration.module.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration.module.tsindex 5d26e426cf3..ce12987df64 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration.module.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration.module.ts@@ -1,10 +1,10 @@+import { AgentHistoryUpgradeStorageService } from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';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';import { AgentHistoryCleanupCommand } from 'src/database/commands/agent-history/agent-history-cleanup.command';import { Module } from '@nestjs/common';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';-import { AgentHistoryMigrateCommand } from 'src/database/commands/agent-history/agent-history-migrate.command';import { AgentHistoryMigrationService } from 'src/database/commands/agent-history/agent-history-migration.service';import { AgentHistorySchemaService } from 'src/database/commands/agent-history/agent-history-schema.service';import { AgentHistoryMigrationStateService } from 'src/database/commands/agent-history/agent-history-migration-state.service';@@ -14,6 +14,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace@Module({exports: [+ AgentHistoryUpgradeStorageService,AgentHistorySchemaService,AgentHistoryMigrationService,AgentHistoryMigrationStateService,@@ -25,8 +26,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceWorkspaceMigrationModule,],providers: [+ AgentHistoryUpgradeStorageService,AgentHistoryCleanupCommand,- AgentHistoryMigrateCommand,AgentHistoryMigrationService,AgentHistoryMigrationStateService,AgentHistoryMigrationDataService,diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-upgrade-storage.service.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-upgrade-storage.service.tsnew file mode 100644index 00000000000..334052ea2ad--- /dev/null+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-upgrade-storage.service.ts@@ -0,0 +1,119 @@+import { isDefined } from 'twenty-shared/utils';+import { AgentHistoryMigrationStateException } from 'src/database/commands/agent-history/agent-history-migration-state.exception';+import { type AGENT_HISTORY_TABLES } from 'src/database/commands/agent-history/agent-history-tables.constant';+import { Injectable, ServiceUnavailableException } from '@nestjs/common';+import { InjectDataSource } from '@nestjs/typeorm';+import { DataSource, type EntityManager } from 'typeorm';+import { isNonEmptyString } from '@sniptt/guards';++import { AGENT_HISTORY_MIGRATION_STORAGE_KEY } from 'src/database/commands/agent-history/agent-history-migration-storage-key.constant';+import { AgentHistoryMigrationStateService } from 'src/database/commands/agent-history/agent-history-migration-state.service';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';+import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';++export type AgentHistoryUpgradeStorageContext = {+ manager: EntityManager;+ table: (name: (typeof AGENT_HISTORY_TABLES)[number]['name']) => string;+};++const getWorkspaceAgentHistoryTable =+ (workspaceId: string) =>+ (name: (typeof AGENT_HISTORY_TABLES)[number]['name']) =>+ `${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier(name)}`;++@Injectable()+export class AgentHistoryUpgradeStorageService extends AgentHistoryMigrationStateService {+ constructor(@InjectDataSource() private readonly dataSource: DataSource) {+ super();+ }++ async run<TResult>(+ workspaceId: string,+ work: (context: AgentHistoryUpgradeStorageContext) => Promise<TResult>,+ ): Promise<TResult> {+ if (!isNonEmptyString(workspaceId)) {+ throw new AgentHistoryMigrationStateException(+ 'INVALID_WORKSPACE',+ 'Agent history requires a workspace ID',+ );+ }++ const runner = this.dataSource.createQueryRunner('master');+ try {+ await runner.connect();+ await runner.startTransaction();+ // The route cannot change between this primary read and the operation.+ await runner.query(+ 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',+ [`${AGENT_HISTORY_MIGRATION_STORAGE_KEY}:${workspaceId}`],+ );+ const state = await this.readState(runner, workspaceId);+ if (state.migration) {+ throw new ServiceUnavailableException(+ 'AI history is being migrated. Please retry shortly.',+ );+ }+ // History still in core belongs to a workspace whose 2.42 upgrade has+ // not finished. Serving the empty workspace tables would hide it, and+ // writing to them would be wiped when the copy resumes.+ if (state.storage !== 'workspace') {+ throw new ServiceUnavailableException(+ 'AI history is unavailable until this workspace finishes upgrading.',+ );+ }+ const result = await work({+ manager: runner.manager,+ table: getWorkspaceAgentHistoryTable(workspaceId),+ });+ await runner.commitTransaction();+ return result;+ } catch (error) {+ if (runner.isTransactionActive) {+ await runner.rollbackTransaction();+ }+ throw error;+ } finally {+ await runner.release();+ }+ }++ async runReadOnlyReport<TResult>(+ workspaceIds: string[],+ work: (context: {+ manager: EntityManager;+ partitions: {+ workspaceIds: string[];+ table: AgentHistoryUpgradeStorageContext['table'];+ }[];+ }) => Promise<TResult>,+ ): Promise<TResult> {+ const runner = this.dataSource.createQueryRunner('master');+ try {+ await runner.connect();+ // One MVCC snapshot sees both the route and its data before or after a+ // cutover. Reports need no per-workspace locks or second pool.+ await runner.startTransaction('REPEATABLE READ');+ await runner.query('SET TRANSACTION READ ONLY');+ const states = await this.readStates(runner, workspaceIds);+ const partitions = [...states]+ .filter(+ ([, state]) =>+ state.storage === 'workspace' && !isDefined(state.migration),+ )+ .map(([workspaceId]) => ({+ workspaceIds: [workspaceId],+ table: getWorkspaceAgentHistoryTable(workspaceId),+ }));+ const result = await work({ manager: runner.manager, partitions });+ await runner.commitTransaction();+ return result;+ } catch (error) {+ if (runner.isTransactionActive) {+ await runner.rollbackTransaction();+ }+ throw error;+ } finally {+ await runner.release();+ }+ }+}diff --git a/packages/twenty-server/src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util.ts b/packages/twenty-server/src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util.tsnew file mode 100644index 00000000000..c23a532d785--- /dev/null+++ b/packages/twenty-server/src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util.ts@@ -0,0 +1,37 @@+import { type EntityManager } from 'typeorm';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';+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 backfillLegacyChatThreadOwnerGrants = async ({+ manager,+ workspaceId,+ threadTableExpression,+ recordIds,+}: {+ manager: EntityManager;+ workspaceId: string;+ threadTableExpression: string;+ recordIds?: string[];+}): Promise<number> => {+ const schema = escapeIdentifier(getWorkspaceSchemaName(workspaceId));+ const inserted = await manager.query<{ id: string }[]>(+ `+ INSERT INTO ${schema}."recordShare"+ ("objectMetadataId", "recordId", "principalId", "principalType", "accessLevel", "rowCause", "sourceId")+ SELECT metadata.id, thread.id, member.id, 'WORKSPACE_MEMBER', 'FULL', 'OWNER', thread.id+ FROM ${threadTableExpression} thread+ JOIN core."userWorkspace" membership ON membership.id = thread."userWorkspaceId"+ AND membership."workspaceId" = $1 AND membership."deletedAt" IS NULL+ JOIN ${schema}."workspaceMember" member ON member."userId" = membership."userId" AND member."deletedAt" IS NULL+ JOIN core."objectMetadata" metadata ON metadata."workspaceId" = $1 AND metadata."universalIdentifier" = $2+ WHERE ($3::uuid[] IS NULL OR thread.id = ANY($3::uuid[]))+ ON CONFLICT DO NOTHING RETURNING id`,+ [+ workspaceId,+ STANDARD_OBJECTS.agentChatThread.universalIdentifier,+ recordIds ?? null,+ ],+ );+ return inserted.length;+};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.tsindex 64b5515001d..189b4601eb9 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command.ts@@ -4,7 +4,7 @@ import { BillingSubscriptionService } from 'src/engine/core-modules/billing/servimport { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';import { preserveLegacyRecordAccess } from 'src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util';import { isEmptyUnprovisionedAgentHistoryWorkspace } from 'src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util';-import { backfillChatThreadOwnerGrants } from 'src/engine/metadata-modules/ai/ai-chat/utils/backfill-chat-thread-owner-grants.util';+import { backfillLegacyChatThreadOwnerGrants as backfillChatThreadOwnerGrants } from 'src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util';import { Command } from 'nest-commander';import { MetadataReadability, MetadataWritability } from 'twenty-shared/types';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.tsindex 1b1db37ca87..285d5098aff 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/enable-common-record-sharing.command.spec.ts@@ -10,10 +10,10 @@ import { ServiceUnavailableException } from '@nestjs/common';import { EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command';import { isEmptyUnprovisionedAgentHistoryWorkspace } from 'src/database/commands/upgrade-version-command/2-43/utils/is-empty-unprovisioned-agent-history-workspace.util';-import { backfillChatThreadOwnerGrants } from 'src/engine/metadata-modules/ai/ai-chat/utils/backfill-chat-thread-owner-grants.util';+import { backfillLegacyChatThreadOwnerGrants as backfillChatThreadOwnerGrants } from 'src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util';jest.mock(- 'src/engine/metadata-modules/ai/ai-chat/utils/backfill-chat-thread-owner-grants.util',+ 'src/database/commands/agent-history/utils/backfill-legacy-chat-thread-owner-grants.util',);jest.mock(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 a0d89ae519a..f07eed17bf3 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-chat.service.ts@@ -1,7 +1,7 @@-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';-import { Injectable } from '@nestjs/common';+import { Inject, Injectable } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';@@ -17,7 +17,11 @@ import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/en@Injectable()export class AdminPanelChatService {constructor(- private readonly historyStorage: AgentHistoryStorageService,+ @Inject(AgentHistoryWorkspaceStorageService)+ private readonly historyStorage: Pick<+ AgentHistoryWorkspaceStorageService,+ 'runReadOnlyReport'+ >,@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,@InjectAgentHistoryRepository('agentChatThread')diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.tsindex c27fa57fab8..b2ac83a33dc 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service.ts@@ -1,9 +1,9 @@-import { Injectable } from '@nestjs/common';+import { Inject, Injectable } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';import { Repository } from 'typeorm';import { ASK_QUESTIONS_TOOL_NAME } from 'twenty-shared/ai';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { ADMIN_CHAT_THREADS_MAX_PAGE_SIZE } from 'src/engine/core-modules/admin-panel/constants/admin-chat-threads-max-page-size.constant';import { type PaginatedAdminChatThreadsDTO } from 'src/engine/core-modules/admin-panel/dtos/paginated-admin-chat-threads.dto';import { AdminChatThreadScope } from 'src/engine/core-modules/admin-panel/enums/admin-chat-thread-scope.enum';@@ -55,7 +55,11 @@ export class AdminPanelGlobalChatThreadsService {constructor(@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,- private readonly historyStorage: AgentHistoryStorageService,+ @Inject(AgentHistoryWorkspaceStorageService)+ private readonly historyStorage: Pick<+ AgentHistoryWorkspaceStorageService,+ 'runReadOnlyReport'+ >,) {}async getGlobalChatThreads(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 98a4b9187e7..265822e4454 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,7 +1,7 @@import { lockAgentChatThread } from 'src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util';import { In } from 'typeorm';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-storage.service';+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';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.tsindex 90ff75ff59e..1225d5b7e84 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service.ts@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';import { findAgentChatThreadTargetJoinColumnName } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-agent-chat-thread-target-join-column-name.util';-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import {AiException,AiExceptionCode,@@ -39,7 +39,7 @@ type ThreadRecordArgs = RecordReference & {export class AgentChatThreadTargetService {constructor(private readonly agentChatSharingService: AgentChatSharingService,- private readonly agentHistoryStorageService: AgentHistoryStorageService,+ private readonly agentHistoryStorageService: AgentHistoryWorkspaceStorageService,private readonly workspaceOrmManager: WorkspaceOrmManager,private readonly workspaceCacheService: WorkspaceCacheService,) {}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 f624c4da040..05f59d5fa1d 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,6 +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 { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+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,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.tsindex 0cc22be591d..9e3acb2974b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/ai-history.module.ts@@ -1,7 +1,6 @@import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';-import { AgentHistoryLifecycleService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service';import { Module } from '@nestjs/common';-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { getAgentHistoryRepositoryToken } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';@@ -9,23 +8,15 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.managerconst REPOSITORY_PROVIDERS = AGENT_HISTORY_OBJECT_NAMES.map((objectName) => ({provide: getAgentHistoryRepositoryToken(objectName),useFactory: (- storageService: AgentHistoryStorageService,+ storageService: AgentHistoryWorkspaceStorageService,workspaceOrmManager: WorkspaceOrmManager,) =>new AgentHistoryRepository(objectName, storageService, workspaceOrmManager),- inject: [AgentHistoryStorageService, WorkspaceOrmManager],+ inject: [AgentHistoryWorkspaceStorageService, WorkspaceOrmManager],}));@Module({- providers: [- AgentHistoryStorageService,- AgentHistoryLifecycleService,- ...REPOSITORY_PROVIDERS,- ],- exports: [- AgentHistoryStorageService,- AgentHistoryLifecycleService,- ...REPOSITORY_PROVIDERS,- ],+ providers: [AgentHistoryWorkspaceStorageService, ...REPOSITORY_PROVIDERS],+ exports: [AgentHistoryWorkspaceStorageService, ...REPOSITORY_PROVIDERS],})export class AgentHistoryModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.tsindex a710ecceded..529d7196ded 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant.ts@@ -1 +1 @@-export const AGENT_HISTORY_STORAGE_KEY = 'agent-history-storage-v1';+export { AGENT_HISTORY_MIGRATION_STORAGE_KEY as AGENT_HISTORY_STORAGE_KEY } from 'src/database/commands/agent-history/agent-history-migration-storage-key.constant';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 e8902614ab0..b33f90a90ff 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@@ -24,9 +24,9 @@ import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEimport { isDefined } from 'twenty-shared/utils';import {- type AgentHistoryStorageService,+ type AgentHistoryWorkspaceStorageService,type AgentHistoryStorageContext,-} from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+} from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';import {@@ -40,7 +40,10 @@ export class AgentHistoryRepository<> {constructor(private readonly name: AgentHistoryObjectName,- private readonly storageService: AgentHistoryStorageService,+ private readonly storageService: Pick<+ AgentHistoryWorkspaceStorageService,+ 'run'+ >,private readonly workspaceOrmManager: Pick<WorkspaceOrmManager,'executeInWorkspaceContext' | 'getRepository'diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-workspace-storage.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-workspace-storage.service.spec.tsnew file mode 100644index 00000000000..5c8b163462c--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-workspace-storage.service.spec.ts@@ -0,0 +1,74 @@+import { type DataSource } from 'typeorm';++import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';++const WORKSPACE_ID = '20202020-1111-4111-8111-111111111111';++describe('AgentHistoryWorkspaceStorageService', () => {+ const runner = {+ connect: jest.fn(),+ startTransaction: jest.fn(),+ commitTransaction: jest.fn(),+ rollbackTransaction: jest.fn(),+ release: jest.fn(),+ query: jest.fn(),+ manager: {},+ isTransactionActive: true,+ };+ const service = new AgentHistoryWorkspaceStorageService({+ createQueryRunner: () => runner,+ } as unknown as DataSource);++ beforeEach(() => {+ jest.clearAllMocks();+ runner.query.mockResolvedValue([{ ready: true }]);+ });++ it('uses workspace tables after checking upgrade readiness', async () => {+ const result = await service.run(WORKSPACE_ID, async ({ table }) => {+ expect(table('agentMessage')).toBe(+ `"${getWorkspaceSchemaName(WORKSPACE_ID)}"."agentMessage"`,+ );+ expect(runner.commitTransaction).not.toHaveBeenCalled();+ return 'saved';+ });++ expect(result).toBe('saved');+ expect(runner.query).toHaveBeenCalledTimes(2);+ expect(runner.commitTransaction).toHaveBeenCalledTimes(1);+ expect(runner.release).toHaveBeenCalledTimes(1);+ });++ it.each([[], undefined])(+ 'rejects incomplete upgrades before running domain writes (%s)',+ async (ready) => {+ runner.query.mockResolvedValueOnce([]).mockResolvedValueOnce(ready ?? []);+ const work = jest.fn();+ await expect(service.run(WORKSPACE_ID, work)).rejects.toThrow(+ 'finishes upgrading',+ );+ expect(work).not.toHaveBeenCalled();+ expect(runner.rollbackTransaction).toHaveBeenCalled();+ },+ );++ it('rolls back domain writes on failure', async () => {+ await expect(+ service.run(WORKSPACE_ID, async () => {+ throw new Error('write failed');+ }),+ ).rejects.toThrow('write failed');++ expect(runner.rollbackTransaction).toHaveBeenCalledTimes(1);+ expect(runner.commitTransaction).not.toHaveBeenCalled();+ expect(runner.release).toHaveBeenCalledTimes(1);+ });++ it('rejects an empty workspace scope before opening a transaction', async () => {+ await expect(service.run('', jest.fn())).rejects.toMatchObject({+ code: 'INVALID_WORKSPACE',+ });+ expect(runner.connect).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service.tsdeleted file mode 100644index 47f8de9623c..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service.ts+++ /dev/null@@ -1,53 +0,0 @@-import { Injectable } from '@nestjs/common';-import { InjectDataSource } from '@nestjs/typeorm';-import { DataSource } from 'typeorm';-import { isNonEmptyArray } from 'twenty-shared/utils';--import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';-import { AGENT_HISTORY_STORAGE_KEY } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant';--@Injectable()-export class AgentHistoryLifecycleService {- constructor(- @InjectDataSource() private readonly dataSource: DataSource,- private readonly storage: AgentHistoryStorageService,- ) {}-- async initializeWorkspace(workspaceId: string): Promise<void> {- await this.dataSource.transaction(async (manager) => {- const runner = manager.queryRunner!;- // Initialization must not select a route between a runner's initial read- // and its first fenced transition.- await runner.query(- 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',- [`${AGENT_HISTORY_STORAGE_KEY}:runner:${workspaceId}`],- );- await runner.query(- 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',- [`${AGENT_HISTORY_STORAGE_KEY}:${workspaceId}`],- );- const existing = await runner.query(- 'SELECT 1 FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = $2 AND "userId" IS NULL AND "applicationId" IS NULL',- [AGENT_HISTORY_STORAGE_KEY, workspaceId],- );- if (isNonEmptyArray(existing)) {- await this.storage.readState(runner, workspaceId);- return;- }- // Detect lost routes with workspace data before an initialization retry.- await this.storage.readState(runner, workspaceId);- // Initialization can be retried. Existing data must use verified migration.- const legacy = await runner.query(- 'SELECT 1 FROM core."agentChatThread" WHERE "workspaceId" = $1 LIMIT 1',- [workspaceId],- );- await this.storage.writeState(- runner,- workspaceId,- isNonEmptyArray(legacy)- ? { storage: 'core' }- : { storage: 'workspace', verifiedAt: new Date().toISOString() },- );- });- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.tsindex 32af03aa451..172bb7b5b8a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts@@ -1,204 +1,5 @@-import { isDefined } from 'twenty-shared/utils';-import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';-import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';-import { Injectable, ServiceUnavailableException } from '@nestjs/common';-import { InjectDataSource } from '@nestjs/typeorm';-import { DataSource, type EntityManager, type QueryRunner } from 'typeorm';-import { isNonEmptyString } from '@sniptt/guards';--import { AGENT_HISTORY_STORAGE_KEY } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-storage-key.constant';-import {- agentHistoryStorageStateSchema,- type AgentHistoryStorageState,-} from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type';-import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';-import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';--export type AgentHistoryStorageContext = {- manager: EntityManager;- table: (name: AgentHistoryObjectName) => string;-};--const getWorkspaceAgentHistoryTable =- (workspaceId: string) => (name: AgentHistoryObjectName) =>- `${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier(name)}`;--@Injectable()-export class AgentHistoryStorageService {- constructor(@InjectDataSource() private readonly dataSource: DataSource) {}-- async run<TResult>(- workspaceId: string,- work: (context: AgentHistoryStorageContext) => Promise<TResult>,- ): Promise<TResult> {- if (!isNonEmptyString(workspaceId)) {- throw new AgentHistoryStorageException(- 'INVALID_WORKSPACE',- 'Agent history requires a workspace ID',- );- }-- const runner = this.dataSource.createQueryRunner('master');- try {- await runner.connect();- await runner.startTransaction();- // The route cannot change between this primary read and the operation.- await runner.query(- 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',- [`${AGENT_HISTORY_STORAGE_KEY}:${workspaceId}`],- );- const state = await this.readState(runner, workspaceId);- if (state.migration) {- throw new ServiceUnavailableException(- 'AI history is being migrated. Please retry shortly.',- );- }- // History still in core belongs to a workspace whose 2.42 upgrade has- // not finished. Serving the empty workspace tables would hide it, and- // writing to them would be wiped when the copy resumes.- if (state.storage !== 'workspace') {- throw new ServiceUnavailableException(- 'AI history is unavailable until this workspace finishes upgrading.',- );- }- const result = await work({- manager: runner.manager,- table: getWorkspaceAgentHistoryTable(workspaceId),- });- await runner.commitTransaction();- return result;- } catch (error) {- if (runner.isTransactionActive) {- await runner.rollbackTransaction();- }- throw error;- } finally {- await runner.release();- }- }-- async readState(- runner: QueryRunner,- workspaceId: string,- ): Promise<AgentHistoryStorageState> {- return (await this.readStates(runner, [workspaceId])).get(workspaceId)!;- }-- private async readStates(- runner: QueryRunner,- workspaceIds: string[],- ): Promise<Map<string, AgentHistoryStorageState>> {- const rows: { workspaceId: string; type: string; value: unknown }[] =- await runner.query(- `SELECT "workspaceId", type, value FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = ANY($2::uuid[]) AND "userId" IS NULL AND "applicationId" IS NULL`,- [AGENT_HISTORY_STORAGE_KEY, workspaceIds],- );- const states = new Map<string, AgentHistoryStorageState>();- for (const row of rows) {- const parsed = agentHistoryStorageStateSchema.safeParse(row.value);- if (row.type !== 'CONFIG_VARIABLE' || !parsed.success) {- throw new AgentHistoryStorageException(- 'INVALID_STATE',- `Invalid agent history storage state for ${row.workspaceId}`,- );- }- states.set(row.workspaceId, parsed.data);- }- const missing = workspaceIds.filter((id) => !states.has(id));- if (missing.length) {- const prepared: { workspaceId: string; tableName: string }[] =- await runner.query(- `SELECT id AS "workspaceId", table_name AS "tableName" FROM unnest($1::uuid[], $2::text[]) AS candidate(id, table_name) WHERE to_regclass(table_name) IS NOT NULL`,- [- missing,- missing.map(- (id) =>- `${escapeIdentifier(getWorkspaceSchemaName(id))}."agentChatThread"`,- ),- ],- );- // A lost route must never silently expose an empty legacy snapshot after cleanup.- // Empty, never-routed stores remain indistinguishable during the expand release.- for (let offset = 0; offset < prepared.length; offset += 50) {- const batch = prepared.slice(offset, offset + 50);- const populated: { workspaceId: string }[] = await runner.query(- batch- .map(- ({ tableName }, index) =>- `SELECT $${index + 1}::uuid AS "workspaceId" WHERE EXISTS (SELECT 1 FROM ${tableName})`,- )- .join(' UNION ALL '),- batch.map(({ workspaceId }) => workspaceId),- );- if (populated.length) {- throw new AgentHistoryStorageException(- 'MISSING_STATE',- `Agent history route is missing for ${populated[0].workspaceId}; restore its durable state before serving traffic`,- );- }- }- for (const workspaceId of missing)- states.set(workspaceId, { storage: 'core' });- }- return states;- }-- async runReadOnlyReport<TResult>(- workspaceIds: string[],- work: (context: {- manager: EntityManager;- partitions: {- workspaceIds: string[];- table: AgentHistoryStorageContext['table'];- }[];- }) => Promise<TResult>,- ): Promise<TResult> {- const runner = this.dataSource.createQueryRunner('master');- try {- await runner.connect();- // One MVCC snapshot sees both the route and its data before or after a- // cutover. Reports need no per-workspace locks or second pool.- await runner.startTransaction('REPEATABLE READ');- await runner.query('SET TRANSACTION READ ONLY');- const states = await this.readStates(runner, workspaceIds);- const partitions = [...states]- .filter(- ([, state]) =>- state.storage === 'workspace' && !isDefined(state.migration),- )- .map(([workspaceId]) => ({- workspaceIds: [workspaceId],- table: getWorkspaceAgentHistoryTable(workspaceId),- }));- const result = await work({ manager: runner.manager, partitions });- await runner.commitTransaction();- return result;- } catch (error) {- if (runner.isTransactionActive) {- await runner.rollbackTransaction();- }- throw error;- } finally {- await runner.release();- }- }-- async writeState(- runner: QueryRunner,- workspaceId: string,- state: AgentHistoryStorageState,- ): Promise<void> {- const rows = await runner.query(- `INSERT INTO core."keyValuePair" ("key", "workspaceId", "type", "value") VALUES ($1, $2, 'CONFIG_VARIABLE', $3::jsonb)- ON CONFLICT ("key", "workspaceId") WHERE "userId" IS NULL AND "applicationId" IS NULL- DO UPDATE SET "value" = EXCLUDED."value", "updatedAt" = now() WHERE "keyValuePair".type = 'CONFIG_VARIABLE' RETURNING "key"`,- [AGENT_HISTORY_STORAGE_KEY, workspaceId, JSON.stringify(state)],- );- if (!rows.length) {- throw new AgentHistoryStorageException(- 'INVALID_STATE',- 'Agent history route conflicts with a non-configuration key',- );- }- }-}+// Shipped upgrade commands keep this import while live chat uses workspace storage.+export {+ AgentHistoryUpgradeStorageService as AgentHistoryStorageService,+ type AgentHistoryUpgradeStorageContext as AgentHistoryStorageContext,+} from 'src/database/commands/agent-history/agent-history-upgrade-storage.service';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.tsnew file mode 100644index 00000000000..547021142e0--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts@@ -0,0 +1,147 @@+import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';+import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';+import { Injectable, ServiceUnavailableException } from '@nestjs/common';+import { InjectDataSource } from '@nestjs/typeorm';+import { DataSource, type EntityManager } from 'typeorm';+import { isNonEmptyString } from '@sniptt/guards';++import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';+import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';++export type AgentHistoryStorageContext = {+ manager: EntityManager;+ table: (name: AgentHistoryObjectName) => string;+};++// Deployed upgrade commands use this key for their exclusive copy lock.+const HISTORY_READINESS_KEY = 'agent-history-storage-v1';++const getWorkspaceAgentHistoryTable =+ (workspaceId: string) => (name: AgentHistoryObjectName) =>+ `${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier(name)}`;++@Injectable()+export class AgentHistoryWorkspaceStorageService {+ constructor(@InjectDataSource() private readonly dataSource: DataSource) {}++ async initializeWorkspace(workspaceId: string): Promise<void> {+ await this.dataSource.transaction(async (manager) => {+ await manager.query(+ 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',+ [`${HISTORY_READINESS_KEY}:runner:${workspaceId}`],+ );+ await manager.query(+ 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',+ [`${HISTORY_READINESS_KEY}:${workspaceId}`],+ );+ // Never mark a lost route or a workspace with legacy history as migrated.+ await manager.query(+ `INSERT INTO core."keyValuePair" ("key", "workspaceId", type, value)+ SELECT $1, $2, 'CONFIG_VARIABLE', $3::jsonb+ WHERE NOT EXISTS (SELECT 1 FROM core."agentChatThread" WHERE "workspaceId" = $2)+ AND NOT EXISTS (SELECT 1 FROM ${getWorkspaceAgentHistoryTable(workspaceId)('agentChatThread')})+ ON CONFLICT ("key", "workspaceId") WHERE "userId" IS NULL AND "applicationId" IS NULL DO NOTHING`,+ [+ HISTORY_READINESS_KEY,+ workspaceId,+ JSON.stringify({+ storage: 'workspace',+ verifiedAt: new Date().toISOString(),+ }),+ ],+ );+ });+ }++ async run<TResult>(+ workspaceId: string,+ work: (context: AgentHistoryStorageContext) => Promise<TResult>,+ ): Promise<TResult> {+ if (!isNonEmptyString(workspaceId)) {+ throw new AgentHistoryStorageException(+ 'INVALID_WORKSPACE',+ 'Agent history requires a workspace ID',+ );+ }++ const runner = this.dataSource.createQueryRunner('master');+ try {+ await runner.connect();+ await runner.startTransaction();+ // A retried upgrade clears its destination; no live write may race that copy.+ await runner.query(+ 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',+ [`${HISTORY_READINESS_KEY}:${workspaceId}`],+ );+ const ready = await runner.query(+ `SELECT 1 FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = $2+ AND "userId" IS NULL AND "applicationId" IS NULL AND type = 'CONFIG_VARIABLE'+ AND value->>'storage' = 'workspace' AND NOT (value ? 'migration')`,+ [HISTORY_READINESS_KEY, workspaceId],+ );+ if (ready.length === 0) {+ throw new ServiceUnavailableException(+ 'AI history is unavailable until this workspace finishes upgrading.',+ );+ }+ const result = await work({+ manager: runner.manager,+ table: getWorkspaceAgentHistoryTable(workspaceId),+ });+ await runner.commitTransaction();+ return result;+ } catch (error) {+ if (runner.isTransactionActive) {+ await runner.rollbackTransaction();+ }+ throw error;+ } finally {+ await runner.release();+ }+ }++ async runReadOnlyReport<TResult>(+ workspaceIds: string[],+ work: (context: {+ manager: EntityManager;+ partitions: {+ workspaceIds: string[];+ table: AgentHistoryStorageContext['table'];+ }[];+ }) => Promise<TResult>,+ ): Promise<TResult> {+ const runner = this.dataSource.createQueryRunner('master');+ try {+ await runner.connect();+ await runner.startTransaction('REPEATABLE READ');+ await runner.query('SET TRANSACTION READ ONLY');+ // Unprovisioned workspaces have no history tables to include in reports.+ const provisioned: { workspaceId: string }[] = await runner.query(+ `SELECT id AS "workspaceId" FROM unnest($1::uuid[], $2::text[]) AS candidate(id, table_name) WHERE to_regclass(table_name) IS NOT NULL+ AND EXISTS (SELECT 1 FROM core."keyValuePair" state WHERE state."workspaceId" = candidate.id+ AND state."key" = $3 AND state."userId" IS NULL AND state."applicationId" IS NULL+ AND state.type = 'CONFIG_VARIABLE' AND state.value->>'storage' = 'workspace'+ AND NOT (state.value ? 'migration'))`,+ [+ workspaceIds,+ workspaceIds.map((workspaceId) =>+ getWorkspaceAgentHistoryTable(workspaceId)('agentChatThread'),+ ),+ HISTORY_READINESS_KEY,+ ],+ );+ const partitions = provisioned.map(({ workspaceId }) => ({+ workspaceIds: [workspaceId],+ table: getWorkspaceAgentHistoryTable(workspaceId),+ }));+ const result = await work({ manager: runner.manager, partitions });+ await runner.commitTransaction();+ return result;+ } catch (error) {+ if (runner.isTransactionActive) await runner.rollbackTransaction();+ throw error;+ } finally {+ await runner.release();+ }+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.tsindex e3964171f7d..2ff291e9062 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type.ts@@ -1,28 +1,5 @@-import { z } from 'zod';-import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';--export const agentHistoryStorageStateSchema = z- .object({- storage: z.enum(['core', 'workspace']),- migration: z- .object({- phase: z.enum(['clearing', 'copying', 'aborting']),- target: z.enum(['core', 'workspace']),- tableIndex: z- .number()- .int()- .min(0)- .max(AGENT_HISTORY_OBJECT_NAMES.length),- lastId: z.string().uuid().nullable(),- })- .optional(),- verifiedAt: z.string().datetime().optional(),- cleanedAt: z.string().datetime().optional(),- })- .refine(- (state) => !state.migration || state.migration.target !== state.storage,- );--export type AgentHistoryStorageState = z.infer<- typeof agentHistoryStorageStateSchema->;+// Frozen compatibility exports for shipped upgrade commands.+export {+ agentHistoryMigrationStateSchema as agentHistoryStorageStateSchema,+ type AgentHistoryMigrationState as AgentHistoryStorageState,+} from 'src/database/commands/agent-history/agent-history-migration-state.type';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util.tsindex 7224ca4889a..e765fddb86d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util.ts@@ -3,7 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';import { type ObjectLiteral } from 'typeorm';-import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.tsindex 0997dde59e2..b150a4be571 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts@@ -1,7 +1,6 @@import { backfillChatThreadOwnerGrants } from 'src/engine/metadata-modules/ai/ai-chat/utils/backfill-chat-thread-owner-grants.util';-import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';-import { AgentHistoryLifecycleService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service';import { Injectable } from '@nestjs/common';import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';@@ -62,8 +61,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspa@Injectable()export class DevSeederService {constructor(- private readonly agentHistoryLifecycleService: AgentHistoryLifecycleService,- private readonly agentHistoryStorageService: AgentHistoryStorageService,+ private readonly agentHistoryStorageService: AgentHistoryWorkspaceStorageService,private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,private readonly twentyConfigService: TwentyConfigService,private readonly workspaceSchemaService: WorkspaceSchemaService,@@ -136,7 +134,7 @@ export class DevSeederService {},);- await this.agentHistoryLifecycleService.initializeWorkspace(workspaceId);+ await this.agentHistoryStorageService.initializeWorkspace(workspaceId);await this.sdkClientGenerationService.generateSdkClientForApplication({workspaceId,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.tsindex b6de18dd243..400f394938b 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts@@ -1,4 +1,4 @@-import { AgentHistoryLifecycleService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-lifecycle.service';+import { AgentHistoryWorkspaceStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';import { Injectable, Logger } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';@@ -23,6 +23,7 @@ export class WorkspaceManagerService {private readonly logger = new Logger(WorkspaceManagerService.name);constructor(+ private readonly agentHistoryStorageService: AgentHistoryWorkspaceStorageService,private readonly workspaceSchemaService: WorkspaceSchemaService,@InjectRepository(UserWorkspaceEntity)private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,@@ -34,7 +35,6 @@ export class WorkspaceManagerService {@InjectWorkspaceScopedRepository(RoleEntity)private readonly roleRepository: WorkspaceScopedRepository<RoleEntity>,private readonly applicationService: ApplicationService,- private readonly agentHistoryLifecycleService: AgentHistoryLifecycleService,) {}public async init({@@ -71,8 +71,7 @@ export class WorkspaceManagerService {},);- // A route can select workspace storage only after its tables exist.- await this.agentHistoryLifecycleService.initializeWorkspace(workspaceId);+ await this.agentHistoryStorageService.initializeWorkspace(workspaceId);const dataSourceMetadataCreationEnd = performance.now();diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.tsindex b1e6393bb17..1c5e9830e2d 100644--- a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-chat-threads.integration-spec.ts@@ -252,7 +252,7 @@ describe('Admin panel global chat threads (integration)', () => {beforeAll(async () => {dataSource = global.testDataSource;storage = getAppProviderByClassName<AgentHistoryStorageService>(- 'AgentHistoryStorageService',+ 'AgentHistoryUpgradeStorageService',);const [firstUserWorkspace] = await dataSource.query(diff --git a/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.tsindex acf66b2a2cd..3cd37b4c92f 100644--- a/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts@@ -164,7 +164,7 @@ describe('Persisted chat senders', () => {await command.up(args);await command.down(args);const storage = getAppProviderByClassName<AgentHistoryStorageService>(- 'AgentHistoryStorageService',+ 'AgentHistoryUpgradeStorageService',);const records = await storage.run(workspaceId, ({ manager, table }) =>manager.query(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 1a3bd1d3ddf..cf7fc63fa29 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@@ -435,7 +435,7 @@ describe('Conversation sharing through the authenticated API', () => {{} as never,cache,getAppProviderByClassName<AgentHistoryStorageService>(- 'AgentHistoryStorageService',+ 'AgentHistoryUpgradeStorageService',),getAppProviderByClassName<WorkspaceMigrationValidateBuildAndRunService>('WorkspaceMigrationValidateBuildAndRunService',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 8ff92e610c2..2fd53a5d0b0 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@@ -104,7 +104,7 @@ describe('versioned agent history upgrade (integration)', () => {'WorkspaceOrmManager',);storage = getAppProviderByClassName<AgentHistoryStorageService>(- 'AgentHistoryStorageService',+ 'AgentHistoryUpgradeStorageService',);heartbeat = getAppProviderByClassName<AgentChatStreamHeartbeatService>('AgentChatStreamHeartbeatService',