Skip to content

The open alternative to Salesforce, designed for AI.

Stop using the dead deletedAt column on agent (#29121)

Félix Malfait138c95fb0396
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-instance-command-slow-1793272266091-purge-soft-deleted-agents.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-instance-command-slow-1793272266091-purge-soft-deleted-agents.ts
new file mode 100644
index 00000000000..0f7a9a3f65b
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-instance-command-slow-1793272266091-purge-soft-deleted-agents.ts
@@ -0,0 +1,23 @@
+import { type DataSource, type QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { type SlowInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/slow-instance-command.interface';
+
+@RegisteredInstanceCommand('2.54.0', 1793272266091, { type: 'slow' })
+export class PurgeSoftDeletedAgentsSlowInstanceCommand implements SlowInstanceCommand {
+ // 2.54 stops filtering on deletedAt, so soft-deleted agents would come back live
+ async runDataMigration(dataSource: DataSource): Promise<void> {
+ await dataSource.query(
+ 'DELETE FROM "core"."agent" WHERE "deletedAt" IS NOT NULL',
+ );
+ }
+
+ public async up(_queryRunner: QueryRunner): Promise<void> {
+ return;
+ }
+
+ // Deleted soft-deleted agents are not restored
+ public async down(_queryRunner: QueryRunner): Promise<void> {
+ return;
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
index 5c174c7bb9b..64281831f06 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
@@ -265,6 +265,7 @@ import { AddMessagingProviderFastInstanceCommand } from 'src/database/commands/u
import { AddMcpServerFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-53/2-53-instance-command-fast-1793150000000-add-mcp-server';
import { AgentAndSkillOverridableEntityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-53/2-53-instance-command-fast-1793203146887-agent-and-skill-overridable-entity';
import { DropIsCustomFromAgentSkillViewIndexAndAgentChatChannelFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-instance-command-fast-1793139794914-drop-is-custom-from-agent-skill-view-index-and-agent-chat-channel';
+import { PurgeSoftDeletedAgentsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-instance-command-slow-1793272266091-purge-soft-deleted-agents';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -532,4 +533,5 @@ export const INSTANCE_COMMANDS = [
AgentAndSkillOverridableEntityFastInstanceCommand,
DropIsCustomFromAgentSkillViewIndexAndAgentChatChannelFastInstanceCommand,
AddFieldMetadataDisabledFieldPermissionActionsFastInstanceCommand,
+ PurgeSoftDeletedAgentsSlowInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
index 34b86bcc13a..e30974e532a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/reconstruct-agents-manifest.util.spec.ts
@@ -42,8 +42,6 @@ const WORKSPACE_ROLE_AGENT_UNIVERSAL_IDENTIFIER =
'30000000-0000-4000-8000-000000000006';
const CONFIGURED_AGENT_UNIVERSAL_IDENTIFIER =
'30000000-0000-4000-8000-000000000007';
-const DELETED_AGENT_UNIVERSAL_IDENTIFIER =
- '30000000-0000-4000-8000-000000000008';
const FOREIGN_AGENT_UNIVERSAL_IDENTIFIER =
'30000000-0000-4000-8000-000000000009';
const UNASSIGNED_AGENT_UNIVERSAL_IDENTIFIER =
@@ -172,7 +170,6 @@ const applicationAgents = [
modelConfiguration: { webSearch: { enabled: true } },
isSystem: true,
}),
- buildFlatAgent(DELETED_AGENT_UNIVERSAL_IDENTIFIER, { deletedAt: NOW }),
buildFlatAgent(UNASSIGNED_AGENT_UNIVERSAL_IDENTIFIER),
];
const applicationRoles = [
@@ -210,10 +207,6 @@ const applicationRoleTargets = [
roleUniversalIdentifier: SUPPORT_ROLE_UNIVERSAL_IDENTIFIER,
universalIdentifier: WORKSPACE_ROLE_TARGET_UNIVERSAL_IDENTIFIER,
}),
- buildFlatRoleTarget({
- agentUniversalIdentifier: DELETED_AGENT_UNIVERSAL_IDENTIFIER,
- roleUniversalIdentifier: SUPPORT_ROLE_UNIVERSAL_IDENTIFIER,
- }),
buildFlatRoleTarget({
agentUniversalIdentifier: FOREIGN_AGENT_UNIVERSAL_IDENTIFIER,
roleUniversalIdentifier: SUPPORT_ROLE_UNIVERSAL_IDENTIFIER,
@@ -353,12 +346,6 @@ describe('reconstructAgentsManifest', () => {
},
);
- it('should leave a soft-deleted agent to the classifier', () => {
- expect(
- findCoverage('agent', DELETED_AGENT_UNIVERSAL_IDENTIFIER),
- ).toBeUndefined();
- });
-
it.each([
[
roleTargetUniversalIdentifierOf(
@@ -374,10 +361,6 @@ describe('reconstructAgentsManifest', () => {
WORKSPACE_ROLE_TARGET_UNIVERSAL_IDENTIFIER,
'role target of an agent that is not exported',
],
- [
- roleTargetUniversalIdentifierOf(DELETED_AGENT_UNIVERSAL_IDENTIFIER),
- 'role target of an agent that is not exported',
- ],
[
roleTargetUniversalIdentifierOf(FOREIGN_AGENT_UNIVERSAL_IDENTIFIER),
'role target of an agent outside the application',
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-agents-manifest.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-agents-manifest.util.ts
index bce8943130d..1e0bd6dec11 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-agents-manifest.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-agents-manifest.util.ts
@@ -130,11 +130,6 @@ export const reconstructAgentsManifest = ({
for (const flatAgent of sortFlatEntitiesByUniversalIdentifier(
applicationAllFlatEntityMaps.flatAgentMaps,
)) {
- // Left to the classifier, which reports soft-deleted entities as excluded
- if (isDefined(flatAgent.deletedAt)) {
- continue;
- }
-
const conversion = convertFlatAgent({
flatAgent,
flatRoleTargets:
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
index 66e3bbea093..c0a43080e9c 100644
--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
@@ -234,15 +234,13 @@ export class DataloaderService {
return {
flatEntityMaps: flatAgentMaps,
toDtos: (flatAgents: FlatAgent[]) =>
- flatAgents
- .filter((flatAgent) => !isDefined(flatAgent.deletedAt))
- .map((flatAgent) =>
- fromFlatAgentWithRoleIdToAgentDto({
- ...flatAgent,
- roleId:
- flatRoleTargetByAgentIdMaps[flatAgent.id]?.roleId ?? null,
- }),
- ),
+ flatAgents.map((flatAgent) =>
+ fromFlatAgentWithRoleIdToAgentDto({
+ ...flatAgent,
+ roleId:
+ flatRoleTargetByAgentIdMaps[flatAgent.id]?.roleId ?? null,
+ }),
+ ),
};
},
});
@@ -1180,10 +1178,8 @@ export class DataloaderService {
flatEntityIds: agentIds,
flatEntityMaps: flatAgentMaps,
})
- .filter(
- (flatAgent) =>
- !isDefined(flatAgent.deletedAt) &&
- isDefined(flatApplicationMaps.byId[flatAgent.applicationId]),
+ .filter((flatAgent) =>
+ isDefined(flatApplicationMaps.byId[flatAgent.applicationId]),
)
.map((flatAgent) =>
fromFlatAgentWithRoleIdToAgentDto({ ...flatAgent, roleId }),
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/utils/find-active-agent-triggers.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/utils/find-active-agent-triggers.util.ts
index 106c7d763ad..61c712ab4ad 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/utils/find-active-agent-triggers.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/utils/find-active-agent-triggers.util.ts
@@ -17,7 +17,6 @@ export const findActiveAgentTriggers = <TTriggerType extends AgentTriggerType>({
}): FlatAgentWithTrigger<Extract<AgentTrigger, { type: TTriggerType }>>[] =>
Object.values(flatAgentMaps.byUniversalIdentifier)
.filter(isDefined)
- .filter((flatAgent) => !isDefined(flatAgent.deletedAt))
.map((flatAgent) => resolveEffectiveAgent(flatAgent))
.filter((flatAgent) => flatAgent.isActive)
.flatMap((flatAgent) =>
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
index 332ba3dfb74..a093dbf7851 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
@@ -1,7 +1,6 @@
import {
Column,
CreateDateColumn,
- DeleteDateColumn,
Entity,
Index,
PrimaryGeneratedColumn,
@@ -35,6 +34,7 @@ export type AgentOverrides = {
};
@Entity('agent')
+// Both indexes go with the deletedAt column in 2.55
@Index('IDX_AGENT_ID_DELETED_AT', ['id', 'deletedAt'])
@Index('IDX_AGENT_NAME_WORKSPACE_ID_UNIQUE', ['name', 'workspaceId'], {
unique: true,
@@ -93,7 +93,7 @@ export class AgentEntity
@UpdateDateColumn({ type: 'timestamptz' })
updatedAt: Date;
- @DeleteDateColumn({ type: 'timestamptz' })
+ @Column({ nullable: true, type: 'timestamptz' })
deletedAt: Date | null;
@Column({ nullable: true, type: 'jsonb' })
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
index 1fce5e71a99..a2fb43dec62 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
@@ -624,13 +624,6 @@ export class RoleService {
const activeApiKeyIds = new Set(activeApiKeys.flat().map(({ id }) => id));
- const softDeletedAgentIds = new Set(
- Object.values(flatAgentMaps.byUniversalIdentifier)
- .filter(isDefined)
- .filter(({ deletedAt }) => isDefined(deletedAt))
- .map(({ id }) => id),
- );
-
const flatRoleTargetsToDelete = Object.values(
flatRoleTargetMaps.byUniversalIdentifier,
).filter(
@@ -647,9 +640,7 @@ export class RoleService {
if (
!isDefined(targetId) ||
(targetMetadataForeignKey === 'apiKeyId' &&
- !activeApiKeyIds.has(targetId)) ||
- (targetMetadataForeignKey === 'agentId' &&
- softDeletedAgentIds.has(targetId))
+ !activeApiKeyIds.has(targetId))
) {
return [];
}