From 3a6621ef6c1d6ab40337615a9ea8b9521d759167 Mon Sep 17 00:00:00 2001
From: Abdul Rahman <81605929+abdulrahmancodes@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:33:27 +0530
Subject: [PATCH] Fix agent sync failing due to non-existent AgentEntity
 property (#15051)

---
 ...nsform-standard-agent-definition-to-flat-agent.util.ts | 8 +++++++-
 .../services/workspace-sync-agent.service.ts              | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-standard-agent-definition-to-flat-agent.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-standard-agent-definition-to-flat-agent.util.ts
index f2cd34ffde..ffb41ac504 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-standard-agent-definition-to-flat-agent.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-agent/utils/transform-standard-agent-definition-to-flat-agent.util.ts
@@ -7,8 +7,14 @@ export const transformStandardAgentDefinitionToFlatAgent = (
   standardAgentDefinition: StandardAgentDefinition,
   workspaceId: string,
 ): FlatAgent => {
+  const {
+    createHandoffFromDefaultAgent: _createHandoffFromDefaultAgent,
+    standardRoleId: _standardRoleId,
+    ...agentData
+  } = standardAgentDefinition;
+
   return {
-    ...standardAgentDefinition,
+    ...agentData,
     id: v4(),
     workspaceId,
     universalIdentifier: standardAgentDefinition.standardId || v4(),
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
index b8d25b2ee5..8607b2a59a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-agent.service.ts
@@ -6,7 +6,6 @@ import { IsNull, Not, type EntityManager } from 'typeorm';
 import { ComparatorAction } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 import { type WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
-import { AgentRoleService } from 'src/engine/metadata-modules/agent-role/agent-role.service';
 import { AgentEntity } from 'src/engine/metadata-modules/agent/agent.entity';
 import { transformAgentEntityToFlatAgent } from 'src/engine/metadata-modules/flat-agent/utils/transform-agent-entity-to-flat-agent.util';
 import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
@@ -27,7 +26,6 @@ export class WorkspaceSyncAgentService {
   constructor(
     private readonly standardAgentFactory: StandardAgentFactory,
     private readonly workspaceAgentComparator: WorkspaceAgentComparator,
-    private readonly agentRoleService: AgentRoleService,
   ) {}
 
   async synchronize(