Cursor: Apply local changes for cloud agent

2026-03-05 11:20:03 +01:00
35 changed files with 303 additions and 195 deletions
@@ -316,7 +316,7 @@ export type ApiKeyToken = {
  token: Scalars['String'];
 };

-export enum AppRegistrationSourceType {
+export enum ApplicationRegistrationSourceType {
  LOCAL = 'LOCAL',
  NPM = 'NPM',
  TARBALL = 'TARBALL'
@@ -369,7 +369,7 @@ export type ApplicationRegistration = {
  oAuthRedirectUris: Array<Scalars['String']>;
  oAuthScopes: Array<Scalars['String']>;
  sourcePackage?: Maybe<Scalars['String']>;
-  sourceType: AppRegistrationSourceType;
+  sourceType: ApplicationRegistrationSourceType;
  termsUrl?: Maybe<Scalars['String']>;
  universalIdentifier: Scalars['String'];
  updatedAt: Scalars['DateTime'];
@@ -387,7 +387,7 @@ export type ApplicationRegistrationSummary = {
  __typename?: 'ApplicationRegistrationSummary';
  id: Scalars['UUID'];
  latestAvailableVersion?: Maybe<Scalars['String']>;
-  sourceType: AppRegistrationSourceType;
+  sourceType: ApplicationRegistrationSourceType;
 };

 export type ApplicationRegistrationVariable = {
@@ -5813,19 +5813,19 @@ export type UpdateOneApplicationVariableMutationVariables = Exact<{

 export type UpdateOneApplicationVariableMutation = { __typename?: 'Mutation', updateOneApplicationVariable: boolean };

-export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };
+export type ApplicationFieldsFragment = { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> };

 export type FindManyApplicationsQueryVariables = Exact<{ [key: string]: never; }>;


-export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, applicationRegistrationId?: string | null, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null }> };
+export type FindManyApplicationsQuery = { __typename?: 'Query', findManyApplications: Array<{ __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, applicationRegistrationId?: string | null, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null }> };

 export type FindOneApplicationQueryVariables = Exact<{
  id: Scalars['UUID'];
 }>;


-export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: AppRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };
+export type FindOneApplicationQuery = { __typename?: 'Query', findOneApplication: { __typename?: 'Application', id: string, name: string, description?: string | null, version?: string | null, universalIdentifier: string, applicationRegistrationId?: string | null, canBeUninstalled: boolean, defaultRoleId?: string | null, settingsCustomTabFrontComponentId?: string | null, availablePackages: any, applicationRegistration?: { __typename?: 'ApplicationRegistrationSummary', id: string, latestAvailableVersion?: string | null, sourceType: ApplicationRegistrationSourceType } | null, applicationVariables: Array<{ __typename?: 'ApplicationVariable', id: string, key: string, value: string, description: string, isSecret: boolean }>, agents: Array<{ __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string }>, objects: Array<{ __typename?: 'Object', id: string, universalIdentifier: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, isUIReadOnly: boolean, createdAt: string, updatedAt: string, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, applicationId: string, shortcut?: string | null, isLabelSyncedWithName: boolean, isSearchable: boolean, duplicateCriteria?: Array<Array<string>> | null, indexMetadataList: Array<{ __typename?: 'Index', id: string, createdAt: string, updatedAt: string, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, isCustom?: boolean | null, indexFieldMetadataList: Array<{ __typename?: 'IndexField', id: string, fieldMetadataId: string, createdAt: string, updatedAt: string, order: number }> }>, fieldsList: Array<{ __typename?: 'Field', id: string, universalIdentifier: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isUIReadOnly?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: string, updatedAt: string, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, morphId?: string | null, applicationId: string, relation?: { __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } } | null, morphRelations?: Array<{ __typename?: 'Relation', type: RelationType, sourceObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, targetObjectMetadata: { __typename?: 'Object', id: string, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'Field', id: string, name: string }, targetFieldMetadata: { __typename?: 'Field', id: string, name: string } }> | null }> }>, logicFunctions: Array<{ __typename?: 'LogicFunction', id: string, name: string, description?: string | null, runtime: string, timeoutSeconds: number, sourceHandlerPath: string, handlerName: string, toolInputSchema?: any | null, isTool: boolean, cronTriggerSettings?: any | null, databaseEventTriggerSettings?: any | null, httpRouteTriggerSettings?: any | null, applicationId?: string | null, createdAt: string, updatedAt: string }> } };

 export type AuthTokenFragmentFragment = { __typename?: 'AuthToken', token: string, expiresAt: string };

