Skip to content

The open alternative to Salesforce, designed for AI.

refactor(ai): remove transitional sender insert preparation (#26753)

Félix Malfait8ab8bbc678e4
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.ts
index d8545e5cf65..436e554b2e0 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
@@ -775,10 +775,13 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
expect(emitDatabaseBatchEvent).not.toHaveBeenCalled();
});
- it('writes and resolves owner messages while workspace sender fields are still absent', async () => {
- const legacyMessages = await prepareLegacyMessages();
- const chat = createChatService(legacyMessages);
- const actors = createActorService(legacyMessages);
+ it('persists senders for normal, queued and hidden kickoff messages after schema expansion', async () => {
+ await migration.migrate({
+ workspaceId: WORKSPACE_ID,
+ target: 'workspace',
+ });
+ const chat = createChatService(messages);
+ const actors = createActorService(messages);
const thread = await threads.insertAndReturnOne(WORKSPACE_ID, {
userWorkspaceId: OWNER_ID,
});
@@ -786,7 +789,7 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
workspaceId: WORKSPACE_ID,
userWorkspaceId: OWNER_ID,
threadId: thread.id,
- text: 'Setup during deploy',
+ text: 'Setup after upgrade',
});
const message = await chat.addMessage({
workspaceId: WORKSPACE_ID,
@@ -794,14 +797,14 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
threadId: thread.id,
uiMessage: {
role: AgentMessageRole.USER,
- parts: [{ type: 'text', text: 'Live message during deploy' }],
+ parts: [{ type: 'text', text: 'Live message after upgrade' }],
},
});
const queued = await chat.queueMessage({
workspaceId: WORKSPACE_ID,
userWorkspaceId: OWNER_ID,
threadId: thread.id,
- text: 'Queued during deploy',
+ text: 'Queued after upgrade',
});
await chat.promoteQueuedMessage({
workspaceId: WORKSPACE_ID,
@@ -819,23 +822,25 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
sender: { userWorkspaceId: OWNER_ID, applicationId: null },
});
}
- const saved = await legacyMessages.findOneOrFail(WORKSPACE_ID, {
+ const saved = await messages.findOneOrFail(WORKSPACE_ID, {
where: { id: message.id },
relations: { parts: true },
});
- expect(saved.parts[0].textContent).toBe('Live message during deploy');
+ expect(saved.senderUserWorkspaceId).toBe(OWNER_ID);
+ expect(saved.parts[0].textContent).toBe('Live message after upgrade');
expect(
- await legacyMessages.findOneOrFail(WORKSPACE_ID, {
+ await messages.findOneOrFail(WORKSPACE_ID, {
where: { id: queued.id },
}),
).toMatchObject({ status: AgentMessageStatus.SENT });
});
it.each([
+ { senderUserWorkspaceId: OWNER_ID, senderApplicationId: null },
{ senderUserWorkspaceId: THREAD_ID, senderApplicationId: null },
{ senderUserWorkspaceId: OWNER_ID, senderApplicationId: TURN_ID },
])(
- 'refuses to discard unrecoverable attribution on an old workspace: %o',
+ 'requires expanded metadata before accepting sender writes: %o',
async (sender) => {
const legacyMessages = await prepareLegacyMessages();
const count = await legacyMessages.count(WORKSPACE_ID);
@@ -849,22 +854,25 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
},
{ threadId: THREAD_ID, role: AgentMessageRole.USER, ...sender },
]),
- ).rejects.toThrow('Chat sender attribution is being upgraded');
+ ).rejects.toThrow(
+ 'Complete upgrade:2-43:attribute-chat-message-senders',
+ );
expect(await legacyMessages.count(WORKSPACE_ID)).toBe(count);
},
);
- it('preserves available sender fields during partial expansion and resumes full attribution after upgrade', async () => {
+ it('rejects incomplete sender expansion and persists full attribution after upgrade', async () => {
const legacyMessages = await prepareLegacyMessages([
'senderApplicationId',
]);
- const legacy = await legacyMessages.insertAndReturnOne(WORKSPACE_ID, {
- threadId: THREAD_ID,
- role: AgentMessageRole.USER,
- senderUserWorkspaceId: TURN_ID,
- senderApplicationId: null,
- });
- expect(legacy.senderUserWorkspaceId).toBe(TURN_ID);
+ await expect(
+ legacyMessages.insertAndReturnOne(WORKSPACE_ID, {
+ threadId: THREAD_ID,
+ role: AgentMessageRole.USER,
+ senderUserWorkspaceId: TURN_ID,
+ senderApplicationId: null,
+ }),
+ ).rejects.toThrow('Complete upgrade:2-43:attribute-chat-message-senders');
await dataSource.query(
`ALTER TABLE "${SCHEMA}"."agentMessage" ADD COLUMN "senderApplicationId" uuid`,
);
@@ -885,10 +893,29 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
});
});
- it('still rejects unrelated unknown fields on an old workspace', async () => {
- const legacyMessages = await prepareLegacyMessages();
+ it('preserves the owner fallback for historical null-sender messages', async () => {
+ await migration.migrate({
+ workspaceId: WORKSPACE_ID,
+ target: 'workspace',
+ });
+ await expect(
+ createActorService(messages).resolveMessage({
+ workspaceId: WORKSPACE_ID,
+ threadId: THREAD_ID,
+ messageId: MESSAGE_ID,
+ }),
+ ).resolves.toMatchObject({
+ sender: { userWorkspaceId: OWNER_ID, applicationId: null },
+ });
+ });
+
+ it('still rejects unrelated unknown fields after sender expansion', async () => {
+ await migration.migrate({
+ workspaceId: WORKSPACE_ID,
+ target: 'workspace',
+ });
await expect(
- legacyMessages.insert(WORKSPACE_ID, {
+ messages.insert(WORKSPACE_ID, {
threadId: THREAD_ID,
role: AgentMessageRole.USER,
unexpectedField: null,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
index b33f90a90ff..4e51a907962 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,10 +1,10 @@
+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 { prepareAgentMessageSenderValues } from 'src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util';
import { mapAgentHistoryOrderToWorkspace } from 'src/engine/metadata-modules/ai/ai-history/utils/map-agent-history-order-to-workspace.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';
@@ -178,33 +178,26 @@ export class AgentHistoryRepository<
);
}
- private async prepareWorkspaceInsert(
- values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
- context: AgentHistoryStorageContext,
- ): Promise<ObjectLiteral | ObjectLiteral[]> {
- const mapped = mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values);
-
- return this.name === 'agentMessage'
- ? prepareAgentMessageSenderValues(mapped, context)
- : mapped;
- }
-
insert(
workspaceId: string,
values: QueryDeepPartialEntity<TRecord> | QueryDeepPartialEntity<TRecord>[],
) {
- return this.run(workspaceId, async (repository, context) =>
- repository.insert(await this.prepareWorkspaceInsert(values, context)),
- );
+ return this.run(workspaceId, (repository) => {
+ if (this.name === 'agentMessage') assertAgentMessageSenderFields();
+ return repository.insert(
+ mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),
+ );
+ });
}
insertAndReturnOne(
workspaceId: string,
values: QueryDeepPartialEntity<TRecord>,
): Promise<TRecord> {
- return this.run(workspaceId, async (repository, context) => {
+ return this.run(workspaceId, async (repository) => {
+ if (this.name === 'agentMessage') assertAgentMessageSenderFields();
const result = await repository.insert(
- await this.prepareWorkspaceInsert(values, context),
+ mapAgentHistoryValuesToWorkspace<TRecord>(this.name, values),
);
return normalizeAgentHistoryRecord({
record: result.raw[0],
@@ -271,6 +264,7 @@ 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),
conflictPaths,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts
new file mode 100644
index 00000000000..cdb730ec69a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/assert-agent-message-sender-fields.util.ts
@@ -0,0 +1,30 @@
+import { ServiceUnavailableException } from '@nestjs/common';
+import { isDefined } from 'twenty-shared/utils';
+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';
+
+export const assertAgentMessageSenderFields = (): void => {
+ const {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ objectIdByNameSingular,
+ } = getWorkspaceContext();
+ const object = findFlatEntityByIdInFlatEntityMapsOrThrow({
+ flatEntityId: objectIdByNameSingular.agentMessage,
+ flatEntityMaps: flatObjectMetadataMaps,
+ });
+ const { fieldIdByName } = buildFieldMapsFromFlatObjectMetadata(
+ flatFieldMetadataMaps,
+ object,
+ );
+ const missingFields = (
+ ['senderUserWorkspaceId', 'senderApplicationId'] as const
+ ).filter((field) => !isDefined(fieldIdByName[field]));
+
+ if (missingFields.length > 0) {
+ throw new ServiceUnavailableException(
+ 'Chat sender attribution is not ready. Complete upgrade:2-43:attribute-chat-message-senders for this workspace and retry.',
+ );
+ }
+};
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.ts
deleted file mode 100644
index e765fddb86d..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/prepare-agent-message-sender-values.util.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ServiceUnavailableException } from '@nestjs/common';
-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-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';
-
-export const prepareAgentMessageSenderValues = async (
- values: ObjectLiteral | ObjectLiteral[],
- context: AgentHistoryStorageContext,
-): Promise<ObjectLiteral | ObjectLiteral[]> => {
- const {
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- objectIdByNameSingular,
- } = getWorkspaceContext();
- const object = findFlatEntityByIdInFlatEntityMapsOrThrow({
- flatEntityId: objectIdByNameSingular.agentMessage,
- flatEntityMaps: flatObjectMetadataMaps,
- });
- const { fieldIdByName } = buildFieldMapsFromFlatObjectMetadata(
- flatFieldMetadataMaps,
- object,
- );
- const missingFields = (
- ['senderUserWorkspaceId', 'senderApplicationId'] as const
- ).filter((field) => !isDefined(fieldIdByName[field]));
-
- if (missingFields.length === 0) {
- return values;
- }
-
- const prepare = async (message: ObjectLiteral): Promise<ObjectLiteral> => {
- const unavailable = () =>
- new ServiceUnavailableException(
- 'Chat sender attribution is being upgraded. Please retry shortly.',
- );
-
- // Workspace upgrades trail server deployment. Legacy messages can recover
- // their owner from the thread, but cannot recover another sender or an app.
- if (
- missingFields.includes('senderApplicationId') &&
- isDefined(message.senderApplicationId)
- ) {
- throw unavailable();
- }
-
- if (
- missingFields.includes('senderUserWorkspaceId') &&
- isDefined(message.senderUserWorkspaceId)
- ) {
- if (!isNonEmptyString(message.threadId)) {
- throw unavailable();
- }
- const [thread]: { userWorkspaceId: string }[] =
- await context.manager.query(
- `SELECT "userWorkspaceId" FROM ${context.table('agentChatThread')} WHERE id = $1`,
- [message.threadId],
- );
- if (thread?.userWorkspaceId !== message.senderUserWorkspaceId) {
- throw unavailable();
- }
- }
-
- return Object.fromEntries(
- Object.entries(message).filter(
- ([field]) => !missingFields.some((missing) => missing === field),
- ),
- );
- };
-
- return Array.isArray(values)
- ? Promise.all(values.map(prepare))
- : prepare(values);
-};