The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Pass @DefineTool execute arguments as a single object (#28519)
Paul Rastoin9ece7d58f9e9
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/__tests__/define-tool.decorator.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/__tests__/define-tool.decorator.spec.tsindex 470be36ae34..c2f0cf94aa9 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/__tests__/define-tool.decorator.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/__tests__/define-tool.decorator.spec.ts@@ -7,6 +7,8 @@ import { z } from 'zod';import { DEFINE_TOOL_METADATA_KEY } from 'src/engine/core-modules/tool-provider/constants/define-tool-metadata-key.constant';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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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';const renameWebhookInputSchema = z.object({ id: z.uuid() });@@ -75,7 +77,12 @@ describe('DefineTool', () => {> {readonly inputSchema = renameWebhookInputSchema;- async execute(input: { id: string; name: string }): Promise<ToolOutput> {+ async execute({+ input,+ }: {+ input: { id: string; name: string };+ context: ToolProviderContext;+ }): Promise<ToolOutput> {return { success: true, message: input.name.toUpperCase() };}}@@ -91,7 +98,11 @@ describe('DefineTool', () => {readonly inputSchema = renameWebhookInputSchema;// @ts-expect-error execute input must match the inputSchema- async execute(input: { name: number }): Promise<ToolOutput> {+ async execute({+ input,+ }: {+ input: { name: number };+ }): Promise<ToolOutput> {return { success: true, message: String(input.name) };}}@@ -143,9 +154,9 @@ describe('DefineTool', () => {class PinItemTool extends BaseTool<typeof pinItemInputSchema> {readonly inputSchema = pinItemInputSchema;- async execute(- input: z.infer<typeof pinItemInputSchema>,- ): Promise<ToolOutput> {+ async execute({+ input,+ }: ToolExecuteArgs<typeof pinItemInputSchema>): Promise<ToolOutput> {return {success: true,message: input.type === 'LINK' ? input.link : input.name,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/define-tool.decorator.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/define-tool.decorator.tsindex a072f897d04..6c8da02c962 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/define-tool.decorator.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/decorators/define-tool.decorator.ts@@ -9,14 +9,11 @@ import { type DefineToolOptions } from 'src/engine/core-modules/tool-provider/ty// Method parameters are bivariant, so BaseTool alone accepts an execute input narrower than the schematype ExecuteInputMatchesInputSchema<TTool extends BaseTool> =- Parameters<TTool['execute']> extends []- ? unknown- : IsExactly<- Parameters<TTool['execute']>[0],- z.infer<TTool['inputSchema']>- > extends true+ Parameters<TTool['execute']> extends [{ input: infer TInput }, ...unknown[]]+ ? IsExactly<TInput, z.infer<TTool['inputSchema']>> extends true? unknown- : 'execute input must be exactly z.infer<typeof inputSchema>';+ : 'execute input must be exactly z.infer<typeof inputSchema>'+ : unknown;export const DefineTool =(options: DefineToolOptions) =>diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/base-tool.interface.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/base-tool.interface.tsindex d028ebd4cae..b6582514602 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/base-tool.interface.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/base-tool.interface.ts@@ -1,6 +1,4 @@-import { type z } from 'zod';--import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+import { type ToolExecuteArgs } from 'src/engine/core-modules/tool-provider/types/tool-execute-args.type';import { type ToolInputSchema } from 'src/engine/core-modules/tool-provider/types/tool-input-schema.type';import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';@@ -12,8 +10,5 @@ export abstract class BaseTool<abstract readonly inputSchema: TInputSchema;- abstract execute(- input: z.infer<TInputSchema>,- context: ToolProviderContext,- ): Promise<ToolOutput>;+ abstract execute(args: ToolExecuteArgs<TInputSchema>): Promise<ToolOutput>;}diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.tsindex 04f49bb1fc6..082dd210fdb 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/defined-tool-registry.service.spec.ts@@ -8,6 +8,7 @@ import { DefineTool } from 'src/engine/core-modules/tool-provider/decorators/defimport { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-tool.interface';import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';import { DefinedToolRegistryService } from 'src/engine/core-modules/tool-provider/services/defined-tool-registry.service';+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 { type PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';@@ -32,9 +33,9 @@ const renameWebhookInputSchema = z.object({ id: z.uuid() });class RenameWebhookTool extends BaseTool<typeof renameWebhookInputSchema> {readonly inputSchema = renameWebhookInputSchema;- async execute(- input: z.infer<typeof renameWebhookInputSchema>,- ): Promise<ToolOutput> {+ async execute({+ input,+ }: ToolExecuteArgs<typeof renameWebhookInputSchema>): Promise<ToolOutput> {return { success: true, message: `Webhook ${input.id} renamed` };}}@@ -66,11 +67,11 @@ describe('DefinedToolRegistryService', () => {const { definedToolRegistryService, definedTool } =buildRenameWebhookTool({ isGranted: true });- const output = await definedToolRegistryService.execute(+ const output = await definedToolRegistryService.execute({definedTool,- { id: webhookId },+ args: { id: webhookId },context,- );+ });expect(output).toEqual({success: true,@@ -83,11 +84,11 @@ describe('DefinedToolRegistryService', () => {buildRenameWebhookTool({ isGranted: false });const executeSpy = jest.spyOn(tool, 'execute');- const output = await definedToolRegistryService.execute(+ const output = await definedToolRegistryService.execute({definedTool,- { id: webhookId },+ args: { id: webhookId },context,- );+ });expect(output).toMatchObject({success: false,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.tsindex 68d59067e3b..4596e64cf3e 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/defined-tool-registry.service.ts@@ -90,11 +90,15 @@ export class DefinedToolRegistryService implements OnModuleInit {});}- async execute(- definedTool: DefinedTool,- args: Record<string, unknown>,- context: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ definedTool,+ args,+ context,+ }: {+ definedTool: DefinedTool;+ args: Record<string, unknown>;+ context: ToolProviderContext;+ }): Promise<ToolOutput> {const { options, tool } = definedTool;if (!(await this.isAvailable(definedTool, context))) {@@ -110,7 +114,7 @@ export class DefinedToolRegistryService implements OnModuleInit {});}- return tool.execute(parsedInput.data, context);+ return tool.execute({ input: parsedInput.data, context });}private async isAvailable(diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.tsindex f599f6e806c..53deb8c9d63 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts@@ -327,11 +327,11 @@ export class ToolExecutorService {);if (isDefined(definedTool)) {- return this.definedToolRegistryService.execute(+ return this.definedToolRegistryService.execute({definedTool,args,context,- );+ });}const provider = this.providers.find(diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-execute-args.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-execute-args.type.tsnew file mode 100644index 00000000000..a0f4ed4a0e7--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-execute-args.type.ts@@ -0,0 +1,11 @@+import { type z } from 'zod';++import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+import { type ToolInputSchema } from 'src/engine/core-modules/tool-provider/types/tool-input-schema.type';++export type ToolExecuteArgs<+ TInputSchema extends ToolInputSchema = ToolInputSchema,+> = {+ input: z.infer<TInputSchema>;+ context: ToolProviderContext;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/create-navigation-menu-item.tool.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/create-navigation-menu-item.tool.tsindex d112a963cc3..00cf8bac1c5 100644--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/create-navigation-menu-item.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/create-navigation-menu-item.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { type CreateNavigationMenuItemInput } from 'src/engine/metadata-modules/navigation-menu-item/dtos/create-navigation-menu-item.input';import { NavigationMenuItemService } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service';@@ -103,7 +103,7 @@ const toServiceInput = (const resolvedUserWorkspaceId =params.scope === 'user' ? userWorkspaceId : undefined;const base = {- type: params.type as NavigationMenuItemType,+ type: params.type,userWorkspaceId: resolvedUserWorkspaceId,icon: params.icon,color: params.color,@@ -167,12 +167,14 @@ export class CreateNavigationMenuItemTool extends BaseTool<super();}- async execute(- parameters: CreateNavigationMenuItemParams,- { workspaceId, userWorkspaceId, application, agentId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, userWorkspaceId, application, agentId },+ }: ToolExecuteArgs<+ typeof createNavigationMenuItemInputSchema+ >): Promise<ToolOutput> {try {- if (parameters.scope === 'user' && !userWorkspaceId) {+ if (input.scope === 'user' && !userWorkspaceId) {return {success: false,message:@@ -182,7 +184,7 @@ export class CreateNavigationMenuItemTool extends BaseTool<}const created = await this.navigationMenuItemService.create({- input: toServiceInput(parameters, userWorkspaceId),+ input: toServiceInput(input, userWorkspaceId),workspaceId,authUserWorkspaceId: userWorkspaceId,authApplicationId: application?.id,diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/delete-navigation-menu-item.tool.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/delete-navigation-menu-item.tool.tsindex a539837155e..99a8e85607d 100644--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/delete-navigation-menu-item.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/delete-navigation-menu-item.tool.ts@@ -3,7 +3,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { NavigationMenuItemService } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service';@@ -28,13 +28,15 @@ export class DeleteNavigationMenuItemTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof deleteNavigationMenuItemInputSchema>,- { workspaceId, userWorkspaceId, application, agentId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, userWorkspaceId, application, agentId },+ }: ToolExecuteArgs<+ typeof deleteNavigationMenuItemInputSchema+ >): Promise<ToolOutput> {try {const deleted = await this.navigationMenuItemService.delete({- id: parameters.id,+ id: input.id,workspaceId,authUserWorkspaceId: userWorkspaceId,authApplicationId: application?.id,diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/list-navigation-menu-items.tool.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/list-navigation-menu-items.tool.tsindex fbf8139299f..0419ac7e6cd 100644--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/list-navigation-menu-items.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/list-navigation-menu-items.tool.ts@@ -1,11 +1,10 @@import { ToolCategory } from 'twenty-shared/ai';-import { NavigationMenuItemType } 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { NavigationMenuItemService } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service';import { navigationMenuItemTypeSchema } from 'src/engine/metadata-modules/navigation-menu-item/tools/schemas/navigation-menu-item-type.schema';@@ -54,18 +53,20 @@ export class ListNavigationMenuItemsTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof listNavigationMenuItemsInputSchema>,- { workspaceId, userWorkspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, userWorkspaceId },+ }: ToolExecuteArgs<+ typeof listNavigationMenuItemsInputSchema+ >): Promise<ToolOutput> {try {const items = await this.navigationMenuItemService.findAll({workspaceId,userWorkspaceId,- scope: parameters.scope,- folderId: parameters.folderId,- type: parameters.type as NavigationMenuItemType | undefined,- limit: parameters.limit,+ scope: input.scope,+ folderId: input.folderId,+ type: input.type,+ limit: input.limit,});return {diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/update-navigation-menu-item.tool.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/update-navigation-menu-item.tool.tsindex bb20911e342..d5ae0bb8408 100644--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/update-navigation-menu-item.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/tools/update-navigation-menu-item.tool.ts@@ -3,7 +3,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { type UpdateNavigationMenuItemInput } from 'src/engine/metadata-modules/navigation-menu-item/dtos/update-navigation-menu-item.input';import { NavigationMenuItemService } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.service';@@ -56,26 +56,26 @@ export class UpdateNavigationMenuItemTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof updateNavigationMenuItemInputSchema>,- { workspaceId, userWorkspaceId, application, agentId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, userWorkspaceId, application, agentId },+ }: ToolExecuteArgs<+ typeof updateNavigationMenuItemInputSchema+ >): Promise<ToolOutput> {try {const update: Partial<UpdateNavigationMenuItemInput> = {};- if (parameters.name !== undefined) update.name = parameters.name;- if (parameters.icon !== undefined) update.icon = parameters.icon;- if (parameters.color !== undefined) update.color = parameters.color;- if (parameters.position !== undefined)- update.position = parameters.position;- if (parameters.folderId !== undefined)- update.folderId = parameters.folderId;- if (parameters.link !== undefined) update.link = parameters.link;- if (parameters.pageLayoutId !== undefined)- update.pageLayoutId = parameters.pageLayoutId;+ if (input.name !== undefined) update.name = input.name;+ if (input.icon !== undefined) update.icon = input.icon;+ if (input.color !== undefined) update.color = input.color;+ if (input.position !== undefined) update.position = input.position;+ if (input.folderId !== undefined) update.folderId = input.folderId;+ if (input.link !== undefined) update.link = input.link;+ if (input.pageLayoutId !== undefined)+ update.pageLayoutId = input.pageLayoutId;const updated = await this.navigationMenuItemService.update({- input: { id: parameters.id, ...update },+ input: { id: input.id, ...update },workspaceId,authUserWorkspaceId: userWorkspaceId,authApplicationId: application?.id,diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.tsindex d025c2b9eb1..deb47af78b4 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/__tests__/role-tools.spec.ts@@ -107,7 +107,10 @@ describe('Role tools', () => {},]);- const output = await buildListRolesTool(services).execute({}, context);+ const output = await buildListRolesTool(services).execute({+ input: {},+ context,+ });expect(output.success).toBe(true);expect(services.roleService.getWorkspaceRoles).toHaveBeenCalledWith(@@ -134,10 +137,10 @@ describe('Role tools', () => {],);- const output = await buildListRolesTool(services).execute(- { includeRowLevelPermissionRules: true },+ const output = await buildListRolesTool(services).execute({+ input: { includeRowLevelPermissionRules: true },context,- );+ });expect(output.success).toBe(true);@@ -165,10 +168,10 @@ describe('Role tools', () => {{ id: 'role-3', label: 'Guest', isEditable: true },]);- await buildListRolesTool(services).execute(- { includeRowLevelPermissionRules: true },+ await buildListRolesTool(services).execute({+ input: { includeRowLevelPermissionRules: true },context,- );+ });expect(services.rowLevelPermissionPredicateService.findByWorkspaceId,@@ -194,7 +197,10 @@ describe('Role tools', () => {const output = await new CreateRoleTool(services.roleService as unknown as RoleService,services.applicationService as unknown as ApplicationService,- ).execute({ label: 'Sales', canReadAllObjectRecords: true }, context);+ ).execute({+ input: { label: 'Sales', canReadAllObjectRecords: true },+ context,+ });expect(output.success).toBe(true);expect(services.roleService.createRole).toHaveBeenCalledWith(@@ -220,13 +226,13 @@ describe('Role tools', () => {const output = await new UpdateRoleTool(services.roleService as unknown as RoleService,- ).execute(- {+ ).execute({+ input: {roleId: otherRoleId,update: { canUpdateAllSettings: false, label: 'Support L1' },},context,- );+ });expect(output.success).toBe(true);expect(services.roleService.updateRole).toHaveBeenCalledWith({@@ -246,9 +252,9 @@ describe('Role tools', () => {await new UpdateRoleTool(services.roleService as unknown as RoleService,- ).execute(- { roleId: otherRoleId, update: { canUpdateAllSettings: false } },- {+ ).execute({+ input: { roleId: otherRoleId, update: { canUpdateAllSettings: false } },+ context: {...context,rolePermissionConfig: {intersectionOf: {@@ -257,7 +263,7 @@ describe('Role tools', () => {},},},- );+ });expect(services.roleService.updateRole).toHaveBeenCalledTimes(1);expect(services.roleService.updateRole).toHaveBeenCalledWith(@@ -274,13 +280,13 @@ describe('Role tools', () => {await new UpdateRoleTool(services.roleService as unknown as RoleService,- ).execute(- { roleId: otherRoleId, update: { canUpdateAllSettings: false } },- {+ ).execute({+ input: { roleId: otherRoleId, update: { canUpdateAllSettings: false } },+ context: {...context,rolePermissionConfig: { shouldBypassPermissionChecks: true },},- );+ });expect(services.roleService.updateRole).toHaveBeenCalledTimes(1);expect(services.roleService.updateRole).toHaveBeenCalledWith(@@ -300,7 +306,7 @@ describe('Role tools', () => {const output = await new DeleteRoleTool(services.roleService as unknown as RoleService,- ).execute({ roleId: otherRoleId }, context);+ ).execute({ input: { roleId: otherRoleId }, context });expect(output.success).toBe(true);expect(services.roleService.deleteRole).toHaveBeenCalledWith({@@ -317,10 +323,10 @@ describe('Role tools', () => {const output = await new AssignRoleToWorkspaceMemberTool(services.userRoleService as unknown as UserRoleService,- ).execute(- { workspaceMemberId: targetMemberId, roleId: otherRoleId },+ ).execute({+ input: { workspaceMemberId: targetMemberId, roleId: otherRoleId },context,- );+ });expect(output.success).toBe(true);expect(@@ -351,10 +357,10 @@ describe('Role tools', () => {const output = await new UpsertObjectPermissionsTool(services.objectPermissionService as unknown as ObjectPermissionService,- ).execute(- { roleId: supportRoleId, objectPermissions: [objectPermission] },+ ).execute({+ input: { roleId: supportRoleId, objectPermissions: [objectPermission] },context,- );+ });expect(output.success).toBe(true);expect(@@ -375,8 +381,8 @@ describe('Role tools', () => {const output = await new UpsertRowLevelPermissionRulesTool(services.rowLevelPermissionPredicateService as unknown as RowLevelPermissionPredicateService,- ).execute(- {+ ).execute({+ input: {roleId: supportRoleId,objectMetadataId: objectMetadataId,predicates: [@@ -396,7 +402,7 @@ describe('Role tools', () => {],},context,- );+ });expect(output.success).toBe(true);expect(diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/assign-role-to-workspace-member.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/assign-role-to-workspace-member.tool.tsindex ae1318afc3e..817a547baa6 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/assign-role-to-workspace-member.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/assign-role-to-workspace-member.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';@@ -32,15 +32,17 @@ export class AssignRoleToWorkspaceMemberTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof assignRoleToWorkspaceMemberInputSchema>,- { workspaceId, userWorkspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, userWorkspaceId },+ }: ToolExecuteArgs<+ typeof assignRoleToWorkspaceMemberInputSchema+ >): Promise<ToolOutput> {const { workspaceMember } =await this.userRoleService.assignRoleToWorkspaceMember({workspaceId,- workspaceMemberId: parameters.workspaceMemberId,- roleId: parameters.roleId,+ workspaceMemberId: input.workspaceMemberId,+ roleId: input.roleId,actingUserWorkspaceId: userWorkspaceId,});@@ -49,8 +51,8 @@ export class AssignRoleToWorkspaceMemberTool extends BaseTool<message:`Role assigned to workspace member ${workspaceMember.name?.firstName ?? ''} ${workspaceMember.name?.lastName ?? ''}`.trim(),result: {- workspaceMemberId: parameters.workspaceMemberId,- roleId: parameters.roleId,+ workspaceMemberId: input.workspaceMemberId,+ roleId: input.roleId,},};}diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/create-role.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/create-role.tool.tsindex fe9377d3f9b..62fc7c8f699 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/create-role.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/create-role.tool.ts@@ -5,7 +5,7 @@ import { z } from 'zod';import { ApplicationService } from 'src/engine/core-modules/application/application.service';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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { RoleService } from 'src/engine/metadata-modules/role/role.service';import { rolePermissionsSchema } from 'src/engine/metadata-modules/role/tools/schemas/role-permissions.schema';@@ -40,10 +40,10 @@ export class CreateRoleTool extends BaseTool<typeof createRoleInputSchema> {super();}- async execute(- parameters: z.infer<typeof createRoleInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId },+ }: ToolExecuteArgs<typeof createRoleInputSchema>): Promise<ToolOutput> {const { workspaceCustomFlatApplication } =await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow({ workspaceId },@@ -51,7 +51,7 @@ export class CreateRoleTool extends BaseTool<typeof createRoleInputSchema> {const role = await this.roleService.createRole({workspaceId,- input: parameters,+ input,ownerFlatApplication: workspaceCustomFlatApplication,});diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.tsindex 0f37787af69..350b5c03eb8 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/delete-role.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { RoleService } from 'src/engine/metadata-modules/role/role.service';import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';@@ -28,12 +28,12 @@ export class DeleteRoleTool extends BaseTool<typeof deleteRoleInputSchema> {super();}- async execute(- parameters: z.infer<typeof deleteRoleInputSchema>,- { workspaceId, rolePermissionConfig }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, rolePermissionConfig },+ }: ToolExecuteArgs<typeof deleteRoleInputSchema>): Promise<ToolOutput> {const deletedRole = await this.roleService.deleteRole({- roleId: parameters.roleId,+ roleId: input.roleId,workspaceId,actingRoleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),});diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/list-roles.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/list-roles.tool.tsindex 2cb2b6124a0..76bbec846c6 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/list-roles.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/list-roles.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { RoleService } from 'src/engine/metadata-modules/role/role.service';import { toRoleSummary } from 'src/engine/metadata-modules/role/tools/utils/to-role-summary.util';@@ -40,11 +40,11 @@ export class ListRolesTool extends BaseTool<typeof listRolesInputSchema> {super();}- async execute(- parameters: z.infer<typeof listRolesInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {- if (!parameters.includeRowLevelPermissionRules) {+ async execute({+ input,+ context: { workspaceId },+ }: ToolExecuteArgs<typeof listRolesInputSchema>): Promise<ToolOutput> {+ if (!input.includeRowLevelPermissionRules) {const roles = await this.roleService.getWorkspaceRoles(workspaceId);return {diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.tsindex b55e9e09682..d4b1bed059f 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/update-role.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { RoleService } from 'src/engine/metadata-modules/role/role.service';import { rolePermissionsSchema } from 'src/engine/metadata-modules/role/tools/schemas/role-permissions.schema';@@ -37,15 +37,15 @@ export class UpdateRoleTool extends BaseTool<typeof updateRoleInputSchema> {super();}- async execute(- parameters: z.infer<typeof updateRoleInputSchema>,- { workspaceId, rolePermissionConfig }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId, rolePermissionConfig },+ }: ToolExecuteArgs<typeof updateRoleInputSchema>): Promise<ToolOutput> {const role = await this.roleService.updateRole({workspaceId,input: {- id: parameters.roleId,- update: parameters.update,+ id: input.roleId,+ update: input.update,},actingRoleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),});diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-object-permissions.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-object-permissions.tool.tsindex f286afa053c..4f1c0de690a 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-object-permissions.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-object-permissions.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { ObjectPermissionService } from 'src/engine/metadata-modules/object-permission/object-permission.service';import { toObjectPermissionSummary } from 'src/engine/metadata-modules/role/tools/utils/to-role-summary.util';@@ -62,16 +62,18 @@ export class UpsertObjectPermissionsTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof upsertObjectPermissionsInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId },+ }: ToolExecuteArgs<+ typeof upsertObjectPermissionsInputSchema+ >): Promise<ToolOutput> {const objectPermissions =await this.objectPermissionService.upsertObjectPermissions({workspaceId,input: {- roleId: parameters.roleId,- objectPermissions: parameters.objectPermissions,+ roleId: input.roleId,+ objectPermissions: input.objectPermissions,},});@@ -79,7 +81,7 @@ export class UpsertObjectPermissionsTool extends BaseTool<success: true,message: 'Object permissions updated',result: {- roleId: parameters.roleId,+ roleId: input.roleId,objectPermissions: objectPermissions.map(toObjectPermissionSummary),},};diff --git a/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-row-level-permission-rules.tool.ts b/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-row-level-permission-rules.tool.tsindex c83e1352a79..5bc4cb70e1a 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-row-level-permission-rules.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/tools/upsert-row-level-permission-rules.tool.ts@@ -8,7 +8,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { RowLevelPermissionPredicateService } from 'src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service';@@ -132,24 +132,24 @@ export class UpsertRowLevelPermissionRulesTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof upsertRowLevelPermissionRulesInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId },+ }: ToolExecuteArgs<+ typeof upsertRowLevelPermissionRulesInputSchema+ >): Promise<ToolOutput> {const { predicates, predicateGroups } =await this.rowLevelPermissionPredicateService.upsertRowLevelPermissionPredicates({workspaceId,input: {- roleId: parameters.roleId,- objectMetadataId: parameters.objectMetadataId,- predicates: parameters.predicates,- predicateGroups: parameters.predicateGroups.map(- (predicateGroup) => ({- ...predicateGroup,- objectMetadataId: parameters.objectMetadataId,- }),- ),+ roleId: input.roleId,+ objectMetadataId: input.objectMetadataId,+ predicates: input.predicates,+ predicateGroups: input.predicateGroups.map((predicateGroup) => ({+ ...predicateGroup,+ objectMetadataId: input.objectMetadataId,+ })),},},);diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.tsindex 0b5b37a8ece..a4ffd91f8dd 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { webhookOperationSchema } from 'src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema';import { compileWebhookOperations } from 'src/engine/metadata-modules/webhook/tools/utils/compile-webhook-operations.util';@@ -51,15 +51,10 @@ export class CreateWebhookTool extends BaseTool<super();}- async execute(- {- targetUrl,- operations,- description,- secret,- }: z.infer<typeof createWebhookInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input: { targetUrl, operations, description, secret },+ context: { workspaceId },+ }: ToolExecuteArgs<typeof createWebhookInputSchema>): Promise<ToolOutput> {const webhook = await this.webhookService.create({targetUrl,diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/delete-webhook.tool.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/delete-webhook.tool.tsindex cfb62a156e8..e3cb64b7bee 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/delete-webhook.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/delete-webhook.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.service';@@ -27,10 +27,10 @@ export class DeleteWebhookTool extends BaseTool<super();}- async execute(- { id }: z.infer<typeof deleteWebhookInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input: { id },+ context: { workspaceId },+ }: ToolExecuteArgs<typeof deleteWebhookInputSchema>): Promise<ToolOutput> {const webhook = await this.webhookService.delete(id, workspaceId);return {diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/list-webhooks.tool.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/list-webhooks.tool.tsindex 964f9e836e2..ad4c0d590b8 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/list-webhooks.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/list-webhooks.tool.ts@@ -4,7 +4,7 @@ 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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.service';@@ -23,10 +23,9 @@ export class ListWebhooksTool extends BaseTool<typeof listWebhooksInputSchema> {super();}- async execute(- _input: z.infer<typeof listWebhooksInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ context: { workspaceId },+ }: ToolExecuteArgs<typeof listWebhooksInputSchema>): Promise<ToolOutput> {const webhooks = await this.webhookService.findAll(workspaceId);return {diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/update-webhook.tool.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/update-webhook.tool.tsindex 30fd51ba7c1..ea8c1782634 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/update-webhook.tool.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/update-webhook.tool.ts@@ -1,10 +1,11 @@import { ToolCategory } from 'twenty-shared/ai';import { PermissionFlagType } from 'twenty-shared/constants';+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 ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+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 { webhookOperationSchema } from 'src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema';import { compileWebhookOperations } from 'src/engine/metadata-modules/webhook/tools/utils/compile-webhook-operations.util';@@ -39,10 +40,10 @@ export class UpdateWebhookTool extends BaseTool<super();}- async execute(- parameters: z.infer<typeof updateWebhookInputSchema>,- { workspaceId }: ToolProviderContext,- ): Promise<ToolOutput> {+ async execute({+ input,+ context: { workspaceId },+ }: ToolExecuteArgs<typeof updateWebhookInputSchema>): Promise<ToolOutput> {const update: {targetUrl?: string;operations?: string[];@@ -50,21 +51,21 @@ export class UpdateWebhookTool extends BaseTool<secret?: string;} = {};- if (parameters.targetUrl !== undefined) {- update.targetUrl = parameters.targetUrl;+ if (isDefined(input.targetUrl)) {+ update.targetUrl = input.targetUrl;}- if (parameters.operations !== undefined) {- update.operations = compileWebhookOperations(parameters.operations);+ if (isDefined(input.operations)) {+ update.operations = compileWebhookOperations(input.operations);}- if (parameters.description !== undefined) {- update.description = parameters.description;+ if (isDefined(input.description)) {+ update.description = input.description;}- if (parameters.secret !== undefined) {- update.secret = parameters.secret;+ if (isDefined(input.secret)) {+ update.secret = input.secret;}const webhook = await this.webhookService.update(- { id: parameters.id, update },+ { id: input.id, update },workspaceId,);