@@ -6544,7 +6544,7 @@ export type GetSystemHealthStatusQueryVariables = Exact<{ [key: string]: never;

 export type GetSystemHealthStatusQuery = { __typename?: 'Query', getSystemHealthStatus: { __typename?: 'SystemHealth', services: Array<{ __typename?: 'SystemHealthService', id: HealthIndicatorId, label: string, status: AdminPanelHealthServiceStatus }> } };

-export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string };
+export type ApplicationRegistrationFragmentFragment = { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string };

 export type DeleteApplicationRegistrationMutationVariables = Exact<{
  id: Scalars['String'];
@@ -6565,7 +6565,7 @@ export type UpdateApplicationRegistrationMutationVariables = Exact<{
 }>;


-export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
+export type UpdateApplicationRegistrationMutation = { __typename?: 'Mutation', updateApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };

 export type UpdateApplicationRegistrationVariableMutationVariables = Exact<{
  input: UpdateApplicationRegistrationVariableInput;
@@ -6598,14 +6598,14 @@ export type FindApplicationRegistrationVariablesQuery = { __typename?: 'Query',
 export type FindManyApplicationRegistrationsQueryVariables = Exact<{ [key: string]: never; }>;


-export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string }> };
+export type FindManyApplicationRegistrationsQuery = { __typename?: 'Query', findManyApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string }> };

 export type FindOneApplicationRegistrationQueryVariables = Exact<{
  id: Scalars['String'];
 }>;


