Revert "refactor: Simplify CRUD services to leverage Common API (#157… (#15875)

This reverts commit 11e07f90d2.

packages/twenty-server/src/engine/metadata-modules/agent/agent-execution.service.ts

@@ -78,7 +78,6 @@ export class AgentExecutionService implements AgentExecutionContext {
     actorContext,
     roleIds,
     excludeHandoffTools = false,
-    userWorkspaceId,
     toolHints,
   }: {
     system: string;
@@ -87,7 +86,6 @@ export class AgentExecutionService implements AgentExecutionContext {
     actorContext?: ActorMetadata;
     roleIds?: string[];
     excludeHandoffTools?: boolean;
-    userWorkspaceId?: string;
     toolHints?: ToolHints;
   }) {
     try {
@@ -110,7 +108,6 @@ export class AgentExecutionService implements AgentExecutionContext {
             agent.workspaceId,
             actorContext,
             roleIds,
-            userWorkspaceId,
             toolHints,
           );
 
@@ -353,7 +350,6 @@ export class AgentExecutionService implements AgentExecutionContext {
         messages,
         actorContext,
         roleIds: [roleId, ...(agent?.roleId ? [agent?.roleId] : [])],
-        userWorkspaceId,
         toolHints,
       });
 

packages/twenty-server/src/engine/metadata-modules/agent/agent-tool-generator.service.ts

@@ -3,26 +3,24 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { type ToolSet } from 'ai';
 import { Repository } from 'typeorm';
-import { type ActorMetadata } from 'twenty-shared/types';
+
+import type { ActorMetadata } from 'twenty-shared/types';
 
 import { ToolAdapterService } from 'src/engine/core-modules/ai/services/tool-adapter.service';
 import { ToolService } from 'src/engine/core-modules/ai/services/tool.service';
 import { SearchArticlesTool } from 'src/engine/core-modules/tool/tools/search-articles-tool/search-articles-tool';
 import { AgentEntity } from 'src/engine/metadata-modules/agent/agent.entity';
-import { type ToolHints } from 'src/engine/metadata-modules/ai-router/types/tool-hints.interface';
 import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
 import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
-import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 import { HELPER_AGENT } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent';
 import { WorkflowToolWorkspaceService as WorkflowToolService } from 'src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service';
+import type { ToolHints } from 'src/engine/metadata-modules/ai-router/types/tool-hints.interface';
 
 @Injectable()
 export class AgentToolGeneratorService {
   private readonly logger = new Logger(AgentToolGeneratorService.name);
 
   constructor(
-    @InjectRepository(RoleEntity)
-    private readonly roleRepository: Repository<RoleEntity>,
     @InjectRepository(AgentEntity)
     private readonly agentRepository: Repository<AgentEntity>,
     private readonly toolAdapterService: ToolAdapterService,
@@ -37,7 +35,6 @@ export class AgentToolGeneratorService {
     workspaceId: string,
     actorContext?: ActorMetadata,
     roleIds?: string[],
-    userWorkspaceId?: string,
     toolHints?: ToolHints,
   ): Promise<ToolSet> {
     let tools: ToolSet = {};
@@ -79,7 +76,6 @@ export class AgentToolGeneratorService {
         { intersectionOf: roleIds },
         workspaceId,
         actorContext,
-        userWorkspaceId,
         toolHints,
       );
 

packages/twenty-server/src/engine/metadata-modules/agent/agent.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { AiModule } from 'src/engine/core-modules/ai/ai.module';
@@ -10,6 +10,7 @@ import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
 import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
 import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
 import { AgentRoleModule } from 'src/engine/metadata-modules/agent-role/agent-role.module';
@@ -72,6 +73,7 @@ import { AgentActorContextService } from './services/agent-actor-context.service
     TokenModule,
     WorkspaceDomainsModule,
     WorkflowToolsModule,
+    forwardRef(() => UserModule),
     UserWorkspaceModule,
     UserRoleModule,
   ],