Skip to content

The open alternative to Salesforce, designed for AI.

Add standardized rule (#26376)

BOHEUSa5a99f8e19f8
diff --git a/.claude/skills/syncable-entity-types-and-constants/SKILL.md b/.claude/skills/syncable-entity-types-and-constants/SKILL.md
index 1c7bab40396..0e157177ccf 100644
--- a/.claude/skills/syncable-entity-types-and-constants/SKILL.md
+++ b/.claude/skills/syncable-entity-types-and-constants/SKILL.md
@@ -172,7 +172,7 @@ export type FlatDeleteMyEntityAction = {
### 6a. AllFlatEntityTypesByMetadataName
-**File**: `src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts`
+**File**: `src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type.ts`
```typescript
export type AllFlatEntityTypesByMetadataName = {
diff --git a/packages/twenty-front/.oxlintrc.json b/packages/twenty-front/.oxlintrc.json
index 5e71f41c775..bd863052292 100644
--- a/packages/twenty-front/.oxlintrc.json
+++ b/packages/twenty-front/.oxlintrc.json
@@ -130,6 +130,7 @@
"twenty/no-icu-escaping-apostrophe": "error",
"twenty/no-miscased-acronym-in-identifier": "error",
"twenty/no-miscased-acronym-in-message": "error",
+ "twenty/types-folder-filename": ["error", { "convention": "PascalCase" }],
"twenty/enforce-module-boundaries": [
"error",
{
diff --git a/packages/twenty-front/src/modules/apollo/types/operation-type.ts b/packages/twenty-front/src/modules/apollo/types/OperationType.ts
similarity index 100%
rename from packages/twenty-front/src/modules/apollo/types/operation-type.ts
rename to packages/twenty-front/src/modules/apollo/types/OperationType.ts
diff --git a/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts b/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
index 47b3322cb71..76445bb8c0b 100644
--- a/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
@@ -1,4 +1,4 @@
-import { OperationType } from '@/apollo/types/operation-type';
+import { OperationType } from '@/apollo/types/OperationType';
import formatTitle from '@/apollo/utils/formatTitle';
diff --git a/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts b/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
index 931dd0d277a..bb57842a981 100644
--- a/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
@@ -1,4 +1,4 @@
-import { OperationType } from '@/apollo/types/operation-type';
+import { OperationType } from '@/apollo/types/OperationType';
const operationTypeColors = {
// oxlint-disable-next-line twenty/no-hardcoded-colors
diff --git a/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts b/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts
index b2241b32699..739b7d66da8 100644
--- a/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts
+++ b/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts
@@ -4,7 +4,7 @@ import { applicationsSelector } from '@/applications/states/applicationsSelector
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useQuery } from '@apollo/client/react';
import { FindManyApplicationsDocument } from '~/generated-metadata/graphql';
-import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
+import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/ApplicationWithoutRelation';
export const useInstalledApplications = (): ApplicationWithoutRelation[] => {
const { data, refetch } = useQuery(FindManyApplicationsDocument);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
index dac9535e02d..0e80e2cca0a 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpPasswordField.tsx
@@ -1,6 +1,6 @@
import { Text } from 'twenty-ui/primitives/typography';
import { type Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { SignInUpMode } from '@/auth/types/SignInUpMode';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
index 12a06f8a93a..61dcd7fcb9d 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
@@ -12,7 +12,7 @@ import { SignInUpEmailField } from '@/auth/sign-in-up/components/internal/SignIn
import { SignInUpPasswordField } from '@/auth/sign-in-up/components/internal/SignInUpPasswordField';
import { StyledSsoButtonContainer } from '@/auth/sign-in-up/components/internal/SignInUpSsoButtonStyles';
import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { SignInUpMode } from '@/auth/types/SignInUpMode';
import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
import { captchaState } from '@/client-config/states/captchaState';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
index 9b9cd6c79a1..7aed497efae 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx
@@ -11,7 +11,7 @@ import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
import { type Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
import { signInUpModeState } from '@/auth/states/signInUpModeState';
import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { SignInUpMode } from '@/auth/types/SignInUpMode';
import {
jotaiStore,
resetJotaiStore,
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
index 40dd30f95fb..2b58875b569 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
@@ -12,7 +12,7 @@ import {
} from '@/auth/states/signInUpStepState';
import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { SignInUpMode } from '@/auth/types/SignInUpMode';
import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
import { useCaptcha } from '@/client-config/hooks/useCaptcha';
import { useBuildSearchParamsFromUrlSyncedStates } from '@/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates';
diff --git a/packages/twenty-front/src/modules/auth/states/signInUpModeState.ts b/packages/twenty-front/src/modules/auth/states/signInUpModeState.ts
index b8eef5b13e8..915d1c9a86a 100644
--- a/packages/twenty-front/src/modules/auth/states/signInUpModeState.ts
+++ b/packages/twenty-front/src/modules/auth/states/signInUpModeState.ts
@@ -1,4 +1,4 @@
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { SignInUpMode } from '@/auth/types/SignInUpMode';
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
export const signInUpModeState = createAtomState<SignInUpMode>({
diff --git a/packages/twenty-front/src/modules/auth/types/signInUpMode.ts b/packages/twenty-front/src/modules/auth/types/SignInUpMode.ts
similarity index 100%
rename from packages/twenty-front/src/modules/auth/types/signInUpMode.ts
rename to packages/twenty-front/src/modules/auth/types/SignInUpMode.ts
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
index d1c09d8e87d..276667edb8c 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomMentionMenu.tsx
@@ -9,7 +9,7 @@ import { MentionMenuListItem } from '@/mention/components/MentionMenuListItem';
import {
type CustomMentionMenuProps,
type MentionItem,
-} from '@/blocknote-editor/types/types';
+} from '@/blocknote-editor/types/SuggestionMenuItems';
import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
index c06bfa63544..c5fa633ccb0 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenu.tsx
@@ -11,7 +11,7 @@ import { CustomSlashMenuSelectedIndexSyncEffect } from '@/blocknote-editor/compo
import type {
CustomSlashMenuProps,
SuggestionItem,
-} from '@/blocknote-editor/types/types';
+} from '@/blocknote-editor/types/SuggestionMenuItems';
import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
index 30eb668dea5..408650726d0 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuListItem.tsx
@@ -1,4 +1,4 @@
-import { type SuggestionItem } from '@/blocknote-editor/types/types';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { SLASH_MENU_LIST_ID } from '@/ui/input/constants/SlashMenuListId';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuSelectedIndexSyncEffect.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuSelectedIndexSyncEffect.tsx
index a845361b212..28f9f58e5a0 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuSelectedIndexSyncEffect.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/components/CustomSlashMenuSelectedIndexSyncEffect.tsx
@@ -1,5 +1,5 @@
import { SLASH_MENU_LIST_ID } from '@/ui/input/constants/SlashMenuListId';
-import { type SuggestionItem } from '@/blocknote-editor/types/types';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
import { useEffect } from 'react';
import { isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/blocknote-editor/types/types.ts b/packages/twenty-front/src/modules/blocknote-editor/types/SuggestionMenuItems.ts
similarity index 100%
rename from packages/twenty-front/src/modules/blocknote-editor/types/types.ts
rename to packages/twenty-front/src/modules/blocknote-editor/types/SuggestionMenuItems.ts
diff --git a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
index 681b696b89d..464872349a8 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
+++ b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts
@@ -1,6 +1,6 @@
import { getDefaultReactSlashMenuItems } from '@blocknote/react';
-import { type SuggestionItem } from '@/blocknote-editor/types/types';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { type BLOCK_SCHEMA } from '@/blocknote-editor/blocks/Schema';
import {
diff --git a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
index cd69a060bc7..d3c1c1b6439 100644
--- a/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
+++ b/packages/twenty-front/src/modules/geo-map/components/PlaceAutocompleteSelect.tsx
@@ -1,4 +1,4 @@
-import { type PlaceAutocompleteResult } from '@/geo-map/types/placeApi';
+import { type PlaceAutocompleteResult } from '@/geo-map/types/PlaceApi';
import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
diff --git a/packages/twenty-front/src/modules/geo-map/components/__tests__/PlaceAutocompleteSelect.test.tsx b/packages/twenty-front/src/modules/geo-map/components/__tests__/PlaceAutocompleteSelect.test.tsx
index eeb30285dca..97e1d4111ac 100644
--- a/packages/twenty-front/src/modules/geo-map/components/__tests__/PlaceAutocompleteSelect.test.tsx
+++ b/packages/twenty-front/src/modules/geo-map/components/__tests__/PlaceAutocompleteSelect.test.tsx
@@ -1,4 +1,4 @@
-import { type PlaceAutocompleteResult } from '@/geo-map/types/placeApi';
+import { type PlaceAutocompleteResult } from '@/geo-map/types/PlaceApi';
describe('PlaceAutocompleteSelect Component', () => {
describe('component interface', () => {
diff --git a/packages/twenty-front/src/modules/geo-map/hooks/__tests__/useGetPlaceApiData.test.tsx b/packages/twenty-front/src/modules/geo-map/hooks/__tests__/useGetPlaceApiData.test.tsx
index 2124dde9f4c..c2298995fba 100644
--- a/packages/twenty-front/src/modules/geo-map/hooks/__tests__/useGetPlaceApiData.test.tsx
+++ b/packages/twenty-front/src/modules/geo-map/hooks/__tests__/useGetPlaceApiData.test.tsx
@@ -11,7 +11,7 @@ import { useGetPlaceApiData } from '@/geo-map/hooks/useGetPlaceApiData';
import {
type PlaceAutocompleteResult,
type PlaceDetailsResult,
-} from '@/geo-map/types/placeApi';
+} from '@/geo-map/types/PlaceApi';
const mockAutocompleteResults: PlaceAutocompleteResult[] = [
{
diff --git a/packages/twenty-front/src/modules/geo-map/hooks/useGetPlaceApiData.ts b/packages/twenty-front/src/modules/geo-map/hooks/useGetPlaceApiData.ts
index ff43867c32d..a72b5d7acfc 100644
--- a/packages/twenty-front/src/modules/geo-map/hooks/useGetPlaceApiData.ts
+++ b/packages/twenty-front/src/modules/geo-map/hooks/useGetPlaceApiData.ts
@@ -5,7 +5,7 @@ import {
import {
type PlaceAutocompleteResult,
type PlaceDetailsResult,
-} from '@/geo-map/types/placeApi';
+} from '@/geo-map/types/PlaceApi';
import { useApolloClient } from '@apollo/client/react';
export const useGetPlaceApiData = () => {
diff --git a/packages/twenty-front/src/modules/geo-map/hooks/usePlaceAutocomplete.ts b/packages/twenty-front/src/modules/geo-map/hooks/usePlaceAutocomplete.ts
index fca6b8cb938..52694be2085 100644
--- a/packages/twenty-front/src/modules/geo-map/hooks/usePlaceAutocomplete.ts
+++ b/packages/twenty-front/src/modules/geo-map/hooks/usePlaceAutocomplete.ts
@@ -1,5 +1,5 @@
import { useGetPlaceApiData } from '@/geo-map/hooks/useGetPlaceApiData';
-import { type PlaceAutocompleteResult } from '@/geo-map/types/placeApi';
+import { type PlaceAutocompleteResult } from '@/geo-map/types/PlaceApi';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { isNonEmptyString } from '@sniptt/guards';
diff --git a/packages/twenty-front/src/modules/geo-map/types/placeApi.ts b/packages/twenty-front/src/modules/geo-map/types/PlaceApi.ts
similarity index 100%
rename from packages/twenty-front/src/modules/geo-map/types/placeApi.ts
rename to packages/twenty-front/src/modules/geo-map/types/PlaceApi.ts
diff --git a/packages/twenty-front/src/modules/geo-map/types/__tests__/placeApi.test.ts b/packages/twenty-front/src/modules/geo-map/types/__tests__/placeApi.test.ts
index 6966db3e055..42771ed0290 100644
--- a/packages/twenty-front/src/modules/geo-map/types/__tests__/placeApi.test.ts
+++ b/packages/twenty-front/src/modules/geo-map/types/__tests__/placeApi.test.ts
@@ -2,7 +2,7 @@ import {
type PlaceAutocompleteResult,
type PlaceAutocompleteVariables,
type PlaceDetailsResult,
-} from '@/geo-map/types/placeApi';
+} from '@/geo-map/types/PlaceApi';
describe('placeApi types', () => {
describe('PlaceAutocompleteVariables', () => {
diff --git a/packages/twenty-front/src/modules/mention/hooks/useMentionMenu.ts b/packages/twenty-front/src/modules/mention/hooks/useMentionMenu.ts
index e53c9076b44..86f68de3e15 100644
--- a/packages/twenty-front/src/modules/mention/hooks/useMentionMenu.ts
+++ b/packages/twenty-front/src/modules/mention/hooks/useMentionMenu.ts
@@ -1,6 +1,6 @@
import { type BLOCK_SCHEMA } from '@/blocknote-editor/blocks/Schema';
import { useMentionSearch } from '@/mention/hooks/useMentionSearch';
-import { type MentionItem } from '@/blocknote-editor/types/types';
+import { type MentionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { useCallback } from 'react';
export const useMentionMenu = (editor: typeof BLOCK_SCHEMA.BlockNoteEditor) => {
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDraggableData.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDraggableData.ts
similarity index 100%
rename from packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDraggableData.ts
rename to packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDraggableData.ts
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination.ts
similarity index 100%
rename from packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination.ts
rename to packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination.ts
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDroppableData.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDroppableData.ts
similarity index 100%
rename from packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitDroppableData.ts
rename to packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitDroppableData.ts
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination.ts
similarity index 83%
rename from packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination.ts
rename to packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination.ts
index 171f41dcb24..1b976e8b2c6 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination.ts
@@ -1,4 +1,4 @@
-import type { DropDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination';
+import type { DropDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination';
export type SortableTargetDestination = {
destination: DropDestination;
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDropResult.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDropResult.ts
similarity index 82%
rename from packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDropResult.ts
rename to packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDropResult.ts
index 1b5ac162741..388fba80e13 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/types/navigationMenuItemDropResult.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/types/NavigationMenuItemDropResult.ts
@@ -1,4 +1,4 @@
-import type { DropDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination';
+import type { DropDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination';
export type NavigationMenuItemDropResult = {
source: DropDestination;
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppableSlot.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppableSlot.tsx
index c00b299f294..f0270b56545 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppableSlot.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppableSlot.tsx
@@ -4,7 +4,7 @@ import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
import { themeCssVariables } from 'twenty-ui/theme';
-import type { DroppableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDroppableData';
+import type { DroppableData } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDroppableData';
import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';
const StyledSlotWrapper = styled.div<{ $empty: boolean }>`
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemInsertBeforeDroppableZone.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemInsertBeforeDroppableZone.tsx
index 05b5eceb927..68beb6cf4d6 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemInsertBeforeDroppableZone.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemInsertBeforeDroppableZone.tsx
@@ -2,7 +2,7 @@ import { pointerIntersection } from '@dnd-kit/collision';
import { useDroppable } from '@dnd-kit/react';
import { styled } from '@linaria/react';
-import type { DroppableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDroppableData';
+import type { DroppableData } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDroppableData';
import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';
const INSERT_BEFORE_ZONE_HEIGHT_PX = 5;
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.ts
index 637ed91b606..31198ca263f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.ts
@@ -2,7 +2,7 @@ import { useStore } from 'jotai';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { isDefined } from 'twenty-shared/utils';
-import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/navigationMenuItemDropResult';
+import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/NavigationMenuItemDropResult';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useUpdateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useUpdateManyNavigationMenuItems';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts
index dfa4686627a..3de30285792 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts
@@ -3,10 +3,10 @@ import { useCallback, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';
-import type { DraggableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDraggableData';
-import type { DropDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination';
-import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/navigationMenuItemDropResult';
-import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination';
+import type { DraggableData } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDraggableData';
+import type { DropDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination';
+import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/NavigationMenuItemDropResult';
+import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination';
import type { NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';
import { canNavigationMenuItemBeDroppedIn } from '@/navigation-menu-item/common/utils/canNavigationMenuItemBeDroppedIn';
import { extractFolderIdFromDroppableId } from '@/navigation-menu-item/common/utils/extractFolderIdFromDroppableId';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/providers/NavigationMenuItemDndKitProvider.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/providers/NavigationMenuItemDndKitProvider.tsx
index 5dc864dbc7b..2a473db46e7 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/providers/NavigationMenuItemDndKitProvider.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/providers/NavigationMenuItemDndKitProvider.tsx
@@ -5,7 +5,7 @@ import type { NavigationSections } from '@/navigation-menu-item/common/constants
import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';
import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';
import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';
-import type { DraggableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDraggableData';
+import type { DraggableData } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDraggableData';
import { useNavigationMenuItemDndKit } from '@/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitGetDestinationFromSortableTarget.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitGetDestinationFromSortableTarget.ts
index cf6162cfa6b..8e06186dbd7 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitGetDestinationFromSortableTarget.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitGetDestinationFromSortableTarget.ts
@@ -3,8 +3,8 @@ import type { NavigationMenuItem } from '~/generated-metadata/graphql';
import { NAVIGATION_MENU_ITEM_SECTION_DROPPABLE_CONFIG } from '@/navigation-menu-item/common/constants/NavigationMenuItemSectionDroppableConfig';
import type { NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';
-import type { DropDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination';
-import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination';
+import type { DropDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDropDestination';
+import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination';
import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';
import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitResolveDropTarget.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitResolveDropTarget.ts
index 4daf0007a0a..66a8234af0b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitResolveDropTarget.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitResolveDropTarget.ts
@@ -2,8 +2,8 @@ import { isDefined } from 'twenty-shared/utils';
import type { NavigationMenuItem } from '~/generated-metadata/graphql';
import type { NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';
-import type { DroppableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDroppableData';
-import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitSortableTargetDestination';
+import type { DroppableData } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitDroppableData';
+import type { SortableTargetDestination } from '@/navigation-menu-item/common/types/NavigationMenuItemDndKitSortableTargetDestination';
import { canNavigationMenuItemBeDroppedIn } from '@/navigation-menu-item/common/utils/canNavigationMenuItemBeDroppedIn';
import { getDestinationFromSortableTarget } from '@/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitGetDestinationFromSortableTarget';
diff --git a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
index 88562f4674c..93a37e40d51 100644
--- a/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/components/RecordChip.tsx
@@ -5,7 +5,7 @@ import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';
import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';
-import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/TriggerEventType';
import { t } from '@lingui/core/macro';
import { type MouseEvent } from 'react';
import { CoreObjectNameSingular, OpenRecordIn } from 'twenty-shared/types';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
index 9c20095b931..e28faf69bc7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
@@ -2,7 +2,7 @@ import { createContext, type MouseEvent } from 'react';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/TriggerEventType';
export type RecordUpdateHookParams = {
variables: {
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
index 2368bd7b927..23868cd9604 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
@@ -1,7 +1,7 @@
import { useEndPageLayoutDragSelection } from '@/page-layout/hooks/useEndPageLayoutDragSelection';
import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
-import { type PageLayoutDraggedArea } from '@/page-layout/types/page-layout-dragged-area';
+import { type PageLayoutDraggedArea } from '@/page-layout/types/PageLayoutDraggedArea';
import { calculateGridBoundsFromSelectedCells } from '@/page-layout/utils/calculateGridBoundsFromSelectedCells';
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
diff --git a/packages/twenty-front/src/modules/page-layout/states/pageLayoutDraggedAreaComponentState.ts b/packages/twenty-front/src/modules/page-layout/states/pageLayoutDraggedAreaComponentState.ts
index ae32434257b..19e14dd1498 100644
--- a/packages/twenty-front/src/modules/page-layout/states/pageLayoutDraggedAreaComponentState.ts
+++ b/packages/twenty-front/src/modules/page-layout/states/pageLayoutDraggedAreaComponentState.ts
@@ -1,6 +1,6 @@
import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-import { type PageLayoutDraggedArea } from '@/page-layout/types/page-layout-dragged-area';
+import { type PageLayoutDraggedArea } from '@/page-layout/types/PageLayoutDraggedArea';
import { PageLayoutComponentInstanceContext } from './contexts/PageLayoutComponentInstanceContext';
export const pageLayoutDraggedAreaComponentState =
diff --git a/packages/twenty-front/src/modules/page-layout/types/page-layout-dragged-area.ts b/packages/twenty-front/src/modules/page-layout/types/PageLayoutDraggedArea.ts
similarity index 100%
rename from packages/twenty-front/src/modules/page-layout/types/page-layout-dragged-area.ts
rename to packages/twenty-front/src/modules/page-layout/types/PageLayoutDraggedArea.ts
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
index 87d1dd794b6..0ed578d1260 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts
@@ -1,6 +1,6 @@
import { getDefaultReactSlashMenuItems } from '@blocknote/react';
-import { type SuggestionItem } from '@/blocknote-editor/types/types';
+import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';
import { type DASHBOARD_BLOCK_SCHEMA } from '@/page-layout/widgets/standalone-rich-text/constants/DashboardBlockSchema';
import {
IconBlockquote,
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
index a825e929042..771ce7cbf87 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
@@ -7,7 +7,7 @@ import {
type PartialWorkspaceMember,
type RoleWithPartialMembers,
} from '@/settings/roles/types/RoleWithPartialMembers';
-import { type RoleMaps } from '@/settings/roles/role-assignment/types/role-maps';
+import { type RoleMaps } from '@/settings/roles/role-assignment/types/RoleMaps';
export const ROLE_TARGET_CONFIG = {
member: {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/types/role-maps.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/types/RoleMaps.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/roles/role-assignment/types/role-maps.ts
rename to packages/twenty-front/src/modules/settings/roles/role-assignment/types/RoleMaps.ts
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/buildRoleMaps.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/buildRoleMaps.ts
index e82f11a3d86..f6460b283a1 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/buildRoleMaps.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/buildRoleMaps.ts
@@ -1,5 +1,5 @@
import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
-import { type RoleMaps } from '@/settings/roles/role-assignment/types/role-maps';
+import { type RoleMaps } from '@/settings/roles/role-assignment/types/RoleMaps';
export const buildRoleMaps = (roles: RoleWithPartialMembers[]): RoleMaps => {
const maps: RoleMaps = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts
index 47d9be98a3f..68718f31d28 100644
--- a/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/types/LinkChipProps.ts
@@ -1,4 +1,4 @@
-import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/TriggerEventType';
import { type ComponentPropsWithRef, type MouseEvent } from 'react';
import { type Link } from 'react-router-dom';
import { type ChipProps } from 'twenty-ui/primitives/data-display';
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
index f38db6694d2..f604ce56ae7 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
@@ -8,7 +8,7 @@ import { useNavigationDrawerTooltip } from '@/ui/navigation/navigation-drawer/ho
import { type NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';
import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
import { useMouseDownNavigation } from '@/ui/navigation/utils/hooks/useMouseDownNavigation';
-import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/TriggerEventType';
import { useIsMobile } from 'twenty-ui/utilities';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { styled } from '@linaria/react';
diff --git a/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts b/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
index c7c1b751810..ec9ce628202 100644
--- a/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/utils/hooks/useMouseDownNavigation.ts
@@ -1,5 +1,5 @@
import { isNavigationModifierPressed } from '@/ui/navigation/utils/isNavigationModifierPressed';
-import { type TriggerEventType } from '@/ui/navigation/utils/types/trigger-event.type';
+import { type TriggerEventType } from '@/ui/navigation/utils/types/TriggerEventType';
import { type MouseEvent } from 'react';
import { useNavigate } from 'react-router-dom';
import { isDefined } from 'twenty-ui/utilities';
diff --git a/packages/twenty-front/src/modules/ui/navigation/utils/types/trigger-event.type.ts b/packages/twenty-front/src/modules/ui/navigation/utils/types/TriggerEventType.ts
similarity index 100%
rename from packages/twenty-front/src/modules/ui/navigation/utils/types/trigger-event.type.ts
rename to packages/twenty-front/src/modules/ui/navigation/utils/types/TriggerEventType.ts
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfMonthDescription.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfMonthDescription.test.ts
index 613d8454694..b3e34e4a0c6 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfMonthDescription.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfMonthDescription.test.ts
@@ -1,5 +1,5 @@
import { getDayOfMonthDescription } from '@/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription';
-import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
describe('getDayOfMonthDescription', () => {
const options = DEFAULT_CRON_DESCRIPTION_OPTIONS;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfWeekDescription.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfWeekDescription.test.ts
index ced84c68779..041f8ccc2eb 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfWeekDescription.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getDayOfWeekDescription.test.ts
@@ -1,5 +1,5 @@
import { getDayOfWeekDescription } from '@/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription';
-import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
describe('getDayOfWeekDescription', () => {
const options = DEFAULT_CRON_DESCRIPTION_OPTIONS;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getHoursDescription.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getHoursDescription.test.ts
index 52558989f2a..3be2be08961 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getHoursDescription.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getHoursDescription.test.ts
@@ -1,5 +1,5 @@
import { getHoursDescription } from '@/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription';
-import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
describe('getHoursDescription', () => {
const options24 = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMinutesDescription.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMinutesDescription.test.ts
index 05ae1a2d0e8..4b76e8150dd 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMinutesDescription.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMinutesDescription.test.ts
@@ -1,5 +1,5 @@
import { getMinutesDescription } from '@/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription';
-import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
describe('getMinutesDescription', () => {
const options = DEFAULT_CRON_DESCRIPTION_OPTIONS;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMonthsDescription.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMonthsDescription.test.ts
index 8531d187786..ee9ca00a0da 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMonthsDescription.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/__tests__/getMonthsDescription.test.ts
@@ -1,5 +1,5 @@
import { getMonthsDescription } from '@/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription';
-import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { DEFAULT_CRON_DESCRIPTION_OPTIONS } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
describe('getMonthsDescription', () => {
const options = DEFAULT_CRON_DESCRIPTION_OPTIONS;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/describeCronExpression.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/describeCronExpression.ts
index f5f9e381ed3..8c96e46c39f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/describeCronExpression.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/describeCronExpression.ts
@@ -10,7 +10,7 @@ import { getMonthsDescription } from './descriptors/getMonthsDescription';
import {
type CronDescriptionOptions,
DEFAULT_CRON_DESCRIPTION_OPTIONS,
-} from './types/cronDescriptionOptions';
+} from './types/CronDescriptionOptions';
import { parseCronExpression } from './utils/parseCronExpression';
export const describeCronExpression = (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
index 78798774c4e..953af587263 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
@@ -5,7 +5,7 @@ import { getOrdinalNumber } from '~/utils/format/getOrdinalNumber';
import { isListValue } from '~/utils/validation/isListValue';
import { isNumericRange } from '~/utils/validation/isNumericRange';
import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
export const getDayOfMonthDescription = (
dayOfMonth: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
index 2d70b3347a6..12b42b62385 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { isListValue } from '~/utils/validation/isListValue';
import { isNumericRange } from '~/utils/validation/isNumericRange';
import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
const getDayName = (
dayNum: number,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
index 2fc42a278ca..5f1a92908f9 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
@@ -5,7 +5,7 @@ import { formatTime as formatCronTime } from '~/utils/format/formatTime';
import { isListValue } from '~/utils/validation/isListValue';
import { isNumericRange } from '~/utils/validation/isNumericRange';
import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
export const getHoursDescription = (
hours: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
index 52889358c95..57b9ef2d384 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { isListValue } from '~/utils/validation/isListValue';
import { isNumericRange } from '~/utils/validation/isNumericRange';
import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
export const getMinutesDescription = (
minutes: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
index 486fc911393..8b6fd4ed702 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { isListValue } from '~/utils/validation/isListValue';
import { isNumericRange } from '~/utils/validation/isNumericRange';
import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions';
const getMonthName = (
monthNum: number,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions.ts
similarity index 100%
rename from packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions.ts
rename to packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/CronDescriptionOptions.ts
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/cronExpressionParts.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/CronExpressionParts.ts
similarity index 100%
rename from packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/cronExpressionParts.ts
rename to packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/types/CronExpressionParts.ts
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/parseCronExpression.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/parseCronExpression.ts
index 91639201bd6..1f0b1d608d1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/parseCronExpression.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/parseCronExpression.ts
@@ -1,4 +1,4 @@
-import { type CronExpressionParts } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronExpressionParts';
+import { type CronExpressionParts } from '@/workflow/workflow-trigger/utils/cron-to-human/types/CronExpressionParts';
import { CronExpressionParser } from 'cron-parser';
import { isDefined } from 'twenty-shared/utils';
import { normalizeWhitespace } from './normalizeWhitespace';
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index 9b3ab867416..1a9f5bce2b4 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -14,7 +14,7 @@ import {
APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,
SettingsApplicationTableRow,
} from '~/pages/settings/applications/components/SettingsApplicationTableRow';
-import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
+import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/ApplicationWithoutRelation';
import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
const StyledTableRowsContainer = styled.div`
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
index 8c9dde17665..b9413033125 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
@@ -12,7 +12,7 @@ import { Button } from 'twenty-ui/primitives/input';
import { IconRestore, IconTimelineEvent } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme';
-import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/settingsApplicationTimelineActivityType';
+import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/SettingsApplicationTimelineActivityType';
type SettingsApplicationTimelineActivityTypeSettingsTabProps = {
timelineActivityType: SettingsApplicationTimelineActivityType;
diff --git a/packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts b/packages/twenty-front/src/pages/settings/applications/types/ApplicationWithoutRelation.ts
similarity index 100%
rename from packages/twenty-front/src/pages/settings/applications/types/applicationWithoutRelation.ts
rename to packages/twenty-front/src/pages/settings/applications/types/ApplicationWithoutRelation.ts
diff --git a/packages/twenty-front/src/pages/settings/applications/types/installedTimelineActivityType.ts b/packages/twenty-front/src/pages/settings/applications/types/InstalledTimelineActivityType.ts
similarity index 100%
rename from packages/twenty-front/src/pages/settings/applications/types/installedTimelineActivityType.ts
rename to packages/twenty-front/src/pages/settings/applications/types/InstalledTimelineActivityType.ts
diff --git a/packages/twenty-front/src/pages/settings/applications/types/settingsApplicationTimelineActivityType.ts b/packages/twenty-front/src/pages/settings/applications/types/SettingsApplicationTimelineActivityType.ts
similarity index 100%
rename from packages/twenty-front/src/pages/settings/applications/types/settingsApplicationTimelineActivityType.ts
rename to packages/twenty-front/src/pages/settings/applications/types/SettingsApplicationTimelineActivityType.ts
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/__tests__/filterSettingsApplicationTimelineActivityTypes.test.ts b/packages/twenty-front/src/pages/settings/applications/utils/__tests__/filterSettingsApplicationTimelineActivityTypes.test.ts
index f731c92b822..cebd025c2af 100644
--- a/packages/twenty-front/src/pages/settings/applications/utils/__tests__/filterSettingsApplicationTimelineActivityTypes.test.ts
+++ b/packages/twenty-front/src/pages/settings/applications/utils/__tests__/filterSettingsApplicationTimelineActivityTypes.test.ts
@@ -1,5 +1,5 @@
import { filterSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes';
-import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/settingsApplicationTimelineActivityType';
+import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/SettingsApplicationTimelineActivityType';
const timelineActivityTypes: SettingsApplicationTimelineActivityType[] = [
{
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes.ts b/packages/twenty-front/src/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes.ts
index 7d0e4ae7ee9..8d3f3a22248 100644
--- a/packages/twenty-front/src/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes.ts
+++ b/packages/twenty-front/src/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes.ts
@@ -1,6 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/settingsApplicationTimelineActivityType';
+import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/SettingsApplicationTimelineActivityType';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
export const filterSettingsApplicationTimelineActivityTypes = ({
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes.ts b/packages/twenty-front/src/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes.ts
index 9c8853d454d..4301d31f879 100644
--- a/packages/twenty-front/src/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes.ts
+++ b/packages/twenty-front/src/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes.ts
@@ -1,6 +1,6 @@
import { type TimelineActivityTypeManifest } from 'twenty-shared/application';
-import { type InstalledTimelineActivityType } from '~/pages/settings/applications/types/installedTimelineActivityType';
-import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/settingsApplicationTimelineActivityType';
+import { type InstalledTimelineActivityType } from '~/pages/settings/applications/types/InstalledTimelineActivityType';
+import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/SettingsApplicationTimelineActivityType';
const getSettingsApplicationTimelineActivityTypeCommonFields = (
timelineActivityType:
diff --git a/packages/twenty-oxlint-rules/oxlint-plugin.ts b/packages/twenty-oxlint-rules/oxlint-plugin.ts
index 59f82110d37..bb8968ee68d 100644
--- a/packages/twenty-oxlint-rules/oxlint-plugin.ts
+++ b/packages/twenty-oxlint-rules/oxlint-plugin.ts
@@ -88,6 +88,10 @@ import {
rule as styledComponentsPrefixedWithStyled,
RULE_NAME as styledComponentsPrefixedWithStyledName,
} from './rules/styled-components-prefixed-with-styled';
+import {
+ rule as typesFolderFilename,
+ RULE_NAME as typesFolderFilenameName,
+} from './rules/types-folder-filename';
import {
rule as upgradeCommandFilename,
RULE_NAME as upgradeCommandFilenameName,
@@ -120,6 +124,7 @@ export default definePlugin({
[sortCssPropertiesAlphabeticallyName]: sortCssPropertiesAlphabetically,
[styledComponentsPrefixedWithStyledName]:
styledComponentsPrefixedWithStyled,
+ [typesFolderFilenameName]: typesFolderFilename,
[upgradeCommandFilenameName]: upgradeCommandFilename,
},
});
diff --git a/packages/twenty-oxlint-rules/rules/types-folder-filename.spec.ts b/packages/twenty-oxlint-rules/rules/types-folder-filename.spec.ts
new file mode 100644
index 00000000000..9aa5a87e179
--- /dev/null
+++ b/packages/twenty-oxlint-rules/rules/types-folder-filename.spec.ts
@@ -0,0 +1,173 @@
+import { RuleTester } from 'oxlint/plugins-dev';
+
+import { rule, RULE_NAME } from './types-folder-filename';
+
+const ruleTester = new RuleTester();
+
+const DUMMY_CODE = 'const x = 1;';
+
+const PASCAL_CASE = [{ convention: 'PascalCase' }];
+const KEBAB_CASE_TYPE_SUFFIX = [{ convention: 'kebab-case-type-suffix' }];
+
+const front = (path: string) => `/project/packages/twenty-front/src/${path}`;
+const server = (path: string) => `/project/packages/twenty-server/src/${path}`;
+
+ruleTester.run(RULE_NAME, rule, {
+ valid: [
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/object-metadata/types/MetadataRequestResult.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/AgentChatFileUIPart.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/settings/types/SettingsPanel.tsx'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/types/global.d.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/auth/types/AuthenticatedMethod.enum.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/apollo/types/apolloManager.interface.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/index.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/__tests__/toolWidget.spec.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/hooks/useAiChatFileUpload.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/page-layout/chart-filter.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('modules/workflow/types/workflow-action-input.type.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('engine/api/rest/types/request-context.type.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('engine/core-modules/ai/types/model-family.enum.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server(
+ 'engine/metadata-modules/types/syncable-entity.interface.ts',
+ ),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/geo-map/types/placeApi.custom.ts'),
+ options: [{ convention: 'PascalCase', allowedSuffixes: ['custom'] }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/toolWidget.spec.ts'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/toolWidget.test.tsx'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/toolWidget.stories.tsx'),
+ options: PASCAL_CASE,
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('modules/workflow/types/workflow-action-input.spec.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ },
+ ],
+ invalid: [
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/ai/types/tool-widget.type.ts'),
+ options: PASCAL_CASE,
+ errors: [{ messageId: 'invalidPascalCaseFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/applications/types/applicationDisplayData.ts'),
+ options: PASCAL_CASE,
+ errors: [{ messageId: 'invalidPascalCaseFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/page-layout/types/page-layout-dragged-area.ts'),
+ options: PASCAL_CASE,
+ errors: [{ messageId: 'invalidPascalCaseFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('engine/api/rest/types/RequestContext.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ errors: [{ messageId: 'invalidKebabCaseTypeFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('modules/messaging/types/message.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ errors: [{ messageId: 'invalidKebabCaseTypeFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server('engine/core-modules/dpa/types/dpa.types.ts'),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ errors: [{ messageId: 'invalidKebabCaseTypeFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: server(
+ 'engine/metadata-modules/ai/types/modelConfiguration.ts',
+ ),
+ options: KEBAB_CASE_TYPE_SUFFIX,
+ errors: [{ messageId: 'invalidKebabCaseTypeFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/geo-map/types/placeApi.custom.ts'),
+ options: PASCAL_CASE,
+ errors: [{ messageId: 'invalidPascalCaseFilename' }],
+ },
+ {
+ code: DUMMY_CODE,
+ filename: front('modules/geo-map/types/placeApiXbar.ts'),
+ options: [{ convention: 'PascalCase', allowedSuffixes: ['foo.bar'] }],
+ errors: [{ messageId: 'invalidPascalCaseFilename' }],
+ },
+ ],
+});
diff --git a/packages/twenty-oxlint-rules/rules/types-folder-filename.ts b/packages/twenty-oxlint-rules/rules/types-folder-filename.ts
new file mode 100644
index 00000000000..cffe4c376d2
--- /dev/null
+++ b/packages/twenty-oxlint-rules/rules/types-folder-filename.ts
@@ -0,0 +1,117 @@
+import { defineRule } from '@oxlint/plugins';
+
+export const RULE_NAME = 'types-folder-filename';
+
+const PASCAL_CASE_REGEX = /^[A-Z][A-Za-z0-9]*\.tsx?$/;
+const KEBAB_CASE_TYPE_SUFFIX_REGEX = /^[a-z0-9]+(?:-[a-z0-9]+)*\.type\.ts$/;
+
+const SKIPPED_FILE_REGEX = /\.(spec|test|stories|snap)\.tsx?$/;
+
+const DEFAULT_ALLOWED_SUFFIXES = [
+ 'd',
+ 'enum',
+ 'interface',
+ 'schema',
+ 'constant',
+ 'const',
+ 'input',
+ 'guard',
+];
+
+type Convention = 'PascalCase' | 'kebab-case-type-suffix';
+
+type RuleOptions = {
+ convention?: Convention;
+ allowedSuffixes?: string[];
+};
+
+const CONVENTIONS = {
+ PascalCase: {
+ regex: PASCAL_CASE_REGEX,
+ messageId: 'invalidPascalCaseFilename',
+ },
+ 'kebab-case-type-suffix': {
+ regex: KEBAB_CASE_TYPE_SUFFIX_REGEX,
+ messageId: 'invalidKebabCaseTypeFilename',
+ },
+} as const;
+
+const escapeForRegex = (value: string) =>
+ value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+const buildAllowedSuffixRegex = (suffixes: string[]) =>
+ new RegExp(`\\.(?:${suffixes.map(escapeForRegex).join('|')})\\.tsx?$`);
+
+const isInsideTypesFolder = (filename: string): boolean => {
+ const segments = filename.split('/');
+
+ return segments.length >= 2 && segments[segments.length - 2] === 'types';
+};
+
+export const rule = defineRule({
+ meta: {
+ type: 'problem',
+ docs: {
+ description:
+ 'Enforce a single filename convention for files directly inside a types/ folder',
+ },
+ schema: [
+ {
+ type: 'object',
+ properties: {
+ convention: {
+ type: 'string',
+ enum: ['PascalCase', 'kebab-case-type-suffix'],
+ },
+ allowedSuffixes: {
+ type: 'array',
+ items: { type: 'string' },
+ },
+ },
+ },
+ ],
+ messages: {
+ invalidPascalCaseFilename:
+ "Type file '{{ name }}' must be named {PascalCase}.ts after the type it exports (e.g. 'OrderBy.ts'), without a '.type' suffix.",
+ invalidKebabCaseTypeFilename:
+ "Type file '{{ name }}' must be named {kebab-case}.type.ts (e.g. 'workflow-action-input.type.ts').",
+ },
+ },
+ create: (context) => {
+ const [options] = context.options as [RuleOptions | undefined];
+ const convention = options?.convention ?? 'PascalCase';
+ const allowedSuffixRegex = buildAllowedSuffixRegex(
+ options?.allowedSuffixes ?? DEFAULT_ALLOWED_SUFFIXES,
+ );
+
+ return {
+ Program: (node: any) => {
+ const filename = context.filename;
+
+ if (!isInsideTypesFolder(filename)) {
+ return;
+ }
+
+ const basename = filename.split('/').pop() ?? '';
+
+ if (basename === 'index.ts' || SKIPPED_FILE_REGEX.test(basename)) {
+ return;
+ }
+
+ if (allowedSuffixRegex.test(basename)) {
+ return;
+ }
+
+ const { regex, messageId } = CONVENTIONS[convention];
+
+ if (!regex.test(basename)) {
+ context.report({
+ node,
+ messageId,
+ data: { name: basename },
+ });
+ }
+ },
+ };
+ },
+});
diff --git a/packages/twenty-server/.oxlintrc.json b/packages/twenty-server/.oxlintrc.json
index 5f3ef25f961..fdfb5e27a88 100644
--- a/packages/twenty-server/.oxlintrc.json
+++ b/packages/twenty-server/.oxlintrc.json
@@ -97,6 +97,10 @@
"twenty/no-icu-escaping-apostrophe": "error",
"twenty/no-miscased-acronym-in-identifier": "error",
"twenty/no-miscased-acronym-in-message": "error",
+ "twenty/types-folder-filename": [
+ "error",
+ { "convention": "kebab-case-type-suffix" }
+ ],
"twenty/enforce-module-boundaries": [
"error",
{
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-18/2-18-workspace-command-1799200001000-recompute-search-vectors.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-18/2-18-workspace-command-1799200001000-recompute-search-vectors.command.ts
index a230a2301ee..6c88050be4b 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-18/2-18-workspace-command-1799200001000-recompute-search-vectors.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-18/2-18-workspace-command-1799200001000-recompute-search-vectors.command.ts
@@ -8,7 +8,7 @@ import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/w
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { WORKSPACE_MIGRATION_ACTION_TYPE } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/constants/workspace-migration-action-type.constant';
import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783529458171-rebuild-installed-app-search-vectors.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783529458171-rebuild-installed-app-search-vectors.command.ts
index eb0e43be59e..0da66077b3f 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783529458171-rebuild-installed-app-search-vectors.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783529458171-rebuild-installed-app-search-vectors.command.ts
@@ -9,7 +9,7 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicat
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { WORKSPACE_MIGRATION_ACTION_TYPE } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/constants/workspace-migration-action-type.constant';
import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts
index 260f7feca80..de1c36e9354 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787749300000-backfill-timeline-activity-search-field-metadata.command.ts
@@ -16,7 +16,7 @@ import { buildFlatSearchFieldMetadataForField } from 'src/engine/metadata-module
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
-import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { WORKSPACE_MIGRATION_ACTION_TYPE } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/constants/workspace-migration-action-type.constant';
import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service';
import { getWorkspaceSchemaContextForMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/get-workspace-schema-context-for-migration.util';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command.ts
index f2c605e2280..2d718eeaacd 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790262034322-backfill-logic-function-file-rows.command.ts
@@ -12,7 +12,7 @@ import {
} from 'src/database/commands/upgrade-version-command/2-43/utils/build-logic-function-files.util';
import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { extractFileInfoOrThrow } from 'src/engine/core-modules/file/utils/extract-file-info-or-throw.utils';
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
index d249b48f966..2529610d443 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
@@ -5,7 +5,7 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import {
CommonQueryRunnerException,
CommonQueryRunnerExceptionCode,
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
index 77b54426e4e..d2e064ec34a 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
@@ -13,7 +13,7 @@ import {
CommonQueryRunnerExceptionCode,
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import {
ObjectRecordGroupByForAtomicField,
ObjectRecordGroupByForCompositeField,
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
index f08dfdc7c6b..37d5dd66fdc 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
@@ -9,7 +9,7 @@ import {
CommonQueryRunnerExceptionCode,
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { getGroupableSubFieldsForCompositeType } from 'src/engine/metadata-modules/field-metadata/utils/get-groupable-sub-fields-for-composite-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
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 b7a066ac38f..8000c87c927 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
@@ -30,7 +30,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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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-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 c3c4368402e..e30530d7858 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
@@ -49,7 +49,7 @@ import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/obj
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 { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
-import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { RolePermissionConfig } from 'src/engine/twenty-orm/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-group-by-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
index 26dd04a3e54..3633c22f9f6 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
@@ -24,7 +24,7 @@ import {
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
import { GroupByDefinition } from 'src/engine/api/common/common-query-runners/types/group-by-definition.type';
-import { GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getGroupByDefinitions } from 'src/engine/api/common/common-query-runners/utils/get-group-by-definitions.util';
import { getObjectAlias } from 'src/engine/api/common/common-query-runners/utils/get-object-alias-for-group-by.util';
import { isGroupByRelationField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.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 fc6158d2c57..6b12b24aae9 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
@@ -48,7 +48,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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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/common-query-runners/types/group-by-field.types.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.types.ts
rename to packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.type.ts
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts
index 53618e875ac..883eacf8877 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/__tests__/get-group-by-expression.util.spec.ts
@@ -6,7 +6,7 @@ import {
import {
type GroupByDateField,
type GroupByRegularField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getGroupByExpression } from 'src/engine/api/common/common-query-runners/utils/get-group-by-expression.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-definitions.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-definitions.util.ts
index 7d5459acdef..bf63cf29c0d 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-definitions.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-definitions.util.ts
@@ -1,5 +1,5 @@
import { type GroupByDefinition } from 'src/engine/api/common/common-query-runners/types/group-by-definition.type';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getGroupByExpression } from 'src/engine/api/common/common-query-runners/utils/get-group-by-expression.util';
import { isGroupByDateField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util';
import { isGroupByRelationField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts
index b8c6624061f..6c244847abe 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-expression.util.ts
@@ -15,7 +15,7 @@ import {
CommonQueryRunnerExceptionCode,
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { isGroupByDateField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util';
import { isGroupByRelationField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-order-expression.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-order-expression.util.ts
index 9e4d1f46ebe..fe4a9a3dd97 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-order-expression.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/get-group-by-order-expression.util.ts
@@ -4,7 +4,7 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getGroupByExpression } from 'src/engine/api/common/common-query-runners/utils/get-group-by-expression.util';
import { isGroupByDateField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util';
import { isGroupByRelationField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util.ts
index 6d17936773a..8e87003f432 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-date-field.util.ts
@@ -1,7 +1,7 @@
import {
type GroupByDateField,
type GroupByField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
export const isGroupByDateField = (
groupByField: GroupByField,
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util.ts
index 523889dce81..29dc439f8d7 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util.ts
@@ -1,7 +1,7 @@
import {
type GroupByField,
type GroupByRelationField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
export const isGroupByRelationField = (
groupByField: GroupByField,
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 f9a30e77738..1458fe4f617 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 bf11e437dde..d283fc720e2 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type CommonExtendedQueryRunnerContext = Omit<
CommonBaseQueryRunnerContext,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order-group-by.parser.spec.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order-group-by.parser.spec.ts
index c5994b4246e..5cba0db3ddb 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order-group-by.parser.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order-group-by.parser.spec.ts
@@ -9,7 +9,7 @@ import {
type GroupByDateField,
type GroupByRegularField,
type GroupByRelationField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getObjectAlias } from 'src/engine/api/common/common-query-runners/utils/get-object-alias-for-group-by.util';
import { GraphqlQueryOrderGroupByParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
index af24111c54b..72967ec1d80 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
@@ -16,7 +16,7 @@ import {
type GroupByDateField,
type GroupByField,
type GroupByRegularField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { getGroupByOrderExpression } from 'src/engine/api/common/common-query-runners/utils/get-group-by-order-expression.util';
import { getObjectAlias } from 'src/engine/api/common/common-query-runners/utils/get-object-alias-for-group-by.util';
import { convertOrderByToFindOptionsOrder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
index 18bc45efa98..4aa210b7b80 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import {
type GroupByField,
type GroupByRelationField,
-} from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+} from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { isGroupByRelationField } from 'src/engine/api/common/common-query-runners/utils/is-group-by-relation-field.util';
import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
index 3ab60962e35..e21e9b576b0 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
@@ -8,7 +8,7 @@ import {
type ObjectRecordOrderBy,
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
-import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.types';
+import { type GroupByField } from 'src/engine/api/common/common-query-runners/types/group-by-field.type';
import { GraphqlQueryFilterConditionParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser';
import { GraphqlQueryOrderGroupByParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser';
import {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
index eb07383edaf..1fa16e5a047 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
@@ -7,7 +7,7 @@ import { isDefined, pascalCase } from 'twenty-shared/utils';
import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/enums/object-type-definition-kind.enum';
import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
import { computeCompositeFieldEnumTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-enum-type-key.util';
import { computeCompositeFieldObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-object-type-key.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/connection-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/connection-gql-object-type.generator.ts
index 436e8f64c2a..aeb093dbcab 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/connection-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/connection-gql-object-type.generator.ts
@@ -8,7 +8,7 @@ import { AggregationObjectTypeGenerator } from 'src/engine/api/graphql/workspace
import { PageInfoType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/object';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { computeObjectMetadataObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-object-metadata-object-type-key.util';
import { 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';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/edge-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/edge-gql-object-type.generator.ts
index d9b88eaa324..d872cde2236 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/edge-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/edge-gql-object-type.generator.ts
@@ -7,7 +7,7 @@ import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schem
import { CursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { computeObjectMetadataObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-object-metadata-object-type-key.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/group-by-connection-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/group-by-connection-gql-object-type.generator.ts
index 1d895db6e6d..582fe9b70ee 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/group-by-connection-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/group-by-connection-gql-object-type.generator.ts
@@ -7,7 +7,7 @@ import { isDefined, pascalCase } from 'twenty-shared/utils';
import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/enums/object-type-definition-kind.enum';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { computeObjectMetadataObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-object-metadata-object-type-key.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-gql-object-type.generator.ts
index fe0c9a6370b..f9ed95d575a 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-gql-object-type.generator.ts
@@ -12,7 +12,7 @@ import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schem
import { RelationFieldMetadataGqlObjectTypeGenerator } from 'src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/relation-field-metadata-gql-object-type.generator';
import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
import { computeCompositeFieldObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-object-type-key.util';
import { computeEnumFieldGqlTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-enum-field-gql-type-key.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-with-relations-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-with-relations-gql-object-type.generator.ts
index 2c901079df2..3109998cd4d 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-with-relations-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/object-metadata-with-relations-gql-object-type.generator.ts
@@ -14,7 +14,7 @@ import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfa
import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/enums/object-type-definition-kind.enum';
import { ArgsTypeGenerator } from 'src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/args-type/args-type.generator';
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
-import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { type SchemaGenerationContext } from 'src/engine/api/graphql/workspace-schema-builder/types/schema-generation-context.type';
import { computeObjectMetadataObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-object-metadata-object-type-key.util';
import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/root-types/root-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/root-types/root-type.generator.ts
index 3b97d67f3c8..3083c2ef617 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/root-types/root-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/root-types/root-type.generator.ts
@@ -12,7 +12,7 @@ import { ArgsTypeGenerator } from 'src/engine/api/graphql/workspace-schema-build
import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
import { type SchemaGenerationContext } from 'src/engine/api/graphql/workspace-schema-builder/types/schema-generation-context.type';
-import { GraphQLRootTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types';
+import { GraphQLRootTypeFieldConfigMap } from 'src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type';
import { computeObjectMetadataObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-object-metadata-object-type-key.util';
import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.types.ts
rename to packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/types/graphql-field-config-map.type.ts
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 93cc6529043..ca676918da9 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 54d33d2fb01..f6157370cec 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
@@ -54,7 +54,7 @@ import {
loadSkillInputSchema,
} from 'src/engine/core-modules/tool-provider/tools/load-skill.tool';
import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
import { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.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';
diff --git a/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts b/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
index 835d53da01b..280b1975ba1 100644
--- a/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
@@ -17,7 +17,7 @@ import { ApiPath } from 'twenty-shared/types';
import { RestApiCoreService } from 'src/engine/api/rest/core/services/rest-api-core.service';
import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
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 ffd215486fc..d0c3af51cbd 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
@@ -12,7 +12,7 @@ import { CommonGroupByOutputItem } from 'src/engine/api/common/types/common-grou
import { CommonSelectedFields } from 'src/engine/api/common/types/common-selected-fields-result.type';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
import { Depth } from 'src/engine/api/rest/input-request-parsers/types/depth.type';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { ActorFromAuthContextService } from 'src/engine/core-modules/actor/services/actor-from-auth-context.service';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-many.handler.ts
index ecb10569f38..75c19a9599e 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-many.handler.ts
@@ -7,7 +7,7 @@ import { CommonCreateManyQueryRunnerService } from 'src/engine/api/common/common
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseUpsertRestRequest } from 'src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
export class RestApiCreateManyHandler extends RestApiBaseHandler {
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-one.handler.ts
index 5b98e51d281..1870a733a63 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-create-one.handler.ts
@@ -7,7 +7,7 @@ import { CommonCreateOneQueryRunnerService } from 'src/engine/api/common/common-
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseUpsertRestRequest } from 'src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-many.handler.ts
index f0351ef45aa..956c59eca4b 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-many.handler.ts
@@ -7,7 +7,7 @@ import { capitalize } from 'twenty-shared/utils';
import { CommonDeleteManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-delete-many-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseFilterRestRequest } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-one.handler.ts
index 7356586fbe6..a99841c090d 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-delete-one.handler.ts
@@ -6,7 +6,7 @@ import { capitalize, isDefined } from 'twenty-shared/utils';
import { CommonDeleteOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-delete-one-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-many.handler.ts
index 90186b6fad0..345614ad7a6 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-many.handler.ts
@@ -7,7 +7,7 @@ import { capitalize } from 'twenty-shared/utils';
import { CommonDestroyManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseFilterRestRequest } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-one.handler.ts
index 8c3f0d576db..d36df27e7ad 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-destroy-one.handler.ts
@@ -6,7 +6,7 @@ import { capitalize, isDefined } from 'twenty-shared/utils';
import { CommonDestroyOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-destroy-one-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-duplicates.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-duplicates.handler.ts
index e6f3f7607c3..4b9b9dd4503 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-duplicates.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-duplicates.handler.ts
@@ -5,7 +5,7 @@ import { type ObjectRecord } from 'twenty-shared/types';
import { CommonFindDuplicatesQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-many.handler.ts
index 53bb29beb18..e3fba3644e2 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-many.handler.ts
@@ -13,7 +13,7 @@ import { parseFilterRestRequest } from 'src/engine/api/rest/input-request-parser
import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util';
import { parseOrderByRestRequest } from 'src/engine/api/rest/input-request-parsers/order-by-parser-utils/parse-order-by-rest-request.util';
import { parseStartingAfterRestRequest } from 'src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-one.handler.ts
index 358019a5f37..6042b084b28 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-find-one.handler.ts
@@ -6,7 +6,7 @@ import { CommonFindOneQueryRunnerService } from 'src/engine/api/common/common-qu
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-group-by.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-group-by.handler.ts
index 99948d19905..4c60c095471 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-group-by.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-group-by.handler.ts
@@ -13,7 +13,7 @@ import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers
import { parseOrderByForRecordsWithGroupByRestRequest } from 'src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-for-records-rest-request.util';
import { parseOrderByWithGroupByRestRequest } from 'src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-with-group-by-rest-request.util';
import { parseViewIdRestRequest } from 'src/engine/api/rest/input-request-parsers/view-id-parser-utils/parse-view-id-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-merge-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-merge-many.handler.ts
index 354883ef7a2..0eaed186123 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-merge-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-merge-many.handler.ts
@@ -6,7 +6,7 @@ import { capitalize } from 'twenty-shared/utils';
import { CommonMergeManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-merge-many-query-runner.service';
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-many.handler.ts
index fcce7296743..4cf48b9fb30 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-many.handler.ts
@@ -7,7 +7,7 @@ import { CommonRestoreManyQueryRunnerService } from 'src/engine/api/common/commo
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseFilterRestRequest } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-one.handler.ts
index 81c4c4bb190..7d9c26f6e6b 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-restore-one.handler.ts
@@ -7,7 +7,7 @@ import { CommonRestoreOneQueryRunnerService } from 'src/engine/api/common/common
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-many.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-many.handler.ts
index d9a1b69607b..30e7bd8c8d6 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-many.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-many.handler.ts
@@ -7,7 +7,7 @@ import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-b
import { CommonUpdateManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-update-many-query-runner.service';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseFilterRestRequest } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-one.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-one.handler.ts
index e6162723849..1d68747598e 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-one.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-update-one.handler.ts
@@ -7,7 +7,7 @@ import { CommonUpdateOneQueryRunnerService } from 'src/engine/api/common/common-
import { RestApiBaseHandler } from 'src/engine/api/rest/core/handlers/rest-api-base.handler';
import { parseDepthRestRequest } from 'src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { workspaceQueryRunnerRestApiExceptionHandler } from 'src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util';
@Injectable()
diff --git a/packages/twenty-server/src/engine/api/rest/core/services/rest-api-core.service.ts b/packages/twenty-server/src/engine/api/rest/core/services/rest-api-core.service.ts
index f32795d50e7..e520e331bb2 100644
--- a/packages/twenty-server/src/engine/api/rest/core/services/rest-api-core.service.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/services/rest-api-core.service.ts
@@ -19,7 +19,7 @@ import { RestApiUpdateManyHandler } from 'src/engine/api/rest/core/handlers/rest
import { RestApiUpdateOneHandler } from 'src/engine/api/rest/core/handlers/rest-api-update-one.handler';
import { parseCorePath } from 'src/engine/api/rest/input-request-parsers/path-parser-utils/parse-core-path.utils';
import { parseSoftDeleteRestRequest } from 'src/engine/api/rest/input-request-parsers/soft-delete-parser-utils/parse-soft-delete-rest-request.util';
-import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
@Injectable()
export class RestApiCoreService {
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/aggregate-fields-parser-utils/parse-aggregate-fields-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/aggregate-fields-parser-utils/parse-aggregate-fields-rest-request.util.ts
index c99cd6c5f9e..04fe51adcf9 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/aggregate-fields-parser-utils/parse-aggregate-fields-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/aggregate-fields-parser-utils/parse-aggregate-fields-rest-request.util.ts
@@ -6,7 +6,7 @@ import {
RestInputRequestParserException,
RestInputRequestParserExceptionCode,
} from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseAggregateFieldsRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util.ts
index 67c4e7d82d4..f1382917cfc 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/depth-parser-utils/parse-depth-rest-request.util.ts
@@ -4,7 +4,7 @@ import {
RestInputRequestParserExceptionCode,
} from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
import { type Depth } from 'src/engine/api/rest/input-request-parsers/types/depth.type';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseDepthRestRequest = (request: AuthenticatedRequest): Depth => {
if (!request.query.depth) {
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util.ts
index 5b817367b00..c1e51247bd7 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util.ts
@@ -1,4 +1,4 @@
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { type RequestContext } from 'src/engine/api/rest/types/request-context.type';
export const parseEndingBeforeRestRequest = (
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util.ts
index 0b8843e434f..465cb0f6bb7 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter-rest-request.util.ts
@@ -2,7 +2,7 @@ import { type FieldValue } from 'src/engine/api/rest/core/types/field-value.type
import { addDefaultConjunctionIfMissing } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/add-default-conjunction.util';
import { checkFilterQuery } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/check-filter-query.util';
import { parseFilter } from 'src/engine/api/rest/input-request-parsers/filter-parser-utils/parse-filter.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseFilterRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-parser-utils/parse-group-by-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-parser-utils/parse-group-by-rest-request.util.ts
index fdb46c6b3d1..c71ed0c9964 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-parser-utils/parse-group-by-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-parser-utils/parse-group-by-rest-request.util.ts
@@ -4,7 +4,7 @@ import {
RestInputRequestParserException,
RestInputRequestParserExceptionCode,
} from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseGroupByRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-with-records/parse-include-records-sample-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-with-records/parse-include-records-sample-rest-request.util.ts
index 9323e790957..93f1de1fc15 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-with-records/parse-include-records-sample-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/group-by-with-records/parse-include-records-sample-rest-request.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseIncludeRecordsSampleRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts
index c8724b4a485..0f215e9d85b 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts
@@ -7,7 +7,7 @@ import {
RestInputRequestParserException,
RestInputRequestParserExceptionCode,
} from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { type RequestContext } from 'src/engine/api/rest/types/request-context.type';
export const parseLimitRestRequest = (
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/parse-order-by-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/parse-order-by-rest-request.util.ts
index d1a0520649f..ae3249fadeb 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/parse-order-by-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/parse-order-by-rest-request.util.ts
@@ -1,7 +1,7 @@
import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { parseOrderBy } from 'src/engine/api/rest/input-request-parsers/order-by-parser-utils/utils/parse-order-by-rest-request-common.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseOrderByRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-for-records-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-for-records-rest-request.util.ts
index 69302bffa95..30e3206ab4c 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-for-records-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-for-records-rest-request.util.ts
@@ -1,7 +1,7 @@
import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { parseOrderBy } from 'src/engine/api/rest/input-request-parsers/order-by-parser-utils/utils/parse-order-by-rest-request-common.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseOrderByForRecordsWithGroupByRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-with-group-by-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-with-group-by-rest-request.util.ts
index ce0e2a23020..34865c030f4 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-with-group-by-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-with-group-by-parser-utils/parse-order-by-with-group-by-rest-request.util.ts
@@ -3,7 +3,7 @@ import { BadRequestException } from '@nestjs/common';
import { type OrderByWithGroupBy } from 'twenty-shared/types';
import { RestInputRequestParserExceptionCode } from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseOrderByWithGroupByRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/soft-delete-parser-utils/parse-soft-delete-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/soft-delete-parser-utils/parse-soft-delete-rest-request.util.ts
index b206c732521..513fb6f0b71 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/soft-delete-parser-utils/parse-soft-delete-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/soft-delete-parser-utils/parse-soft-delete-rest-request.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseSoftDeleteRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util.ts
index b865e2cd96a..5ca82406038 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util.ts
@@ -1,4 +1,4 @@
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { type RequestContext } from 'src/engine/api/rest/types/request-context.type';
export const parseStartingAfterRestRequest = (
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util.ts
index 5eeeb50a656..99a58577892 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/upsert-parser-utils/parse-upsert-rest-request.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseUpsertRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/view-id-parser-utils/parse-view-id-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/view-id-parser-utils/parse-view-id-rest-request.util.ts
index 271bbdcf434..95ddb576880 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/view-id-parser-utils/parse-view-id-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/view-id-parser-utils/parse-view-id-rest-request.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const parseViewIdRestRequest = (
request: AuthenticatedRequest,
diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts
index da254a07eb1..826f67f2b86 100644
--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts
@@ -5,7 +5,7 @@ import {
QUERY_MAX_RECORDS,
} from 'twenty-shared/constants';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts
index 9913ed0fe2f..4df2e92d9fd 100644
--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts
@@ -1,4 +1,4 @@
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
export const isMetadataRestRequest = (request: AuthenticatedRequest): boolean =>
request.originalUrl.startsWith('/rest/metadata/');
diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts
index b0974c906ea..fe70e87d8a7 100644
--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { paginateMetadataQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util';
import { type WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts
index 2c13e51f42a..f2bc9af3094 100644
--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts
@@ -1,6 +1,6 @@
import { type MetadataRestListResponse } from 'src/engine/api/rest/metadata/types/metadata-rest-list-response.type';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';
export const paginateMetadataRestItems = <T extends { id: string }>({
diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts
index 1aa545bbef7..6c00d4a67bc 100644
--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts
@@ -7,7 +7,7 @@ import { validate as uuidValidate } from 'uuid';
import { parseEndingBeforeRestRequest } from 'src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util';
import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util';
import { parseStartingAfterRestRequest } from 'src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';
export const parseMetadataRestPagination = (
diff --git a/packages/twenty-server/src/engine/api/rest/types/authenticated-request.ts b/packages/twenty-server/src/engine/api/rest/types/authenticated-request.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/rest/types/authenticated-request.ts
rename to packages/twenty-server/src/engine/api/rest/types/authenticated-request.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.entity.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.entity.ts
index ba56c112140..37564b7af44 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.entity.ts
@@ -9,7 +9,7 @@ import {
} from 'typeorm';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Index('IDX_API_KEY_WORKSPACE_ID', ['workspaceId'])
@Entity({ name: 'apiKey', schema: 'core' })
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
index 1ef7f7e67a3..c6373e93b68 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
@@ -18,7 +18,7 @@ import { ApiPath } from 'twenty-shared/types';
import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';
import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { type ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { CreateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/create-api-key.input';
import { UpdateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/update-api-key.input';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts
index 0a1aa176dd8..acb38b2b92c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts
@@ -37,7 +37,7 @@ import {
FileUploadCompletionService,
type FileUploadStorageLocation,
} from 'src/engine/core-modules/file/file-upload/services/file-upload-completion.service';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
index ee414f099f3..7cfb8be5feb 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.entity.ts
@@ -34,7 +34,7 @@ import { FrontComponentEntity } from 'src/engine/metadata-modules/front-componen
import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'application', schema: 'core' })
@ObjectType('Application')
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.entity.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.entity.ts
index 095476881a4..154a57b3626 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.entity.ts
@@ -9,7 +9,7 @@ import {
UpdateDateColumn,
} from 'typeorm';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'approvedAccessDomain', schema: 'core' })
@ObjectType('ApprovedAccessDomain')
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index d8536c3dd7f..73b0ba31b0a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -51,7 +51,7 @@ import {
type ExistingUserOrNewUser,
type SignInUpBaseParams,
type SignInUpNewUserPayload,
-} from 'src/engine/core-modules/auth/types/signInUp.type';
+} from 'src/engine/core-modules/auth/types/sign-in-up.type';
import { assertIssuerIsPublishedOrThrow } from 'src/engine/core-modules/auth/utils/assert-issuer-is-published.util';
import { validateRedirectUri } from 'src/engine/core-modules/auth/utils/validate-redirect-uri.util';
import { DomainServerConfigService } from 'src/engine/core-modules/domain/domain-server-config/services/domain-server-config.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
index 16fd51c3488..de89fa5975a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
@@ -51,7 +51,7 @@ import {
type PartialUserWithPicture,
type SignInUpBaseParams,
type SignInUpNewUserPayload,
-} from 'src/engine/core-modules/auth/types/signInUp.type';
+} from 'src/engine/core-modules/auth/types/sign-in-up.type';
import { SubdomainManagerService } from 'src/engine/core-modules/domain/subdomain-manager/services/subdomain-manager.service';
import { EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
index 563323a68a9..35f634625d4 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
@@ -14,7 +14,7 @@ import {
AuthException,
AuthExceptionCode,
} from 'src/engine/core-modules/auth/auth.exception';
-import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';
+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/sign-in-up.type';
import { type SocialSsoState } from 'src/engine/core-modules/auth/types/social-sso-state.type';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
index 65805201e0f..eaaf37edfdb 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
@@ -12,7 +12,7 @@ import {
AuthExceptionCode,
} from 'src/engine/core-modules/auth/auth.exception';
import { type MicrosoftPassportProfile } from 'src/engine/core-modules/auth/types/microsoft-passport-profile.type';
-import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';
+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/sign-in-up.type';
import { type SocialSsoState } from 'src/engine/core-modules/auth/types/social-sso-state.type';
import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/sign-in-up.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts
rename to packages/twenty-server/src/engine/core-modules/auth/types/sign-in-up.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts
index cefa83dd061..d1937b4b08b 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts
@@ -1,6 +1,6 @@
import { type APP_LOCALES } from 'twenty-shared/translations';
-import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';
+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/sign-in-up.type';
export type SocialSsoState = {
workspaceInviteHash?: string;
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.validate.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.validate.ts
index a93fdfdb34b..ec877b710e1 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.validate.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.validate.ts
@@ -16,7 +16,7 @@ import {
type LicensedBillingSubscriptionItem,
type MeteredBillingSubscriptionItem,
} from 'src/engine/core-modules/billing/types/billing-subscription-item.type';
-import { type BillingSubscriptionWithSubscriptionItems } from 'src/engine/core-modules/billing/types/billing-subscription-with-subscription-items';
+import { type BillingSubscriptionWithSubscriptionItems } from 'src/engine/core-modules/billing/types/billing-subscription-with-subscription-items.type';
import { type MeterBillingPriceTiers } from 'src/engine/core-modules/billing/types/meter-billing-price-tier.type';
const assertIsMeteredTiersSchemaOrThrow = (
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-credit-grant.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-credit-grant.entity.ts
index aa6647bcc1d..a5418efe73e 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-credit-grant.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-credit-grant.entity.ts
@@ -11,7 +11,7 @@ import {
import { BillingCreditGrantType } from 'src/engine/core-modules/billing/enums/billing-credit-grant-type.enum';
import { bigintColumnTransformer } from 'src/engine/core-modules/billing/utils/bigint-column-transformer.util';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'billingCreditGrant', schema: 'core' })
@Index('IDX_BILLING_CREDIT_GRANT_WORKSPACE_ID_EXPIRES_AT', [
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-customer.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-customer.entity.ts
index 169c7170736..cad6e6a7370 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-customer.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-customer.entity.ts
@@ -15,7 +15,7 @@ import {
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { BillingEntitlementEntity } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'billingCustomer', schema: 'core' })
@ObjectType('BillingCustomer')
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-entitlement.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-entitlement.entity.ts
index a90a8aed888..834391f311b 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-entitlement.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-entitlement.entity.ts
@@ -16,7 +16,7 @@ import {
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { BillingCustomerEntity } from 'src/engine/core-modules/billing/entities/billing-customer.entity';
import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'billingEntitlement', schema: 'core' })
@ObjectType('BillingEntitlement')
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
index cb97c70b3f8..841c2fa911c 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
@@ -42,7 +42,7 @@ import { BillingSubscriptionItemEntity } from 'src/engine/core-modules/billing/e
import { BillingSubscriptionCollectionMethod } from 'src/engine/core-modules/billing/enums/billing-subscription-collection-method.enum';
import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
registerEnumType(SubscriptionStatus, { name: 'SubscriptionStatus' });
registerEnumType(SubscriptionInterval, { name: 'SubscriptionInterval' });
diff --git a/packages/twenty-server/src/engine/core-modules/billing/types/billing-subscription-with-subscription-items.ts b/packages/twenty-server/src/engine/core-modules/billing/types/billing-subscription-with-subscription-items.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/billing/types/billing-subscription-with-subscription-items.ts
rename to packages/twenty-server/src/engine/core-modules/billing/types/billing-subscription-with-subscription-items.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/config/dpa-region-config.constant.ts b/packages/twenty-server/src/engine/core-modules/dpa/config/dpa-region-config.constant.ts
index 96286e34fa2..fc9723e9b5b 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/config/dpa-region-config.constant.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/config/dpa-region-config.constant.ts
@@ -1,5 +1,5 @@
import { DpaRegion } from 'src/engine/core-modules/dpa/enums/dpa-region.enum';
-import { type DpaRegionConfig } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type DpaRegionConfig } from 'src/engine/core-modules/dpa/types/dpa.type';
export const DEFAULT_DPA_REGION: DpaRegion = DpaRegion.EU;
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/constants/dpa-template.constant.ts b/packages/twenty-server/src/engine/core-modules/dpa/constants/dpa-template.constant.ts
index 8e6463f3f16..fc83a22fb86 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/constants/dpa-template.constant.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/constants/dpa-template.constant.ts
@@ -2,7 +2,7 @@
// Legal wording changes must be reviewed and accompanied by a template-version bump.
// Merge fields use {{DOUBLE_BRACES}} and are resolved at render time.
-import { type DpaTemplateBlock } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type DpaTemplateBlock } from 'src/engine/core-modules/dpa/types/dpa.type';
export const DPA_TEMPLATE_BLOCKS: DpaTemplateBlock[] = [
{
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/pdf/dpa-pdf-document.ts b/packages/twenty-server/src/engine/core-modules/dpa/pdf/dpa-pdf-document.ts
index 532bc1a01a5..0a14ca65256 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/pdf/dpa-pdf-document.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/pdf/dpa-pdf-document.ts
@@ -14,7 +14,7 @@ import {
LIBERATION_SANS_BOLD_BASE64,
LIBERATION_SANS_REGULAR_BASE64,
} from 'src/engine/core-modules/dpa/pdf/fonts/liberation-sans.fonts';
-import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.type';
// createElement (not JSX) because the twenty-server swc builder has tsx disabled (syntax: 'typescript').
// Liberation Sans is embedded because react-pdf's built-in fonts only encode ASCII; the legal text's curly
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/pdf/render-dpa-to-pdf.util.ts b/packages/twenty-server/src/engine/core-modules/dpa/pdf/render-dpa-to-pdf.util.ts
index 44d5fa741d7..9e7b8adb097 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/pdf/render-dpa-to-pdf.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/pdf/render-dpa-to-pdf.util.ts
@@ -1,7 +1,7 @@
import { renderToBuffer } from '@react-pdf/renderer';
import { buildDpaPdfDocumentElement } from 'src/engine/core-modules/dpa/pdf/dpa-pdf-document';
-import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.type';
// @react-pdf/renderer renders server-side via its own layout engine (no DOM/browser needed).
export const renderDpaToPdfBuffer = (resolved: ResolvedDpa): Promise<Buffer> =>
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/services/dpa-region.service.ts b/packages/twenty-server/src/engine/core-modules/dpa/services/dpa-region.service.ts
index a893fa54981..9320a39af11 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/services/dpa-region.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/services/dpa-region.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import { DEFAULT_DPA_REGION } from 'src/engine/core-modules/dpa/config/dpa-region-config.constant';
-import { type DpaRegion } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type DpaRegion } from 'src/engine/core-modules/dpa/types/dpa.type';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/services/dpa.service.ts b/packages/twenty-server/src/engine/core-modules/dpa/services/dpa.service.ts
index 8294016b544..90a5d307c20 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/services/dpa.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/services/dpa.service.ts
@@ -14,7 +14,7 @@ import { type GenerateSignedDpaResult } from 'src/engine/core-modules/dpa/dtos/g
import { DpaAgreementEntity } from 'src/engine/core-modules/dpa/entities/dpa-agreement.entity';
import { DpaAgreementType } from 'src/engine/core-modules/dpa/enums/dpa-agreement-type.enum';
import { DpaRegionService } from 'src/engine/core-modules/dpa/services/dpa-region.service';
-import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.type';
import { buildDpaAgreementRecord } from 'src/engine/core-modules/dpa/utils/build-dpa-agreement-record.util';
import { resolveDpa } from 'src/engine/core-modules/dpa/utils/resolve-dpa.util';
import { renderDpaToPdfBuffer } from 'src/engine/core-modules/dpa/pdf/render-dpa-to-pdf.util';
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/types/dpa.types.ts b/packages/twenty-server/src/engine/core-modules/dpa/types/dpa.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/dpa/types/dpa.types.ts
rename to packages/twenty-server/src/engine/core-modules/dpa/types/dpa.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/utils/__tests__/render-dpa-to-html.util.spec.ts b/packages/twenty-server/src/engine/core-modules/dpa/utils/__tests__/render-dpa-to-html.util.spec.ts
index 93a679f4fac..6b551a6cfb3 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/utils/__tests__/render-dpa-to-html.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/utils/__tests__/render-dpa-to-html.util.spec.ts
@@ -2,7 +2,7 @@ import { DpaRegion } from 'src/engine/core-modules/dpa/enums/dpa-region.enum';
import {
type DpaResolveContext,
type ResolvedDpa,
-} from 'src/engine/core-modules/dpa/types/dpa.types';
+} from 'src/engine/core-modules/dpa/types/dpa.type';
import { resolveDpa } from 'src/engine/core-modules/dpa/utils/resolve-dpa.util';
import { renderDpaToHtml } from 'src/engine/core-modules/dpa/utils/render-dpa-to-html.util';
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/utils/build-dpa-agreement-record.util.ts b/packages/twenty-server/src/engine/core-modules/dpa/utils/build-dpa-agreement-record.util.ts
index b7704ce4f4f..8bdadf24fbe 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/utils/build-dpa-agreement-record.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/utils/build-dpa-agreement-record.util.ts
@@ -2,7 +2,7 @@ import { getDpaRegionConfig } from 'src/engine/core-modules/dpa/config/dpa-regio
import { DPA_TEMPLATE_VERSION } from 'src/engine/core-modules/dpa/constants/dpa-template-version.constant';
import { type DpaAgreementEntity } from 'src/engine/core-modules/dpa/entities/dpa-agreement.entity';
import { type DpaAgreementType } from 'src/engine/core-modules/dpa/enums/dpa-agreement-type.enum';
-import { type DpaRegion } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type DpaRegion } from 'src/engine/core-modules/dpa/types/dpa.type';
type BuildDpaAgreementRecordArgs = {
workspaceId: string;
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/utils/render-dpa-to-html.util.ts b/packages/twenty-server/src/engine/core-modules/dpa/utils/render-dpa-to-html.util.ts
index 8760c789f81..e2b156150b6 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/utils/render-dpa-to-html.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/utils/render-dpa-to-html.util.ts
@@ -1,5 +1,5 @@
import { escapeHtml } from 'src/engine/core-modules/emailing-domain/utils/escape-html.util';
-import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.types';
+import { type ResolvedDpa } from 'src/engine/core-modules/dpa/types/dpa.type';
const renderMultiline = (value: string): string =>
escapeHtml(value)
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/utils/resolve-dpa.util.ts b/packages/twenty-server/src/engine/core-modules/dpa/utils/resolve-dpa.util.ts
index bbe1227e575..1041cba59bd 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/utils/resolve-dpa.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/utils/resolve-dpa.util.ts
@@ -13,7 +13,7 @@ import {
type DpaResolveContext,
type ResolvedDpa,
type ResolvedDpaBlock,
-} from 'src/engine/core-modules/dpa/types/dpa.types';
+} from 'src/engine/core-modules/dpa/types/dpa.type';
import { type SubprocessorList } from 'src/engine/core-modules/dpa/types/subprocessor.type';
const MERGE_FIELD_PATTERN = /\{\{([A-Z_]+)\}\}/g;
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts
index 0abfede73e4..9d921ea4e1a 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts
@@ -39,7 +39,7 @@ import {
EmailingDomainDriverExceptionCode,
} from 'src/engine/core-modules/emailing-domain/drivers/exceptions/emailing-domain-driver.exception';
import { EmailingDomainStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-status.type';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
export class AwsSesDriver implements EmailingDomainDriverInterface {
private readonly logger = new Logger(AwsSesDriver.name);
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/utils/build-aws-ses-verification-records.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/utils/build-aws-ses-verification-records.util.ts
index 68f3a39b736..57eccf15f23 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/utils/build-aws-ses-verification-records.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/utils/build-aws-ses-verification-records.util.ts
@@ -1,5 +1,5 @@
import { AWS_SES_MAIL_FROM_SUBDOMAIN } from 'src/engine/core-modules/emailing-domain/drivers/aws-ses/constants/aws-ses-mail-from-subdomain.constant';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
type BuildAwsSesVerificationRecordsArgs = {
domain: string;
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/interfaces/emailing-domain-driver.interface.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/interfaces/emailing-domain-driver.interface.ts
index 7645d246270..064ef317a6d 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/interfaces/emailing-domain-driver.interface.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/interfaces/emailing-domain-driver.interface.ts
@@ -3,7 +3,7 @@ import { type EmailingDomainSendEmailBatchResult } from 'src/engine/core-modules
import { type EmailingDomainSendEmailRequest } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-email-input.type';
import { type EmailingDomainSendEmailResult } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-email-result.type';
import { type EmailingDomainStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-status.type';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
export type EmailingDomainResourceInput = {
domain: string;
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/utils/map-resend-domain-records.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/utils/map-resend-domain-records.util.ts
index d42fc86c163..e4ee56fa46e 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/utils/map-resend-domain-records.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/utils/map-resend-domain-records.util.ts
@@ -1,7 +1,7 @@
import { isDefined } from 'twenty-shared/utils';
import { type ResendDomainRecord } from 'src/engine/core-modules/emailing-domain/drivers/resend/types/resend-domain-record.type';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
const mapResendRecordStatus = (status: string | undefined): string => {
switch (status) {
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/types/verifications-record.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/types/verifications-record.ts
rename to packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.entity.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.entity.ts
index 9bb2670df45..e94b9c9108f 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.entity.ts
@@ -12,8 +12,8 @@ import {
import { EmailingDomainStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-status.type';
import { EmailingDomainTenantStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-tenant-status.type';
import { UnsubscribeHostnameStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/unsubscribe-hostname-status.type';
-import { VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'emailingDomain', schema: 'core' })
@ObjectType('EmailingDomain')
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
index 7ae396f0223..fdba8fa79ad 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
@@ -10,7 +10,7 @@ import {
} from 'src/engine/core-modules/dns-manager/exceptions/dns-manager.exception';
import { UNSUBSCRIBE_HOSTNAME_PREFIX } from 'src/engine/core-modules/emailing-domain/constants/unsubscribe-hostname-prefix.constant';
import { UnsubscribeHostnameStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/unsubscribe-hostname-status.type';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
import { DnsManagerService } from 'src/engine/core-modules/dns-manager/services/dns-manager.service';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/unsubscribe-topic.entity.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/unsubscribe-topic.entity.ts
index b813c1a96af..5d0a1a06667 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/unsubscribe-topic.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/unsubscribe-topic.entity.ts
@@ -8,7 +8,7 @@ import {
} from 'typeorm';
import { UnsubscribeTopicVisibility } from 'src/engine/core-modules/emailing-domain/types/unsubscribe-topic-visibility.type';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'unsubscribeTopic', schema: 'core' })
@Index('IDX_UNSUBSCRIBE_TOPIC_WORKSPACE_ID', ['workspaceId'])
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-dmarc-verification-record.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-dmarc-verification-record.util.ts
index 87a4a1bb12e..e47afae392d 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-dmarc-verification-record.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-dmarc-verification-record.util.ts
@@ -2,7 +2,7 @@ import { DMARC_MONITORING_POLICY } from 'src/engine/core-modules/emailing-domain
import { DMARC_RECORD_PREFIX } from 'src/engine/core-modules/emailing-domain/constants/dmarc-record-prefix.constant';
import { DMARC_REPORT_MAILBOX } from 'src/engine/core-modules/emailing-domain/constants/dmarc-report-mailbox.constant';
import { DMARC_VERSION_TAG } from 'src/engine/core-modules/emailing-domain/constants/dmarc-version-tag.constant';
-import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record';
+import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
export const buildDmarcVerificationRecord = (
domain: string,
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
index 8ce07bcd46e..5e59c5418cb 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
@@ -10,7 +10,7 @@ import {
UpdateDateColumn,
} from 'typeorm';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'featureFlag', schema: 'core' })
@Unique('IDX_FEATURE_FLAG_KEY_WORKSPACE_ID_UNIQUE', ['key', 'workspaceId'])
diff --git a/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts b/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
index ed535ef5c5c..b034eb3365d 100644
--- a/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file-storage/services/file-storage.service.ts
@@ -32,8 +32,8 @@ import { validateFolderPath } from 'src/engine/core-modules/file-storage/utils/v
import { validateStoragePathIsWithinWorkspaceOrThrow } from 'src/engine/core-modules/file-storage/utils/validate-storage-path-is-within-workspace-or-throw.util';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FILE_CONTENT_SNIFF_BYTE_COUNT } from 'src/engine/core-modules/file/file-upload/constants/file-content-sniff.constant';
-import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.types';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.type';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { extractFileInfoOrThrow } from 'src/engine/core-modules/file/utils/extract-file-info-or-throw.utils';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
import { STOCK_METERS } from 'src/engine/core-modules/usage-limit/constants/usage-meters.constant';
diff --git a/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts b/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
index 9b1eabc793c..a238b7de5b8 100644
--- a/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/entities/file.entity.ts
@@ -17,11 +17,11 @@ import { ADD_STATUS_TO_FILE_UPGRADE_COMMAND_NAME } from 'src/database/commands/u
import { ALLOW_SERVER_SCOPED_FILE_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-20/allow-server-scoped-file-upgrade-command-name.constant';
import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.types';
+import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.type';
import {
FILE_STATUS,
FileStatus,
-} from 'src/engine/core-modules/file/types/file-status.types';
+} from 'src/engine/core-modules/file/types/file-status.type';
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { nullableBigintColumnTransformer } from 'src/engine/twenty-orm/utils/nullable-bigint-column-transformer.util';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/__tests__/file-upload-completion.service.spec.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/__tests__/file-upload-completion.service.spec.ts
index 63e9012a23d..13ccf00d1c1 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/__tests__/file-upload-completion.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/__tests__/file-upload-completion.service.spec.ts
@@ -8,7 +8,7 @@ import { MAX_SANITIZABLE_SVG_BYTES } from 'src/engine/core-modules/file/file-upl
import { FileUploadExceptionCode } from 'src/engine/core-modules/file/file-upload/file-upload.exception';
import { FileUploadCompletionService } from 'src/engine/core-modules/file/file-upload/services/file-upload-completion.service';
import { buildPendingUploadResourcePath } from 'src/engine/core-modules/file/file-upload/utils/build-pending-upload-resource-path.util';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
describe('FileUploadCompletionService.completeUploadedFile', () => {
const workspaceId = '20202020-0000-4000-8000-000000000001';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload-target.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload-target.service.ts
index 0a2336e68ea..f0f580c52e1 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload-target.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload-target.service.ts
@@ -16,7 +16,7 @@ import {
import { type BatchFileResult } from 'src/engine/core-modules/file/file-upload/types/batch-file-result.type';
import { buildPendingUploadResourcePath } from 'src/engine/core-modules/file/file-upload/utils/build-pending-upload-resource-path.util';
import { toBatchErrorMessage } from 'src/engine/core-modules/file/file-upload/utils/to-batch-error-message.util';
-import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.types';
+import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.type';
import { FileUploadTokenJwtPayload } from 'src/engine/core-modules/auth/types/file-upload-token-jwt-payload.type';
import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
index 765a7b685b7..2b435783002 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts
@@ -31,7 +31,7 @@ import { FileUploadTargetService } from 'src/engine/core-modules/file/file-uploa
import { assertValidDirectUploadSize } from 'src/engine/core-modules/file/file-upload/utils/assert-valid-direct-upload-size.util';
import { buildSvgTooLargeException } from 'src/engine/core-modules/file/file-upload/utils/build-svg-too-large-exception.util';
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { buildFileInfo } from 'src/engine/core-modules/file/utils/build-file-info.utils';
import { buildPendingUploadResourcePath } from 'src/engine/core-modules/file/file-upload/utils/build-pending-upload-resource-path.util';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/pending-file-cleanup.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/pending-file-cleanup.service.ts
index bf341424ae7..d07154a03f8 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/pending-file-cleanup.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/pending-file-cleanup.service.ts
@@ -14,7 +14,7 @@ import {
RECORD_EXPORT_FILE_MAX_AGE_MS,
} from 'src/engine/core-modules/file/file-upload/crons/constants/pending-file-cleanup.constants';
import { buildPendingUploadResourcePath } from 'src/engine/core-modules/file/file-upload/utils/build-pending-upload-resource-path.util';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
@Injectable()
diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts
index 132793566f5..403c941716b 100644
--- a/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts
@@ -5,7 +5,7 @@ import { type FileStorageService } from 'src/engine/core-modules/file-storage/se
import { type FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { type FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
import { FilesFieldService } from 'src/engine/core-modules/file/files-field/services/files-field.service';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { type WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts
index 77e536f5887..01b7a4f6052 100644
--- a/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts
@@ -19,7 +19,7 @@ import {
FilesFieldException,
FilesFieldExceptionCode,
} from 'src/engine/core-modules/file/files-field/files-field.exception';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { extractFileInfoOrThrow } from 'src/engine/core-modules/file/utils/extract-file-info-or-throw.utils';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
diff --git a/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
index 63f76940f7b..61ab9346f3e 100644
--- a/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
@@ -20,7 +20,7 @@ import {
FileExceptionCode,
} from 'src/engine/core-modules/file/file.exception';
import { type FileResponse } from 'src/engine/core-modules/file/types/file-response.type';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { getContentDisposition } from 'src/engine/core-modules/file/utils/get-content-disposition.utils';
import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';
import { resolveByteRange } from 'src/engine/core-modules/file/utils/resolve-byte-range.utils';
diff --git a/packages/twenty-server/src/engine/core-modules/file/types/file-settings.types.ts b/packages/twenty-server/src/engine/core-modules/file/types/file-settings.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/file/types/file-settings.types.ts
rename to packages/twenty-server/src/engine/core-modules/file/types/file-settings.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/file/types/file-status.types.ts b/packages/twenty-server/src/engine/core-modules/file/types/file-status.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/file/types/file-status.types.ts
rename to packages/twenty-server/src/engine/core-modules/file/types/file-status.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.entity.ts b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.entity.ts
index 947b12eec2c..1da74b171cd 100644
--- a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.entity.ts
@@ -13,7 +13,7 @@ import {
} from 'typeorm';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity({ name: 'publicDomain', schema: 'core' })
@ObjectType('PublicDomain')
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 48b72e21f21..0e7e668c332 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
@@ -22,7 +22,7 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
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 { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } 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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
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 d309b20757e..e5212fd19f2 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
@@ -3,7 +3,7 @@ import { type ActorMetadata } from 'twenty-shared/types';
import { type ShareWithInput } from 'src/engine/core-modules/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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 e4dfe9898af..0738b8a5d7f 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 e6455f665fd..eb5af551b6d 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type RecordCrudExecutionContext = {
authContext: WorkspaceAuthContext;
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 c29a48c2a9a..0cdf4f3a9d8 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 13a768c4dd5..f0a2f5bc38b 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type UpsertManyRecordsParams = {
objectName: string;
diff --git a/packages/twenty-server/src/engine/core-modules/record-export/jobs/generate-record-export.job.ts b/packages/twenty-server/src/engine/core-modules/record-export/jobs/generate-record-export.job.ts
index 5b01b714afe..f11c8ecf001 100644
--- a/packages/twenty-server/src/engine/core-modules/record-export/jobs/generate-record-export.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-export/jobs/generate-record-export.job.ts
@@ -11,7 +11,7 @@ import {
import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
diff --git a/packages/twenty-server/src/engine/core-modules/record-export/services/record-export.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/record-export/services/record-export.workspace-service.ts
index ef88b71a0fe..9d83760ebc6 100644
--- a/packages/twenty-server/src/engine/core-modules/record-export/services/record-export.workspace-service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-export/services/record-export.workspace-service.ts
@@ -34,7 +34,7 @@ import { CacheStorageService } from 'src/engine/core-modules/cache-storage/servi
import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
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 1b0846a2a83..97b5e37891e 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
@@ -38,7 +38,7 @@ import {
SearchException,
SearchExceptionCode,
} from 'src/engine/core-modules/search/exceptions/search.exception';
-import { type RecordsWithObjectMetadataItem } from 'src/engine/core-modules/search/types/records-with-object-metadata-item';
+import { type RecordsWithObjectMetadataItem } from 'src/engine/core-modules/search/types/records-with-object-metadata-item.type';
import { formatSearchTerms } from 'src/engine/core-modules/search/utils/format-search-terms';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
@@ -55,7 +55,7 @@ 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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/search/types/records-with-object-metadata-item.ts b/packages/twenty-server/src/engine/core-modules/search/types/records-with-object-metadata-item.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/search/types/records-with-object-metadata-item.ts
rename to packages/twenty-server/src/engine/core-modules/search/types/records-with-object-metadata-item.type.ts
diff --git a/packages/twenty-server/src/engine/core-modules/secret-encryption/branded-strings/__tests__/extract-encrypted-columns.type-test.ts b/packages/twenty-server/src/engine/core-modules/secret-encryption/branded-strings/__tests__/extract-encrypted-columns.type-test.ts
index 51544229ddd..a668c01d7f4 100644
--- a/packages/twenty-server/src/engine/core-modules/secret-encryption/branded-strings/__tests__/extract-encrypted-columns.type-test.ts
+++ b/packages/twenty-server/src/engine/core-modules/secret-encryption/branded-strings/__tests__/extract-encrypted-columns.type-test.ts
@@ -4,7 +4,7 @@ import { type EmptyObject } from 'twenty-shared/types';
import { type EncryptedString } from 'src/engine/core-modules/secret-encryption/branded-strings/encrypted-string.type';
import { type ExtractEncryptedColumns } from 'src/engine/core-modules/secret-encryption/branded-strings/extract-encrypted-columns.type';
import { type PlaintextString } from 'src/engine/core-modules/secret-encryption/branded-strings/plaintext-string.type';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
type EncryptedConnectionParametersLike = {
IMAP?: { host: string; password: EncryptedString };
diff --git a/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts b/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts
index 77dd6e25212..4343b4aa686 100644
--- a/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts
@@ -10,7 +10,7 @@ import {
} from 'typeorm';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export enum IdentityProviderType {
OIDC = 'OIDC',
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 e42a1eb8633..680320cb060 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type ToolProviderContext = {
resolveExecutionContext?: () => Promise<ToolProviderContext>;
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 9c7283640e7..acfec16c68e 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
@@ -20,7 +20,7 @@ import { findSimilarToolNames } from 'src/engine/core-modules/tool-provider/util
import { wrapWithErrorHandler } from 'src/engine/core-modules/tool-provider/utils/tool-error.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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 965c57e53e5..d845f16f36d 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
@@ -3,7 +3,7 @@ import { z } from 'zod';
import { ToolCategory } from 'twenty-shared/ai';
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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 1341220e8b2..4db964af540 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type ToolContext = {
resolveExecutionContext?: () => Promise<ToolContext>;
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
index 5541ec7504f..f5c9838d409 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
@@ -39,7 +39,7 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
-import { type MessageAttachment } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageAttachment } from 'src/modules/messaging/message-import-manager/types/message.type';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
type ParentThreadContext = {
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
index bb28e936fba..b8308161d3b 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
@@ -1,5 +1,5 @@
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
-import { type MessageAttachment } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageAttachment } from 'src/modules/messaging/message-import-manager/types/message.type';
export type ComposedEmail = {
recipients: { to: string[]; cc: string[]; bcc: string[] };
diff --git a/packages/twenty-server/src/engine/core-modules/upgrade/utils/__tests__/format-upgrade-error-for-storage.util.spec.ts b/packages/twenty-server/src/engine/core-modules/upgrade/utils/__tests__/format-upgrade-error-for-storage.util.spec.ts
index dfd1ce92d29..b3257340820 100644
--- a/packages/twenty-server/src/engine/core-modules/upgrade/utils/__tests__/format-upgrade-error-for-storage.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/upgrade/utils/__tests__/format-upgrade-error-for-storage.util.spec.ts
@@ -6,7 +6,7 @@ import {
WorkspaceMigrationRunnerException,
WorkspaceMigrationRunnerExceptionCode,
} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { type OrchestratorFailureReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
import { formatUpgradeErrorForStorage } from 'src/engine/core-modules/upgrade/utils/format-upgrade-error-for-storage.util';
diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts
index 834e766c26a..7c55cb8f0ae 100644
--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts
@@ -14,7 +14,7 @@ import { type UsageMeter } from 'src/engine/core-modules/usage-limit/types/usage
import { nullableBigintColumnTransformer } from 'src/engine/twenty-orm/utils/nullable-bigint-column-transformer.util';
import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';
import { type UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Unique('UQ_USAGE_LIMIT_SCOPE', [
'workspaceId',
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts
index cedf8ad224f..9e87faea174 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts
@@ -24,7 +24,7 @@ import { TwoFactorAuthenticationMethodSummaryDTO } from 'src/engine/core-modules
import { TwoFactorAuthenticationMethodEntity } from 'src/engine/core-modules/two-factor-authentication/entities/two-factor-authentication-method.entity';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { ObjectPermissionDTO } from 'src/engine/metadata-modules/object-permission/dtos/object-permission.dto';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
registerEnumType(PermissionFlagType, {
name: 'PermissionFlagType',
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 0ce6bcee1a3..91b04448784 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -76,7 +76,7 @@ import {
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
-import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions';
+import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions.type';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { fromUserWorkspacePermissionsToUserWorkspacePermissionsDto } from 'src/engine/metadata-modules/role/utils/fromUserWorkspacePermissionsToUserWorkspacePermissionsDto';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/run-agent-attachment.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/run-agent-attachment.service.ts
index e63a177aebe..a94ae734dd3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/run-agent-attachment.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/run-agent-attachment.service.ts
@@ -8,7 +8,7 @@ import { In, Like } from 'typeorm';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { type ResolvedRunAgentAttachment } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/resolved-run-agent-attachment.type';
import { buildRunAgentModelMessageOrThrow } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-run-agent-model-message.util';
import { extractRunAgentAttachmentFileIdsOrThrow } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/extract-run-agent-attachment-file-ids.util';
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 43a9ec664eb..81bc6eb31e7 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,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export const buildAgentRolePermissionConfig = ({
agentRoleId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
index 1bde00803b5..3a44b86bed6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto.ts
@@ -10,7 +10,7 @@ import {
import GraphQLJSON from 'graphql-type-json';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';
@ObjectType('Agent')
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
index d9f1f8dd395..d85c24e635c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/create-agent.input.ts
@@ -14,7 +14,7 @@ import GraphQLJSON from 'graphql-type-json';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { AgentResponseFormat } from 'src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type';
import { AgentResponseFormatJson } from 'src/engine/metadata-modules/ai/ai-agent/validators/agent-response-format-json.validator';
import { AgentResponseFormatText } from 'src/engine/metadata-modules/ai/ai-agent/validators/agent-response-format-text.validator';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
index a5a2d8e539e..1d0c0d8f900 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/dtos/update-agent.input.ts
@@ -14,7 +14,7 @@ import GraphQLJSON from 'graphql-type-json';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { AgentResponseFormat } from 'src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type';
import { AgentResponseFormatJson } from 'src/engine/metadata-modules/ai/ai-agent/validators/agent-response-format-json.validator';
import { AgentResponseFormatText } from 'src/engine/metadata-modules/ai/ai-agent/validators/agent-response-format-text.validator';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
index 6aa64413c06..dc50bc9b90c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/entities/agent.entity.ts
@@ -9,7 +9,7 @@ import {
} from 'typeorm';
import { AgentResponseFormat } from 'src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type';
-import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type';
import { AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID } from 'twenty-shared/ai';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts
index 6c3387c4f76..a9905fae28b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts
@@ -1,6 +1,6 @@
import type { ExtendedUIMessage } from 'twenty-shared/ai';
-import type { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type';
+import type { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';
export type StreamAgentChatJobData = {
threadId: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
index 2cace4fda82..cea0be20eab 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
@@ -27,7 +27,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';
-import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type';
+import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';
import { AgentChatQuestionAnswerInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input';
import { AgentChatThreadDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread.dto';
import { FileAttachmentInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/file-attachment.input';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
index 0083baf1b5d..f3ab589b68b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
@@ -31,7 +31,7 @@ import {
AgentMessageStatus,
} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/mapDBPartsToUIMessageParts';
-import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type';
+import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
import { type AgentChatThreadLastStreamError } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type';
import { STREAM_AGENT_CHAT_JOB_NAME } from 'src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job-name.constant';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
index 659a3c14c20..ef51525c558 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts
@@ -49,7 +49,7 @@ import { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agen
import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';
import { guideUncallableToolCallsToMetaTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/guide-uncallable-tool-calls-to-meta-tool.util';
import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const';
-import { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type';
+import { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';
import { repairToolCall } from 'src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util';
import { AiBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
import { convertDollarsToCreditsMicro } from 'src/engine/metadata-modules/ai/ai-billing/utils/convert-dollars-to-credits-micro.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
index fba0c6ad8c3..798f1c784ca 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
@@ -21,7 +21,7 @@ import {
} from 'twenty-shared/types';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
registerEnumType(CalendarChannelVisibility, {
name: 'CalendarChannelVisibility',
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
index ea9a0e9c69b..c335c5d4306 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/entities/command-menu-item.entity.ts
@@ -25,7 +25,7 @@ import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-ite
import { FrontComponentEntity } from 'src/engine/metadata-modules/front-component/entities/front-component.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type CommandMenuItemOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/entities/connected-account.entity.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/entities/connected-account.entity.ts
index 6dcf8ba0089..3d3be49d7a4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/entities/connected-account.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/entities/connected-account.entity.ts
@@ -21,7 +21,7 @@ import { type EncryptedString } from 'src/engine/core-modules/secret-encryption/
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { type CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
import { type MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export type ConnectedAccountVisibility = 'user' | 'workspace';
diff --git a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
index 870f0a27178..43d9e1b74d3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.entity.ts
@@ -8,7 +8,7 @@ import {
UpdateDateColumn,
} from 'typeorm';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export type DataSourceType = DataSourceOptions['type'];
diff --git a/packages/twenty-server/src/engine/metadata-modules/deferred-workspace-migration-action/deferred-workspace-migration-action.entity.ts b/packages/twenty-server/src/engine/metadata-modules/deferred-workspace-migration-action/deferred-workspace-migration-action.entity.ts
index 8080d87888b..6123ac21b65 100644
--- a/packages/twenty-server/src/engine/metadata-modules/deferred-workspace-migration-action/deferred-workspace-migration-action.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/deferred-workspace-migration-action/deferred-workspace-migration-action.entity.ts
@@ -9,7 +9,7 @@ import {
import { type PersistedDeferredWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action.type';
import { type DeferredWorkspaceMigrationActionStatus } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action-status.type';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Index('IDX_DEFERRED_WORKSPACE_MIGRATION_ACTION_WORKSPACE_ID_STATUS', [
'workspaceId',
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts
index d151f83c2f1..d4131072693 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts
@@ -20,7 +20,7 @@ import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';
import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';
import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/__tests__/all-flat-entity-by-metadata-engine-name.test-type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/__tests__/all-flat-entity-by-metadata-engine-name.test-type.ts
index 62274c71a5f..4ded1f740a9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/__tests__/all-flat-entity-by-metadata-engine-name.test-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/__tests__/all-flat-entity-by-metadata-engine-name.test-type.ts
@@ -1,7 +1,7 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type Expect } from 'twenty-shared/testing';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { type SyncableFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';
import { type WorkspaceMigrationActionType } from 'src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type';
import { type UniversalSyncableFlatEntity } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-from.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type.ts
index 4f6776a37c0..e125b7f26ff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type.ts
@@ -1,7 +1,7 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type MetadataFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
export type AllFlatEntityMaps<
TWithCustomMapsProperties extends boolean = false,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type.ts
similarity index 99%
rename from packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts
rename to packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type.ts
index c7a74c27978..c8bc0c36079 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type.ts
@@ -126,7 +126,7 @@ import {
type UniversalCreateAgentAction,
type UniversalDeleteAgentAction,
type UniversalUpdateAgentAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type';
import {
type FlatCreateCommandMenuItemAction,
type FlatDeleteCommandMenuItemAction,
@@ -166,7 +166,7 @@ import {
type UniversalCreateFieldAction,
type UniversalDeleteFieldAction,
type UniversalUpdateFieldAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import {
type FlatCreateFrontComponentAction,
type FlatDeleteFrontComponentAction,
@@ -182,7 +182,7 @@ import {
type UniversalCreateIndexAction,
type UniversalDeleteIndexAction,
type UniversalUpdateIndexAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type';
import {
type FlatCreateLogicFunctionAction,
type FlatDeleteLogicFunctionAction,
@@ -214,7 +214,7 @@ import {
type UniversalCreateObjectAction,
type UniversalDeleteObjectAction,
type UniversalUpdateObjectAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import {
type FlatCreatePageLayoutTabAction,
type FlatDeletePageLayoutTabAction,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-many-to-one-entity-relation-properties.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-many-to-one-entity-relation-properties.type.ts
index 5f558146ced..5e552c69fbf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-many-to-one-entity-relation-properties.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-many-to-one-entity-relation-properties.type.ts
@@ -1,5 +1,5 @@
import { type AllNonWorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/all-non-workspace-related-entity.type';
-import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export type ExtractEntityManyToOneEntityRelationProperties<
T,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-one-to-many-entity-relation-properties.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-one-to-many-entity-relation-properties.type.ts
index fed59afc32a..14c3e123a9d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-one-to-many-entity-relation-properties.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-one-to-many-entity-relation-properties.type.ts
@@ -1,5 +1,5 @@
import { type AllNonWorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/all-non-workspace-related-entity.type';
-import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export type ExtractEntityOneToManyEntityRelationProperties<
T,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-related-entity-properties.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-related-entity-properties.type.ts
index cc5b9c88059..8ee68fd1435 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-related-entity-properties.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/extract-entity-related-entity-properties.type.ts
@@ -1,7 +1,7 @@
import { type ExtractEntityManyToOneEntityRelationProperties } from 'src/engine/metadata-modules/flat-entity/types/extract-entity-many-to-one-entity-relation-properties.type';
import { type ExtractEntityOneToManyEntityRelationProperties } from 'src/engine/metadata-modules/flat-entity/types/extract-entity-one-to-many-entity-relation-properties.type';
import { type AllNonWorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/all-non-workspace-related-entity.type';
-import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { type WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
export type ExtractEntityRelatedEntityProperties<
T,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/from-metadata-entity-to-metadata-name.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/from-metadata-entity-to-metadata-name.type.ts
index 264be641386..da2278edc29 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/from-metadata-entity-to-metadata-name.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/from-metadata-entity-to-metadata-name.type.ts
@@ -3,7 +3,7 @@ import { type Expect } from 'twenty-shared/testing';
import { type FieldMetadataType } from 'twenty-shared/types';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { type SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
export type FromMetadataEntityToMetadataName<T extends SyncableEntity> = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-side-effect.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-side-effect.type.ts
index 1666998d8bb..f62e38cd591 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-side-effect.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-side-effect.type.ts
@@ -2,7 +2,7 @@ import { type AllMetadataName } from 'twenty-shared/metadata';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type MetadataSideEffectRelatedMetadataNames } from 'src/engine/metadata-modules/flat-entity/types/metadata-side-effect-related-metadata-names.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
export type MetadataFlatEntityAndRelatedFlatEntityMapsForSideEffect<
T extends AllMetadataName,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-validation.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-validation.type.ts
index 1330ab2bdb8..4d170496ec5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-validation.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-validation.type.ts
@@ -1,7 +1,7 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type MetadataRelatedFlatEntityMapsKeys } from 'src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { type MetadataValidationRelatedMetadataNames } from 'src/engine/metadata-modules/flat-entity/types/metadata-validation-related-metadata-names.type';
import { type AllUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type.ts
index d7c6116dc88..803ea2135de 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-maps.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type.ts
index 524ac58de5d..d36ff860da9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
export type MetadataFlatEntity<T extends AllMetadataName> =
AllFlatEntityTypesByMetadataName[T]['flatEntity'];
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type.ts
index 13e212351f6..5a776db9765 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type.ts
@@ -1,7 +1,7 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type MetadataManyToOneRelatedMetadataNames } from 'src/engine/metadata-modules/flat-entity/types/metadata-many-to-one-related-metadata-names.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
export type MetadataRelatedFlatEntityMapsKeys<T extends AllMetadataName> =
MetadataToFlatEntityMapsKey<MetadataManyToOneRelatedMetadataNames<T>>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-types.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-types.type.ts
index dedb55b4a84..6d2ddaa879a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-types.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-related-types.type.ts
@@ -2,7 +2,7 @@ import { type AllMetadataName } from 'twenty-shared/metadata';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type MetadataRelatedFlatEntityMapsKeys } from 'src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { type MetadataValidationRelatedMetadataNames } from 'src/engine/metadata-modules/flat-entity/types/metadata-validation-related-metadata-names.type';
import { type AllUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.ts
rename to packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type.ts
index 5bd96d349a7..6b9eec6e27e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
export type MetadataUniversalFlatEntity<T extends AllMetadataName> =
AllFlatEntityTypesByMetadataName[T]['universalFlatEntity'];
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type.ts
index 3d575d57527..1932f9a2d26 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { type WORKSPACE_MIGRATION_ACTION_TYPE } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/constants/workspace-migration-action-type.constant';
export type WorkspaceMigrationActionType =
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util.ts
index 4a5085a9173..6159717461a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util.ts
@@ -1,7 +1,7 @@
import { capitalize } from 'twenty-shared/utils';
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
export const getMetadataFlatEntityMapsKey = <T extends AllMetadataName>(
metadataName: T,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util.ts
index 8919f77ddab..de426723173 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util.ts
@@ -9,7 +9,7 @@ import {
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type MetadataManyToOneJoinColumn } from 'src/engine/metadata-modules/flat-entity/types/metadata-many-to-one-join-column.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
type ManyToOneConfig<T extends AllMetadataName> =
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function-layer/logic-function-layer.entity.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function-layer/logic-function-layer.entity.ts
index cb2a4da7dcd..4dad06f4523 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function-layer/logic-function-layer.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function-layer/logic-function-layer.entity.ts
@@ -7,7 +7,7 @@ import {
UpdateDateColumn,
} from 'typeorm';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Entity('logicFunctionLayer')
export class LogicFunctionLayerEntity extends WorkspaceRelatedEntity {
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/entities/message-channel.entity.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/entities/message-channel.entity.ts
index a1323e3695a..fb1038bf42e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/entities/message-channel.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/entities/message-channel.entity.ts
@@ -26,7 +26,7 @@ import {
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { type MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
registerEnumType(MessageChannelVisibility, {
name: 'MessageChannelVisibility',
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
index e8ea23f5b45..37df9966612 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/services/application-message-ingestion.service.ts
@@ -19,7 +19,7 @@ import { resolveAppMessageDirection } from 'src/engine/metadata-modules/message-
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { MessagingSaveMessagesAndEnqueueContactCreationService } from 'src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
// A full batch is 100 messages in one transaction, so the hold has to outlast
// that comfortably: a lease that expires mid-save would let the next delivery
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
index 727fe077a87..c4c4a0921c8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/entities/message-folder.entity.ts
@@ -14,7 +14,7 @@ import {
import { MessageFolderPendingSyncAction } from 'twenty-shared/types';
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
registerEnumType(MessageFolderPendingSyncAction, {
name: 'MessageFolderPendingSyncAction',
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts
index ccf5a99ba8e..23d38eeed9b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts
@@ -21,7 +21,7 @@ import { In } from 'typeorm';
import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';
import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts
index 390d96a9e2e..e2456a1a4c8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts
@@ -20,7 +20,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
index f505c947c3d..a2da230e18a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts
@@ -19,7 +19,7 @@ import { ADD_IS_SYSTEM_SIDE_EFFECT_UPGRADE_COMMAND_NAME } from 'src/database/com
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type PageLayoutTabOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts
index a72d6c1691f..4aee008ef74 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts
@@ -20,7 +20,7 @@ import { type APP_LOCALES } from 'twenty-shared/translations';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
index 7430f67e39c..b6eacf4face 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
@@ -27,7 +27,7 @@ import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadat
import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';
import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
import { PageLayoutWidgetConfigurationTypeSettings } from 'src/engine/metadata-modules/page-layout-widget/types/page-layout-widget-configuration.type';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
import { type JsonbProperty } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/jsonb-property.type';
export type PageLayoutWidgetOverrides = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts
index 86ddea6b446..76a25318f3a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts
@@ -18,7 +18,7 @@ import { ApiPath, PageLayoutType } from 'twenty-shared/types';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
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 df26cbcc410..92a617f9073 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
@@ -24,10 +24,10 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions';
+import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions.type';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+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 { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.util';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/types/user-workspace-permissions.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/types/user-workspace-permissions.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/permissions/types/user-workspace-permissions.ts
rename to packages/twenty-server/src/engine/metadata-modules/permissions/types/user-workspace-permissions.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/services/workspace-user-workspace-role-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/services/workspace-user-workspace-role-map-cache.service.ts
index 3f597407046..84070eb2aec 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role-target/services/workspace-user-workspace-role-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role-target/services/workspace-user-workspace-role-map-cache.service.ts
@@ -6,7 +6,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
-import { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+import { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
import { type WorkspaceCacheProviderContext } from 'src/engine/workspace-cache/types/workspace-cache-provider-context.type';
import { type WorkspaceCacheRowsRequirement } from 'src/engine/workspace-cache/types/workspace-cache-rows-requirement.type';
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/types/user-workspace-role-map.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/types/user-workspace-role-map.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/role-target/types/user-workspace-role-map.ts
rename to packages/twenty-server/src/engine/metadata-modules/role-target/types/user-workspace-role-map.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/utils/fromUserWorkspacePermissionsToUserWorkspacePermissionsDto.ts b/packages/twenty-server/src/engine/metadata-modules/role/utils/fromUserWorkspacePermissionsToUserWorkspacePermissionsDto.ts
index 903ed419376..38185d76986 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/utils/fromUserWorkspacePermissionsToUserWorkspacePermissionsDto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/utils/fromUserWorkspacePermissionsToUserWorkspacePermissionsDto.ts
@@ -1,6 +1,6 @@
import { type PermissionFlagType } from 'twenty-shared/constants';
-import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions';
+import { type UserWorkspacePermissions } from 'src/engine/metadata-modules/permissions/types/user-workspace-permissions.type';
import { type UserWorkspacePermissionsDto } from 'src/engine/metadata-modules/role/dtos/user-workspace-permissions.dto';
export const fromUserWorkspacePermissionsToUserWorkspacePermissionsDto = ({
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
index f692d061750..2962c0973ff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts
@@ -21,7 +21,7 @@ import { ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME } from 'src
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-removed-in-upgrade.decorator';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type TimelineActivityTypeOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
index 845958f681f..ee6c4488230 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/entities/view-field-group.entity.ts
@@ -16,7 +16,7 @@ import { ADD_IS_SYSTEM_SIDE_EFFECT_TO_VIEW_FIELD_GROUP_UPGRADE_COMMAND_NAME } fr
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type ViewFieldGroupOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts
index 24c981cb787..947527b230f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts
@@ -17,7 +17,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
index aa62d7cce63..69e80a5356a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/entities/view-field.entity.ts
@@ -20,7 +20,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
import { ADD_IS_SYSTEM_SIDE_EFFECT_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-15/is-system-side-effect-upgrade-command-name.constant';
import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-group/entities/view-field-group.entity';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type ViewFieldOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts
index a38d867540c..2792e238ac1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts
@@ -17,7 +17,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts
index d8a6f949efd..43ad2999bc1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts
@@ -17,7 +17,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts
index 97187b7414d..4557c162430 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts
@@ -17,7 +17,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
index cb1b785ce7a..a0473941649 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
@@ -6,7 +6,7 @@ import {
} from '@nestjs/common';
import { GqlExecutionContext } from '@nestjs/graphql';
-import { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';
+import { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.type';
import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';
import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';
import { resolveViewAccessContext } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
index f1eb78b9d23..e31cdf2524e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { ViewVisibility } from 'twenty-shared/types';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
-import { type ViewAccessContext } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';
+import { type ViewAccessContext } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.type';
import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import {
ViewException,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts
index f79921040c2..017b7268b7b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';
+import { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.type';
@Injectable()
export class ViewEntityLookupService {
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts
rename to packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.type.ts
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util.ts
index bf14db661a6..c67ceceafb3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util.ts
@@ -1,4 +1,4 @@
-import { type ViewAccessContext } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';
+import { type ViewAccessContext } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.type';
// Every view guard authorises the same three principals, so they read them in
// one place: a guard that builds the context by hand is how an application
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts
index 0bd7bf4fdc5..cde5ba43495 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts
@@ -17,7 +17,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts
index ab586be54ce..4878b0a7804 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts
@@ -18,7 +18,7 @@ import { hasObjectMetadataLabelPlaceholder } from 'twenty-shared/i18n';
import { isDefined } from 'twenty-shared/utils';
import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
index eef8f9c3415..9dfd2b3775f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
@@ -38,7 +38,7 @@ import { ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-g
import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';
import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';
-import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity.type';
export type ViewOverrides = {
isActive?: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
index 4c8aceef86b..74a9a160e73 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
@@ -17,7 +17,7 @@ import { ApiPath } from 'twenty-shared/types';
import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';
import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';
import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';
-import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/types/webhook-job-data.type.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/types/webhook-job-data.type.ts
index db4de1b1cc6..7c14f40f3f0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/types/webhook-job-data.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/types/webhook-job-data.type.ts
@@ -1,4 +1,4 @@
-import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
type WebhookJobBase = {
targetUrl: string;
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-event-emitter.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-event-emitter.ts
index b23f2679a8e..871b39a7fc4 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-event-emitter.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-event-emitter.ts
@@ -12,7 +12,7 @@ import {
AllMetadataEventName,
AllMetadataEventType,
MetadataEvent,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
type EmitMetadataEventsArgs = {
metadataEvents: MetadataEvent[];
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-events-to-db.listener.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-events-to-db.listener.ts
index f5dab0088ab..c27c7384f4b 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/metadata-events-to-db.listener.ts
@@ -12,7 +12,7 @@ import { CallWebhookJobsForMetadataJob } from 'src/engine/metadata-modules/webho
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';
import { MetadataEventPublisher } from 'src/engine/subscriptions/metadata-event/metadata-event-publisher';
-import { type AllMetadataEventType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type AllMetadataEventType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
@Injectable()
export class MetadataEventsToDbListener {
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/types/metadata-event-batch.type.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/types/metadata-event-batch.type.ts
index 71d6dc10375..fa52ce3bc50 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/types/metadata-event-batch.type.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/types/metadata-event-batch.type.ts
@@ -3,7 +3,7 @@ import type { AllMetadataName } from 'twenty-shared/metadata';
import {
type AllMetadataEventType,
type MetadataEvent,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
export type MetadataEventBatch<
TMetadataName extends AllMetadataName = AllMetadataName,
diff --git a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/compute-metadata-event-name.util.ts b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/compute-metadata-event-name.util.ts
index 7bd3d135d74..b890f0f54ec 100644
--- a/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/compute-metadata-event-name.util.ts
+++ b/packages/twenty-server/src/engine/subscriptions/metadata-event/utils/compute-metadata-event-name.util.ts
@@ -1,4 +1,4 @@
-import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
export const computeMetadataEventName = ({
metadataName,
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 1d803461e9f..5e91563954a 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
@@ -33,7 +33,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
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 { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+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';
@@ -48,7 +48,7 @@ import {
} from 'src/engine/subscriptions/types/event-stream-data.type';
import { type EventStreamPayload } from 'src/engine/subscriptions/types/event-stream-payload.type';
import { ObjectRecordSubscriptionEvent } from 'src/engine/subscriptions/types/object-record-subscription-event.type';
-import { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { 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 { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';
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 f63c042df08..5c9dad57b9d 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
@@ -13,7 +13,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/wo
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 { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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';
diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
index ce5db6c363f..e3171c78b3d 100644
--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
@@ -19,7 +19,7 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
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 {
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
index 26871e5287c..6e4bc998237 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
@@ -7,7 +7,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 UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+import { type 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 { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
index 3ded27684e7..8626a865804 100644
--- a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
@@ -11,7 +11,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 UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+import { type 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';
diff --git a/packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.ts b/packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.ts
rename to packages/twenty-server/src/engine/twenty-orm/types/role-permission-config.type.ts
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 53e5df4a125..b94da39e10f 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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-objects-permissions-from-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts
index c2b9dfc569b..ecf069c81e0 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/twenty-orm/utils/get-objects-permissions-from-role-permission-config.util.ts
@@ -4,7 +4,7 @@ import {
} from 'twenty-shared/types';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
export const getObjectsPermissionsFromRolePermissionConfig = ({
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/twenty-orm/utils/get-role-ids-from-role-permission-config.util.ts
index f574b8feb4d..6ccf436a101 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/twenty-orm/utils/get-role-ids-from-role-permission-config.util.ts
@@ -1,4 +1,4 @@
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export const getRoleIdsFromRolePermissionConfig = (
rolePermissionConfig: RolePermissionConfig,
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 5e61bdf0b21..b886ab164cd 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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/utils/resolve-object-records-permissions.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
index f383716821f..adad0ff94ad 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
@@ -9,7 +9,7 @@ import {
TwentyOrmException,
TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export const resolveObjectRecordsPermissions = ({
rolePermissionConfig,
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/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts
index 4b37e5d6483..b6cfca1c243 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-principal-ids-from-auth-context.util.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-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 UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+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';
export const resolvePrincipalIdsFromAuthContext = ({
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/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts
index 4853ffe1e2b..39057d80b46 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util.ts
@@ -4,7 +4,7 @@ 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 UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+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';
export const resolveRoleIdsFromAuthContext = ({
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts
index 0e0e1f7f373..4e755bb9b4c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-role-permission-config.util.ts
@@ -2,8 +2,8 @@ import { isNonEmptyArray } from 'twenty-shared/utils';
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 UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
-import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
+import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
import { resolveRoleIdsFromAuthContext } from 'src/engine/twenty-orm/utils/resolve-role-ids-from-auth-context.util';
export const resolveRolePermissionConfig = ({
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 2d1ced4d8af..f55a41373e2 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
@@ -21,7 +21,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';
+import type { RolePermissionConfig } from 'src/engine/twenty-orm/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 { RecordSharingFeatureService } from 'src/engine/core-modules/record-share/services/record-sharing-feature.service';
diff --git a/packages/twenty-server/src/engine/workspace-cache/interfaces/metadata-flat-entity-maps-cache-provider.service.ts b/packages/twenty-server/src/engine/workspace-cache/interfaces/metadata-flat-entity-maps-cache-provider.service.ts
index db64953c39d..fcc53dd0d53 100644
--- a/packages/twenty-server/src/engine/workspace-cache/interfaces/metadata-flat-entity-maps-cache-provider.service.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/interfaces/metadata-flat-entity-maps-cache-provider.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
import { type FlatEntityRowsRequirement } from 'src/engine/workspace-cache/types/flat-entity-rows-requirement.type';
diff --git a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
index 7aa085af324..88774464b5f 100644
--- a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
@@ -18,7 +18,7 @@ import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types
import { type WorkflowAutomatedTriggerMaps } from 'src/engine/core-modules/workflow/types/workflow-automated-trigger-maps.type';
import { type FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-agent/types/flat-role-target-by-agent-id-maps.type';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
-import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
+import { type 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 { type UsageLimits } from 'src/engine/core-modules/usage-limit/types/usage-limits.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type.ts
index ed40a9050e9..9907091089c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type.ts
@@ -1,5 +1,5 @@
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { type TWENTY_STANDARD_ALL_METADATA_NAME } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-all-metadata-name.constant';
export type TwentyStandardAllFlatEntityMaps = Pick<
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/agent-metadata/create-standard-agent-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/agent-metadata/create-standard-agent-flat-metadata.util.ts
index 6cd2ce6a5e6..b0e333705f0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/agent-metadata/create-standard-agent-flat-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/agent-metadata/create-standard-agent-flat-metadata.util.ts
@@ -2,7 +2,7 @@ import { v4 } from 'uuid';
import { type AgentResponseFormat } from 'src/engine/metadata-modules/ai/ai-agent/types/agent-response-format.type';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
-import { type ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/modelConfiguration';
+import { type ModelConfiguration } from 'src/engine/metadata-modules/ai/ai-agent/types/model-configuration.type';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';
import { type FlatAgent } from 'src/engine/metadata-modules/flat-agent/types/flat-agent.type';
import { STANDARD_AGENT } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-agent.constant';
diff --git a/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts b/packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.ts
rename to packages/twenty-server/src/engine/workspace-manager/types/overridable-entity.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/types/syncable-entity.interface.ts b/packages/twenty-server/src/engine/workspace-manager/types/syncable-entity.interface.ts
index e94c76dfa63..0f8b7ab1ff3 100644
--- a/packages/twenty-server/src/engine/workspace-manager/types/syncable-entity.interface.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/types/syncable-entity.interface.ts
@@ -1,7 +1,7 @@
import { Column, Index, JoinColumn, ManyToOne, type Relation } from 'typeorm';
import type { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
+import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@Index(['workspaceId', 'universalIdentifier'], {
unique: true,
diff --git a/packages/twenty-server/src/engine/workspace-manager/types/workspace-related-entity.ts b/packages/twenty-server/src/engine/workspace-manager/types/workspace-related-entity.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/types/workspace-related-entity.ts
rename to packages/twenty-server/src/engine/workspace-manager/types/workspace-related-entity.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/__tests__/enrich-create-workspace-migration-action-with-ids.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/__tests__/enrich-create-workspace-migration-action-with-ids.util.spec.ts
index 3847043c1fa..2d0c0ec2d18 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/__tests__/enrich-create-workspace-migration-action-with-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/__tests__/enrich-create-workspace-migration-action-with-ids.util.spec.ts
@@ -1,5 +1,5 @@
import { enrichCreateWorkspaceMigrationActionsWithIds } from 'src/engine/workspace-manager/workspace-migration/services/utils/enrich-create-workspace-migration-action-with-ids.util';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { type UniversalCreatePageLayoutTabAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/page-layout-tab/types/workspace-migration-page-layout-tab-action.type';
import { type WorkspaceMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/enrich-create-workspace-migration-action-with-ids.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/enrich-create-workspace-migration-action-with-ids.util.ts
index fb4acafa9bf..afd531bfcc9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/enrich-create-workspace-migration-action-with-ids.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/services/utils/enrich-create-workspace-migration-action-with-ids.util.ts
@@ -2,8 +2,8 @@ import { type AllMetadataName } from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
-import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
+import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import { type WorkspaceMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type';
export type IdByUniversalIdentifierByMetadataName = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type.ts
index 6b49d6f685e..127d4567476 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/all-universal-flat-entity-maps.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { type MetadataUniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type';
export type AllUniversalFlatEntityMaps = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type.ts
index 69ed89302ef..31fd121e876 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-maps.type.ts
@@ -1,6 +1,6 @@
import { type AllMetadataName } from 'twenty-shared/metadata';
-import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name';
+import { type AllFlatEntityTypesByMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.type';
import { type UniversalFlatEntityMaps } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-maps.type';
export type MetadataUniversalFlatEntityMaps<T extends AllMetadataName> =
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util.ts
index 7f98e375f85..90097fd4b9b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util.ts
@@ -9,7 +9,7 @@ import {
} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
-import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { type MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-non-relation-fields-into-object-actions.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-non-relation-fields-into-object-actions.util.spec.ts
index c14ed66737b..41778efe3fe 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-non-relation-fields-into-object-actions.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-non-relation-fields-into-object-actions.util.spec.ts
@@ -5,8 +5,8 @@ import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-obje
import { createEmptyOrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/constant/empty-orchestrator-actions-report.constant';
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
import { aggregateNonRelationFieldsIntoObjectActions } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
-import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
+import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
describe('aggregateNonRelationFieldsIntoObjectActions', () => {
it('should merge non-relation field into matching create-object action', () => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.spec.ts
index 8f1a453735e..70f62573144 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.spec.ts
@@ -8,7 +8,7 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-metadata/constants/search-vector-field.constants';
import { createEmptyOrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/constant/empty-orchestrator-actions-report.constant';
import { aggregateOrchestratorActionsReportDeprioritizeSearchVectorUpdateFieldActions } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util';
-import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
describe('aggregateOrchestratorActionsReportDeprioritizeSearchVectorUpdateFieldActions', () => {
it('should move searchVector update actions to the end of the update list', () => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-relation-field-pairs.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-relation-field-pairs.util.spec.ts
index 466e8b19230..d56a6f7e47b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-relation-field-pairs.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/aggregate-relation-field-pairs.util.spec.ts
@@ -4,7 +4,7 @@ import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field
import { createEmptyOrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/constant/empty-orchestrator-actions-report.constant';
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
import { aggregateRelationFieldPairs } from 'src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
describe('aggregateRelationFieldPairs', () => {
it('should bundle relation field pairs into single action with relatedFieldId', () => {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util.ts
index 0604c1a258f..db0c58c36a0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-non-relation-fields-into-object-actions.util.ts
@@ -3,8 +3,8 @@ import { isDefined } from 'twenty-shared/utils';
import { isMorphOrRelationFieldMetadataType } from 'src/engine/utils/is-morph-or-relation-field-metadata-type.util';
import { type AggregateOrchestratorActionsReportArgs } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-aggregate-orchestrator-actions-report-args.type';
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
-import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
+import { type UniversalCreateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
export const aggregateNonRelationFieldsIntoObjectActions = ({
orchestratorActionsReport,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.ts
index 864c16740af..c11ef4412cc 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-orchestrator-actions-report-deprioritize-search-vector-update-field-actions.util.ts
@@ -5,7 +5,7 @@ import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/search-field-me
import { type AggregateOrchestratorActionsReportArgs } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-aggregate-orchestrator-actions-report-args.type';
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
import { WORKSPACE_MIGRATION_ACTION_TYPE } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/constants/workspace-migration-action-type.constant';
-import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
export const aggregateOrchestratorActionsReportDeprioritizeSearchVectorUpdateFieldActions =
({
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util.ts
index f4f73e5b6db..0e8a24ba480 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/aggregate-relation-field-pairs.util.ts
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type AggregateOrchestratorActionsReportArgs } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-aggregate-orchestrator-actions-report-args.type';
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
-import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type UniversalCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
export const aggregateRelationFieldPairs = ({
orchestratorActionsReport,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/compute-ordered-migration-actions.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/compute-ordered-migration-actions.util.ts
index ae797119b18..dfe80f852c1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/compute-ordered-migration-actions.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/compute-ordered-migration-actions.util.ts
@@ -1,5 +1,5 @@
import { type OrchestratorActionsReport } from 'src/engine/workspace-manager/workspace-migration/types/workspace-migration-orchestrator.type';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export const computeOrderedMigrationActions = (
aggregatedOrchestratorActionsReport: OrchestratorActionsReport,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/workspace-migration-agent-actions-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/workspace-migration-agent-actions-builder.service.ts
index c881132db35..1db99876f0d 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/workspace-migration-agent-actions-builder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/workspace-migration-agent-actions-builder.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
-import { UniversalUpdateAgentAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service';
+import { UniversalUpdateAgentAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type';
import { WorkspaceEntityMigrationBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/workspace-migration-field-actions-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/workspace-migration-field-actions-builder.service.ts
index c946637541f..f665ca2cfb2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/workspace-migration-field-actions-builder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/workspace-migration-field-actions-builder.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
-import { UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { UniversalUpdateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { WorkspaceEntityMigrationBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/workspace-migration-object-actions-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/workspace-migration-object-actions-builder.service.ts
index e1eb970f74c..5ea58fbda59 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/workspace-migration-object-actions-builder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/workspace-migration-object-actions-builder.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
-import { UniversalUpdateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+import { UniversalUpdateObjectAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import { WorkspaceEntityMigrationBuilderService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service';
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type.ts
index d461ab98362..cd12fb0391a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type.ts
@@ -2,7 +2,7 @@ import { type MessageDescriptor } from '@lingui/core';
import { type AllMetadataName } from 'twenty-shared/metadata';
import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
-import { type WorkspaceMigrationActionType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type WorkspaceMigrationActionType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type FlatEntityValidationError<TCode extends string = string> = {
code: TCode;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
index 51163d04410..d18b646b311 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts
@@ -41,7 +41,7 @@ import { type FlatEntityCreationValidationArgs } from 'src/engine/workspace-mana
import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
import { UniversalFlatEntityValidationReturnType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-result.type';
-import { AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
export type ValidateAndBuildArgs<T extends AllMetadataName> = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type.ts
index 3f21b6b0e50..0340fc76678 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type.ts
@@ -1,4 +1,4 @@
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type WorkspaceMigration<
TActions extends AllUniversalWorkspaceMigrationAction =
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/create-agent-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/create-agent-action-handler.service.ts
index eab4059b427..924dcb7761e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/create-agent-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/create-agent-action-handler.service.ts
@@ -8,7 +8,7 @@ import { getUniversalFlatEntityEmptyForeignKeyAggregators } from 'src/engine/wor
import {
FlatCreateAgentAction,
UniversalCreateAgentAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type';
import {
WorkspaceMigrationActionRunnerArgs,
WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/delete-agent-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/delete-agent-action-handler.service.ts
index 285be86be83..3926c50da95 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/delete-agent-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/delete-agent-action-handler.service.ts
@@ -6,7 +6,7 @@ import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/ag
import {
FlatDeleteAgentAction,
UniversalDeleteAgentAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type';
import {
WorkspaceMigrationActionRunnerArgs,
WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/update-agent-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/update-agent-action-handler.service.ts
index 7fa5ea65dc9..55e610193ba 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/update-agent-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/agent/services/update-agent-action-handler.service.ts
@@ -10,7 +10,7 @@ import { resolveUniversalUpdateRelationIdentifiersToIds } from 'src/engine/works
import {
FlatUpdateAgentAction,
UniversalUpdateAgentAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action-builder.service';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/agent/types/workspace-migration-agent-action.type';
import {
WorkspaceMigrationActionRunnerArgs,
WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
index 23c6cd15500..7b46f8d736b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/create-field-action-handler.service.ts
@@ -23,7 +23,7 @@ import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-s
import {
type FlatCreateFieldAction,
type UniversalCreateFieldAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { fromUniversalFlatFieldMetadataToFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util';
import {
WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/delete-field-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/delete-field-action-handler.service.ts
index cf63b42c4c9..0699935e0c5 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/delete-field-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/delete-field-action-handler.service.ts
@@ -8,7 +8,7 @@ import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-s
import {
type FlatDeleteFieldAction,
type UniversalDeleteFieldAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import {
type WorkspaceMigrationActionRunnerArgs,
type WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
index 39adad8c7ae..0e48db24c86 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/update-field-action-handler.service.ts
@@ -35,7 +35,7 @@ import { convertOnDeleteActionToOnDelete } from 'src/engine/workspace-manager/wo
import {
FlatUpdateFieldAction,
UniversalUpdateFieldAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { serializeDefaultValue } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/utils/serialize-default-value.util';
import { fromUniversalSettingsToFlatFieldMetadataSettings } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-settings-to-flat-field-metadata-settings.util';
import {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/__tests__/get-deferred-foreign-key-validation.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/__tests__/get-deferred-foreign-key-validation.util.spec.ts
index afdcb598d21..675f6606adc 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/__tests__/get-deferred-foreign-key-validation.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/__tests__/get-deferred-foreign-key-validation.util.spec.ts
@@ -6,7 +6,7 @@ import {
import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-import { type FlatCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type FlatCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { getDeferredForeignKeyValidation } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/get-deferred-foreign-key-validation.util';
const FEATURE_FLAGS_ON = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util.ts
index fa5c6407b63..73f8a93add1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util.ts
@@ -5,7 +5,7 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
import { type ExtractUniversalForeignKeyAggregatorForMetadataName } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-universal-flat-entity-foreign-key-aggregator-properties.constant';
import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';
import { getUniversalFlatEntityEmptyForeignKeyAggregators } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/reset-universal-flat-entity-foreign-key-aggregators.util';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { findFieldMetadataIdInCreateFieldContext } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/find-field-metadata-id-in-create-field-context.util';
import { fromUniversalSettingsToFlatFieldMetadataSettings } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-settings-to-flat-field-metadata-settings.util';
import { type WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/get-deferred-foreign-key-validation.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/get-deferred-foreign-key-validation.util.ts
index cc44af92dd9..7daae85ef20 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/get-deferred-foreign-key-validation.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/get-deferred-foreign-key-validation.util.ts
@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
-import { type FlatCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action';
+import { type FlatCreateFieldAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/field/types/workspace-migration-field-action.type';
import { type DeferredWorkspaceMigrationActionPayload } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action.type';
export const getDeferredForeignKeyValidation = ({
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/create-index-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/create-index-action-handler.service.ts
index 44f30aff166..8772750e6a0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/create-index-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/create-index-action-handler.service.ts
@@ -12,7 +12,7 @@ import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-s
import {
type FlatCreateIndexAction,
type UniversalCreateIndexAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type';
import { fromUniversalFlatIndexToFlatIndex } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/utils/from-universal-flat-index-to-flat-index.util';
import { createIndexInWorkspaceSchema } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/utils/index-action-handler.utils';
import { isIndexCreationDeferrable } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/utils/is-index-creation-deferrable.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/delete-index-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/delete-index-action-handler.service.ts
index 6af2fcab52a..b513240399c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/delete-index-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/delete-index-action-handler.service.ts
@@ -8,7 +8,7 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge
import {
type FlatDeleteIndexAction,
type UniversalDeleteIndexAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type';
import {
deleteIndexMetadata,
dropIndexFromWorkspaceSchema,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/update-index-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/update-index-action-handler.service.ts
index 3608874cd2e..a74885ca27f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/update-index-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/services/update-index-action-handler.service.ts
@@ -12,7 +12,7 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge
import {
type FlatUpdateIndexAction,
type UniversalUpdateIndexAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/index/types/workspace-migration-index-action.type';
import { fromUniversalFlatIndexToFlatIndex } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/index/utils/from-universal-flat-index-to-flat-index.util';
import {
createIndexInWorkspaceSchema,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
index 916569bb5d2..ed511172b6b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/create-object-action-handler.service.ts
@@ -14,7 +14,7 @@ import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-s
import {
FlatCreateObjectAction,
UniversalCreateObjectAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import { fromUniversalFlatFieldMetadataToFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/field/services/utils/from-universal-flat-field-metadata-to-flat-field-metadata.util';
import { fromUniversalFlatObjectMetadataToFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util';
import {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts
index 2af94c31fed..2ab937d72b9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts
@@ -12,7 +12,7 @@ import { WorkspaceSchemaManagerService } from 'src/engine/twenty-orm/workspace-s
import {
type FlatDeleteObjectAction,
type UniversalDeleteObjectAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import {
type WorkspaceMigrationActionRunnerArgs,
type WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts
index 81ffa8a6d58..ae0837a2c01 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts
@@ -22,7 +22,7 @@ import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target
import {
type FlatUpdateObjectAction,
type UniversalUpdateObjectAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/object/types/workspace-migration-object-action.type';
import {
type WorkspaceMigrationActionRunnerArgs,
type WorkspaceMigrationActionRunnerContext,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts
index e68e8243a3e..0d69907cf7e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/utils/from-universal-flat-object-metadata-to-flat-object-metadata.util.ts
@@ -5,7 +5,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type ExtractUniversalForeignKeyAggregatorForMetadataName } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-universal-flat-entity-foreign-key-aggregator-properties.constant';
import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-metadata.type';
import { getUniversalFlatEntityEmptyForeignKeyAggregators } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/reset-universal-flat-entity-foreign-key-aggregators.util';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { type WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
export type FromUniversalFlatObjectMetadataToFlatObjectMetadataArgs = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/__tests__/workspace-migration-runner.exception.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/__tests__/workspace-migration-runner.exception.spec.ts
index e0b7eace842..7a68b669305 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/__tests__/workspace-migration-runner.exception.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/__tests__/workspace-migration-runner.exception.spec.ts
@@ -1,4 +1,4 @@
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import {
WorkspaceMigrationRunnerException,
WorkspaceMigrationRunnerExceptionCode,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception.ts
index 7ca666b16e9..0d9e095c2ff 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception.ts
@@ -3,7 +3,7 @@ import { msg } from '@lingui/core/macro';
import { assertUnreachable, CustomError } from 'twenty-shared/utils';
import { type FlatEntityMapsExceptionContext } from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { formatWorkspaceMigrationRunnerExecutionErrors } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/format-workspace-migration-runner-execution-errors.util';
export const WorkspaceMigrationRunnerExceptionCode = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface.ts
index d6f295785e8..f2cf2538292 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface.ts
@@ -13,7 +13,7 @@ import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
import { MetadataRelatedFlatEntityMapsKeys } from 'src/engine/metadata-modules/flat-entity/types/metadata-related-flat-entity-maps-keys.type';
-import { MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key';
+import { MetadataToFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/types/metadata-to-flat-entity-maps-key.type';
import { WorkspaceMigrationActionType } from 'src/engine/metadata-modules/flat-entity/types/metadata-workspace-migration-action.type';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
@@ -24,14 +24,14 @@ import {
buildActionHandlerKey,
type AllFlatWorkspaceMigrationAction,
type AllUniversalWorkspaceMigrationAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { WORKSPACE_MIGRATION_ACTION_HANDLER_METADATA_KEY } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/workspace-migration-action-handler-metadata-key.constant';
import {
WorkspaceMigrationRunnerException,
WorkspaceMigrationRunnerExceptionCode,
} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/exceptions/workspace-migration-runner.exception';
import { type DeferredWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action.type';
-import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
import {
WorkspaceMigrationActionRunnerContext,
type WorkspaceMigrationActionRunnerArgs,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/registry/workspace-migration-runner-action-handler-registry.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/registry/workspace-migration-runner-action-handler-registry.service.ts
index b93753beda9..5055786783b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/registry/workspace-migration-runner-action-handler-registry.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/registry/workspace-migration-runner-action-handler-registry.service.ts
@@ -7,7 +7,7 @@ import {
buildActionHandlerKey,
type AllUniversalWorkspaceMigrationAction,
type WorkspaceMigrationActionHandlerKey,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { WorkspaceSchemaMigrationRunnerActionHandlersModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/workspace-schema-migration-runner-action-handlers.module';
import { WORKSPACE_MIGRATION_ACTION_HANDLER_METADATA_KEY } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/workspace-migration-action-handler-metadata-key.constant';
import {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
index 977bbf07a2e..273c23e71d2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
@@ -31,7 +31,7 @@ import { isSchemaAffectingWorkspaceMigration } from 'src/engine/workspace-manage
import { WorkspaceMigrationRunnerActionHandlerRegistryService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/registry/workspace-migration-runner-action-handler-registry.service';
import { DeferredWorkspaceMigrationActionRunnerService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/deferred-workspace-migration-action-runner.service';
import { type DeferredWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action.type';
-import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
import { getMetadataNamesToLoadForWorkspaceMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/get-metadata-names-to-load-for-workspace-migration.util';
import { buildPreallocatedIdByUniversalIdentifierFromActions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/build-preallocated-id-by-universal-identifier-from-actions.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action-execution-args.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action-execution-args.type.ts
index 4b0e11ed2cd..2f1c11fd6a5 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action-execution-args.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/deferred-workspace-migration-action-execution-args.type.ts
@@ -1,5 +1,5 @@
import { type WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type DeferredWorkspaceMigrationActionExecutionArgs<TPayload> = Pick<
WorkspaceMigrationActionRunnerArgs<AllUniversalWorkspaceMigrationAction>,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type.ts
similarity index 100%
rename from packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type.ts
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type.ts
index 8ef414cd535..235b3155a9a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/workspace-migration-action-runner-args.type.ts
@@ -9,7 +9,7 @@ import { type PreallocatedIdByUniversalIdentifierByMetadataName } from 'src/engi
import {
type AllFlatWorkspaceMigrationAction,
type AllUniversalWorkspaceMigrationAction,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type WorkspaceMigrationActionRunnerArgs<
TUniversalAction extends AllUniversalWorkspaceMigrationAction,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/build-preallocated-id-by-universal-identifier-from-actions.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/build-preallocated-id-by-universal-identifier-from-actions.util.ts
index be258e26658..ba409203cc0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/build-preallocated-id-by-universal-identifier-from-actions.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/build-preallocated-id-by-universal-identifier-from-actions.util.ts
@@ -2,7 +2,7 @@ import { type AllMetadataName } from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
import { type PreallocatedIdByUniversalIdentifierByMetadataName } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/resolve-universal-relation-identifiers-to-ids.util';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export const buildPreallocatedIdByUniversalIdentifierFromActions = (
actions: AllUniversalWorkspaceMigrationAction[],
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-create-action.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-create-action.util.ts
index bdf732c7a6b..ca07ffb6705 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-create-action.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-create-action.util.ts
@@ -1,11 +1,11 @@
import { assertUnreachable, isDefined } from 'twenty-shared/utils';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { METADATA_EVENTS_TO_EMIT } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/metadata-event-to-emit.constant';
import {
type CreateMetadataEvent,
type MetadataEvent,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
import { flatEntityToScalarFlatEntity } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/flat-entity-to-scalar-flat-entity.util';
export const deriveMetadataEventsFromCreateAction = (
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-delete-action.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-delete-action.util.ts
index ce7b8d38771..b71b9e3c484 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-delete-action.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-delete-action.util.ts
@@ -4,9 +4,9 @@ import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/
import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { METADATA_EVENTS_TO_EMIT } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/metadata-event-to-emit.constant';
-import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+import { type MetadataEvent } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
import { flatEntityToScalarFlatEntity } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/flat-entity-to-scalar-flat-entity.util';
export type DeriveMetadataEventsFromDeleteActionArgs = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-update-action.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-update-action.util.ts
index 030c77a4b2a..c48a2ffacbb 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-update-action.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/derive-metadata-events-from-update-action.util.ts
@@ -6,7 +6,7 @@ import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
import { type MetadataUniversalFlatEntityPropertiesToCompare } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/metadata-universal-flat-entity-properties-to-compare.type';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
import { METADATA_EVENTS_TO_EMIT } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/metadata-event-to-emit.constant';
import {
type CreateMetadataEvent,
@@ -14,7 +14,7 @@ import {
type MetadataEvent,
type UpdateMetadataEvent,
type UpdateMetadataEventDiff,
-} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';
+} from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event.type';
import { flatEntityToScalarFlatEntity } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/flat-entity-to-scalar-flat-entity.util';
export type DeriveMetadataEventsFromUpdateActionArgs = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/is-schema-affecting-workspace-migration.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/is-schema-affecting-workspace-migration.util.ts
index b120e86b0f9..9b8b474c7a7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/is-schema-affecting-workspace-migration.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/is-schema-affecting-workspace-migration.util.ts
@@ -1,5 +1,5 @@
import { SCHEMA_AFFECTING_WORKSPACE_MIGRATION_METADATA_NAMES } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/constants/schema-affecting-workspace-migration-metadata-names.constant';
-import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllUniversalWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export const isSchemaAffectingWorkspaceMigration = (
actions: Pick<AllUniversalWorkspaceMigrationAction, 'metadataName'>[],
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-create-action-on-all-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-create-action-on-all-flat-entity-maps.util.ts
index 0c92c6e5301..59ae6a52fbc 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-create-action-on-all-flat-entity-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-create-action-on-all-flat-entity-maps.util.ts
@@ -2,7 +2,7 @@ import { assertUnreachable, isDefined } from 'twenty-shared/utils';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import { addFlatEntityToFlatEntityAndRelatedEntityMapsThroughMutationOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.util';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type OptimisticallyApplyCreateActionOnAllFlatEntityMapsArgs = {
flatAction: AllFlatWorkspaceMigrationAction<'create'>;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-delete-action-on-all-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-delete-action-on-all-flat-entity-maps.util.ts
index 38a489ae76a..7e5b6825db2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-delete-action-on-all-flat-entity-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-delete-action-on-all-flat-entity-maps.util.ts
@@ -5,7 +5,7 @@ import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity
import { deleteFlatEntityFromFlatEntityAndRelatedEntityMapsThroughMutationOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.util';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type OptimisticallyApplyDeleteActionOnAllFlatEntityMapsArgs = {
flatAction: AllFlatWorkspaceMigrationAction<'delete'>;
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-update-action-on-all-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-update-action-on-all-flat-entity-maps.util.ts
index 3177d431d2b..2b7adc3d00b 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-update-action-on-all-flat-entity-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/utils/optimistically-apply-update-action-on-all-flat-entity-maps.util.ts
@@ -7,7 +7,7 @@ import { deleteFlatEntityFromFlatEntityAndRelatedEntityMapsThroughMutationOrThro
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
import { replaceFlatEntityInFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration/utils/replace-flat-entity-in-flat-entity-maps-through-mutation-or-throw.util';
-import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type AllFlatWorkspaceMigrationAction } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common.type';
export type OptimisticallyApplyUpdateActionOnAllFlatEntityMapsArgs = {
flatAction: AllFlatWorkspaceMigrationAction<'update'>;
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts
index f0f5847be23..01e2d7f183d 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/caldav/services/caldav-create-event.service.ts
@@ -13,7 +13,7 @@ import { type CalendarEventToCreate } from 'src/modules/calendar/calendar-event-
import { CalDavClientProvider } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/providers/caldav-client.provider';
import { CalDavFetchEventsService } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service';
import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
@Injectable()
export class CalDavCreateEventService implements CalendarEventCreationDriver {
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/google-calendar/services/google-calendar-create-event.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/google-calendar/services/google-calendar-create-event.service.ts
index 58fcef511a7..6fe1643e0d1 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/google-calendar/services/google-calendar-create-event.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/google-calendar/services/google-calendar-create-event.service.ts
@@ -11,7 +11,7 @@ import {
} from 'src/modules/calendar/calendar-event-creation-manager/exceptions/calendar-event-creation.exception';
import { type CalendarEventCreationDriver } from 'src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface';
import { type CalendarEventToCreate } from 'src/modules/calendar/calendar-event-creation-manager/types/calendar-event-to-create.type';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { GoogleOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider';
const GOOGLE_CALENDAR_ID = 'primary';
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/microsoft-calendar/services/microsoft-calendar-create-event.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/microsoft-calendar/services/microsoft-calendar-create-event.service.ts
index e7b0b1e13a7..1d5f6c7b88c 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/microsoft-calendar/services/microsoft-calendar-create-event.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/drivers/microsoft-calendar/services/microsoft-calendar-create-event.service.ts
@@ -11,7 +11,7 @@ import {
} from 'src/modules/calendar/calendar-event-creation-manager/exceptions/calendar-event-creation.exception';
import { type CalendarEventCreationDriver } from 'src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface';
import { type CalendarEventToCreate } from 'src/modules/calendar/calendar-event-creation-manager/types/calendar-event-to-create.type';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { MicrosoftOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client.provider';
@Injectable()
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface.ts
index 2363f689473..2425f09b064 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/interfaces/calendar-event-creation-driver.interface.ts
@@ -1,6 +1,6 @@
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { type CalendarEventToCreate } from 'src/modules/calendar/calendar-event-creation-manager/types/calendar-event-to-create.type';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export type CalendarEventCreationDriver = {
createCalendarEvent(
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/services/create-calendar-event.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/services/create-calendar-event.service.ts
index 71652806aec..cafef6e830c 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/services/create-calendar-event.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/services/create-calendar-event.service.ts
@@ -11,7 +11,7 @@ import {
} from 'src/modules/calendar/calendar-event-creation-manager/exceptions/calendar-event-creation.exception';
import { CalendarSaveEventsService } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service';
import { type ComposedCalendarEvent } from 'src/modules/calendar/calendar-event-creation-manager/types/composed-calendar-event.type';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
@Injectable()
export class CreateCalendarEventService {
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service.ts
index d60d6a649f6..7f5eba98589 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service.ts
@@ -12,7 +12,7 @@ import {
import { isDefined } from 'twenty-shared/utils';
import { CALDAV_UNVERSIONED_RESOURCE } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/constants/caldav-unversioned-resource.constant';
-import { type CalDavSyncCursor } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor';
+import { type CalDavSyncCursor } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.type';
import { extractICalData } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-ical-data.util';
import { isCalDavCollectionHref } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-caldav-collection-href.util';
import { isEventCalendar } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-calendar.util';
@@ -24,7 +24,7 @@ import { mapCalDavStatusToExceptionCode } from 'src/modules/calendar/calendar-ev
import { parseICalEvents } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-ical-event.util';
import { resolveCalDavResourceVersion } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/resolve-caldav-resource-version.util';
import { CalendarEventImportDriverException } from 'src/modules/calendar/calendar-event-import-manager/drivers/exceptions/calendar-event-import-driver.exception';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
type CalendarSyncResult = {
calendarUrl: string;
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-get-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-get-events.service.ts
index c35bec53961..cc104876ebb 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-get-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-get-events.service.ts
@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
import { CalDavClientProvider } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/providers/caldav-client.provider';
import { CalDavFetchEventsService } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service';
-import { type CalDavSyncCursor } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor';
+import { type CalDavSyncCursor } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.type';
import { parseCalDAVError } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-caldav-error.util';
import { CalendarEventImportDriverException } from 'src/modules/calendar/calendar-event-import-manager/drivers/exceptions/calendar-event-import-driver.exception';
import { type GetCalendarEventsResponse } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-get-events.service';
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-import-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-import-events.service.ts
index e9fa61b8ffd..aeaff9c1b89 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-import-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-import-events.service.ts
@@ -4,7 +4,7 @@ import { CalDavClientProvider } from 'src/modules/calendar/calendar-event-import
import { CalDavFetchEventsService } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-fetch-events.service';
import { parseCalDAVError } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-caldav-error.util';
import { CalendarEventImportDriverException } from 'src/modules/calendar/calendar-event-import-manager/drivers/exceptions/calendar-event-import-driver.exception';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
@Injectable()
export class CalDavImportEventsService {
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.ts
rename to packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/types/caldav-sync-cursor.type.ts
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/__tests__/is-event-in-time-range.util.spec.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/__tests__/is-event-in-time-range.util.spec.ts
index 95ea2f65f0b..583d8eae0ca 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/__tests__/is-event-in-time-range.util.spec.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/__tests__/is-event-in-time-range.util.spec.ts
@@ -1,5 +1,5 @@
import { isEventInTimeRange } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-in-time-range.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
const event = (startsAt: string, endsAt: string) =>
({ startsAt, endsAt }) as unknown as FetchedCalendarEvent;
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/build-cancelled-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/build-cancelled-event.util.ts
index cd8a7822461..e4d07e5c1c6 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/build-cancelled-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/build-cancelled-event.util.ts
@@ -1,4 +1,4 @@
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const buildCancelledCalDavEvent = (
href: string,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-attendees-from-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-attendees-from-event.util.ts
index 4b1da4d7bdb..f59ba731871 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-attendees-from-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-attendees-from-event.util.ts
@@ -3,7 +3,7 @@ import type * as ical from 'node-ical';
import { isDefined } from 'twenty-shared/utils';
import { mapPartStatToResponseStatus } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/map-partstat-to-response-status.util';
-import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const extractAttendeesFromEvent = (
event: ical.VEvent,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-organizer-from-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-organizer-from-event.util.ts
index a484439df37..bad6c373bea 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-organizer-from-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-organizer-from-event.util.ts
@@ -3,7 +3,7 @@ import type * as ical from 'node-ical';
import { isDefined } from 'twenty-shared/utils';
import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const extractOrganizerFromEvent = (
event: ical.VEvent,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-in-time-range.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-in-time-range.util.ts
index 411754b5118..bee47de3c06 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-in-time-range.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/is-event-in-time-range.util.ts
@@ -1,6 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const isEventInTimeRange = (
event: FetchedCalendarEvent,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-ical-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-ical-event.util.ts
index b35e4a6e1c8..d59195cb645 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-ical-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/parse-ical-event.util.ts
@@ -2,7 +2,7 @@ import * as ical from 'node-ical';
import { icalDataExtractPropertyValue } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/lib/utils/icalDataExtractPropertyValue';
import { extractAttendeesFromEvent } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-attendees-from-event.util';
import { extractOrganizerFromEvent } from 'src/modules/calendar/calendar-event-import-manager/drivers/caldav/utils/extract-organizer-from-event.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const parseICalEvents = (
rawData: string,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/services/google-calendar-import-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/services/google-calendar-import-events.service.ts
index 2670880ec6e..58d16164e8a 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/services/google-calendar-import-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/services/google-calendar-import-events.service.ts
@@ -7,7 +7,7 @@ import { isDefined } from 'twenty-shared/utils';
import { formatGoogleCalendarEvents } from 'src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/format-google-calendar-event.util';
import { parseGaxiosError } from 'src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/parse-gaxios-error.util';
import { parseGoogleCalendarError } from 'src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/parse-google-calendar-error.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { GoogleOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider';
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/format-google-calendar-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/format-google-calendar-event.util.ts
index ec90cafa997..46dc789d760 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/format-google-calendar-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/utils/format-google-calendar-event.util.ts
@@ -2,7 +2,7 @@ import { type calendar_v3 as calendarV3 } from 'googleapis';
import { sanitizeCalendarEvent } from 'src/modules/calendar/calendar-event-import-manager/drivers/utils/sanitizeCalendarEvent';
import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const formatGoogleCalendarEvents = (
events: calendarV3.Schema$Event[],
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/services/microsoft-calendar-import-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/services/microsoft-calendar-import-events.service.ts
index 3d5a7abc5af..ca92b5a215c 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/services/microsoft-calendar-import-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/services/microsoft-calendar-import-events.service.ts
@@ -4,7 +4,7 @@ import { type Event } from '@microsoft/microsoft-graph-types';
import { MicrosoftCalendarEventsImportErrorHandler } from 'src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/services/microsoft-calendar-events-import-error-handler.service';
import { formatMicrosoftCalendarEvents } from 'src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/utils/format-microsoft-calendar-event.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { MicrosoftOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client.provider';
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/utils/format-microsoft-calendar-event.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/utils/format-microsoft-calendar-event.util.ts
index 67ddc54fcc8..b6ba6c84a97 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/utils/format-microsoft-calendar-event.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/microsoft-calendar/utils/format-microsoft-calendar-event.util.ts
@@ -6,7 +6,7 @@ import {
import { sanitizeCalendarEvent } from 'src/modules/calendar/calendar-event-import-manager/drivers/utils/sanitizeCalendarEvent';
import { CalendarEventParticipantResponseStatus } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const formatMicrosoftCalendarEvents = (
events: Event[],
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-import-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-import-events.service.ts
index 3f33bae2efb..6a69db52d09 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-import-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-import-events.service.ts
@@ -9,7 +9,7 @@ import {
CalendarEventImportException,
CalendarEventImportExceptionCode,
} from 'src/modules/calendar/calendar-event-import-manager/exceptions/calendar-event-import.exception';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
@Injectable()
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
index d0f3e4166f9..da36140b738 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
@@ -11,7 +11,7 @@ import { CalendarEventParticipantService } from 'src/modules/calendar/calendar-e
import { buildCalendarEventParticipantSaveOperations } from 'src/modules/calendar/calendar-event-participant-manager/utils/build-calendar-event-participant-save-operations.util';
import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
import { type CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
@Injectable()
export class CalendarSaveEventsService {
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/build-calendar-event-save-operations.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/build-calendar-event-save-operations.util.ts
index 52327206635..d442a72f0da 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/build-calendar-event-save-operations.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/build-calendar-event-save-operations.util.ts
@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
import { type CalendarEventSaveOperations } from 'src/modules/calendar/calendar-event-import-manager/types/calendar-event-save-operations.type';
import { type CalendarEventSavePlan } from 'src/modules/calendar/calendar-event-import-manager/types/calendar-event-save-plan.type';
import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
import { type FetchedParticipantWithCalendarEventId } from 'src/modules/calendar/common/types/fetched-participant-with-calendar-event-id.type';
export const buildCalendarEventSaveOperations = ({
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events.util.ts
index f9cdd8eab14..1576a479bd8 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events.util.ts
@@ -1,5 +1,5 @@
import { filterOutBlocklistedEvents } from 'src/modules/calendar/calendar-event-import-manager/utils/filter-out-blocklisted-events.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const filterEventsAndReturnCancelledEvents = (
calendarChannelHandles: string[],
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-out-blocklisted-events.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-out-blocklisted-events.util.ts
index 1f737516282..d9abbab6720 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-out-blocklisted-events.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-out-blocklisted-events.util.ts
@@ -1,5 +1,5 @@
import { isEmailBlocklisted } from 'src/modules/blocklist/utils/is-email-blocklisted.util';
-import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEvent } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export const filterOutBlocklistedEvents = (
calendarChannelHandles: string[],
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/types/calendar-event-participant-save-operations.type.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/types/calendar-event-participant-save-operations.type.ts
index 319be19085f..9ab99192222 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/types/calendar-event-participant-save-operations.type.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/types/calendar-event-participant-save-operations.type.ts
@@ -1,5 +1,5 @@
import { type CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export type CalendarEventParticipantSaveOperations = {
participantsToInsert: (FetchedCalendarEventParticipant & {
diff --git a/packages/twenty-server/src/modules/calendar/common/types/fetched-calendar-event.ts b/packages/twenty-server/src/modules/calendar/common/types/fetched-calendar-event.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/calendar/common/types/fetched-calendar-event.ts
rename to packages/twenty-server/src/modules/calendar/common/types/fetched-calendar-event.type.ts
diff --git a/packages/twenty-server/src/modules/calendar/common/types/fetched-participant-with-calendar-event-id.type.ts b/packages/twenty-server/src/modules/calendar/common/types/fetched-participant-with-calendar-event-id.type.ts
index 1afca293631..424efbd1cbc 100644
--- a/packages/twenty-server/src/modules/calendar/common/types/fetched-participant-with-calendar-event-id.type.ts
+++ b/packages/twenty-server/src/modules/calendar/common/types/fetched-participant-with-calendar-event-id.type.ts
@@ -1,4 +1,4 @@
-import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event';
+import { type FetchedCalendarEventParticipant } from 'src/modules/calendar/common/types/fetched-calendar-event.type';
export type FetchedParticipantWithCalendarEventId =
FetchedCalendarEventParticipant & {
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 a590e98be03..245a19ea992 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,7 +18,7 @@ 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';
+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';
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 036b89a2e72..0e5414beb50 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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 d3ae65eb018..4da67e0904f 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';
+import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type DashboardToolDependencies = {
pageLayoutService: PageLayoutService;
diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/microsoft/services/microsoft-get-all-folders.service.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/microsoft/services/microsoft-get-all-folders.service.ts
index 3d30445fbcb..ff58d6a592f 100644
--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/microsoft/services/microsoft-get-all-folders.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/microsoft/services/microsoft-get-all-folders.service.ts
@@ -18,7 +18,7 @@ import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connect
import { shouldCreateFolderByDefault } from 'src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util';
import { shouldSyncFolderByDefault } from 'src/modules/messaging/message-folder-manager/utils/should-sync-folder-by-default.util';
import { MicrosoftMessageListFetchErrorHandler } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-message-list-fetch-error-handler.service';
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
import { getStandardFolderByRegex } from 'src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex';
type MicrosoftGraphFolder = {
diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS.ts
index b753f73670d..4c89ee59475 100644
--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS.ts
+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS.ts
@@ -1,4 +1,4 @@
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
export const MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS = [
StandardFolder.TRASH,
diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/__tests__/should-create-folder-by-default.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/__tests__/should-create-folder-by-default.util.spec.ts
index 52a01941e11..8f58aa409ff 100644
--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/__tests__/should-create-folder-by-default.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/__tests__/should-create-folder-by-default.util.spec.ts
@@ -1,5 +1,5 @@
import { shouldCreateFolderByDefault } from 'src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util';
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
describe('shouldCreateFolderByDefault', () => {
it('should allow creating user folders', () => {
diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util.ts
index a5139b9c7d2..b5a2b0a3c73 100644
--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/utils/should-create-folder-by-default.util.ts
@@ -1,7 +1,7 @@
import { isDefined } from 'twenty-shared/utils';
import { MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS } from 'src/modules/messaging/message-folder-manager/utils/MESSAGING_FOLDER_MANAGER_ALWAYS_EXCLUDED_FOLDERS';
-import { type StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { type StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
export const shouldCreateFolderByDefault = (
standardFolder?: StandardFolder | null,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
index ac79950f732..a0e432b2d3e 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
@@ -13,7 +13,7 @@ import { MESSAGING_GMAIL_EXCLUDED_SYSTEM_LABELS } from 'src/modules/messaging/me
import { GmailMessagesImportErrorHandler } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-messages-import-error-handler.service';
import { filterGmailMessagesByFolderPolicy } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util';
import { parseAndFormatGmailMessage } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-and-format-gmail-message.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
const GMAIL_BATCH_REQUEST_MAX_SIZE = 50;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type.ts
index 0a1124cfd53..4165a9e0d1b 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type.ts
@@ -1,6 +1,6 @@
import { type MessageParticipantRole } from 'twenty-shared/types';
-import { type ExplicitParticipantIdentity } from 'src/modules/messaging/message-import-manager/types/message';
+import { type ExplicitParticipantIdentity } from 'src/modules/messaging/message-import-manager/types/message.type';
export type GmailMessage = {
historyId: string;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/__tests__/filter-out-gmail-excluded-folders.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/__tests__/filter-out-gmail-excluded-folders.util.spec.ts
index 36d886e6439..e986e3ec8f7 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/__tests__/filter-out-gmail-excluded-folders.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/__tests__/filter-out-gmail-excluded-folders.util.spec.ts
@@ -1,7 +1,7 @@
import { MessageFolderImportPolicy } from 'twenty-shared/types';
import { type MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
import { filterGmailMessagesByFolderPolicy } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
const createMessage = (
externalId: string,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util.ts
index 4f7aa057b65..efea513f947 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/filter-gmail-messages-by-folder-policy.util.ts
@@ -2,7 +2,7 @@ import { MessageFolderImportPolicy } from 'twenty-shared/types';
import { type MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
import { MESSAGING_GMAIL_EXCLUDED_CATEGORY_LABELS } from 'src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-excluded-category-labels.constant';
import { MESSAGING_GMAIL_FOLDERS_WITH_CATEGORY_EXCLUSIONS } from 'src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-folders-with-category-exclusions.constant';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export const filterGmailMessagesByFolderPolicy = (
messages: MessageWithParticipants[],
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-and-format-gmail-message.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-and-format-gmail-message.util.ts
index 8e453f5ee29..de82814d226 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-and-format-gmail-message.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-and-format-gmail-message.util.ts
@@ -6,7 +6,7 @@ import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { computeMessageDirection } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/compute-message-direction.util';
import { parseGmailMessage } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/parse-gmail-message.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { buildReplyToParticipants } from 'src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util';
import { extractMessageTextWithoutQuotedHistory } from 'src/modules/messaging/message-import-manager/utils/extract-message-text-without-quoted-history.util';
import { formatAddressObjectAsParticipants } from 'src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-find-drafts-folder.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-find-drafts-folder.service.ts
index b8d6ca0255c..56d49fb5b81 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-find-drafts-folder.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-find-drafts-folder.service.ts
@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
import { type ImapFlow, type ListResponse } from 'imapflow';
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
import { getStandardFolderByRegex } from 'src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex';
type DraftsFolderResult = {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
index 830df9ce35f..12e329f0d8a 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
@@ -10,7 +10,7 @@ import { ImapMessageParserService } from 'src/modules/messaging/message-import-m
import { ImapMessagesImportErrorHandler } from 'src/modules/messaging/message-import-manager/drivers/imap/services/imap-messages-import-error-handler.service';
import { parseMessageId } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/parse-message-id.util';
import { resolveReceivedAt } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { extractAddressesFromParsedEmail } from 'src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util';
import { extractMessageTextWithoutQuotedHistory } from 'src/modules/messaging/message-import-manager/utils/extract-message-text-without-quoted-history.util';
import { extractParticipantsFromParsedEmail } from 'src/modules/messaging/message-import-manager/utils/extract-participants-from-parsed-email.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/get-standard-folder-by-regex.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/get-standard-folder-by-regex.util.spec.ts
index c4806ebe9cf..48ffc477475 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/get-standard-folder-by-regex.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/get-standard-folder-by-regex.util.spec.ts
@@ -1,4 +1,4 @@
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
import { getStandardFolderByRegex } from 'src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex';
function testFolderMatches(
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/get-sent-folder-candidates-by-regex.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/get-sent-folder-candidates-by-regex.util.ts
index cbc601cd5c7..71fe8dac7d8 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/get-sent-folder-candidates-by-regex.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/get-sent-folder-candidates-by-regex.util.ts
@@ -1,6 +1,6 @@
import { type ListResponse } from 'imapflow';
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
import { getStandardFolderByRegex } from 'src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex';
export function getImapSentFolderCandidatesByRegex(
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
index f0297394e24..6c6f310d63a 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
@@ -15,7 +15,7 @@ import { InboundEmailMessageSourceResolverService } from 'src/modules/messaging/
import { type InboundEmailImportOutcome } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-import-outcome.type';
import { type InboundEmailMessageReference } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-message-reference.type';
import { extractReferencedMessageIds } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/utils/extract-referenced-message-ids.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
import { MessagingSaveMessagesAndEnqueueContactCreationService } from 'src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service.ts
index 7a44ac7926a..b6ef57240f5 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service.ts
@@ -4,7 +4,7 @@ import PostalMime, { type Email as ParsedEmail } from 'postal-mime';
import { MessageDirection } from 'src/modules/messaging/common/enums/message-direction.enum';
import { type ParsedInboundMessage } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/types/parsed-inbound-message.type';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { extractMessageTextWithoutQuotedHistory } from 'src/modules/messaging/message-import-manager/utils/extract-message-text-without-quoted-history.util';
import { extractParticipantsFromParsedEmail } from 'src/modules/messaging/message-import-manager/utils/extract-participants-from-parsed-email.util';
import { extractThreadIdFromParsedEmail } from 'src/modules/messaging/message-import-manager/utils/extract-thread-id-from-parsed-email.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface.ts
index 70318291ee5..238df2e13e6 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface.ts
@@ -1,4 +1,4 @@
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export type InboundEmailMessageSourceInterface = {
isConfigured(): boolean;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/resend-inbound-email-message-source.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/resend-inbound-email-message-source.service.ts
index 544bd4f79bf..a79267db346 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/resend-inbound-email-message-source.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/resend-inbound-email-message-source.service.ts
@@ -11,7 +11,7 @@ import { ResendApiClientService } from 'src/engine/core-modules/emailing-domain/
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { InboundEmailParserService } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service';
import { type InboundEmailMessageSourceInterface } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
// Resend stores received emails on their side; the reference is the received
// email id from the email.received webhook, and the raw MIME is fetched
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/ses-s3-inbound-email-message-source.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/ses-s3-inbound-email-message-source.service.ts
index 7975d84a3bb..0594365cdd5 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/ses-s3-inbound-email-message-source.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/sources/ses-s3-inbound-email-message-source.service.ts
@@ -5,7 +5,7 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twent
import { InboundEmailParserService } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-parser.service';
import { InboundEmailStorageService } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-storage.service';
import { type InboundEmailMessageSourceInterface } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/sources/inbound-email-message-source.interface';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
// SES receipt rules park the raw MIME message in S3; the reference is the S3
// object key relayed through the inbound webhook notification.
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/parsed-inbound-message.type.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/parsed-inbound-message.type.ts
index 41023ccb1e0..559d8755505 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/parsed-inbound-message.type.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/parsed-inbound-message.type.ts
@@ -1,6 +1,6 @@
import { type Email as ParsedEmail } from 'postal-mime';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export type ParsedInboundMessage = {
parsed: ParsedEmail;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/utils/extract-referenced-message-ids.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/utils/extract-referenced-message-ids.util.ts
index db9a9fe897d..c90b935ead2 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/utils/extract-referenced-message-ids.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/utils/extract-referenced-message-ids.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type MessageHeader } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageHeader } from 'src/modules/messaging/message-import-manager/types/message.type';
const MESSAGE_ID_PATTERN = /<[^<>\s]{1,996}>/g;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts
index 280f3ad2e3d..f174639d5f9 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts
@@ -14,7 +14,7 @@ import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channe
import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
import { MicrosoftOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client.provider';
import { microsoftGraphWithMessagesDeltaLink } from 'src/modules/messaging/message-import-manager/drivers/microsoft/mocks/microsoft-api-examples';
-import { MessageFolderName } from 'src/modules/messaging/message-import-manager/drivers/microsoft/types/folders';
+import { MessageFolderName } from 'src/modules/messaging/message-import-manager/drivers/microsoft/types/folders.type';
import { MicrosoftGetMessageListService } from './microsoft-get-message-list.service';
import { MicrosoftMessageListFetchErrorHandler } from './microsoft-message-list-fetch-error-handler.service';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts
index 4c892270e28..9cf93a7f587 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts
@@ -9,7 +9,7 @@ import { MessageDirection } from 'src/modules/messaging/common/enums/message-dir
import { computeMessageDirection } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/compute-message-direction.util';
import { MicrosoftImportDriverException } from 'src/modules/messaging/message-import-manager/drivers/microsoft/exceptions/microsoft-import-driver.exception';
import { type MicrosoftGraphBatchResponse } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { buildReplyToParticipants } from 'src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util';
import { extractMessageTextWithoutQuotedHistory } from 'src/modules/messaging/message-import-manager/utils/extract-message-text-without-quoted-history.util';
import { formatAddressObjectAsParticipants } from 'src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/types/folders.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/types/folders.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/types/folders.ts
rename to packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/types/folders.type.ts
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/types/standard-folder.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/types/standard-folder.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/messaging/message-import-manager/drivers/types/standard-folder.ts
rename to packages/twenty-server/src/modules/messaging/message-import-manager/drivers/types/standard-folder.type.ts
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex.ts
index ef7fb61fc03..6c3aebedbc3 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/utils/get-standard-folder-by-regex.ts
@@ -1,4 +1,4 @@
-import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder';
+import { StandardFolder } from 'src/modules/messaging/message-import-manager/drivers/types/standard-folder.type';
const FOLDER_REGEX_PATTERNS: Record<StandardFolder, string[]> = {
[StandardFolder.INBOX]: [
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
index 745e3aba057..58bb13e3517 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
@@ -11,7 +11,7 @@ import {
import { GmailGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service';
import { ImapGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service';
import { MicrosoftGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export type GetMessagesResponse = MessageWithParticipants[];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
index dad2df4f955..73e83391b61 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
@@ -10,7 +10,7 @@ import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system
import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
import { type MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
type MessageAccumulator = {
existingMessageInDB?: MessageWorkspaceEntity;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
index c048b7fa1dc..08f5bc48f34 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
@@ -26,7 +26,7 @@ import {
import { MessagingMessageFolderAssociationService } from 'src/modules/messaging/message-import-manager/services/messaging-message-folder-association.service';
import { MessagingMessageService } from 'src/modules/messaging/message-import-manager/services/messaging-message.service';
import { type MessageChannelMessageAssociationFolderAssociation } from 'src/modules/messaging/message-import-manager/types/message-channel-message-association-folder-association.type';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { isGroupEmail } from 'src/modules/messaging/message-import-manager/utils/is-group-email';
import { MessagingMessageParticipantService } from 'src/modules/messaging/message-participant-manager/services/messaging-message-participant.service';
import { isWorkEmail } from 'src/utils/is-work-email';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/types/email-address.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/types/email-address.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/messaging/message-import-manager/types/email-address.ts
rename to packages/twenty-server/src/modules/messaging/message-import-manager/types/email-address.type.ts
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/types/message.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/types/message.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/messaging/message-import-manager/types/message.ts
rename to packages/twenty-server/src/modules/messaging/message-import-manager/types/message.type.ts
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__mocks__/messages.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__mocks__/messages.ts
index 2058b389fa8..79090873fbe 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__mocks__/messages.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__mocks__/messages.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { MessageDirection } from 'src/modules/messaging/common/enums/message-direction.enum';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export const messagingGetMessagesServiceGetMessages = [
{
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-emails.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-emails.util.spec.ts
index dbcea8c0c0a..8744a9f1fc2 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-emails.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-emails.util.spec.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { MessageDirection } from 'src/modules/messaging/common/enums/message-direction.enum';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { messagingGetMessagesServiceGetMessages } from 'src/modules/messaging/message-import-manager/utils/__mocks__/messages';
import { filterEmails } from 'src/modules/messaging/message-import-manager/utils/filter-emails.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-out-unsubscribe-requests.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-out-unsubscribe-requests.util.spec.ts
index 38286634adc..f19a7cd7fe1 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-out-unsubscribe-requests.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/filter-out-unsubscribe-requests.util.spec.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { MessageDirection } from 'src/modules/messaging/common/enums/message-direction.enum';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { filterOutUnsubscribeRequests } from 'src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util';
const OWN_HANDLES = ['[email protected]'];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util.ts
index 4237d26275e..5eca8803204 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/build-reply-to-participants.util.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { type Participant } from 'src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type';
-import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address';
+import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address.type';
import { formatAddressObjectAsParticipants } from 'src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util';
export const buildReplyToParticipants = (
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util.ts
index 9140df68599..285af7a6456 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util.ts
@@ -1,6 +1,6 @@
import { type Address } from 'postal-mime';
-import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address';
+import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address.type';
import { sanitizeString } from 'src/modules/messaging/message-import-manager/utils/sanitize-string.util';
export const extractAddressesFromParsedEmail = (
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
index 7a7bb6b2fb6..4fc4933e45e 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
@@ -1,4 +1,4 @@
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { filterOutBlocklistedMessages } from 'src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util';
import { filterOutIcsAttachments } from 'src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util';
import { filterOutInternals } from 'src/modules/messaging/message-import-manager/utils/filter-out-internals.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util.ts
index 59aceb6173c..253088ad839 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util.ts
@@ -1,5 +1,5 @@
import { isEmailBlocklisted } from 'src/modules/blocklist/utils/is-email-blocklisted.util';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export const filterOutBlocklistedMessages = (
messageChannelHandles: string[],
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util.ts
index 8ca0482398b..2d0e0805517 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util.ts
@@ -1,4 +1,4 @@
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export const filterOutIcsAttachments = (
messages: MessageWithParticipants[],
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-internals.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-internals.util.ts
index 4ade3c21c9c..3291fb25a10 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-internals.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-internals.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { getDomainFromEmailOrThrow } from 'src/utils/get-domain-from-email-or-throw';
export const filterOutInternals = (
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util.ts
index 27bacc0ef09..a70a5d4b803 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util.ts
@@ -5,7 +5,7 @@ import { MessageDirection } from 'src/modules/messaging/common/enums/message-dir
import { AUTO_GENERATED_BODY_MARKER } from 'src/modules/messaging/message-import-manager/constants/auto-generated-body-marker.constant';
import { RECIPIENT_ROLES } from 'src/modules/messaging/message-import-manager/constants/recipient-roles.constant';
import { UNSUBSCRIBE_COMMAND_SUBJECT } from 'src/modules/messaging/message-import-manager/constants/unsubscribe-command-subject.constant';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { isBulkMail } from 'src/modules/messaging/message-import-manager/utils/is-bulk-mail.util';
import { isUnsubscribeEmail } from 'src/modules/messaging/message-import-manager/utils/is-unsubscribe-email.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util.ts
index 38bf0af196f..5c13098a176 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util.ts
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type MessageParticipantRole } from 'twenty-shared/types';
import { type Participant } from 'src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message.type';
-import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address';
+import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address.type';
const removeSpacesAndLowerCase = (email: string): string => {
return email.replace(/\s/g, '').toLowerCase();
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-bulk-mail.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-bulk-mail.util.ts
index e11545a96d4..f1bffa6aaf1 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-bulk-mail.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-bulk-mail.util.ts
@@ -1,6 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
-import { type MessageHeader } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageHeader } from 'src/modules/messaging/message-import-manager/types/message.type';
const BULK_LIST_HEADER_NAMES = ['list-unsubscribe', 'list-id'];
const BULK_PRECEDENCE_VALUES = ['bulk', 'list', 'junk'];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts
index 8ba7da5979e..5b28696aba7 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
import { isBulkMail } from 'src/modules/messaging/message-import-manager/utils/is-bulk-mail.util';
import { isGroupEmail } from 'src/modules/messaging/message-import-manager/utils/is-group-email';
import { isMessageSenderMatchingHandles } from 'src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util.ts
index 7991f7fa021..f5848f7ac93 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util.ts
@@ -1,7 +1,7 @@
import { MessageParticipantRole } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message.type';
export const isMessageSenderMatchingHandles = (
message: MessageWithParticipants,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-address.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-address.util.ts
index c94bc9bf8d5..ec73d223465 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-address.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-address.util.ts
@@ -1,4 +1,4 @@
-import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address';
+import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address.type';
import { safeParseEmailAddressAddress } from 'src/modules/messaging/message-import-manager/utils/safe-parse-email-address-address.util';
export const safeParseEmailAddress = (
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-addresses.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-addresses.util.ts
index d5319cc41f4..04e883a397e 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-addresses.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/safe-parse-email-addresses.util.ts
@@ -1,7 +1,7 @@
import { isNonEmptyString } from '@sniptt/guards';
import { parseEmailAddressList } from 'twenty-shared/utils';
-import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address';
+import { type EmailAddress } from 'src/modules/messaging/message-import-manager/types/email-address.type';
export const safeParseEmailAddresses = (header: string): EmailAddress[] => {
return parseEmailAddressList(header).filter((parsedAddress) =>
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
index 0098b70f63f..56c0f3bd4d2 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
@@ -5,7 +5,7 @@ import { MessageDirection } from 'src/modules/messaging/common/enums/message-dir
import {
type MessageParticipant,
type MessageWithParticipants,
-} from 'src/modules/messaging/message-import-manager/types/message';
+} from 'src/modules/messaging/message-import-manager/types/message.type';
import { type PersistSentMessageInput } from 'src/modules/messaging/message-outbound-manager/types/persist-sent-message-input.type';
import { resolveOutboundThreadExternalId } from 'src/modules/messaging/message-outbound-manager/utils/resolve-outbound-thread-external-id.util';
diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
index 6f1ba15a645..c25bc891bbd 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
@@ -12,7 +12,7 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload';
+import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload.type';
import { type LinkedTimelineActivityHappensAtSyncUpdate } from 'src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util';
import {
buildTimelineActivityMergeKey,
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index 91df647f9ca..3c96e2be36c 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -21,7 +21,7 @@ import {
} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
import { TimelineActivityTargetQueryService } from 'src/modules/timeline/services/timeline-activity-target-query.service';
import { type ResolvedTimelineActivityTarget } from 'src/modules/timeline/types/resolved-timeline-activity-target.type';
-import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload';
+import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload.type';
import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';
import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
import { buildLinkedTimelineActivityHappensAtSyncUpdates } from 'src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util';
diff --git a/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts b/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts
rename to packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.type.ts
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/interfaces/workflow-action.interface.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/interfaces/workflow-action.interface.ts
index 0c84e5ab0dc..f5aa422c817 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/interfaces/workflow-action.interface.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/interfaces/workflow-action.interface.ts
@@ -1,4 +1,4 @@
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
export interface WorkflowAction {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-action-input.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-action-input.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-action-input.ts
rename to packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-action-input.type.ts
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 2b46ebe8d57..3a828719008 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
@@ -1,7 +1,7 @@
import { type ActorMetadata } from 'twenty-shared/types';
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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config.type';
export type WorkflowExecutionContext = {
isActingOnBehalfOfUser: boolean;
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-executor-input.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-executor-input.type.ts
similarity index 100%
rename from packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-executor-input.ts
rename to packages/twenty-server/src/modules/workflow/workflow-executor/types/workflow-executor-input.type.ts
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
index 711c83c8787..5a9ba526d02 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
@@ -16,7 +16,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { buildAiAgentStepLog } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/build-ai-agent-step-log.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/classify/classify.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/classify/classify.workflow-action.ts
index b0a9c5fc27a..751b6c28aa4 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/classify/classify.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/classify/classify.workflow-action.ts
@@ -8,7 +8,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action.ts
index fc96b5de8b9..5e1147a3e6e 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/code.workflow-action.ts
@@ -12,7 +12,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowCodeAction } from 'src/modules/workflow/workflow-executor/workflow-actions/code/guards/is-workflow-code-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/delay/delay.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/delay/delay.workflow-action.ts
index 85cb7de3ba9..bbc5a6a54a1 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/delay/delay.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/delay/delay.workflow-action.ts
@@ -11,7 +11,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { RESUME_DELAYED_WORKFLOW_JOB_NAME } from 'src/modules/workflow/workflow-executor/workflow-actions/delay/contants/resume-delayed-workflow-job-name';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/empty/empty.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/empty/empty.workflow-action.ts
index 90281504a6a..aebb0c37ee5 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/empty/empty.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/empty/empty.workflow-action.ts
@@ -6,7 +6,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowEmptyAction } from 'src/modules/workflow/workflow-executor/workflow-actions/empty/guards/is-workflow-empty-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/filter.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/filter.workflow-action.ts
index dac4a58e90c..b99238fc4a6 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/filter.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/filter/filter.workflow-action.ts
@@ -6,7 +6,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowFilterAction } from 'src/modules/workflow/workflow-executor/workflow-actions/filter/guards/is-workflow-filter-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
index ef449d8891b..07f857cbcbd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/form/form.workflow-action.ts
@@ -6,7 +6,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowFormAction } from 'src/modules/workflow/workflow-executor/workflow-actions/form/guards/is-workflow-form-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/if-else/if-else.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/if-else/if-else.workflow-action.ts
index 4cfee16ee5d..22af8bc60a3 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/if-else/if-else.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/if-else/if-else.workflow-action.ts
@@ -6,7 +6,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowIfElseAction } from 'src/modules/workflow/workflow-executor/workflow-actions/if-else/guards/is-workflow-if-else-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/iterator/iterator.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/iterator/iterator.workflow-action.ts
index 429551f5259..7e969d0ed3f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/iterator/iterator.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/iterator/iterator.workflow-action.ts
@@ -10,7 +10,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { buildStepInfosReset } from 'src/modules/workflow/workflow-executor/utils/build-step-infos-reset.util';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/logic-function/logic-function.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/logic-function/logic-function.workflow-action.ts
index 48abdb2c62b..cfe2f614aee 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/logic-function/logic-function.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/logic-function/logic-function.workflow-action.ts
@@ -13,7 +13,7 @@ import {
WorkflowStepExecutorException,
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowLogicFunctionAction } from 'src/modules/workflow/workflow-executor/workflow-actions/logic-function/guards/is-workflow-logic-function-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
index fb3f95248a3..213fd2ed972 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/email-workflow-action.base.ts
@@ -20,7 +20,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowRunInfo } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowRunInfo } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { getUserFromAuthContext } from 'src/modules/workflow/workflow-executor/utils/get-user-from-auth-context.util';
import { type WorkflowSendEmailActionInput } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/types/workflow-send-email-action-input.type';
import { buildEmailStepLog } from 'src/modules/workflow/workflow-executor/workflow-actions/mail-sender/utils/build-email-step-log.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
index 9b7a8354e82..0c4184530fa 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts
@@ -7,7 +7,7 @@ import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/inte
import { CreateRecordService } from 'src/engine/core-modules/record-crud/services/create-record.service';
import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { buildWorkflowActorMetadata } from 'src/modules/workflow/workflow-executor/utils/build-workflow-actor-metadata.util';
import { filterValidFieldsInRecord } from 'src/modules/workflow/workflow-executor/utils/filter-valid-fields-in-record.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
index a94b7aefdaf..d919596bb91 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/delete-record.workflow-action.ts
@@ -10,7 +10,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowDeleteRecordAction } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/guards/is-workflow-delete-record-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
index f2929b095c4..6eac7ce9f5f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
@@ -19,7 +19,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowFindRecordsAction } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/guards/is-workflow-find-records-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
index 860b2be109a..4c21f338ebe 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/pick-record.workflow-action.ts
@@ -16,7 +16,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { isWorkflowPickRecordAction } from 'src/modules/workflow/workflow-executor/workflow-actions/record-crud/guards/is-workflow-pick-record-action.guard';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
index 3559f13b3c2..741c726488b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/update-record.workflow-action.ts
@@ -11,7 +11,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { buildWorkflowActorMetadata } from 'src/modules/workflow/workflow-executor/utils/build-workflow-actor-metadata.util';
import { filterValidFieldsInRecord } from 'src/modules/workflow/workflow-executor/utils/filter-valid-fields-in-record.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
index dba22787feb..54ed746e937 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/upsert-record.workflow-action.ts
@@ -11,7 +11,7 @@ import {
WorkflowStepExecutorExceptionCode,
} from 'src/modules/workflow/workflow-executor/exceptions/workflow-step-executor.exception';
import { WorkflowExecutionContextService } from 'src/modules/workflow/workflow-executor/services/workflow-execution-context.service';
-import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+import { type WorkflowActionInput } from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { filterValidFieldsInRecord } from 'src/modules/workflow/workflow-executor/utils/filter-valid-fields-in-record.util';
import { formatWorkflowRecordRelationFields } from 'src/modules/workflow/workflow-executor/utils/format-workflow-record-relation-fields.util';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/tool-backed/tool-backed.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/tool-backed/tool-backed.workflow-action.ts
index ce59dd164da..3bad9323b2a 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/tool-backed/tool-backed.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/tool-backed/tool-backed.workflow-action.ts
@@ -11,7 +11,7 @@ import { type WorkflowAction as WorkflowActionContract } from 'src/modules/workf
import {
type WorkflowActionInput,
type WorkflowRunInfo,
-} from 'src/modules/workflow/workflow-executor/types/workflow-action-input';
+} from 'src/modules/workflow/workflow-executor/types/workflow-action-input.type';
import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executor/types/workflow-action-output.type';
import { findStepOrThrow } from 'src/modules/workflow/workflow-executor/utils/find-step-or-throw.util';
import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
index 3207c571dd6..835888d7dbd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
@@ -32,7 +32,7 @@ import { type WorkflowActionOutput } from 'src/modules/workflow/workflow-executo
import {
type WorkflowBranchExecutorInput,
type WorkflowExecutorInput,
-} from 'src/modules/workflow/workflow-executor/types/workflow-executor-input';
+} from 'src/modules/workflow/workflow-executor/types/workflow-executor-input.type';
import { getStepRetryAttempt } from 'src/modules/workflow/workflow-executor/utils/get-step-retry-attempt.util';
import { getStepRetryDelayMs } from 'src/modules/workflow/workflow-executor/utils/get-step-retry-delay-ms.util';
import { isUserFacingWorkflowExecutorError } from 'src/modules/workflow/workflow-executor/utils/is-user-facing-workflow-executor-error.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 2a46b6aff2a..b189f0c8f25 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
@@ -12,7 +12,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';
+import { type RolePermissionConfig } from 'src/engine/twenty-orm/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 a875148f4fe..fc6c81a220a 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
@@ -9,7 +9,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';
+import type { RolePermissionConfig } from 'src/engine/twenty-orm/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/test/integration/graphql/suites/auth/sign-up/successful-new-workspace-logo-direct-upload.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/successful-new-workspace-logo-direct-upload.integration-spec.ts
index 95e87454202..df772222f85 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/successful-new-workspace-logo-direct-upload.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/successful-new-workspace-logo-direct-upload.integration-spec.ts
@@ -9,7 +9,7 @@ import { ONE_BY_ONE_TRANSPARENT_PNG } from 'test/integration/metadata/suites/fil
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { settings } from 'src/engine/constants/settings';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
const createNewWorkspaceLogoUploadMutation = gql`
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/failing-create-input-by-field-metadata-type.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/failing-create-input-by-field-metadata-type.constant.ts
index b6f81533f0c..d05aef39b00 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/failing-create-input-by-field-metadata-type.constant.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/failing-create-input-by-field-metadata-type.constant.ts
@@ -1,4 +1,4 @@
-import { type FieldMetadataTypesToTestForCreateInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test';
+import { type FieldMetadataTypesToTestForCreateInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type';
import { joinColumnNameForManyToOneMorphRelationField1 } from 'test/integration/graphql/suites/inputs-validation/utils/setup-test-objects-with-all-field-types.util';
import { FieldMetadataType } from 'twenty-shared/types';
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/successful-create-input-by-field-metadata-type.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/successful-create-input-by-field-metadata-type.constant.ts
index c8d32ae52cf..779b3d451e1 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/successful-create-input-by-field-metadata-type.constant.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/create-validation/constants/successful-create-input-by-field-metadata-type.constant.ts
@@ -1,4 +1,4 @@
-import { type FieldMetadataTypesToTestForCreateInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test';
+import { type FieldMetadataTypesToTestForCreateInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type';
import {
joinColumnNameForManyToOneMorphRelationField1,
TEST_TARGET_OBJECT_RECORD_ID_FIELD_VALUE,
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/failing-filter-input-by-field-metadata-type.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/failing-filter-input-by-field-metadata-type.constant.ts
index dc25d2ce41f..89129b12206 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/failing-filter-input-by-field-metadata-type.constant.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/failing-filter-input-by-field-metadata-type.constant.ts
@@ -1,4 +1,4 @@
-import { type FieldMetadataTypesToTestForFilterInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test';
+import { type FieldMetadataTypesToTestForFilterInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type';
import { joinColumnNameForManyToOneMorphRelationField1 } from 'test/integration/graphql/suites/inputs-validation/utils/setup-test-objects-with-all-field-types.util';
import { FieldMetadataType } from 'twenty-shared/types';
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts
index 08dcb883518..92948121e34 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts
@@ -1,4 +1,4 @@
-import { type FieldMetadataTypesToTestForFilterInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test';
+import { type FieldMetadataTypesToTestForFilterInputValidation } from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type';
import {
joinColumnNameForManyToOneMorphRelationField1,
TEST_TARGET_OBJECT_RECORD_ID,
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type.ts
similarity index 100%
rename from packages/twenty-server/test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.ts
rename to packages/twenty-server/test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type.ts
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/utils/get-field-metadata-creation-inputs.util.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/utils/get-field-metadata-creation-inputs.util.ts
index 991b38ebaf5..88fbfa5d8d0 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/utils/get-field-metadata-creation-inputs.util.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/utils/get-field-metadata-creation-inputs.util.ts
@@ -1,7 +1,7 @@
import {
type FieldMetadataTypesToTestForCreateInputValidation,
type FieldMetadataTypesToTestForFilterInputValidation,
-} from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test';
+} from 'test/integration/graphql/suites/inputs-validation/types/field-metadata-type-to-test.type';
import {
type FieldMetadataComplexOption,
type FieldMetadataSettingsMapping,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/create-enum-field-metadata-test-cases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/create-enum-field-metadata-test-cases.ts
index d4bbb8a1fee..3bbf5dba047 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/create-enum-field-metadata-test-cases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/create-enum-field-metadata-test-cases.ts
@@ -1,7 +1,7 @@
import { MUTLI_SELECT_OPERATION_AGNOSTIC_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases';
import { SELECT_OPERATION_AGNOSTIC_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases';
-import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases';
-import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case';
+import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type';
+import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type';
import { type FieldMetadataComplexOption } from 'twenty-shared/types';
import { type EnumFieldMetadataUnionType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases.ts
index ec7d2c5cd47..9fbb7d5f15a 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases.ts
@@ -1,8 +1,8 @@
import { isDefined } from 'class-validator';
import { BASIC_FAILING_STRING_EDGE_CASE_INPUTS } from 'test/constants/basic-failing-string-edge-case-inputs.constant';
import { SELECT_AND_MULTI_SELECT_OPERATION_AGNOSTIC_SUCCESSFUL_AND_FAILING_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases';
-import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases';
-import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case';
+import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type';
+import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type';
const fuzzedDefaultValueFailingTestCases: UpdateCreateFieldMetadataSelectTestCase[] =
BASIC_FAILING_STRING_EDGE_CASE_INPUTS.filter((el) => isDefined(el.input)).map(
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases.ts
index c013d85b293..b591dd884d0 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases.ts
@@ -1,6 +1,6 @@
import { BASIC_FAILING_STRING_EDGE_CASE_INPUTS } from 'test/constants/basic-failing-string-edge-case-inputs.constant';
-import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases';
-import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case';
+import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type';
+import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type';
import {
type FieldMetadataComplexOption,
type TagColor,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases.ts
index 9bd3a29dae3..ba667f65152 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases.ts
@@ -1,8 +1,8 @@
import { isDefined } from 'class-validator';
import { BASIC_FAILING_STRING_EDGE_CASE_INPUTS } from 'test/constants/basic-failing-string-edge-case-inputs.constant';
import { SELECT_AND_MULTI_SELECT_OPERATION_AGNOSTIC_SUCCESSFUL_AND_FAILING_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/select-and-multi-select-operation-agnostic-tests-cases';
-import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases';
-import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case';
+import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type';
+import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type';
const fuzzedDefaultValueFailingTestCases: UpdateCreateFieldMetadataSelectTestCase[] =
BASIC_FAILING_STRING_EDGE_CASE_INPUTS.filter((el) => isDefined(el.input)).map(
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/update-enum-field-metadata-test-cases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/update-enum-field-metadata-test-cases.ts
index 3829a0e9ee1..4ac3efc351f 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/update-enum-field-metadata-test-cases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/common/update-enum-field-metadata-test-cases.ts
@@ -1,6 +1,6 @@
import { MUTLI_SELECT_OPERATION_AGNOSTIC_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/multi-select-operation-agnostic-test-cases';
import { SELECT_OPERATION_AGNOSTIC_TEST_CASES } from 'test/integration/metadata/suites/field-metadata/enum/common/select-operation-agnostic-test-cases';
-import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases';
+import { type FieldMetadataEnumSuccessfulAndFailingTestCases } from 'test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type';
import { type FieldMetadataComplexOption } from 'twenty-shared/types';
import { type EnumFieldMetadataUnionType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type.ts
similarity index 89%
rename from packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases.ts
rename to packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type.ts
index 49e1e536951..6ce7f6e95ff 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/fieldMetadataEnumSuccessfulAndFailingTestCases.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/field-metadata-enum-successful-and-failing-test-cases.type.ts
@@ -1,4 +1,4 @@
-import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case';
+import { type UpdateCreateFieldMetadataSelectTestCase } from 'test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type';
import { type SuccessfulAndFailingTestCases } from 'twenty-shared/testing';
export type FieldMetadataEnumSuccessfulAndFailingTestCases =
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type.ts
similarity index 100%
rename from packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.ts
rename to packages/twenty-server/test/integration/metadata/suites/field-metadata/enum/types/update-create-field-metadata-enum-test-case.type.ts
diff --git a/packages/twenty-server/test/integration/metadata/suites/file/failing-core-picture-direct-upload.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/file/failing-core-picture-direct-upload.integration-spec.ts
index 9df93753dcf..33eff25635d 100644
--- a/packages/twenty-server/test/integration/metadata/suites/file/failing-core-picture-direct-upload.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/file/failing-core-picture-direct-upload.integration-spec.ts
@@ -15,7 +15,7 @@ import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/m
import { v4 as uuidv4 } from 'uuid';
import { settings } from 'src/engine/constants/settings';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
const MINIMAL_PDF = Buffer.from(
diff --git a/packages/twenty-server/test/integration/metadata/suites/file/successful-core-picture-direct-upload.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/file/successful-core-picture-direct-upload.integration-spec.ts
index 29bdfee4e11..5b59d7e8589 100644
--- a/packages/twenty-server/test/integration/metadata/suites/file/successful-core-picture-direct-upload.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/file/successful-core-picture-direct-upload.integration-spec.ts
@@ -8,7 +8,7 @@ import { createFileUploadAndPutFile } from 'test/integration/graphql/utils/uploa
import { ONE_BY_ONE_TRANSPARENT_PNG } from 'test/integration/metadata/suites/file/utils/seed-workspace-logo.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
+import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
const CORE_PICTURE_PATH_PATTERN = /^core-picture\/[0-9a-f-]{36}\.png$/;
diff --git a/packages/twenty-server/test/integration/record-export/record-export-file-cleanup.integration-spec.ts b/packages/twenty-server/test/integration/record-export/record-export-file-cleanup.integration-spec.ts
index a8ca2ef7b90..6215802964b 100644
--- a/packages/twenty-server/test/integration/record-export/record-export-file-cleanup.integration-spec.ts
+++ b/packages/twenty-server/test/integration/record-export/record-export-file-cleanup.integration-spec.ts
@@ -15,7 +15,7 @@ import { type PendingFileCleanupCronJob } from 'src/engine/core-modules/file/fil
import {
FILE_STATUS,
type FileStatus,
-} from 'src/engine/core-modules/file/types/file-status.types';
+} from 'src/engine/core-modules/file/types/file-status.type';
import { type JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
import { type RecordExportWorkspaceService } from 'src/engine/core-modules/record-export/services/record-export.workspace-service';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
diff --git a/packages/twenty-shared/.oxlintrc.json b/packages/twenty-shared/.oxlintrc.json
index 468af56c0b8..c8fc51aec43 100644
--- a/packages/twenty-shared/.oxlintrc.json
+++ b/packages/twenty-shared/.oxlintrc.json
@@ -48,6 +48,7 @@
}
],
"twenty/no-miscased-acronym-in-identifier": "error",
+ "twenty/types-folder-filename": ["error", { "convention": "PascalCase" }],
"twenty/enforce-module-boundaries": [
"error",
{
diff --git a/packages/twenty-shared/src/ai/index.ts b/packages/twenty-shared/src/ai/index.ts
index c5ebe824af6..89d3e6d2909 100644
--- a/packages/twenty-shared/src/ai/index.ts
+++ b/packages/twenty-shared/src/ai/index.ts
@@ -30,17 +30,17 @@ export { DEFAULT_AI_AGENT_MODEL_TIER } from './constants/default-ai-agent-model-
export { DEFAULT_AI_CHAT_MODEL_TIER } from './constants/default-ai-chat-model-tier.const';
export { JEV_MODEL_ID } from './constants/jev-model-id.const';
export { ToolCategory } from './constants/tool-category.const';
+export type { AgentChatSubscriptionEvent } from './types/AgentChatSubscriptionEvent';
export type {
AgentResponseFormatType,
AgentTextResponseFormat,
AgentJsonResponseFormat,
AgentResponseFormat,
-} from './types/agent-response-format.type';
+} from './types/AgentResponseFormat';
export type {
AgentResponseFieldType,
AgentResponseSchema,
-} from './types/agent-response-schema.type';
-export type { AgentChatSubscriptionEvent } from './types/AgentChatSubscriptionEvent';
+} from './types/AgentResponseSchema';
export type { AskQuestionAnswer } from './types/AskQuestionAnswer';
export type { AskQuestionItem } from './types/AskQuestionItem';
export type { AskQuestionOption } from './types/AskQuestionOption';
@@ -61,7 +61,7 @@ export type {
ExtendedUIMessage,
} from './types/ExtendedUIMessage';
export type { ExtendedUIMessagePart } from './types/ExtendedUIMessagePart';
-export type { ModelConfiguration } from './types/model-configuration.type';
+export type { ModelConfiguration } from './types/ModelConfiguration';
export type { NavigateAppToolOutput } from './types/NavigateAppToolOutput';
export type { ToolWidgetName, ToolRecordReference } from './types/ToolWidget';
export {
diff --git a/packages/twenty-shared/src/ai/types/agent-response-format.type.ts b/packages/twenty-shared/src/ai/types/AgentResponseFormat.ts
similarity index 78%
rename from packages/twenty-shared/src/ai/types/agent-response-format.type.ts
rename to packages/twenty-shared/src/ai/types/AgentResponseFormat.ts
index 54ba9a303b1..f9ca6829870 100644
--- a/packages/twenty-shared/src/ai/types/agent-response-format.type.ts
+++ b/packages/twenty-shared/src/ai/types/AgentResponseFormat.ts
@@ -1,4 +1,4 @@
-import { type AgentResponseSchema } from '@/ai/types/agent-response-schema.type';
+import { type AgentResponseSchema } from '@/ai/types/AgentResponseSchema';
export type AgentResponseFormatType = AgentResponseFormat['type'];
diff --git a/packages/twenty-shared/src/ai/types/agent-response-schema.type.ts b/packages/twenty-shared/src/ai/types/AgentResponseSchema.ts
similarity index 100%
rename from packages/twenty-shared/src/ai/types/agent-response-schema.type.ts
rename to packages/twenty-shared/src/ai/types/AgentResponseSchema.ts
diff --git a/packages/twenty-shared/src/ai/types/model-configuration.type.ts b/packages/twenty-shared/src/ai/types/ModelConfiguration.ts
similarity index 100%
rename from packages/twenty-shared/src/ai/types/model-configuration.type.ts
rename to packages/twenty-shared/src/ai/types/ModelConfiguration.ts
diff --git a/packages/twenty-shared/src/ai/types/index.ts b/packages/twenty-shared/src/ai/types/index.ts
index e9022464442..aec3774d7ee 100644
--- a/packages/twenty-shared/src/ai/types/index.ts
+++ b/packages/twenty-shared/src/ai/types/index.ts
@@ -1,5 +1,5 @@
export type {
AgentResponseFieldType,
AgentResponseSchema,
-} from './agent-response-schema.type';
-export type { ModelConfiguration } from './model-configuration.type';
+} from './AgentResponseSchema';
+export type { ModelConfiguration } from './ModelConfiguration';
diff --git a/packages/twenty-shared/src/application/agentManifestType.ts b/packages/twenty-shared/src/application/agentManifestType.ts
index afe3ba63d60..35a221d6118 100644
--- a/packages/twenty-shared/src/application/agentManifestType.ts
+++ b/packages/twenty-shared/src/application/agentManifestType.ts
@@ -1,4 +1,4 @@
-import { type AgentResponseFormat } from '@/ai/types/agent-response-format.type';
+import { type AgentResponseFormat } from '@/ai/types/AgentResponseFormat';
import { type SyncableEntityOptions } from '@/application/syncableEntityOptionsType';
export type AgentManifest = SyncableEntityOptions & {
diff --git a/packages/twenty-shared/src/application/deterministic-identifier/deterministic-entity-namespace.type.ts b/packages/twenty-shared/src/application/deterministic-identifier/deterministic-entity-namespace.type.ts
index 76ef53b18d6..0edb2d5933d 100644
--- a/packages/twenty-shared/src/application/deterministic-identifier/deterministic-entity-namespace.type.ts
+++ b/packages/twenty-shared/src/application/deterministic-identifier/deterministic-entity-namespace.type.ts
@@ -1,4 +1,4 @@
-import { type AllMetadataName } from '@/metadata/types/all-metadata-name.type';
+import { type AllMetadataName } from '@/metadata/types/AllMetadataName';
// selectOption is not a syncable metadata entity yet; it will join AllMetadataName once it is.
export type DeterministicEntityNamespace =
diff --git a/packages/twenty-shared/src/i18n/translatable-properties-by-metadata-name.ts b/packages/twenty-shared/src/i18n/translatable-properties-by-metadata-name.ts
index ffd77f9561f..c21edca1790 100644
--- a/packages/twenty-shared/src/i18n/translatable-properties-by-metadata-name.ts
+++ b/packages/twenty-shared/src/i18n/translatable-properties-by-metadata-name.ts
@@ -1,4 +1,4 @@
-import { type AllMetadataName } from '@/metadata/types/all-metadata-name.type';
+import { type AllMetadataName } from '@/metadata/types/AllMetadataName';
// The single source of truth for which provider-owned metadata properties are
// translatable. twenty-server resolves them against a catalog at request time
diff --git a/packages/twenty-shared/src/logic-function/__tests__/get-output-schema-mismatch-issues.test.ts b/packages/twenty-shared/src/logic-function/__tests__/get-output-schema-mismatch-issues.test.ts
index adc3c77295e..26924c9c5ad 100644
--- a/packages/twenty-shared/src/logic-function/__tests__/get-output-schema-mismatch-issues.test.ts
+++ b/packages/twenty-shared/src/logic-function/__tests__/get-output-schema-mismatch-issues.test.ts
@@ -4,7 +4,7 @@ import {
type Leaf,
type LeafType,
type Node,
-} from '@/workflow/workflow-schema/types/base-output-schema.type';
+} from '@/workflow/workflow-schema/types/BaseOutputSchema';
const leaf = (type: LeafType, label = 'label'): Leaf => ({
isLeaf: true,
diff --git a/packages/twenty-shared/src/logic-function/get-output-schema-from-value.ts b/packages/twenty-shared/src/logic-function/get-output-schema-from-value.ts
index 8c2f2f7863e..87ec05e21d6 100644
--- a/packages/twenty-shared/src/logic-function/get-output-schema-from-value.ts
+++ b/packages/twenty-shared/src/logic-function/get-output-schema-from-value.ts
@@ -2,7 +2,7 @@ import { isDefined } from '@/utils';
import {
type BaseOutputSchemaV2,
type LeafType,
-} from '@/workflow/workflow-schema/types/base-output-schema.type';
+} from '@/workflow/workflow-schema/types/BaseOutputSchema';
import { isObject } from '@sniptt/guards';
const getValueType = (value: any): LeafType => {
diff --git a/packages/twenty-shared/src/logic-function/get-output-schema-mismatch-issues.ts b/packages/twenty-shared/src/logic-function/get-output-schema-mismatch-issues.ts
index d660cd04457..4185a91082f 100644
--- a/packages/twenty-shared/src/logic-function/get-output-schema-mismatch-issues.ts
+++ b/packages/twenty-shared/src/logic-function/get-output-schema-mismatch-issues.ts
@@ -1,5 +1,5 @@
import { isDefined } from '@/utils';
-import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/BaseOutputSchema';
const buildPath = (parentPath: string, key: string): string =>
parentPath ? `${parentPath}.${key}` : key;
diff --git a/packages/twenty-shared/src/logic-function/input-schema-to-output-schema.ts b/packages/twenty-shared/src/logic-function/input-schema-to-output-schema.ts
index c36df1ae4e7..1c7f244fff2 100644
--- a/packages/twenty-shared/src/logic-function/input-schema-to-output-schema.ts
+++ b/packages/twenty-shared/src/logic-function/input-schema-to-output-schema.ts
@@ -7,7 +7,7 @@ import {
type Leaf,
type LeafType,
type Node,
-} from '@/workflow/workflow-schema/types/base-output-schema.type';
+} from '@/workflow/workflow-schema/types/BaseOutputSchema';
import { isObject } from '@sniptt/guards';
const LEAF_TYPES: LeafType[] = [
diff --git a/packages/twenty-shared/src/metadata/index.ts b/packages/twenty-shared/src/metadata/index.ts
index 2f8ef1f74d6..28e5817e3dd 100644
--- a/packages/twenty-shared/src/metadata/index.ts
+++ b/packages/twenty-shared/src/metadata/index.ts
@@ -21,14 +21,14 @@ export type { StandardObjectWithUniversalIdentifierName } from './constants/stan
export { STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS } from './constants/standard-object-universal-identifiers.constant';
export { STANDARD_OBJECTS } from './constants/standard-object.constant';
export { STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS } from './constants/standard-page-layout-universal-identifiers.constant';
-export type { AllMetadataName } from './types/all-metadata-name.type';
+export type { AllMetadataName } from './types/AllMetadataName';
export type {
FailedMetadataValidationError,
FailedMetadataValidation,
MetadataValidationErrorResponse,
} from './types/MetadataValidationError';
export { WorkspaceMigrationV2ExceptionCode } from './types/MetadataValidationError';
-export type { SyncAction } from './types/sync-action.type';
+export type { SyncAction } from './types/SyncAction';
export { addCustomSuffixIfIsReserved } from './utils/add-custom-suffix-if-reserved.util';
export { computeMetadataNameFromLabel } from './utils/compute-metadata-name-from-label.util';
export { computeMetadataNamesFromLabelsOrThrow } from './utils/compute-metadata-names-from-labels-or-throw.util';
diff --git a/packages/twenty-shared/src/metadata/types/all-metadata-name.type.ts b/packages/twenty-shared/src/metadata/types/AllMetadataName.ts
similarity index 100%
rename from packages/twenty-shared/src/metadata/types/all-metadata-name.type.ts
rename to packages/twenty-shared/src/metadata/types/AllMetadataName.ts
diff --git a/packages/twenty-shared/src/metadata/types/MetadataValidationError.ts b/packages/twenty-shared/src/metadata/types/MetadataValidationError.ts
index 0e2335747bb..29c8e1b2f13 100644
--- a/packages/twenty-shared/src/metadata/types/MetadataValidationError.ts
+++ b/packages/twenty-shared/src/metadata/types/MetadataValidationError.ts
@@ -1,4 +1,4 @@
-import { type AllMetadataName } from '@/metadata/types/all-metadata-name.type';
+import { type AllMetadataName } from '@/metadata/types/AllMetadataName';
export type FailedMetadataValidationError = {
code: string;
diff --git a/packages/twenty-shared/src/metadata/types/sync-action.type.ts b/packages/twenty-shared/src/metadata/types/SyncAction.ts
similarity index 89%
rename from packages/twenty-shared/src/metadata/types/sync-action.type.ts
rename to packages/twenty-shared/src/metadata/types/SyncAction.ts
index 2e808eafe60..34bc684a7b1 100644
--- a/packages/twenty-shared/src/metadata/types/sync-action.type.ts
+++ b/packages/twenty-shared/src/metadata/types/SyncAction.ts
@@ -1,4 +1,4 @@
-import { type AllMetadataName } from '@/metadata/types/all-metadata-name.type';
+import { type AllMetadataName } from '@/metadata/types/AllMetadataName';
type SyncActionFlatEntity = {
name?: string | null;
diff --git a/packages/twenty-shared/src/testing/EachTestingContextFilter.ts b/packages/twenty-shared/src/testing/EachTestingContextFilter.ts
index 76002c1e08b..00ee5e278ec 100644
--- a/packages/twenty-shared/src/testing/EachTestingContextFilter.ts
+++ b/packages/twenty-shared/src/testing/EachTestingContextFilter.ts
@@ -1,4 +1,4 @@
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
export const eachTestingContextFilter = <T>(
testCases: EachTestingContext<T>[],
diff --git a/packages/twenty-shared/src/testing/index.ts b/packages/twenty-shared/src/testing/index.ts
index 36c26e241dc..310399f547c 100644
--- a/packages/twenty-shared/src/testing/index.ts
+++ b/packages/twenty-shared/src/testing/index.ts
@@ -8,10 +8,6 @@
*/
export { eachTestingContextFilter } from './EachTestingContextFilter';
-export type { EachTestingContext } from './types/EachTestingContext.type';
+export type { EachTestingContext } from './types/EachTestingContext';
export type { SuccessfulAndFailingTestCases } from './types/SuccessfulAndFailingTestCases';
-export type {
- Expect,
- Equal,
- HasAllProperties,
-} from './types/TestingGenerics.type';
+export type { Expect, Equal, HasAllProperties } from './types/TestingGenerics';
diff --git a/packages/twenty-shared/src/testing/types/EachTestingContext.type.ts b/packages/twenty-shared/src/testing/types/EachTestingContext.ts
similarity index 100%
rename from packages/twenty-shared/src/testing/types/EachTestingContext.type.ts
rename to packages/twenty-shared/src/testing/types/EachTestingContext.ts
diff --git a/packages/twenty-shared/src/testing/types/SuccessfulAndFailingTestCases.ts b/packages/twenty-shared/src/testing/types/SuccessfulAndFailingTestCases.ts
index 93c8dc036f5..4469c49aaaa 100644
--- a/packages/twenty-shared/src/testing/types/SuccessfulAndFailingTestCases.ts
+++ b/packages/twenty-shared/src/testing/types/SuccessfulAndFailingTestCases.ts
@@ -1,4 +1,4 @@
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
export type SuccessfulAndFailingTestCases<T> = {
successful: EachTestingContext<T>[];
diff --git a/packages/twenty-shared/src/testing/types/TestingGenerics.type.ts b/packages/twenty-shared/src/testing/types/TestingGenerics.ts
similarity index 100%
rename from packages/twenty-shared/src/testing/types/TestingGenerics.type.ts
rename to packages/twenty-shared/src/testing/types/TestingGenerics.ts
diff --git a/packages/twenty-shared/src/types/AssertUnreachable.type.ts b/packages/twenty-shared/src/types/AssertUnreachable.ts
similarity index 100%
rename from packages/twenty-shared/src/types/AssertUnreachable.type.ts
rename to packages/twenty-shared/src/types/AssertUnreachable.ts
diff --git a/packages/twenty-shared/src/types/EmptyObject.type.ts b/packages/twenty-shared/src/types/EmptyObject.ts
similarity index 100%
rename from packages/twenty-shared/src/types/EmptyObject.type.ts
rename to packages/twenty-shared/src/types/EmptyObject.ts
diff --git a/packages/twenty-shared/src/types/ExtractSerializedRelationProperties.type.ts b/packages/twenty-shared/src/types/ExtractSerializedRelationProperties.ts
similarity index 96%
rename from packages/twenty-shared/src/types/ExtractSerializedRelationProperties.type.ts
rename to packages/twenty-shared/src/types/ExtractSerializedRelationProperties.ts
index 963c50eb5d5..7a86bc53f22 100644
--- a/packages/twenty-shared/src/types/ExtractSerializedRelationProperties.type.ts
+++ b/packages/twenty-shared/src/types/ExtractSerializedRelationProperties.ts
@@ -1,4 +1,4 @@
-import { type IsSerializedRelation } from '@/types/IsSerializedRelation.type';
+import { type IsSerializedRelation } from '@/types/IsSerializedRelation';
export type ExtractSerializedRelationProperties<T> = T extends unknown
? T extends object
diff --git a/packages/twenty-shared/src/types/FieldMetadataSettings.ts b/packages/twenty-shared/src/types/FieldMetadataSettings.ts
index 35e264a6917..12a39225a19 100644
--- a/packages/twenty-shared/src/types/FieldMetadataSettings.ts
+++ b/packages/twenty-shared/src/types/FieldMetadataSettings.ts
@@ -2,9 +2,9 @@ import { type AllowedAddressSubField } from '@/types/AddressFieldsType';
import { type FieldMetadataMultiItemSettings } from '@/types/FieldMetadataMultiItemSettings';
import { type FieldMetadataType } from '@/types/FieldMetadataType';
import { type IsExactly } from '@/types/IsExactly';
-import { type RelationOnDeleteAction } from '@/types/RelationOnDeleteAction.type';
+import { type RelationOnDeleteAction } from '@/types/RelationOnDeleteAction';
import { type RelationType } from '@/types/RelationType';
-import { type SerializedRelation } from '@/types/SerializedRelation.type';
+import { type SerializedRelation } from '@/types/SerializedRelation';
export enum NumberDataType {
FLOAT = 'float',
diff --git a/packages/twenty-shared/src/types/FieldMetadataUniversalSettings.ts b/packages/twenty-shared/src/types/FieldMetadataUniversalSettings.ts
index a3246e3cd62..02c61adebc5 100644
--- a/packages/twenty-shared/src/types/FieldMetadataUniversalSettings.ts
+++ b/packages/twenty-shared/src/types/FieldMetadataUniversalSettings.ts
@@ -1,6 +1,6 @@
import { type FieldMetadataType } from '@/types/FieldMetadataType';
import { type FieldMetadataSettings } from '@/types/FieldMetadataSettings';
-import { type FormatRecordSerializedRelationProperties } from '@/types/FormatRecordSerializedRelationProperties.type';
+import { type FormatRecordSerializedRelationProperties } from '@/types/FormatRecordSerializedRelationProperties';
export type FieldMetadataUniversalSettings<
T extends FieldMetadataType = FieldMetadataType,
diff --git a/packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.type.ts b/packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.ts
similarity index 92%
rename from packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.type.ts
rename to packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.ts
index 6afb0b14208..bfcc0c69f47 100644
--- a/packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.type.ts
+++ b/packages/twenty-shared/src/types/FormatRecordSerializedRelationProperties.ts
@@ -1,6 +1,6 @@
-import { type ExtractSerializedRelationProperties } from '@/types/ExtractSerializedRelationProperties.type';
-import { type IsSerializedRelation } from '@/types/IsSerializedRelation.type';
-import { type RemoveSuffix } from '@/types/RemoveSuffix.type';
+import { type ExtractSerializedRelationProperties } from '@/types/ExtractSerializedRelationProperties';
+import { type IsSerializedRelation } from '@/types/IsSerializedRelation';
+import { type RemoveSuffix } from '@/types/RemoveSuffix';
// Determines if a property should be transformed to a universal identifier
// A property is transformed only if:
diff --git a/packages/twenty-shared/src/types/IndexOf.type.ts b/packages/twenty-shared/src/types/IndexOf.ts
similarity index 100%
rename from packages/twenty-shared/src/types/IndexOf.type.ts
rename to packages/twenty-shared/src/types/IndexOf.ts
diff --git a/packages/twenty-shared/src/types/IsEmptyObject.type.ts b/packages/twenty-shared/src/types/IsEmptyObject.ts
similarity index 100%
rename from packages/twenty-shared/src/types/IsEmptyObject.type.ts
rename to packages/twenty-shared/src/types/IsEmptyObject.ts
diff --git a/packages/twenty-shared/src/types/IsEmptyRecord.type.ts b/packages/twenty-shared/src/types/IsEmptyRecord.ts
similarity index 100%
rename from packages/twenty-shared/src/types/IsEmptyRecord.type.ts
rename to packages/twenty-shared/src/types/IsEmptyRecord.ts
diff --git a/packages/twenty-shared/src/types/IsGreaterOrEqual.type.ts b/packages/twenty-shared/src/types/IsGreaterOrEqual.ts
similarity index 100%
rename from packages/twenty-shared/src/types/IsGreaterOrEqual.type.ts
rename to packages/twenty-shared/src/types/IsGreaterOrEqual.ts
diff --git a/packages/twenty-shared/src/types/IsNever.type.ts b/packages/twenty-shared/src/types/IsNever.ts
similarity index 100%
rename from packages/twenty-shared/src/types/IsNever.type.ts
rename to packages/twenty-shared/src/types/IsNever.ts
diff --git a/packages/twenty-shared/src/types/IsSerializedRelation.type.ts b/packages/twenty-shared/src/types/IsSerializedRelation.ts
similarity index 90%
rename from packages/twenty-shared/src/types/IsSerializedRelation.type.ts
rename to packages/twenty-shared/src/types/IsSerializedRelation.ts
index baf95fdc232..deee183b268 100644
--- a/packages/twenty-shared/src/types/IsSerializedRelation.type.ts
+++ b/packages/twenty-shared/src/types/IsSerializedRelation.ts
@@ -1,4 +1,4 @@
-import { type SERIALIZED_RELATION_BRAND } from '@/types/SerializedRelation.type';
+import { type SERIALIZED_RELATION_BRAND } from '@/types/SerializedRelation';
export type IsSerializedRelation<T> =
typeof SERIALIZED_RELATION_BRAND extends keyof T ? true : false;
diff --git a/packages/twenty-shared/src/types/RelationOnDeleteAction.type.ts b/packages/twenty-shared/src/types/RelationOnDeleteAction.ts
similarity index 100%
rename from packages/twenty-shared/src/types/RelationOnDeleteAction.type.ts
rename to packages/twenty-shared/src/types/RelationOnDeleteAction.ts
diff --git a/packages/twenty-shared/src/types/RemoveSuffix.type.ts b/packages/twenty-shared/src/types/RemoveSuffix.ts
similarity index 100%
rename from packages/twenty-shared/src/types/RemoveSuffix.type.ts
rename to packages/twenty-shared/src/types/RemoveSuffix.ts
diff --git a/packages/twenty-shared/src/types/SerializedRelation.type.ts b/packages/twenty-shared/src/types/SerializedRelation.ts
similarity index 100%
rename from packages/twenty-shared/src/types/SerializedRelation.type.ts
rename to packages/twenty-shared/src/types/SerializedRelation.ts
diff --git a/packages/twenty-shared/src/types/__tests__/extract-serialized-relation-properties.type-test.ts b/packages/twenty-shared/src/types/__tests__/extract-serialized-relation-properties.type-test.ts
index 2c6ca49e141..733e015196b 100644
--- a/packages/twenty-shared/src/types/__tests__/extract-serialized-relation-properties.type-test.ts
+++ b/packages/twenty-shared/src/types/__tests__/extract-serialized-relation-properties.type-test.ts
@@ -1,6 +1,6 @@
import { type Equal, type Expect } from '@/testing';
-import { type ExtractSerializedRelationProperties } from '@/types/ExtractSerializedRelationProperties.type';
-import { type SerializedRelation } from '@/types/SerializedRelation.type';
+import { type ExtractSerializedRelationProperties } from '@/types/ExtractSerializedRelationProperties';
+import { type SerializedRelation } from '@/types/SerializedRelation';
type TestedRecord = {
plainString: string;
diff --git a/packages/twenty-shared/src/types/__tests__/index-of.type-test.ts b/packages/twenty-shared/src/types/__tests__/index-of.type-test.ts
index 4e25dcbeca7..a6c319cb840 100644
--- a/packages/twenty-shared/src/types/__tests__/index-of.type-test.ts
+++ b/packages/twenty-shared/src/types/__tests__/index-of.type-test.ts
@@ -1,6 +1,6 @@
import { type Equal, type Expect } from '@/testing';
-import { type IndexOf } from '@/types/IndexOf.type';
+import { type IndexOf } from '@/types/IndexOf';
type Versions = readonly ['1.20.0', '1.21.0', '1.22.0', '1.23.0'];
diff --git a/packages/twenty-shared/src/types/__tests__/is-greater-or-equal.type-test.ts b/packages/twenty-shared/src/types/__tests__/is-greater-or-equal.type-test.ts
index 9767d95a06f..7fa862c74f5 100644
--- a/packages/twenty-shared/src/types/__tests__/is-greater-or-equal.type-test.ts
+++ b/packages/twenty-shared/src/types/__tests__/is-greater-or-equal.type-test.ts
@@ -1,6 +1,6 @@
import { type Equal, type Expect } from '@/testing';
-import { type IsGreaterOrEqual } from '@/types/IsGreaterOrEqual.type';
+import { type IsGreaterOrEqual } from '@/types/IsGreaterOrEqual';
// oxlint-disable-next-line unused-imports/no-unused-vars
type Assertions = [
diff --git a/packages/twenty-shared/src/types/index.ts b/packages/twenty-shared/src/types/index.ts
index 1d3071051e8..ff648f2ca83 100644
--- a/packages/twenty-shared/src/types/index.ts
+++ b/packages/twenty-shared/src/types/index.ts
@@ -16,7 +16,7 @@ export { AppBasePath } from './AppBasePath';
export { AppPath } from './AppPath';
export type { Arrayable } from './Arrayable';
export type { ArraySortDirection } from './ArraySortDirection';
-export type { AssertUnreachable } from './AssertUnreachable.type';
+export type { AssertUnreachable } from './AssertUnreachable';
export { BlocklistScope } from './BlocklistScope';
export { CalendarChannelContactAutoCreationPolicy } from './CalendarChannelContactAutoCreationPolicy';
export { CalendarChannelSyncStage } from './CalendarChannelSyncStage';
@@ -77,7 +77,7 @@ export { CrudOperationType } from './CrudOperationType';
export type { EmailAttachment } from './EmailAttachment';
export type { EmailConnectionParameters } from './EmailConnectionParameters';
export { EmailOperation } from './EmailOperation';
-export type { EmptyObject } from './EmptyObject.type';
+export type { EmptyObject } from './EmptyObject';
export type {
SnackBarVariant,
EnqueueSnackbarParams,
@@ -87,7 +87,7 @@ export { EventLogTable } from './EventLogTable';
export type { ExcludeFunctions } from './ExcludeFunctions';
export type { ExtractPropertiesThatEndsWithId } from './ExtractPropertiesThatEndsWithId';
export type { ExtractPropertiesThatEndsWithIds } from './ExtractPropertiesThatEndsWithIds';
-export type { ExtractSerializedRelationProperties } from './ExtractSerializedRelationProperties.type';
+export type { ExtractSerializedRelationProperties } from './ExtractSerializedRelationProperties';
export { FeatureFlagKey } from './FeatureFlagKey';
export type {
FieldMetadataDefaultValueFunctionNames,
@@ -146,17 +146,17 @@ export type {
} from './FilterableFieldType';
export { FILTERABLE_FIELD_TYPES } from './FilterableFieldType';
export { FirstDayOfTheWeek } from './FirstDayOfTheWeek';
-export type { FormatRecordSerializedRelationProperties } from './FormatRecordSerializedRelationProperties.type';
+export type { FormatRecordSerializedRelationProperties } from './FormatRecordSerializedRelationProperties';
export type { FromTo } from './FromToType';
export { HTTPMethod } from './HttpMethod';
-export type { IndexOf } from './IndexOf.type';
+export type { IndexOf } from './IndexOf';
export { IndexType } from './IndexType';
-export type { IsEmptyObject } from './IsEmptyObject.type';
-export type { IsEmptyRecord } from './IsEmptyRecord.type';
+export type { IsEmptyObject } from './IsEmptyObject';
+export type { IsEmptyRecord } from './IsEmptyRecord';
export type { IsExactly } from './IsExactly';
-export type { IsGreaterOrEqual } from './IsGreaterOrEqual.type';
-export type { IsNever } from './IsNever.type';
-export type { IsSerializedRelation } from './IsSerializedRelation.type';
+export type { IsGreaterOrEqual } from './IsGreaterOrEqual';
+export type { IsNever } from './IsNever';
+export type { IsSerializedRelation } from './IsSerializedRelation';
export type { LogicFunctionEvent } from './LogicFunctionEvent';
export type { LogicFunctionHttpResponse } from './LogicFunctionResponse';
export {
@@ -300,10 +300,10 @@ export { RecordSharePrincipalType } from './RecordSharePrincipalType';
export { RecordShareRowCause } from './RecordShareRowCause';
export type { RelationAndMorphRelationFieldMetadataType } from './RelationAndMorphRelationFieldMetadataType';
export type { RelationCreationPayload } from './RelationCreationPayload';
-export { RelationOnDeleteAction } from './RelationOnDeleteAction.type';
+export { RelationOnDeleteAction } from './RelationOnDeleteAction';
export { RelationType } from './RelationType';
export type { RelationUpdatePayload } from './RelationUpdatePayload';
-export type { RemoveSuffix } from './RemoveSuffix.type';
+export type { RemoveSuffix } from './RemoveSuffix';
export type { RestrictedFieldPermissions } from './RestrictedFieldPermissions';
export type { RestrictedFieldsPermissions } from './RestrictedFieldsPermissions';
export type { RowLevelPermissionPredicate } from './RowLevelPermissionPredicate';
@@ -314,8 +314,8 @@ export type {
RelationPredicateValue,
RowLevelPermissionPredicateValue,
} from './RowLevelPermissionPredicateValue';
-export type { SerializedRelation } from './SerializedRelation.type';
-export { SERIALIZED_RELATION_BRAND } from './SerializedRelation.type';
+export type { SerializedRelation } from './SerializedRelation';
+export { SERIALIZED_RELATION_BRAND } from './SerializedRelation';
export { ServerFileFolder } from './ServerFileFolder';
export { SettingsPath } from './SettingsPath';
export { SidePanelPages } from './SidePanelPages';
diff --git a/packages/twenty-shared/src/types/page-layout/chart-filter.type.ts b/packages/twenty-shared/src/types/page-layout/chart-filter.type.ts
index b1e7ce8fe49..5469ee333f3 100644
--- a/packages/twenty-shared/src/types/page-layout/chart-filter.type.ts
+++ b/packages/twenty-shared/src/types/page-layout/chart-filter.type.ts
@@ -1,5 +1,5 @@
-import { type FormatRecordSerializedRelationProperties } from '../FormatRecordSerializedRelationProperties.type';
-import { type SerializedRelation } from '../SerializedRelation.type';
+import { type FormatRecordSerializedRelationProperties } from '../FormatRecordSerializedRelationProperties';
+import { type SerializedRelation } from '../SerializedRelation';
export type ChartRecordFilter = {
fieldMetadataId: SerializedRelation;
diff --git a/packages/twenty-shared/src/types/page-layout/page-layout-widget-configuration.type.ts b/packages/twenty-shared/src/types/page-layout/page-layout-widget-configuration.type.ts
index 299d91624b2..731e8161e5c 100644
--- a/packages/twenty-shared/src/types/page-layout/page-layout-widget-configuration.type.ts
+++ b/packages/twenty-shared/src/types/page-layout/page-layout-widget-configuration.type.ts
@@ -1,6 +1,6 @@
import { type AggregateOperations } from '../AggregateOperations';
import { type ObjectRecordGroupByDateGranularity } from '../ObjectRecordGroupByDateGranularity';
-import { type SerializedRelation } from '../SerializedRelation.type';
+import { type SerializedRelation } from '../SerializedRelation';
import { type ChartFilter } from './chart-filter.type';
import { type RatioAggregateConfig } from './ratio-aggregate-config.type';
diff --git a/packages/twenty-shared/src/types/page-layout/page-layout-widget-universal-configuration.type.ts b/packages/twenty-shared/src/types/page-layout/page-layout-widget-universal-configuration.type.ts
index b61e0f2192f..929c618aa80 100644
--- a/packages/twenty-shared/src/types/page-layout/page-layout-widget-universal-configuration.type.ts
+++ b/packages/twenty-shared/src/types/page-layout/page-layout-widget-universal-configuration.type.ts
@@ -1,4 +1,4 @@
-import { type FormatRecordSerializedRelationProperties } from '../FormatRecordSerializedRelationProperties.type';
+import { type FormatRecordSerializedRelationProperties } from '../FormatRecordSerializedRelationProperties';
import { type PageLayoutWidgetConfiguration } from './page-layout-widget-configuration.type';
diff --git a/packages/twenty-shared/src/types/page-layout/ratio-aggregate-config.type.ts b/packages/twenty-shared/src/types/page-layout/ratio-aggregate-config.type.ts
index 25b12824fec..eb02ed28f7c 100644
--- a/packages/twenty-shared/src/types/page-layout/ratio-aggregate-config.type.ts
+++ b/packages/twenty-shared/src/types/page-layout/ratio-aggregate-config.type.ts
@@ -1,4 +1,4 @@
-import { type SerializedRelation } from '../SerializedRelation.type';
+import { type SerializedRelation } from '../SerializedRelation';
export type RatioAggregateConfig = {
fieldMetadataId: SerializedRelation;
diff --git a/packages/twenty-shared/src/utils/__tests__/deepMerge.test.ts b/packages/twenty-shared/src/utils/__tests__/deepMerge.test.ts
index b8ec66030ac..9be3634c375 100644
--- a/packages/twenty-shared/src/utils/__tests__/deepMerge.test.ts
+++ b/packages/twenty-shared/src/utils/__tests__/deepMerge.test.ts
@@ -1,4 +1,4 @@
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
import { deepMerge } from '@/utils';
type DeepMergeTestCase<T extends object> = {
diff --git a/packages/twenty-shared/src/utils/__tests__/from-array-to-unique-key-record.util.test.ts b/packages/twenty-shared/src/utils/__tests__/from-array-to-unique-key-record.util.test.ts
index 55d9f9c7460..d7cd9e2515b 100644
--- a/packages/twenty-shared/src/utils/__tests__/from-array-to-unique-key-record.util.test.ts
+++ b/packages/twenty-shared/src/utils/__tests__/from-array-to-unique-key-record.util.test.ts
@@ -1,4 +1,4 @@
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
import { fromArrayToUniqueKeyRecord } from '@/utils/from-array-to-unique-key-record.util';
type FromArrayToUniqueKeyRecordTestCase = EachTestingContext<{
diff --git a/packages/twenty-shared/src/utils/__tests__/sanitizeObjectStringFields.test.ts b/packages/twenty-shared/src/utils/__tests__/sanitizeObjectStringFields.test.ts
index f4100c4b8f3..592c0bee4e7 100644
--- a/packages/twenty-shared/src/utils/__tests__/sanitizeObjectStringFields.test.ts
+++ b/packages/twenty-shared/src/utils/__tests__/sanitizeObjectStringFields.test.ts
@@ -1,5 +1,5 @@
import { eachTestingContextFilter } from '@/testing';
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
import { extractAndSanitizeObjectStringFields } from '../extractAndSanitizeObjectStringFields';
type TestObject = {
diff --git a/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-object-string-properties.test.ts b/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-object-string-properties.test.ts
index c61e5918cd4..18b462a9ff4 100644
--- a/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-object-string-properties.test.ts
+++ b/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-object-string-properties.test.ts
@@ -1,5 +1,5 @@
import { eachTestingContextFilter } from '@/testing';
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from '../trim-and-remove-duplicated-whitespaces-from-object-string-properties';
type SanitizeObjectStringPropertiesTestCase = EachTestingContext<{
input: Record<string, any>;
diff --git a/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-string.test.ts b/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-string.test.ts
index 9e0b5cb8948..15d5c248f98 100644
--- a/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-string.test.ts
+++ b/packages/twenty-shared/src/utils/__tests__/trim-and-remove-duplicated-whitespaces-from-string.test.ts
@@ -1,4 +1,4 @@
-import { type EachTestingContext } from '@/testing/types/EachTestingContext.type';
+import { type EachTestingContext } from '@/testing/types/EachTestingContext';
import { trimAndRemoveDuplicatedWhitespacesFromString } from '../trim-and-remove-duplicated-whitespaces-from-string';
type TrimAndRemoveWhitespacesTestCase = EachTestingContext<{
diff --git a/packages/twenty-shared/src/workflow/constants/ContentTypeValuesHttpRequest.ts b/packages/twenty-shared/src/workflow/constants/ContentTypeValuesHttpRequest.ts
index eaa80753f74..009f1268b01 100644
--- a/packages/twenty-shared/src/workflow/constants/ContentTypeValuesHttpRequest.ts
+++ b/packages/twenty-shared/src/workflow/constants/ContentTypeValuesHttpRequest.ts
@@ -1,4 +1,4 @@
-import type { BodyType } from '../types/workflowHttpRequestStep';
+import type { BodyType } from '../types/WorkflowHttpRequestStep';
export const CONTENT_TYPE_VALUES_HTTP_REQUEST: Record<BodyType, string> = {
rawJson: 'application/json',
diff --git a/packages/twenty-shared/src/workflow/index.ts b/packages/twenty-shared/src/workflow/index.ts
index 43429754224..159d1b646a6 100644
--- a/packages/twenty-shared/src/workflow/index.ts
+++ b/packages/twenty-shared/src/workflow/index.ts
@@ -124,7 +124,7 @@ export type {
WorkflowClassifyCriterion,
WorkflowClassifyQuestion,
} from './types/WorkflowClassifyQuestion';
-export type { BodyType } from './types/workflowHttpRequestStep';
+export type { BodyType } from './types/WorkflowHttpRequestStep';
export type {
WorkflowRunStepInfo,
WorkflowRunStepInfos,
@@ -163,7 +163,7 @@ export type {
ValidatableWorkflowStep,
ValidatableWorkflowTrigger,
ValidatableWorkflow,
-} from './validation/types/workflow-validation.type';
+} from './validation/types/WorkflowValidation';
export type { WorkflowGraph } from './validation/utils/build-workflow-graph.util';
export { buildWorkflowGraph } from './validation/utils/build-workflow-graph.util';
export { extractVariablesFromInput } from './validation/utils/extract-variables-from-input.util';
@@ -184,7 +184,7 @@ export type {
Leaf,
Node,
BaseOutputSchemaV2,
-} from './workflow-schema/types/base-output-schema.type';
+} from './workflow-schema/types/BaseOutputSchema';
export type {
RecordFieldLeaf,
RecordFieldNode,
@@ -202,7 +202,7 @@ export type {
ManualTriggerOutputSchema,
OutputSchemaV2,
VariableSearchResult,
-} from './workflow-schema/types/output-schema.type';
+} from './workflow-schema/types/OutputSchema';
export { buildManualTriggerMetadataNode } from './workflow-schema/utils/build-manual-trigger-metadata-node';
export { collectOutputSchemaPaths } from './workflow-schema/utils/collect-output-schema-paths';
export type { OutputSchemaPathFailure } from './workflow-schema/utils/find-output-schema-path-failure';
@@ -226,4 +226,4 @@ export type {
GlobalAvailability,
SingleRecordAvailability,
BulkRecordsAvailability,
-} from './workflow-trigger/types/workflow-trigger.type';
+} from './workflow-trigger/types/WorkflowTrigger';
diff --git a/packages/twenty-shared/src/workflow/types/workflowHttpRequestStep.ts b/packages/twenty-shared/src/workflow/types/WorkflowHttpRequestStep.ts
similarity index 100%
rename from packages/twenty-shared/src/workflow/types/workflowHttpRequestStep.ts
rename to packages/twenty-shared/src/workflow/types/WorkflowHttpRequestStep.ts
diff --git a/packages/twenty-shared/src/workflow/validation/__tests__/validate-workflow-structure.util.test.ts b/packages/twenty-shared/src/workflow/validation/__tests__/validate-workflow-structure.util.test.ts
index c010e23a924..7c081acbce7 100644
--- a/packages/twenty-shared/src/workflow/validation/__tests__/validate-workflow-structure.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/__tests__/validate-workflow-structure.util.test.ts
@@ -1,4 +1,4 @@
-import { type ValidatableWorkflow } from '@/workflow/validation/types/workflow-validation.type';
+import { type ValidatableWorkflow } from '@/workflow/validation/types/WorkflowValidation';
import { validateWorkflowStructure } from '../validate-workflow-structure.util';
const getCodes = (workflow: ValidatableWorkflow): string[] => {
diff --git a/packages/twenty-shared/src/workflow/validation/constants/malformed-workflow-validation-issue-codes.constant.ts b/packages/twenty-shared/src/workflow/validation/constants/malformed-workflow-validation-issue-codes.constant.ts
index d9f132dc308..23655893648 100644
--- a/packages/twenty-shared/src/workflow/validation/constants/malformed-workflow-validation-issue-codes.constant.ts
+++ b/packages/twenty-shared/src/workflow/validation/constants/malformed-workflow-validation-issue-codes.constant.ts
@@ -1,4 +1,4 @@
-import { type WorkflowValidationIssueCode } from '@/workflow/validation/types/workflow-validation.type';
+import { type WorkflowValidationIssueCode } from '@/workflow/validation/types/WorkflowValidation';
export const MALFORMED_WORKFLOW_VALIDATION_ISSUE_CODES: ReadonlySet<WorkflowValidationIssueCode> =
new Set([
diff --git a/packages/twenty-shared/src/workflow/validation/constants/non-activable-workflow-validation-issue-codes.constant.ts b/packages/twenty-shared/src/workflow/validation/constants/non-activable-workflow-validation-issue-codes.constant.ts
index ea33c40bc76..e6e8dcec096 100644
--- a/packages/twenty-shared/src/workflow/validation/constants/non-activable-workflow-validation-issue-codes.constant.ts
+++ b/packages/twenty-shared/src/workflow/validation/constants/non-activable-workflow-validation-issue-codes.constant.ts
@@ -1,4 +1,4 @@
-import { type WorkflowValidationIssueCode } from '@/workflow/validation/types/workflow-validation.type';
+import { type WorkflowValidationIssueCode } from '@/workflow/validation/types/WorkflowValidation';
// Issues a well-formed draft may carry while being edited, but that keep it
// from being activated because a run could not proceed through them.
diff --git a/packages/twenty-shared/src/workflow/validation/guards/isIfElseStepInput.ts b/packages/twenty-shared/src/workflow/validation/guards/isIfElseStepInput.ts
index d65db26a30d..389ceb89ac9 100644
--- a/packages/twenty-shared/src/workflow/validation/guards/isIfElseStepInput.ts
+++ b/packages/twenty-shared/src/workflow/validation/guards/isIfElseStepInput.ts
@@ -4,7 +4,7 @@ import { WorkflowActionType } from '@/workflow/types/WorkflowActionType';
import {
type IfElseStepInput,
type ValidatableWorkflowStep,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
export const isIfElseStepInput = (
step: ValidatableWorkflowStep,
diff --git a/packages/twenty-shared/src/workflow/validation/guards/isIteratorStepInput.ts b/packages/twenty-shared/src/workflow/validation/guards/isIteratorStepInput.ts
index 4b3c90bfb4f..b19289c93c2 100644
--- a/packages/twenty-shared/src/workflow/validation/guards/isIteratorStepInput.ts
+++ b/packages/twenty-shared/src/workflow/validation/guards/isIteratorStepInput.ts
@@ -4,7 +4,7 @@ import { WorkflowActionType } from '@/workflow/types/WorkflowActionType';
import {
type IteratorStepInput,
type ValidatableWorkflowStep,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
export const isIteratorStepInput = (
step: ValidatableWorkflowStep,
diff --git a/packages/twenty-shared/src/workflow/validation/types/workflow-validation.type.ts b/packages/twenty-shared/src/workflow/validation/types/WorkflowValidation.ts
similarity index 100%
rename from packages/twenty-shared/src/workflow/validation/types/workflow-validation.type.ts
rename to packages/twenty-shared/src/workflow/validation/types/WorkflowValidation.ts
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/build-workflow-graph.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/build-workflow-graph.util.test.ts
index 0b81d3bc25d..4dd4116abdc 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/build-workflow-graph.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/build-workflow-graph.util.test.ts
@@ -2,7 +2,7 @@ import { TRIGGER_STEP_ID } from '@/workflow/constants/TriggerStepId';
import {
type ValidatableWorkflow,
type ValidatableWorkflowStep,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { buildWorkflowGraph } from '../build-workflow-graph.util';
const buildStep = (
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-step-outgoing-step-ids.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-step-outgoing-step-ids.util.test.ts
index 341e125278d..72fa1f220e9 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-step-outgoing-step-ids.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-step-outgoing-step-ids.util.test.ts
@@ -1,5 +1,5 @@
import { WorkflowActionType } from '@/workflow/types/WorkflowActionType';
-import { type ValidatableWorkflowStep } from '@/workflow/validation/types/workflow-validation.type';
+import { type ValidatableWorkflowStep } from '@/workflow/validation/types/WorkflowValidation';
import {
getStepInput,
getStepOutgoingStepIds,
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-variable-path-suggestions.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-variable-path-suggestions.util.test.ts
index 264cacc0f11..5b42dbcefc4 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-variable-path-suggestions.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/get-variable-path-suggestions.util.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/BaseOutputSchema';
import { getVariablePathSuggestions } from '../get-variable-path-suggestions.util';
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-graph.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-graph.util.test.ts
index 92a60135b41..25d09d1b917 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-graph.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-graph.util.test.ts
@@ -2,7 +2,7 @@ import { WorkflowActionType } from '@/workflow/types/WorkflowActionType';
import {
type ValidatableWorkflow,
type WorkflowValidationIssueCode,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { buildWorkflowGraph } from '../build-workflow-graph.util';
import { validateWorkflowGraph } from '../validate-workflow-graph.util';
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-step-params.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-step-params.util.test.ts
index 17e67740dea..e856675bcfa 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-step-params.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-step-params.util.test.ts
@@ -1,4 +1,4 @@
-import { type ValidatableWorkflow } from '@/workflow/validation/types/workflow-validation.type';
+import { type ValidatableWorkflow } from '@/workflow/validation/types/WorkflowValidation';
import { validateWorkflowStepParams } from '../validate-workflow-step-params.util';
describe('validateWorkflowStepParams', () => {
diff --git a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-variable-references.util.test.ts b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-variable-references.util.test.ts
index db3855adf47..22b8f37a06b 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-variable-references.util.test.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/__tests__/validate-workflow-variable-references.util.test.ts
@@ -2,7 +2,7 @@ import {
type ValidatableWorkflow,
type ValidatableWorkflowStep,
type WorkflowValidationIssueCode,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { buildWorkflowGraph } from '../build-workflow-graph.util';
import { validateWorkflowVariableReferences } from '../validate-workflow-variable-references.util';
diff --git a/packages/twenty-shared/src/workflow/validation/utils/build-workflow-graph.util.ts b/packages/twenty-shared/src/workflow/validation/utils/build-workflow-graph.util.ts
index 085844a0db5..a3d9e55e740 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/build-workflow-graph.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/build-workflow-graph.util.ts
@@ -1,6 +1,6 @@
import { isDefined } from '@/utils';
import { TRIGGER_STEP_ID } from '@/workflow/constants/TriggerStepId';
-import { type ValidatableWorkflow } from '@/workflow/validation/types/workflow-validation.type';
+import { type ValidatableWorkflow } from '@/workflow/validation/types/WorkflowValidation';
import { getStepOutgoingStepIds } from '@/workflow/validation/utils/get-step-outgoing-step-ids.util';
export type WorkflowGraph = {
diff --git a/packages/twenty-shared/src/workflow/validation/utils/get-step-outgoing-step-ids.util.ts b/packages/twenty-shared/src/workflow/validation/utils/get-step-outgoing-step-ids.util.ts
index 4ffadcc7bcd..aa857150cab 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/get-step-outgoing-step-ids.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/get-step-outgoing-step-ids.util.ts
@@ -1,7 +1,7 @@
import { isDefined } from '@/utils';
import { isIfElseStepInput } from '@/workflow/validation/guards/isIfElseStepInput';
import { isIteratorStepInput } from '@/workflow/validation/guards/isIteratorStepInput';
-import { type ValidatableWorkflowStep } from '@/workflow/validation/types/workflow-validation.type';
+import { type ValidatableWorkflowStep } from '@/workflow/validation/types/WorkflowValidation';
import { isObject } from '@sniptt/guards';
export const getStepInput = (
diff --git a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-graph.util.ts b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-graph.util.ts
index 6647fa9db7e..c7f9c00ce82 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-graph.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-graph.util.ts
@@ -6,7 +6,7 @@ import {
type ValidatableWorkflow,
type ValidatableWorkflowStep,
type WorkflowValidationIssue,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { type WorkflowGraph } from '@/workflow/validation/utils/build-workflow-graph.util';
import { getStepInput } from '@/workflow/validation/utils/get-step-outgoing-step-ids.util';
diff --git a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-step-params.util.ts b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-step-params.util.ts
index 808048f1efa..3dc57e97ca6 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-step-params.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-step-params.util.ts
@@ -4,7 +4,7 @@ import { isDefined } from '@/utils';
import {
type ValidatableWorkflow,
type WorkflowValidationIssue,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { type z } from 'zod';
const formatZodPath = (path: PropertyKey[]): string =>
diff --git a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-variable-references.util.ts b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-variable-references.util.ts
index b91e8167d26..ed0f346fa52 100644
--- a/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-variable-references.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/utils/validate-workflow-variable-references.util.ts
@@ -7,7 +7,7 @@ import {
type ValidatableWorkflow,
type ValidatableWorkflowStep,
type WorkflowValidationIssue,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { type WorkflowGraph } from '@/workflow/validation/utils/build-workflow-graph.util';
import { extractVariablesFromInput } from '@/workflow/validation/utils/extract-variables-from-input.util';
import { getVariablePathSuggestions } from '@/workflow/validation/utils/get-variable-path-suggestions.util';
diff --git a/packages/twenty-shared/src/workflow/validation/validate-workflow-structure.util.ts b/packages/twenty-shared/src/workflow/validation/validate-workflow-structure.util.ts
index 22f697f527b..db3793aa1fa 100644
--- a/packages/twenty-shared/src/workflow/validation/validate-workflow-structure.util.ts
+++ b/packages/twenty-shared/src/workflow/validation/validate-workflow-structure.util.ts
@@ -4,7 +4,7 @@ import {
type ValidatableWorkflowStep,
type WorkflowValidationIssue,
type WorkflowValidationResult,
-} from '@/workflow/validation/types/workflow-validation.type';
+} from '@/workflow/validation/types/WorkflowValidation';
import { buildWorkflowGraph } from '@/workflow/validation/utils/build-workflow-graph.util';
import { validateWorkflowGraph } from '@/workflow/validation/utils/validate-workflow-graph.util';
import { validateWorkflowStepParams } from '@/workflow/validation/utils/validate-workflow-step-params.util';
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/guards/isBaseOutputSchemaV2.ts b/packages/twenty-shared/src/workflow/workflow-schema/guards/isBaseOutputSchemaV2.ts
index 0da3afc7234..bb95e61d9f2 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/guards/isBaseOutputSchemaV2.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/guards/isBaseOutputSchemaV2.ts
@@ -1,5 +1,5 @@
import { isDefined } from '@/utils';
-import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/BaseOutputSchema';
import { isBoolean, isObject } from 'class-validator';
export const isBaseOutputSchemaV2 = (
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/index.ts b/packages/twenty-shared/src/workflow/workflow-schema/index.ts
index 5673a3bf9ba..c40a9b81a98 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/index.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/index.ts
@@ -5,7 +5,7 @@ export type {
LeafType,
Node,
NodeType,
-} from './types/base-output-schema.type';
+} from './types/BaseOutputSchema';
export { collectOutputSchemaPaths } from './utils/collect-output-schema-paths';
export {
getCurrentItemSchemaFromFlattenedArrayOutputSchema,
@@ -38,7 +38,7 @@ export type {
RecordNode,
RecordOutputSchemaV2,
VariableSearchResult,
-} from './types/output-schema.type';
+} from './types/OutputSchema';
export {
searchRecordOutputSchema,
searchVariableInOutputSchema,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/types/base-output-schema.type.ts b/packages/twenty-shared/src/workflow/workflow-schema/types/BaseOutputSchema.ts
similarity index 100%
rename from packages/twenty-shared/src/workflow/workflow-schema/types/base-output-schema.type.ts
rename to packages/twenty-shared/src/workflow/workflow-schema/types/BaseOutputSchema.ts
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/types/output-schema.type.ts b/packages/twenty-shared/src/workflow/workflow-schema/types/OutputSchema.ts
similarity index 98%
rename from packages/twenty-shared/src/workflow/workflow-schema/types/output-schema.type.ts
rename to packages/twenty-shared/src/workflow/workflow-schema/types/OutputSchema.ts
index 8ee0de6832e..979d71459fc 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/types/output-schema.type.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/types/OutputSchema.ts
@@ -4,7 +4,7 @@ import {
type BaseOutputSchemaV2,
type Leaf,
type Node,
-} from './base-output-schema.type';
+} from './BaseOutputSchema';
export type RecordFieldLeaf = {
isLeaf: true;
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/collect-output-schema-paths.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/collect-output-schema-paths.test.ts
index 27519d65925..984d04c39f8 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/collect-output-schema-paths.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/collect-output-schema-paths.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
import { collectOutputSchemaPaths } from '../collect-output-schema-paths';
describe('collectOutputSchemaPaths', () => {
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/find-output-schema-path-failure.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/find-output-schema-path-failure.test.ts
index 94c399d3bdc..e233e6bebc8 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/find-output-schema-path-failure.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/find-output-schema-path-failure.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
import { findOutputSchemaPathFailure } from '../find-output-schema-path-failure';
describe('findOutputSchemaPathFailure', () => {
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/flattened-array-output-schema.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/flattened-array-output-schema.test.ts
index cae77485341..9c109c7a262 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/flattened-array-output-schema.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/flattened-array-output-schema.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
import {
getCurrentItemSchemaFromFlattenedArrayOutputSchema,
isFlattenedArrayOutputSchema,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/navigate-output-schema-property.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/navigate-output-schema-property.test.ts
index 5bf7f9b5658..d9a19998f9b 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/navigate-output-schema-property.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/navigate-output-schema-property.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
import { navigateOutputSchemaProperty } from '../navigate-output-schema-property';
describe('navigateOutputSchemaProperty', () => {
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.base.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.base.test.ts
index 3f28abebe1a..6b17567d2b6 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.base.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.base.test.ts
@@ -1,4 +1,4 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
// Pins the dispatcher to a non-record step type so it resolves through the base schema branch
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.code.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.code.test.ts
index be872547bbd..b0a58b6ef3a 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.code.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.code.test.ts
@@ -1,5 +1,5 @@
-import { type BaseOutputSchemaV2 } from '../../types/base-output-schema.type';
-import { type CodeOutputSchema } from '../../types/output-schema.type';
+import { type BaseOutputSchemaV2 } from '../../types/BaseOutputSchema';
+import { type CodeOutputSchema } from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughCodeOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.find-records.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.find-records.test.ts
index 016e62e61b4..58c0deaf754 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.find-records.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.find-records.test.ts
@@ -2,7 +2,7 @@ import { FieldMetadataType } from '@/types/FieldMetadataType';
import {
type FindRecordsOutputSchema,
type RecordOutputSchemaV2,
-} from '../../types/output-schema.type';
+} from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughFindRecordsOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.form.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.form.test.ts
index c7774ea98e0..624ae828aed 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.form.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.form.test.ts
@@ -2,7 +2,7 @@ import { FieldMetadataType } from '@/types/FieldMetadataType';
import {
type FormOutputSchema,
type RecordOutputSchemaV2,
-} from '../../types/output-schema.type';
+} from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughFormOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.iterator.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.iterator.test.ts
index 5c3b600d16e..115c184bbe2 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.iterator.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.iterator.test.ts
@@ -2,7 +2,7 @@ import { FieldMetadataType } from '@/types/FieldMetadataType';
import {
type IteratorOutputSchema,
type RecordOutputSchemaV2,
-} from '../../types/output-schema.type';
+} from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughIteratorOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.manual.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.manual.test.ts
index 20d2d9700e9..b67d4453f89 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.manual.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.manual.test.ts
@@ -1,5 +1,5 @@
import { FieldMetadataType } from '@/types/FieldMetadataType';
-import { type RecordOutputSchemaV2 } from '../../types/output-schema.type';
+import { type RecordOutputSchemaV2 } from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchManualTrigger = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record-event.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record-event.test.ts
index 169ba978fbf..56b0b3a1db8 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record-event.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record-event.test.ts
@@ -1,5 +1,5 @@
import { FieldMetadataType } from '@/types/FieldMetadataType';
-import { type RecordOutputSchemaV2 } from '../../types/output-schema.type';
+import { type RecordOutputSchemaV2 } from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughRecordEventOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record.test.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record.test.ts
index 0b4318f7c26..3e1d971c2b5 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record.test.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/__tests__/search-variable-in-output-schema.record.test.ts
@@ -1,5 +1,5 @@
import { FieldMetadataType } from '@/types/FieldMetadataType';
-import { type RecordOutputSchemaV2 } from '../../types/output-schema.type';
+import { type RecordOutputSchemaV2 } from '../../types/OutputSchema';
import { searchVariableInOutputSchema } from '../search-variable-in-output-schema';
const searchVariableThroughRecordOutputSchema = ({
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/build-manual-trigger-metadata-node.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/build-manual-trigger-metadata-node.ts
index 485fa7337ef..5910f4bc112 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/build-manual-trigger-metadata-node.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/build-manual-trigger-metadata-node.ts
@@ -1,7 +1,7 @@
import { WORKFLOW_TRIGGER_METADATA_LABEL } from '@/workflow/constants/WorkflowTriggerMetadataLabel';
import { WORKFLOW_TRIGGER_METADATA_WORKSPACE_MEMBER_ID_KEY } from '@/workflow/constants/WorkflowTriggerMetadataWorkspaceMemberIdKey';
import { WORKFLOW_TRIGGER_METADATA_WORKSPACE_MEMBER_ID_LABEL } from '@/workflow/constants/WorkflowTriggerMetadataWorkspaceMemberIdLabel';
-import { type Node } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type Node } from '@/workflow/workflow-schema/types/BaseOutputSchema';
export const buildManualTriggerMetadataNode = (): Node => ({
isLeaf: false,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/collect-output-schema-paths.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/collect-output-schema-paths.ts
index 20222f5541a..40d5117aa12 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/collect-output-schema-paths.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/collect-output-schema-paths.ts
@@ -1,6 +1,6 @@
import { isObject } from '@sniptt/guards';
-import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/BaseOutputSchema';
export const collectOutputSchemaPaths = (
schema: BaseOutputSchemaV2,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/find-output-schema-path-failure.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/find-output-schema-path-failure.ts
index 157e4cf694e..e76491490ba 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/find-output-schema-path-failure.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/find-output-schema-path-failure.ts
@@ -1,7 +1,7 @@
import { isObject } from '@sniptt/guards';
import { isDefined } from '@/utils';
-import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '@/workflow/workflow-schema/types/BaseOutputSchema';
export type OutputSchemaPathFailure = {
validPrefix: string[];
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/flattened-array-output-schema.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/flattened-array-output-schema.ts
index f6724f09af0..f32997bf4d6 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/flattened-array-output-schema.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/flattened-array-output-schema.ts
@@ -4,7 +4,7 @@ import {
type BaseOutputSchemaV2,
type Leaf,
type Node,
-} from '../types/base-output-schema.type';
+} from '../types/BaseOutputSchema';
export const isFlattenedArrayOutputSchema = (
schema: BaseOutputSchemaV2 | undefined,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/navigate-output-schema-property.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/navigate-output-schema-property.ts
index bab0b0a251a..59639776ea6 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/navigate-output-schema-property.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/navigate-output-schema-property.ts
@@ -3,7 +3,7 @@ import {
type BaseOutputSchemaV2,
type Leaf,
type Node,
-} from '@/workflow/workflow-schema/types/base-output-schema.type';
+} from '@/workflow/workflow-schema/types/BaseOutputSchema';
export const navigateOutputSchemaProperty = ({
schema,
diff --git a/packages/twenty-shared/src/workflow/workflow-schema/utils/search-variable-in-output-schema.ts b/packages/twenty-shared/src/workflow/workflow-schema/utils/search-variable-in-output-schema.ts
index 26100419b38..28a2f038067 100644
--- a/packages/twenty-shared/src/workflow/workflow-schema/utils/search-variable-in-output-schema.ts
+++ b/packages/twenty-shared/src/workflow/workflow-schema/utils/search-variable-in-output-schema.ts
@@ -4,7 +4,7 @@ import { isObject } from 'class-validator';
import { CAPTURE_ALL_VARIABLE_TAG_INNER_REGEX } from '../../constants/CaptureAllVariableTagInnerRegex';
import { parseVariablePath } from '../../utils/variable-path.util';
-import { type BaseOutputSchemaV2 } from '../types/base-output-schema.type';
+import { type BaseOutputSchemaV2 } from '../types/BaseOutputSchema';
import {
type FieldOutputSchemaV2,
type FindRecordsOutputSchema,
@@ -15,7 +15,7 @@ import {
type RecordFieldNodeValue,
type RecordOutputSchemaV2,
type VariableSearchResult,
-} from '../types/output-schema.type';
+} from '../types/OutputSchema';
import { isFlattenedArrayOutputSchema } from './flattened-array-output-schema';
const EMPTY_RESULT: VariableSearchResult = {
diff --git a/packages/twenty-shared/src/workflow/workflow-trigger/types/workflow-trigger.type.ts b/packages/twenty-shared/src/workflow/workflow-trigger/types/WorkflowTrigger.ts
similarity index 100%
rename from packages/twenty-shared/src/workflow/workflow-trigger/types/workflow-trigger.type.ts
rename to packages/twenty-shared/src/workflow/workflow-trigger/types/WorkflowTrigger.ts