-export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: AppRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };
+export type FindOneApplicationRegistrationQuery = { __typename?: 'Query', findOneApplicationRegistration: { __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, description?: string | null, logoUrl?: string | null, author?: string | null, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, websiteUrl?: string | null, termsUrl?: string | null, createdAt: string, updatedAt: string } };

 export type UninstallApplicationMutationVariables = Exact<{
  universalIdentifier: Scalars['String'];
@@ -17080,4 +17080,4 @@ export function useGetWorkspaceFromInviteHashLazyQuery(baseOptions?: Apollo.Lazy
        }
 export type GetWorkspaceFromInviteHashQueryHookResult = ReturnType<typeof useGetWorkspaceFromInviteHashQuery>;
 export type GetWorkspaceFromInviteHashLazyQueryHookResult = ReturnType<typeof useGetWorkspaceFromInviteHashLazyQuery>;
-export type GetWorkspaceFromInviteHashQueryResult = Apollo.QueryResult<GetWorkspaceFromInviteHashQuery, GetWorkspaceFromInviteHashQueryVariables>;
+export type GetWorkspaceFromInviteHashQueryResult = Apollo.QueryResult<GetWorkspaceFromInviteHashQuery, GetWorkspaceFromInviteHashQueryVariables>;
@@ -6,7 +6,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { IconCircleDot, IconStatusChange, IconUpload } from 'twenty-ui/display';
 import { Button } from 'twenty-ui/input';
 import {
-  AppRegistrationSourceType,
+  ApplicationRegistrationSourceType,
  type Application,
 } from '~/generated-metadata/graphql';
 import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
@@ -26,7 +26,7 @@ export const SettingsApplicationVersionContainer = ({
  const currentVersion = application?.version;

  const sourceType = application?.applicationRegistration?.sourceType;
-  const isNpmApp = sourceType === AppRegistrationSourceType.NPM;
+  const isNpmApp = sourceType === ApplicationRegistrationSourceType.NPM;

  const latestVersion = isNpmApp
    ? (latestAvailableVersion ?? currentVersion)
@@ -16,7 +16,7 @@ import { Section } from 'twenty-ui/layout';
 import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
 import { ThemeContext } from 'twenty-ui/theme';
 import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { AppRegistrationSourceType } from '~/generated-metadata/graphql';
+import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';

 const StyledTable = styled(Table)`
  margin-top: ${themeCssVariables.spacing[3]};
@@ -75,7 +75,7 @@ export const SettingsApplicationsTable = ({
        {filteredApplications.map((application) => {
          const isNpmApp =
            application.applicationRegistration?.sourceType ===
-            AppRegistrationSourceType.NPM;
+            ApplicationRegistrationSourceType.NPM;

          const latestVersion =
            application.applicationRegistration?.latestAvailableVersion;
@@ -2,7 +2,7 @@ import { Logger } from '@nestjs/common';

 import { Command, CommandRunner } from 'nest-commander';

-import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';
+import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';
 import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';
 import { EventLogCleanupCronCommand } from 'src/engine/core-modules/event-logs/cleanup/commands/event-log-cleanup.cron.command';
 import { CheckPublicDomainsValidRecordsCronCommand } from 'src/engine/core-modules/public-domain/crons/commands/check-public-domains-valid-records.cron.command';
@@ -55,7 +55,7 @@ export class CronRegisterAllCommand extends CommandRunner {
    private readonly trashCleanupCronCommand: TrashCleanupCronCommand,
    private readonly eventLogCleanupCronCommand: EventLogCleanupCronCommand,
    private readonly marketplaceCatalogSyncCronCommand: MarketplaceCatalogSyncCronCommand,
-    private readonly appVersionCheckCronCommand: AppVersionCheckCronCommand,
+    private readonly applicationVersionCheckCronCommand: ApplicationVersionCheckCronCommand,
  ) {
    super();
  }
@@ -145,8 +145,8 @@ export class CronRegisterAllCommand extends CommandRunner {
        command: this.marketplaceCatalogSyncCronCommand,
      },
      {
-        name: 'AppVersionCheck',
-        command: this.appVersionCheckCronCommand,
+        name: 'ApplicationVersionCheck',
+        command: this.applicationVersionCheckCronCommand,
      },
    ];

@@ -9,7 +9,8 @@ import { UpgradeVersionCommandModule } from 'src/database/commands/upgrade-versi
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
 import { GenerateApiKeyCommand } from 'src/engine/core-modules/api-key/commands/generate-api-key.command';
-import { AppVersionCheckModule } from 'src/engine/core-modules/application/application-version-check/application-version-check.module';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { ApplicationUpgradeModule } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.module';
 import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';
 import { EventLogCleanupModule } from 'src/engine/core-modules/event-logs/cleanup/event-log-cleanup.module';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
@@ -58,7 +59,8 @@ import { AutomatedTriggerModule } from 'src/modules/workflow/workflow-trigger/au
    PublicDomainModule,
    EventLogCleanupModule,
    MarketplaceModule,
-    AppVersionCheckModule,
+    ApplicationInstallModule,
+    ApplicationUpgradeModule,
  ],
  providers: [
    DataSeedWorkspaceCommand,
@@ -10,7 +10,7 @@ import { ActiveOrSuspendedWorkspacesMigrationCommandRunner } from 'src/database/
 import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspaces-migration.command-runner';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
 import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
-import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
+import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
 import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
 import { FileSettings } from 'src/engine/core-modules/file/types/file-settings.types';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';

 import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';
-import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { ApplicationManifestModule } from 'src/engine/core-modules/application/application-manifest/application-manifest.module';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { ApplicationDevelopmentResolver } from 'src/engine/core-modules/application/application-development/application-development.resolver';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
@@ -12,7 +12,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor

@Module({
  imports: [
-    ApplicationInstallModule,
+    ApplicationManifestModule,
    ApplicationRegistrationModule,
    ApplicationModule,
    FeatureFlagModule,
@@ -13,9 +13,9 @@ import { FileFolder, FeatureFlagKey } from 'twenty-shared/types';

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

-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';
 import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
 import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
 import {
@@ -28,7 +28,7 @@ import { CreateApplicationInput } from 'src/engine/core-modules/application/dtos
 import { GenerateApplicationTokenInput } from 'src/engine/core-modules/application/dtos/generate-application-token.input';
 import { UploadApplicationFileInput } from 'src/engine/core-modules/application/dtos/uploadApplicationFileInput';
 import { WorkspaceMigrationDTO } from 'src/engine/core-modules/application/dtos/workspace-migration.dto';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/services/application-sync.service';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
 import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';
 import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
@@ -129,7 +129,7 @@ export class ApplicationDevelopmentResolver {
  ) {
    return await this.applicationService.create({
      ...input,
-      sourceType: AppRegistrationSourceType.LOCAL,
+      sourceType: ApplicationRegistrationSourceType.LOCAL,
      workspaceId,
    });
  }
@@ -6,26 +6,17 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { ApplicationManifestModule } from 'src/engine/core-modules/application/application-manifest/application-manifest.module';
+import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';
 import { ApplicationInstallResolver } from 'src/engine/core-modules/application/application-install/application-install.resolver';
-import { AppPackageFetcherService } from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';
 import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
-import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-install/application-manifest-migration.service';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
-import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';
-import { ApplicationVariableEntityModule } from 'src/engine/core-modules/application/application-variable/application-variable.module';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
-import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';
-import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
 import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
 import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
-import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
-import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/code-step/code-step-build.module';

@Module({
  imports: [
@@ -35,35 +26,21 @@ import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workf
      ApplicationEntity,
    ]),
    ApplicationModule,
+    ApplicationManifestModule,
+    ApplicationPackageModule,
    CacheLockModule,
    FeatureFlagModule,
-    ApplicationVariableEntityModule,
    TokenModule,
-    WorkspaceMigrationModule,
    PermissionsModule,
-    ObjectPermissionModule,
-    PermissionFlagModule,
-    WorkflowCommonModule,
-    CodeStepBuildModule,
    FileStorageModule,
    WorkspaceCacheModule,
    WorkspaceMigrationRunnerModule,
-    TwentyConfigModule,
  ],
  providers: [
    ApplicationInstallResolver,
-    ApplicationManifestMigrationService,
-    ApplicationSyncService,
-    AppPackageFetcherService,
    ApplicationInstallService,
-    AppUpgradeService,
    WorkspaceMigrationGraphqlApiExceptionInterceptor,
  ],
-  exports: [
-    ApplicationSyncService,
-    AppPackageFetcherService,
-    ApplicationInstallService,
-    AppUpgradeService,
-  ],
+  exports: [ApplicationInstallService],
 })
 export class ApplicationInstallModule {}
@@ -4,26 +4,21 @@ import {
  UseInterceptors,
  UsePipes,
 } from '@nestjs/common';
-import { Args, Mutation, Query } from '@nestjs/graphql';
+import { Args, Mutation } from '@nestjs/graphql';

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

 import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
 import {
  ApplicationException,
  ApplicationExceptionCode,
 } from 'src/engine/core-modules/application/application.exception';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
-import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';
-import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/services/application-sync.service';
 import { InstallApplicationInput } from 'src/engine/core-modules/application/dtos/install-application.input';
 import { UninstallApplicationInput } from 'src/engine/core-modules/application/dtos/uninstallApplicationInput';
-import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
 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';
@@ -31,7 +26,6 @@ import {
  FeatureFlagGuard,
  RequireFeatureFlag,
 } from 'src/engine/guards/feature-flag.guard';
-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';
 import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -41,67 +35,16 @@ import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/wo
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
+@UseFilters(ApplicationExceptionFilter)
@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
 export class ApplicationInstallResolver {
  constructor(
    private readonly applicationService: ApplicationService,
-    private readonly applicationTokenService: ApplicationTokenService,
    private readonly applicationSyncService: ApplicationSyncService,
    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
    private readonly workspaceCacheService: WorkspaceCacheService,
  ) {}

-  @Query(() => [ApplicationDTO])
-  @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
-  async findManyApplications(
-    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
-  ) {
-    return this.applicationService.findManyApplications(workspaceId);
-  }
-
-  @Query(() => ApplicationDTO)
-  @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
-  async findOneApplication(
-    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
-    @Args('id', { type: () => UUIDScalarType, nullable: true }) id?: string,
-    @Args('universalIdentifier', {
-      type: () => UUIDScalarType,
-      nullable: true,
-    })
-    universalIdentifier?: string,
-  ) {
-    return await this.applicationService.findOneApplicationOrThrow({
-      id,
-      universalIdentifier,
-      workspaceId,
-    });
-  }
-
-  @Mutation(() => ApplicationTokenPairDTO)
-  @UseGuards(NoPermissionGuard)
-  @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
-  async renewApplicationToken(
-    @Args('applicationRefreshToken') applicationRefreshToken: string,
-    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
-  ): Promise<ApplicationTokenPairDTO> {
-    const applicationRefreshTokenPayload =
-      this.applicationTokenService.validateApplicationRefreshToken(
-        applicationRefreshToken,
-      );
-
-    if (applicationRefreshTokenPayload.workspaceId !== workspaceId) {
-      throw new ApplicationException(
-        'Refresh token workspace does not match authenticated workspace',
-        ApplicationExceptionCode.FORBIDDEN,
-      );
-    }
-
-    return this.applicationTokenService.renewApplicationTokens(
-      applicationRefreshTokenPayload,
-    );
-  }
-
  @Mutation(() => Boolean)
  @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
  @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
@@ -9,13 +9,13 @@ import { isDefined } from 'twenty-shared/utils';
 import { Repository } from 'typeorm';

 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import {
-  AppPackageFetcherService,
+  ApplicationPackageResolverService,
  type ResolvedPackage,
-} from 'src/engine/core-modules/application/application-install/app-package-fetcher.service';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-install/application-sync.service';
+} from 'src/engine/core-modules/application/application-package/services/application-package-resolver.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/services/application-sync.service';
 import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
 import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';

@@ -45,7 +45,7 @@ export class ApplicationInstallService {
    private readonly appRegistrationRepository: Repository<ApplicationRegistrationEntity>,
    @InjectRepository(ApplicationEntity)
    private readonly applicationRepository: Repository<ApplicationEntity>,
-    private readonly appPackageFetcherService: AppPackageFetcherService,
+    private readonly applicationPackageResolverService: ApplicationPackageResolverService,
    private readonly applicationSyncService: ApplicationSyncService,
    private readonly fileStorageService: FileStorageService,
    private readonly cacheLockService: CacheLockService,
@@ -60,7 +60,7 @@ export class ApplicationInstallService {
      where: { id: params.appRegistrationId },
    });

-    if (appRegistration.sourceType === AppRegistrationSourceType.LOCAL) {
+    if (appRegistration.sourceType === ApplicationRegistrationSourceType.LOCAL) {
      this.logger.log(
        `Skipping install for LOCAL app ${appRegistration.universalIdentifier} (files synced by CLI watcher in dev mode)`,
      );
@@ -88,10 +88,11 @@ export class ApplicationInstallService {
    let resolvedPackage: ResolvedPackage | null = null;

    try {
-      resolvedPackage = await this.appPackageFetcherService.resolvePackage(
-        appRegistration,
-        { targetVersion: params.version },
-      );
+      resolvedPackage =
+        await this.applicationPackageResolverService.resolvePackage(
+          appRegistration,
+          { targetVersion: params.version },
+        );

      if (!resolvedPackage) {
        return true;
@@ -128,7 +129,7 @@ export class ApplicationInstallService {
      throw error;
    } finally {
      if (resolvedPackage) {
-        await this.appPackageFetcherService.cleanupExtractedDir(
+        await this.applicationPackageResolverService.cleanupExtractedDir(
          resolvedPackage.cleanupDir,
        );
      }
@@ -205,7 +206,7 @@ export class ApplicationInstallService {
  private async updateApplicationSourceType(
    universalIdentifier: string,
    workspaceId: string,
-    sourceType: AppRegistrationSourceType,
+    sourceType: ApplicationRegistrationSourceType,
  ): Promise<void> {
    await this.applicationRepository.update(
      { universalIdentifier, workspaceId },
@@ -0,0 +1,31 @@
+import { Module } from '@nestjs/common';
+
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
+import { ApplicationManifestMigrationService } from 'src/engine/core-modules/application/application-manifest/services/application-manifest-migration.service';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-manifest/services/application-sync.service';
+import { ApplicationVariableEntityModule } from 'src/engine/core-modules/application/application-variable/application-variable.module';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
+import { ObjectPermissionModule } from 'src/engine/metadata-modules/object-permission/object-permission.module';
+import { PermissionFlagModule } from 'src/engine/metadata-modules/permission-flag/permission-flag.module';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
+
+@Module({
+  imports: [
+    ApplicationModule,
+    ApplicationVariableEntityModule,
+    FileStorageModule,
+    ObjectPermissionModule,
+    PermissionFlagModule,
+    WorkspaceCacheModule,
+    WorkspaceMigrationModule,
+    WorkspaceMigrationRunnerModule,
+  ],
+  providers: [
+    ApplicationManifestMigrationService,
+    ApplicationSyncService,
+  ],
+  exports: [ApplicationSyncService],
+})
+export class ApplicationManifestModule {}
@@ -3,6 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';

 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
 import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { ApplicationUpgradeModule } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.module';
 import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';
 import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
 import { MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-catalog-sync.service';
@@ -17,6 +18,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
  imports: [
    TypeOrmModule.forFeature([ApplicationRegistrationEntity]),
    ApplicationInstallModule,
+    ApplicationUpgradeModule,
    FeatureFlagModule,
    PermissionsModule,
    TwentyConfigModule,
@@ -10,9 +10,9 @@ import {
  ApplicationRegistrationException,
  ApplicationRegistrationExceptionCode,
 } from 'src/engine/core-modules/application/application-registration/application-registration.exception';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
-import { AppUpgradeService } from 'src/engine/core-modules/application/application-install/app-upgrade.service';
+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';
 import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';
 import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace-query.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -38,7 +38,7 @@ export class MarketplaceResolver {
  constructor(
    private readonly marketplaceQueryService: MarketplaceQueryService,
    private readonly applicationInstallService: ApplicationInstallService,
-    private readonly appUpgradeService: AppUpgradeService,
+    private readonly applicationUpgradeService: ApplicationUpgradeService,
  ) {}

  @Query(() => [MarketplaceAppDTO])
@@ -61,7 +61,7 @@ export class MarketplaceResolver {
        universalIdentifier,
      );

-    if (registration.sourceType !== AppRegistrationSourceType.NPM) {
+    if (registration.sourceType !== ApplicationRegistrationSourceType.NPM) {
      throw new ApplicationRegistrationException(
        `Only NPM apps can be installed via the marketplace`,
        ApplicationRegistrationExceptionCode.SOURCE_CHANNEL_MISMATCH,
@@ -105,7 +105,7 @@ export class MarketplaceResolver {
    @Args('targetVersion') targetVersion: string,
    @AuthWorkspace() workspace: WorkspaceEntity,
  ): Promise<boolean> {
-    return this.appUpgradeService.upgradeApplication({
+    return this.applicationUpgradeService.upgradeApplication({
      appRegistrationId,
      targetVersion,
      workspaceId: workspace.id,
@@ -6,7 +6,7 @@ import { Repository } from 'typeorm';
 import { v4 } from 'uuid';

 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { MARKETPLACE_CATALOG_INDEX } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-catalog-index.constant';
 import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/services/marketplace.service';
 import { getAdminWorkspaceId } from 'src/engine/core-modules/application/application-marketplace/utils/get-admin-workspace-id.util';
@@ -48,7 +48,7 @@ export class MarketplaceCatalogSyncService {
          description:
            entry.richDisplayData.aboutDescription ?? entry.description,
          author: entry.author,
-          sourceType: AppRegistrationSourceType.NPM,
+          sourceType: ApplicationRegistrationSourceType.NPM,
          sourcePackage: entry.sourcePackage,
          logoUrl: entry.logoUrl ?? null,
          websiteUrl: entry.websiteUrl ?? null,
@@ -84,7 +84,7 @@ export class MarketplaceCatalogSyncService {
          name: app.name,
          description: app.description,
          author: app.author,
-          sourceType: AppRegistrationSourceType.NPM,
+          sourceType: ApplicationRegistrationSourceType.NPM,
          sourcePackage: app.sourcePackage ?? app.name,
          logoUrl: null,
          websiteUrl: app.websiteUrl ?? null,
@@ -10,8 +10,8 @@ import {
  ApplicationRegistrationException,
  ApplicationRegistrationExceptionCode,
 } from 'src/engine/core-modules/application/application-registration/application-registration.exception';
-import { assertValidNpmPackageName } from 'src/engine/core-modules/application/utils/assert-valid-npm-package-name.util';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { assertValidNpmPackageName } from 'src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
 import { MarketplaceAppDTO } from 'src/engine/core-modules/application/application-marketplace/dtos/marketplace-app.dto';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
@@ -40,7 +40,7 @@ export class MarketplaceQueryService {
    }

    const registrations = await this.appRegistrationRepository.find({
-      where: { sourceType: AppRegistrationSourceType.NPM },
+      where: { sourceType: ApplicationRegistrationSourceType.NPM },
    });

    if (registrations.length === 0) {
@@ -105,7 +105,7 @@ export class MarketplaceQueryService {
      const registration = this.appRegistrationRepository.create({
        universalIdentifier: v4(),
        name: params.packageName,
-        sourceType: AppRegistrationSourceType.NPM,
+        sourceType: ApplicationRegistrationSourceType.NPM,
        sourcePackage: params.packageName,
        oAuthClientId: v4(),
        oAuthRedirectUris: [],
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationPackageResolverService } from 'src/engine/core-modules/application/application-package/services/application-package-resolver.service';
+import { ApplicationTarballService } from 'src/engine/core-modules/application/application-package/services/application-tarball.service';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([ApplicationRegistrationEntity]),
+    FileStorageModule,
+    TwentyConfigModule,
+  ],
+  providers: [ApplicationPackageResolverService, ApplicationTarballService],
+  exports: [ApplicationPackageResolverService, ApplicationTarballService],
+})
+export class ApplicationPackageModule {}
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      ApplicationRegistrationVariableEntity,
+      ApplicationRegistrationEntity,
+    ]),
+    SecretEncryptionModule,
+  ],
+  providers: [ApplicationRegistrationVariableService],
+  exports: [ApplicationRegistrationVariableService],
+})
+export class ApplicationRegistrationVariableModule {}
@@ -18,8 +18,8 @@ import {
 } from 'typeorm';

 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
 import { type MarketplaceDisplayData } from 'src/engine/core-modules/application/application-marketplace/types/marketplace-display-data.type';
 import { UserEntity } from 'src/engine/core-modules/user/user.entity';
@@ -106,12 +106,12 @@ export class ApplicationRegistrationEntity {
  @JoinColumn({ name: 'workspaceId' })
  workspace: Relation<WorkspaceEntity>;

-  @Field(() => AppRegistrationSourceType)
+  @Field(() => ApplicationRegistrationSourceType)
  @Column({
    type: 'text',
-    default: AppRegistrationSourceType.LOCAL,
+    default: ApplicationRegistrationSourceType.LOCAL,
  })
-  sourceType: AppRegistrationSourceType;
+  sourceType: ApplicationRegistrationSourceType;

  @Field(() => String, { nullable: true })
  @Column({ nullable: true, type: 'text' })
@@ -1,15 +1,14 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';

-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
 import { ApplicationRegistrationResolver } from 'src/engine/core-modules/application/application-registration/application-registration.resolver';
 import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
 import { OAuthDiscoveryController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-discovery.controller';
 import { OAuthTokenController } from 'src/engine/core-modules/application/application-registration/controllers/oauth-token.controller';
 import { OAuthService } from 'src/engine/core-modules/application/application-registration/oauth.service';
-import { AppTarballUploadService } from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';
+import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';
+import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';
 import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
@@ -17,7 +16,6 @@ import { ApplicationInstallModule } from 'src/engine/core-modules/application/ap
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
-import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
 import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
@@ -27,32 +25,30 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
  imports: [
    TypeOrmModule.forFeature([
      ApplicationRegistrationEntity,
-      ApplicationRegistrationVariableEntity,
      ApplicationEntity,
      AppTokenEntity,
      UserWorkspaceEntity,
    ]),
-    SecretEncryptionModule,
+    ApplicationRegistrationVariableModule,
    FeatureFlagModule,
    PermissionsModule,
    ThrottlerModule,
    TokenModule,
    ApplicationModule,
    ApplicationInstallModule,
+    ApplicationPackageModule,
    FileStorageModule,
    WorkspaceCacheStorageModule,
  ],
  controllers: [OAuthTokenController, OAuthDiscoveryController],
  providers: [
    ApplicationRegistrationService,
-    ApplicationRegistrationVariableService,
    ApplicationRegistrationResolver,
-    AppTarballUploadService,
    OAuthService,
  ],
  exports: [
    ApplicationRegistrationService,
-    ApplicationRegistrationVariableService,
+    ApplicationRegistrationVariableModule,
  ],
 })
 export class ApplicationRegistrationModule {}
@@ -8,22 +8,22 @@ import { FeatureFlagKey } from 'twenty-shared/types';
 import type { FileUpload } from 'graphql-upload/processRequest.mjs';

 import { ApplicationRegistrationExceptionFilter } from 'src/engine/core-modules/application/application-registration/application-registration-exception-filter';
-import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
-import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration/application-registration-variable.service';
+import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';
+import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';
 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
 import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
 import {
-  AppTarballUploadService,
+  ApplicationTarballService,
  MAX_TARBALL_UPLOAD_SIZE_BYTES,
-} from 'src/engine/core-modules/application/application-registration/services/app-tarball-upload.service';
+} from 'src/engine/core-modules/application/application-package/services/application-tarball.service';
 import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';
 import { CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';
 import { CreateApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.dto';
 import { PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';
-import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration-variable.input';
+import { CreateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/create-application-registration-variable.input';
 import { RotateClientSecretDTO } from 'src/engine/core-modules/application/application-registration/dtos/rotate-client-secret.dto';
 import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';
-import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration-variable.input';
+import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modules/application/application-registration-variable/dtos/update-application-registration-variable.input';
 import {
  ApplicationRegistrationException,
  ApplicationRegistrationExceptionCode,
@@ -57,7 +57,7 @@ export class ApplicationRegistrationResolver {
  constructor(
    private readonly applicationRegistrationService: ApplicationRegistrationService,
    private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,
-    private readonly appTarballUploadService: AppTarballUploadService,
+    private readonly applicationTarballService: ApplicationTarballService,
  ) {}

  @UseGuards(PublicEndpointGuard, NoPermissionGuard)
@@ -279,7 +279,7 @@ export class ApplicationRegistrationResolver {
      );
    }

-    return this.appTarballUploadService.uploadTarball({
+    return this.applicationTarballService.uploadTarball({
      tarballBuffer,
      universalIdentifier,
      ownerWorkspaceId: workspaceId,
@@ -13,7 +13,7 @@ import {
 } from 'src/engine/core-modules/app-token/app-token.entity';
 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
 import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
@@ -562,8 +562,8 @@ export class OAuthService {
    );

    if (
-      applicationRegistration.sourceType === AppRegistrationSourceType.NPM ||
-      applicationRegistration.sourceType === AppRegistrationSourceType.TARBALL
+      applicationRegistration.sourceType === ApplicationRegistrationSourceType.NPM ||
+      applicationRegistration.sourceType === ApplicationRegistrationSourceType.TARBALL
    ) {
      await this.applicationInstallService.installApplication({
        appRegistrationId: applicationRegistration.id,
@@ -0,0 +1,31 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
+import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
+import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';
+import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/application/application-upgrade/crons/application-version-check.cron.job';
+import { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';
+import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      ApplicationRegistrationEntity,
+      ApplicationEntity,
+    ]),
+    ApplicationInstallModule,
+    TwentyConfigModule,
+  ],
+  providers: [
+    ApplicationUpgradeService,
+    ApplicationVersionCheckCronJob,
+    ApplicationVersionCheckCronCommand,
+  ],
+  exports: [
+    ApplicationUpgradeService,
+    ApplicationVersionCheckCronCommand,
+  ],
+})
+export class ApplicationUpgradeModule {}
@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
-import { AppVersionCheckCronCommand } from 'src/engine/core-modules/application/application-version-check/crons/commands/app-version-check.cron.command';
-import { AppVersionCheckCronJob } from 'src/engine/core-modules/application/application-version-check/crons/app-version-check.cron.job';
-
-@Module({
-  imports: [ApplicationInstallModule],
-  providers: [AppVersionCheckCronJob, AppVersionCheckCronCommand],
-  exports: [AppVersionCheckCronCommand],
-})
-export class AppVersionCheckModule {}
@@ -16,7 +16,7 @@ import {
 } from 'typeorm';

 import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
 import { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
 import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
@@ -53,8 +53,8 @@ export class ApplicationEntity extends WorkspaceRelatedEntity {
  @Column({ nullable: true, type: 'text' })
  version: string | null;

-  @Column({ type: 'text', default: AppRegistrationSourceType.LOCAL })
-  sourceType: AppRegistrationSourceType;
+  @Column({ type: 'text', default: ApplicationRegistrationSourceType.LOCAL })
+  sourceType: ApplicationRegistrationSourceType;

  @Column({ nullable: false, type: 'text' })
  sourcePath: string;
@@ -2,8 +2,11 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';

 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
+import { ApplicationResolver } from 'src/engine/core-modules/application/application.resolver';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
 import { WorkspaceFlatApplicationMapCacheService } from 'src/engine/core-modules/application/workspace-flat-application-map-cache.service';
+import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
@@ -16,8 +19,14 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
    WorkspaceManyOrAllFlatEntityMapsCacheModule,
    WorkspaceCacheModule,
    TwentyConfigModule,
+    TokenModule,
+    FeatureFlagModule,
  ],
  exports: [ApplicationService, WorkspaceFlatApplicationMapCacheService],
-  providers: [ApplicationService, WorkspaceFlatApplicationMapCacheService],
+  providers: [
+    ApplicationService,
+    ApplicationResolver,
+    WorkspaceFlatApplicationMapCacheService,
+  ],
 })
 export class ApplicationModule {}
@@ -0,0 +1,89 @@
+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
+import { Args, Mutation, Query } from '@nestjs/graphql';
+
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { FeatureFlagKey } from 'twenty-shared/types';
+
+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
+import {
+  ApplicationException,
+  ApplicationExceptionCode,
+} from 'src/engine/core-modules/application/application.exception';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { ApplicationTokenPairDTO } from 'src/engine/core-modules/application/dtos/application-token-pair.dto';
+import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
+import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
+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 {
+  FeatureFlagGuard,
+  RequireFeatureFlag,
+} from 'src/engine/guards/feature-flag.guard';
+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';
+
+@UsePipes(ResolverValidationPipe)
+@MetadataResolver()
+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
+@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
+export class ApplicationResolver {
+  constructor(
+    private readonly applicationService: ApplicationService,
+    private readonly applicationTokenService: ApplicationTokenService,
+  ) {}
+
+  @Query(() => [ApplicationDTO])
+  @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
+  async findManyApplications(
+    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
+  ) {
+    return this.applicationService.findManyApplications(workspaceId);
+  }
+
+  @Query(() => ApplicationDTO)
+  @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
+  async findOneApplication(
+    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
+    @Args('id', { type: () => UUIDScalarType, nullable: true }) id?: string,
+    @Args('universalIdentifier', {
+      type: () => UUIDScalarType,
+      nullable: true,
+    })
+    universalIdentifier?: string,
+  ) {
+    return await this.applicationService.findOneApplicationOrThrow({
+      id,
+      universalIdentifier,
+      workspaceId,
+    });
+  }
+
+  @Mutation(() => ApplicationTokenPairDTO)
+  @UseGuards(NoPermissionGuard)
+  @RequireFeatureFlag(FeatureFlagKey.IS_APPLICATION_ENABLED)
+  async renewApplicationToken(
+    @Args('applicationRefreshToken') applicationRefreshToken: string,
+    @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
+  ): Promise<ApplicationTokenPairDTO> {
+    const applicationRefreshTokenPayload =
+      this.applicationTokenService.validateApplicationRefreshToken(
+        applicationRefreshToken,
+      );
+
+    if (applicationRefreshTokenPayload.workspaceId !== workspaceId) {
+      throw new ApplicationException(
+        'Refresh token workspace does not match authenticated workspace',
+        ApplicationExceptionCode.FORBIDDEN,
+      );
+    }
+
+    return this.applicationTokenService.renewApplicationTokens(
+      applicationRefreshTokenPayload,
+    );
+  }
+}
@@ -10,8 +10,8 @@ import {
  ApplicationException,
  ApplicationExceptionCode,
 } from 'src/engine/core-modules/application/application.exception';
-import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/utils/get-default-application-package-fields.util';
-import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
+import { getDefaultApplicationPackageFields } from 'src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util';
+import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
 import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { ALL_FLAT_ENTITY_MAPS_PROPERTIES } from 'src/engine/metadata-modules/flat-entity/constant/all-flat-entity-maps-properties.constant';
@@ -3,7 +3,7 @@ import { Field, ObjectType } from '@nestjs/graphql';
 import { IsOptional, IsString } from 'class-validator';

 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';

@ObjectType('ApplicationRegistrationSummary')
 export class ApplicationRegistrationSummaryDTO {
@@ -15,6 +15,6 @@ export class ApplicationRegistrationSummaryDTO {
  @Field({ nullable: true })
  latestAvailableVersion?: string;

-  @Field(() => AppRegistrationSourceType)
-  sourceType: AppRegistrationSourceType;
+  @Field(() => ApplicationRegistrationSourceType)
+  sourceType: ApplicationRegistrationSourceType;
 }
@@ -38,7 +38,7 @@ import {
  LogicFunctionExceptionCode,
 } from 'src/engine/metadata-modules/logic-function/logic-function.exception';
 import { type FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/types/flat-logic-function.type';
-import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies';
+import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies';
 import { type LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';
 import { callWithTimeout } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout';

@@ -14,7 +14,7 @@ import { ConsoleListener } from 'src/engine/core-modules/logic-function/logic-fu
 import { TemporaryDirManager } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/temporary-dir-manager';
 import { HANDLER_NAME_REGEX } from 'src/engine/metadata-modules/logic-function/constants/handler.contant';
 import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';
-import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/utils/copy-yarn-engine-and-build-dependencies';
+import { copyYarnEngineAndBuildDependencies } from 'src/engine/core-modules/application/application-package/utils/copy-yarn-engine-and-build-dependencies';
 import type { LogicFunctionResourceService } from 'src/engine/core-modules/logic-function/logic-function-resource/logic-function-resource.service';

 export interface LocalDriverOptions {
@@ -5,7 +5,7 @@ import { FieldMetadataType } from 'twenty-shared/types';

 import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';

-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
 import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
 import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
@@ -27,7 +27,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {
  description: null,
  workspaceId: 'workspace-id',
  version: null,
-  sourceType: AppRegistrationSourceType.LOCAL,
+  sourceType: ApplicationRegistrationSourceType.LOCAL,
  sourcePath: '',
  packageJsonChecksum: null,
  packageJsonFileId: null,
@@ -6,7 +6,7 @@ import {
  RelationType,
 } from 'twenty-shared/types';

-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
 import {
  generateMorphOrRelationFlatFieldMetadataPair,
@@ -22,7 +22,7 @@ const MOCK_FLAT_APPLICATION: FlatApplication = {
  description: null,
  version: null,
  workspaceId: 'workspace-id',
-  sourceType: AppRegistrationSourceType.LOCAL,
+  sourceType: ApplicationRegistrationSourceType.LOCAL,
  sourcePath: '',
  packageJsonChecksum: null,
  packageJsonFileId: null,
@@ -1,4 +1,4 @@
-import { AppRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/app-registration-source-type.enum';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
 import { type ApplicationEntity } from 'src/engine/core-modules/application/application.entity';

 export const TWENTY_STANDARD_APPLICATION = {
@@ -8,7 +8,7 @@ export const TWENTY_STANDARD_APPLICATION = {
    'Twenty is an open-source CRM that allows you to manage your sales and customer relationships',
  version: '1.0.0',
  sourcePath: 'cli-sync',
-  sourceType: AppRegistrationSourceType.LOCAL,
+  sourceType: ApplicationRegistrationSourceType.LOCAL,
 } as const satisfies Pick<
  ApplicationEntity,
  | 'universalIdentifier'
@@ -9,7 +9,7 @@ import { type CommonResponseBody } from 'test/integration/metadata/types/common-
 import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';
 import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';

-import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration/application-registration-variable.entity';
+import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';

 type VariableFields = Pick<
  ApplicationRegistrationVariableEntity,