Merge branch 'main' into feat/navbar-customization

2026-02-11 16:15:58 +05:30
parent f530034288 9e21e55db4
commit 4d9b2d15e8
164 changed files with 2037 additions and 3219 deletions
@@ -21,7 +21,6 @@ module.exports = {
    './src/modules/logic-functions/graphql/**/*.{ts,tsx}',

    './src/modules/databases/graphql/**/*.{ts,tsx}',
-    './src/modules/workflow/**/graphql/**/*.{ts,tsx}',
    './src/modules/analytics/graphql/**/*.{ts,tsx}',
    './src/modules/object-metadata/graphql/**/*.{ts,tsx}',
    './src/modules/navigation-menu-item/graphql/**/*.{ts,tsx}',
@@ -32,6 +31,9 @@ module.exports = {

    './src/modules/page-layout/widgets/**/graphql/**/*.{ts,tsx}',

+    './src/modules/dashboards/graphql/**/*.{ts,tsx}',
+    './src/modules/page-layout/graphql/**/*.{ts,tsx}',
+    './src/modules/marketplace/graphql/**/*.{ts,tsx}',
    '!./src/**/*.test.{ts,tsx}',
    '!./src/**/*.stories.{ts,tsx}',
    '!./src/**/__mocks__/*.ts',
@@ -5,23 +5,11 @@ module.exports = {
    (process.env.REACT_APP_SERVER_BASE_URL ?? 'http://localhost:3000') +
    '/graphql',
  documents: [
-    './src/modules/activities/graphql/**/*.{ts,tsx}',
-    './src/modules/companies/graphql/**/*.{ts,tsx}',
-    './src/modules/people/graphql/**/*.{ts,tsx}',
-    './src/modules/opportunities/graphql/**/*.{ts,tsx}',
-
+    './src/modules/workflow/**/graphql/**/*.{ts,tsx}',
+    './src/modules/activities/emails/graphql/**/*.{ts,tsx}',
+    './src/modules/activities/calendar/graphql/**/*.{ts,tsx}',
    './src/modules/search/graphql/**/*.{ts,tsx}',
-    './src/modules/views/graphql/**/*.{ts,tsx}',
-    './src/modules/favorites/graphql/**/*.{ts,tsx}',
-    './src/modules/spreadsheet-import/graphql/**/*.{ts,tsx}',
    './src/modules/command-menu/graphql/**/*.{ts,tsx}',
-    './src/modules/marketplace/graphql/**/*.{ts,tsx}',
-
-    './src/modules/prefetch/graphql/**/*.{ts,tsx}',
-    './src/modules/subscription/graphql/**/*.{ts,tsx}',
-
-    './src/modules/dashboards/graphql/**/*.{ts,tsx}',
-    './src/modules/page-layout/graphql/**/*.{ts,tsx}',

    '!./src/**/*.test.{ts,tsx}',
    '!./src/**/*.stories.{ts,tsx}',
@@ -1,4 +1,4 @@
-import { type ConnectionParameters } from '~/generated/graphql';
+import { type ConnectionParameters } from '~/generated-metadata/graphql';

 export type ImapSmtpCaldavAccount = {
  IMAP?: ConnectionParameters;
@@ -7,6 +7,7 @@ import {
 import { useState } from 'react';

 import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';

@@ -37,6 +38,7 @@ export const useCustomResolver = <
  fetchMoreRecords: () => Promise<void>;
 } => {
  const { enqueueErrorSnackBar } = useSnackBar();
+  const apolloCoreClient = useApolloCoreClient();

  const [page, setPage] = useState({
    pageNumber: 1,
@@ -62,6 +64,7 @@ export const useCustomResolver = <
    loading: firstQueryLoading,
    fetchMore,
  } = useQuery<CustomResolverQueryResult<T>>(query, {
+    client: apolloCoreClient,
    variables: queryVariables,
    onError: (error) => {
      enqueueErrorSnackBar({
@@ -8,7 +8,7 @@ import {
  ANALYTICS_COOKIE_NAME,
  useEventTracker,
 } from '@/analytics/hooks/useEventTracker';
-import { AnalyticsType } from '~/generated/graphql';
+import { AnalyticsType } from '~/generated-metadata/graphql';

 // Mock document.cookie
 Object.defineProperty(document, 'cookie', {
@@ -37,7 +37,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { AppBasePath, AppPath } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
-import { AnalyticsType } from '~/generated/graphql';
+import { AnalyticsType } from '~/generated-metadata/graphql';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 import { useInitializeQueryParamState } from '~/modules/app/hooks/useInitializeQueryParamState';
 import { isMatchingLocation } from '~/utils/isMatchingLocation';
@@ -0,0 +1,113 @@
+import { useCommandMenuUpdateNavigationMorphItemsByPage } from '@/command-menu/hooks/useCommandMenuUpdateNavigationMorphItemsByPage';
+import { commandMenuNavigationMorphItemsByPageState } from '@/command-menu/states/commandMenuNavigationMorphItemsByPageState';
+import { renderHook } from '@testing-library/react';
+import { act } from 'react';
+import { RecoilRoot, useRecoilValue } from 'recoil';
+
+const pageId = 'merge-page-id';
+const objectMetadataId = 'company-metadata-id';
+
+const Wrapper = ({
+  children,
+  initialRecordIds,
+}: {
+  children: React.ReactNode;
+  initialRecordIds: string[];
+}) => (
+  <RecoilRoot
+    initializeState={({ set }) => {
+      set(
+        commandMenuNavigationMorphItemsByPageState,
+        new Map([
+          [
+            pageId,
+            initialRecordIds.map((recordId) => ({
+              objectMetadataId,
+              recordId,
+            })),
+          ],
+        ]),
+      );
+    }}
+  >
+    {children}
+  </RecoilRoot>
+);
+
+const renderHooks = (initialRecordIds: string[]) =>
+  renderHook(
+    () => {
+      const { updateCommandMenuNavigationMorphItemsByPage } =
+        useCommandMenuUpdateNavigationMorphItemsByPage();
+      const commandMenuNavigationMorphItemsByPage = useRecoilValue(
+        commandMenuNavigationMorphItemsByPageState,
+      );
+
+      return {
+        updateCommandMenuNavigationMorphItemsByPage,
+        commandMenuNavigationMorphItemsByPage,
+      };
+    },
+    {
+      wrapper: ({ children }) => (
+        <Wrapper initialRecordIds={initialRecordIds}>{children}</Wrapper>
+      ),
+    },
+  );
+
+describe('useCommandMenuUpdateNavigationMorphItemsByPage', () => {
+  it('should replace existing items for a page instead of appending', async () => {
+    const { result } = renderHooks(['record-1', 'record-2']);
+
+    await act(async () => {
+      await result.current.updateCommandMenuNavigationMorphItemsByPage({
+        pageId,
+        objectMetadataId,
+        objectRecordIds: ['record-2', 'record-1'],
+      });
+    });
+
+    expect(
+      result.current.commandMenuNavigationMorphItemsByPage.get(pageId),
+    ).toEqual([
+      {
+        objectMetadataId,
+        recordId: 'record-2',
+      },
+      {
+        objectMetadataId,
+        recordId: 'record-1',
+      },
+    ]);
+  });
+
+  it('should keep only the latest payload when called twice for the same page', async () => {
+    const { result } = renderHooks([]);
+
+    await act(async () => {
+      await result.current.updateCommandMenuNavigationMorphItemsByPage({
+        pageId,
+        objectMetadataId,
+        objectRecordIds: ['record-1', 'record-2'],
+      });
+      await result.current.updateCommandMenuNavigationMorphItemsByPage({
+        pageId,
+        objectMetadataId,
+        objectRecordIds: ['record-2', 'record-1'],
+      });
+    });
+
+    expect(
+      result.current.commandMenuNavigationMorphItemsByPage.get(pageId),
+    ).toEqual([
+      {
+        objectMetadataId,
+        recordId: 'record-2',
+      },
+      {
+        objectMetadataId,
+        recordId: 'record-1',
+      },
+    ]);
+  });
+});
@@ -1,5 +1,4 @@
 import { commandMenuNavigationMorphItemsByPageState } from '@/command-menu/states/commandMenuNavigationMorphItemsByPageState';
-import { isNonEmptyArray } from '@sniptt/guards';
 import { useRecoilCallback } from 'recoil';

 type UpdateNavigationMorphItemsByPageParams = {
@@ -20,17 +19,10 @@ export const useCommandMenuUpdateNavigationMorphItemsByPage = () => {
          .getLoadable(commandMenuNavigationMorphItemsByPageState)
          .getValue();

-        const currentMorphItemsForPage = currentMorphItems.get(pageId);
-
-        const newMorphItems = [
-          ...(isNonEmptyArray(currentMorphItemsForPage)
-            ? currentMorphItemsForPage
-            : []),
-          ...objectRecordIds.map((recordId) => ({
-            objectMetadataId,
-            recordId,
-          })),
-        ];
+        const newMorphItems = objectRecordIds.map((recordId) => ({
+          objectMetadataId,
+          recordId,
+        }));

        const newMorphItemsMap = new Map(currentMorphItems);
        newMorphItemsMap.set(pageId, newMorphItems);
@@ -1,7 +1,7 @@
 import {
  type UpdatePageLayoutWithTabsInput,
  useUpdatePageLayoutWithTabsAndWidgetsMutation,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 import { useMetadataErrorHandler } from '@/metadata-error-handler/hooks/useMetadataErrorHandler';
 import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';
@@ -1,5 +1,5 @@
 import { type DraftPageLayout } from '@/page-layout/types/DraftPageLayout';
-import { type UpdatePageLayoutWithTabsInput } from '~/generated/graphql';
+import { type UpdatePageLayoutWithTabsInput } from '~/generated-metadata/graphql';

 export const convertPageLayoutDraftToUpdateInput = (
  pageLayoutDraft: DraftPageLayout,
@@ -1,6 +1,6 @@
 import { ACCOUNT_PROTOCOLS } from '@/settings/accounts/constants/AccountProtocols';
 import { z } from 'zod';
-import { type ConnectionParameters } from '~/generated/graphql';
+import { type ConnectionParameters } from '~/generated-metadata/graphql';

 const connectionParameters = z
  .object({
@@ -1,6 +1,7 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRecordSearchRecords';
 import { SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
@@ -8,7 +9,6 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
 import { useLingui } from '@lingui/react/macro';
 import { type ChangeEvent, useState } from 'react';
-import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';

 type SettingsRoleAssignmentWorkspaceMemberPickerDropdownProps = {
  excludedWorkspaceMemberIds: string[];
@@ -1,4 +1,3 @@
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
 import { ADD_QUERY_TO_EVENT_STREAM_MUTATION } from '@/sse-db-event/graphql/mutations/AddQueryToEventStreamMutation';
 import { REMOVE_QUERY_FROM_EVENT_STREAM_MUTATION } from '@/sse-db-event/graphql/mutations/RemoveQueryFromEventStreamMutation';
 import { activeQueryListenersState } from '@/sse-db-event/states/activeQueryListenersState';
@@ -18,22 +17,20 @@ import { useDebouncedCallback } from 'use-debounce';
 import {
  type AddQuerySubscriptionInput,
  type RemoveQueryFromEventStreamInput,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 export const SSEQuerySubscribeEffect = () => {
  const sseEventStreamId = useRecoilValue(sseEventStreamIdState);

-  const apolloCoreClient = useApolloCoreClient();
-
  const [addQueryToEventStream] = useMutation<
    boolean,
    { input: AddQuerySubscriptionInput }
-  >(ADD_QUERY_TO_EVENT_STREAM_MUTATION, { client: apolloCoreClient });
+  >(ADD_QUERY_TO_EVENT_STREAM_MUTATION);

  const [removeQueryFromEventStream] = useMutation<
    void,
    { input: RemoveQueryFromEventStreamInput }
-  >(REMOVE_QUERY_FROM_EVENT_STREAM_MUTATION, { client: apolloCoreClient });
+  >(REMOVE_QUERY_FROM_EVENT_STREAM_MUTATION);

  const requiredQueryListeners = useRecoilValue(requiredQueryListenersState);
  const activeQueryListeners = useRecoilValue(activeQueryListenersState);
@@ -4,7 +4,7 @@ import { useContext, useEffect } from 'react';
 import {
  type Subscription,
  type SubscriptionOnDbEventArgs,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 type OnDbEventArgs = SubscriptionOnDbEventArgs & {
  skip?: boolean;
@@ -27,10 +27,10 @@ import { isDefined } from 'twenty-shared/utils';
 import {
  type WorkspaceMember,
  useFindAllCoreViewsQuery,
+  useFindAllRecordPageLayoutsQuery,
  useGetCurrentUserQuery,
  useGetManyLogicFunctionsQuery,
 } from '~/generated-metadata/graphql';
-import { useFindAllRecordPageLayoutsQuery } from '~/generated/graphql';
 import { dateLocaleState } from '~/localization/states/dateLocaleState';
 import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
@@ -15,7 +15,7 @@ import {
  useCreateCoreViewMutation,
  useDestroyCoreViewMutation,
  ViewType,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 export const usePerformViewAPIPersist = () => {
  const [createCoreViewMutation] = useCreateCoreViewMutation();
@@ -13,7 +13,7 @@ import {
  type CoreView,
  type UpdateCoreViewMutationVariables,
  useUpdateCoreViewMutation,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 export const usePerformViewAPIUpdate = () => {
  const [updateCoreViewMutation] = useUpdateCoreViewMutation();
@@ -17,7 +17,7 @@ import {
  useDeleteCoreViewFieldMutation,
  useDestroyCoreViewFieldMutation,
  useUpdateCoreViewFieldMutation,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';
 export const usePerformViewFieldAPIPersist = () => {
  const { triggerViewFieldOptimisticEffect } =
    useTriggerViewFieldOptimisticEffect();
@@ -17,7 +17,7 @@ import {
  useDeleteCoreViewFilterMutation,
  useDestroyCoreViewFilterMutation,
  useUpdateCoreViewFilterMutation,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 export const usePerformViewFilterAPIPersist = () => {
  const { triggerViewFilterOptimisticEffect } =
@@ -11,7 +11,7 @@ import { isDefined } from 'twenty-shared/utils';
 import {
  type UpdateCoreViewGroupMutationVariables,
  useUpdateCoreViewGroupMutation,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';

 export const usePerformViewGroupAPIPersist = () => {
  const { triggerViewGroupOptimisticEffect } =
@@ -3,7 +3,7 @@ import { coreViewsState } from '@/views/states/coreViewState';
 import { type FetchPolicy, useApolloClient } from '@apollo/client';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { type FindAllCoreViewsQuery } from '~/generated/graphql';
+import { type FindAllCoreViewsQuery } from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';

 export const useRefreshAllCoreViews = (
@@ -12,7 +12,7 @@ import { mapViewFieldToRecordField } from '@/views/utils/mapViewFieldToRecordFie
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 import { useRecoilCallback } from 'recoil';
 import { isDefined, removePropertiesFromRecord } from 'twenty-shared/utils';
-import { useFindManyCoreViewsLazyQuery } from '~/generated/graphql';
+import { useFindManyCoreViewsLazyQuery } from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';

 export const useRefreshCoreViewsByObjectMetadataId = () => {
@@ -9,7 +9,7 @@ import { type ViewField } from '@/views/types/ViewField';
 import {
  type CreateViewFieldInput,
  type UpdateCoreViewFieldMutationVariables,
-} from '~/generated/graphql';
+} from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';

@@ -3,7 +3,7 @@ import { convertViewKeyToCore } from '@/views/utils/convertViewKeyToCore';
 import { convertViewOpenRecordInToCore } from '@/views/utils/convertViewOpenRecordInToCore';
 import { convertViewTypeToCore } from '@/views/utils/convertViewTypeToCore';
 import { isDefined } from 'twenty-shared/utils';
-import { type UpdateViewInput } from '~/generated/graphql';
+import { type UpdateViewInput } from '~/generated-metadata/graphql';

 export const convertUpdateViewInputToCore = (
  view: Partial<GraphQLView & { __typename?: string }>,
@@ -19,7 +19,7 @@ import { isDefined } from 'twenty-shared/utils';
 import {
  type ActivateWorkflowVersionMutation,
  type ActivateWorkflowVersionMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useActivateWorkflowVersion = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -5,7 +5,7 @@ import {
  type ComputeStepOutputSchemaInput,
  type ComputeStepOutputSchemaMutation,
  type ComputeStepOutputSchemaMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useComputeStepOutputSchema = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -4,7 +4,7 @@ import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecord
 import {
  type CreateDraftFromWorkflowVersionInput,
  useCreateDraftFromWorkflowVersionMutation,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useCreateDraftFromWorkflowVersion = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -19,7 +19,7 @@ import { isDefined } from 'twenty-shared/utils';
 import {
  type DeactivateWorkflowVersionMutation,
  type DeactivateWorkflowVersionMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useDeactivateWorkflowVersion = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -24,7 +24,7 @@ import { v4 } from 'uuid';
 import {
  type RunWorkflowVersionMutation,
  type RunWorkflowVersionMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useRunWorkflowVersion = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -2,7 +2,7 @@ import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { dispatchObjectRecordOperationBrowserEvent } from '@/object-record/utils/dispatchObjectRecordOperationBrowserEvent';
-import { useStopWorkflowRunMutation } from '~/generated-metadata/graphql';
+import { useStopWorkflowRunMutation } from '~/generated/graphql';

 export const useStopWorkflowRun = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -3,9 +3,9 @@ import { useMutation } from '@apollo/client';
 import {
  type CreateWorkflowVersionEdgeMutation,
  type CreateWorkflowVersionEdgeMutationVariables,
-} from '~/generated-metadata/graphql';
+  type CreateWorkflowVersionEdgeInput,
+} from '~/generated/graphql';
 import { CREATE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/createWorkflowVersionEdge';
-import { type CreateWorkflowVersionEdgeInput } from '~/generated/graphql';
 import { useUpdateWorkflowVersionCache } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionCache';

 export const useCreateWorkflowVersionEdge = () => {
@@ -5,7 +5,7 @@ import {
  type CreateWorkflowVersionStepInput,
  type CreateWorkflowVersionStepMutation,
  type CreateWorkflowVersionStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';
 import { useUpdateWorkflowVersionCache } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionCache';
 import { flowComponentState } from '@/workflow/states/flowComponentState';
 import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState';
@@ -1,11 +1,11 @@
 import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
 import { useMutation } from '@apollo/client';
-import { type CreateWorkflowVersionEdgeInput } from '~/generated/graphql';
-import { DELETE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/deleteWorkflowVersionEdge';
 import {
+  type CreateWorkflowVersionEdgeInput,
  type DeleteWorkflowVersionEdgeMutation,
  type DeleteWorkflowVersionEdgeMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';
+import { DELETE_WORKFLOW_VERSION_EDGE } from '@/workflow/graphql/mutations/deleteWorkflowVersionEdge';
 import { useUpdateWorkflowVersionCache } from '@/workflow/workflow-steps/hooks/useUpdateWorkflowVersionCache';

 export const useDeleteWorkflowVersionEdge = () => {
@@ -8,7 +8,7 @@ import {
  type DeleteWorkflowVersionStepInput,
  type DeleteWorkflowVersionStepMutation,
  type DeleteWorkflowVersionStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useDeleteWorkflowVersionStep = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -9,7 +9,7 @@ import {
  type DuplicateWorkflowVersionStepInput,
  type DuplicateWorkflowVersionStepMutation,
  type DuplicateWorkflowVersionStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useDuplicateWorkflowVersionStep = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -13,7 +13,7 @@ import {
  type UpdateWorkflowRunStepInput,
  type UpdateWorkflowRunStepMutation,
  type UpdateWorkflowRunStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useUpdateWorkflowRunStep = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -16,7 +16,7 @@ import {
  type UpdateWorkflowVersionStepInput,
  type UpdateWorkflowVersionStepMutation,
  type UpdateWorkflowVersionStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useUpdateWorkflowVersionStep = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -7,7 +7,7 @@ import {
  type SubmitFormStepInput,
  type SubmitFormStepMutation,
  type SubmitFormStepMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 export const useSubmitFormStep = () => {
  const apolloCoreClient = useApolloCoreClient();
@@ -15,7 +15,7 @@ import {
  type TestHttpRequestInput,
  type TestHttpRequestMutation,
  type TestHttpRequestMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 const convertFlatVariablesToNestedContext = (flatVariables: {
  [variablePath: string]: any;
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
 import {
  type UpdateWorkflowVersionPositionsMutation,
  type UpdateWorkflowVersionPositionsMutationVariables,
-} from '~/generated-metadata/graphql';
+} from '~/generated/graphql';

 import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
@@ -1,4 +1,4 @@
-import { useFindManyMarketplaceAppsQuery } from '~/generated/graphql';
+import { useFindManyMarketplaceAppsQuery } from '~/generated-metadata/graphql';
 import { type AvailableApplication } from '~/pages/settings/applications/types/availableApplication';

 export const useMarketplaceApps = () => {
@@ -1,3 +1,18 @@
+diff --git a/dist/interfaces/gql-module-options.interface.d.ts b/dist/interfaces/gql-module-options.interface.d.ts
+index 1234567..abcdefg 100644
+--- a/dist/interfaces/gql-module-options.interface.d.ts
+++ b/dist/interfaces/gql-module-options.interface.d.ts
+@@ -97,6 +97,10 @@ export interface GqlModuleOptions<TDriver extends GraphQLDriver = any> {
+      * Extra static metadata to be loaded into the specification
+      */
+     metadata?: () => Promise<Record<string, any>>;
+    /**
+     * When set, only resolvers decorated with a matching scope will be included in this schema.
+     */
+    resolverSchemaScope?: 'core' | 'metadata';
+ }
+ export interface GqlOptionsFactory<T extends Record<string, any> = GqlModuleOptions> {
+     createGqlOptions(): Promise<Omit<T, 'driver'>> | Omit<T, 'driver'>;
 diff --git a/dist/schema-builder/graphql-schema.factory.js b/dist/schema-builder/graphql-schema.factory.js
 index f349a6e..425815c 100644
 --- a/dist/schema-builder/graphql-schema.factory.js
@@ -39,3 +54,39 @@ index d5423f1..701a3b2 100644
     generateInputTypeDefs(options) {
         const metadata = type_metadata_storage_1.TypeMetadataStorage.getInputTypesMetadata();
         const inputTypeDefs = metadata.map((metadata) => this.inputTypeDefinitionFactory.create(metadata, options));
+diff --git a/dist/services/resolvers-explorer.service.js b/dist/services/resolvers-explorer.service.js
+index 1234567..abcdefg 100644
+--- a/dist/services/resolvers-explorer.service.js
+++ b/dist/services/resolvers-explorer.service.js
+@@ -43,6 +43,15 @@ let ResolversExplorerService = ResolversExplorerService_1 = class ResolversExplo
+     filterResolvers(gqlAdapter, wrapper, moduleRef) {
+         const { instance } = wrapper;
+         if (!instance) {
+             return undefined;
+         }
+        const resolverSchemaScope = this.gqlOptions.resolverSchemaScope;
+        if (resolverSchemaScope && wrapper.metatype) {
+            // Default to 'metadata' for unscoped resolvers (e.g. nestjs-query auto-generated CRUD)
+            // TODO: remove this fallback once nestjs-query is deprecated
+            const scope = Reflect.getMetadata('RESOLVER_SCHEMA_SCOPE', wrapper.metatype) || 'metadata';
+            if (scope !== resolverSchemaScope) {
+                return undefined;
+            }
+        }
+         const prototype = Object.getPrototypeOf(instance);
+@@ -147,5 +154,14 @@ let ResolversExplorerService = ResolversExplorerService_1 = class ResolversExplo
+     getAllCtors() {
+         const modules = this.getModules(this.modulesContainer, this.gqlOptions.include || []);
+         const resolvers = this.flatMap(modules, this.mapToCtor).filter(Boolean);
+-        return resolvers;
+        const resolverSchemaScope = this.gqlOptions.resolverSchemaScope;
+        if (resolverSchemaScope) {
+            return resolvers.filter((ctor) => {
+                // Default to 'metadata' for unscoped resolvers (e.g. nestjs-query auto-generated CRUD)
+                // TODO: remove this fallback once nestjs-query is deprecated
+                const scope = Reflect.getMetadata('RESOLVER_SCHEMA_SCOPE', ctor) || 'metadata';
+                return scope === resolverSchemaScope;
+            });
+        }
+        return resolvers;
+     }
@@ -0,0 +1,28 @@
+# How to patch a dependency
+
+`yarn patch-commit -s` does not work in our monorepo. Use the workflow below instead.
+
+## New patch
+
+```bash
+yarn patch <package-name>
+# Yarn prints a temp folder path — edit files there, then:
+yarn patch-commit <temp-folder> > packages/twenty-server/patches/<package+name+version>.patch
+yarn install --mode update-lockfile && yarn install
+```
+
+Reference the patch in `packages/twenty-server/package.json`:
+
+```
+"<package-name>": "patch:<package-name>@<version>#./patches/<package+name+version>.patch"
+```
+
+## Updating an existing patch
+
+```bash
+yarn patch -u <package-name>   # extract with current patches applied (PATCHED)
+yarn patch <package-name>      # extract clean original (CLEAN)
+# Edit files in PATCHED, then copy them into CLEAN
+yarn patch-commit <CLEAN> > packages/twenty-server/patches/<package+name+version>.patch
+yarn install --mode update-lockfile && yarn install
+```
@@ -0,0 +1 @@
+export const RESOLVER_SCHEMA_SCOPE_KEY = 'RESOLVER_SCHEMA_SCOPE';
@@ -0,0 +1,11 @@
+import { applyDecorators, SetMetadata } from '@nestjs/common';
+import { Resolver } from '@nestjs/graphql';
+
+import { RESOLVER_SCHEMA_SCOPE_KEY } from 'src/engine/api/graphql/graphql-config/constants/resolver-schema-scope-key.constant';
+import { type ResolverSchemaScope } from 'src/engine/api/graphql/graphql-config/types/resolver-schema-scope.type';
+
+export const CoreResolver = (typeFunc?: () => unknown) =>
+  applyDecorators(
+    typeFunc ? Resolver(typeFunc) : Resolver(),
+    SetMetadata(RESOLVER_SCHEMA_SCOPE_KEY, 'core' as ResolverSchemaScope),
+  );
@@ -0,0 +1,11 @@
+import { applyDecorators, SetMetadata } from '@nestjs/common';
+import { Resolver } from '@nestjs/graphql';
+
+import { RESOLVER_SCHEMA_SCOPE_KEY } from 'src/engine/api/graphql/graphql-config/constants/resolver-schema-scope-key.constant';
+import { type ResolverSchemaScope } from 'src/engine/api/graphql/graphql-config/types/resolver-schema-scope.type';
+
+export const MetadataResolver = (typeFunc?: () => unknown) =>
+  applyDecorators(
+    typeFunc ? Resolver(typeFunc) : Resolver(),
+    SetMetadata(RESOLVER_SCHEMA_SCOPE_KEY, 'metadata' as ResolverSchemaScope),
+  );
@@ -19,17 +19,6 @@ import { isDefined } from 'twenty-shared/utils';
 import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';

 import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
-import {
-  ApiConfig,
-  Billing,
-  Captcha,
-  ClientAIModelConfig,
-  NativeModelCapabilities,
-  PublicFeatureFlag,
-  PublicFeatureFlagMetadata,
-  Sentry as SentryConfig,
-  Support,
-} from 'src/engine/core-modules/client-config/client-config.entity';
 import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
 import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 import { useSentryTracing } from 'src/engine/core-modules/exception-handler/hooks/use-sentry-tracing';
@@ -93,19 +82,8 @@ export class GraphQLConfigService
    const config: YogaDriverConfig = {
      autoSchemaFile: true,
      include: [CoreEngineModule],
-      buildSchemaOptions: {
-        orphanedTypes: [
-          ApiConfig,
-          Billing,
-          Captcha,
-          ClientAIModelConfig,
-          NativeModelCapabilities,
-          PublicFeatureFlag,
-          PublicFeatureFlagMetadata,
-          SentryConfig,
-          Support,
-        ],
-      },
+      resolverSchemaScope: 'core',
+      buildSchemaOptions: {},
      conditionalSchema: async (context) => {
        const { workspace, user } = context.req;

@@ -0,0 +1 @@
+export type ResolverSchemaScope = 'core' | 'metadata';
@@ -27,6 +27,7 @@ export const metadataModuleFactory = async (
  const config: YogaDriverConfig = {
    autoSchemaFile: true,
    include: [MetadataGraphQLApiModule],
+    resolverSchemaScope: 'metadata',
    renderGraphiQL() {
      return renderApolloPlayground({ path: 'metadata' });
    },
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Int, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Int, Mutation, Query } from '@nestjs/graphql';

 import GraphQLJSON from 'graphql-type-json';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -30,6 +30,7 @@ import { type MessageQueue } from 'src/engine/core-modules/message-queue/message
 import { type ConfigVariables } from 'src/engine/core-modules/twenty-config/config-variables';
 import { ConfigVariableGraphqlApiExceptionFilter } from 'src/engine/core-modules/twenty-config/filters/config-variable-graphql-api-exception.filter';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
 import { ServerLevelImpersonateGuard } from 'src/engine/guards/server-level-impersonate.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -40,7 +41,7 @@ import { AdminPanelHealthServiceDataDTO } from './dtos/admin-panel-health-servic
 import { QueueMetricsDataDTO } from './dtos/queue-metrics-data.dto';

@UsePipes(ResolverValidationPipe)
-@Resolver()
+@MetadataResolver()
@UseFilters(
  AuthGraphqlApiExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -1,12 +1,5 @@
 import { UseGuards } from '@nestjs/common';
-import {
-  Args,
-  Mutation,
-  Parent,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';

 import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -24,6 +17,7 @@ import {
 import { apiKeyGraphqlApiExceptionHandler } from 'src/engine/core-modules/api-key/utils/api-key-graphql-api-exception-handler.util';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
@@ -31,7 +25,7 @@ import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
 import { ApiKeyRoleService } from './services/api-key-role.service';
 import { ApiKeyService } from './services/api-key.service';

-@Resolver(() => ApiKeyEntity)
+@MetadataResolver(() => ApiKeyEntity)
@UseGuards(
  WorkspaceAuthGuard,
  SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
@@ -4,7 +4,7 @@ import {
  UseInterceptors,
  UsePipes,
 } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -31,6 +31,7 @@ import { FileDTO } from 'src/engine/core-modules/file/dtos/file.dto';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -45,7 +46,7 @@ import { CreateApplicationInput } from 'src/engine/core-modules/application/dtos
  SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
 )
@UsePipes(ResolverValidationPipe)
-@Resolver()
+@MetadataResolver()
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(ApplicationExceptionFilter)
 export class ApplicationResolver {
@@ -1,16 +1,17 @@
 import { UseGuards } from '@nestjs/common';
-import { Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

 import { MarketplaceAppDTO } from 'src/engine/core-modules/application/dtos/marketplace-app.dto';
 import { MarketplaceService } from 'src/engine/core-modules/application/services/marketplace.service';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';

-@Resolver()
+@MetadataResolver()
@UseGuards(UserAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
 export class MarketplaceResolver {
  constructor(private readonly marketplaceService: MarketplaceService) {}
@@ -1,11 +1,5 @@
 import { UseFilters, UseGuards } from '@nestjs/common';
-import {
-  Args,
-  Mutation,
-  Parent,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Mutation, Parent, ResolveField } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

@@ -16,6 +10,7 @@ import { ApplicationVariableEntityDTO } from 'src/engine/core-modules/applicatio
 import { UpdateApplicationVariableEntityInput } from 'src/engine/core-modules/applicationVariable/dtos/update-application-variable.input';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';

@@ -23,7 +18,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
  WorkspaceAuthGuard,
  SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
 )
-@Resolver(() => ApplicationVariableEntityDTO)
+@MetadataResolver(() => ApplicationVariableEntityDTO)
@UseFilters(ApplicationVariableEntityExceptionFilter)
 export class ApplicationVariableEntityResolver {
  constructor(
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

@@ -15,6 +15,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
@@ -30,7 +31,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
  ApprovedAccessDomainExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
 )
-@Resolver()
+@MetadataResolver()
 export class ApprovedAccessDomainResolver {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { AuditExceptionFilter } from 'src/engine/core-modules/audit/audit-exception-filter';
 import {
@@ -12,6 +12,7 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
 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';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -24,7 +25,7 @@ import {
 } from './dtos/create-analytics.input';
 import { AuditService } from './services/audit.service';

-@Resolver(() => Analytics)
+@MetadataResolver(() => Analytics)
@UsePipes(ResolverValidationPipe)
@UseFilters(AuditExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)
 export class AuditResolver {
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Context, Mutation, Query } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';

 import omit from 'lodash.omit';
@@ -70,6 +70,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthProvider } from 'src/engine/decorators/auth/auth-provider.decorator';
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -91,7 +92,7 @@ import { WorkspaceInviteHashValidInput } from './dto/workspace-invite-hash.input
 import { AuthService } from './services/auth.service';

@UsePipes(ResolverValidationPipe)
-@Resolver()
+@MetadataResolver()
@UseFilters(
  CaptchaGraphqlApiExceptionFilter,
  AuthGraphqlApiExceptionFilter,
@@ -1,7 +1,7 @@
 /* @license Enterprise */

 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';
 import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
@@ -46,8 +46,9 @@ import {
 } from 'src/engine/metadata-modules/permissions/permissions.exception';
 import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';

-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(
  PermissionsGraphqlApiExceptionFilter,
@@ -1,5 +1,5 @@
 import { UseGuards } from '@nestjs/common';
-import { Args, ArgsType, Field, Int, Query, Resolver } from '@nestjs/graphql';
+import { Args, ArgsType, Field, Int, Query } from '@nestjs/graphql';

 import { Max } from 'class-validator';

@@ -9,6 +9,7 @@ import { TimelineCalendarEventsWithTotalDTO } from 'src/engine/core-modules/cale
 import { TimelineCalendarEventService } from 'src/engine/core-modules/calendar/timeline-calendar-event.service';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -53,7 +54,7 @@ class GetTimelineCalendarEventsFromOpportunityIdArgs {
 }

@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
-@Resolver(() => TimelineCalendarEventsWithTotalDTO)
+@CoreResolver(() => TimelineCalendarEventsWithTotalDTO)
 export class TimelineCalendarEventResolver {
  constructor(
    private readonly timelineCalendarEventService: TimelineCalendarEventService,
@@ -53,13 +53,11 @@ import { TelemetryModule } from 'src/engine/core-modules/telemetry/telemetry.mod
 import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 import { UserModule } from 'src/engine/core-modules/user/user.module';
-import { WebhookModule } from 'src/engine/metadata-modules/webhook/webhook.module';
 import { WorkflowApiModule } from 'src/engine/core-modules/workflow/workflow-api.module';
 import { WorkspaceInvitationModule } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.module';
 import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
 import { AiModelsModule } from 'src/engine/metadata-modules/ai/ai-models/ai-models.module';
-import { FlatPageLayoutTabModule } from 'src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module';
 import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module';
 import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
 import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';
@@ -154,13 +152,10 @@ import { FileModule } from './file/file.module';
    }),
    SearchModule,
    ApiKeyModule,
-    WebhookModule,
    PageLayoutModule,
-    FlatPageLayoutTabModule,
    ImpersonationModule,
    TrashCleanupModule,
    DashboardModule,
-    RowLevelPermissionModule,
    EventLogsModule,
  ],
  exports: [
@@ -1,7 +1,8 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Context, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Context, Mutation } from '@nestjs/graphql';

 import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { ResendEmailVerificationTokenInput } from 'src/engine/core-modules/email-verification/dtos/resend-email-verification-token.input';
 import { ResendEmailVerificationTokenOutput } from 'src/engine/core-modules/email-verification/dtos/resend-email-verification-token.output';
 import { EmailVerificationExceptionFilter } from 'src/engine/core-modules/email-verification/email-verification-exception-filter.util';
@@ -12,7 +13,7 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typ
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';

-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(
  EmailVerificationExceptionFilter,
@@ -1,8 +1,9 @@
 import { UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { EmailingDomainDriver } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain';
 import { EmailingDomainDto } from 'src/engine/core-modules/emailing-domain/dtos/emailing-domain.dto';
 import { EmailingDomainService } from 'src/engine/core-modules/emailing-domain/services/emailing-domain.service';
@@ -17,7 +18,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
  SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
 )
@UsePipes(ResolverValidationPipe)
-@Resolver(() => EmailingDomainDto)
+@MetadataResolver(() => EmailingDomainDto)
 export class EmailingDomainResolver {
  constructor(private readonly emailingDomainService: EmailingDomainService) {}

@@ -1,10 +1,11 @@
 /* @license Enterprise */

 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Args, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
 import { EnterpriseFeaturesEnabledGuard } from 'src/engine/core-modules/auth/guards/enterprise-features-enabled.guard';
 import { EventLogsGraphqlApiExceptionFilter } from 'src/engine/core-modules/event-logs/filters/event-logs-graphql-api-exception.filter';
@@ -22,7 +23,7 @@ import { EventLogsService } from './event-logs.service';
 import { EventLogQueryInput } from './dtos/event-log-query.input';
 import { EventLogQueryResult } from './dtos/event-log-result.output';

-@Resolver()
+@MetadataResolver()
@UseFilters(
  ForbiddenExceptionGraphqlFilter,
  AuthGraphqlApiExceptionFilter,
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -15,12 +15,13 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';

@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
-@Resolver()
+@MetadataResolver()
 export class FileUploadResolver {
  constructor(private readonly fileUploadService: FileUploadService) {}

@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -14,12 +14,13 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';

@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
-@Resolver()
+@MetadataResolver()
 export class FilesFieldResolver {
  constructor(private readonly filesFieldService: FilesFieldService) {}

@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -15,12 +15,13 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';

@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
-@Resolver()
+@MetadataResolver()
 export class FileResolver {
  constructor(private readonly fileMetadataService: FileMetadataService) {}

@@ -1,13 +1,14 @@
 import { UseGuards } from '@nestjs/common';
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Args, Query } from '@nestjs/graphql';

 import { AutocompleteResultDTO } from 'src/engine/core-modules/geo-map/dtos/autocomplete-result.dto';
 import { PlaceDetailsResultDTO } from 'src/engine/core-modules/geo-map/dtos/place-details-result.dto';
 import { GeoMapService } from 'src/engine/core-modules/geo-map/services/geo-map.service';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';

-@Resolver()
+@MetadataResolver()
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
 export class GeoMapResolver {
  constructor(private readonly geoMapService: GeoMapService) {}
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';
 import { isDefined } from 'twenty-shared/utils';
@@ -18,9 +18,10 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/services/imap-smtp-caldav-apis.service';

-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)
@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
@@ -1,5 +1,5 @@
 import { UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { ImpersonateInput } from 'src/engine/core-modules/admin-panel/dtos/impersonate.input';
 import { ImpersonateOutput } from 'src/engine/core-modules/admin-panel/dtos/impersonate.output';
@@ -14,9 +14,10 @@ import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard
 import { ImpersonatePermissionGuard } from 'src/engine/guards/impersonate-permission.guard';
 import { NoImpersonationGuard } from 'src/engine/guards/no-impersonation.guard';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';

-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
 export class ImpersonationResolver {
  constructor(private readonly impersonationService: ImpersonationService) {}
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

@@ -15,9 +15,10 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';

-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(
  AuthGraphqlApiExceptionFilter,
@@ -1,16 +1,9 @@
 import { UseGuards } from '@nestjs/common';
-import {
-  Args,
-  ArgsType,
-  Field,
-  Int,
-  Mutation,
-  Query,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, ArgsType, Field, Int, Mutation, Query } from '@nestjs/graphql';

 import { Max } from 'class-validator';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { TIMELINE_THREADS_MAX_PAGE_SIZE } from 'src/engine/core-modules/messaging/constants/messaging.constants';
 import { DismissReconnectAccountBannerInput } from 'src/engine/core-modules/messaging/dtos/dismiss-reconnect-account-banner.input';
@@ -66,7 +59,7 @@ class GetTimelineThreadsFromOpportunityIdArgs {
 }

@UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)
-@Resolver(() => TimelineThreadsWithTotalDTO)
+@CoreResolver(() => TimelineThreadsWithTotalDTO)
 export class TimelineMessagingResolver {
  constructor(
    private readonly getMessagesFromPersonIdsService: GetMessagesService,
@@ -1,6 +1,7 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Mutation, Resolver } from '@nestjs/graphql';
+import { Mutation } from '@nestjs/graphql';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { OnboardingStepSuccessDTO } from 'src/engine/core-modules/onboarding/dtos/onboarding-step-success.dto';
@@ -16,7 +17,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
-@Resolver()
+@MetadataResolver()
 export class OnboardingResolver {
  constructor(private readonly onboardingService: OnboardingService) {}

@@ -1,8 +1,9 @@
 import { UseGuards } from '@nestjs/common';
-import { Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { PostgresCredentialsDTO } from 'src/engine/core-modules/postgres-credentials/dtos/postgres-credentials.dto';
 import { PostgresCredentialsService } from 'src/engine/core-modules/postgres-credentials/postgres-credentials.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -14,7 +15,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
  WorkspaceAuthGuard,
  SettingsPermissionGuard(PermissionFlagType.DATA_MODEL),
 )
-@Resolver(() => PostgresCredentialsDTO)
+@MetadataResolver(() => PostgresCredentialsDTO)
 export class PostgresCredentialsResolver {
  constructor(
    private readonly postgresCredentialsService: PostgresCredentialsService,
@@ -1,11 +1,12 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';

 import { assertIsDefinedOrThrow } from 'twenty-shared/utils';
 import { Repository } from 'typeorm';
 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { DomainValidRecords } from 'src/engine/core-modules/dns-manager/dtos/domain-valid-records';
 import { DnsManagerService } from 'src/engine/core-modules/dns-manager/services/dns-manager.service';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
@@ -33,7 +34,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
  PublicDomainExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
 )
-@Resolver()
+@MetadataResolver()
 export class PublicDomainResolver {
  constructor(
    @InjectRepository(PublicDomainEntity)
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Args, Query } from '@nestjs/graphql';

 import { isDefined } from 'twenty-shared/utils';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
 import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
@@ -21,7 +22,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
 import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
 import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';

-@Resolver()
+@CoreResolver()
@UseFilters(SearchApiExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)
@UsePipes(ResolverValidationPipe)
@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
@@ -1,10 +1,11 @@
 /* @license Enterprise */

 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { EnterpriseFeaturesEnabledGuard } from 'src/engine/core-modules/auth/guards/enterprise-features-enabled.guard';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
@@ -26,7 +27,7 @@ import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.g
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';

-@Resolver()
+@MetadataResolver()
@UseFilters(
  PermissionsGraphqlApiExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -1,8 +1,9 @@
 import { UseGuards } from '@nestjs/common';
-import { Field, ObjectType, Query, Resolver } from '@nestjs/graphql';
+import { Field, ObjectType, Query } from '@nestjs/graphql';

 import graphqlTypeJson from 'graphql-type-json';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';
 import { UserEntity } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -31,7 +32,7 @@ export class ToolIndexEntryDTO {
  inputSchema?: object;
 }

-@Resolver()
+@MetadataResolver()
@UseGuards(WorkspaceAuthGuard)
 export class ToolIndexResolver {
  constructor(
@@ -1,10 +1,11 @@
 import { UseFilters, UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';

 import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
 import { Repository } from 'typeorm';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import {
  AuthException,
  AuthExceptionCode,
@@ -34,7 +35,7 @@ import { VerifyTwoFactorAuthenticationMethodInput } from './dto/verify-two-facto
 import { VerifyTwoFactorAuthenticationMethodOutput } from './dto/verify-two-factor-authentication-method.output';
 import { TwoFactorAuthenticationMethodEntity } from './entities/two-factor-authentication-method.entity';

-@Resolver()
+@MetadataResolver()
@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)
 export class TwoFactorAuthenticationResolver {
  constructor(
@@ -1,11 +1,12 @@
 import { UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { FileFolder } from 'twenty-shared/types';

 import type { FileUpload } from 'graphql-upload/processRequest.mjs';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SignedFileDTO } from 'src/engine/core-modules/file/file-upload/dtos/signed-file.dto';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { UploadProfilePicturePermissionGuard } from 'src/engine/core-modules/user-workspace/guards/upload-profile-picture-permission.guard';
@@ -14,7 +15,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';

-@Resolver()
+@MetadataResolver()
 export class UserWorkspaceResolver {
  constructor(private readonly fileUploadService: FileUploadService) {}

@@ -1,12 +1,5 @@
 import { BadRequestException, UseFilters, UseGuards } from '@nestjs/common';
-import {
-  Args,
-  Mutation,
-  Parent,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';

 import crypto from 'crypto';
@@ -20,6 +13,7 @@ import { In, Repository } from 'typeorm';

 import { SupportDriver } from 'src/engine/core-modules/twenty-config/interfaces/support.interface';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
 import {
  AuthException,
@@ -81,7 +75,7 @@ const getHMACKey = (email?: string, key?: string | null) => {
  return hmac.update(email).digest('hex');
 };

-@Resolver(() => UserEntity)
+@MetadataResolver(() => UserEntity)
@UseFilters(PermissionsGraphqlApiExceptionFilter)
 export class UserResolver {
  constructor(
@@ -1,9 +1,10 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import graphqlTypeJson from 'graphql-type-json';
 import { PermissionFlagType } from 'twenty-shared/constants';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { ComputeStepOutputSchemaInput } from 'src/engine/core-modules/workflow/dtos/compute-step-output-schema-input.dto';
@@ -17,7 +18,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
 import { type OutputSchema } from 'src/modules/workflow/workflow-builder/workflow-schema/types/output-schema.type';
 import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';

-@Resolver()
+@CoreResolver()
@UseGuards(
  WorkspaceAuthGuard,
  UserAuthGuard,
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { buildCreatedByFromFullNameMetadata } from 'src/engine/core-modules/actor/utils/build-created-by-from-full-name-metadata.util';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
@@ -24,7 +25,7 @@ import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system
 import { WorkflowTriggerWorkspaceService } from 'src/modules/workflow/workflow-trigger/workspace-services/workflow-trigger.workspace-service';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

-@Resolver()
+@CoreResolver()
@UseGuards(
  WorkspaceAuthGuard,
  UserAuthGuard,
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { CreateWorkflowVersionEdgeInput } from 'src/engine/core-modules/workflow/dtos/create-workflow-version-edge-input.dto';
@@ -16,7 +17,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
 import { WorkflowVersionEdgeWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service';

-@Resolver()
+@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
  WorkspaceAuthGuard,
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
@@ -30,7 +31,7 @@ import { WorkflowActionType } from 'src/modules/workflow/workflow-executor/workf
 import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';
 import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';

-@Resolver()
+@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
  WorkspaceAuthGuard,
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { CreateDraftFromWorkflowVersionInput } from 'src/engine/core-modules/workflow/dtos/create-draft-from-workflow-version-input.dto';
@@ -17,7 +18,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
 import { WorkflowVersionWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service';

-@Resolver()
+@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
  WorkspaceAuthGuard,
@@ -1,8 +1,9 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { UserEntity } from 'src/engine/core-modules/user/user.entity';
@@ -31,7 +32,7 @@ import { SendInvitationsInput } from './dtos/send-invitations.input';
  PermissionsGraphqlApiExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
 )
-@Resolver()
+@MetadataResolver()
 export class WorkspaceInvitationResolver {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
@@ -5,14 +5,7 @@ import {
  UsePipes,
  createParamDecorator,
 } from '@nestjs/common';
-import {
-  Args,
-  Mutation,
-  Parent,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';

 import assert from 'assert';

@@ -78,6 +71,7 @@ import { RoleService } from 'src/engine/metadata-modules/role/role.service';
 import { fromRoleEntityToRoleDto } from 'src/engine/metadata-modules/role/utils/fromRoleEntityToRoleDto.util';
 import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
 import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { getRequest } from 'src/utils/extract-request';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';
 const OriginHeader = createParamDecorator(
@@ -88,7 +82,7 @@ const OriginHeader = createParamDecorator(
  },
 );

-@Resolver(() => WorkspaceEntity)
+@MetadataResolver(() => WorkspaceEntity)
@UsePipes(ResolverValidationPipe)
@UseFilters(
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -1,5 +1,5 @@
 import { Logger, UseGuards } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';

 import { msg } from '@lingui/core/macro';
@@ -14,6 +14,7 @@ import { MessageQueueService } from 'src/engine/core-modules/message-queue/servi
 import { type 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';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { AgentTurnDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto';
@@ -24,7 +25,7 @@ import { AgentTurnGraderService } from 'src/engine/metadata-modules/ai/ai-agent-
 import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';

@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
-@Resolver()
+@MetadataResolver()
 export class AgentTurnResolver {
  private readonly logger = new Logger(AgentTurnResolver.name);

@@ -1,11 +1,12 @@
 import { UseGuards, UseInterceptors } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import {
  FeatureFlagGuard,
  RequireFeatureFlag,
@@ -32,7 +33,7 @@ import { AgentGraphqlApiExceptionInterceptor } from './interceptors/agent-graphq
  WorkspaceMigrationGraphqlApiExceptionInterceptor,
  AgentGraphqlApiExceptionInterceptor,
 )
-@Resolver()
+@MetadataResolver()
 export class AgentResolver {
  constructor(private readonly agentService: AgentService) {}

@@ -6,7 +6,6 @@ import {
  Parent,
  Query,
  ResolveField,
-  Resolver,
 } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -17,6 +16,7 @@ import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/featu
 import { type 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';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import {
  FeatureFlagGuard,
  RequireFeatureFlag,
@@ -35,7 +35,7 @@ import { SystemPromptBuilderService } from 'src/engine/metadata-modules/ai/ai-ch
  FeatureFlagGuard,
  SettingsPermissionGuard(PermissionFlagType.AI),
 )
-@Resolver(() => AgentChatThreadDTO)
+@MetadataResolver(() => AgentChatThreadDTO)
 export class AgentChatResolver {
  constructor(
    private readonly agentChatService: AgentChatService,
@@ -1,12 +1,5 @@
 import { UseGuards, UseInterceptors } from '@nestjs/common';
-import {
-  Args,
-  Mutation,
-  Parent,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';

 import { isDefined } from 'twenty-shared/utils';

@@ -14,6 +7,7 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import {
  FeatureFlagGuard,
  RequireFeatureFlag,
@@ -34,7 +28,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
  WorkspaceMigrationGraphqlApiExceptionInterceptor,
  CommandMenuItemGraphqlApiExceptionInterceptor,
 )
-@Resolver(() => CommandMenuItemDTO)
+@MetadataResolver(() => CommandMenuItemDTO)
 export class CommandMenuItemResolver {
  constructor(
    private readonly commandMenuItemService: CommandMenuItemService,
@@ -1,12 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import {
-  Args,
-  Context,
-  Mutation,
-  Parent,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Context, Mutation, Parent, ResolveField } from '@nestjs/graphql';

 import { isDefined } from 'twenty-shared/utils';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -19,6 +12,7 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typ
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { CreateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
@@ -33,7 +27,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module

@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
-@Resolver(() => FieldMetadataDTO)
+@MetadataResolver(() => FieldMetadataDTO)
@UseFilters(
  PermissionsGraphqlApiExceptionFilter,
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -1,11 +1,12 @@
 import { UseGuards, UseInterceptors } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -22,7 +23,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
  WorkspaceMigrationGraphqlApiExceptionInterceptor,
  FrontComponentGraphqlApiExceptionInterceptor,
 )
-@Resolver(() => FrontComponentDTO)
+@MetadataResolver(() => FrontComponentDTO)
 export class FrontComponentResolver {
  constructor(private readonly frontComponentService: FrontComponentService) {}

@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Context, Parent, ResolveField, Resolver } from '@nestjs/graphql';
+import { Context, Parent, ResolveField } from '@nestjs/graphql';

 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
@@ -8,6 +8,7 @@ import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-contex
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { IndexFieldMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto';
 import { IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';
@@ -15,7 +16,7 @@ import { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-mo
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';

@UseGuards(WorkspaceAuthGuard)
-@Resolver(() => IndexMetadataDTO)
+@MetadataResolver(() => IndexMetadataDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -1,5 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver, Subscription } from '@nestjs/graphql';
+import { Args, Mutation, Query, Subscription } from '@nestjs/graphql';

 import graphqlTypeJson from 'graphql-type-json';
 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -9,6 +9,7 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -30,7 +31,7 @@ import { SubscriptionService } from 'src/engine/subscriptions/subscription.servi
  FeatureFlagGuard,
  SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
 )
-@Resolver()
+@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
 export class LogicFunctionResolver {
@@ -6,7 +6,6 @@ import {
  Parent,
  Query,
  ResolveField,
-  Resolver,
 } from '@nestjs/graphql';

 import { isDefined } from 'twenty-shared/utils';
@@ -19,6 +18,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
 import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';
 import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { CreateNavigationMenuItemInput } from 'src/engine/metadata-modules/navigation-menu-item/dtos/create-navigation-menu-item.input';
@@ -34,7 +34,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
  WorkspaceMigrationGraphqlApiExceptionInterceptor,
  NavigationMenuItemGraphqlApiExceptionInterceptor,
 )
-@Resolver(() => NavigationMenuItemDTO)
+@MetadataResolver(() => NavigationMenuItemDTO)
 export class NavigationMenuItemResolver {
  constructor(
    private readonly navigationMenuItemService: NavigationMenuItemService,
@@ -1,12 +1,5 @@
 import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
-import {
-  Args,
-  Context,
-  Mutation,
-  Parent,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, Context, Mutation, Parent, ResolveField } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

@@ -17,6 +10,7 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typ
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
@@ -32,7 +26,7 @@ import { resolveObjectMetadataStandardOverride } from 'src/engine/metadata-modul
 import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';

@UseGuards(WorkspaceAuthGuard)
-@Resolver(() => ObjectMetadataDTO)
+@MetadataResolver(() => ObjectMetadataDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
  PreventNestToAutoLogGraphqlErrorsFilter,
@@ -4,13 +4,14 @@ import {
  UseInterceptors,
  UsePipes,
 } from '@nestjs/common';
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';

 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
 import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -21,7 +22,7 @@ import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-ta
 import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
 import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';

-@Resolver(() => PageLayoutTabDTO)
+@MetadataResolver(() => PageLayoutTabDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(PageLayoutGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`export const RESOLVER_SCHEMA_SCOPE_KEY = 'RESOLVER_SCHEMA_SCOPE';`
				`@@ -0,0 +1 @@`
				`export type ResolverSchemaScope = 'core' \| 'metadata';`