The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Migrate the agent tools to @DefineTool (#28630)
Paul Rastoin702930c712bc
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/agent-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/agent-tool.provider.tsdeleted file mode 100644index 45f3f70d3f2..00000000000--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/agent-tool.provider.ts+++ /dev/null@@ -1,77 +0,0 @@-import { Injectable } from '@nestjs/common';--import { type ToolSet } from 'ai';-import { ToolCategory } from 'twenty-shared/ai';-import { PermissionFlagType } from 'twenty-shared/constants';-import { FeatureFlagKey } from 'twenty-shared/types';--import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';-import { type GenerateDescriptorOptions } from 'src/engine/core-modules/tool-provider/interfaces/generate-descriptor-options.type';-import { type ToolProvider } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider.interface';-import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';-import { type ToolDescriptor } from 'src/engine/core-modules/tool-provider/types/tool-descriptor.type';-import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';-import { executeToolFromToolSet } from 'src/engine/core-modules/tool-provider/utils/execute-tool-from-tool-set.util';-import { toolSetToDescriptors } from 'src/engine/core-modules/tool-provider/utils/tool-set-to-descriptors.util';-import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';-import { AgentToolWorkspaceService } from 'src/engine/metadata-modules/ai/ai-agent/tools/services/agent-tool.workspace-service';-import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';--@Injectable()-export class AgentToolProvider implements ToolProvider {- readonly category = ToolCategory.AGENT;-- constructor(- private readonly agentToolWorkspaceService: AgentToolWorkspaceService,- private readonly permissionsService: PermissionsService,- private readonly featureFlagService: FeatureFlagService,- ) {}-- async isAvailable(context: ToolProviderContext): Promise<boolean> {- const isAiChatInboxEnabled = await this.featureFlagService.isFeatureEnabled(- FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED,- context.workspaceId,- );-- if (!isAiChatInboxEnabled) {- return false;- }-- return this.permissionsService.checkRolesPermissions(- context.rolePermissionConfig,- context.workspaceId,- PermissionFlagType.AI_SETTINGS,- );- }-- async generateDescriptors(- context: ToolProviderContext,- options?: GenerateDescriptorOptions,- ): Promise<(ToolIndexEntry | ToolDescriptor)[]> {- return toolSetToDescriptors(- this.buildToolSet(context),- ToolCategory.AGENT,- { includeSchemas: options?.includeSchemas ?? true },- );- }-- async executeStaticTool(- toolName: string,- args: Record<string, unknown>,- context: ToolProviderContext,- ): Promise<ToolOutput> {- return executeToolFromToolSet(- this.buildToolSet(context),- toolName,- args,- ToolCategory.AGENT,- );- }-- private buildToolSet(context: ToolProviderContext): ToolSet {- return this.agentToolWorkspaceService.generateAgentTools({- workspaceId: context.workspaceId,- callingApplication: context.application,- });- }-}diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.tsindex fd8b63ac51c..78e7c2a2cb8 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts@@ -8,7 +8,6 @@ import { FilesFieldModule } from 'src/engine/core-modules/file/files-field/filesimport { RecordCrudModule } from 'src/engine/core-modules/record-crud/record-crud.module';import { TOOL_PROVIDERS } from 'src/engine/core-modules/tool-provider/constants/tool-providers.token';import { ActionToolProvider } from 'src/engine/core-modules/tool-provider/providers/action-tool.provider';-import { AgentToolProvider } from 'src/engine/core-modules/tool-provider/providers/agent-tool.provider';import { DashboardToolProvider } from 'src/engine/core-modules/tool-provider/providers/dashboard-tool.provider';import { DatabaseToolProvider } from 'src/engine/core-modules/tool-provider/providers/database-tool.provider';import { LogicFunctionToolProvider } from 'src/engine/core-modules/tool-provider/providers/logic-function-tool.provider';@@ -19,7 +18,7 @@ import { RecordFilesResolverService } from 'src/engine/core-modules/tool-provideimport { ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';import { ToolModule } from 'src/engine/core-modules/tool/tool.module';import { UserEntity } from 'src/engine/core-modules/user/user.entity';-import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';+import { AgentToolsModule } from 'src/engine/metadata-modules/ai/ai-agent/tools/agent-tools.module';import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@@ -44,7 +43,6 @@ import { ToolRegistryService } from './services/tool-registry.service';@Module({imports: [DiscoveryModule,- AiAgentModule,ApplicationTranslationCatalogModule,ToolModule,RecordCrudModule,@@ -59,6 +57,7 @@ import { ToolRegistryService } from './services/tool-registry.service';NavigationMenuItemToolsModule,WebhookToolsModule,RoleToolsModule,+ AgentToolsModule,UserRoleModule,ValidationRuleModule,EmailingModule,@@ -71,7 +70,6 @@ import { ToolRegistryService } from './services/tool-registry.service';RecordFilesResolverService,provideWorkspaceScopedRepository(FileEntity),ActionToolProvider,- AgentToolProvider,DashboardToolProvider,DatabaseToolProvider,MetadataToolProvider,@@ -86,7 +84,6 @@ import { ToolRegistryService } from './services/tool-registry.service';logicFunctionProvider: LogicFunctionToolProvider,workflowProvider: WorkflowToolProvider,dashboardProvider: DashboardToolProvider,- agentProvider: AgentToolProvider,) => [actionProvider,databaseProvider,@@ -94,7 +91,6 @@ import { ToolRegistryService } from './services/tool-registry.service';logicFunctionProvider,workflowProvider,dashboardProvider,- agentProvider,],inject: [ActionToolProvider,@@ -103,7 +99,6 @@ import { ToolRegistryService } from './services/tool-registry.service';LogicFunctionToolProvider,WorkflowToolProvider,DashboardToolProvider,- AgentToolProvider,],},ToolRegistryService,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.tsindex 8a4f8d63237..b36afb986ce 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts@@ -9,7 +9,6 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceimport { AgentResolver } from './agent.resolver';import { AgentService } from './agent.service';-import { AgentToolWorkspaceService } from './tools/services/agent-tool.workspace-service';import { AgentEntity } from './entities/agent.entity';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@@ -30,13 +29,8 @@ import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/appproviders: [AgentResolver,AgentService,- AgentToolWorkspaceService,provideWorkspaceScopedRepository(AgentEntity),],- exports: [- AgentService,- AgentToolWorkspaceService,- TypeOrmModule.forFeature([AgentEntity]),- ],+ exports: [AgentService, TypeOrmModule.forFeature([AgentEntity])],})export class AiAgentModule {}diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.tssimilarity index 63%rename from packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.tsindex 7e79ff1328f..7c3f6f866c7 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/__tests__/agent-tools.spec.ts@@ -1,15 +1,21 @@+import { type DiscoveryService } from '@nestjs/core';+import { PermissionFlagType } from 'twenty-shared/constants';-import { FieldActorSource } from 'twenty-shared/types';+import { FeatureFlagKey, FieldActorSource } from 'twenty-shared/types';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { type FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';-import { AgentToolProvider } from 'src/engine/core-modules/tool-provider/providers/agent-tool.provider';+import { DefinedToolRegistryService } from 'src/engine/core-modules/tool-provider/services/defined-tool-registry.service';import { type AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';-import { AgentToolWorkspaceService } from 'src/engine/metadata-modules/ai/ai-agent/tools/services/agent-tool.workspace-service';+import { CreateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool';+import { DeleteAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool';+import { ListAgentsTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool';+import { UpdateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool';import { type AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';import { AiExceptionCode } from 'src/engine/metadata-modules/ai/ai.exception';import { type PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';+import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';const workspaceId = 'workspace-id';const agentId = '20202020-0000-4000-8000-000000000001';@@ -32,7 +38,27 @@ const buildAgent = (overrides: Record<string, unknown> = {}) => ({...overrides,});-const buildProvider = (options?: {+const otherApplication = {+ id: 'other-application-id',+ sourceType: 'npm',+} as unknown as FlatApplication;++const context: ToolProviderContext = {+ workspaceId,+ rolePermissionConfig: {+ intersectionOf: { userWorkspaceRoleId: 'caller-role-id' },+ },+ userWorkspaceId: 'caller-user-workspace-id',+ actorContext: {+ source: FieldActorSource.MANUAL,+ workspaceMemberId: 'caller-workspace-member-id',+ name: 'Caller',+ context: {},+ },+};++// Runs the tools through the registry, which applies their declared gates and parses their input+const buildAgentTools = (options?: {hasAiSettingsPermission?: boolean;isAiChatInboxEnabled?: boolean;}) => {@@ -56,53 +82,78 @@ const buildProvider = (options?: {.mockResolvedValue(options?.hasAiSettingsPermission ?? true),};const featureFlagService = {- isFeatureEnabled: jest- .fn()- .mockResolvedValue(options?.isAiChatInboxEnabled ?? true),+ getWorkspaceFeatureFlagsMap: jest.fn().mockResolvedValue({+ [FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED]:+ options?.isAiChatInboxEnabled ?? true,+ }),};- const provider = new AgentToolProvider(- new AgentToolWorkspaceService(+ const tools = [+ new ListAgentsTool(agentService as unknown as AgentService),+ new CreateAgentTool(agentService as unknown as AgentService,aiModelRegistryService as unknown as AiModelRegistryService,),+ new UpdateAgentTool(+ agentService as unknown as AgentService,+ aiModelRegistryService as unknown as AiModelRegistryService,+ ),+ new DeleteAgentTool(agentService as unknown as AgentService),+ ];++ const definedToolRegistryService = new DefinedToolRegistryService(+ {+ getProviders: () =>+ tools.map((tool) => ({ instance: tool, metatype: tool.constructor })),+ } as unknown as DiscoveryService,permissionsService as unknown as PermissionsService,featureFlagService as unknown as FeatureFlagService,);+ definedToolRegistryService.onModuleInit();++ const listToolNames = async () =>+ (+ await definedToolRegistryService.getAvailableDescriptors(context, {+ includeSchemas: false,+ })+ ).map((descriptor) => descriptor.name);++ const executeTool = ({+ toolName,+ args,+ toolContext = context,+ }: {+ toolName: string;+ args: Record<string, unknown>;+ toolContext?: ToolProviderContext;+ }) => {+ const definedTool = definedToolRegistryService.findDefinedTool(toolName);++ jestExpectToBeDefined(definedTool);++ return definedToolRegistryService.execute({+ definedTool,+ args,+ context: toolContext,+ });+ };+return {- provider,+ listToolNames,+ executeTool,agentService,aiModelRegistryService,permissionsService,};};-const otherApplication = {- id: 'other-application-id',- sourceType: 'npm',-} as unknown as FlatApplication;--const context: ToolProviderContext = {- workspaceId,- rolePermissionConfig: {- intersectionOf: { userWorkspaceRoleId: 'caller-role-id' },- },- userWorkspaceId: 'caller-user-workspace-id',- actorContext: {- source: FieldActorSource.MANUAL,- workspaceMemberId: 'caller-workspace-member-id',- name: 'Caller',- context: {},- },-};--describe('AgentToolProvider', () => {- describe('isAvailable', () => {+describe('Agent tools', () => {+ describe('availability', () => {it('is available when the caller has the AI settings permission', async () => {- const { provider, permissionsService } = buildProvider();+ const { listToolNames, permissionsService } = buildAgentTools();- await expect(provider.isAvailable(context)).resolves.toBe(true);+ await expect(listToolNames()).resolves.toHaveLength(4);expect(permissionsService.checkRolesPermissions).toHaveBeenCalledTimes(1);expect(permissionsService.checkRolesPermissions).toHaveBeenCalledWith(context.rolePermissionConfig,@@ -112,29 +163,40 @@ describe('AgentToolProvider', () => {});it('is not available without the AI settings permission', async () => {- const { provider } = buildProvider({ hasAiSettingsPermission: false });+ const { listToolNames, executeTool, agentService } = buildAgentTools({+ hasAiSettingsPermission: false,+ });- await expect(provider.isAvailable(context)).resolves.toBe(false);+ await expect(listToolNames()).resolves.toEqual([]);+ await expect(+ executeTool({ toolName: 'list_agents', args: {} }),+ ).resolves.toMatchObject({+ success: false,+ message: 'Tool "list_agents" is not available',+ });+ expect(agentService.findManyAgents).not.toHaveBeenCalled();});it('is not available while the AI chat inbox feature flag is off', async () => {- const { provider, permissionsService } = buildProvider({- isAiChatInboxEnabled: false,- });+ const { listToolNames, executeTool, agentService, permissionsService } =+ buildAgentTools({ isAiChatInboxEnabled: false });- await expect(provider.isAvailable(context)).resolves.toBe(false);+ await expect(listToolNames()).resolves.toEqual([]);+ await expect(+ executeTool({ toolName: 'list_agents', args: {} }),+ ).resolves.toMatchObject({+ success: false,+ message: 'Tool "list_agents" is not available',+ });expect(permissionsService.checkRolesPermissions).not.toHaveBeenCalled();+ expect(agentService.findManyAgents).not.toHaveBeenCalled();});});it('exposes the agent management tools', async () => {- const { provider } = buildProvider();-- const descriptors = await provider.generateDescriptors(context, {- includeSchemas: true,- });+ const { listToolNames } = buildAgentTools();- expect(descriptors.map((descriptor) => descriptor.name)).toEqual([+ await expect(listToolNames()).resolves.toEqual(['list_agents','create_agent','update_agent',@@ -144,18 +206,14 @@ describe('AgentToolProvider', () => {describe('list_agents', () => {it('leaves out system agents', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();agentService.findManyAgents.mockResolvedValue([buildAgent(),buildAgent({ id: 'workflow-step-agent-id', isSystem: true }),]);- const output = await provider.executeStaticTool(- 'list_agents',- {},- context,- );+ const output = await executeTool({ toolName: 'list_agents', args: {} });expect(output.success).toBe(true);expect(output.result).toMatchObject({@@ -172,7 +230,7 @@ describe('AgentToolProvider', () => {};it('only lists the agents of the calling application', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();agentService.findManyAgents.mockResolvedValue([buildAgent(),@@ -182,11 +240,11 @@ describe('AgentToolProvider', () => {}),]);- const output = await provider.executeStaticTool(- 'list_agents',- {},- applicationContext,- );+ const output = await executeTool({+ toolName: 'list_agents',+ args: {},+ toolContext: applicationContext,+ });expect(output.result).toMatchObject({count: 1,@@ -195,21 +253,21 @@ describe('AgentToolProvider', () => {});it('refuses to update or delete an agent of another application', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();await expect(- provider.executeStaticTool(- 'update_agent',- { id: agentId, prompt: 'Something else' },- applicationContext,- ),+ executeTool({+ toolName: 'update_agent',+ args: { id: agentId, prompt: 'Something else' },+ toolContext: applicationContext,+ }),).rejects.toMatchObject({ code: AiExceptionCode.AGENT_NOT_FOUND });await expect(- provider.executeStaticTool(- 'delete_agent',- { id: agentId },- applicationContext,- ),+ executeTool({+ toolName: 'delete_agent',+ args: { id: agentId },+ toolContext: applicationContext,+ }),).rejects.toMatchObject({ code: AiExceptionCode.AGENT_NOT_FOUND });expect(agentService.updateOneAgent).not.toHaveBeenCalled();expect(agentService.deleteOneAgent).not.toHaveBeenCalled();@@ -218,12 +276,12 @@ describe('AgentToolProvider', () => {describe('create_agent', () => {it('creates an agent on the workspace default model with generated trigger ids', async () => {- const { provider, agentService, aiModelRegistryService } =- buildProvider();+ const { executeTool, agentService, aiModelRegistryService } =+ buildAgentTools();- const output = await provider.executeStaticTool(- 'create_agent',- {+ const output = await executeTool({+ toolName: 'create_agent',+ args: {label: 'Deal watcher',prompt: 'Watch deals',roleId,@@ -236,8 +294,7 @@ describe('AgentToolProvider', () => {{ type: 'CRON', settings: { pattern: '0 9 * * 1' } },],},- context,- );+ });expect(output.success).toBe(true);expect(@@ -281,12 +338,12 @@ describe('AgentToolProvider', () => {describe('update_agent', () => {it('keeps the ids of the triggers passed back and only sends the given fields', async () => {- const { provider, agentService, aiModelRegistryService } =- buildProvider();+ const { executeTool, agentService, aiModelRegistryService } =+ buildAgentTools();- const output = await provider.executeStaticTool(- 'update_agent',- {+ const output = await executeTool({+ toolName: 'update_agent',+ args: {id: agentId,triggers: [{@@ -297,8 +354,7 @@ describe('AgentToolProvider', () => {},],},- context,- );+ });expect(output.success).toBe(true);expect(@@ -323,18 +379,17 @@ describe('AgentToolProvider', () => {});it('refuses to change an agent backing a workflow step', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();agentService.findOneAgentById.mockResolvedValue(buildAgent({ isSystem: true }),);await expect(- provider.executeStaticTool(- 'update_agent',- { id: agentId, prompt: 'Something else' },- context,- ),+ executeTool({+ toolName: 'update_agent',+ args: { id: agentId, prompt: 'Something else' },+ }),).rejects.toMatchObject({ code: AiExceptionCode.INVALID_AGENT_INPUT });expect(agentService.updateOneAgent).not.toHaveBeenCalled();});@@ -342,13 +397,12 @@ describe('AgentToolProvider', () => {describe('delete_agent', () => {it('deletes the agent', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();- const output = await provider.executeStaticTool(- 'delete_agent',- { id: agentId },- context,- );+ const output = await executeTool({+ toolName: 'delete_agent',+ args: { id: agentId },+ });expect(output.success).toBe(true);expect(agentService.deleteOneAgent).toHaveBeenCalledTimes(1);@@ -359,14 +413,14 @@ describe('AgentToolProvider', () => {});it('refuses to delete an agent backing a workflow step', async () => {- const { provider, agentService } = buildProvider();+ const { executeTool, agentService } = buildAgentTools();agentService.findOneAgentById.mockResolvedValue(buildAgent({ isSystem: true }),);await expect(- provider.executeStaticTool('delete_agent', { id: agentId }, context),+ executeTool({ toolName: 'delete_agent', args: { id: agentId } }),).rejects.toMatchObject({ code: AiExceptionCode.INVALID_AGENT_INPUT });expect(agentService.deleteOneAgent).not.toHaveBeenCalled();});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/agent-tools.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/agent-tools.module.tsnew file mode 100644index 00000000000..22793be9bce--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/agent-tools.module.ts@@ -0,0 +1,18 @@+import { Module } from '@nestjs/common';++import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';+import { CreateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool';+import { DeleteAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool';+import { ListAgentsTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool';+import { UpdateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool';++@Module({+ imports: [AiAgentModule],+ providers: [+ ListAgentsTool,+ CreateAgentTool,+ UpdateAgentTool,+ DeleteAgentTool,+ ],+})+export class AgentToolsModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool.tsindex 33bc2460a07..be40f249ff5 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool.ts@@ -1,13 +1,22 @@-import { AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID } from 'twenty-shared/ai';+import {+ AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID,+ ToolCategory,+} from 'twenty-shared/ai';+import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';import { z } from 'zod';+import { DefineTool } from 'src/engine/core-modules/tool-provider/decorators/define-tool.decorator';+import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-tool.interface';+import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';+import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { agentTriggersSchema } from 'src/engine/metadata-modules/ai/ai-agent/tools/schemas/agent-trigger.schema';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';import { toAgentSummary } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/to-agent-summary.util';import { toAgentTriggers } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/to-agent-triggers.util';+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';-const createAgentSchema = z.object({+const createAgentInputSchema = z.object({label: z.string().min(1).describe('Display name of the agent'),prompt: z.string()@@ -35,32 +44,43 @@ const createAgentSchema = z.object({triggers: agentTriggersSchema.optional(),});-type CreateAgentParams = z.infer<typeof createAgentSchema>;--export const createCreateAgentTool = (- deps: AgentToolDependencies,- context: AgentToolContext,-) => ({- name: 'create_agent' as const,+@DefineTool({+ name: 'create_agent',+ category: ToolCategory.AGENT,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],+ requiredFeatureFlags: [FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED],description: `Create an AI agent that works on its own: it wakes up on its triggers (record events or a schedule) and acts with the tools its role allows, for example posting a note, updating records or sending a summary.Before creating it, present the plan to the user (prompt, role, triggers) and get their confirmation, since the agent keeps running after this conversation.Give the agent a role with the least access it needs (use list_roles to find one); without a role it cannot read or write records.Write the prompt as standing instructions for every run, and put what to do for a specific trigger in that trigger's instructions.`,- inputSchema: createAgentSchema,- execute: async ({ triggers, ...parameters }: CreateAgentParams) => {+})+export class CreateAgentTool extends BaseTool<typeof createAgentInputSchema> {+ readonly inputSchema = createAgentInputSchema;++ constructor(+ private readonly agentService: AgentService,+ private readonly aiModelRegistryService: AiModelRegistryService,+ ) {+ super();+ }++ async execute({+ input: { triggers, ...parameters },+ context: { workspaceId },+ }: ToolExecuteArgs<typeof createAgentInputSchema>): Promise<ToolOutput> {const modelId =parameters.modelId ?? AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID;- deps.aiModelRegistryService.validateModelAvailability(modelId);+ this.aiModelRegistryService.validateModelAvailability(modelId);- const agent = await deps.agentService.createOneAgent(+ const agent = await this.agentService.createOneAgent({...parameters,modelId,triggers: toAgentTriggers(triggers ?? []),},- context.workspaceId,+ workspaceId,);return {@@ -68,5 +88,5 @@ Write the prompt as standing instructions for every run, and put what to do formessage: `Agent "${agent.label}" created`,result: toAgentSummary(agent),};- },-});+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool.tsindex 4f69c36b79b..9592586b24e 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool.ts@@ -1,31 +1,45 @@+import { ToolCategory } from 'twenty-shared/ai';+import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';import { z } from 'zod';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';+import { DefineTool } from 'src/engine/core-modules/tool-provider/decorators/define-tool.decorator';+import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-tool.interface';+import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';+import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { findManageableAgentOrThrow } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util';-const deleteAgentSchema = z.object({+const deleteAgentInputSchema = z.object({id: z.uuid().describe('Id of the agent to delete'),});-type DeleteAgentParams = z.infer<typeof deleteAgentSchema>;--export const createDeleteAgentTool = (- deps: Pick<AgentToolDependencies, 'agentService'>,- context: AgentToolContext,-) => ({- name: 'delete_agent' as const,+@DefineTool({+ name: 'delete_agent',+ category: ToolCategory.AGENT,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],+ requiredFeatureFlags: [FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED],description: `Delete an AI agent and its triggers, for example once it is no longer useful. Use list_agents first if you don't know the id.`,- inputSchema: deleteAgentSchema,- execute: async (parameters: DeleteAgentParams) => {+})+export class DeleteAgentTool extends BaseTool<typeof deleteAgentInputSchema> {+ readonly inputSchema = deleteAgentInputSchema;++ constructor(private readonly agentService: AgentService) {+ super();+ }++ async execute({+ input,+ context,+ }: ToolExecuteArgs<typeof deleteAgentInputSchema>): Promise<ToolOutput> {await findManageableAgentOrThrow({- agentId: parameters.id,- deps,+ agentId: input.id,+ agentService: this.agentService,context,});- const agent = await deps.agentService.deleteOneAgent(- parameters.id,+ const agent = await this.agentService.deleteOneAgent(+ input.id,context.workspaceId,);@@ -34,5 +48,5 @@ export const createDeleteAgentTool = (message: `Agent "${agent.label}" deleted`,result: { id: agent.id, label: agent.label },};- },-});+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool.tsindex 6a72bcaff88..ef5b4dba792 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool.ts@@ -1,28 +1,43 @@+import { ToolCategory } from 'twenty-shared/ai';+import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';import { z } from 'zod';import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';+import { DefineTool } from 'src/engine/core-modules/tool-provider/decorators/define-tool.decorator';+import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-tool.interface';+import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';+import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { toAgentSummary } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/to-agent-summary.util';-const listAgentsSchema = z.object({});+const listAgentsInputSchema = z.object({});-export const createListAgentsTool = (- deps: Pick<AgentToolDependencies, 'agentService'>,- context: AgentToolContext,-) => ({- name: 'list_agents' as const,+@DefineTool({+ name: 'list_agents',+ category: ToolCategory.AGENT,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],+ requiredFeatureFlags: [FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED],description: `List the AI agents of the workspace with their prompt, model, role and triggers. System agents (those backing workflow AI steps or installed by an application) are not included.`,- inputSchema: listAgentsSchema,- execute: async () => {- const agents = await deps.agentService.findManyAgents(context.workspaceId);+})+export class ListAgentsTool extends BaseTool<typeof listAgentsInputSchema> {+ readonly inputSchema = listAgentsInputSchema;++ constructor(private readonly agentService: AgentService) {+ super();+ }++ async execute({+ context: { workspaceId, application },+ }: ToolExecuteArgs<typeof listAgentsInputSchema>): Promise<ToolOutput> {+ const agents = await this.agentService.findManyAgents(workspaceId);const listedAgents = agents.filter((agent) =>!agent.isSystem &&canCallerReachApplication({- callingApplication: context.callingApplication,+ callingApplication: application,applicationId: agent.applicationId,}),)@@ -33,5 +48,5 @@ export const createListAgentsTool = (message: `Found ${listedAgents.length} agent(s)`,result: { agents: listedAgents, count: listedAgents.length },};- },-});+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/services/agent-tool.workspace-service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/services/agent-tool.workspace-service.tsdeleted file mode 100644index 6a99b059002..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/services/agent-tool.workspace-service.ts+++ /dev/null@@ -1,38 +0,0 @@-import { Injectable } from '@nestjs/common';--import { type ToolSet } from 'ai';--import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';-import { createCreateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/create-agent.tool';-import { createDeleteAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/delete-agent.tool';-import { createListAgentsTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/list-agents.tool';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';-import { createUpdateAgentTool } from 'src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool';-import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';--@Injectable()-export class AgentToolWorkspaceService {- private readonly deps: AgentToolDependencies;-- constructor(- agentService: AgentService,- aiModelRegistryService: AiModelRegistryService,- ) {- this.deps = { agentService, aiModelRegistryService };- }-- generateAgentTools(context: AgentToolContext): ToolSet {- const listAgents = createListAgentsTool(this.deps, context);- const createAgent = createCreateAgentTool(this.deps, context);- const updateAgent = createUpdateAgentTool(this.deps, context);- const deleteAgent = createDeleteAgentTool(this.deps, context);-- return {- [listAgents.name]: listAgents,- [createAgent.name]: createAgent,- [updateAgent.name]: updateAgent,- [deleteAgent.name]: deleteAgent,- };- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type.tsdeleted file mode 100644index 09b2acb899b..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type.ts+++ /dev/null@@ -1,6 +0,0 @@-import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';--export type AgentToolContext = {- workspaceId: string;- callingApplication?: FlatApplication;-};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type.tsdeleted file mode 100644index a7ac8f07398..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type.ts+++ /dev/null@@ -1,7 +0,0 @@-import type { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';-import type { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';--export type AgentToolDependencies = {- agentService: AgentService;- aiModelRegistryService: AiModelRegistryService;-};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool.tsindex ad3a1fc44f2..fb591679003 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/update-agent.tool.ts@@ -1,14 +1,21 @@+import { ToolCategory } from 'twenty-shared/ai';+import { PermissionFlagType } from 'twenty-shared/constants';+import { FeatureFlagKey } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { z } from 'zod';+import { DefineTool } from 'src/engine/core-modules/tool-provider/decorators/define-tool.decorator';+import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-tool.interface';+import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';+import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { agentTriggersSchema } from 'src/engine/metadata-modules/ai/ai-agent/tools/schemas/agent-trigger.schema';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';import { findManageableAgentOrThrow } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util';import { toAgentSummary } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/to-agent-summary.util';import { toAgentTriggers } from 'src/engine/metadata-modules/ai/ai-agent/tools/utils/to-agent-triggers.util';+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';-const updateAgentSchema = z.object({+const updateAgentInputSchema = z.object({id: z.uuid().describe('Id of the agent to update'),label: z.string().min(1).optional(),prompt: z.string().min(1).optional(),@@ -27,29 +34,40 @@ const updateAgentSchema = z.object({),});-type UpdateAgentParams = z.infer<typeof updateAgentSchema>;--export const createUpdateAgentTool = (- deps: AgentToolDependencies,- context: AgentToolContext,-) => ({- name: 'update_agent' as const,+@DefineTool({+ name: 'update_agent',+ category: ToolCategory.AGENT,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],+ requiredFeatureFlags: [FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED],description: `Update an AI agent. Only the fields you pass are changed.To pause an agent without deleting it, set isActive to false on its triggers. Confirm changes to the role or triggers with the user first.`,- inputSchema: updateAgentSchema,- execute: async ({ triggers, ...parameters }: UpdateAgentParams) => {+})+export class UpdateAgentTool extends BaseTool<typeof updateAgentInputSchema> {+ readonly inputSchema = updateAgentInputSchema;++ constructor(+ private readonly agentService: AgentService,+ private readonly aiModelRegistryService: AiModelRegistryService,+ ) {+ super();+ }++ async execute({+ input: { triggers, ...parameters },+ context,+ }: ToolExecuteArgs<typeof updateAgentInputSchema>): Promise<ToolOutput> {await findManageableAgentOrThrow({agentId: parameters.id,- deps,+ agentService: this.agentService,context,});if (isDefined(parameters.modelId)) {- deps.aiModelRegistryService.validateModelAvailability(parameters.modelId);+ this.aiModelRegistryService.validateModelAvailability(parameters.modelId);}- const agent = await deps.agentService.updateOneAgent({+ const agent = await this.agentService.updateOneAgent({input: {...parameters,...(isDefined(triggers) && { triggers: toAgentTriggers(triggers) }),@@ -62,5 +80,5 @@ To pause an agent without deleting it, set isActive to false on its triggers. Comessage: `Agent "${agent.label}" updated`,result: toAgentSummary(agent),};- },-});+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util.tsindex 54717dda055..3a50127a737 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/tools/utils/find-manageable-agent-or-throw.util.ts@@ -1,6 +1,6 @@import { canCallerReachApplication } from 'src/engine/core-modules/application/utils/can-caller-reach-application.util';-import { type AgentToolContext } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-context.type';-import { type AgentToolDependencies } from 'src/engine/metadata-modules/ai/ai-agent/tools/types/agent-tool-dependencies.type';+import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+import { type AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import {AiException,AiExceptionCode,@@ -9,21 +9,21 @@ import { type FlatAgentWithRoleId } from 'src/engine/metadata-modules/flat-agentexport const findManageableAgentOrThrow = async ({agentId,- deps,+ agentService,context,}: {agentId: string;- deps: Pick<AgentToolDependencies, 'agentService'>;- context: AgentToolContext;+ agentService: AgentService;+ context: ToolProviderContext;}): Promise<FlatAgentWithRoleId> => {- const agent = await deps.agentService.findOneAgentById({+ const agent = await agentService.findOneAgentById({id: agentId,workspaceId: context.workspaceId,});if (!canCallerReachApplication({- callingApplication: context.callingApplication,+ callingApplication: context.application,applicationId: agent.applicationId,})) {diff --git a/packages/twenty-server/test/integration/ai/suites/__snapshots__/mcp-agent-tools.integration-spec.ts.snap b/packages/twenty-server/test/integration/ai/suites/__snapshots__/mcp-agent-tools.integration-spec.ts.snapnew file mode 100644index 00000000000..feda301ebff--- /dev/null+++ b/packages/twenty-server/test/integration/ai/suites/__snapshots__/mcp-agent-tools.integration-spec.ts.snap@@ -0,0 +1,351 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`MCP agent tools (integration) should describe the agent tools to the model 1`] = `+[+ {+ "description": "List the AI agents of the workspace with their prompt, model, role and triggers. System agents (those backing workflow AI steps or installed by an application) are not included.",+ "inputSchema": {+ "properties": {},+ "type": "object",+ },+ "name": "list_agents",+ },+ {+ "description": "Create an AI agent that works on its own: it wakes up on its triggers (record events or a schedule) and acts with the tools its role allows, for example posting a note, updating records or sending a summary.++Before creating it, present the plan to the user (prompt, role, triggers) and get their confirmation, since the agent keeps running after this conversation.+Give the agent a role with the least access it needs (use list_roles to find one); without a role it cannot read or write records.+Write the prompt as standing instructions for every run, and put what to do for a specific trigger in that trigger's instructions.",+ "inputSchema": {+ "$defs": {+ "__schema0": {+ "description": "Id of an existing trigger, as returned by list_agents. Pass it to keep that trigger when updating; omit it for a new trigger.",+ "format": "uuid",+ "type": "string",+ },+ "__schema1": {+ "description": "Whether the trigger starts runs. Defaults to true.",+ "type": "boolean",+ },+ "__schema2": {+ "anyOf": [+ {+ "maxLength": 10000,+ "type": "string",+ },+ {+ "type": "null",+ },+ ],+ "description": "What the agent should do when this trigger fires, on top of its prompt (e.g. 'Post a summary of the new deal in a note on the company').",+ },+ },+ "properties": {+ "description": {+ "description": "Optional short description",+ "type": "string",+ },+ "icon": {+ "description": "Optional icon identifier (e.g. "IconRobot")",+ "type": "string",+ },+ "label": {+ "description": "Display name of the agent",+ "minLength": 1,+ "type": "string",+ },+ "modelId": {+ "description": "Model the agent runs on. Defaults to "workspace-default-model", the workspace default model.",+ "type": "string",+ },+ "prompt": {+ "description": "System prompt describing who the agent is and what it does on every run",+ "minLength": 1,+ "type": "string",+ },+ "roleId": {+ "description": "Role the agent acts with. Without a role the agent can neither read nor write any record.",+ "format": "uuid",+ "type": "string",+ },+ "triggers": {+ "description": "What wakes the agent up on its own. DATABASE_EVENT runs it when records change, with the changed records as input. CRON runs it on a schedule.",+ "items": {+ "anyOf": [+ {+ "properties": {+ "id": {+ "$ref": "#/$defs/__schema0",+ },+ "instructions": {+ "$ref": "#/$defs/__schema2",+ },+ "isActive": {+ "$ref": "#/$defs/__schema1",+ },+ "settings": {+ "properties": {+ "batchMode": {+ "description": "When true, events fired close together are grouped into a single run.",+ "type": "boolean",+ },+ "eventName": {+ "description": "'<objectNameSingular>.<action>' where action is created, updated, deleted, destroyed, restored or upserted (e.g. 'opportunity.created'). Wildcards are not allowed.",+ "pattern": "^[a-z][a-zA-Z0-9]*\\.(created|updated|deleted|destroyed|restored|upserted)$",+ "type": "string",+ },+ "updatedFields": {+ "description": "Only for '.updated' events: field names that must change for the trigger to fire.",+ "items": {+ "minLength": 1,+ "type": "string",+ },+ "type": "array",+ },+ },+ "required": [+ "eventName",+ ],+ "type": "object",+ },+ "type": {+ "const": "DATABASE_EVENT",+ "type": "string",+ },+ },+ "required": [+ "type",+ "settings",+ ],+ "type": "object",+ },+ {+ "properties": {+ "id": {+ "$ref": "#/$defs/__schema0",+ },+ "instructions": {+ "$ref": "#/$defs/__schema2",+ },+ "isActive": {+ "$ref": "#/$defs/__schema1",+ },+ "settings": {+ "properties": {+ "pattern": {+ "description": "Standard 5-field cron pattern (e.g. '0 9 * * 1' for every Monday at 9:00).",+ "minLength": 1,+ "type": "string",+ },+ },+ "required": [+ "pattern",+ ],+ "type": "object",+ },+ "type": {+ "const": "CRON",+ "type": "string",+ },+ },+ "required": [+ "type",+ "settings",+ ],+ "type": "object",+ },+ ],+ },+ "maxItems": 20,+ "type": "array",+ },+ },+ "required": [+ "label",+ "prompt",+ ],+ "type": "object",+ },+ "name": "create_agent",+ },+ {+ "description": "Update an AI agent. Only the fields you pass are changed.++To pause an agent without deleting it, set isActive to false on its triggers. Confirm changes to the role or triggers with the user first.",+ "inputSchema": {+ "$defs": {+ "__schema0": {+ "description": "Id of an existing trigger, as returned by list_agents. Pass it to keep that trigger when updating; omit it for a new trigger.",+ "format": "uuid",+ "type": "string",+ },+ "__schema1": {+ "description": "Whether the trigger starts runs. Defaults to true.",+ "type": "boolean",+ },+ "__schema2": {+ "anyOf": [+ {+ "maxLength": 10000,+ "type": "string",+ },+ {+ "type": "null",+ },+ ],+ "description": "What the agent should do when this trigger fires, on top of its prompt (e.g. 'Post a summary of the new deal in a note on the company').",+ },+ },+ "properties": {+ "description": {+ "type": "string",+ },+ "icon": {+ "type": "string",+ },+ "id": {+ "description": "Id of the agent to update",+ "format": "uuid",+ "type": "string",+ },+ "label": {+ "minLength": 1,+ "type": "string",+ },+ "modelId": {+ "type": "string",+ },+ "prompt": {+ "minLength": 1,+ "type": "string",+ },+ "roleId": {+ "anyOf": [+ {+ "format": "uuid",+ "type": "string",+ },+ {+ "type": "null",+ },+ ],+ "description": "New role of the agent, or null to remove its role",+ },+ "triggers": {+ "description": "Replaces the whole trigger list. To keep an existing trigger, pass it again with its id from list_agents. Pass an empty list to remove all triggers.",+ "items": {+ "anyOf": [+ {+ "properties": {+ "id": {+ "$ref": "#/$defs/__schema0",+ },+ "instructions": {+ "$ref": "#/$defs/__schema2",+ },+ "isActive": {+ "$ref": "#/$defs/__schema1",+ },+ "settings": {+ "properties": {+ "batchMode": {+ "description": "When true, events fired close together are grouped into a single run.",+ "type": "boolean",+ },+ "eventName": {+ "description": "'<objectNameSingular>.<action>' where action is created, updated, deleted, destroyed, restored or upserted (e.g. 'opportunity.created'). Wildcards are not allowed.",+ "pattern": "^[a-z][a-zA-Z0-9]*\\.(created|updated|deleted|destroyed|restored|upserted)$",+ "type": "string",+ },+ "updatedFields": {+ "description": "Only for '.updated' events: field names that must change for the trigger to fire.",+ "items": {+ "minLength": 1,+ "type": "string",+ },+ "type": "array",+ },+ },+ "required": [+ "eventName",+ ],+ "type": "object",+ },+ "type": {+ "const": "DATABASE_EVENT",+ "type": "string",+ },+ },+ "required": [+ "type",+ "settings",+ ],+ "type": "object",+ },+ {+ "properties": {+ "id": {+ "$ref": "#/$defs/__schema0",+ },+ "instructions": {+ "$ref": "#/$defs/__schema2",+ },+ "isActive": {+ "$ref": "#/$defs/__schema1",+ },+ "settings": {+ "properties": {+ "pattern": {+ "description": "Standard 5-field cron pattern (e.g. '0 9 * * 1' for every Monday at 9:00).",+ "minLength": 1,+ "type": "string",+ },+ },+ "required": [+ "pattern",+ ],+ "type": "object",+ },+ "type": {+ "const": "CRON",+ "type": "string",+ },+ },+ "required": [+ "type",+ "settings",+ ],+ "type": "object",+ },+ ],+ },+ "maxItems": 20,+ "type": "array",+ },+ },+ "required": [+ "id",+ ],+ "type": "object",+ },+ "name": "update_agent",+ },+ {+ "description": "Delete an AI agent and its triggers, for example once it is no longer useful. Use list_agents first if you don't know the id.",+ "inputSchema": {+ "properties": {+ "id": {+ "description": "Id of the agent to delete",+ "format": "uuid",+ "type": "string",+ },+ },+ "required": [+ "id",+ ],+ "type": "object",+ },+ "name": "delete_agent",+ },+]+`;diff --git a/packages/twenty-server/test/integration/ai/suites/mcp-agent-tools.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/mcp-agent-tools.integration-spec.tsindex bb6fe5af000..71b71a49c55 100644--- a/packages/twenty-server/test/integration/ai/suites/mcp-agent-tools.integration-spec.ts+++ b/packages/twenty-server/test/integration/ai/suites/mcp-agent-tools.integration-spec.ts@@ -1,7 +1,19 @@import { randomUUID } from 'node:crypto';import request from 'supertest';+import { callMcpTool } from 'test/integration/graphql/suites/application-role-intersection/utils/call-mcp-tool.util';+import { getMcpToolCatalog } from 'test/integration/graphql/suites/application-role-intersection/utils/get-mcp-tool-catalog.util';+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';+import { ToolCategory } from 'twenty-shared/ai';+import { FeatureFlagKey } from 'twenty-shared/types';++const AGENT_TOOL_NAMES = [+ 'list_agents',+ 'create_agent',+ 'update_agent',+ 'delete_agent',+];type AgentSummary = {id: string;@@ -65,6 +77,33 @@ const listAgentIds = async (): Promise<string[]> => {return (payload.result?.agents ?? []).map((agent) => agent.id);};+const expectToolRefused = async ({+ toolName,+ token,+}: {+ toolName: string;+ token: string;+}) => {+ const result = await callMcpTool({+ toolName: 'execute_tool',+ toolArguments: { toolName, arguments: {} },+ token,+ });++ expect(result.isError).toBe(true);+ expect(JSON.parse(result.content[0].text)).toMatchObject({+ success: false,+ message: `Tool "${toolName}" not found`,+ });+};++const setAiChatInboxEnabled = (value: boolean) =>+ updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED,+ value,+ expectToFail: false,+ });+describe('MCP agent tools (integration)', () => {const createdAgentIds: string[] = [];@@ -74,6 +113,29 @@ describe('MCP agent tools (integration)', () => {}});+ it('should describe the agent tools to the model', async () => {+ const result = await callMcpTool({+ toolName: 'learn_tools',+ toolArguments: { toolNames: AGENT_TOOL_NAMES },+ token: API_KEY_ACCESS_TOKEN,+ });++ expect(result.isError).toBe(false);++ const payload = JSON.parse(result.content[0].text);++ expect(payload.notFound).toEqual([]);+ expect(payload.tools).toMatchSnapshot();+ });++ it('should list the agent tools in the catalog', async () => {+ const catalog = await getMcpToolCatalog({ token: API_KEY_ACCESS_TOKEN });++ expect(catalog[ToolCategory.AGENT]?.map(({ name }) => name)).toEqual(+ AGENT_TOOL_NAMES,+ );+ });+it('creates an agent with triggers, updates it and deletes it', async () => {const created = await executeTool<AgentSummary>('create_agent', {label: `Deal watcher ${randomUUID().slice(0, 8)}`,@@ -139,4 +201,42 @@ describe('MCP agent tools (integration)', () => {expect(created.success).toBe(false);expect(created.error).toContain('cron');});++ // AI_SETTINGS is a settings flag, so the member's canAccessAllTools does not grant it+ describe('for a member without AI_SETTINGS', () => {+ it('should hide the agent category from the catalog', async () => {+ const catalog = await getMcpToolCatalog({+ token: APPLE_JONY_MEMBER_ACCESS_TOKEN,+ });++ expect(Object.keys(catalog)).not.toContain(ToolCategory.AGENT);+ });++ it.each(AGENT_TOOL_NAMES)('should refuse %s', async (toolName) => {+ await expectToolRefused({+ toolName,+ token: APPLE_JONY_MEMBER_ACCESS_TOKEN,+ });+ });+ });++ describe('with the AI chat inbox disabled', () => {+ beforeAll(async () => {+ await setAiChatInboxEnabled(false);+ });++ afterAll(async () => {+ await setAiChatInboxEnabled(true);+ });++ it('should hide the agent category from the catalog', async () => {+ const catalog = await getMcpToolCatalog({ token: API_KEY_ACCESS_TOKEN });++ expect(Object.keys(catalog)).not.toContain(ToolCategory.AGENT);+ });++ it.each(AGENT_TOOL_NAMES)('should refuse %s', async (toolName) => {+ await expectToolRefused({ toolName, token: API_KEY_ACCESS_TOKEN });+ });+ });});