The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat: add two-layer AI model availability filtering (#18170)
Félix Malfait9a3852bf04d8
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 7865106f1e9..86cd0776e1b 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -44,6 +44,24 @@ export type AddQuerySubscriptionInput = {queryId: Scalars['String'];};+export type AdminAiModelConfig = {+ __typename?: 'AdminAIModelConfig';+ deprecated?: Maybe<Scalars['Boolean']>;+ inferenceProvider: InferenceProvider;+ isAdminEnabled: Scalars['Boolean'];+ isAvailable: Scalars['Boolean'];+ isRecommended?: Maybe<Scalars['Boolean']>;+ label: Scalars['String'];+ modelFamily?: Maybe<ModelFamily>;+ modelId: Scalars['String'];+};++export type AdminAiModelsOutput = {+ __typename?: 'AdminAIModelsOutput';+ autoEnableNewModels: Scalars['Boolean'];+ models: Array<AdminAiModelConfig>;+};+export type AdminPanelHealthServiceData = {__typename?: 'AdminPanelHealthServiceData';description: Scalars['String'];@@ -681,6 +699,7 @@ export type ClientAiModelConfig = {deprecated?: Maybe<Scalars['Boolean']>;inferenceProvider: InferenceProvider;inputCostPerMillionTokensInCredits: Scalars['Float'];+ isRecommended?: Maybe<Scalars['Boolean']>;label: Scalars['String'];modelFamily?: Maybe<ModelFamily>;modelId: Scalars['String'];@@ -3737,6 +3756,7 @@ export type Query = {frontComponents: Array<FrontComponent>;getAISystemPromptPreview: AiSystemPromptPreview;getAddressDetails: PlaceDetailsResult;+ getAdminAiModels: AdminAiModelsOutput;getApprovedAccessDomains: Array<ApprovedAccessDomain>;getAutoCompleteAddress: Array<AutocompleteResult>;getAvailablePackages: Scalars['JSON'];@@ -4837,10 +4857,13 @@ export type UpdateWebhookInputUpdates = {export type UpdateWorkspaceInput = {aiAdditionalInstructions?: InputMaybe<Scalars['String']>;allowImpersonation?: InputMaybe<Scalars['Boolean']>;+ autoEnableNewAiModels?: InputMaybe<Scalars['Boolean']>;customDomain?: InputMaybe<Scalars['String']>;defaultRoleId?: InputMaybe<Scalars['UUID']>;+ disabledAiModelIds?: InputMaybe<Array<Scalars['String']>>;displayName?: InputMaybe<Scalars['String']>;editableProfileFields?: InputMaybe<Array<Scalars['String']>>;+ enabledAiModelIds?: InputMaybe<Array<Scalars['String']>>;eventLogRetentionDays?: InputMaybe<Scalars['Float']>;fastModel?: InputMaybe<Scalars['String']>;inviteHash?: InputMaybe<Scalars['String']>;@@ -4856,6 +4879,7 @@ export type UpdateWorkspaceInput = {smartModel?: InputMaybe<Scalars['String']>;subdomain?: InputMaybe<Scalars['String']>;trashRetentionDays?: InputMaybe<Scalars['Float']>;+ useRecommendedModels?: InputMaybe<Scalars['Boolean']>;};export type UpsertFieldPermissionsInput = {@@ -5158,6 +5182,7 @@ export type Workspace = {activationStatus: WorkspaceActivationStatus;aiAdditionalInstructions?: Maybe<Scalars['String']>;allowImpersonation: Scalars['Boolean'];+ autoEnableNewAiModels: Scalars['Boolean'];billingEntitlements: Array<BillingEntitlement>;billingSubscriptions: Array<BillingSubscription>;createdAt: Scalars['DateTime'];@@ -5167,8 +5192,10 @@ export type Workspace = {databaseUrl: Scalars['String'];defaultRole?: Maybe<Role>;deletedAt?: Maybe<Scalars['DateTime']>;+ disabledAiModelIds?: Maybe<Array<Scalars['String']>>;displayName?: Maybe<Scalars['String']>;editableProfileFields?: Maybe<Array<Scalars['String']>>;+ enabledAiModelIds?: Maybe<Array<Scalars['String']>>;eventLogRetentionDays: Scalars['Float'];fastModel: Scalars['String'];featureFlags?: Maybe<Array<FeatureFlagDto>>;@@ -5192,6 +5219,7 @@ export type Workspace = {subdomain: Scalars['String'];trashRetentionDays: Scalars['Float'];updatedAt: Scalars['DateTime'];+ useRecommendedModels: Scalars['Boolean'];version?: Maybe<Scalars['String']>;viewFields?: Maybe<Array<CoreViewField>>;viewFilterGroups?: Maybe<Array<CoreViewFilterGroup>>;@@ -6094,6 +6122,19 @@ export type GetConnectedImapSmtpCaldavAccountQueryVariables = Exact<{export type GetConnectedImapSmtpCaldavAccountQuery = { __typename?: 'Query', getConnectedImapSmtpCaldavAccount: { __typename?: 'ConnectedImapSmtpCaldavAccount', id: string, handle: string, provider: string, accountOwnerId: string, connectionParameters?: { __typename?: 'ImapSmtpCaldavConnectionParameters', IMAP?: { __typename?: 'ConnectionParametersOutput', host: string, port: number, secure?: boolean | null, username?: string | null, password: string } | null, SMTP?: { __typename?: 'ConnectionParametersOutput', host: string, username?: string | null, port: number, secure?: boolean | null, password: string } | null, CALDAV?: { __typename?: 'ConnectionParametersOutput', host: string, username?: string | null, password: string } | null } | null } };+export type GetAdminAiModelsQueryVariables = Exact<{ [key: string]: never; }>;+++export type GetAdminAiModelsQuery = { __typename?: 'Query', getAdminAiModels: { __typename?: 'AdminAIModelsOutput', autoEnableNewModels: boolean, models: Array<{ __typename?: 'AdminAIModelConfig', modelId: string, label: string, modelFamily?: ModelFamily | null, inferenceProvider: InferenceProvider, isAvailable: boolean, isAdminEnabled: boolean, deprecated?: boolean | null, isRecommended?: boolean | null }> } };++export type SetAdminAiModelEnabledMutationVariables = Exact<{+ modelId: Scalars['String'];+ enabled: Scalars['Boolean'];+}>;+++export type SetAdminAiModelEnabledMutation = { __typename?: 'Mutation', setAdminAiModelEnabled: boolean };+export type CreateDatabaseConfigVariableMutationVariables = Exact<{key: Scalars['String'];value: Scalars['JSON'];@@ -6509,7 +6550,7 @@ export type BillingSubscriptionFragmentFragment = { __typename?: 'BillingSubscriexport type CurrentBillingSubscriptionFragmentFragment = { __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, interval?: SubscriptionInterval | null, metadata: any, currentPeriodEnd?: string | null, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }>, billingSubscriptionItems?: Array<{ __typename?: 'BillingSubscriptionItemDTO', id: string, hasReachedCurrentPeriodCap: boolean, quantity?: number | null, stripePriceId: string, billingProduct: { __typename?: 'BillingLicensedProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } | { __typename?: 'BillingMeteredProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } }> | null };-export type UserQueryFragmentFragment = { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, hasPassword: boolean, canAccessFullAdminPanel: boolean, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars?: any | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale?: string | null, userEmail: string, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, calendarStartDay?: number | null, numberFormat?: WorkspaceMemberNumberFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, deletedWorkspaceMembers?: Array<{ __typename?: 'DeletedWorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', id: string, permissionFlags?: Array<PermissionFlagType> | null, objectsPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null, rowLevelPermissionPredicates?: Array<{ __typename?: 'RowLevelPermissionPredicate', id: string, fieldMetadataId: string, objectMetadataId: string, operand: RowLevelPermissionPredicateOperand, subFieldName?: string | null, workspaceMemberFieldMetadataId?: string | null, workspaceMemberSubFieldName?: string | null, rowLevelPermissionPredicateGroupId?: string | null, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, value?: any | null }> | null, rowLevelPermissionPredicateGroups?: Array<{ __typename?: 'RowLevelPermissionPredicateGroup', id: string, parentRowLevelPermissionPredicateGroupId?: string | null, logicalOperator: RowLevelPermissionPredicateGroupLogicalOperator, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, objectMetadataId: string }> | null }> | null, twoFactorAuthenticationMethodSummary?: Array<{ __typename?: 'TwoFactorAuthenticationMethodDTO', twoFactorAuthenticationMethodId: string, status: string, strategy: string }> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, isGoogleAuthBypassEnabled: boolean, isMicrosoftAuthBypassEnabled: boolean, isPasswordAuthBypassEnabled: boolean, subdomain: string, customDomain?: string | null, hasValidEnterpriseKey: boolean, isCustomDomainEnabled: boolean, metadataVersion: number, workspaceMembersCount?: number | null, fastModel: string, smartModel: string, aiAdditionalInstructions?: string | null, isTwoFactorAuthenticationEnforced: boolean, trashRetentionDays: number, eventLogRetentionDays: number, editableProfileFields?: Array<string> | null, workspaceCustomApplication?: { __typename?: 'Application', id: string } | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlagDTO', key: FeatureFlagKey, value: boolean }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, interval?: SubscriptionInterval | null, metadata: any, currentPeriodEnd?: string | null, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }>, billingSubscriptionItems?: Array<{ __typename?: 'BillingSubscriptionItemDTO', id: string, hasReachedCurrentPeriodCap: boolean, quantity?: number | null, stripePriceId: string, billingProduct: { __typename?: 'BillingLicensedProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } | { __typename?: 'BillingMeteredProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } }> | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, metadata: any, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }> }>, billingEntitlements: Array<{ __typename?: 'BillingEntitlement', key: BillingEntitlementKey, value: boolean }>, defaultRole?: { __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean } | null } | null, availableWorkspaces: { __typename?: 'AvailableWorkspaces', availableWorkspacesForSignIn: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }>, availableWorkspacesForSignUp: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } };+export type UserQueryFragmentFragment = { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, hasPassword: boolean, canAccessFullAdminPanel: boolean, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars?: any | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale?: string | null, userEmail: string, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, calendarStartDay?: number | null, numberFormat?: WorkspaceMemberNumberFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, deletedWorkspaceMembers?: Array<{ __typename?: 'DeletedWorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', id: string, permissionFlags?: Array<PermissionFlagType> | null, objectsPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null, rowLevelPermissionPredicates?: Array<{ __typename?: 'RowLevelPermissionPredicate', id: string, fieldMetadataId: string, objectMetadataId: string, operand: RowLevelPermissionPredicateOperand, subFieldName?: string | null, workspaceMemberFieldMetadataId?: string | null, workspaceMemberSubFieldName?: string | null, rowLevelPermissionPredicateGroupId?: string | null, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, value?: any | null }> | null, rowLevelPermissionPredicateGroups?: Array<{ __typename?: 'RowLevelPermissionPredicateGroup', id: string, parentRowLevelPermissionPredicateGroupId?: string | null, logicalOperator: RowLevelPermissionPredicateGroupLogicalOperator, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, objectMetadataId: string }> | null }> | null, twoFactorAuthenticationMethodSummary?: Array<{ __typename?: 'TwoFactorAuthenticationMethodDTO', twoFactorAuthenticationMethodId: string, status: string, strategy: string }> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, isGoogleAuthBypassEnabled: boolean, isMicrosoftAuthBypassEnabled: boolean, isPasswordAuthBypassEnabled: boolean, subdomain: string, customDomain?: string | null, hasValidEnterpriseKey: boolean, isCustomDomainEnabled: boolean, metadataVersion: number, workspaceMembersCount?: number | null, fastModel: string, smartModel: string, aiAdditionalInstructions?: string | null, autoEnableNewAiModels: boolean, disabledAiModelIds?: Array<string> | null, enabledAiModelIds?: Array<string> | null, useRecommendedModels: boolean, isTwoFactorAuthenticationEnforced: boolean, trashRetentionDays: number, eventLogRetentionDays: number, editableProfileFields?: Array<string> | null, workspaceCustomApplication?: { __typename?: 'Application', id: string } | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlagDTO', key: FeatureFlagKey, value: boolean }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, interval?: SubscriptionInterval | null, metadata: any, currentPeriodEnd?: string | null, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }>, billingSubscriptionItems?: Array<{ __typename?: 'BillingSubscriptionItemDTO', id: string, hasReachedCurrentPeriodCap: boolean, quantity?: number | null, stripePriceId: string, billingProduct: { __typename?: 'BillingLicensedProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } | { __typename?: 'BillingMeteredProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } }> | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, metadata: any, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }> }>, billingEntitlements: Array<{ __typename?: 'BillingEntitlement', key: BillingEntitlementKey, value: boolean }>, defaultRole?: { __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean } | null } | null, availableWorkspaces: { __typename?: 'AvailableWorkspaces', availableWorkspacesForSignIn: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }>, availableWorkspacesForSignUp: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } };export type WorkspaceUrlsFragmentFragment = { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null };@@ -6528,7 +6569,7 @@ export type DeleteUserWorkspaceMutation = { __typename?: 'Mutation', deleteUserFexport type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, hasPassword: boolean, canAccessFullAdminPanel: boolean, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars?: any | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale?: string | null, userEmail: string, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, calendarStartDay?: number | null, numberFormat?: WorkspaceMemberNumberFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, deletedWorkspaceMembers?: Array<{ __typename?: 'DeletedWorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', id: string, permissionFlags?: Array<PermissionFlagType> | null, objectsPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null, rowLevelPermissionPredicates?: Array<{ __typename?: 'RowLevelPermissionPredicate', id: string, fieldMetadataId: string, objectMetadataId: string, operand: RowLevelPermissionPredicateOperand, subFieldName?: string | null, workspaceMemberFieldMetadataId?: string | null, workspaceMemberSubFieldName?: string | null, rowLevelPermissionPredicateGroupId?: string | null, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, value?: any | null }> | null, rowLevelPermissionPredicateGroups?: Array<{ __typename?: 'RowLevelPermissionPredicateGroup', id: string, parentRowLevelPermissionPredicateGroupId?: string | null, logicalOperator: RowLevelPermissionPredicateGroupLogicalOperator, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, objectMetadataId: string }> | null }> | null, twoFactorAuthenticationMethodSummary?: Array<{ __typename?: 'TwoFactorAuthenticationMethodDTO', twoFactorAuthenticationMethodId: string, status: string, strategy: string }> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, isGoogleAuthBypassEnabled: boolean, isMicrosoftAuthBypassEnabled: boolean, isPasswordAuthBypassEnabled: boolean, subdomain: string, customDomain?: string | null, hasValidEnterpriseKey: boolean, isCustomDomainEnabled: boolean, metadataVersion: number, workspaceMembersCount?: number | null, fastModel: string, smartModel: string, aiAdditionalInstructions?: string | null, isTwoFactorAuthenticationEnforced: boolean, trashRetentionDays: number, eventLogRetentionDays: number, editableProfileFields?: Array<string> | null, workspaceCustomApplication?: { __typename?: 'Application', id: string } | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlagDTO', key: FeatureFlagKey, value: boolean }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, interval?: SubscriptionInterval | null, metadata: any, currentPeriodEnd?: string | null, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }>, billingSubscriptionItems?: Array<{ __typename?: 'BillingSubscriptionItemDTO', id: string, hasReachedCurrentPeriodCap: boolean, quantity?: number | null, stripePriceId: string, billingProduct: { __typename?: 'BillingLicensedProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } | { __typename?: 'BillingMeteredProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } }> | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, metadata: any, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }> }>, billingEntitlements: Array<{ __typename?: 'BillingEntitlement', key: BillingEntitlementKey, value: boolean }>, defaultRole?: { __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean } | null } | null, availableWorkspaces: { __typename?: 'AvailableWorkspaces', availableWorkspacesForSignIn: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }>, availableWorkspacesForSignUp: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } } };+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: string, firstName: string, lastName: string, email: string, hasPassword: boolean, canAccessFullAdminPanel: boolean, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars?: any | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: string, colorScheme: string, avatarUrl?: string | null, locale?: string | null, userEmail: string, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, calendarStartDay?: number | null, numberFormat?: WorkspaceMemberNumberFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, deletedWorkspaceMembers?: Array<{ __typename?: 'DeletedWorkspaceMember', id: string, avatarUrl?: string | null, userEmail: string, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', id: string, permissionFlags?: Array<PermissionFlagType> | null, objectsPermissions?: Array<{ __typename?: 'ObjectPermission', objectMetadataId: string, canReadObjectRecords?: boolean | null, canUpdateObjectRecords?: boolean | null, canSoftDeleteObjectRecords?: boolean | null, canDestroyObjectRecords?: boolean | null, restrictedFields?: any | null, rowLevelPermissionPredicates?: Array<{ __typename?: 'RowLevelPermissionPredicate', id: string, fieldMetadataId: string, objectMetadataId: string, operand: RowLevelPermissionPredicateOperand, subFieldName?: string | null, workspaceMemberFieldMetadataId?: string | null, workspaceMemberSubFieldName?: string | null, rowLevelPermissionPredicateGroupId?: string | null, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, value?: any | null }> | null, rowLevelPermissionPredicateGroups?: Array<{ __typename?: 'RowLevelPermissionPredicateGroup', id: string, parentRowLevelPermissionPredicateGroupId?: string | null, logicalOperator: RowLevelPermissionPredicateGroupLogicalOperator, positionInRowLevelPermissionPredicateGroup?: number | null, roleId: string, objectMetadataId: string }> | null }> | null, twoFactorAuthenticationMethodSummary?: Array<{ __typename?: 'TwoFactorAuthenticationMethodDTO', twoFactorAuthenticationMethodId: string, status: string, strategy: string }> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: string, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, isGoogleAuthBypassEnabled: boolean, isMicrosoftAuthBypassEnabled: boolean, isPasswordAuthBypassEnabled: boolean, subdomain: string, customDomain?: string | null, hasValidEnterpriseKey: boolean, isCustomDomainEnabled: boolean, metadataVersion: number, workspaceMembersCount?: number | null, fastModel: string, smartModel: string, aiAdditionalInstructions?: string | null, autoEnableNewAiModels: boolean, disabledAiModelIds?: Array<string> | null, enabledAiModelIds?: Array<string> | null, useRecommendedModels: boolean, isTwoFactorAuthenticationEnforced: boolean, trashRetentionDays: number, eventLogRetentionDays: number, editableProfileFields?: Array<string> | null, workspaceCustomApplication?: { __typename?: 'Application', id: string } | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlagDTO', key: FeatureFlagKey, value: boolean }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, interval?: SubscriptionInterval | null, metadata: any, currentPeriodEnd?: string | null, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }>, billingSubscriptionItems?: Array<{ __typename?: 'BillingSubscriptionItemDTO', id: string, hasReachedCurrentPeriodCap: boolean, quantity?: number | null, stripePriceId: string, billingProduct: { __typename?: 'BillingLicensedProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } | { __typename?: 'BillingMeteredProduct', name: string, description: string, images?: Array<string> | null, metadata: { __typename?: 'BillingProductMetadata', productKey: BillingProductKey, planKey: BillingPlanKey, priceUsageBased: BillingUsageType } } }> | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: string, status: SubscriptionStatus, metadata: any, phases: Array<{ __typename?: 'BillingSubscriptionSchedulePhase', start_date: number, end_date: number, items: Array<{ __typename?: 'BillingSubscriptionSchedulePhaseItem', price: string, quantity?: number | null }> }> }>, billingEntitlements: Array<{ __typename?: 'BillingEntitlement', key: BillingEntitlementKey, value: boolean }>, defaultRole?: { __typename?: 'Role', id: string, label: string, description?: string | null, icon?: string | null, canUpdateAllSettings: boolean, canAccessAllTools: boolean, isEditable: boolean, canReadAllObjectRecords: boolean, canUpdateAllObjectRecords: boolean, canSoftDeleteAllObjectRecords: boolean, canDestroyAllObjectRecords: boolean, canBeAssignedToUsers: boolean, canBeAssignedToAgents: boolean, canBeAssignedToApiKeys: boolean } | null } | null, availableWorkspaces: { __typename?: 'AvailableWorkspaces', availableWorkspacesForSignIn: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }>, availableWorkspacesForSignUp: Array<{ __typename?: 'AvailableWorkspace', id: string, displayName?: string | null, loginToken?: string | null, inviteHash?: string | null, personalInviteToken?: string | null, logo?: string | null, workspaceUrls: { __typename?: 'WorkspaceUrls', subdomainUrl: string, customUrl?: string | null }, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } } };export type ViewFieldFragmentFragment = { __typename?: 'CoreViewField', id: string, fieldMetadataId: string, viewId: string, isVisible: boolean, position: number, size: number, aggregateOperation?: AggregateOperations | null, createdAt: string, updatedAt: string, deletedAt?: string | null };@@ -7835,6 +7876,10 @@ export const UserQueryFragmentFragmentDoc = gql`fastModelsmartModelaiAdditionalInstructions+ autoEnableNewAiModels+ disabledAiModelIds+ enabledAiModelIds+ useRecommendedModelsisTwoFactorAuthenticationEnforcedtrashRetentionDayseventLogRetentionDays@@ -12056,6 +12101,63 @@ export function useGetConnectedImapSmtpCaldavAccountLazyQuery(baseOptions?: Apolexport type GetConnectedImapSmtpCaldavAccountQueryHookResult = ReturnType<typeof useGetConnectedImapSmtpCaldavAccountQuery>;export type GetConnectedImapSmtpCaldavAccountLazyQueryHookResult = ReturnType<typeof useGetConnectedImapSmtpCaldavAccountLazyQuery>;export type GetConnectedImapSmtpCaldavAccountQueryResult = Apollo.QueryResult<GetConnectedImapSmtpCaldavAccountQuery, GetConnectedImapSmtpCaldavAccountQueryVariables>;+export const GetAdminAiModelsDocument = gql`+ query GetAdminAiModels {+ getAdminAiModels {+ autoEnableNewModels+ models {+ modelId+ label+ modelFamily+ inferenceProvider+ isAvailable+ isAdminEnabled+ deprecated+ isRecommended+ }+ }+}+ `;++/**+ * __useGetAdminAiModelsQuery__+ *+ * To run a query within a React component, call `useGetAdminAiModelsQuery` and pass it any options that fit your needs.+ * When your component renders, `useGetAdminAiModelsQuery` returns an object from Apollo Client that contains loading, error, and data properties+ * you can use to render your UI.+ *+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;+ *+ * @example+ * const { data, loading, error } = useGetAdminAiModelsQuery({+ * variables: {+ * },+ * });+ */+export function useGetAdminAiModelsQuery(baseOptions?: Apollo.QueryHookOptions<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useQuery<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>(GetAdminAiModelsDocument, options);+ }+export function useGetAdminAiModelsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useLazyQuery<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>(GetAdminAiModelsDocument, options);+ }+export type GetAdminAiModelsQueryHookResult = ReturnType<typeof useGetAdminAiModelsQuery>;+export type GetAdminAiModelsLazyQueryHookResult = ReturnType<typeof useGetAdminAiModelsLazyQuery>;+export type GetAdminAiModelsQueryResult = Apollo.QueryResult<GetAdminAiModelsQuery, GetAdminAiModelsQueryVariables>;+export const SetAdminAiModelEnabledDocument = gql`+ mutation SetAdminAiModelEnabled($modelId: String!, $enabled: Boolean!) {+ setAdminAiModelEnabled(modelId: $modelId, enabled: $enabled)+}+ `;+export type SetAdminAiModelEnabledMutationFn = Apollo.MutationFunction<SetAdminAiModelEnabledMutation, SetAdminAiModelEnabledMutationVariables>;+export function useSetAdminAiModelEnabledMutation(baseOptions?: Apollo.MutationHookOptions<SetAdminAiModelEnabledMutation, SetAdminAiModelEnabledMutationVariables>) {+ const options = {...defaultOptions, ...baseOptions}+ return Apollo.useMutation<SetAdminAiModelEnabledMutation, SetAdminAiModelEnabledMutationVariables>(SetAdminAiModelEnabledDocument, options);+ }+export type SetAdminAiModelEnabledMutationHookResult = ReturnType<typeof useSetAdminAiModelEnabledMutation>;+export type SetAdminAiModelEnabledMutationResult = Apollo.MutationResult<SetAdminAiModelEnabledMutation>;+export type SetAdminAiModelEnabledMutationOptions = Apollo.BaseMutationOptions<SetAdminAiModelEnabledMutation, SetAdminAiModelEnabledMutationVariables>;export const CreateDatabaseConfigVariableDocument = gql`mutation CreateDatabaseConfigVariable($key: String!, $value: JSON!) {createDatabaseConfigVariable(key: $key, value: $value)diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiModelOptions.ts b/packages/twenty-front/src/modules/ai/hooks/useAiModelOptions.tsindex 4e257a592ba..e5a5eaf6c2b 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAiModelOptions.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAiModelOptions.ts@@ -1,39 +1,35 @@-import { aiModelsState } from '@/client-config/states/aiModelsState';import { type SelectOption } from 'twenty-ui/input';import { DEFAULT_FAST_MODEL } from '@/ai/constants/DefaultFastModel';import { DEFAULT_SMART_MODEL } from '@/ai/constants/DefaultSmartModel';+import { useWorkspaceAiModelAvailability } from '@/ai/hooks/useWorkspaceAiModelAvailability';+import { aiModelsState } from '@/client-config/states/aiModelsState';import { useRecoilValueV2 } from '@/ui/utilities/state/jotai/hooks/useRecoilValueV2';-import { MODEL_FAMILY_CONFIG } from '~/pages/settings/ai/constants/SettingsAiModelProviders';+import { getModelProviderLabel } from '~/pages/settings/ai/utils/getModelProviderLabel';export const useAiModelOptions = (includeDeprecated = false,): SelectOption<string>[] => {const aiModels = useRecoilValueV2(aiModelsState);+ const { isModelEnabled } = useWorkspaceAiModelAvailability();return aiModels- .filter((model) => includeDeprecated || !model.deprecated)+ .filter(+ (model) =>+ (includeDeprecated || !model.deprecated) &&+ isModelEnabled(model.modelId, model),+ ).map((model) => ({value: model.modelId,label:model.modelId === DEFAULT_FAST_MODEL ||model.modelId === DEFAULT_SMART_MODEL? model.label- : `${model.label} (${getModelFamilyLabel(model.modelFamily) ?? model.inferenceProvider})`,+ : `${model.label} (${getModelProviderLabel(model.modelFamily) || model.inferenceProvider})`,})).sort((a, b) => a.label.localeCompare(b.label));};-const getModelFamilyLabel = (- modelFamily: string | null | undefined,-): string | undefined => {- if (!modelFamily) {- return undefined;- }-- return MODEL_FAMILY_CONFIG[modelFamily]?.label || modelFamily;-};-export const useAiModelLabel = (modelId: string | undefined,includeProvider = true,@@ -58,5 +54,5 @@ export const useAiModelLabel = (return model.label;}- return `${model.label} (${getModelFamilyLabel(model.modelFamily) ?? model.inferenceProvider})`;+ return `${model.label} (${getModelProviderLabel(model.modelFamily) || model.inferenceProvider})`;};diff --git a/packages/twenty-front/src/modules/ai/hooks/useWorkspaceAiModelAvailability.ts b/packages/twenty-front/src/modules/ai/hooks/useWorkspaceAiModelAvailability.tsnew file mode 100644index 00000000000..72403439892--- /dev/null+++ b/packages/twenty-front/src/modules/ai/hooks/useWorkspaceAiModelAvailability.ts@@ -0,0 +1,64 @@+import { DEFAULT_FAST_MODEL } from '@/ai/constants/DefaultFastModel';+import { DEFAULT_SMART_MODEL } from '@/ai/constants/DefaultSmartModel';+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { aiModelsState } from '@/client-config/states/aiModelsState';+import { useRecoilValueV2 } from '@/ui/utilities/state/jotai/hooks/useRecoilValueV2';+import { type ClientAiModelConfig } from '~/generated-metadata/graphql';++const VIRTUAL_MODEL_IDS: Set<string> = new Set([+ DEFAULT_SMART_MODEL,+ DEFAULT_FAST_MODEL,+]);++const isVirtualModel = (modelId: string) => VIRTUAL_MODEL_IDS.has(modelId);++export const useWorkspaceAiModelAvailability = () => {+ const aiModels = useRecoilValueV2(aiModelsState);+ const currentWorkspace = useRecoilValueV2(currentWorkspaceState);++ const useRecommendedModels = currentWorkspace?.useRecommendedModels ?? true;+ const autoEnableNewAiModels = currentWorkspace?.autoEnableNewAiModels ?? true;+ const disabledAiModelIds = currentWorkspace?.disabledAiModelIds ?? [];+ const enabledAiModelIds = currentWorkspace?.enabledAiModelIds ?? [];++ const isModelEnabled = (+ modelId: string,+ model?: ClientAiModelConfig,+ ): boolean => {+ if (isVirtualModel(modelId)) {+ return true;+ }++ if (useRecommendedModels) {+ return model?.isRecommended === true;+ }++ return autoEnableNewAiModels+ ? !disabledAiModelIds.includes(modelId)+ : enabledAiModelIds.includes(modelId);+ };++ const realModels = aiModels.filter(+ (model) => !isVirtualModel(model.modelId) && !model.deprecated,+ );++ const enabledModels = realModels.filter((model) =>+ isModelEnabled(model.modelId, model),+ );++ const allModelsWithAvailability = realModels.map((model) => ({+ ...model,+ isEnabled: isModelEnabled(model.modelId, model),+ }));++ return {+ isModelEnabled,+ enabledModels,+ realModels,+ allModelsWithAvailability,+ useRecommendedModels,+ autoEnableNewAiModels,+ disabledAiModelIds,+ enabledAiModelIds,+ };+};diff --git a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.tsindex e60c23cfd10..2ab887ee2cd 100644--- a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts+++ b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts@@ -70,6 +70,10 @@ const mockWorkspace = {fastModel: DEFAULT_FAST_MODEL,smartModel: DEFAULT_SMART_MODEL,routerModel: 'auto',+ autoEnableNewAiModels: true,+ disabledAiModelIds: [],+ enabledAiModelIds: [],+ useRecommendedModels: true,workspaceCustomApplication: CUSTOM_WORKSPACE_APPLICATION_MOCK,workspaceCustomApplicationId: CUSTOM_WORKSPACE_APPLICATION_MOCK.id,};diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.tsindex 379458a6869..001bad094f3 100644--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts@@ -38,6 +38,10 @@ export type CurrentWorkspace = Pick<| 'smartModel'| 'aiAdditionalInstructions'| 'editableProfileFields'+ | 'autoEnableNewAiModels'+ | 'disabledAiModelIds'+ | 'enabledAiModelIds'+ | 'useRecommendedModels'> & {defaultRole?: Omit<Role, 'workspaceMembers' | 'agents' | 'apiKeys'> | null;workspaceCustomApplication: Pick<Application, 'id'> | null;diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsxindex 87160451105..c710bcb7100 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/IsAppMetadataReadyEffect.tsx@@ -18,13 +18,6 @@ export const IsAppMetadataReadyEffect = () => {const viewsEntry = useFamilyRecoilValueV2(metadataStoreState, 'views');const setIsAppMetadataReady = useSetRecoilStateV2(isAppMetadataReadyState);- console.log('objectsEntry', objectsEntry);- console.log('viewsEntry', viewsEntry);- console.log('isLoggedIn', isLoggedIn);- console.log('currentUser', currentUser);- console.log('currentWorkspace', currentWorkspace);- console.log('setIsAppMetadataReady', setIsAppMetadataReady);-useEffect(() => {const hasActiveWorkspace = isWorkspaceActiveOrSuspended(currentWorkspace);diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromObjectMetadata.test.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromObjectMetadata.test.tsindex f7bf32e806d..1ddddc63d3e 100644--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromObjectMetadata.test.ts+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromObjectMetadata.test.ts@@ -71,6 +71,10 @@ describe('useColumnDefinitionsFromObjectMetadata', () => {eventLogRetentionDays: 365 * 3,fastModel: DEFAULT_FAST_MODEL,smartModel: DEFAULT_SMART_MODEL,+ autoEnableNewAiModels: true,+ disabledAiModelIds: [],+ enabledAiModelIds: [],+ useRecommendedModels: true,});const companyObjectMetadata = generatedMockObjectMetadataItems.find(diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.tsindex a3b5630997e..eb0db541c1b 100644--- a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts@@ -6,8 +6,8 @@ import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailabimport { availableFieldMetadataItemsForFilterFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForFilterFamilySelector';import { availableFieldMetadataItemsForSortFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForSortFamilySelector';-import { useFamilySelectorValueV2 } from '@/ui/utilities/state/jotai/hooks/useFamilySelectorValueV2';import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';+import { useFamilySelectorValueV2 } from '@/ui/utilities/state/jotai/hooks/useFamilySelectorValueV2';import { useMemo } from 'react';export const useColumnDefinitionsFromObjectMetadata = (@@ -28,13 +28,12 @@ export const useColumnDefinitionsFromObjectMetadata = ();const columnDefinitions: ColumnDefinition<FieldMetadata>[] = useMemo(() => {- const activeFieldMetadataItems =- objectMetadataItem.readableFields.filter(- (field) =>- field.isActive &&- (!isHiddenSystemField(field) ||- field.id === objectMetadataItem.labelIdentifierFieldMetadataId),- );+ const activeFieldMetadataItems = objectMetadataItem.readableFields.filter(+ (field) =>+ field.isActive &&+ (!isHiddenSystemField(field) ||+ field.id === objectMetadataItem.labelIdentifierFieldMetadataId),+ );return activeFieldMetadataItems.map((field, index) =>diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsxnew file mode 100644index 00000000000..00eb5e781c4--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx@@ -0,0 +1,233 @@+import { useState } from 'react';+import styled from '@emotion/styled';++import { useClientConfig } from '@/client-config/hooks/useClientConfig';+import { GET_ADMIN_AI_MODELS } from '@/settings/admin-panel/ai/graphql/queries/getAdminAiModels';+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { t } from '@lingui/core/macro';+import {+ H2Title,+ IconArchive,+ IconFilter,+ IconPlug,+ IconRobot,+ IconSearch,+} from 'twenty-ui/display';+import { Button } from 'twenty-ui/input';+import { Card, Section } from 'twenty-ui/layout';+import { MenuItemToggle } from 'twenty-ui/navigation';+import {+ useCreateDatabaseConfigVariableMutation,+ useGetAdminAiModelsQuery,+ useSetAdminAiModelEnabledMutation,+} from '~/generated-metadata/graphql';+import { getModelIcon } from '~/pages/settings/ai/utils/getModelIcon';+import { getModelProviderLabel } from '~/pages/settings/ai/utils/getModelProviderLabel';++const StyledSearchAndFilterContainer = styled.div`+ display: flex;+ gap: ${({ theme }) => theme.spacing(2)};+ margin-bottom: ${({ theme }) => theme.spacing(2)};+ width: 100%;+`;++const StyledSearchInput = styled(SettingsTextInput)`+ flex: 1;+`;++export const SettingsAdminAI = () => {+ const { enqueueErrorSnackBar } = useSnackBar();+ const [searchQuery, setSearchQuery] = useState('');+ const [showUnconfigured, setShowUnconfigured] = useState(false);+ const [showDeprecated, setShowDeprecated] = useState(false);+ const { refetch: refetchClientConfig } = useClientConfig();++ const { data } = useGetAdminAiModelsQuery();+ const [createConfigVariable] = useCreateDatabaseConfigVariableMutation();+ const [setModelEnabled] = useSetAdminAiModelEnabledMutation();++ const autoEnableNewModels =+ data?.getAdminAiModels?.autoEnableNewModels ?? true;++ const models = data?.getAdminAiModels?.models ?? [];++ const handleAutoEnableToggle = async (checked: boolean) => {+ try {+ await createConfigVariable({+ variables: {+ key: 'AI_AUTO_ENABLE_NEW_MODELS',+ value: checked,+ },+ refetchQueries: [{ query: GET_ADMIN_AI_MODELS }],+ });++ await refetchClientConfig();+ } catch {+ enqueueErrorSnackBar({+ message: t`Failed to update auto-enable setting`,+ });+ }+ };++ const handleModelToggle = async (+ modelId: string,+ isCurrentlyEnabled: boolean,+ ) => {+ try {+ await setModelEnabled({+ variables: {+ modelId,+ enabled: !isCurrentlyEnabled,+ },+ refetchQueries: [{ query: GET_ADMIN_AI_MODELS }],+ });++ await refetchClientConfig();+ } catch {+ enqueueErrorSnackBar({+ message: t`Failed to update model availability`,+ });+ }+ };++ let filteredModels = models;++ if (!showUnconfigured) {+ filteredModels = filteredModels.filter((model) => model.isAvailable);+ }++ if (!showDeprecated) {+ filteredModels = filteredModels.filter((model) => !model.deprecated);+ }++ if (searchQuery.trim().length > 0) {+ const query = searchQuery.toLowerCase();++ filteredModels = filteredModels.filter(+ (model) =>+ model.label.toLowerCase().includes(query) ||+ (model.modelFamily?.toLowerCase().includes(query) ?? false) ||+ model.inferenceProvider.toLowerCase().includes(query),+ );+ }++ const getModelDescription = (+ modelFamily: string | null | undefined,+ isAvailable: boolean,+ isDeprecated: boolean | null | undefined,+ ) => {+ const providerLabel = getModelProviderLabel(modelFamily);++ if (isDeprecated === true) {+ return providerLabel ? t`${providerLabel} — Deprecated` : t`Deprecated`;+ }++ if (!isAvailable) {+ return providerLabel+ ? t`${providerLabel} — API key not configured`+ : t`API key not configured`;+ }++ return providerLabel;+ };++ return (+ <>+ <Section>+ <H2Title+ title={t`Admin Model Controls`}+ description={t`Server-wide AI model availability settings`}+ />++ <Card rounded>+ <SettingsOptionCardContentToggle+ Icon={IconRobot}+ title={t`Automatically enable new models`}+ description={t`When enabled, newly added models are available to all workspaces by default`}+ checked={autoEnableNewModels}+ onChange={handleAutoEnableToggle}+ />+ </Card>+ </Section>++ <Section>+ <H2Title+ title={t`All Models`}+ description={t`Toggle model availability across all workspaces`}+ />++ <StyledSearchAndFilterContainer>+ <StyledSearchInput+ instanceId="admin-model-search"+ LeftIcon={IconSearch}+ placeholder={t`Search a model...`}+ value={searchQuery}+ onChange={setSearchQuery}+ />+ <Dropdown+ dropdownId="admin-ai-models-filter-dropdown"+ dropdownPlacement="bottom-end"+ dropdownOffset={{ x: 0, y: 8 }}+ clickableComponent={+ <Button+ Icon={IconFilter}+ size="medium"+ variant="secondary"+ accent="default"+ ariaLabel={t`Filter`}+ />+ }+ dropdownComponents={+ <DropdownContent>+ <DropdownMenuItemsContainer>+ <MenuItemToggle+ LeftIcon={IconPlug}+ onToggleChange={() =>+ setShowUnconfigured(!showUnconfigured)+ }+ toggled={showUnconfigured}+ text={t`Unconfigured models`}+ toggleSize="small"+ />+ <MenuItemToggle+ LeftIcon={IconArchive}+ onToggleChange={() => setShowDeprecated(!showDeprecated)}+ toggled={showDeprecated}+ text={t`Deprecated models`}+ toggleSize="small"+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ }+ />+ </StyledSearchAndFilterContainer>++ <Card rounded>+ {filteredModels.map((model, index) => (+ <SettingsOptionCardContentToggle+ key={model.modelId}+ Icon={getModelIcon(model.modelFamily)}+ title={model.label}+ description={getModelDescription(+ model.modelFamily,+ model.isAvailable,+ model.deprecated,+ )}+ checked={model.isAdminEnabled}+ onChange={() =>+ handleModelToggle(model.modelId, model.isAdminEnabled)+ }+ disabled={!model.isAvailable || model.deprecated === true}+ divider={index < filteredModels.length - 1}+ />+ ))}+ </Card>+ </Section>+ </>+ );+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/mutations/setAdminAiModelEnabled.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/mutations/setAdminAiModelEnabled.tsnew file mode 100644index 00000000000..0c1259b0ca7--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/mutations/setAdminAiModelEnabled.ts@@ -0,0 +1,7 @@+import { gql } from '@apollo/client';++export const SET_ADMIN_AI_MODEL_ENABLED = gql`+ mutation SetAdminAiModelEnabled($modelId: String!, $enabled: Boolean!) {+ setAdminAiModelEnabled(modelId: $modelId, enabled: $enabled)+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/queries/getAdminAiModels.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/queries/getAdminAiModels.tsnew file mode 100644index 00000000000..0a5845e9711--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/graphql/queries/getAdminAiModels.ts@@ -0,0 +1,19 @@+import { gql } from '@apollo/client';++export const GET_ADMIN_AI_MODELS = gql`+ query GetAdminAiModels {+ getAdminAiModels {+ autoEnableNewModels+ models {+ modelId+ label+ modelFamily+ inferenceProvider+ isAvailable+ isAdminEnabled+ deprecated+ isRecommended+ }+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsxindex 9fc97cf6ee1..62e4dfb863e 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx@@ -4,7 +4,12 @@ import { SETTINGS_ADMIN_TABS } from '@/settings/admin-panel/constants/SettingsAdimport { SETTINGS_ADMIN_TABS_ID } from '@/settings/admin-panel/constants/SettingsAdminTabsId';import { TabList } from '@/ui/layout/tab-list/components/TabList';import { t } from '@lingui/core/macro';-import { IconHeart, IconSettings2, IconVariable } from 'twenty-ui/display';+import {+ IconHeart,+ IconSettings2,+ IconSparkles,+ IconVariable,+} from 'twenty-ui/display';import { useRecoilValueV2 } from '@/ui/utilities/state/jotai/hooks/useRecoilValueV2';export const SettingsAdminContent = () => {@@ -19,15 +24,21 @@ export const SettingsAdminContent = () => {Icon: IconSettings2,disabled: !canAccessFullAdminPanel && !canImpersonate,},+ {+ id: SETTINGS_ADMIN_TABS.AI,+ title: t`AI`,+ Icon: IconSparkles,+ disabled: !canAccessFullAdminPanel,+ },{id: SETTINGS_ADMIN_TABS.CONFIG_VARIABLES,- title: t`Config Variables`,+ title: t`Config`,Icon: IconVariable,disabled: !canAccessFullAdminPanel,},{id: SETTINGS_ADMIN_TABS.HEALTH_STATUS,- title: t`Health Status`,+ title: t`Health`,Icon: IconHeart,disabled: !canAccessFullAdminPanel,},diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsxindex e0034b3ecc1..bd6b7cec171 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTabContent.tsx@@ -1,3 +1,4 @@+import { SettingsAdminAI } from '@/settings/admin-panel/ai/components/SettingsAdminAI';import { SettingsAdminGeneral } from '@/settings/admin-panel/components/SettingsAdminGeneral';import { SettingsAdminConfigVariables } from '@/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables';import { SETTINGS_ADMIN_TABS } from '@/settings/admin-panel/constants/SettingsAdminTabs';@@ -15,6 +16,8 @@ export const SettingsAdminTabContent = () => {switch (activeTabId) {case SETTINGS_ADMIN_TABS.GENERAL:return <SettingsAdminGeneral />;+ case SETTINGS_ADMIN_TABS.AI:+ return <SettingsAdminAI />;case SETTINGS_ADMIN_TABS.CONFIG_VARIABLES:return <SettingsAdminConfigVariables />;case SETTINGS_ADMIN_TABS.HEALTH_STATUS:diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.tsindex c2b3e913079..4aa7bd6e46c 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminTabs.ts@@ -1,5 +1,6 @@export const SETTINGS_ADMIN_TABS = {GENERAL: 'general',+ AI: 'ai',CONFIG_VARIABLES: 'config-variables',HEALTH_STATUS: 'health-status',};diff --git a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.tsindex 0885af796e9..1e112a1748c 100644--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts@@ -90,6 +90,10 @@ export const USER_QUERY_FRAGMENT = gql`fastModelsmartModelaiAdditionalInstructions+ autoEnableNewAiModels+ disabledAiModelIds+ enabledAiModelIds+ useRecommendedModelsisTwoFactorAuthenticationEnforcedtrashRetentionDayseventLogRetentionDaysdiff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIModelsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIModelsTab.tsxindex c6e9cb53729..0cae768ec2b 100644--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIModelsTab.tsx+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIModelsTab.tsx@@ -1,108 +1,388 @@+import { useState } from 'react';+import styled from '@emotion/styled';+import { DEFAULT_FAST_MODEL } from '@/ai/constants/DefaultFastModel';import { DEFAULT_SMART_MODEL } from '@/ai/constants/DefaultSmartModel';+import { useWorkspaceAiModelAvailability } from '@/ai/hooks/useWorkspaceAiModelAvailability';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { aiModelsState } from '@/client-config/states/aiModelsState';import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { Select } from '@/ui/input/components/Select';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { useRecoilStateV2 } from '@/ui/utilities/state/jotai/hooks/useRecoilStateV2';import { useRecoilValueV2 } from '@/ui/utilities/state/jotai/hooks/useRecoilValueV2';import { t } from '@lingui/core/macro';-import { H2Title, IconBolt } from 'twenty-ui/display';+import {+ H2Title,+ IconBolt,+ IconRobot,+ IconSearch,+ IconTwentyStar,+} from 'twenty-ui/display';import { Card, Section } from 'twenty-ui/layout';import { useUpdateWorkspaceMutation } from '~/generated-metadata/graphql';-import { MODEL_FAMILY_CONFIG } from '~/pages/settings/ai/constants/SettingsAiModelProviders';+import { getModelIcon } from '~/pages/settings/ai/utils/getModelIcon';+import { getModelProviderLabel } from '~/pages/settings/ai/utils/getModelProviderLabel';++const StyledSearchContainer = styled.div`+ padding-bottom: ${({ theme }) => theme.spacing(2)};+`;-const VIRTUAL_MODEL_IDS: Set<string> = new Set([- DEFAULT_SMART_MODEL,- DEFAULT_FAST_MODEL,-]);+const StyledSearchInput = styled(SettingsTextInput)`+ width: 100%;+`;export const SettingsAIModelsTab = () => {- const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();+ const { enqueueErrorSnackBar } = useSnackBar();const [currentWorkspace, setCurrentWorkspace] = useRecoilStateV2(currentWorkspaceState,);const [updateWorkspace] = useUpdateWorkspaceMutation();-+ const [searchQuery, setSearchQuery] = useState('');const aiModels = useRecoilValueV2(aiModelsState);- const realModels = aiModels.filter(- (model) => !VIRTUAL_MODEL_IDS.has(model.modelId),- );+ const {+ allModelsWithAvailability,+ enabledModels,+ useRecommendedModels,+ autoEnableNewAiModels,+ realModels,+ } = useWorkspaceAiModelAvailability();const currentSmartModel = currentWorkspace?.smartModel;+ const currentFastModel = currentWorkspace?.fastModel;++ const buildVirtualModelOption = (virtualModelId: string) => {+ const virtualModel = aiModels.find(+ (model) => model.modelId === virtualModelId,+ );++ return virtualModel+ ? {+ value: virtualModelId,+ label: virtualModel.label,+ Icon: IconTwentyStar,+ }+ : null;+ };++ const smartAutoOption = buildVirtualModelOption(DEFAULT_SMART_MODEL);+ const fastAutoOption = buildVirtualModelOption(DEFAULT_FAST_MODEL);++ const modelOptions = enabledModels.map((model) => ({+ value: model.modelId,+ label: model.label,+ Icon: getModelIcon(model.modelFamily),+ }));++ const smartModelOptions = [...modelOptions];++ if (smartAutoOption !== null) {+ smartModelOptions.unshift(smartAutoOption);+ }++ const fastModelOptions = [...modelOptions];++ if (fastAutoOption !== null) {+ fastModelOptions.unshift(fastAutoOption);+ }++ const handleModelFieldChange = async (+ field: 'smartModel' | 'fastModel',+ value: string,+ ) => {+ if (!currentWorkspace?.id) {+ return;+ }++ const previousValue = currentWorkspace[field];++ try {+ setCurrentWorkspace({+ ...currentWorkspace,+ [field]: value,+ });++ await updateWorkspace({+ variables: {+ input: {+ [field]: value,+ },+ },+ });+ } catch {+ setCurrentWorkspace({+ ...currentWorkspace,+ [field]: previousValue,+ });++ enqueueErrorSnackBar({+ message: t`Failed to update model`,+ });+ }+ };++ const handleUseRecommendedToggle = async (checked: boolean) => {+ if (!currentWorkspace?.id) {+ return;+ }++ const previousValue = currentWorkspace.useRecommendedModels;++ let newEnabledIds = currentWorkspace.enabledAiModelIds ?? [];++ if (!checked && previousValue) {+ const recommendedModelIds = realModels+ .filter((model) => model.isRecommended)+ .map((model) => model.modelId);++ newEnabledIds = recommendedModelIds;+ }++ try {+ setCurrentWorkspace({+ ...currentWorkspace,+ useRecommendedModels: checked,+ enabledAiModelIds: newEnabledIds,+ });- const defaultModelOptions = realModels- .filter((model) => !model.deprecated || model.modelId === currentSmartModel)- .map((model) => ({- value: model.modelId,- label: model.label,- Icon: (model.modelFamily- ? (MODEL_FAMILY_CONFIG[model.modelFamily] ??- MODEL_FAMILY_CONFIG.FALLBACK)- : MODEL_FAMILY_CONFIG.FALLBACK- ).Icon,- }));-- const handleDefaultModelChange = async (value: string) => {+ await updateWorkspace({+ variables: {+ input: {+ useRecommendedModels: checked,+ enabledAiModelIds: newEnabledIds,+ },+ },+ });+ } catch {+ setCurrentWorkspace({+ ...currentWorkspace,+ useRecommendedModels: previousValue,+ });++ enqueueErrorSnackBar({+ message: t`Failed to update model selection mode`,+ });+ }+ };++ const handleAutoEnableToggle = async (checked: boolean) => {if (!currentWorkspace?.id) {return;}- const previousSmartModel = currentWorkspace.smartModel;+ const previousAutoEnable = currentWorkspace.autoEnableNewAiModels;+ const previousDisabled = currentWorkspace.disabledAiModelIds ?? [];+ const previousEnabled = currentWorkspace.enabledAiModelIds ?? [];++ let newDisabledIds: string[] = [];+ let newEnabledIds: string[] = [];++ if (checked) {+ newDisabledIds = realModels+ .filter((model) => !previousEnabled.includes(model.modelId))+ .map((model) => model.modelId);+ newEnabledIds = [];+ } else {+ newEnabledIds = realModels+ .filter((model) => !previousDisabled.includes(model.modelId))+ .map((model) => model.modelId);+ newDisabledIds = [];+ }try {setCurrentWorkspace({...currentWorkspace,- smartModel: value,+ autoEnableNewAiModels: checked,+ disabledAiModelIds: newDisabledIds,+ enabledAiModelIds: newEnabledIds,});await updateWorkspace({variables: {input: {- smartModel: value,+ autoEnableNewAiModels: checked,+ disabledAiModelIds: newDisabledIds,+ enabledAiModelIds: newEnabledIds,},},});+ } catch {+ setCurrentWorkspace({+ ...currentWorkspace,+ autoEnableNewAiModels: previousAutoEnable,+ disabledAiModelIds: previousDisabled,+ enabledAiModelIds: previousEnabled,+ });- enqueueSuccessSnackBar({- message: t`Default model updated successfully`,+ enqueueErrorSnackBar({+ message: t`Failed to update model availability settings`,+ });+ }+ };++ const handleModelToggle = async (+ modelId: string,+ isCurrentlyEnabled: boolean,+ ) => {+ if (!currentWorkspace?.id) {+ return;+ }++ const previousDisabled = currentWorkspace.disabledAiModelIds ?? [];+ const previousEnabled = currentWorkspace.enabledAiModelIds ?? [];++ let newDisabledIds = [...previousDisabled];+ let newEnabledIds = [...previousEnabled];++ if (autoEnableNewAiModels) {+ if (isCurrentlyEnabled) {+ newDisabledIds = [...previousDisabled, modelId];+ } else {+ newDisabledIds = previousDisabled.filter((id) => id !== modelId);+ }+ } else {+ if (isCurrentlyEnabled) {+ newEnabledIds = previousEnabled.filter((id) => id !== modelId);+ } else {+ newEnabledIds = [...previousEnabled, modelId];+ }+ }++ try {+ setCurrentWorkspace({+ ...currentWorkspace,+ disabledAiModelIds: newDisabledIds,+ enabledAiModelIds: newEnabledIds,+ });++ await updateWorkspace({+ variables: {+ input: {+ disabledAiModelIds: newDisabledIds,+ enabledAiModelIds: newEnabledIds,+ },+ },});} catch {setCurrentWorkspace({...currentWorkspace,- smartModel: previousSmartModel,+ disabledAiModelIds: previousDisabled,+ enabledAiModelIds: previousEnabled,});enqueueErrorSnackBar({- message: t`Failed to update default model`,+ message: t`Failed to update model availability`,});}};+ const filteredModels = searchQuery.trim()+ ? allModelsWithAvailability.filter((model) => {+ const query = searchQuery.toLowerCase();++ return (+ model.label.toLowerCase().includes(query) ||+ (model.modelFamily?.toLowerCase().includes(query) ?? false) ||+ model.inferenceProvider.toLowerCase().includes(query)+ );+ })+ : allModelsWithAvailability;+return (- <Section>- <H2Title- title={t`Default`}- description={t`Configure your default AI model`}- />-- <Card rounded>- <SettingsOptionCardContentSelect- Icon={IconBolt}- title={t`Default Model`}- description={t`Default model for new chats and agents`}- >- <Select- dropdownId="default-model-select"- value={currentSmartModel}- onChange={handleDefaultModelChange}- options={defaultModelOptions}- selectSizeVariant="small"+ <>+ <Section>+ <H2Title+ title={t`Models`}+ description={t`Configure default AI models and availability`}+ />++ <Card rounded>+ <SettingsOptionCardContentSelect+ Icon={IconBolt}+ title={t`Smart Model`}+ description={t`Used for chats, agents, and complex reasoning`}+ >+ <Select+ dropdownId="smart-model-select"+ value={currentSmartModel}+ onChange={(value) => handleModelFieldChange('smartModel', value)}+ options={smartModelOptions}+ selectSizeVariant="small"+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ />+ </SettingsOptionCardContentSelect>+ <SettingsOptionCardContentSelect+ Icon={IconBolt}+ title={t`Fast Model`}+ description={t`Used for lightweight tasks like title generation`}+ >+ <Select+ dropdownId="fast-model-select"+ value={currentFastModel}+ onChange={(value) => handleModelFieldChange('fastModel', value)}+ options={fastModelOptions}+ selectSizeVariant="small"+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ />+ </SettingsOptionCardContentSelect>+ <SettingsOptionCardContentToggle+ Icon={IconTwentyStar}+ title={t`Use best models only`}+ description={t`Restrict available models to a curated list`}+ checked={useRecommendedModels}+ onChange={handleUseRecommendedToggle}+ divider={!useRecommendedModels}+ />+ {!useRecommendedModels && (+ <SettingsOptionCardContentToggle+ Icon={IconRobot}+ title={t`Automatically mark new models as available`}+ description={t`When enabled, new AI models will be available to users by default`}+ checked={autoEnableNewAiModels}+ onChange={handleAutoEnableToggle}+ />+ )}+ </Card>+ </Section>++ {!useRecommendedModels && (+ <Section>+ <H2Title+ title={t`Available`}+ description={t`Models available in the chat model picker`}/>- </SettingsOptionCardContentSelect>- </Card>- </Section>++ <StyledSearchContainer>+ <StyledSearchInput+ instanceId="model-table-search"+ LeftIcon={IconSearch}+ placeholder={t`Search a model...`}+ value={searchQuery}+ onChange={setSearchQuery}+ />+ </StyledSearchContainer>++ <Card rounded>+ {filteredModels.map((model, index) => (+ <SettingsOptionCardContentToggle+ key={model.modelId}+ Icon={getModelIcon(model.modelFamily)}+ title={model.label}+ description={getModelProviderLabel(model.modelFamily)}+ checked={model.isEnabled}+ onChange={() =>+ handleModelToggle(model.modelId, model.isEnabled)+ }+ divider={index < filteredModels.length - 1}+ />+ ))}+ </Card>+ </Section>+ )}+ </>);};diff --git a/packages/twenty-front/src/pages/settings/ai/utils/getModelIcon.ts b/packages/twenty-front/src/pages/settings/ai/utils/getModelIcon.tsnew file mode 100644index 00000000000..cc3010f1c1a--- /dev/null+++ b/packages/twenty-front/src/pages/settings/ai/utils/getModelIcon.ts@@ -0,0 +1,15 @@+import { type IconComponent } from 'twenty-ui/display';++import { MODEL_FAMILY_CONFIG } from '~/pages/settings/ai/constants/SettingsAiModelProviders';++export const getModelIcon = (+ modelFamily: string | null | undefined,+): IconComponent => {+ if (!modelFamily) {+ return MODEL_FAMILY_CONFIG.FALLBACK.Icon;+ }++ const key = modelFamily.toLowerCase();++ return MODEL_FAMILY_CONFIG[key]?.Icon ?? MODEL_FAMILY_CONFIG.FALLBACK.Icon;+};diff --git a/packages/twenty-front/src/pages/settings/ai/utils/getModelProviderLabel.ts b/packages/twenty-front/src/pages/settings/ai/utils/getModelProviderLabel.tsnew file mode 100644index 00000000000..e8172fa9222--- /dev/null+++ b/packages/twenty-front/src/pages/settings/ai/utils/getModelProviderLabel.ts@@ -0,0 +1,13 @@+import { MODEL_FAMILY_CONFIG } from '~/pages/settings/ai/constants/SettingsAiModelProviders';++export const getModelProviderLabel = (+ modelFamily: string | null | undefined,+): string => {+ if (!modelFamily) {+ return '';+ }++ const key = modelFamily.toLowerCase();++ return MODEL_FAMILY_CONFIG[key]?.label ?? modelFamily;+};diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.tsindex 6ada3aac146..5419e1eac1f 100644--- a/packages/twenty-front/src/testing/mock-data/users.ts+++ b/packages/twenty-front/src/testing/mock-data/users.ts@@ -87,6 +87,10 @@ export const mockCurrentWorkspace = {fastModel: DEFAULT_FAST_MODEL,smartModel: DEFAULT_SMART_MODEL,routerModel: 'auto',+ autoEnableNewAiModels: true,+ disabledAiModelIds: [],+ enabledAiModelIds: [],+ useRecommendedModels: true,currentBillingSubscription: {__typename: 'BillingSubscription',id: '7efbc3f7-6e5e-4128-957e-8d86808cdf6a',diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1771768847449-add-ai-model-availability-columns.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1771768847449-add-ai-model-availability-columns.tsnew file mode 100644index 00000000000..838b2b88405--- /dev/null+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1771768847449-add-ai-model-availability-columns.ts@@ -0,0 +1,31 @@+import { type MigrationInterface, type QueryRunner } from 'typeorm';++export class AddAiModelAvailabilityColumns1771768847449+ implements MigrationInterface+{+ name = 'AddAiModelAvailabilityColumns1771768847449';++ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" ADD "autoEnableNewAiModels" boolean NOT NULL DEFAULT true`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" ADD "disabledAiModelIds" character varying array NOT NULL DEFAULT '{}'`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" ADD "enabledAiModelIds" character varying array NOT NULL DEFAULT '{}'`,+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" DROP COLUMN "enabledAiModelIds"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" DROP COLUMN "disabledAiModelIds"`,+ );+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" DROP COLUMN "autoEnableNewAiModels"`,+ );+ }+}diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1771840510112-1771768847450-add-use-recommended-models.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1771840510112-1771768847450-add-use-recommended-models.tsnew file mode 100644index 00000000000..987268c6b53--- /dev/null+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1771840510112-1771768847450-add-use-recommended-models.ts@@ -0,0 +1,19 @@+import { type MigrationInterface, type QueryRunner } from 'typeorm';++export class AddUseRecommendedModels1771840510112+ implements MigrationInterface+{+ name = 'AddUseRecommendedModels1771840510112';++ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" ADD "useRecommendedModels" boolean NOT NULL DEFAULT true`,+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TABLE "core"."workspace" DROP COLUMN "useRecommendedModels"`,+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.tsindex 3f918734169..033e24fb8d0 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts@@ -7,6 +7,7 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { AdminPanelHealthService } from 'src/engine/core-modules/admin-panel/admin-panel-health.service';import { AdminPanelQueueService } from 'src/engine/core-modules/admin-panel/admin-panel-queue.service';import { AdminPanelService } from 'src/engine/core-modules/admin-panel/admin-panel.service';+import { AdminAIModelsOutput } from 'src/engine/core-modules/client-config/client-config.entity';import { ConfigVariableDTO } from 'src/engine/core-modules/admin-panel/dtos/config-variable.dto';import { ConfigVariablesOutput } from 'src/engine/core-modules/admin-panel/dtos/config-variables.output';import { DeleteJobsResponseDTO } from 'src/engine/core-modules/admin-panel/dtos/delete-jobs-response.dto';@@ -30,6 +31,7 @@ import { type MessageQueue } from 'src/engine/core-modules/message-queue/messageimport { 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 { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.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';@@ -59,6 +61,7 @@ export class AdminPanelResolver {private adminPanelQueueService: AdminPanelQueueService,private featureFlagService: FeatureFlagService,private readonly twentyConfigService: TwentyConfigService,+ private readonly aiModelRegistryService: AiModelRegistryService,) {}@UseGuards(ServerLevelImpersonateGuard)@@ -138,6 +141,41 @@ export class AdminPanelResolver {return this.adminService.getVersionInfo();}+ @UseGuards(AdminPanelGuard)+ @Query(() => AdminAIModelsOutput)+ async getAdminAiModels(): Promise<AdminAIModelsOutput> {+ const models = this.aiModelRegistryService+ .getAllModelsWithStatus()+ .map(({ modelConfig, isAvailable, isAdminEnabled }) => ({+ modelId: modelConfig.modelId,+ label: modelConfig.label,+ modelFamily: modelConfig.modelFamily,+ inferenceProvider: modelConfig.inferenceProvider,+ isAvailable,+ isAdminEnabled,+ deprecated: modelConfig.deprecated,+ isRecommended: modelConfig.isRecommended,+ }));++ return {+ autoEnableNewModels: this.twentyConfigService.get(+ 'AI_AUTO_ENABLE_NEW_MODELS',+ ),+ models,+ };+ }++ @UseGuards(AdminPanelGuard)+ @Mutation(() => Boolean)+ async setAdminAiModelEnabled(+ @Args('modelId', { type: () => String }) modelId: string,+ @Args('enabled', { type: () => Boolean }) enabled: boolean,+ ): Promise<boolean> {+ await this.aiModelRegistryService.setModelAdminEnabled(modelId, enabled);++ return true;+ }+@UseGuards(AdminPanelGuard)@Query(() => ConfigVariableDTO)async getDatabaseConfigVariable(diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.tsindex 4a4530f0c51..f594eece774 100644--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts@@ -58,6 +58,45 @@ export class ClientAIModelConfig {@Field(() => Boolean, { nullable: true })deprecated?: boolean;++ @Field(() => Boolean, { nullable: true })+ isRecommended?: boolean;+}++@ObjectType()+export class AdminAIModelConfig {+ @Field(() => String)+ modelId: string;++ @Field(() => String)+ label: string;++ @Field(() => ModelFamily, { nullable: true })+ modelFamily?: ModelFamily;++ @Field(() => InferenceProvider)+ inferenceProvider: InferenceProvider;++ @Field(() => Boolean)+ isAvailable: boolean;++ @Field(() => Boolean)+ isAdminEnabled: boolean;++ @Field(() => Boolean, { nullable: true })+ deprecated?: boolean;++ @Field(() => Boolean, { nullable: true })+ isRecommended?: boolean;+}++@ObjectType()+export class AdminAIModelsOutput {+ @Field(() => Boolean)+ autoEnableNewModels: boolean;++ @Field(() => [AdminAIModelConfig])+ models: AdminAIModelConfig[];}@ObjectType()diff --git a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.tsindex c0437009232..61f9d139dcf 100644--- a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts+++ b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts@@ -43,7 +43,8 @@ export class ClientConfigService {'CALENDAR_BOOKING_PAGE_ID',);- const availableModels = this.aiModelRegistryService.getAvailableModels();+ const availableModels =+ this.aiModelRegistryService.getAdminFilteredModels();const aiModels: ClientAIModelConfig[] = availableModels.map((registeredModel) => {@@ -68,6 +69,7 @@ export class ClientConfigService {): 0,deprecated: builtInModel?.deprecated,+ isRecommended: builtInModel?.isRecommended,};},);@@ -96,14 +98,14 @@ export class ClientConfigService {aiModels.unshift({modelId: DEFAULT_SMART_MODEL,- label: `Smart (${defaultPerformanceModelLabel})`,+ label: `Best (${defaultPerformanceModelLabel})`,inferenceProvider: InferenceProvider.NONE,inputCostPerMillionTokensInCredits: 0,outputCostPerMillionTokensInCredits: 0,},{modelId: DEFAULT_FAST_MODEL,- label: `Fast (${defaultSpeedModelLabel})`,+ label: `Best (${defaultSpeedModelLabel})`,inferenceProvider: InferenceProvider.NONE,inputCostPerMillionTokensInCredits: 0,outputCostPerMillionTokensInCredits: 0,diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.tsindex a0cce86d2ae..8ffa1e6db79 100644--- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts+++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts@@ -1326,6 +1326,33 @@ export class ConfigVariables {@IsOptional()AWS_BEDROCK_SESSION_TOKEN: string;+ @ConfigVariablesMetadata({+ group: ConfigVariablesGroup.LLM,+ description:+ 'When true, newly added models are automatically available to all workspaces',+ type: ConfigVariableType.BOOLEAN,+ })+ @IsOptional()+ AI_AUTO_ENABLE_NEW_MODELS = true;++ @ConfigVariablesMetadata({+ group: ConfigVariablesGroup.LLM,+ description:+ 'Model IDs to disable (used when AI_AUTO_ENABLE_NEW_MODELS is true)',+ type: ConfigVariableType.ARRAY,+ })+ @IsOptional()+ AI_DISABLED_MODEL_IDS: string[] = [];++ @ConfigVariablesMetadata({+ group: ConfigVariablesGroup.LLM,+ description:+ 'Model IDs to enable (used when AI_AUTO_ENABLE_NEW_MODELS is false)',+ type: ConfigVariableType.ARRAY,+ })+ @IsOptional()+ AI_ENABLED_MODEL_IDS: string[] = [];+@ConfigVariablesMetadata({group: ConfigVariablesGroup.SERVER_CONFIG,description: 'Enable or disable multi-workspace support',diff --git a/packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts b/packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.tsindex 16ea0bbdca7..0f036d46f22 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts@@ -127,4 +127,26 @@ export class UpdateWorkspaceInput {@IsString({ each: true })@IsOptional()editableProfileFields?: string[];++ @Field({ nullable: true })+ @IsBoolean()+ @IsOptional()+ autoEnableNewAiModels?: boolean;++ @Field(() => [String], { nullable: true })+ @IsArray()+ @IsString({ each: true })+ @IsOptional()+ disabledAiModelIds?: string[];++ @Field(() => [String], { nullable: true })+ @IsArray()+ @IsString({ each: true })+ @IsOptional()+ enabledAiModelIds?: string[];++ @Field({ nullable: true })+ @IsBoolean()+ @IsOptional()+ useRecommendedModels?: boolean;}diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.tsindex 7fc4a973cff..006d612726f 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts@@ -37,6 +37,8 @@ import {WorkspaceExceptionCode,WorkspaceNotFoundDefaultError,} from 'src/engine/core-modules/workspace/workspace.exception';+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';+import { isModelAllowedByWorkspace } from 'src/engine/metadata-modules/ai/ai-models/utils/is-model-allowed.util';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { ALL_METADATA_ENTITY_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-entity-by-metadata-name.constant';import { ALL_METADATA_NAMES_SORTED_ATOMICALLY } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-names-sorted-atomically.constant';@@ -86,6 +88,10 @@ export class WorkspaceService extends TypeOrmQueryService<WorkspaceEntity> {fastModel: PermissionFlagType.WORKSPACE,smartModel: PermissionFlagType.WORKSPACE,aiAdditionalInstructions: PermissionFlagType.WORKSPACE,+ autoEnableNewAiModels: PermissionFlagType.AI_SETTINGS,+ disabledAiModelIds: PermissionFlagType.AI_SETTINGS,+ enabledAiModelIds: PermissionFlagType.AI_SETTINGS,+ useRecommendedModels: PermissionFlagType.AI_SETTINGS,};constructor(@@ -110,6 +116,7 @@ export class WorkspaceService extends TypeOrmQueryService<WorkspaceEntity> {private readonly workspaceDataSourceService: WorkspaceDataSourceService,private readonly customDomainManagerService: CustomDomainManagerService,private readonly fileCorePictureService: FileCorePictureService,+ private readonly aiModelRegistryService: AiModelRegistryService,@InjectMessageQueue(MessageQueue.deleteCascadeQueue)private readonly messageQueueService: MessageQueueService,@InjectDataSource()@@ -216,6 +223,48 @@ export class WorkspaceService extends TypeOrmQueryService<WorkspaceEntity> {);}+ const isChangingModels =+ isDefined(payload.smartModel) || isDefined(payload.fastModel);+ const isChangingAvailability =+ payload.useRecommendedModels !== undefined ||+ payload.autoEnableNewAiModels !== undefined ||+ payload.disabledAiModelIds !== undefined ||+ payload.enabledAiModelIds !== undefined;++ if (isChangingModels || isChangingAvailability) {+ const effectiveWorkspace = {+ useRecommendedModels:+ payload.useRecommendedModels ?? workspace.useRecommendedModels,+ autoEnableNewAiModels:+ payload.autoEnableNewAiModels ?? workspace.autoEnableNewAiModels,+ disabledAiModelIds:+ payload.disabledAiModelIds ?? workspace.disabledAiModelIds,+ enabledAiModelIds:+ payload.enabledAiModelIds ?? workspace.enabledAiModelIds,+ };++ const modelsToValidate = [+ payload.smartModel ?? workspace.smartModel,+ payload.fastModel ?? workspace.fastModel,+ ].filter(isDefined);++ for (const modelId of modelsToValidate) {+ if (!this.aiModelRegistryService.isModelAdminAllowed(modelId)) {+ throw new WorkspaceException(+ 'Selected model has been disabled by the administrator',+ WorkspaceExceptionCode.ENVIRONMENT_VAR_NOT_ENABLED,+ );+ }++ if (!isModelAllowedByWorkspace(modelId, effectiveWorkspace)) {+ throw new WorkspaceException(+ 'Selected model is not available in this workspace',+ WorkspaceExceptionCode.ENVIRONMENT_VAR_NOT_ENABLED,+ );+ }+ }+ }+let updatedWorkspace: WorkspaceEntity;try {diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.tsindex a430af19249..1a7125ec64c 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts@@ -314,6 +314,32 @@ export class WorkspaceEntity {@Column({ type: 'text', nullable: true })aiAdditionalInstructions: string | null;+ @Field(() => Boolean, { nullable: false })+ @Column({ type: 'boolean', nullable: false, default: true })+ autoEnableNewAiModels: boolean;++ @Field(() => [String], { nullable: true })+ @Column({+ type: 'varchar',+ array: true,+ nullable: false,+ default: '{}',+ })+ disabledAiModelIds: string[];++ @Field(() => [String], { nullable: true })+ @Column({+ type: 'varchar',+ array: true,+ nullable: false,+ default: '{}',+ })+ enabledAiModelIds: string[];++ @Field(() => Boolean, { nullable: false })+ @Column({ type: 'boolean', nullable: false, default: true })+ useRecommendedModels: boolean;+@Column({ nullable: false, type: 'uuid' })workspaceCustomApplicationId: string;diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.tsindex 2580a02e44b..cf4988cee46 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts@@ -260,6 +260,34 @@ export class WorkspaceResolver {return workspace.smartModel;}+ @ResolveField(() => Boolean, { nullable: false })+ async autoEnableNewAiModels(+ @Parent() workspace: WorkspaceEntity,+ ): Promise<boolean> {+ return workspace.autoEnableNewAiModels;+ }++ @ResolveField(() => [String], { nullable: true })+ async disabledAiModelIds(+ @Parent() workspace: WorkspaceEntity,+ ): Promise<string[]> {+ return workspace.disabledAiModelIds;+ }++ @ResolveField(() => [String], { nullable: true })+ async enabledAiModelIds(+ @Parent() workspace: WorkspaceEntity,+ ): Promise<string[]> {+ return workspace.enabledAiModelIds;+ }++ @ResolveField(() => Boolean, { nullable: false })+ async useRecommendedModels(+ @Parent() workspace: WorkspaceEntity,+ ): Promise<boolean> {+ return workspace.useRecommendedModels;+ }+@ResolveField(() => ApplicationDTO, { nullable: true })async workspaceCustomApplication(@Parent() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.tsindex 5861d73cc52..56f51891e9d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts@@ -8,6 +8,7 @@ import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';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 { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';@@ -36,6 +37,7 @@ import { AgentAsyncExecutorService } from './services/agent-async-executor.serviAgentMessagePartEntity,AgentTurnEntity,RoleTargetEntity,+ WorkspaceEntity,]),],providers: [AgentAsyncExecutorService, AgentActorContextService],diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.tsindex 749ab0deda2..f08ef82af13 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts@@ -30,6 +30,7 @@ import { type AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entitiimport { repairToolCall } from 'src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util';import { AI_TELEMETRY_CONFIG } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-telemetry.const';import { AgentModelConfigService } from 'src/engine/metadata-modules/ai/ai-models/services/agent-model-config.service';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';@@ -47,6 +48,8 @@ export class AgentAsyncExecutorService {private readonly toolRegistry: ToolRegistryService,@InjectRepository(RoleTargetEntity)private readonly roleTargetRepository: Repository<RoleTargetEntity>,+ @InjectRepository(WorkspaceEntity)+ private readonly workspaceRepository: Repository<WorkspaceEntity>,) {}private extractRoleIds(@@ -108,6 +111,19 @@ export class AgentAsyncExecutorService {authContext?: WorkspaceAuthContext;}): Promise<AgentExecutionResult> {try {+ if (agent) {+ const workspace = await this.workspaceRepository.findOneBy({+ id: agent.workspaceId,+ });++ if (workspace) {+ this.aiModelRegistryService.validateModelAvailability(+ agent.modelId,+ workspace,+ );+ }+ }+const registeredModel =await this.aiModelRegistryService.resolveModelForAgent(agent);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.tsindex 0d4abbb022f..2220089da3b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts@@ -2,6 +2,7 @@ import { UseGuards, UseInterceptors } from '@nestjs/common';import { Args, Mutation, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';+import { isDefined } from 'twenty-shared/utils';import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -15,6 +16,7 @@ import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.gimport { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { fromFlatAgentWithRoleIdToAgentDto } from 'src/engine/metadata-modules/flat-agent/utils/from-agent-entity-to-agent-dto.util';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';import { AgentService } from './agent.service';@@ -35,7 +37,10 @@ import { AgentGraphqlApiExceptionInterceptor } from './interceptors/agent-graphq)@MetadataResolver()export class AgentResolver {- constructor(private readonly agentService: AgentService) {}+ constructor(+ private readonly agentService: AgentService,+ private readonly aiModelRegistryService: AiModelRegistryService,+ ) {}@Query(() => [AgentDTO])@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)@@ -67,11 +72,18 @@ export class AgentResolver {@UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))async createOneAgent(@Args('input') input: CreateAgentInput,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthWorkspace() workspace: WorkspaceEntity,): Promise<AgentDTO> {+ if (isDefined(input.modelId)) {+ this.aiModelRegistryService.validateModelAvailability(+ input.modelId,+ workspace,+ );+ }+const createdAgent = await this.agentService.createOneAgent({ ...input, isCustom: true },- workspaceId,+ workspace.id,);return fromFlatAgentWithRoleIdToAgentDto(createdAgent);@@ -82,11 +94,18 @@ export class AgentResolver {@UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))async updateOneAgent(@Args('input') input: UpdateAgentInput,- @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @AuthWorkspace() workspace: WorkspaceEntity,): Promise<AgentDTO> {+ if (isDefined(input.modelId)) {+ this.aiModelRegistryService.validateModelAvailability(+ input.modelId,+ workspace,+ );+ }+const updatedAgent = await this.agentService.updateOneAgent({input,- workspaceId,+ workspaceId: workspace.id,});return fromFlatAgentWithRoleIdToAgentDto(updatedAgent);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.tsindex 19bcbc10806..610cc7b4925 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/controllers/agent-chat.controller.ts@@ -64,15 +64,20 @@ export class AgentChatController {@AuthWorkspace() workspace: WorkspaceEntity,@Res() response: Response,) {- const availableModels = this.aiModelRegistryService.getAvailableModels();-- if (availableModels.length === 0) {+ if (this.aiModelRegistryService.getAvailableModels().length === 0) {throw new AgentException('No AI models are available. Please configure at least one AI provider API key (OPENAI_API_KEY, ANTHROPIC_API_KEY, or XAI_API_KEY).',AgentExceptionCode.API_KEY_NOT_CONFIGURED,);}+ const resolvedModelId = workspace.smartModel;++ this.aiModelRegistryService.validateModelAvailability(+ resolvedModelId,+ workspace,+ );+if (this.twentyConfigService.get('IS_BILLING_ENABLED')) {const canBill = await this.billingService.canBillMeteredProduct(workspace.id,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.tsindex 23fd7f0bc19..85af0c8d817 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts@@ -126,10 +126,13 @@ export class ChatExecutionService {const preloadedToolNames = Object.keys(preloadedTools);- // Respect the workspace's model preference (Settings > AI > Model Router)+ const modelId = workspace.smartModel;++ this.aiModelRegistryService.validateModelAvailability(modelId, workspace);+const registeredModel =await this.aiModelRegistryService.resolveModelForAgent({- modelId: workspace.smartModel,+ modelId,});const modelConfig = this.aiModelRegistryService.getEffectiveModelConfig(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models-types.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models-types.const.tsindex 193612715cd..1e7cef69422 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models-types.const.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/ai-models-types.const.ts@@ -101,4 +101,5 @@ export interface AIModelConfig {twitterSearch?: boolean;};deprecated?: boolean;+ isRecommended?: boolean;}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/anthropic-models.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/anthropic-models.const.tsindex 9ac58fc761f..102b974ed63 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/anthropic-models.const.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/anthropic-models.const.ts@@ -40,6 +40,7 @@ export const ANTHROPIC_MODELS: AIModelConfig[] = [nativeCapabilities: {webSearch: true,},+ isRecommended: true,},{modelId: 'claude-sonnet-4-6',@@ -75,6 +76,7 @@ export const ANTHROPIC_MODELS: AIModelConfig[] = [nativeCapabilities: {webSearch: true,},+ isRecommended: true,},{modelId: 'claude-sonnet-4-5-20250929',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/google-models.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/google-models.const.tsindex 4ebf008e5ea..3c652c51f4b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/google-models.const.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/google-models.const.ts@@ -26,6 +26,7 @@ export const GOOGLE_MODELS: AIModelConfig[] = [maxOutputTokens: 65536,supportedFileTypes: ['image/png', 'image/jpeg', 'image/gif', 'image/webp'],doesSupportThinking: true,+ isRecommended: true,},{modelId: 'gemini-3-flash-preview',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/openai-models.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/openai-models.const.tsindex 87809c8d50c..cb060781423 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/openai-models.const.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/openai-models.const.ts@@ -23,6 +23,7 @@ export const OPENAI_MODELS: AIModelConfig[] = [nativeCapabilities: {webSearch: true,},+ isRecommended: true,},{modelId: 'gpt-5-mini',@@ -55,6 +56,7 @@ export const OPENAI_MODELS: AIModelConfig[] = [nativeCapabilities: {webSearch: true,},+ isRecommended: true,},{modelId: 'gpt-4.1-mini',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/xai-models.const.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/xai-models.const.tsindex a01078b7b24..a35354730f3 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/xai-models.const.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/constants/xai-models.const.ts@@ -23,6 +23,7 @@ export const XAI_MODELS: AIModelConfig[] = [webSearch: true,twitterSearch: true,},+ isRecommended: true,},{modelId: 'grok-4-1-fast-reasoning',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.tsindex 1a37a5c42b2..b97508aad13 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts@@ -32,6 +32,10 @@ import { GROQ_MODELS } from 'src/engine/metadata-modules/ai/ai-models/constants/import { MISTRAL_MODELS } from 'src/engine/metadata-modules/ai/ai-models/constants/mistral-models.const';import { OPENAI_MODELS } from 'src/engine/metadata-modules/ai/ai-models/constants/openai-models.const';import { XAI_MODELS } from 'src/engine/metadata-modules/ai/ai-models/constants/xai-models.const';+import {+ isModelAllowedByWorkspace,+ type WorkspaceModelAvailabilitySettings,+} from 'src/engine/metadata-modules/ai/ai-models/utils/is-model-allowed.util';export interface RegisteredAIModel {modelId: string;@@ -371,6 +375,97 @@ export class AiModelRegistryService {return providerToFamily[inferenceProvider] ?? ModelFamily.OPENAI;}+ isModelAdminAllowed(modelId: string): boolean {+ if (modelId === DEFAULT_FAST_MODEL || modelId === DEFAULT_SMART_MODEL) {+ return true;+ }++ const autoEnable = this.twentyConfigService.get(+ 'AI_AUTO_ENABLE_NEW_MODELS',+ );+ const disabledIds = this.twentyConfigService.get('AI_DISABLED_MODEL_IDS');+ const enabledIds = this.twentyConfigService.get('AI_ENABLED_MODEL_IDS');++ return autoEnable+ ? !disabledIds.includes(modelId)+ : enabledIds.includes(modelId);+ }++ validateModelAvailability(+ modelId: string,+ workspace: WorkspaceModelAvailabilitySettings,+ ): void {+ if (!this.isModelAdminAllowed(modelId)) {+ throw new AgentException(+ 'The selected model has been disabled by the administrator.',+ AgentExceptionCode.AGENT_EXECUTION_FAILED,+ );+ }++ if (!isModelAllowedByWorkspace(modelId, workspace)) {+ throw new AgentException(+ 'The selected model is not available in this workspace.',+ AgentExceptionCode.AGENT_EXECUTION_FAILED,+ );+ }+ }++ getAdminFilteredModels(): RegisteredAIModel[] {+ return this.getAvailableModels().filter((model) =>+ this.isModelAdminAllowed(model.modelId),+ );+ }++ getAllModelsWithStatus(): Array<{+ modelConfig: AIModelConfig;+ isAvailable: boolean;+ isAdminEnabled: boolean;+ }> {+ return AI_MODELS.map((model) => ({+ modelConfig: model,+ isAvailable: this.modelRegistry.has(model.modelId),+ isAdminEnabled: this.isModelAdminAllowed(model.modelId),+ }));+ }++ async setModelAdminEnabled(modelId: string, enabled: boolean): Promise<void> {+ const isKnownModel = AI_MODELS.some((model) => model.modelId === modelId);++ if (!isKnownModel) {+ throw new AgentException(+ `Unknown model ID: ${modelId}`,+ AgentExceptionCode.AGENT_EXECUTION_FAILED,+ );+ }++ const autoEnable = this.twentyConfigService.get(+ 'AI_AUTO_ENABLE_NEW_MODELS',+ );+ const disabledIds = this.twentyConfigService.get('AI_DISABLED_MODEL_IDS');+ const enabledIds = this.twentyConfigService.get('AI_ENABLED_MODEL_IDS');++ if (autoEnable) {+ const newDisabledIds = enabled+ ? disabledIds.filter((id) => id !== modelId)+ : disabledIds.includes(modelId)+ ? disabledIds+ : [...disabledIds, modelId];++ await this.twentyConfigService.set(+ 'AI_DISABLED_MODEL_IDS',+ newDisabledIds,+ );+ } else {+ const newEnabledIds = enabled+ ? enabledIds.includes(modelId)+ ? enabledIds+ : [...enabledIds, modelId]+ : enabledIds.filter((id) => id !== modelId);++ await this.twentyConfigService.set('AI_ENABLED_MODEL_IDS', newEnabledIds);+ }+ }+refreshRegistry(): void {this.buildModelRegistry();}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/is-model-allowed.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/is-model-allowed.util.tsnew file mode 100644index 00000000000..17c48900283--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/is-model-allowed.util.ts@@ -0,0 +1,35 @@+import {+ AI_MODELS,+ DEFAULT_FAST_MODEL,+ DEFAULT_SMART_MODEL,+} from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';++export type WorkspaceModelAvailabilitySettings = {+ useRecommendedModels: boolean;+ autoEnableNewAiModels: boolean;+ disabledAiModelIds: string[];+ enabledAiModelIds: string[];+};++const RECOMMENDED_MODEL_IDS = new Set(+ AI_MODELS.filter((model) => model.isRecommended).map(+ (model) => model.modelId,+ ),+);++export const isModelAllowedByWorkspace = (+ modelId: string,+ workspace: WorkspaceModelAvailabilitySettings,+): boolean => {+ if (modelId === DEFAULT_FAST_MODEL || modelId === DEFAULT_SMART_MODEL) {+ return true;+ }++ if (workspace.useRecommendedModels) {+ return RECOMMENDED_MODEL_IDS.has(modelId);+ }++ return workspace.autoEnableNewAiModels+ ? !workspace.disabledAiModelIds.includes(modelId)+ : workspace.enabledAiModelIds.includes(modelId);+};