The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Read tool roles from the role permission config only (#28007)
Paul Rastoinf93b4832d96f
diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.tsindex 059ba020494..bf4d2e4f43d 100644--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-instruction-builder.service.ts@@ -21,12 +21,10 @@ export class McpInstructionBuilderService {async buildInstructions({workspaceId,- roleId,rolePermissionConfig,isDirectMode,}: {workspaceId: string;- roleId: string;rolePermissionConfig: RolePermissionConfig;isDirectMode: boolean;}): Promise<string> {@@ -37,7 +35,7 @@ export class McpInstructionBuilderService {flatMapsKeys: ['flatObjectMetadataMaps'],}),this.skillService.findAllFlatSkills(workspaceId),- this.toolRegistry.buildToolIndex(workspaceId, roleId, {+ this.toolRegistry.buildToolIndex(workspaceId, {rolePermissionConfig,categories: [ToolCategory.ACTION],}),diff --git a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.tsindex 2615e6175d0..cf395556122 100644--- a/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts+++ b/packages/twenty-server/src/engine/api/mcp/services/mcp-protocol.service.ts@@ -113,12 +113,10 @@ export class McpProtocolService {requestId: string | number,{workspaceId,- roleId,rolePermissionConfig,isDirectMode,}: {workspaceId: string;- roleId: string;rolePermissionConfig: RolePermissionConfig;isDirectMode: boolean;},@@ -126,7 +124,6 @@ export class McpProtocolService {const instructions =await this.mcpInstructionBuilderService.buildInstructions({workspaceId,- roleId,rolePermissionConfig,isDirectMode,});@@ -157,7 +154,7 @@ export class McpProtocolService {apiKey?: FlatApiKey;application?: FlatApplication;agentId?: string;- }): Promise<{ roleId: string; rolePermissionConfig: RolePermissionConfig }> {+ }): Promise<{ rolePermissionConfig: RolePermissionConfig }> {if (isDefined(apiKey)) {const apiKeyRoleId = await this.apiKeyRoleService.getRoleIdForApiKeyId(apiKey.id,@@ -165,7 +162,6 @@ export class McpProtocolService {);return {- roleId: apiKeyRoleId,rolePermissionConfig: { intersectionOf: { apiKeyRoleId } },};}@@ -184,7 +180,6 @@ export class McpProtocolService {}return {- roleId: application.defaultRoleId,rolePermissionConfig: {intersectionOf: {applicationRoleId: application.defaultRoleId,@@ -207,7 +202,6 @@ export class McpProtocolService {});return {- roleId: userRoleId,rolePermissionConfig: {intersectionOf: {...buildUserRoleIdsBySource({ userRoleId, application }),@@ -282,7 +276,6 @@ export class McpProtocolService {private async buildMcpToolSet(workspace: FlatWorkspace,- roleId: string,rolePermissionConfig: RolePermissionConfig,options?: {authContext?: WorkspaceAuthContext;@@ -301,7 +294,6 @@ export class McpProtocolService {const toolContext: ToolProviderContext = {workspaceId: workspace.id,- roleId,rolePermissionConfig,authContext: options?.authContext,application: options?.application,@@ -319,7 +311,7 @@ export class McpProtocolService {const toolSet: ToolSet = {...annotatePreloadedMcpTools(preloadedTools),[GET_TOOL_CATALOG_TOOL_NAME]: {- ...createGetToolCatalogTool(this.toolRegistry, workspace.id, roleId, {+ ...createGetToolCatalogTool(this.toolRegistry, workspace.id, {rolePermissionConfig,userId: options?.userId,userWorkspaceId: options?.userWorkspaceId,@@ -406,7 +398,7 @@ export class McpProtocolService {}if (method === 'initialize') {- const { roleId, rolePermissionConfig } = await this.resolveCallerRoles({+ const { rolePermissionConfig } = await this.resolveCallerRoles({workspaceId: workspace.id,userWorkspaceId,apiKey,@@ -416,7 +408,6 @@ export class McpProtocolService {return this.handleInitialize(id, {workspaceId: workspace.id,- roleId,rolePermissionConfig,isDirectMode,});@@ -447,7 +438,7 @@ export class McpProtocolService {});}- const { roleId, rolePermissionConfig } = await this.resolveCallerRoles({+ const { rolePermissionConfig } = await this.resolveCallerRoles({workspaceId: workspace.id,userWorkspaceId,apiKey,@@ -458,7 +449,7 @@ export class McpProtocolService {const { toolSet, toolContext } = await Sentry.startSpan({ name: 'mcp build tool set', op: 'mcp.tools', onlyIfParent: true },() =>- this.buildMcpToolSet(workspace, roleId, rolePermissionConfig, {+ this.buildMcpToolSet(workspace, rolePermissionConfig, {authContext,application,userId,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.tsindex a7d8c927071..033c18d7045 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts@@ -9,7 +9,6 @@ import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permexport type ToolProviderContext = {resolveExecutionContext?: () => Promise<ToolProviderContext>;workspaceId: string;- roleId: string;rolePermissionConfig: RolePermissionConfig;authContext?: WorkspaceAuthContext;application?: FlatApplication;@@ -20,5 +19,6 @@ export type ToolProviderContext = {threadId?: string;locale?: keyof typeof APP_LOCALES;onCodeExecutionUpdate?: CodeExecutionStreamEmitter;- requireExplicitObjectGrants?: boolean;+ // database tools then only cover the objects this role explicitly grants+ explicitObjectGrantsRoleId?: string;};diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.tsindex 2ef5311aa39..ba79a59ce3e 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/action-tool.provider.spec.ts@@ -27,7 +27,6 @@ const USER_AUTH_CONTEXT = {const CONTEXT: ToolProviderContext = {workspaceId: WORKSPACE_ID,- roleId: 'role-id',rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-id' } },authContext: USER_AUTH_CONTEXT,userId: 'user-id',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/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.tsindex b90197b540f..7e79ff1328f 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/agent-tool.provider.spec.ts@@ -85,7 +85,6 @@ const otherApplication = {const context: ToolProviderContext = {workspaceId,- roleId: 'caller-role-id',rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: 'caller-role-id' },},diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.tsindex cfba990d59e..d4c66c5f68f 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/database-tool.provider.spec.ts@@ -10,9 +10,11 @@ import { type WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/meimport { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';const roleId = 'role-id';+const userRoleId = 'user-role-id';const workspaceId = 'workspace-id';const allObjectPermissions: ObjectPermissions = {@@ -44,9 +46,11 @@ type ExplicitPermissionRow = {};type GenerateDescriptorsTestOptions = {- requireExplicitObjectGrants?: boolean;+ explicitObjectGrantsRoleId?: string;explicitPermissionRows?: ExplicitPermissionRow[];composedObjectPermissions?: Partial<ObjectPermissions>;+ explicitPermissionRowsRoleId?: string;+ rolePermissionConfig?: RolePermissionConfig;};describe('DatabaseToolProvider', () => {@@ -73,24 +77,30 @@ describe('DatabaseToolProvider', () => {canSoftDeleteObjectRecords: true,}));+ const composedObjectPermissionsByObjectId = Object.fromEntries(+ objects.map((object) => [+ object.id,+ {+ ...allObjectPermissions,+ ...options?.composedObjectPermissions,+ },+ ]),+ );+const workspaceCacheService = {getOrRecompute: jest.fn().mockResolvedValue({rolesPermissions: {- [roleId]: Object.fromEntries(- objects.map((object) => [- object.id,- {- ...allObjectPermissions,- ...options?.composedObjectPermissions,- },- ]),- ),+ [roleId]: composedObjectPermissionsByObjectId,+ [userRoleId]: composedObjectPermissionsByObjectId,},flatObjectPermissionMaps: {byUniversalIdentifier: Object.fromEntries(explicitPermissionRows.map((row, index) => [`object-permission-${index}`,- { roleId, ...row },+ {+ roleId: options?.explicitPermissionRowsRoleId ?? roleId,+ ...row,+ },]),),},@@ -136,9 +146,10 @@ describe('DatabaseToolProvider', () => {return (await provider.generateDescriptors({workspaceId,- roleId,- rolePermissionConfig: { intersectionOf: { agentRoleId: roleId } },- requireExplicitObjectGrants: options?.requireExplicitObjectGrants,+ rolePermissionConfig: options?.rolePermissionConfig ?? {+ intersectionOf: { agentRoleId: roleId },+ },+ explicitObjectGrantsRoleId: options?.explicitObjectGrantsRoleId,},{ includeSchemas: false },)) as (ToolIndexEntry | ToolDescriptor)[];@@ -325,7 +336,7 @@ describe('DatabaseToolProvider', () => {}});- describe('requireExplicitObjectGrants', () => {+ describe('explicitObjectGrantsRoleId', () => {const personObject = createFlatObject({nameSingular: 'person',namePlural: 'people',@@ -339,7 +350,7 @@ describe('DatabaseToolProvider', () => {const descriptorNames = await generateDescriptorNames([personObject, companyObject],{- requireExplicitObjectGrants: true,+ explicitObjectGrantsRoleId: roleId,explicitPermissionRows: [{objectMetadataId: personObject.id,@@ -355,7 +366,7 @@ describe('DatabaseToolProvider', () => {it('emits only the verbs granted by the explicit row', async () => {const descriptorNames = await generateDescriptorNames([personObject], {- requireExplicitObjectGrants: true,+ explicitObjectGrantsRoleId: roleId,explicitPermissionRows: [{objectMetadataId: personObject.id,@@ -373,7 +384,7 @@ describe('DatabaseToolProvider', () => {it('drops the verbs the composed permissions deny even with an explicit row', async () => {const descriptorNames = await generateDescriptorNames([personObject], {- requireExplicitObjectGrants: true,+ explicitObjectGrantsRoleId: roleId,composedObjectPermissions: {canUpdateObjectRecords: false,canSoftDeleteObjectRecords: false,@@ -385,7 +396,22 @@ describe('DatabaseToolProvider', () => {expect(descriptorNames).not.toContain('delete_one_person');});- it('keeps composed permissions when the flag is not set even without explicit rows', async () => {+ it('ignores explicit rows of the other roles', async () => {+ const descriptorNames = await generateDescriptorNames([personObject], {+ explicitObjectGrantsRoleId: roleId,+ explicitPermissionRowsRoleId: userRoleId,+ rolePermissionConfig: {+ intersectionOf: {+ agentRoleId: roleId,+ userWorkspaceRoleId: userRoleId,+ },+ },+ });++ expect(descriptorNames).toEqual([]);+ });++ it('keeps composed permissions without a grants role even without explicit rows', async () => {const descriptorNames = await generateDescriptorNames([personObject], {explicitPermissionRows: [],});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.tsindex 9795f4946ed..0ad192f0a19 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/logic-function-tool.provider.spec.ts@@ -66,7 +66,6 @@ const generateDescriptors = async (return (await provider.generateDescriptors({workspaceId,- roleId,rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: roleId } },application,},diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/role-tool.provider.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/role-tool.provider.spec.tsindex f35677bae58..b07225ca9ca 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/role-tool.provider.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/__tests__/role-tool.provider.spec.ts@@ -88,7 +88,6 @@ const buildProvider = (options?: { hasRolesPermission?: boolean }) => {const context: ToolProviderContext = {workspaceId,- roleId: callerRoleId,rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: callerRoleId },},@@ -307,6 +306,53 @@ describe('RoleToolProvider', () => {actingRoleIds: [callerRoleId],});});++ it('forwards every role of the caller config for lockout protection', async () => {+ const { provider, roleService } = buildProvider();++ roleService.updateRole.mockResolvedValue({ id: 'other-role-id' });++ await provider.executeStaticTool(+ 'update_role',+ { roleId: 'other-role-id', update: { canUpdateAllSettings: false } },+ {+ ...context,+ rolePermissionConfig: {+ intersectionOf: {+ userWorkspaceRoleId: callerRoleId,+ applicationRoleId: 'application-role-id',+ },+ },+ },+ );++ expect(roleService.updateRole).toHaveBeenCalledTimes(1);+ expect(roleService.updateRole).toHaveBeenCalledWith(+ expect.objectContaining({+ actingRoleIds: [callerRoleId, 'application-role-id'],+ }),+ );+ });++ it('forwards no caller role when the config bypasses permission checks', async () => {+ const { provider, roleService } = buildProvider();++ roleService.updateRole.mockResolvedValue({ id: 'other-role-id' });++ await provider.executeStaticTool(+ 'update_role',+ { roleId: 'other-role-id', update: { canUpdateAllSettings: false } },+ {+ ...context,+ rolePermissionConfig: { shouldBypassPermissionChecks: true },+ },+ );++ expect(roleService.updateRole).toHaveBeenCalledTimes(1);+ expect(roleService.updateRole).toHaveBeenCalledWith(+ expect.objectContaining({ actingRoleIds: [] }),+ );+ });});describe('delete_role', () => {diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.tsindex 811a4f3af60..75f4108827d 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/database-tool.provider.ts@@ -85,8 +85,8 @@ export class DatabaseToolProvider implements ToolProvider {return descriptors;}- const requireExplicitObjectGrants =- context.requireExplicitObjectGrants === true;+ const { explicitObjectGrantsRoleId } = context;+ const requireExplicitObjectGrants = isDefined(explicitObjectGrantsRoleId);const explicitPermissionByObjectId = new Map<string,@@ -99,7 +99,7 @@ export class DatabaseToolProvider implements ToolProvider {)) {if (isDefined(flatObjectPermission) &&- flatObjectPermission.roleId === context.roleId+ flatObjectPermission.roleId === explicitObjectGrantsRoleId) {explicitPermissionByObjectId.set(flatObjectPermission.objectMetadataId,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/role-tool.provider.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/role-tool.provider.tsindex 9472f2e5ee3..58ef280bf1a 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/providers/role-tool.provider.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/providers/role-tool.provider.ts@@ -56,14 +56,11 @@ export class RoleToolProvider implements ToolProvider {}private buildToolSet(context: ToolProviderContext): ToolSet {- const callerRoleIds = new Set([- ...getRoleIdsFromRolePermissionConfig(context.rolePermissionConfig),- context.roleId,- ]);-return this.roleToolWorkspaceService.generateRoleTools({workspaceId: context.workspaceId,- callerRoleIds: [...callerRoleIds],+ callerRoleIds: getRoleIdsFromRolePermissionConfig(+ context.rolePermissionConfig,+ ),callerUserWorkspaceId: context.userWorkspaceId,});}diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.tsindex d52030a25fd..9d9613b8fd1 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts@@ -80,13 +80,13 @@ export class ToolIndexResolver {application: FlatApplication | undefined,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,): Promise<ToolIndexEntryDTO[]> {- const { userRoleId, rolePermissionConfig } = await this.resolveCallerRoles({+ const { rolePermissionConfig } = await this.resolveCallerRoles({userWorkspaceId,workspaceId: workspace.id,application,});- return this.toolRegistryService.buildToolIndex(workspace.id, userRoleId, {+ return this.toolRegistryService.buildToolIndex(workspace.id, {rolePermissionConfig,userId: user?.id,userWorkspaceId,@@ -106,7 +106,7 @@ export class ToolIndexResolver {@AuthApplication({ allowUndefined: true })application: FlatApplication | undefined,): Promise<object | null> {- const { userRoleId, rolePermissionConfig } = await this.resolveCallerRoles({+ const { rolePermissionConfig } = await this.resolveCallerRoles({userWorkspaceId,workspaceId: workspace.id,application,@@ -116,7 +116,6 @@ export class ToolIndexResolver {toolNames: [toolName],context: {workspaceId: workspace.id,- roleId: userRoleId,rolePermissionConfig,userId: user?.id,userWorkspaceId,@@ -135,17 +134,13 @@ export class ToolIndexResolver {userWorkspaceId: string;workspaceId: string;application: FlatApplication | undefined;- }): Promise<{- userRoleId: string;- rolePermissionConfig: RolePermissionConfig;- }> {+ }): Promise<{ rolePermissionConfig: RolePermissionConfig }> {const userRoleId = await this.userRoleService.getRoleIdForUserWorkspace({userWorkspaceId,workspaceId,});return {- userRoleId,rolePermissionConfig: {intersectionOf: buildUserRoleIdsBySource({userRoleId,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.tsindex 5a25dd3f6a7..731bfbbac48 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts@@ -179,7 +179,6 @@ export class ToolRegistryService {async buildToolIndex(workspaceId: string,- roleId: string,options: {userId?: string;userWorkspaceId?: string;@@ -192,7 +191,6 @@ export class ToolRegistryService {): Promise<ToolIndexEntry[]> {const context = this.buildContextFromToolContext({workspaceId,- roleId,rolePermissionConfig: options.rolePermissionConfig,userId: options.userId,userWorkspaceId: options.userWorkspaceId,@@ -506,7 +504,6 @@ export class ToolRegistryService {): undefined,workspaceId: context.workspaceId,- roleId: context.roleId,rolePermissionConfig: context.rolePermissionConfig,authContext: context.authContext,application: context.application,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.tsindex a845c4fd4cc..6ab6cb721be 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/get-tool-catalog.tool.ts@@ -32,7 +32,6 @@ export type GetToolCatalogResult = {export const createGetToolCatalogTool = (toolRegistry: ToolRegistryService,workspaceId: string,- roleId: string,options: {rolePermissionConfig: RolePermissionConfig;userId?: string;@@ -47,11 +46,7 @@ export const createGetToolCatalogTool = (execute: async (parameters: GetToolCatalogInput,): Promise<GetToolCatalogResult> => {- const entries = await toolRegistry.buildToolIndex(- workspaceId,- roleId,- options,- );+ const entries = await toolRegistry.buildToolIndex(workspaceId, options);const categoryFilter = parameters.categories? new Set(parameters.categories)diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.tsindex 259bcd8521b..ae3c68207ed 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts@@ -10,7 +10,6 @@ import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permexport type ToolContext = {resolveExecutionContext?: () => Promise<ToolContext>;workspaceId: string;- roleId: string;rolePermissionConfig: RolePermissionConfig;authContext?: WorkspaceAuthContext;application?: FlatApplication;diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.tsindex 71ea434d9d4..26bf037b05b 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts@@ -14,7 +14,6 @@ describe('buildRequiredToolAuthContext', () => {overrides?: Partial<ToolProviderContext>,): ToolProviderContext => ({workspaceId,- roleId: 'role-1',rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-1' } },...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.tsindex 1a7a3142a66..469a9d4fc1c 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts@@ -16,7 +16,6 @@ describe('withResolvedToolAuthContext', () => {overrides?: Partial<ToolProviderContext>,): ToolProviderContext => ({workspaceId,- roleId: 'role-1',rolePermissionConfig: { intersectionOf: { userWorkspaceRoleId: 'role-1' } },...overrides,});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.tsindex 53bbb99775c..b142a3e1755 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts@@ -107,7 +107,6 @@ type ProposableTools = {type RegistryToolContext = Pick<ToolContext,| 'workspaceId'- | 'roleId'| 'authContext'| 'actorContext'| 'userId'@@ -164,21 +163,23 @@ export class AgentAsyncExecutorService {// preloading the few granted object schemas saves the model a learn_tools round tripprivate async buildPreloadedRegistryTools({toolContext,+ agentRoleId,agentRunRoleIds,additionalExcludedToolNames = [],}: {toolContext: RegistryToolContext;+ agentRoleId: string;agentRunRoleIds?: AgentRunRoleIds;additionalExcludedToolNames?: readonly string[];}): Promise<{ tools: ToolSet; proposableTools: ProposableTools }> {const rolePermissionConfig = buildAgentRolePermissionConfig({- agentRoleId: toolContext.roleId,+ agentRoleId,agentRunRoleIds,});const preloadedToolContext = { ...toolContext, rolePermissionConfig };const tools = await this.toolRegistry.getToolsByCategories(- { ...preloadedToolContext, requireExplicitObjectGrants: true },+ { ...preloadedToolContext, explicitObjectGrantsRoleId: agentRoleId },{categories: PRELOADED_AGENT_REGISTRY_TOOL_CATEGORIES,excludeTools: [@@ -210,10 +211,12 @@ export class AgentAsyncExecutorService {// learn_tools / execute_tool instead, scoped by composed role permissions rather than explicit grants onlyprivate async buildLazyRegistryTools({toolContext: baseToolContext,+ agentRoleId,agentRunRoleIds,additionalExcludedToolNames = [],}: {toolContext: RegistryToolContext;+ agentRoleId: string;agentRunRoleIds?: AgentRunRoleIds;additionalExcludedToolNames?: readonly string[];}): Promise<{@@ -224,23 +227,18 @@ export class AgentAsyncExecutorService {const toolContext: ToolContext = {...baseToolContext,rolePermissionConfig: buildAgentRolePermissionConfig({- agentRoleId: baseToolContext.roleId,+ agentRoleId,agentRunRoleIds,}),};- const {- workspaceId,- roleId,+ const { workspaceId, userId, userWorkspaceId, rolePermissionConfig } =+ toolContext;++ const fullCatalog = await this.toolRegistry.buildToolIndex(workspaceId, {userId,userWorkspaceId,rolePermissionConfig,- } = toolContext;-- const fullCatalog = await this.toolRegistry.buildToolIndex(- workspaceId,- roleId,- { userId, userWorkspaceId, rolePermissionConfig },- );+ });const allowedCategories = new Set(OPEN_ENDED_AGENT_REGISTRY_TOOL_CATEGORIES,@@ -409,7 +407,6 @@ export class AgentAsyncExecutorService {if (isDefined(agentRoleId)) {const toolContext: RegistryToolContext = {workspaceId: agent.workspaceId,- roleId: agentRoleId,agentId: agent.id,authContext,actorContext,@@ -419,12 +416,14 @@ export class AgentAsyncExecutorService {toolLoadingStrategy === 'lazy'? await this.buildLazyRegistryTools({toolContext,+ agentRoleId,agentRunRoleIds,additionalExcludedToolNames,}): {...(await this.buildPreloadedRegistryTools({toolContext,+ agentRoleId,agentRunRoleIds,additionalExcludedToolNames,})),diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.tsindex 01cc16af0ea..8cc5d2c1323 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-caller-conversation.service.ts@@ -22,7 +22,6 @@ import {AiException,AiExceptionCode,} from 'src/engine/metadata-modules/ai/ai.exception';-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';const MAX_ASK_ATTEMPTS = 10;@@ -275,7 +274,6 @@ export class AgentCallerConversationService {const toolContext = {workspaceId,- roleId: getRoleIdsFromRolePermissionConfig(rolePermissionConfig)[0] ?? '',rolePermissionConfig,authContext,application,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.tsindex dc380daf22a..0e4c87ad975 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts@@ -153,7 +153,6 @@ export class AgentChatActorService {}const rolePermissions = await this.resolveRolePermissions({workspaceId,- userWorkspaceId: sender.userWorkspaceId,authContext,});if (!isDefined(rolePermissions)) {@@ -168,15 +167,11 @@ export class AgentChatActorService {// the permissions a member acts with in the chat, also used to run the calls they approveasync resolveRolePermissions({workspaceId,- userWorkspaceId,authContext,}: {workspaceId: string;- userWorkspaceId: string;authContext: WorkspaceAuthContext;- }): Promise<- { rolePermissionConfig: RolePermissionConfig; roleId: string } | undefined- > {+ }): Promise<{ rolePermissionConfig: RolePermissionConfig } | undefined> {const { userWorkspaceRoleMap } =await this.workspaceCacheService.getOrRecompute(workspaceId, ['userWorkspaceRoleMap',@@ -187,10 +182,9 @@ export class AgentChatActorService {apiKeyRoleMap: {},flatRoleTargetByAgentIdMaps: {},});- const roleId = userWorkspaceRoleMap[userWorkspaceId];- return isDefined(rolePermissionConfig) && isDefined(roleId)- ? { rolePermissionConfig, roleId }+ return isDefined(rolePermissionConfig)+ ? { rolePermissionConfig }: undefined;}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.tsindex be2c0c894dc..6a1f9196763 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service.ts@@ -61,7 +61,6 @@ export class AgentInboxProposalService {const toolContext: ToolContext = {workspaceId,- roleId: application.defaultRoleId,rolePermissionConfig,authContext,application,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.tsindex 4105de83beb..1e3cfb7e811 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts@@ -187,7 +187,7 @@ export class ChatExecutionService {...(await getAuthorization()),resolveExecutionContext: undefined,});- const { actorContext, roleId, userId, userContext } =+ const { actorContext, userId, userContext } =await this.agentActorContextService.buildUserAndAgentActorContext(userWorkspaceId,workspace.id,@@ -207,17 +207,13 @@ export class ChatExecutionService {resolveExecutionContext,};- const toolCatalog = await this.toolRegistry.buildToolIndex(- workspace.id,- roleId,- {- userId,- userWorkspaceId,- locale,- excludeTools: AI_CHAT_EXCLUDED_TOOL_NAMES,- rolePermissionConfig: toolContext.rolePermissionConfig,- },- );+ const toolCatalog = await this.toolRegistry.buildToolIndex(workspace.id, {+ userId,+ userWorkspaceId,+ locale,+ excludeTools: AI_CHAT_EXCLUDED_TOOL_NAMES,+ rolePermissionConfig: toolContext.rolePermissionConfig,+ });const skillCatalog = await this.skillService.findAllFlatSkills(workspace.id,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.tsindex 08dc618a35d..9063d029918 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service.ts@@ -43,7 +43,7 @@ export class SystemPromptBuilderService {const [toolCatalog, skillCatalog, canAttachConversationToRecords] =await Promise.all([- this.toolRegistry.buildToolIndex(workspaceId, roleId, {+ this.toolRegistry.buildToolIndex(workspaceId, {rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: roleId },},diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/__tests__/attach-conversation-to-record.tool.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/__tests__/attach-conversation-to-record.tool.spec.tsindex 3382ce2491c..394c990b048 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/__tests__/attach-conversation-to-record.tool.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/__tests__/attach-conversation-to-record.tool.spec.ts@@ -31,7 +31,6 @@ const buildUserAuthContext = (workspaceMemberId: string) =>const buildToolContext = (overrides: Partial<ToolContext> = {}) =>({workspaceId: WORKSPACE_ID,- roleId: 'role-id',threadId: THREAD_ID,authContext: buildUserAuthContext('member-at-turn-start'),...overrides,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.tsindex 97179d84849..2926af1c9e6 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts@@ -516,7 +516,6 @@ export class ToolCallAnswerService {const rolePermissions = await this.actorService.resolveRolePermissions({workspaceId,- userWorkspaceId,authContext,});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.tsindex 9aeb3235b82..09fdda16b7b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service.ts@@ -29,7 +29,7 @@ export class AiWorkspaceStatsService {flatMapsKeys: ['flatSkillMaps'],}),// the full role-scoped catalog, to match the Tools tab- this.toolRegistryService.buildToolIndex(workspaceId, userRoleId, {+ this.toolRegistryService.buildToolIndex(workspaceId, {rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: userRoleId },},diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.tsindex 231fb3c9563..6cf67785463 100644--- a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-code-interpreter-token-beyond-agent-role.integration-spec.ts@@ -58,7 +58,6 @@ const captureSandboxTokenForAgentRun = async ({token,})).executionContext.authContext,- roleId: globalTestContext.agentRoleId,rolePermissionConfig: {intersectionOf: { agentRoleId: globalTestContext.agentRoleId },},diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.tsindex e574eb704bf..6e56c7c80a8 100644--- a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-code-interpreter-token-for-agent-run-caller.integration-spec.ts@@ -33,7 +33,6 @@ const captureSandboxTokenForAgentRun = async ({token,})).executionContext.authContext,- roleId: globalTestContext.applicationRoleId,rolePermissionConfig: {intersectionOf: {applicationRoleId: globalTestContext.applicationRoleId,diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.tsindex 0839550c53f..eea2775786e 100644--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-token.util.ts@@ -9,12 +9,10 @@ import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permexport const captureCodeInterpreterSandboxToken = async ({authContext,- roleId,rolePermissionConfig,agentId,}: {authContext: WorkspaceAuthContext;- roleId: string;rolePermissionConfig: RolePermissionConfig;agentId?: string;}): Promise<string | undefined> => {@@ -41,7 +39,6 @@ export const captureCodeInterpreterSandboxToken = async ({{ code: 'pass' },{workspaceId: authContext.workspace.id,- roleId,rolePermissionConfig,authContext,agentId,diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.tsindex 142e3b7877e..312043c984c 100644--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/capture-code-interpreter-sandbox-tokens.util.ts@@ -59,7 +59,6 @@ export const captureCodeInterpreterSandboxTokens = async ({applicationRunAsJaneToken: requireToken(await captureCodeInterpreterSandboxToken({authContext: runAsJaneContext,- roleId: janeRoleId,rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: janeRoleId },},@@ -68,7 +67,6 @@ export const captureCodeInterpreterSandboxTokens = async ({janeDirectRunToken: requireToken(await captureCodeInterpreterSandboxToken({authContext: janeContext,- roleId: janeRoleId,rolePermissionConfig: {intersectionOf: { userWorkspaceRoleId: janeRoleId },},