Skip to content

The open alternative to Salesforce, designed for AI.

Move permission code into engine/permissions (#29375)

Charles Bochetf38a8cf13c00
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
index 0ba32501031..e7388d36df0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/preserve-legacy-record-access.util.ts
@@ -5,9 +5,9 @@ import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { MetadataReadability, MetadataWritability } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { resolveInheritedReadabilityParents } from 'src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util';
+import { resolveInheritedReadabilityParents } from 'src/engine/permissions/record-share/utils/resolve-inherited-readability-parents.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type RowAccessPolicyEnvironment } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessPolicyEnvironment } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
index 4a86f6535b7..2cc8a250710 100644
--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
+++ b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
@@ -32,7 +32,7 @@ import {
type FieldMapsForObject,
} from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { 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 RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
index f9c45c013b2..6b8b885ecf6 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
@@ -72,7 +72,7 @@ import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/re
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type MutationKind } from 'src/engine/twenty-orm/sql/utils/build-mutation-statement.util';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { addTimelineActivityObjectColumnsToSelect } from 'src/modules/timeline/utils/add-timeline-activity-object-columns-to-select.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
index 5a5ddca4f33..e8f76e6072e 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
@@ -47,13 +47,13 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-module
import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { ShareWithService } from 'src/engine/core-modules/record-share/services/share-with.service';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { resolveShareWithToWrite } from 'src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { ShareWithService } from 'src/engine/permissions/record-share/services/share-with.service';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { resolveShareWithToWrite } from 'src/engine/permissions/record-share/utils/resolve-share-with-to-write.util';
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { containsNestedRelationCreate } from 'src/engine/twenty-orm/utils/contains-nested-relation-create.util';
import { getNestedRelationFieldNames } from 'src/engine/twenty-orm/utils/get-nested-relation-field-names.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
index d1d74c0c886..45f68018541 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
@@ -51,7 +51,7 @@ import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/
import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
diff --git a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
index 18f689944a6..ab631c129d6 100644
--- a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
+++ b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
@@ -18,7 +18,7 @@ import { UsageModule } from 'src/engine/core-modules/usage/usage.module';
import { ViewFilterGroupModule } from 'src/engine/metadata-modules/view-filter-group/view-filter-group.module';
import { ViewFilterModule } from 'src/engine/metadata-modules/view-filter/view-filter.module';
import { ViewModule } from 'src/engine/metadata-modules/view/view.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
diff --git a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
index 1458fe4f617..fac95e2d111 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
@@ -3,7 +3,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
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 RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
export type CommonBaseQueryRunnerContext = {
diff --git a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
index d283fc720e2..cb7b2c4fd92 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-extended-query-runner-context.type.ts
@@ -4,7 +4,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
import { type CommonBaseQueryRunnerContext } from 'src/engine/api/common/types/common-base-query-runner-context.type';
import { type GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type CommonExtendedQueryRunnerContext = Omit<
CommonBaseQueryRunnerContext,
diff --git a/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts b/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts
index 5067164a9ff..ea7a8f09b4a 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-query-args.type.ts
@@ -13,7 +13,7 @@ import {
type CommonSelectedFields,
type CommonSelectedFieldsResult,
} from 'src/engine/api/common/types/common-selected-fields-result.type';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
export enum CommonQueryNames {
FIND_ONE = 'findOne',
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts
index d49960882d3..0c4f84151b0 100644
--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/assert-share-with-arg.util.ts
@@ -4,7 +4,7 @@ import { RecordShareAccessLevel } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import {
GraphqlDirectExecutionException,
GraphqlDirectExecutionExceptionCode,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
index 135052f1fae..033062828ac 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
@@ -20,7 +20,7 @@ import {
GraphqlQueryRunnerExceptionCode,
} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
import { addRelationJoinAliasToQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/add-relation-join-alias.util';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
import { assertFieldIsReadableOrThrow } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/assert-field-is-readable-or-throw.util';
import { resolveFilterKeyFieldMetadata } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util';
import { assertArrayOperatorValueIsNonEmptyArray } from 'src/engine/api/graphql/graphql-query-runner/utils/assert-array-operator-value-is-non-empty-array.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
index e8c09411dba..98d9940398e 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
@@ -20,8 +20,8 @@ import { UsageLimitException } from 'src/engine/core-modules/usage-limit/excepti
import { usageLimitToGraphqlApiExceptionHandler } from 'src/engine/core-modules/usage-limit/utils/usage-limit-to-graphql-api-exception-handler.util';
import { PermissionsException } from 'src/engine/metadata-modules/permissions/permissions.exception';
import { permissionGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util';
-import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
-import { recordShareGraphqlApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util';
+import { RecordShareException } from 'src/engine/permissions/record-share/record-share.exception';
+import { recordShareGraphqlApiExceptionHandler } from 'src/engine/permissions/record-share/utils/record-share-graphql-api-exception-handler.util';
import { RecordValidationRuleException } from 'src/engine/metadata-modules/validation-rule/exceptions/record-validation-rule.exception';
import { recordValidationRuleGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/validation-rule/utils/record-validation-rule-graphql-api-exception-handler.util';
import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
index d73f3be030a..8799c1ec6a2 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
@@ -10,7 +10,7 @@ import {
type ObjectRecordOrderBy,
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
import { type workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
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.ts
index 53627ef6539..544ff0153bb 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
@@ -9,7 +9,7 @@ import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/servi
import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
@Injectable()
export class McpInstructionBuilderService {
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.ts
index eb319bf33ff..7d498f01af5 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
@@ -68,9 +68,9 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat
import {
type RoleIdsBySource,
type RolePermissionConfig,
-} from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
+} from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
index a5553a3923b..6e3fef3c56b 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
@@ -39,8 +39,8 @@ import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role
import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
export interface PageInfo {
hasNextPage?: boolean;
diff --git a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
index ada9ea32c5b..5c5408b45f8 100644
--- a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
@@ -7,8 +7,8 @@ import { commonQueryRunnerToRestApiExceptionHandler } from 'src/engine/api/commo
import { CommonSelectFieldsException } from 'src/engine/api/common/common-select-fields/common-select-fields.exception';
import { RestInputRequestParserException } from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';
-import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
-import { recordShareRestApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util';
+import { RecordShareException } from 'src/engine/permissions/record-share/record-share.exception';
+import { recordShareRestApiExceptionHandler } from 'src/engine/permissions/record-share/utils/record-share-rest-api-exception-handler.util';
import { throttlerToRestApiExceptionHandler } from 'src/engine/core-modules/throttler/utils/throttler-to-rest-api-exception-handler.util';
import { UsageLimitException } from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';
import { usageLimitToRestApiExceptionHandler } from 'src/engine/core-modules/usage-limit/utils/usage-limit-to-rest-api-exception-handler.util';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
index 2378d1fccf4..044fb4bf496 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/create-connected-account.service.ts
@@ -11,7 +11,7 @@ import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modu
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
export type CreateConnectedAccountInput = {
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index 562046f98a9..0b41fbbad2d 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -73,7 +73,7 @@ import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-mode
import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';
import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
import { CodeInterpreterSessionCleanupModule } from 'src/engine/core-modules/code-interpreter/crons/code-interpreter-session-cleanup.module';
import { TrashCleanupModule } from 'src/engine/trash-cleanup/trash-cleanup.module';
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts
index 29127bcd867..b4ecdfa6162 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts
@@ -15,7 +15,7 @@ import { LogicFunctionTriggerService } from 'src/engine/core-modules/logic-funct
import { RouteTriggerService } from 'src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts
index bcadd75c972..441d1d39882 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/__tests__/call-database-event-trigger-jobs.job.spec.ts
@@ -20,8 +20,8 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
index 77e475aac99..34296f2ddf1 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts
@@ -23,7 +23,7 @@ import {
LogicFunctionTriggerJob,
LogicFunctionTriggerJobData,
} from 'src/engine/core-modules/logic-function/logic-function-trigger/jobs/logic-function-trigger.job';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { resolveEventsReadableByRole } from 'src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/engine/core-modules/pending-wake-up/listeners/pending-wake-up-database-event.listener.ts b/packages/twenty-server/src/engine/core-modules/pending-wake-up/listeners/pending-wake-up-database-event.listener.ts
index bbb2a448177..d477a5ba509 100644
--- a/packages/twenty-server/src/engine/core-modules/pending-wake-up/listeners/pending-wake-up-database-event.listener.ts
+++ b/packages/twenty-server/src/engine/core-modules/pending-wake-up/listeners/pending-wake-up-database-event.listener.ts
@@ -9,8 +9,8 @@ import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner
import { PendingWakeUpService } from 'src/engine/core-modules/pending-wake-up/services/pending-wake-up.service';
import { buildPendingWakeUpEvent } from 'src/engine/core-modules/pending-wake-up/utils/build-pending-wake-up-event.util';
import { doesEventMatchPendingWakeUp } from 'src/engine/core-modules/pending-wake-up/utils/does-event-match-pending-wake-up.util';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { resolveAutomationAdmittedRecordIds } from 'src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { resolveAutomationAdmittedRecordIds } from 'src/engine/permissions/combine/utils/resolve-automation-admitted-record-ids.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/engine/core-modules/pending-wake-up/pending-wake-up.module.ts b/packages/twenty-server/src/engine/core-modules/pending-wake-up/pending-wake-up.module.ts
index cbefb35e14a..508232f35db 100644
--- a/packages/twenty-server/src/engine/core-modules/pending-wake-up/pending-wake-up.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/pending-wake-up/pending-wake-up.module.ts
@@ -10,7 +10,7 @@ import { PendingWakeUpOwnerHandlerRegistryService } from 'src/engine/core-module
import { PendingWakeUpResolverService } from 'src/engine/core-modules/pending-wake-up/services/pending-wake-up-resolver.service';
import { PendingWakeUpService } from 'src/engine/core-modules/pending-wake-up/services/pending-wake-up.service';
import { RecordCrudModule } from 'src/engine/core-modules/record-crud/record-crud.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
diff --git a/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts b/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
index 797c0b07a5c..b0a5a783941 100644
--- a/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-handler.type.ts
@@ -3,7 +3,7 @@ import { type QueueJobOptions } from 'src/engine/core-modules/message-queue/driv
import { type PendingWakeUpEntity } from 'src/engine/core-modules/pending-wake-up/entities/pending-wake-up.entity';
import { type PendingWakeUpOutcome } from 'src/engine/core-modules/pending-wake-up/types/pending-wake-up-outcome.type';
import { type PendingWakeUpOwnerState } from 'src/engine/core-modules/pending-wake-up/types/pending-wake-up-owner-state.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type PendingWakeUpOwnerHandler<TOwner = unknown> = {
buildResumeJobOptions?(
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts
index 09c09ca77ee..afe1eed8c64 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/common-api-context-builder.service.ts
@@ -18,9 +18,9 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
-import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
export type CommonApiContext = {
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
index e5212fd19f2..5d6384ff1ab 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/create-many-records-params.type.ts
@@ -1,9 +1,9 @@
import { type ActorMetadata } from 'twenty-shared/types';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type CreateManyRecordsParams = {
objectName: string;
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
index 0738b8a5d7f..4756480966e 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/delete-many-records-params.type.ts
@@ -1,7 +1,7 @@
import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type DeleteManyRecordsParams = {
objectName: string;
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
index eb5af551b6d..8d336eb82ad 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-execution-context.type.ts
@@ -1,5 +1,5 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type RecordCrudExecutionContext = {
authContext: WorkspaceAuthContext;
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts
index 67d1b9abdfc..1740176d9fa 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/record-crud-input.type.ts
@@ -1,4 +1,4 @@
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { type ObjectRecordProperties } from './object-record-properties.type';
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
index 0cdf4f3a9d8..a7fd526ed58 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/update-many-records-params.type.ts
@@ -2,7 +2,7 @@ import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type UpdateManyRecordsParams = {
objectName: string;
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts b/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
index f0a2f5bc38b..b0fb2b8bc3d 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/types/upsert-many-records-params.type.ts
@@ -2,7 +2,7 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ObjectRecordProperties } from 'src/engine/core-modules/record-crud/types/object-record-properties.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type UpsertManyRecordsParams = {
objectName: string;
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.ts b/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.ts
deleted file mode 100644
index ca7005d4143..00000000000
--- a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share.type.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* @license Enterprise */
-
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-
-export type RecordShare = RecordShareInput & {
- id: string;
-};
diff --git a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
index 8247d05cde1..3d4370aabfc 100644
--- a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts
@@ -55,8 +55,8 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/over
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { resolveEffectiveFlatEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-flat-entity-property.util';
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.ts
index 033c18d7045..bab577d01ea 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
@@ -4,7 +4,7 @@ import { type APP_LOCALES } from 'twenty-shared/translations';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-provider/interfaces/code-execution-stream-emitter.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolProviderContext = {
resolveExecutionContext?: () => Promise<ToolProviderContext>;
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.ts
index 38dd1ac0b40..9f45a413ab8 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,7 +10,7 @@ import { type WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/me
import { 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 RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
const roleId = 'role-id';
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.ts
index 2af2dc8627c..73c96ac452c 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
@@ -31,7 +31,7 @@ import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.
import { getDatabaseCrudToolFlatObjects } from 'src/engine/metadata-modules/ai/ai-agent/utils/get-database-crud-tool-flat-objects.util';
import { type FlatObjectPermission } from 'src/engine/metadata-modules/flat-object-permission/types/flat-object-permission.type';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';
+import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { RECORDS_TOOL_WIDGET_NAME, ToolCategory } from 'twenty-shared/ai';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
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.ts
index 5a4ee7c3654..bc6437e5449 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
@@ -18,8 +18,8 @@ import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decor
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
@ObjectType('ToolIndexEntry')
export class ToolIndexEntryDTO {
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.ts
index 8977351398c..af5f82c2caf 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
@@ -28,7 +28,7 @@ import { buildToolExecutionFailure } from 'src/engine/core-modules/tool-provider
import { findSimilarToolNames } from 'src/engine/core-modules/tool-provider/utils/find-similar-tool-names.util';
import { ToolOutputSpillService } from 'src/engine/core-modules/tool/services/tool-output-spill.service';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
@Injectable()
export class ToolRegistryService {
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.ts
index e5af1302da6..eb0b745a450 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
@@ -6,7 +6,7 @@ import { type FlatApplication } from 'src/engine/core-modules/application/types/
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';
import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const GET_TOOL_CATALOG_TOOL_NAME = 'get_tool_catalog';
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.ts
index ae3c68207ed..643228aab09 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
@@ -5,7 +5,7 @@ import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-pr
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolContext = {
resolveExecutionContext?: () => Promise<ToolContext>;
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tool.module.ts b/packages/twenty-server/src/engine/core-modules/tool/tool.module.ts
index 9c6bc52e2f5..c851f143555 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tool.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tool.module.ts
@@ -6,7 +6,7 @@ import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FileModule } from 'src/engine/core-modules/file/file.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-client/secure-http-client.module';
import { CreateCalendarEventTool } from 'src/engine/core-modules/tool/tools/calendar-tool/create-calendar-event-tool';
import { CodeInterpreterTool } from 'src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool';
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/__tests__/share-record-tool.spec.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/__tests__/share-record-tool.spec.ts
index edca9b2aada..0ae608cd992 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/__tests__/share-record-tool.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/__tests__/share-record-tool.spec.ts
@@ -11,8 +11,8 @@ import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-err
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { RecordSharingService } from 'src/engine/permissions/record-share/services/record-sharing.service';
import { ShareRecordTool } from 'src/engine/core-modules/tool/tools/share-record-tool/share-record-tool';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/share-record-tool.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/share-record-tool.ts
index cc428db992e..09c0325aeed 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/share-record-tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/share-record-tool/share-record-tool.ts
@@ -9,8 +9,8 @@ import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-err
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { RecordSharingService } from 'src/engine/permissions/record-share/services/record-sharing.service';
import { ShareRecordToolInputZodSchema } from 'src/engine/core-modules/tool/tools/share-record-tool/share-record-tool.schema';
import { type ToolExecutionContext } from 'src/engine/core-modules/tool/types/tool-execution-context.type';
import { type ToolInput } from 'src/engine/core-modules/tool/types/tool-input.type';
diff --git a/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
index 4ddd1165b89..3874cde1936 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/types/tool-execution-context.type.ts
@@ -1,6 +1,6 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-provider/interfaces/code-execution-stream-emitter.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type ToolExecutionContext = {
workspaceId: string;
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index 03aeca5fdf4..c46e495e7eb 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -43,7 +43,7 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { RecordShareOwnershipTransferService } from 'src/engine/core-modules/record-share/services/record-share-ownership-transfer.service';
+import { RecordShareOwnershipTransferService } from 'src/engine/permissions/record-share/services/record-share-ownership-transfer.service';
import { ConnectedAccountOwnershipTransferService } from 'src/engine/metadata-modules/connected-account/services/connected-account-ownership-transfer.service';
import { detachAgentChatChannelThreadsFromWorkspaceMember } from 'src/engine/metadata-modules/ai/ai-chat/utils/detach-agent-chat-channel-threads-from-workspace-member.util';
import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.module.ts b/packages/twenty-server/src/engine/core-modules/user/user.module.ts
index 6a49860701b..7c4376b788d 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.module.ts
@@ -17,7 +17,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { UserResolver } from 'src/engine/core-modules/user/user.resolver';
import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
-import { RecordShareOwnershipTransferModule } from 'src/engine/core-modules/record-share/record-share-ownership-transfer.module';
+import { RecordShareOwnershipTransferModule } from 'src/engine/permissions/record-share/record-share-ownership-transfer.module';
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
index b6a5d598488..e333f5f3652 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
@@ -10,7 +10,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type FindOptionsWhere, In } from 'typeorm';
import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { buildWorkflowRunRecordShares } from 'src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util.ts b/packages/twenty-server/src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util.ts
index 0ef26199d65..9a4f6f4e122 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util.ts
@@ -6,7 +6,7 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
// must agree with buildCoreWorkflowVisibilitySqlPredicate
export const buildWorkflowRunRecordShares = ({
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts b/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
index e495760f6e9..148b59b4883 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
-import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
+import { RecordShareStorageModule } from 'src/engine/permissions/record-share/record-share-storage.module';
import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { WorkflowRunRecordShareService } from 'src/engine/core-modules/workflow/services/workflow-run-record-share.service';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
index a4aeae1b96d..46a95befaa0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.service.ts
@@ -45,7 +45,7 @@ import { RUN_AGENT_MAX_WAIT_MS } from 'src/engine/metadata-modules/ai/ai-agent-e
import { AgentRunSettlementService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-settlement.service';
import { AgentRunSuspensionService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-suspension.service';
import { AgentRunnerService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service';
-import { resolveApplicationRoleId } from 'src/engine/twenty-orm/utils/resolve-application-role-id.util';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
import { type AgentRunCallerContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-context.type';
import { type AgentRunCallerOutcome } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-outcome.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
index 27aad911124..b660a5fb76c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type.ts
@@ -5,7 +5,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';
import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
import { type AgentConversationActor } from 'src/engine/metadata-modules/ai/ai-history/types/agent-conversation-actor.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
// How a run acts and is billed, which its caller derives on each segment instead of the engine storing it
export type AgentRunExecutionContext = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts
index a35fd6562d9..a7c7ad4438f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type.ts
@@ -1,3 +1,3 @@
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type AgentRunRoleIds = Omit<RoleIdsBySource, 'agentRoleId'>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-role-permission-config.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-role-permission-config.util.ts
index 33aaded1cb9..f04dfa03319 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-role-permission-config.util.ts
@@ -1,5 +1,5 @@
import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const buildAgentRolePermissionConfig = ({
agentRoleId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/ai-agent-trigger.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/ai-agent-trigger.module.ts
index 42bc6ae5c1e..8a480d23403 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/ai-agent-trigger.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/ai-agent-trigger.module.ts
@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { CronModule } from 'src/engine/core-modules/cron/cron.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/__tests__/call-agent-database-event-triggers.job.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/__tests__/call-agent-database-event-triggers.job.spec.ts
index 83ae2633320..5410ae6350c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/__tests__/call-agent-database-event-triggers.job.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/__tests__/call-agent-database-event-triggers.job.spec.ts
@@ -11,8 +11,8 @@ import {
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { CallAgentDatabaseEventTriggersJob } from 'src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job';
import { RunAgentTriggerJob } from 'src/engine/metadata-modules/ai/ai-agent-trigger/jobs/run-agent-trigger.job';
import { AgentTriggerThrottlerService } from 'src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-throttler.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
index add271b81bd..9763c282814 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
@@ -10,9 +10,9 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';
-import { isUpdateOfHiddenFieldsOnly } from 'src/engine/core-modules/record-share/utils/is-update-of-hidden-fields-only.util';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { buildRoleRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util';
+import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/record-share/utils/is-update-of-hidden-fields-only.util';
import { omitRestrictedFieldsFromEvent } from 'src/engine/metadata-modules/permissions/utils/omit-restricted-fields-from-event.util';
import { AGENT_TRIGGER_RUN_LIMITS } from 'src/engine/metadata-modules/ai/ai-agent-trigger/constants/agent-trigger-run-limits.const';
import { RunAgentTriggerJob } from 'src/engine/metadata-modules/ai/ai-agent-trigger/jobs/run-agent-trigger.job';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
index 1f0f72d69d8..fd39d115ff7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/services/agent-trigger-runner.service.ts
@@ -14,7 +14,7 @@ import { type AgentRunCallerInput } from 'src/engine/metadata-modules/ai/ai-agen
import { type AgentRunCallerHandler } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-caller-handler.type';
import { type OwnerWaitingState } from 'src/engine/core-modules/pending-wake-up/types/owner-waiting-state.type';
import { type AgentRunExecutionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type';
-import { resolveApplicationRoleId } from 'src/engine/twenty-orm/utils/resolve-application-role-id.util';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
import { buildAgentRolePermissionConfig } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-role-permission-config.util';
import { buildAgentRunThreadId } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-thread-id.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread.module.ts
index 40392fef987..9d54ebea055 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread.module.ts
@@ -2,8 +2,8 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
-import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
+import { RecordShareStorageModule } from 'src/engine/permissions/record-share/record-share-storage.module';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
import { AgentChatThreadLifecycleModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module';
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.ts
index 0e4c87ad975..01fd8495321 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
@@ -16,8 +16,8 @@ import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/s
import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type AgentChatSender } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type';
import {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-access.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-access.service.ts
index fccfdb56025..7e98c3cc50c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-access.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-access.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { RecordSharePrincipalType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
+import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';
import { AgentChatChannelMetadataService } from 'src/engine/metadata-modules/agent-chat-channel/services/agent-chat-channel-metadata.service';
import { type FlatAgentChatChannelWithRoleIds } from 'src/engine/metadata-modules/agent-chat-channel/types/flat-agent-chat-channel-with-role-ids.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
index f5e5eae1f75..9ad9877253f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
@@ -19,14 +19,14 @@ import {
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { buildRecordShareLockKey } from 'src/engine/core-modules/record-share/utils/build-record-share-lock-key.util';
-import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
-import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
-import { buildWorkspaceMemberRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-workspace-member-row-access-policy-subject.util';
-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';
-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';
+import { buildRecordShareLockKey } from 'src/engine/permissions/record-share/utils/build-record-share-lock-key.util';
+import { RecordShareException } from 'src/engine/permissions/record-share/record-share.exception';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';
+import { RecordSharingService } from 'src/engine/permissions/record-share/services/record-sharing.service';
+import { buildWorkspaceMemberRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-workspace-member-row-access-policy-subject.util';
+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type AgentChatThreadAccessArgs } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-access-args.type';
@@ -51,7 +51,7 @@ import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/works
import {
type RowAccessPolicy,
type RowAccessPolicySubject,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
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.ts
index 6a1f9196763..9a3a7b9c98d 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
@@ -11,7 +11,7 @@ import { type ProposedToolCallResolution } from 'src/engine/metadata-modules/ai/
import { isEmailToolName } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-email-tool-name.util';
import { resolveEmailToolCallProposal } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-email-tool-call-proposal.util';
import { resolveProposedToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-proposed-tool-call.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
// An app proposes only calls it could run itself, checked with its own role; once
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
index 596462f476f..ffd9b367d62 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service.ts
@@ -14,7 +14,7 @@ import { getMinimalSelectForRecordIdentifier } from 'src/engine/metadata-modules
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { FileFolder } from 'twenty-shared/types';
@Injectable()
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
index 30b96cda73e..d185012a332 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
@@ -4,7 +4,7 @@ import { msg } from '@lingui/core/macro';
import { PermissionFlagType } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';
+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import {
ApplicationException,
@@ -27,10 +27,10 @@ import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-targ
import {
type RoleIdsBySource,
type RolePermissionConfig,
-} from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';
+} from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Injectable()
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts
index 95d1519a3e4..7be32a6cfde 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts
@@ -2,16 +2,16 @@ import { type ObjectRecordEvent } from 'twenty-shared/database-events';
import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type EventRecordAccessGate } from 'src/engine/core-modules/record-share/types/event-record-access-gate.type';
-import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';
-import { isUpdateOfHiddenFieldsOnly } from 'src/engine/core-modules/record-share/utils/is-update-of-hidden-fields-only.util';
+import { type EventRecordAccessGate } from 'src/engine/permissions/combine/types/event-record-access-gate.type';
+import { buildRoleRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util';
+import { isUpdateOfHiddenFieldsOnly } from 'src/engine/permissions/record-share/utils/is-update-of-hidden-fields-only.util';
import { omitRestrictedFieldsFromEvent } from 'src/engine/metadata-modules/permissions/utils/omit-restricted-fields-from-event.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
-import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util';
+import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
export const resolveEventsReadableByRole = async <
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
index 97cb043b741..7de4f224b78 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
@@ -64,7 +64,7 @@ import { UpsertRowLevelPermissionPredicatesResultDTO } from 'src/engine/metadata
import { RowLevelPermissionPredicateGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/row-level-permission-predicate/filters/row-level-permission-predicate-graphql-api-exception.filter';
import { RowLevelPermissionPredicateService } from 'src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.util';
+import { resolveRoleIdsForUser } from 'src/engine/permissions/principal/utils/resolve-role-ids-for-user.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
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.ts
index 350b5c03eb8..874b3f28d43 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
@@ -7,7 +7,7 @@ import { BaseTool } from 'src/engine/core-modules/tool-provider/interfaces/base-
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';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
const deleteRoleInputSchema = z.object({
roleId: z.uuid().describe('Id of the role to delete'),
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.ts
index d4b1bed059f..84f9b08faee 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
@@ -9,7 +9,7 @@ import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
import { rolePermissionsSchema } from 'src/engine/metadata-modules/role/tools/schemas/role-permissions.schema';
import { toRoleSummary } from 'src/engine/metadata-modules/role/tools/utils/to-role-summary.util';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
const updateRoleInputSchema = z.object({
roleId: z.uuid().describe('Id of the role to update'),
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
index efe0fdd9a51..93341205457 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/__tests__/call-webhook-jobs.job.spec.ts
@@ -1,8 +1,8 @@
import { Test } from '@nestjs/testing';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job';
import { WebhookRateLimitService } from 'src/engine/metadata-modules/webhook/jobs/webhook-rate-limit.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
index 97da56ca153..e7c89652820 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
@@ -17,8 +17,8 @@ import { type CallWebhookJobData } from 'src/engine/metadata-modules/webhook/typ
import { type WorkspaceEventBatchForWebhook } from 'src/engine/metadata-modules/webhook/types/workspace-event-batch-for-webhook.type';
import { findWebhooksMatchingEventName } from 'src/engine/metadata-modules/webhook/utils/find-webhooks-matching-event-name.util';
import { transformEventBatchToWebhookEvents } from 'src/engine/metadata-modules/webhook/utils/transform-event-batch-to-webhook-events';
-import { EVERYONE_ROW_ACCESS_POLICY_SUBJECT } from 'src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
+import { EVERYONE_ROW_ACCESS_POLICY_SUBJECT } from 'src/engine/permissions/principal/constants/everyone-row-access-policy-subject.constant';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
const WEBHOOK_JOBS_CHUNK_SIZE = 20;
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts
index 74a4b6e697e..6180b1d8984 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts
@@ -8,7 +8,7 @@ import { CallWebhookJobsForMetadataJob } from 'src/engine/metadata-modules/webho
import { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job';
import { CallWebhookJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook.job';
import { WebhookRateLimitService } from 'src/engine/metadata-modules/webhook/jobs/webhook-rate-limit.service';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts
rename to packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
index e72fe282d4f..8bcf9f61667 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-access-policy.service.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
@@ -5,12 +5,12 @@ import { Injectable } from '@nestjs/common';
import groupBy from 'lodash.groupby';
import { type ObjectRecordEvent } from 'twenty-shared/database-events';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { type EventRecordAccessGate } from 'src/engine/core-modules/record-share/types/event-record-access-gate.type';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { evaluateRowAccessPolicy } from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';
-import { resolveEventRecordSnapshots } from 'src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util';
-import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { type EventRecordAccessGate } from 'src/engine/permissions/combine/types/event-record-access-gate.type';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { evaluateRowAccessPolicy } from 'src/engine/permissions/combine/utils/evaluate-row-access-policy.util';
+import { resolveEventRecordSnapshots } from 'src/engine/permissions/combine/utils/resolve-event-record-snapshots.util';
+import { buildRowAccessPolicy } from 'src/engine/permissions/combine/utils/build-row-access-policy.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
similarity index 60%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.ts
rename to packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
index e13e9dd713c..ab709c06c59 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/types/event-record-access-gate.type.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/types/event-record-access-gate.type.ts
@@ -1,6 +1,6 @@
/* @license Enterprise */
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
export type EventRecordAccessGate = {
resolveAdmittedRecordIds: (
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.ts b/packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/types/row-access-policy.type.ts
rename to packages/twenty-server/src/engine/permissions/combine/types/row-access-policy.type.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-row-access-policy.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-row-access-policy.util.spec.ts
index 941f46b514c..e831a2870cf 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-access-policy.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-row-access-policy.util.spec.ts
@@ -11,13 +11,13 @@ import {
type RowAccessCompilationEnvironment,
type RowAccessPolicyEnvironment,
type RowAccessPolicySubject,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';
-import { compileRowAccessPolicy } from 'src/engine/twenty-orm/utils/compile-row-access-policy.util';
-import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { buildRowAccessPolicy } from 'src/engine/permissions/combine/utils/build-row-access-policy.util';
+import { compileRowAccessPolicy } from 'src/engine/permissions/combine/utils/compile-row-access-policy.util';
+import { renderRowLevelPermissionFilterToSql } from 'src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util';
jest.mock(
- 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util',
+ 'src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util',
);
const APPLICATION_ID = 'application-id';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/evaluate-row-access-policy.util.spec.ts
similarity index 95%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/__tests__/evaluate-row-access-policy.util.spec.ts
index 4871b5e1528..10dce696269 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/evaluate-row-access-policy.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/evaluate-row-access-policy.util.spec.ts
@@ -3,12 +3,12 @@
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { FieldMetadataType, RecordShareAccessLevel } from 'twenty-shared/types';
-import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';
+import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
import {
evaluateRowAccessPolicy,
type RowAccessEvaluationContext,
type RowAccessRecord,
-} from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';
+} from 'src/engine/permissions/combine/utils/evaluate-row-access-policy.util';
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
@@ -18,7 +18,7 @@ import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-objec
import {
type RecordShareExpressionTarget,
type RowAccessExpression,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
const MEMBER_ID = 'member-1';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts
similarity index 87%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts
index 4fde64e47b2..d3cde469ea8 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/is-row-access-expression-reading-role-filter.util.spec.ts
@@ -3,8 +3,8 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
-import { type RowAccessExpression } from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { isRowAccessExpressionReadingRoleFilter } from 'src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util';
+import { type RowAccessExpression } from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { isRowAccessExpressionReadingRoleFilter } from 'src/engine/permissions/combine/utils/is-row-access-expression-reading-role-filter.util';
const recordShared: RowAccessExpression = {
kind: 'recordShared',
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/build-row-access-policy.util.ts
similarity index 82%
rename from packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/build-row-access-policy.util.ts
index 915a513caa6..05e9fe596bf 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-access-policy.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/build-row-access-policy.util.ts
@@ -1,19 +1,19 @@
import { type RecordShareAccessLevel } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { buildNamedRecordGrantExpression } from 'src/engine/core-modules/record-share/utils/build-named-record-grant-expression.util';
-import { buildRecordShareGate } from 'src/engine/core-modules/record-share/utils/build-record-share-gate.util';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';
+import { buildNamedRecordGrantExpression } from 'src/engine/permissions/record-share/utils/build-named-record-grant-expression.util';
+import { buildRecordShareGate } from 'src/engine/permissions/record-share/utils/build-record-share-gate.util';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
import {
type RowAccessExpression,
type RowAccessPolicy,
type RowAccessPolicyContext,
type RowAccessPolicyTarget,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { isObjectOperationDisabled } from 'src/engine/twenty-orm/utils/is-object-operation-disabled.util';
-import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';
-import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-object-operation-disabled.util';
+import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
+import { renderRowLevelPermissionFilterToSql } from 'src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util';
export const buildRowAccessPolicy = ({
subject,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/combine-sql-conditions.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/combine-sql-conditions.util.ts
similarity index 80%
rename from packages/twenty-server/src/engine/twenty-orm/utils/combine-sql-conditions.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/combine-sql-conditions.util.ts
index 4481675e175..88daf59c6ba 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/combine-sql-conditions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/combine-sql-conditions.util.ts
@@ -1,4 +1,4 @@
-import { type SqlCondition } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type SqlCondition } from 'src/engine/permissions/combine/types/row-access-policy.type';
export const combineSqlConditions = (
conditions: SqlCondition[],
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compile-row-access-policy.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/compile-row-access-policy.util.ts
similarity index 78%
rename from packages/twenty-server/src/engine/twenty-orm/utils/compile-row-access-policy.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/compile-row-access-policy.util.ts
index 2777ae87685..41578dd1f0f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/compile-row-access-policy.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/compile-row-access-policy.util.ts
@@ -1,15 +1,15 @@
import { assertUnreachable } from 'twenty-shared/utils';
-import { buildRecordShareCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-condition.util';
-import { buildRecordShareExceptionCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-exception-condition.util';
+import { buildRecordShareCondition } from 'src/engine/permissions/record-share/utils/build-record-share-condition.util';
+import { buildRecordShareExceptionCondition } from 'src/engine/permissions/record-share/utils/build-record-share-exception-condition.util';
import {
type CompiledRowAccessPolicy,
type RowAccessExpression,
type RowAccessPolicy,
type RowAccessCompilationEnvironment,
type SqlCondition,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { combineSqlConditions } from 'src/engine/twenty-orm/utils/combine-sql-conditions.util';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { combineSqlConditions } from 'src/engine/permissions/combine/utils/combine-sql-conditions.util';
export const compileRowAccessPolicy = ({
policy,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/evaluate-row-access-policy.util.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/evaluate-row-access-policy.util.ts
index 467e6839e7d..ce0f6337dbe 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/evaluate-row-access-policy.util.ts
@@ -2,16 +2,16 @@
import { assertUnreachable } from 'twenty-shared/utils';
-import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';
-import { resolveRecordIdsRestrictedForPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-restricted-for-principals.util';
-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';
+import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
+import { resolveRecordIdsRestrictedForPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-restricted-for-principals.util';
+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import {
type RowAccessExpression,
type RowAccessPolicy,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';
export type RowAccessRecord = { id: string } & Record<string, unknown>;
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/is-row-access-expression-reading-role-filter.util.ts
similarity index 83%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/is-row-access-expression-reading-role-filter.util.ts
index 5dac6ef3112..5d21982aded 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/is-row-access-expression-reading-role-filter.util.ts
@@ -2,7 +2,7 @@
import { assertUnreachable } from 'twenty-shared/utils';
-import { type RowAccessExpression } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessExpression } from 'src/engine/permissions/combine/types/row-access-policy.type';
export const isRowAccessExpressionReadingRoleFilter = (
expression: RowAccessExpression,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-automation-admitted-record-ids.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/resolve-automation-admitted-record-ids.util.ts
index 7f3cfee5a04..52d438a8462 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-automation-admitted-record-ids.util.ts
@@ -2,8 +2,8 @@ import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/
import { type ObjectRecordEvent } from 'twenty-shared/database-events';
import { findActiveFlatApplicationByUniversalIdentifier } from 'src/engine/core-modules/application/utils/find-active-flat-application-by-universal-identifier.util';
-import { type RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';
+import { type RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { buildRoleRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-event-record-snapshots.util.ts
similarity index 79%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.ts
rename to packages/twenty-server/src/engine/permissions/combine/utils/resolve-event-record-snapshots.util.ts
index c5246acef86..74c02cb8fb1 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-event-record-snapshots.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-event-record-snapshots.util.ts
@@ -5,7 +5,7 @@ import {
type ObjectRecordEvent,
} from 'twenty-shared/database-events';
-import { type RowAccessRecord } from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';
+import { type RowAccessRecord } from 'src/engine/permissions/combine/utils/evaluate-row-access-policy.util';
export const resolveEventRecordSnapshots = (
events: ObjectRecordEvent[],
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.ts b/packages/twenty-server/src/engine/permissions/principal/constants/everyone-row-access-policy-subject.constant.ts
similarity index 78%
rename from packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.ts
rename to packages/twenty-server/src/engine/permissions/principal/constants/everyone-row-access-policy-subject.constant.ts
index 31dd2bc3998..3bf70361e74 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/constants/everyone-row-access-policy-subject.constant.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/constants/everyone-row-access-policy-subject.constant.ts
@@ -2,7 +2,7 @@
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
export const EVERYONE_ROW_ACCESS_POLICY_SUBJECT: RowAccessPolicySubject = {
isSystemContext: false,
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/role-permission-config.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.type.ts
rename to packages/twenty-server/src/engine/permissions/principal/types/role-permission-config.type.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
similarity index 85%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
index 8d7848ad9c6..dda9d23acaa 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-from-role-permission-config.util.spec.ts
@@ -1,4 +1,4 @@
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
describe('getRoleIdsFromRolePermissionConfig', () => {
it('returns the roles to intersect', () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-to-intersect.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
similarity index 95%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
index 8be46f4ef84..a972cf3fc18 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-role-ids-to-intersect.util.spec.ts
@@ -1,4 +1,4 @@
-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
describe('getRoleIdsToIntersect', () => {
it('returns the role of a single source', () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
similarity index 85%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
index 26365ea0605..0866781aea6 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/is-denying-role-ids-by-source.util.spec.ts
@@ -1,4 +1,4 @@
-import { isDenyingRoleIdsBySource } from 'src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util';
+import { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
describe('isDenyingRoleIdsBySource', () => {
it('denies when no source restricts', () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-application-role-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
similarity index 91%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-application-role-id.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
index 139dccd1ade..ca9779086a8 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-application-role-id.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-application-role-id.util.spec.ts
@@ -1,4 +1,4 @@
-import { resolveApplicationRoleId } from 'src/engine/twenty-orm/utils/resolve-application-role-id.util';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
describe('resolveApplicationRoleId', () => {
it.each([true, false])(
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts
index 3bd903178de..31dd1bbd688 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-principal-ids-from-auth-context.util.spec.ts
@@ -1,7 +1,7 @@
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util';
+import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';
const USER_WORKSPACE_ID = 'user-workspace-1';
const USER_ROLE_ID = 'user-role-1';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts
index 9b79a08ce88..4602c3e7d55 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-ids-from-auth-context.util.spec.ts
@@ -1,5 +1,5 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { resolveRoleIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util';
+import { resolveRoleIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util';
const USER_WORKSPACE_ID = 'user-workspace-1';
const USER_ROLE_ID = 'user-role-1';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-permission-config.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts
index f4f84887a5c..0dea5a81703 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/resolve-role-permission-config.util.spec.ts
@@ -1,6 +1,6 @@
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
const USER_WORKSPACE_ID = 'user-workspace-1';
const USER_ROLE_ID = 'user-role-1';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts
index 51f2dcf847a..06d952dda65 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util.ts
@@ -1,7 +1,7 @@
import { isDefined } from 'twenty-shared/utils';
import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
// An agent without a role, or a deleted one, resolves to null, which denies
export const buildAgentRoleIdsBySource = ({
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util.ts
index 2c9d292eac2..3434df81b35 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util.ts
@@ -5,14 +5,14 @@ import { type ObjectsPermissionsByRoleId } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';
+import { canRolesAccessAllRecords } from 'src/engine/permissions/role/utils/can-roles-access-all-records.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
export const buildRoleRowAccessPolicySubject = ({
roleId,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-user-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts
similarity index 66%
rename from packages/twenty-server/src/engine/twenty-orm/utils/build-user-role-ids-by-source.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts
index 0e6e7fefb2a..9183145c082 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-user-role-ids-by-source.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-user-role-ids-by-source.util.ts
@@ -1,5 +1,5 @@
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { resolveApplicationRoleId } from 'src/engine/twenty-orm/utils/resolve-application-role-id.util';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
// An application acting for a user is bounded by both the user's role and its own
export const buildUserRoleIdsBySource = ({
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-workspace-member-row-access-policy-subject.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-workspace-member-row-access-policy-subject.util.ts
similarity index 65%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-workspace-member-row-access-policy-subject.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/build-workspace-member-row-access-policy-subject.util.ts
index b7e40eb2f58..23d051c2dcf 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-workspace-member-row-access-policy-subject.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-workspace-member-row-access-policy-subject.util.ts
@@ -1,7 +1,7 @@
/* @license Enterprise */
-import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { buildRoleRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-role-row-access-policy-subject.util';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
export const buildWorkspaceMemberRowAccessPolicySubject = ({
workspaceMemberId,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts
similarity index 60%
rename from packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts
index 1cd7c0edb4d..e6fea3b2731 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util.ts
@@ -1,5 +1,5 @@
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
// Bypass and deny both yield no role ids: never read an empty list as "no restriction"
export const getRoleIdsFromRolePermissionConfig = (
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-to-intersect.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts
similarity index 78%
rename from packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-to-intersect.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts
index fdf092e5085..2b283ab8387 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-role-ids-to-intersect.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-role-ids-to-intersect.util.ts
@@ -1,7 +1,7 @@
import { isDefined } from 'twenty-shared/utils';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { isDenyingRoleIdsBySource } from 'src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
// Keyed by every source so none can be left out. The key order is the intersection order,
// which must stay stable because the intersection keeps the first role's row-level predicates
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts
similarity index 70%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts
index a72f1ed14ad..0cb68b95b64 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util.ts
@@ -1,4 +1,4 @@
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const isDenyingRoleIdsBySource = (
roleIdsBySource: RoleIdsBySource,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-owning-application-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-owning-application-auth-context.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-owning-application-auth-context.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/is-owning-application-auth-context.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-application-role-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
similarity index 88%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-application-role-id.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
index 7f2e9417aa9..59c21b03bf5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-application-role-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-application-role-id.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
// Temporary: an application without a role adds no restriction when it acts with a
// member or an agent, which the workspace custom and Twenty standard applications rely on
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-named-principal-ids.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-named-principal-ids.util.ts
similarity index 81%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-named-principal-ids.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-named-principal-ids.util.ts
index 45991490843..4a7f28f5ec4 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-named-principal-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-named-principal-ids.util.ts
@@ -2,7 +2,7 @@
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
// Only a grant naming the member or one of their roles reaches beyond the
// role: general access goes as far as the people who can access the object
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.ts
index 48fc0e665af..0a4ae1ed810 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util.ts
@@ -5,7 +5,7 @@ import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-syst
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
-import { resolveRoleIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util';
+import { resolveRoleIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util';
export const resolvePrincipalIdsFromAuthContext = ({
authContext,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-for-user.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-for-user.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-for-user.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-for-user.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.ts
similarity index 92%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.ts
index 39057d80b46..44b6c9d74c2 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-ids-from-auth-context.util.ts
@@ -5,7 +5,7 @@ import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
-import { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.util';
+import { resolveRoleIdsForUser } from 'src/engine/permissions/principal/utils/resolve-role-ids-for-user.util';
export const resolveRoleIdsFromAuthContext = ({
authContext,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts
similarity index 83%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts
rename to packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts
index be12ed640c2..887a3760113 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-role-permission-config.util.ts
@@ -8,11 +8,11 @@ import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-targ
import {
type RolePermissionConfig,
type RoleIdsBySource,
-} from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildAgentRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
-import { resolveApplicationRoleId } from 'src/engine/twenty-orm/utils/resolve-application-role-id.util';
-import { isDenyingRoleIdsBySource } from 'src/engine/twenty-orm/utils/is-denying-role-ids-by-source.util';
+} from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
+import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
+import { isDenyingRoleIdsBySource } from 'src/engine/permissions/principal/utils/is-denying-role-ids-by-source.util';
const resolveRoleIdsBySourceFromAuthContext = ({
authContext,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/constants/general-record-share-access-levels.constant.ts b/packages/twenty-server/src/engine/permissions/record-share/constants/general-record-share-access-levels.constant.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/constants/general-record-share-access-levels.constant.ts
rename to packages/twenty-server/src/engine/permissions/record-share/constants/general-record-share-access-levels.constant.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/constants/grantable-record-share-access-levels.constant.ts b/packages/twenty-server/src/engine/permissions/record-share/constants/grantable-record-share-access-levels.constant.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/constants/grantable-record-share-access-levels.constant.ts
rename to packages/twenty-server/src/engine/permissions/record-share/constants/grantable-record-share-access-levels.constant.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/dtos/record-sharing.dto.ts b/packages/twenty-server/src/engine/permissions/record-share/dtos/record-sharing.dto.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/record-share/dtos/record-sharing.dto.ts
rename to packages/twenty-server/src/engine/permissions/record-share/dtos/record-sharing.dto.ts
index 9f62bae4bca..020510d8c65 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/dtos/record-sharing.dto.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/dtos/record-sharing.dto.ts
@@ -13,7 +13,7 @@ import {
} from 'twenty-shared/types';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
import { RecordPermissionsDTO } from 'src/engine/metadata-modules/record-permissions/dtos/record-permissions.dto';
registerEnumType(RecordShareAccessLevel, { name: 'RecordShareAccessLevel' });
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/enums/record-sharing-mode.enum.ts b/packages/twenty-server/src/engine/permissions/record-share/enums/record-sharing-mode.enum.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/enums/record-sharing-mode.enum.ts
rename to packages/twenty-server/src/engine/permissions/record-share/enums/record-sharing-mode.enum.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share-ownership-transfer.module.ts b/packages/twenty-server/src/engine/permissions/record-share/record-share-ownership-transfer.module.ts
similarity index 73%
rename from packages/twenty-server/src/engine/core-modules/record-share/record-share-ownership-transfer.module.ts
rename to packages/twenty-server/src/engine/permissions/record-share/record-share-ownership-transfer.module.ts
index 4beb43d1efd..8e4b885aadb 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/record-share-ownership-transfer.module.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/record-share-ownership-transfer.module.ts
@@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
-import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
-import { RecordShareOwnershipTransferService } from 'src/engine/core-modules/record-share/services/record-share-ownership-transfer.service';
+import { RecordShareStorageModule } from 'src/engine/permissions/record-share/record-share-storage.module';
+import { RecordShareOwnershipTransferService } from 'src/engine/permissions/record-share/services/record-share-ownership-transfer.service';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share-storage.module.ts b/packages/twenty-server/src/engine/permissions/record-share/record-share-storage.module.ts
similarity index 59%
rename from packages/twenty-server/src/engine/core-modules/record-share/record-share-storage.module.ts
rename to packages/twenty-server/src/engine/permissions/record-share/record-share-storage.module.ts
index 882bfbeb730..bafe7e175ed 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/record-share-storage.module.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/record-share-storage.module.ts
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
@Module({
providers: [RecordShareStorageService],
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share.exception.ts b/packages/twenty-server/src/engine/permissions/record-share/record-share.exception.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/record-share.exception.ts
rename to packages/twenty-server/src/engine/permissions/record-share/record-share.exception.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts b/packages/twenty-server/src/engine/permissions/record-share/record-share.module.ts
similarity index 52%
rename from packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts
rename to packages/twenty-server/src/engine/permissions/record-share/record-share.module.ts
index 025a5a1c7c8..657b74468ce 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/record-share.module.ts
@@ -1,13 +1,13 @@
/* @license Enterprise */
-import { RecordSharingResolver } from 'src/engine/core-modules/record-share/resolvers/record-sharing.resolver';
-import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
+import { RecordSharingResolver } from 'src/engine/permissions/record-share/resolvers/record-sharing.resolver';
+import { RecordSharingService } from 'src/engine/permissions/record-share/services/record-sharing.service';
import { Module } from '@nestjs/common';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
-import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
-import { ShareWithService } from 'src/engine/core-modules/record-share/services/share-with.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';
+import { RecordShareStorageModule } from 'src/engine/permissions/record-share/record-share-storage.module';
+import { ShareWithService } from 'src/engine/permissions/record-share/services/share-with.service';
import { RecordPermissionsModule } from 'src/engine/metadata-modules/record-permissions/record-permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts b/packages/twenty-server/src/engine/permissions/record-share/resolvers/record-sharing.resolver.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts
rename to packages/twenty-server/src/engine/permissions/record-share/resolvers/record-sharing.resolver.ts
index 95b72a71e79..54290cc651d 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/resolvers/record-sharing.resolver.ts
@@ -11,10 +11,10 @@ import { AuthenticationError } from 'src/engine/core-modules/graphql/utils/graph
import {
RecordSharePrincipalInput,
RecordSharingDTO,
-} from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
-import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
-import { recordShareGraphqlApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util';
+} from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { RecordShareException } from 'src/engine/permissions/record-share/record-share.exception';
+import { RecordSharingService } from 'src/engine/permissions/record-share/services/record-sharing.service';
+import { recordShareGraphqlApiExceptionHandler } from 'src/engine/permissions/record-share/utils/record-share-graphql-api-exception-handler.util';
import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { RecordTargetInput } from 'src/engine/metadata-modules/record-permissions/dtos/record-target.input';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-ownership-transfer.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-ownership-transfer.service.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/record-share-ownership-transfer.service.ts
rename to packages/twenty-server/src/engine/permissions/record-share/services/record-share-ownership-transfer.service.ts
index 88e0d5eeebe..10b0dd4a679 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-ownership-transfer.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-ownership-transfer.service.ts
@@ -4,8 +4,8 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { isRecordShareExceptionObject } from 'src/engine/permissions/record-share/utils/is-record-share-exception-object.util';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts
rename to packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
index 2386339822e..c8c602c9838 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
@@ -9,9 +9,9 @@ import { isDefined } from 'twenty-shared/utils';
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-import { buildWorkspaceMemberRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-workspace-member-row-access-policy-subject.util';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+import { buildWorkspaceMemberRowAccessPolicySubject } from 'src/engine/permissions/principal/utils/build-workspace-member-row-access-policy-subject.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-storage.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
similarity index 97%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/record-share-storage.service.ts
rename to packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
index 449592d1992..3b793a5a0fc 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-storage.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-storage.service.ts
@@ -18,9 +18,9 @@ import {
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts
rename to packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
index 9a3c9fb3055..6e3d50a3ea2 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-sharing.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
@@ -1,4 +1,4 @@
-import { buildRecordShareLockKey } from 'src/engine/core-modules/record-share/utils/build-record-share-lock-key.util';
+import { buildRecordShareLockKey } from 'src/engine/permissions/record-share/utils/build-record-share-lock-key.util';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { Injectable } from '@nestjs/common';
@@ -14,31 +14,31 @@ import { isDefined } from 'twenty-shared/utils';
import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
-import { GENERAL_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/core-modules/record-share/constants/general-record-share-access-levels.constant';
+import { GENERAL_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/permissions/record-share/constants/general-record-share-access-levels.constant';
import {
type RecordSharePrincipalInput,
type RecordSharingDTO,
type RecordSharingGrantDTO,
type RecordSharingRoleDTO,
-} from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
+} from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';
-import { resolveDefaultGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util';
-import { resolveRecordGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { canRolesAccessAllRecords } from 'src/engine/permissions/role/utils/can-roles-access-all-records.util';
+import { resolveDefaultGeneralAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-default-general-access-level.util';
+import { resolveRecordGeneralAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-record-general-access-level.util';
import {
type ObjectSharing,
resolveObjectSharing,
-} from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { resolveRecordSharePrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util';
-import { resolveViewerRecordShareAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util';
-import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';
+} from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { resolveRecordSharePrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util';
+import { resolveViewerRecordShareAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util';
+import { validateShareWithPrincipalsOrThrow } from 'src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -48,9 +48,9 @@ import { type RecordTargetInput } from 'src/engine/metadata-modules/record-permi
import { RecordPermissionsService } from 'src/engine/metadata-modules/record-permissions/services/record-permissions.service';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
-import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
+import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts
similarity index 74%
rename from packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts
rename to packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts
index 33804cc14c1..bfcb6b68162 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/share-with.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts
@@ -5,15 +5,15 @@ import { Injectable } from '@nestjs/common';
import { isNonEmptyArray } from 'twenty-shared/utils';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { buildRecordShareInputsForCreatedRecords } from 'src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util';
-import { type ObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';
-import { validateShareWithArgOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util';
-import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { buildRecordShareInputsForCreatedRecords } from 'src/engine/permissions/record-share/utils/build-record-share-inputs-for-created-records.util';
+import { type ObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { resolveShareWithPrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util';
+import { validateShareWithArgOrThrow } from 'src/engine/permissions/record-share/utils/validate-share-with-arg-or-throw.util';
+import { validateShareWithPrincipalsOrThrow } from 'src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-children-parent.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-children-parent.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-children-parent.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-children-parent.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-column-parent.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-column-parent.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-column-parent.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-column-parent.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-parent.type.ts
similarity index 63%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-parent.type.ts
index 5361fbfacf0..02f4525d145 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/types/inherited-readability-parent.type.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/types/inherited-readability-parent.type.ts
@@ -1,7 +1,7 @@
/* @license Enterprise */
-import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';
-import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';
+import { type InheritedReadabilityChildrenParent } from 'src/engine/permissions/record-share/types/inherited-readability-children-parent.type';
+import { type InheritedReadabilityColumnParent } from 'src/engine/permissions/record-share/types/inherited-readability-column-parent.type';
export type InheritedReadabilityParent =
| InheritedReadabilityColumnParent
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share-grant.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/record-share-grant.type.ts
similarity index 56%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/record-share-grant.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/record-share-grant.type.ts
index 6d1e04a9a79..bd3d006bc8b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share-grant.type.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/types/record-share-grant.type.ts
@@ -1,6 +1,6 @@
/* @license Enterprise */
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
export type RecordShareGrant = Pick<
RecordShare,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/record-share-input.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/record-share-input.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/record-share-input.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/record-share-input.type.ts
diff --git a/packages/twenty-server/src/engine/permissions/record-share/types/record-share.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/record-share.type.ts
new file mode 100644
index 00000000000..7679850be6c
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/record-share/types/record-share.type.ts
@@ -0,0 +1,7 @@
+/* @license Enterprise */
+
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+
+export type RecordShare = RecordShareInput & {
+ id: string;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/types/share-with-input.type.ts b/packages/twenty-server/src/engine/permissions/record-share/types/share-with-input.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/types/share-with-input.type.ts
rename to packages/twenty-server/src/engine/permissions/record-share/types/share-with-input.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-condition.util.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-condition.util.spec.ts
index fd96f18bf38..a8d6e4b50bc 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-condition.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-condition.util.spec.ts
@@ -2,7 +2,7 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
-import { buildRecordShareCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-condition.util';
+import { buildRecordShareCondition } from 'src/engine/permissions/record-share/utils/build-record-share-condition.util';
import { compileNamedParameters } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';
const OBJECT_METADATA_ID = 'object-metadata-1';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts
index beec84f297e..597d4bd2f3a 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-exception-condition.util.spec.ts
@@ -4,7 +4,7 @@ import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { RecordShareAccessLevel } from 'twenty-shared/types';
import { compileNamedParameters } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';
-import { buildRecordShareExceptionCondition } from 'src/engine/core-modules/record-share/utils/build-record-share-exception-condition.util';
+import { buildRecordShareExceptionCondition } from 'src/engine/permissions/record-share/utils/build-record-share-exception-condition.util';
const OBJECT_METADATA_ID = 'object-metadata-1';
const PRINCIPAL_IDS = ['principal-1', EVERYONE_PRINCIPAL_ID];
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts
index 1d2c495b82a..00ad1522b2c 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/build-record-share-inputs-for-created-records.util.spec.ts
@@ -8,7 +8,7 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { buildRecordShareInputsForCreatedRecords } from 'src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util';
+import { buildRecordShareInputsForCreatedRecords } from 'src/engine/permissions/record-share/utils/build-record-share-inputs-for-created-records.util';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
const OBJECT_METADATA_ID = 'object-metadata-1';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts
index e0f25dc87e8..96c75f98d96 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-object-sharing.util.spec.ts
@@ -2,8 +2,8 @@
import { FeatureFlagKey, MetadataReadability } from 'twenty-shared/types';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
const OBJECT = {
readability: MetadataReadability.OPEN,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts
similarity index 87%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts
index 2e924e39dc5..3c3b8faf7f7 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-general-access-level.util.spec.ts
@@ -7,9 +7,9 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveRecordGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveRecordGeneralAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-record-general-access-level.util';
const buildEveryoneShare = (
accessLevel: RecordShareAccessLevel,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts
index e1ef209bbad..a7762389963 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-restricted-for-principals.util.spec.ts
@@ -7,8 +7,8 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveRecordIdsRestrictedForPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-restricted-for-principals.util';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveRecordIdsRestrictedForPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-restricted-for-principals.util';
const MEMBER_ID = 'member-1';
const SELECT_ACCESS_LEVELS = [
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts
index 135ff31012a..c16e05b4a76 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-ids-shared-with-principals.util.spec.ts
@@ -6,8 +6,8 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util';
const buildRecordShare = (
recordId: string,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts
similarity index 82%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts
index 239505b6bb6..d7d8aa19559 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-record-share-principal-or-throw.util.spec.ts
@@ -2,8 +2,8 @@
import { RecordSharePrincipalType } from 'twenty-shared/types';
-import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
-import { resolveRecordSharePrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util';
+import { RecordShareException } from 'src/engine/permissions/record-share/record-share.exception';
+import { resolveRecordSharePrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util';
const WORKSPACE_MEMBER_ID = '20202020-0000-4000-8000-000000000001';
const ROLE_ID = '20202020-0000-4000-8000-000000000002';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts
index f028763a310..8fcd1ed7cc5 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-share-with-to-write.util.spec.ts
@@ -2,8 +2,8 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { resolveShareWithToWrite } from 'src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { resolveShareWithToWrite } from 'src/engine/permissions/record-share/utils/resolve-share-with-to-write.util';
const ROLE_GRANT = {
roleId: '20202020-0000-4000-8000-000000000001',
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts
similarity index 92%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts
index 515f81acd8a..603b709cf97 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/resolve-viewer-record-share-access-level.util.spec.ts
@@ -7,8 +7,8 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveViewerRecordShareAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveViewerRecordShareAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util';
const MEMBER_ID = 'member-1';
const PRINCIPAL_IDS = [EVERYONE_PRINCIPAL_ID, MEMBER_ID];
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts
index b7bb1d28e81..c38135392a9 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-arg-or-throw.util.spec.ts
@@ -2,7 +2,7 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
-import { validateShareWithArgOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util';
+import { validateShareWithArgOrThrow } from 'src/engine/permissions/record-share/utils/validate-share-with-arg-or-throw.util';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
const userAuthContext = {
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts
similarity index 96%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts
index a2aa84181b6..487dc7ff299 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/__tests__/validate-share-with-principals-or-throw.util.spec.ts
@@ -6,7 +6,7 @@ import {
RecordSharePrincipalType,
} from 'twenty-shared/types';
-import { validateShareWithPrincipalsOrThrow } from 'src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util';
+import { validateShareWithPrincipalsOrThrow } from 'src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util';
import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
import { type FlatRoleMaps } from 'src/engine/metadata-modules/flat-role/types/flat-role-maps.type';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-named-record-grant-expression.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-named-record-grant-expression.util.ts
similarity index 76%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-named-record-grant-expression.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-named-record-grant-expression.util.ts
index 3bbbe06b435..068659fb970 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-named-record-grant-expression.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/build-named-record-grant-expression.util.ts
@@ -2,13 +2,13 @@
import { isNonEmptyArray } from 'twenty-shared/utils';
-import { resolveNamedPrincipalIds } from 'src/engine/core-modules/record-share/utils/resolve-named-principal-ids.util';
-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';
+import { resolveNamedPrincipalIds } from 'src/engine/permissions/principal/utils/resolve-named-principal-ids.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
import {
type RowAccessExpression,
type RowAccessPolicyContext,
type RowAccessPolicyTarget,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
export const buildNamedRecordGrantExpression = (
{ subject }: Pick<RowAccessPolicyContext, 'subject'>,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-condition.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-condition.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-condition.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-condition.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-exception-condition.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-exception-condition.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-exception-condition.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-exception-condition.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-gate.util.ts
similarity index 79%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-gate.util.ts
index 1ce5ad866e3..0eeac27f6ea 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-gate.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-gate.util.ts
@@ -2,14 +2,14 @@
import { isDefined } from 'twenty-shared/utils';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
import {
type RowAccessPolicy,
type RowAccessPolicyContext,
type RowAccessPolicyTarget,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
export const buildRecordShareGate = ({
subject,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-inputs-for-created-records.util.ts
similarity index 93%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-inputs-for-created-records.util.ts
index b095b658cf8..62b0367f0d1 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-inputs-for-created-records.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-inputs-for-created-records.util.ts
@@ -11,9 +11,9 @@ import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { resolveShareWithPrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util';
const ACCESS_LEVELS_RESTRICTING_OPEN_RECORDS = [
RecordShareAccessLevel.NONE,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-lock-key.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-lock-key.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/build-record-share-lock-key.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/build-record-share-lock-key.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-share-exception-object.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/is-record-share-exception-object.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/is-record-share-exception-object.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/is-record-share-exception-object.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/is-update-of-hidden-fields-only.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/is-update-of-hidden-fields-only.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/is-update-of-hidden-fields-only.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/is-update-of-hidden-fields-only.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/record-share-graphql-api-exception-handler.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/record-share-graphql-api-exception-handler.util.ts
index 6fb998fb681..e85b6db1e4d 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/record-share-graphql-api-exception-handler.util.ts
@@ -9,7 +9,7 @@ import {
import {
type RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
+} from 'src/engine/permissions/record-share/record-share.exception';
export const recordShareGraphqlApiExceptionHandler = (
error: RecordShareException,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/record-share-rest-api-exception-handler.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/record-share-rest-api-exception-handler.util.ts
index 2eb8295f262..e4dbf073940 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/record-share-rest-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/record-share-rest-api-exception-handler.util.ts
@@ -10,7 +10,7 @@ import { assertUnreachable } from 'twenty-shared/utils';
import {
type RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
+} from 'src/engine/permissions/record-share/record-share.exception';
export const recordShareRestApiExceptionHandler = (
error: RecordShareException,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-default-general-access-level.util.ts
similarity index 87%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-default-general-access-level.util.ts
index bc9fc9cee38..df296f2d96c 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-default-general-access-level.util.ts
@@ -3,7 +3,7 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
import { assertUnreachable } from 'twenty-shared/utils';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
// Null when records of the object are not shared, so they have no general access
export const resolveDefaultGeneralAccessLevel = (
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-inherited-readability-parents.util.ts
similarity index 95%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-inherited-readability-parents.util.ts
index 198c48aca7f..066e2a1e448 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-inherited-readability-parents.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-inherited-readability-parents.util.ts
@@ -12,9 +12,9 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type InheritedReadabilityChildrenParent } from 'src/engine/core-modules/record-share/types/inherited-readability-children-parent.type';
-import { type InheritedReadabilityColumnParent } from 'src/engine/core-modules/record-share/types/inherited-readability-column-parent.type';
-import { type InheritedReadabilityParent } from 'src/engine/core-modules/record-share/types/inherited-readability-parent.type';
+import { type InheritedReadabilityChildrenParent } from 'src/engine/permissions/record-share/types/inherited-readability-children-parent.type';
+import { type InheritedReadabilityColumnParent } from 'src/engine/permissions/record-share/types/inherited-readability-column-parent.type';
+import { type InheritedReadabilityParent } from 'src/engine/permissions/record-share/types/inherited-readability-parent.type';
import { getRelationFlatFieldMetadatasOfObject } from 'src/engine/twenty-orm/utils/get-relation-flat-field-metadatas-of-object.util';
import { isManyToOneFlatFieldMetadata } from 'src/engine/twenty-orm/utils/is-many-to-one-flat-field-metadata.util';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-object-sharing.util.ts
similarity index 91%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-object-sharing.util.ts
index 99cfa72fc90..15c8a44d89b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-object-sharing.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-object-sharing.util.ts
@@ -5,8 +5,8 @@ import { FeatureFlagKey, MetadataReadability } from 'twenty-shared/types';
import { isNonEmptyArray } from 'twenty-shared/utils';
-import { isRecordShareExceptionObject } from 'src/engine/core-modules/record-share/utils/is-record-share-exception-object.util';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
+import { isRecordShareExceptionObject } from 'src/engine/permissions/record-share/utils/is-record-share-exception-object.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type OperationType } from 'src/engine/twenty-orm/repository/permissions.utils';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-general-access-level.util.ts
similarity index 73%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-general-access-level.util.ts
index b5384ca2076..2ce7bfd7a26 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-general-access-level.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-general-access-level.util.ts
@@ -7,9 +7,9 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveDefaultGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util';
+import { type RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveDefaultGeneralAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-default-general-access-level.util';
// Everyone rows written by a rule or an application are not part of the
// general access people set on the record
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts
index a0bf6f2a09a..778dbd84864 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-restricted-for-principals.util.ts
@@ -3,8 +3,8 @@
import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { type RecordShareAccessLevel } from 'twenty-shared/types';
-import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';
-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';
+import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util';
// Mirrors buildRecordShareExceptionCondition for records already in memory
export const resolveRecordIdsRestrictedForPrincipals = ({
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util.ts
index c89e1c54e3b..4a1a99c371e 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util.ts
@@ -2,7 +2,7 @@
import { type RecordShareAccessLevel } from 'twenty-shared/types';
-import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';
+import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
export const resolveRecordIdsSharedWithPrincipals = ({
recordShares,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util.ts
similarity index 89%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util.ts
index b27fead0e31..f76393ec8ef 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-record-share-principal-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util.ts
@@ -7,8 +7,8 @@ import { isDefined, isValidUuid } from 'twenty-shared/utils';
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
export const resolveRecordSharePrincipalOrThrow = ({
workspaceMemberId,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util.ts
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util.ts
index c2304cbb921..cbcee765411 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util.ts
@@ -5,14 +5,14 @@ import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';
import { RecordSharePrincipalType } from 'twenty-shared/types';
import { isDefined, isValidUuid } from 'twenty-shared/utils';
-import { GENERAL_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/core-modules/record-share/constants/general-record-share-access-levels.constant';
-import { GRANTABLE_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/core-modules/record-share/constants/grantable-record-share-access-levels.constant';
+import { GENERAL_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/permissions/record-share/constants/general-record-share-access-levels.constant';
+import { GRANTABLE_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/permissions/record-share/constants/grantable-record-share-access-levels.constant';
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
const buildSingleTargetException = () =>
new RecordShareException(
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-to-write.util.ts
similarity index 78%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-to-write.util.ts
index d16ae59d05f..2869a224bb4 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-share-with-to-write.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-share-with-to-write.util.ts
@@ -2,9 +2,9 @@
import { assertUnreachable, isNonEmptyArray } from 'twenty-shared/utils';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { resolveDefaultGeneralAccessLevel } from 'src/engine/core-modules/record-share/utils/resolve-default-general-access-level.util';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { resolveDefaultGeneralAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-default-general-access-level.util';
// Null when the created records get no share row. shareWith also reaches the
// records created through nested relations, so an object whose records are
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util.ts
index 98974fc1e85..da89ae429a6 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-viewer-record-share-access-level.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util.ts
@@ -2,7 +2,7 @@
import { RecordShareAccessLevel } from 'twenty-shared/types';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
const RECORD_SHARE_ACCESS_LEVELS_BY_PRECEDENCE = [
RecordShareAccessLevel.FULL,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-arg-or-throw.util.ts
similarity index 81%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-arg-or-throw.util.ts
index be133a9918a..2fd8983709b 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-arg-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-arg-or-throw.util.ts
@@ -8,9 +8,9 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { resolveShareWithPrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util';
export const validateShareWithArgOrThrow = ({
authContext,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util.ts
similarity index 82%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.ts
rename to packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util.ts
index 3fe66fb9270..c1033b648df 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/validate-share-with-principals-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/validate-share-with-principals-or-throw.util.ts
@@ -9,10 +9,10 @@ import { type FlatRoleMaps } from 'src/engine/metadata-modules/flat-role/types/f
import {
RecordShareException,
RecordShareExceptionCode,
-} from 'src/engine/core-modules/record-share/record-share.exception';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
-import { resolveShareWithPrincipalOrThrow } from 'src/engine/core-modules/record-share/utils/resolve-share-with-principal-or-throw.util';
+} from 'src/engine/permissions/record-share/record-share.exception';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
+import { resolveShareWithPrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-share-with-principal-or-throw.util';
export const validateShareWithPrincipalsOrThrow = ({
shareWith,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts
index 696ee2c87ab..6f8aeb157d3 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts
@@ -13,7 +13,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { UNSATISFIABLE_RECORD_FILTER } from 'src/engine/twenty-orm/constants/unsatisfiable-record-filter.constant';
-import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
+import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
const OBJECT_ID = 'object-1';
const WORKSPACE_MEMBER_OBJECT_ID = 'workspace-member-object';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
index 4604152deb6..663284f330b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts
@@ -12,7 +12,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { UNSATISFIABLE_RECORD_FILTER } from 'src/engine/twenty-orm/constants/unsatisfiable-record-filter.constant';
-import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';
+import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';
describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => {
const createMockFlatObjectMetadata = (
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts
index edfee2b60c3..e5cc0c844ea 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/render-row-level-permission-filter-to-sql.util.spec.ts
@@ -9,7 +9,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { UNSATISFIABLE_RECORD_FILTER } from 'src/engine/twenty-orm/constants/unsatisfiable-record-filter.constant';
-import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util';
+import { renderRowLevelPermissionFilterToSql } from 'src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util';
const createFlatFieldMetadata = (
overrides: Partial<FlatFieldMetadata>,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts
similarity index 98%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts
index df478ad9bb9..f9e16be4f06 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/resolve-workspace-member-predicate-value.util.spec.ts
@@ -2,7 +2,7 @@ import { FieldMetadataType } from 'twenty-shared/types';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
-import { resolveWorkspaceMemberPredicateValue } from 'src/engine/twenty-orm/utils/resolve-workspace-member-predicate-value.util';
+import { resolveWorkspaceMemberPredicateValue } from 'src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
const REGION_ID = '20202020-0000-4000-8000-000000000001';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts
index 3aa0326197c..5039df4b25f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/__tests__/validate-predicate-value-compatibility.util.spec.ts
@@ -1,7 +1,7 @@
import { FieldMetadataType } from 'twenty-shared/types';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-import { validatePredicateValueCompatibility } from 'src/engine/twenty-orm/utils/validate-predicate-value-compatibility.util';
+import { validatePredicateValueCompatibility } from 'src/engine/permissions/rls/utils/validate-predicate-value-compatibility.util';
describe('validatePredicateValueCompatibility', () => {
const createMockFieldMetadata = (
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
similarity index 98%
rename from packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
index 988d1305456..cab754a29e7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util.ts
@@ -29,9 +29,9 @@ import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metada
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
import { type FlatRowLevelPermissionPredicate } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate.type';
import { UNSATISFIABLE_RECORD_FILTER } from 'src/engine/twenty-orm/constants/unsatisfiable-record-filter.constant';
-import { resolveUnsatisfiableRecordFilterGroupIds } from 'src/engine/twenty-orm/utils/resolve-unsatisfiable-record-filter-group-ids.util';
-import { resolveWorkspaceMemberPredicateValue } from 'src/engine/twenty-orm/utils/resolve-workspace-member-predicate-value.util';
-import { validatePredicateValueCompatibility } from 'src/engine/twenty-orm/utils/validate-predicate-value-compatibility.util';
+import { resolveUnsatisfiableRecordFilterGroupIds } from 'src/engine/permissions/rls/utils/resolve-unsatisfiable-record-filter-group-ids.util';
+import { resolveWorkspaceMemberPredicateValue } from 'src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util';
+import { validatePredicateValueCompatibility } from 'src/engine/permissions/rls/utils/validate-predicate-value-compatibility.util';
import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';
type BuildRecordFilterForRoleArgs = {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/render-row-level-permission-filter-to-sql.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
index f5e29c0cec3..9e24e279c52 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util.ts
@@ -7,9 +7,9 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-a
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
export const resolveRowLevelPermissionRecordFilter = ({
internalContext,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-unsatisfiable-record-filter-group-ids.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-unsatisfiable-record-filter-group-ids.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-unsatisfiable-record-filter-group-ids.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/resolve-unsatisfiable-record-filter-group-ids.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-workspace-member-predicate-value.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-workspace-member-predicate-value.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/resolve-workspace-member-predicate-value.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-predicate-value-compatibility.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/validate-predicate-value-compatibility.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/validate-predicate-value-compatibility.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/validate-predicate-value-compatibility.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
similarity index 88%
rename from packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
rename to packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
index dc9ed7db7e1..299e082cda4 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
+++ b/packages/twenty-server/src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util.ts
@@ -9,13 +9,13 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
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 RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import {
TwentyOrmException,
TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
-import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';
-import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
+import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';
+import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
type ValidateRLSPredicatesForRecordsArgs<T extends ObjectLiteral> = {
records: T[];
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/can-roles-access-all-records.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/can-roles-access-all-records.util.spec.ts
similarity index 78%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/can-roles-access-all-records.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/__tests__/can-roles-access-all-records.util.spec.ts
index bc0d8c09061..7774f0e8ba2 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/__tests__/can-roles-access-all-records.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/can-roles-access-all-records.util.spec.ts
@@ -1,4 +1,4 @@
-import { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';
+import { canRolesAccessAllRecords } from 'src/engine/permissions/role/utils/can-roles-access-all-records.util';
describe('canRolesAccessAllRecords', () => {
const roleIdsWithAllRecordsAccess = ['admin', 'auditor'];
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
similarity index 97%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
index 08cbd0abec0..35dbe63a835 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts
@@ -7,8 +7,8 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
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 ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
const INVOICE_ID = 'invoice-id';
const AMOUNT_FIELD_ID = 'amount-field-id';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-permission-intersection.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-permission-intersection.util.spec.ts
similarity index 99%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-permission-intersection.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-permission-intersection.util.spec.ts
index 59684a42504..487a296c491 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-permission-intersection.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-permission-intersection.util.spec.ts
@@ -1,6 +1,6 @@
import { type ObjectsPermissions } from 'twenty-shared/types';
-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
+import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
describe('computePermissionIntersection', () => {
const objectMetadataId1 = 'object-1';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
similarity index 98%
rename from packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
index 8140ec93b62..543349cb051 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
@@ -4,7 +4,7 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util';
+import { getObjectsPermissionsFromRolePermissionConfig } from 'src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';
const OBJECT_ID = 'object-1';
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/can-roles-access-all-records.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/can-roles-access-all-records.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/record-share/utils/can-roles-access-all-records.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/can-roles-access-all-records.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts
similarity index 86%
rename from packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts
index 0b12e1a7c9e..690b901d122 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util.ts
@@ -8,10 +8,10 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';
-import { type RoleIdsBySource } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';
-import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util';
+import { type RoleIdsBySource } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
+import { restrictObjectsPermissionsToDisabledActions } from 'src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util';
const buildApplicationIdByDefaultRoleId = (
flatApplicationMaps: ApplicationDefaultRoleMaps,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-permission-intersection.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-permission-intersection.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/compute-permission-intersection.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/compute-permission-intersection.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
similarity index 87%
rename from packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
index 4a020f150f2..084588c5bc1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/get-objects-permissions-from-role-permission-config.util.ts
@@ -6,8 +6,8 @@ import {
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
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 { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';
export const getObjectsPermissionsFromRolePermissionConfig = ({
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-object-operation-disabled.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-object-operation-disabled.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-object-operation-permitted.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-permitted.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/utils/is-object-operation-permitted.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-permitted.util.ts
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
similarity index 90%
rename from packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
index a390bc59f51..50cc5a867c4 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/resolve-object-records-permissions.util.ts
@@ -7,8 +7,8 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
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 { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { computeObjectsPermissionsForRolePermissionConfig } from 'src/engine/permissions/role/utils/compute-objects-permissions-for-role-permission-config.util';
import { type ApplicationDefaultRoleMaps } from 'src/engine/twenty-orm/types/application-default-role-maps.type';
export const resolveObjectRecordsPermissions = ({
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.ts
rename to packages/twenty-server/src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util.ts
index 99c81d7e417..3d95c6667c1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/restrict-objects-permissions-to-disabled-actions.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/restrict-objects-permissions-to-disabled-actions.util.ts
@@ -10,7 +10,7 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { getFlatFieldMetadatasWithDisabledActionsByObjectId } from 'src/engine/twenty-orm/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util';
+import { getFlatFieldMetadatasWithDisabledActionsByObjectId } from 'src/engine/permissions/role/utils/get-flat-field-metadatas-with-disabled-actions-by-object-id.util';
const RESTRICTED_FIELD_PERMISSION_BY_FIELD_PERMISSION_ACTION: Record<
FieldPermissionAction,
diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts
index 7dd5296b3cd..0c9419f40fa 100644
--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts
+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/__tests__/object-record-event-publisher.spec.ts
@@ -24,10 +24,10 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { COMPANY_FLAT_OBJECT_MOCK } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/company-flat-object.mock';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
import { type EventStreamData } from 'src/engine/subscriptions/types/event-stream-data.type';
@@ -36,14 +36,14 @@ import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/typ
import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';
jest.mock(
- 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util',
+ 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util',
() => ({
buildRowLevelPermissionRecordFilter: jest.fn(),
}),
);
jest.mock(
- 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util',
+ 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util',
() => ({
isRecordMatchingRLSRowLevelPermissionPredicate: jest.fn(),
}),
@@ -51,10 +51,10 @@ jest.mock(
const {
buildRowLevelPermissionRecordFilter,
-} = require('src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util');
+} = require('src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util');
const {
isRecordMatchingRLSRowLevelPermissionPredicate,
-} = require('src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util');
+} = require('src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util');
type MockObjectRecordEvent = {
recordId: string;
diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
index 0b8d9e71077..4cb67fa3224 100644
--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts
@@ -31,8 +31,8 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { type EventRecordAccessGate } from 'src/engine/core-modules/record-share/types/event-record-access-gate.type';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { type EventRecordAccessGate } from 'src/engine/permissions/combine/types/event-record-access-gate.type';
import { omitRestrictedFieldsFromEvent } from 'src/engine/metadata-modules/permissions/utils/omit-restricted-fields-from-event.util';
import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
@@ -45,14 +45,14 @@ import { ObjectRecordSubscriptionEvent } from 'src/engine/subscriptions/types/ob
import {
RolePermissionConfig,
RoleIdsBySource,
-} from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { buildRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util';
-import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
-import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';
-import { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
-import { getRoleIdsToIntersect } from 'src/engine/twenty-orm/utils/get-role-ids-to-intersect.util';
+} from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { buildRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/build-row-level-permission-record-filter.util';
+import { computePermissionIntersection } from 'src/engine/permissions/role/utils/compute-permission-intersection.util';
+import { type RowAccessPolicySubject } from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/permissions/rls/utils/is-record-matching-rls-row-level-permission-predicate.util';
+import { canRolesAccessAllRecords } from 'src/engine/permissions/role/utils/can-roles-access-all-records.util';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
+import { getRoleIdsToIntersect } from 'src/engine/permissions/principal/utils/get-role-ids-to-intersect.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { parseEventNameOrThrow } from 'src/engine/workspace-event-emitter/utils/parse-event-name';
diff --git a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
index fb180cc84ea..02e70b0a84d 100644
--- a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
+++ b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
@@ -7,7 +7,7 @@ import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { NavigationMenuItemModule } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { EventStreamResolver } from 'src/engine/subscriptions/event-stream.resolver';
import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
import { MetadataEventEmitter } from 'src/engine/subscriptions/metadata-event/metadata-event-emitter';
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
index 187c7d6eb11..c8f4bbd9c03 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
@@ -15,7 +15,7 @@ import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-m
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { ClientQueryExecutor } from 'src/engine/twenty-orm/executor/client-query-executor';
import { PoolQueryExecutor } from 'src/engine/twenty-orm/executor/pool-query-executor';
@@ -28,7 +28,7 @@ import { runInRollbackSafeTransaction } from 'src/engine/twenty-orm/datasource/u
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
import { buildWorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util';
-import { resolveObjectRecordsPermissions } from 'src/engine/twenty-orm/utils/resolve-object-records-permissions.util';
+import { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
const tableShapeCache = new WeakMap<
FlatEntityMaps<OrmFlatFieldMetadata>,
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
index dc3dc88fb6c..a66970da2c4 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
@@ -17,8 +17,8 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
+import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
import { getColumnNameToFieldMetadataIdMap } from 'src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util';
export type OperationType =
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
index f12f67ec8c4..e31710f94a2 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
@@ -32,7 +32,7 @@ import {
validateOperationIsPermittedOrThrow,
} from 'src/engine/twenty-orm/repository/permissions.utils';
import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
-import { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';
+import { canRolesAccessAllRecords } from 'src/engine/permissions/role/utils/can-roles-access-all-records.util';
import {
type RowAccessExpression,
type RowAccessPolicy,
@@ -40,19 +40,19 @@ import {
type RowAccessPolicyEnvironment,
type RowAccessPolicySubject,
type SqlCondition,
-} from 'src/engine/twenty-orm/types/row-access-policy.type';
-import { compileRowAccessExpression } from 'src/engine/twenty-orm/utils/compile-row-access-policy.util';
-import { buildRowAccessPolicy } from 'src/engine/twenty-orm/utils/build-row-access-policy.util';
-import { type RecordShareGrant } from 'src/engine/core-modules/record-share/types/record-share-grant.type';
+} from 'src/engine/permissions/combine/types/row-access-policy.type';
+import { compileRowAccessExpression } from 'src/engine/permissions/combine/utils/compile-row-access-policy.util';
+import { buildRowAccessPolicy } from 'src/engine/permissions/combine/utils/build-row-access-policy.util';
+import { type RecordShareGrant } from 'src/engine/permissions/record-share/types/record-share-grant.type';
import {
evaluateRowAccessPolicy,
type RowAccessEvaluationContext,
type RowAccessRecord,
-} from 'src/engine/core-modules/record-share/utils/evaluate-row-access-policy.util';
-import { isRowAccessExpressionReadingRoleFilter } from 'src/engine/twenty-orm/utils/is-row-access-expression-reading-role-filter.util';
-import { resolveObjectSharing } from 'src/engine/core-modules/record-share/utils/resolve-object-sharing.util';
-import { isObjectOperationDisabled } from 'src/engine/twenty-orm/utils/is-object-operation-disabled.util';
-import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';
+} from 'src/engine/permissions/combine/utils/evaluate-row-access-policy.util';
+import { isRowAccessExpressionReadingRoleFilter } from 'src/engine/permissions/combine/utils/is-row-access-expression-reading-role-filter.util';
+import { resolveObjectSharing } from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';
+import { isObjectOperationDisabled } from 'src/engine/permissions/role/utils/is-object-operation-disabled.util';
+import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';
@@ -60,12 +60,12 @@ import {
getUpdateEventRecords,
mergeRecordsWithUpdateValues,
} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';
-import { isOwningApplicationAuthContext } from 'src/engine/twenty-orm/utils/is-owning-application-auth-context.util';
-import { resolvePrincipalIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { getRoleIdsFromRolePermissionConfig } from 'src/engine/twenty-orm/utils/get-role-ids-from-role-permission-config.util';
-import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
-import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';
+import { isOwningApplicationAuthContext } from 'src/engine/permissions/principal/utils/is-owning-application-auth-context.util';
+import { resolvePrincipalIdsFromAuthContext } from 'src/engine/permissions/principal/utils/resolve-principal-ids-from-auth-context.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { getRoleIdsFromRolePermissionConfig } from 'src/engine/permissions/principal/utils/get-role-ids-from-role-permission-config.util';
+import { resolveRowLevelPermissionRecordFilter } from 'src/engine/permissions/rls/utils/resolve-row-level-permission-record-filter.util';
+import { validateRLSPredicatesForRecords } from 'src/engine/permissions/rls/utils/validate-rls-predicates-for-records.util';
import { getActiveValidationRules } from 'src/engine/twenty-orm/utils/get-active-validation-rules.util';
import { validateRecordsAgainstValidationRulesOrThrow } from 'src/engine/twenty-orm/utils/validate-records-against-validation-rules.util';
import {
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts b/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
index b94da39e10f..3bc00669ed1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/types/workspace-transaction-scope.type.ts
@@ -2,7 +2,7 @@ import { type ObjectLiteral } from 'typeorm';
import { type ObjectRecord } from 'twenty-shared/types';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
export type WorkspaceTransactionScope = {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
index b886ab164cd..a6c344c83eb 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-workspace-repository-with-optional-transaction.util.ts
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type ObjectLiteral } from 'typeorm';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
index d74fb1d24fa..549a81ae014 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
@@ -3,7 +3,7 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { isValidationRuleEnforcementEnabled } from 'src/engine/twenty-orm/utils/is-validation-rule-enforcement-enabled.util';
import { Injectable, type Type } from '@nestjs/common';
@@ -24,7 +24,7 @@ import {
withWorkspaceContext,
getWorkspaceContext,
} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { WorkspaceDataSourceService } from 'src/engine/twenty-orm/datasource/workspace-data-source.service';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts
index 744379bd82c..bfae4130424 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts
@@ -11,7 +11,7 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { v5 } from 'uuid';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';
import { PAUSING_TOOLS } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/constants/pausing-tools.constant';
import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
index 5273614b3bd..55783a82158 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts
@@ -10,7 +10,7 @@ import { ApplicationRegistrationModule } from 'src/engine/core-modules/applicati
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { SdkClientModule } from 'src/engine/core-modules/sdk-client/sdk-client.module';
import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
-import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
+import { RecordShareStorageModule } from 'src/engine/permissions/record-share/record-share-storage.module';
import { WorkflowVersionEntity } from 'src/engine/core-modules/workflow/entities/workflow-version.entity';
import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
index 401148ac67d..51878c08e9b 100644
--- a/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
+++ b/packages/twenty-server/src/modules/call-recording/services/call-recording.service.ts
@@ -3,8 +3,8 @@ import { isDefined } from 'twenty-shared/utils';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { resolveObjectRecordsPermissions } from 'src/engine/twenty-orm/utils/resolve-object-records-permissions.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import {
PermissionsException,
PermissionsExceptionCode,
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts b/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
index b92784beb38..350706a8a5c 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/services/chart-relation-label.service.ts
@@ -11,7 +11,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { CHART_RELATION_LABEL_BATCH_SIZE } from 'src/modules/dashboard/chart-data/constants/chart-relation-label-batch-size.constant';
import { type ChartRelationLabelAxisInput } from 'src/modules/dashboard/chart-data/types/chart-relation-label-axis-input.type';
import { type GroupByRawResult } from 'src/modules/dashboard/chart-data/types/group-by-raw-result.type';
diff --git a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
index 8eec0873184..8dfa9cfa979 100644
--- a/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
+++ b/packages/twenty-server/src/modules/dashboard/services/dashboard-duplication.service.ts
@@ -18,10 +18,10 @@ import {
getWorkspaceContext,
type ORMWorkspaceContext,
} from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
-import { isObjectOperationPermitted } from 'src/engine/twenty-orm/utils/is-object-operation-permitted.util';
-import { resolveObjectRecordsPermissions } from 'src/engine/twenty-orm/utils/resolve-object-records-permissions.util';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
+import { isObjectOperationPermitted } from 'src/engine/permissions/role/utils/is-object-operation-permitted.util';
+import { resolveObjectRecordsPermissions } from 'src/engine/permissions/role/utils/resolve-object-records-permissions.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { DuplicatedDashboardDTO } from 'src/modules/dashboard/dtos/duplicated-dashboard.dto';
import {
DashboardException,
diff --git a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
index 0e5414beb50..53eca8c935c 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts
@@ -9,7 +9,7 @@ import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-ta
import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { createAddDashboardTabTool } from 'src/modules/dashboard/tools/add-dashboard-tab.tool';
import { createAddDashboardWidgetTool } from 'src/modules/dashboard/tools/add-dashboard-widget.tool';
import { createCreateCompleteDashboardTool } from 'src/modules/dashboard/tools/create-complete-dashboard.tool';
diff --git a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
index 4da67e0904f..216bbb052ca 100644
--- a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
+++ b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts
@@ -5,7 +5,7 @@ import type { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-l
import type { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import type { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import type { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type DashboardToolDependencies = {
pageLayoutService: PageLayoutService;
diff --git a/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts b/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
index 858946044be..cc166f8b682 100644
--- a/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
+++ b/packages/twenty-server/src/modules/emailing/utils/build-emailing-role-permission-config.util.ts
@@ -1,8 +1,8 @@
import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
-import { buildAgentRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-agent-role-ids-by-source.util';
-import { buildUserRoleIdsBySource } from 'src/engine/twenty-orm/utils/build-user-role-ids-by-source.util';
+import { buildAgentRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-agent-role-ids-by-source.util';
+import { buildUserRoleIdsBySource } from 'src/engine/permissions/principal/utils/build-user-role-ids-by-source.util';
export const buildEmailingRolePermissionConfig = (
userRoleId: string,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
index 52db9807e56..47055e0d7db 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/services/workflow-execution-context.service.ts
@@ -16,7 +16,7 @@ import { fromWorkspaceEntityToFlat } from 'src/engine/core-modules/workspace/uti
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
-import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';
+import { resolveRolePermissionConfig } from 'src/engine/permissions/principal/utils/resolve-role-permission-config.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';
import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
index fdcf01c3565..f13f4c6898b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-execution-context.type.ts
@@ -2,7 +2,7 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export type WorkflowExecutionContext = {
isActingOnBehalfOfUser: boolean;
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
index 5ab274e6cc4..e5ffb10bade 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-workflow-agent-run-execution-context.util.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';
import { type AgentRunExecutionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-execution-context.type';
import { type AgentRunRoleIds } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-run-role-ids.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { type WorkflowExecutionContext } from 'src/modules/workflow/workflow-executor/types/workflow-execution-context.type';
import { getWorkflowRunUserWorkspaceId } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/get-workflow-run-user-workspace-id.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
index 8a310491687..c4b775adc85 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/services/workflow-tool.workspace-service.ts
@@ -11,7 +11,7 @@ import { CoreWorkflowVersionWriteService } from 'src/engine/core-modules/workflo
import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { LogicFunctionFromSourceService } from 'src/engine/metadata-modules/logic-function/services/logic-function-from-source.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
import { createActivateWorkflowVersionTool } from 'src/modules/workflow/workflow-tools/tools/activate-workflow-version.tool';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts b/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
index 143df65072f..76812d5d057 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-tools/types/workflow-tool-dependencies.type.ts
@@ -7,7 +7,7 @@ import type { CoreWorkflowVersionWriteService } from 'src/engine/core-modules/wo
import type { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import type { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import type { LogicFunctionFromSourceService } from 'src/engine/metadata-modules/logic-function/services/logic-function-from-source.service';
-import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import type { RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
import type { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import type { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts
index 1823117c1fd..a20d37f9963 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts
@@ -8,7 +8,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';
import { CronModule } from 'src/engine/core-modules/cron/cron.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';
+import { RecordShareModule } from 'src/engine/permissions/record-share/record-share.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
import { WorkflowCronTriggerCronCommand } from 'src/modules/workflow/workflow-trigger/automated-trigger/crons/commands/workflow-cron-trigger.cron.command';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts
index 3f7c800c201..4eb37c8c4d6 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts
@@ -20,8 +20,8 @@ import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-enti
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
index 4455d06b3bd..586b02a14f9 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts
@@ -25,7 +25,7 @@ import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-m
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
+import { RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
@@ -45,7 +45,7 @@ import {
type UpdateEventTriggerSettings,
} from 'src/modules/workflow/workflow-trigger/automated-trigger/constants/automated-trigger-settings';
import { resolveEventsReadableByRole } from 'src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util';
-import { resolveAutomationAdmittedRecordIds } from 'src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util';
+import { resolveAutomationAdmittedRecordIds } from 'src/engine/permissions/combine/utils/resolve-automation-admitted-record-ids.util';
import { type CoreDispatchIds } from 'src/engine/core-modules/workflow/types/workflow-automated-trigger-maps.type';
import {
WorkflowTriggerJob,
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
index d51359e0353..12469f4b395 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
@@ -7,7 +7,7 @@ import { type WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/work
import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
-import { RecordShareOwnershipTransferService } from 'src/engine/core-modules/record-share/services/record-share-ownership-transfer.service';
+import { RecordShareOwnershipTransferService } from 'src/engine/permissions/record-share/services/record-share-ownership-transfer.service';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
index 4f06027a534..c3e26e41503 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
@@ -4,7 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
-import { RecordShareOwnershipTransferModule } from 'src/engine/core-modules/record-share/record-share-ownership-transfer.module';
+import { RecordShareOwnershipTransferModule } from 'src/engine/permissions/record-share/record-share-ownership-transfer.module';
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
import { WorkspaceMemberCreateManyPreQueryHook } from 'src/modules/workspace-member/query-hooks/workspace-member-create-many.pre-query.hook';
import { WorkspaceMemberCreateOnePreQueryHook } from 'src/modules/workspace-member/query-hooks/workspace-member-create-one.pre-query.hook';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
index 2a8d2010288..2aae6e3ece2 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
@@ -15,7 +15,7 @@ import {
import { listChatThreadIds } from 'test/integration/utils/list-chat-thread-ids.util';
import { type AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';
import { buildWorkspaceSetupChatThreadId } from 'src/engine/metadata-modules/ai/ai-chat/utils/build-workspace-setup-chat-thread-id.util';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { type BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
import { type AddWorkflowRunToChatThreadsCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command';
import { EnableCommonRecordSharingCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790312694997-enable-common-record-sharing.command';
@@ -39,14 +39,14 @@ import { type AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/se
import { type AgentChatQueueService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-queue.service';
import { type AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
+import { type RecordSharePrincipalInput } from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
-import { type RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
+import { type RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { computeEventName } from 'src/engine/workspace-event-emitter/utils/compute-event-name';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
index ccb03245214..cc581a951f3 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/create-share-with-object-records-permissions.integration-spec.ts
@@ -30,10 +30,10 @@ import {
RecordShareRowCause,
} from 'twenty-shared/types';
-import { type ShareWithInput } from 'src/engine/core-modules/record-share/types/share-with-input.type';
+import { type ShareWithInput } from 'src/engine/permissions/record-share/types/share-with-input.type';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
index abb0b58d359..5f401937550 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/readability-object-records-permissions.integration-spec.ts
@@ -36,7 +36,7 @@ import { capitalize } from 'twenty-shared/utils';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-open-object.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-open-object.integration-spec.ts
index 5b6b081741b..3389179402a 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-open-object.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-open-object.integration-spec.ts
@@ -21,9 +21,9 @@ import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { RecordSharingMode } from 'src/engine/core-modules/record-share/enums/record-sharing-mode.enum';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordSharePrincipalInput } from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { RecordSharingMode } from 'src/engine/permissions/record-share/enums/record-sharing-mode.enum';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
index 9f0eb8730ba..60aa52f6862 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
@@ -23,8 +23,8 @@ import { makeRestApiRequest } from 'test/integration/rest/utils/make-rest-api-re
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
-import { type RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
index e2ae8860942..74b6435c27e 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-object.integration-spec.ts
@@ -21,8 +21,8 @@ import {
} from 'twenty-shared/types';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { type RecordShareInput } from 'src/engine/permissions/record-share/types/record-share-input.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { PERSON_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/person-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
index a3c82b4d779..50e8a8da7f9 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-share-twin-object-records-permissions.integration-spec.ts
@@ -26,10 +26,10 @@ import {
} from 'twenty-shared/types';
import { capitalize } from 'twenty-shared/utils';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { type RecordShare } from 'src/engine/core-modules/record-share/types/record-share.type';
-import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/core-modules/record-share/utils/resolve-record-ids-shared-with-principals.util';
-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/core-modules/record-share/utils/resolve-required-record-share-access-levels.util';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { type RecordShare } from 'src/engine/permissions/record-share/types/record-share.type';
+import { resolveRecordIdsSharedWithPrincipals } from 'src/engine/permissions/record-share/utils/resolve-record-ids-shared-with-principals.util';
+import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-all-records-access.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-all-records-access.integration-spec.ts
index 44dcf974f8d..39c86db12b2 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-all-records-access.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-all-records-access.integration-spec.ts
@@ -28,9 +28,9 @@ import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
-import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { type RecordShareOwnershipTransferService } from 'src/engine/core-modules/record-share/services/record-share-ownership-transfer.service';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordSharePrincipalInput } from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { type RecordShareOwnershipTransferService } from 'src/engine/permissions/record-share/services/record-share-ownership-transfer.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
index 764543c6fa4..12422548994 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-api.integration-spec.ts
@@ -31,9 +31,9 @@ import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { GRANTABLE_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/core-modules/record-share/constants/grantable-record-share-access-levels.constant';
-import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { GRANTABLE_RECORD_SHARE_ACCESS_LEVELS } from 'src/engine/permissions/record-share/constants/grantable-record-share-access-levels.constant';
+import { type RecordSharePrincipalInput } from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
index 6c3d9ef2c36..6759c004afe 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
@@ -27,11 +27,11 @@ import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { type RecordSharePrincipalInput } from 'src/engine/core-modules/record-share/dtos/record-sharing.dto';
-import { type RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
+import { type RecordSharePrincipalInput } from 'src/engine/permissions/record-share/dtos/record-sharing.dto';
+import { type RecordAccessPolicyService } from 'src/engine/permissions/combine/services/record-access-policy.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
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.ts
index eea2775786e..140a4eb3162 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
@@ -5,7 +5,7 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-a
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type CodeInterpreterService } from 'src/engine/core-modules/code-interpreter/code-interpreter.service';
import { type ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
+import { type RolePermissionConfig } from 'src/engine/permissions/principal/types/role-permission-config.type';
export const captureCodeInterpreterSandboxToken = async ({
authContext,
diff --git a/packages/twenty-server/test/integration/twenty-orm/find-subject-ids-admitted-by-row-access-policies.integration-spec.ts b/packages/twenty-server/test/integration/twenty-orm/find-subject-ids-admitted-by-row-access-policies.integration-spec.ts
index 61408428fef..56925a072e6 100644
--- a/packages/twenty-server/test/integration/twenty-orm/find-subject-ids-admitted-by-row-access-policies.integration-spec.ts
+++ b/packages/twenty-server/test/integration/twenty-orm/find-subject-ids-admitted-by-row-access-policies.integration-spec.ts
@@ -10,7 +10,7 @@ import { getAppProviderByClassName } from 'test/integration/utils/get-app-provid
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { getObjectMetadataIdByName } from 'src/engine/metadata-modules/flat-object-metadata/utils/get-object-metadata-id-by-name.util';
-import { type RowAccessPolicy } from 'src/engine/twenty-orm/types/row-access-policy.type';
+import { type RowAccessPolicy } from 'src/engine/permissions/combine/types/row-access-policy.type';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-45-workspace-command-1790876639146-add-record-share-none-access-level.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-45-workspace-command-1790876639146-add-record-share-none-access-level.integration-spec.ts
index b84dc9645fc..251d0daf942 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/2-45-workspace-command-1790876639146-add-record-share-none-access-level.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/2-45-workspace-command-1790876639146-add-record-share-none-access-level.integration-spec.ts
@@ -12,7 +12,7 @@ import {
} from 'twenty-shared/types';
import { type AddRecordShareNoneAccessLevelCommand } from 'src/database/commands/upgrade-version-command/2-45/2-45-workspace-command-1790876639146-add-record-share-none-access-level.command';
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
import { type UpgradeCommandRegistryService } from 'src/engine/core-modules/upgrade/services/upgrade-command-registry.service';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { type WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
diff --git a/packages/twenty-server/test/integration/utils/set-manual-record-share.util.ts b/packages/twenty-server/test/integration/utils/set-manual-record-share.util.ts
index 29553cadfaf..5d4509eb1a2 100644
--- a/packages/twenty-server/test/integration/utils/set-manual-record-share.util.ts
+++ b/packages/twenty-server/test/integration/utils/set-manual-record-share.util.ts
@@ -1,5 +1,5 @@
-import { type RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { buildRecordShareLockKey } from 'src/engine/core-modules/record-share/utils/build-record-share-lock-key.util';
+import { type RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';
+import { buildRecordShareLockKey } from 'src/engine/permissions/record-share/utils/build-record-share-lock-key.util';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';