The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(server): unify workspace-event ingestion behind one EventSink pipeline (#21197)
Félix Malfait91f2f08995d8
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex a85da3564a9..7daa202bd83 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1434,11 +1434,6 @@ type EnterpriseSubscriptionStatusDTO {isCancellationScheduled: Boolean!}-type Analytics {- """Boolean that confirms query was dispatched"""- success: Boolean!-}-type VerificationRecord {type: String!key: String!@@ -2621,6 +2616,11 @@ type SendEmailOutput {error: String}+type Analytics {+ """Boolean that confirms query was dispatched"""+ success: Boolean!+}+type EventLogRecord {event: String!timestamp: DateTime!@@ -3200,8 +3200,6 @@ type Mutation {updateApiKey(input: UpdateApiKeyInput!): ApiKeyrevokeApiKey(input: RevokeApiKeyInput!): ApiKeyassignRoleToApiKey(apiKeyId: UUID!, roleId: UUID!): Boolean!- createObjectEvent(event: String!, recordId: UUID!, objectMetadataId: UUID!, properties: JSON): Analytics!- trackAnalytics(type: AnalyticsType!, name: String, event: String, properties: JSON): Analytics!skipSyncEmailOnboardingStep: OnboardingStepSuccess!skipBookOnboardingStep: OnboardingStepSuccess!checkoutSession(recurringInterval: SubscriptionInterval!, plan: BillingPlanKey! = PRO, requirePaymentMethod: Boolean! = true, successUrlPath: String): BillingSession!@@ -3344,6 +3342,8 @@ type Mutation {createSAMLIdentityProvider(input: SetupSAMLSsoInput!): SetupSso!deleteSSOIdentityProvider(input: DeleteSsoInput!): DeleteSso!editSSOIdentityProvider(input: EditSsoInput!): EditSso!+ createObjectEvent(event: String!, recordId: UUID!, objectMetadataId: UUID!, properties: JSON): Analytics!+ trackAnalytics(type: AnalyticsType!, name: String, event: String, properties: JSON): Analytics!duplicateDashboard(id: UUID!): DuplicatedDashboard!impersonate(userId: UUID!, workspaceId: UUID!): Impersonate!sendEmail(input: SendEmailInput!): SendEmailOutput!@@ -3716,11 +3716,6 @@ input RevokeApiKeyInput {id: UUID!}-enum AnalyticsType {- PAGEVIEW- TRACK-}-input CreateApprovedAccessDomainInput {domain: String!email: String!@@ -4430,6 +4425,11 @@ input EditSsoInput {status: SSOIdentityProviderStatus!}+enum AnalyticsType {+ PAGEVIEW+ TRACK+}+input SendEmailInput {connectedAccountId: String!to: String!@@ -4498,6 +4498,7 @@ type Subscription {onEventSubscription(eventStreamId: String!): EventSubscriptionlogicFunctionLogs(input: LogicFunctionLogsInput!): LogicFunctionLogs!onAgentChatEvent(threadId: UUID!): AgentChatEvent!+ eventLogsLive(table: EventLogTable!): [EventLogRecord!]}input LogicFunctionLogsInput {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 166b651c1fe..4be8f9f9235 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1091,12 +1091,6 @@ export interface EnterpriseSubscriptionStatusDTO {__typename: 'EnterpriseSubscriptionStatusDTO'}-export interface Analytics {- /** Boolean that confirms query was dispatched */- success: Scalars['Boolean']- __typename: 'Analytics'-}-export interface VerificationRecord {type: Scalars['String']key: Scalars['String']@@ -2314,6 +2308,12 @@ export interface SendEmailOutput {__typename: 'SendEmailOutput'}+export interface Analytics {+ /** Boolean that confirms query was dispatched */+ success: Scalars['Boolean']+ __typename: 'Analytics'+}+export interface EventLogRecord {event: Scalars['String']timestamp: Scalars['DateTime']@@ -2724,8 +2724,6 @@ export interface Mutation {updateApiKey?: ApiKeyrevokeApiKey?: ApiKeyassignRoleToApiKey: Scalars['Boolean']- createObjectEvent: Analytics- trackAnalytics: AnalyticsskipSyncEmailOnboardingStep: OnboardingStepSuccessskipBookOnboardingStep: OnboardingStepSuccesscheckoutSession: BillingSession@@ -2868,6 +2866,8 @@ export interface Mutation {createSAMLIdentityProvider: SetupSsodeleteSSOIdentityProvider: DeleteSsoeditSSOIdentityProvider: EditSso+ createObjectEvent: Analytics+ trackAnalytics: AnalyticsduplicateDashboard: DuplicatedDashboardimpersonate: ImpersonatesendEmail: SendEmailOutput@@ -2892,16 +2892,17 @@ export interface Mutation {__typename: 'Mutation'}-export type AnalyticsType = 'PAGEVIEW' | 'TRACK'-export type WorkspaceMigrationActionType = 'delete' | 'create' | 'update'+export type AnalyticsType = 'PAGEVIEW' | 'TRACK'+export type FileFolder = 'ProfilePicture' | 'WorkspaceLogo' | 'Attachment' | 'PersonPicture' | 'CorePicture' | 'File' | 'AgentChat' | 'BuiltLogicFunction' | 'BuiltFrontComponent' | 'PublicAsset' | 'Source' | 'FilesField' | 'Dependencies' | 'Workflow' | 'EmailAttachment' | 'AppTarball' | 'GeneratedSdkClient'export interface Subscription {onEventSubscription?: EventSubscriptionlogicFunctionLogs: LogicFunctionLogsonAgentChatEvent: AgentChatEvent+ eventLogsLive?: EventLogRecord[]__typename: 'Subscription'}@@ -4049,13 +4050,6 @@ export interface EnterpriseSubscriptionStatusDTOGenqlSelection{__scalar?: boolean | number}-export interface AnalyticsGenqlSelection{- /** Boolean that confirms query was dispatched */- success?: boolean | number- __typename?: boolean | number- __scalar?: boolean | number-}-export interface VerificationRecordGenqlSelection{type?: boolean | numberkey?: boolean | number@@ -5364,6 +5358,13 @@ export interface SendEmailOutputGenqlSelection{__scalar?: boolean | number}+export interface AnalyticsGenqlSelection{+ /** Boolean that confirms query was dispatched */+ success?: boolean | number+ __typename?: boolean | number+ __scalar?: boolean | number+}+export interface EventLogRecordGenqlSelection{event?: boolean | numbertimestamp?: boolean | number@@ -5811,8 +5812,6 @@ export interface MutationGenqlSelection{updateApiKey?: (ApiKeyGenqlSelection & { __args: {input: UpdateApiKeyInput} })revokeApiKey?: (ApiKeyGenqlSelection & { __args: {input: RevokeApiKeyInput} })assignRoleToApiKey?: { __args: {apiKeyId: Scalars['UUID'], roleId: Scalars['UUID']} }- createObjectEvent?: (AnalyticsGenqlSelection & { __args: {event: Scalars['String'], recordId: Scalars['UUID'], objectMetadataId: Scalars['UUID'], properties?: (Scalars['JSON'] | null)} })- trackAnalytics?: (AnalyticsGenqlSelection & { __args: {type: AnalyticsType, name?: (Scalars['String'] | null), event?: (Scalars['String'] | null), properties?: (Scalars['JSON'] | null)} })skipSyncEmailOnboardingStep?: OnboardingStepSuccessGenqlSelectionskipBookOnboardingStep?: OnboardingStepSuccessGenqlSelectioncheckoutSession?: (BillingSessionGenqlSelection & { __args: {recurringInterval: SubscriptionInterval, plan: BillingPlanKey, requirePaymentMethod: Scalars['Boolean'], successUrlPath?: (Scalars['String'] | null)} })@@ -5955,6 +5954,8 @@ export interface MutationGenqlSelection{createSAMLIdentityProvider?: (SetupSsoGenqlSelection & { __args: {input: SetupSAMLSsoInput} })deleteSSOIdentityProvider?: (DeleteSsoGenqlSelection & { __args: {input: DeleteSsoInput} })editSSOIdentityProvider?: (EditSsoGenqlSelection & { __args: {input: EditSsoInput} })+ createObjectEvent?: (AnalyticsGenqlSelection & { __args: {event: Scalars['String'], recordId: Scalars['UUID'], objectMetadataId: Scalars['UUID'], properties?: (Scalars['JSON'] | null)} })+ trackAnalytics?: (AnalyticsGenqlSelection & { __args: {type: AnalyticsType, name?: (Scalars['String'] | null), event?: (Scalars['String'] | null), properties?: (Scalars['JSON'] | null)} })duplicateDashboard?: (DuplicatedDashboardGenqlSelection & { __args: {id: Scalars['UUID']} })impersonate?: (ImpersonateGenqlSelection & { __args: {userId: Scalars['UUID'], workspaceId: Scalars['UUID']} })sendEmail?: (SendEmailOutputGenqlSelection & { __args: {input: SendEmailInput} })@@ -6356,6 +6357,7 @@ export interface SubscriptionGenqlSelection{onEventSubscription?: (EventSubscriptionGenqlSelection & { __args: {eventStreamId: Scalars['String']} })logicFunctionLogs?: (LogicFunctionLogsGenqlSelection & { __args: {input: LogicFunctionLogsInput} })onAgentChatEvent?: (AgentChatEventGenqlSelection & { __args: {threadId: Scalars['UUID']} })+ eventLogsLive?: (EventLogRecordGenqlSelection & { __args: {table: EventLogTable} })__typename?: boolean | number__scalar?: boolean | number}@@ -7003,14 +7005,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const Analytics_possibleTypes: string[] = ['Analytics']- export const isAnalytics = (obj?: { __typename?: any } | null): obj is Analytics => {- if (!obj?.__typename) throw new Error('__typename is missing in "isAnalytics"')- return Analytics_possibleTypes.includes(obj.__typename)- }---const VerificationRecord_possibleTypes: string[] = ['VerificationRecord']export const isVerificationRecord = (obj?: { __typename?: any } | null): obj is VerificationRecord => {if (!obj?.__typename) throw new Error('__typename is missing in "isVerificationRecord"')@@ -8139,6 +8133,14 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null+ const Analytics_possibleTypes: string[] = ['Analytics']+ export const isAnalytics = (obj?: { __typename?: any } | null): obj is Analytics => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isAnalytics"')+ return Analytics_possibleTypes.includes(obj.__typename)+ }+++const EventLogRecord_possibleTypes: string[] = ['EventLogRecord']export const isEventLogRecord = (obj?: { __typename?: any } | null): obj is EventLogRecord => {if (!obj?.__typename) throw new Error('__typename is missing in "isEventLogRecord"')@@ -8990,17 +8992,17 @@ export const enumUsageOperationType = {WEB_SEARCH: 'WEB_SEARCH' as const}-export const enumAnalyticsType = {- PAGEVIEW: 'PAGEVIEW' as const,- TRACK: 'TRACK' as const-}-export const enumWorkspaceMigrationActionType = {delete: 'delete' as const,create: 'create' as const,update: 'update' as const}+export const enumAnalyticsType = {+ PAGEVIEW: 'PAGEVIEW' as const,+ TRACK: 'TRACK' as const+}+export const enumFileFolder = {ProfilePicture: 'ProfilePicture' as const,WorkspaceLogo: 'WorkspaceLogo' as const,diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 4c50b1547aa..ad44b2f2c59 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -42,26 +42,26 @@ export default {104,110,124,+ 131,132,- 133,+ 139,140,141,- 142,- 144,- 152,- 163,- 166,- 168,- 172,- 174,+ 143,+ 151,+ 162,+ 165,+ 167,+ 171,+ 173,+ 178,179,- 180,- 187,- 190,- 193,- 206,- 221,- 233,+ 186,+ 189,+ 192,+ 205,+ 220,+ 232,306,307,308,@@ -78,8 +78,8 @@ export default {332,339,346,- 382,- 465,+ 464,+ 469,477],"types": {@@ -94,13 +94,13 @@ export default {1],"metadata": [- 139+ 138],"on_BillingLicensedProduct": [- 148+ 147],"on_BillingMeteredProduct": [- 149+ 148],"__typename": [1@@ -954,10 +954,10 @@ export default {3],"relation": [- 205+ 204],"morphRelations": [- 205+ 204],"object": [56@@ -1019,7 +1019,7 @@ export default {46],"objectMetadata": [- 213,+ 212,{"paging": [49,@@ -1032,7 +1032,7 @@ export default {}],"indexFieldMetadatas": [- 211,+ 210,{"paging": [49,@@ -1277,7 +1277,7 @@ export default {47],"fields": [- 218,+ 217,{"paging": [49,@@ -1290,7 +1290,7 @@ export default {}],"indexMetadatas": [- 216,+ 215,{"paging": [49,@@ -1883,19 +1883,19 @@ export default {59],"featureFlags": [- 173+ 172],"billingSubscriptions": [- 151+ 150],"installedApplications": [59],"currentBillingSubscription": [- 151+ 150],"billingEntitlements": [- 232+ 231],"hasValidEnterpriseKey": [6@@ -1907,7 +1907,7 @@ export default {6],"workspaceUrls": [- 175+ 174],"workspaceCustomApplicationId": [1@@ -1996,7 +1996,7 @@ export default {20],"deletedWorkspaceMembers": [- 231+ 230],"hasPassword": [6@@ -2008,7 +2008,7 @@ export default {17],"availableWorkspaces": [- 230+ 229],"__typename": [1@@ -2847,14 +2847,6 @@ export default {1]},- "Analytics": {- "success": [- 6- ],- "__typename": [- 1- ]- },"VerificationRecord": {"type": [1@@ -2886,13 +2878,13 @@ export default {1],"driver": [- 132+ 131],"status": [- 133+ 132],"verificationRecords": [- 130+ 129],"verifiedAt": [4@@ -2967,7 +2959,7 @@ export default {11],"items": [- 137+ 136],"__typename": [1@@ -2975,13 +2967,13 @@ export default {},"BillingProductMetadata": {"planKey": [- 140+ 139],"priceUsageBased": [- 141+ 140],"productKey": [- 142+ 141],"__typename": [1@@ -2992,7 +2984,7 @@ export default {"BillingProductKey": {},"BillingPriceLicensed": {"recurringInterval": [- 144+ 143],"unitAmount": [11@@ -3001,7 +2993,7 @@ export default {1],"priceUsageType": [- 141+ 140],"creditAmount": [11@@ -3027,16 +3019,16 @@ export default {},"BillingPriceMetered": {"tiers": [- 145+ 144],"recurringInterval": [- 144+ 143],"stripePriceId": [1],"priceUsageType": [- 141+ 140],"__typename": [1@@ -3053,7 +3045,7 @@ export default {1],"metadata": [- 139+ 138],"__typename": [1@@ -3070,10 +3062,10 @@ export default {1],"metadata": [- 139+ 138],"prices": [- 143+ 142],"__typename": [1@@ -3090,10 +3082,10 @@ export default {1],"metadata": [- 139+ 138],"prices": [- 146+ 145],"__typename": [1@@ -3124,13 +3116,13 @@ export default {3],"status": [- 152+ 151],"interval": [- 144+ 143],"billingSubscriptionItems": [- 150+ 149],"currentPeriodEnd": [4@@ -3139,7 +3131,7 @@ export default {15],"phases": [- 138+ 137],"__typename": [1@@ -3148,7 +3140,7 @@ export default {"SubscriptionStatus": {},"BillingEndTrialPeriod": {"status": [- 152+ 151],"hasPaymentMethod": [6@@ -3162,7 +3154,7 @@ export default {},"BillingResourceCreditUsage": {"productKey": [- 142+ 141],"periodStart": [4@@ -3191,16 +3183,16 @@ export default {},"BillingPlan": {"planKey": [- 140+ 139],"baseProducts": [- 148+ 147],"resourceCreditProducts": [- 148+ 147],"meteredProducts": [- 149+ 148],"__typename": [1@@ -3216,10 +3208,10 @@ export default {},"BillingUpdate": {"currentBillingSubscription": [- 151+ 150],"billingSubscriptions": [- 151+ 150],"__typename": [1@@ -3258,7 +3250,7 @@ export default {1],"result": [- 159+ 158],"__typename": [1@@ -3295,7 +3287,7 @@ export default {3],"type": [- 163+ 162],"name": [1@@ -3328,7 +3320,7 @@ export default {4],"targetRecordIdentifier": [- 161+ 160],"__typename": [1@@ -3354,7 +3346,7 @@ export default {},"MetadataEvent": {"type": [- 166+ 165],"metadataName": [1@@ -3363,7 +3355,7 @@ export default {1],"properties": [- 164+ 163],"updatedCollectionHash": [1@@ -3375,7 +3367,7 @@ export default {"MetadataEventAction": {},"ObjectRecordEvent": {"action": [- 168+ 167],"objectNameSingular": [1@@ -3390,7 +3382,7 @@ export default {1],"properties": [- 164+ 163],"__typename": [1@@ -3402,7 +3394,7 @@ export default {1],"objectRecordEvent": [- 167+ 166],"__typename": [1@@ -3413,10 +3405,10 @@ export default {1],"objectRecordEventsWithQueryIds": [- 169+ 168],"metadataEvents": [- 165+ 164],"__typename": [1@@ -3433,7 +3425,7 @@ export default {11],"status": [- 172+ 171],"error": [15@@ -3445,7 +3437,7 @@ export default {"LogicFunctionExecutionStatus": {},"FeatureFlag": {"key": [- 174+ 173],"value": [6@@ -3517,10 +3509,10 @@ export default {1],"type": [- 179+ 178],"status": [- 180+ 179],"issuer": [1@@ -3533,7 +3525,7 @@ export default {"SSOIdentityProviderStatus": {},"AuthProviders": {"sso": [- 178+ 177],"google": [6@@ -3570,10 +3562,10 @@ export default {3],"authProviders": [- 181+ 180],"authBypassProviders": [- 182+ 181],"logo": [1@@ -3582,7 +3574,7 @@ export default {1],"workspaceUrls": [- 175+ 174],"__typename": [1@@ -3621,7 +3613,7 @@ export default {1],"modelFamily": [- 187+ 186],"modelFamilyLabel": [1@@ -3636,7 +3628,7 @@ export default {11],"nativeCapabilities": [- 185+ 184],"isDeprecated": [6@@ -3672,7 +3664,7 @@ export default {1],"trialPeriods": [- 177+ 176],"__typename": [1@@ -3680,7 +3672,7 @@ export default {},"Support": {"supportDriver": [- 190+ 189],"supportFrontChatId": [1@@ -3706,7 +3698,7 @@ export default {},"Captcha": {"provider": [- 193+ 192],"siteKey": [1@@ -3740,10 +3732,10 @@ export default {},"PublicFeatureFlag": {"key": [- 174+ 173],"metadata": [- 195+ 194],"__typename": [1@@ -3768,13 +3760,13 @@ export default {1],"authProviders": [- 181+ 180],"billing": [- 188+ 187],"aiModels": [- 186+ 185],"signInPrefilled": [6@@ -3795,25 +3787,25 @@ export default {6],"support": [- 189+ 188],"isAttachmentPreviewEnabled": [6],"sentry": [- 191+ 190],"captcha": [- 192+ 191],"api": [- 194+ 193],"canManageFeatureFlags": [6],"publicFeatureFlags": [- 196+ 195],"isMicrosoftMessagingEnabled": [6@@ -3852,7 +3844,7 @@ export default {6],"maintenance": [- 197+ 196],"__typename": [1@@ -3891,7 +3883,7 @@ export default {1],"versionDistribution": [- 200+ 199],"__typename": [1@@ -3938,7 +3930,7 @@ export default {},"Relation": {"type": [- 206+ 205],"sourceObjectMetadata": [56@@ -3987,10 +3979,10 @@ export default {},"IndexConnection": {"pageInfo": [- 208+ 207],"edges": [- 207+ 206],"__typename": [1@@ -4009,10 +4001,10 @@ export default {},"IndexIndexFieldMetadatasConnection": {"pageInfo": [- 208+ 207],"edges": [- 210+ 209],"__typename": [1@@ -4031,10 +4023,10 @@ export default {},"IndexObjectMetadataConnection": {"pageInfo": [- 208+ 207],"edges": [- 212+ 211],"__typename": [1@@ -4053,10 +4045,10 @@ export default {},"ObjectConnection": {"pageInfo": [- 208+ 207],"edges": [- 212+ 211],"__typename": [1@@ -4064,10 +4056,10 @@ export default {},"ObjectIndexMetadatasConnection": {"pageInfo": [- 208+ 207],"edges": [- 207+ 206],"__typename": [1@@ -4086,10 +4078,10 @@ export default {},"ObjectFieldsConnection": {"pageInfo": [- 208+ 207],"edges": [- 217+ 216],"__typename": [1@@ -4097,10 +4089,10 @@ export default {},"FieldConnection": {"pageInfo": [- 208+ 207],"edges": [- 217+ 216],"__typename": [1@@ -4108,7 +4100,7 @@ export default {},"AppConnection": {"id": [- 221+ 220],"providerName": [1@@ -4160,7 +4152,7 @@ export default {3],"type": [- 179+ 178],"issuer": [1@@ -4169,7 +4161,7 @@ export default {1],"status": [- 180+ 179],"__typename": [1@@ -4188,7 +4180,7 @@ export default {},"FindAvailableSSOIDP": {"type": [- 179+ 178],"id": [3@@ -4200,10 +4192,10 @@ export default {1],"status": [- 180+ 179],"workspace": [- 225+ 224],"__typename": [1@@ -4214,7 +4206,7 @@ export default {3],"type": [- 179+ 178],"issuer": [1@@ -4223,7 +4215,7 @@ export default {1],"status": [- 180+ 179],"__typename": [1@@ -4231,7 +4223,7 @@ export default {},"SSOConnection": {"type": [- 179+ 178],"id": [3@@ -4243,7 +4235,7 @@ export default {1],"status": [- 180+ 179],"__typename": [1@@ -4266,13 +4258,13 @@ export default {1],"workspaceUrls": [- 175+ 174],"logo": [1],"sso": [- 228+ 227],"__typename": [1@@ -4280,10 +4272,10 @@ export default {},"AvailableWorkspaces": {"availableWorkspacesForSignIn": [- 229+ 228],"availableWorkspacesForSignUp": [- 229+ 228],"__typename": [1@@ -4311,7 +4303,7 @@ export default {},"BillingEntitlement": {"key": [- 233+ 232],"value": [6@@ -4349,7 +4341,7 @@ export default {1],"records": [- 234+ 233],"__typename": [1@@ -4419,10 +4411,10 @@ export default {},"AvailableWorkspacesAndAccessTokens": {"tokens": [- 242+ 241],"availableWorkspaces": [- 230+ 229],"__typename": [1@@ -4460,7 +4452,7 @@ export default {},"WorkspaceUrlsAndId": {"workspaceUrls": [- 175+ 174],"id": [3@@ -4474,7 +4466,7 @@ export default {32],"workspace": [- 247+ 246],"__typename": [1@@ -4507,7 +4499,7 @@ export default {32],"workspaceUrls": [- 175+ 174],"__typename": [1@@ -4523,7 +4515,7 @@ export default {},"AuthTokens": {"tokens": [- 242+ 241],"__typename": [1@@ -4564,7 +4556,7 @@ export default {32],"workspace": [- 247+ 246],"__typename": [1@@ -4586,7 +4578,7 @@ export default {1],"dailyUsage": [- 258+ 257],"__typename": [1@@ -4594,16 +4586,16 @@ export default {},"UsageAnalytics": {"usageByUser": [- 199+ 198],"usageByOperationType": [- 199+ 198],"usageByModel": [- 199+ 198],"timeSeries": [- 258+ 257],"periodStart": [4@@ -4612,7 +4604,7 @@ export default {4],"userDailyUsage": [- 259+ 258],"__typename": [1@@ -4777,7 +4769,7 @@ export default {1],"location": [- 268+ 267],"__typename": [1@@ -4802,13 +4794,13 @@ export default {},"PublicImapSmtpCaldavConnectionParameters": {"IMAP": [- 270+ 269],"SMTP": [- 270+ 269],"CALDAV": [- 270+ 269],"__typename": [1@@ -4861,7 +4853,7 @@ export default {4],"connectionParameters": [- 271+ 270],"__typename": [1@@ -4886,13 +4878,13 @@ export default {},"ImapSmtpCaldavPublicConnectionParameters": {"IMAP": [- 273+ 272],"SMTP": [- 273+ 272],"CALDAV": [- 273+ 272],"__typename": [1@@ -4912,7 +4904,7 @@ export default {3],"connectionParameters": [- 274+ 273],"__typename": [1@@ -5114,7 +5106,7 @@ export default {1],"series": [- 282+ 281],"xAxisLabel": [1@@ -5163,7 +5155,7 @@ export default {1],"data": [- 284+ 283],"__typename": [1@@ -5171,7 +5163,7 @@ export default {},"LineChartData": {"series": [- 285+ 284],"xAxisLabel": [1@@ -5208,7 +5200,7 @@ export default {},"PieChartData": {"data": [- 287+ 286],"showLegend": [6@@ -5263,6 +5255,14 @@ export default {1]},+ "Analytics": {+ "success": [+ 6+ ],+ "__typename": [+ 1+ ]+ },"EventLogRecord": {"event": [1@@ -5372,7 +5372,7 @@ export default {1],"parts": [- 279+ 278],"processedAt": [4@@ -5386,7 +5386,7 @@ export default {},"AgentChatThread": {"id": [- 221+ 220],"title": [1@@ -5656,7 +5656,7 @@ export default {4],"connectedAccount": [- 272+ 271],"__typename": [1@@ -5799,10 +5799,10 @@ export default {},"Query": {"navigationMenuItems": [- 162+ 161],"navigationMenuItem": [- 162,+ 161,{"id": [3,@@ -5950,7 +5950,7 @@ export default {}],"billingPortalSession": [- 156,+ 155,{"returnUrlPath": [1@@ -5958,16 +5958,16 @@ export default {}],"listPlans": [- 155+ 154],"getResourceCreditUsage": [- 154+ 153],"findWorkspaceInvitations": [- 159+ 158],"getApprovedAccessDomains": [- 135+ 134],"getPageLayoutTabs": [122,@@ -6008,7 +6008,7 @@ export default {}],"getEmailingDomains": [- 131+ 130],"applicationConnectionProviders": [126,@@ -6092,7 +6092,7 @@ export default {}],"objectRecordCounts": [- 214+ 213],"object": [56,@@ -6104,7 +6104,7 @@ export default {}],"objects": [- 215,+ 214,{"paging": [49,@@ -6126,7 +6126,7 @@ export default {}],"indexMetadatas": [- 209,+ 208,{"paging": [49,@@ -6151,13 +6151,13 @@ export default {}],"myConnectedAccounts": [- 272+ 271],"getRoles": [29],"getToolIndex": [- 278+ 277],"getToolInputSchema": [15,@@ -6169,10 +6169,10 @@ export default {}],"webhooks": [- 277+ 276],"webhook": [- 277,+ 276,{"id": [3,@@ -6190,7 +6190,7 @@ export default {}],"fields": [- 219,+ 218,{"paging": [49,@@ -6247,7 +6247,7 @@ export default {325],"appConnections": [- 220,+ 219,{"filter": [330@@ -6255,10 +6255,10 @@ export default {}],"appConnection": [- 220,+ 219,{"id": [- 221,+ 220,"ID!"]}@@ -6321,7 +6321,7 @@ export default {}],"checkUserExists": [- 255,+ 254,{"email": [1,@@ -6333,7 +6333,7 @@ export default {}],"checkWorkspaceInviteHashIsValid": [- 256,+ 255,{"inviteHash": [1,@@ -6351,7 +6351,7 @@ export default {}],"validatePasswordResetToken": [- 250,+ 249,{"passwordResetToken": [1,@@ -6360,7 +6360,7 @@ export default {}],"findApplicationRegistrationByClientId": [- 203,+ 202,{"clientId": [1,@@ -6390,7 +6390,7 @@ export default {}],"findApplicationRegistrationStats": [- 201,+ 200,{"id": [1,@@ -6399,7 +6399,7 @@ export default {}],"findApplicationRegistrationVariables": [- 176,+ 175,{"applicationRegistrationId": [1,@@ -6423,7 +6423,7 @@ export default {76],"getPublicWorkspaceDataByDomain": [- 183,+ 182,{"origin": [1@@ -6431,7 +6431,7 @@ export default {}],"getPublicWorkspaceDataById": [- 184,+ 183,{"id": [3,@@ -6454,7 +6454,7 @@ export default {}],"getSSOIdentityProviders": [- 226+ 225],"eventLogs": [293,@@ -6466,7 +6466,7 @@ export default {}],"pieChartData": [- 288,+ 287,{"input": [335,@@ -6475,7 +6475,7 @@ export default {}],"lineChartData": [- 286,+ 285,{"input": [336,@@ -6484,7 +6484,7 @@ export default {}],"barChartData": [- 283,+ 282,{"input": [337,@@ -6493,7 +6493,7 @@ export default {}],"getConnectedImapSmtpCaldavAccount": [- 275,+ 274,{"id": [3,@@ -6502,7 +6502,7 @@ export default {}],"getAutoCompleteAddress": [- 267,+ 266,{"address": [1,@@ -6521,7 +6521,7 @@ export default {}],"getAddressDetails": [- 269,+ 268,{"placeId": [1,@@ -6534,7 +6534,7 @@ export default {}],"getUsageAnalytics": [- 260,+ 259,{"input": [338@@ -6542,13 +6542,13 @@ export default {}],"findManyPublicDomains": [- 266+ 265],"findManyMarketplaceApps": [- 264+ 263],"findMarketplaceAppDetail": [- 265,+ 264,{"universalIdentifier": [1,@@ -6570,7 +6570,7 @@ export default {},"LogicFunctionIdInput": {"id": [- 221+ 220],"__typename": [1@@ -6718,7 +6718,7 @@ export default {}],"createManyNavigationMenuItems": [- 162,+ 161,{"inputs": [343,@@ -6727,7 +6727,7 @@ export default {}],"createNavigationMenuItem": [- 162,+ 161,{"input": [343,@@ -6736,7 +6736,7 @@ export default {}],"updateManyNavigationMenuItems": [- 162,+ 161,{"inputs": [344,@@ -6745,7 +6745,7 @@ export default {}],"updateNavigationMenuItem": [- 162,+ 161,{"input": [344,@@ -6754,7 +6754,7 @@ export default {}],"deleteManyNavigationMenuItems": [- 162,+ 161,{"ids": [3,@@ -6763,7 +6763,7 @@ export default {}],"deleteNavigationMenuItem": [- 162,+ 161,{"id": [3,@@ -6772,7 +6772,7 @@ export default {}],"uploadEmailAttachmentFile": [- 136,+ 135,{"file": [346,@@ -6793,7 +6793,7 @@ export default {}],"uploadAiChatFile": [- 136,+ 135,{"file": [346,@@ -6802,7 +6802,7 @@ export default {}],"uploadWorkflowFile": [- 136,+ 135,{"file": [346,@@ -6811,7 +6811,7 @@ export default {}],"uploadWorkspaceLogo": [- 136,+ 135,{"file": [346,@@ -6820,7 +6820,7 @@ export default {}],"uploadWorkspaceMemberProfilePicture": [- 136,+ 135,{"file": [346,@@ -6829,7 +6829,7 @@ export default {}],"uploadFilesFieldFile": [- 136,+ 135,{"file": [346,@@ -6842,7 +6842,7 @@ export default {}],"uploadFilesFieldFileByUniversalIdentifier": [- 136,+ 135,{"file": [346,@@ -7154,59 +7154,21 @@ export default {]}],- "createObjectEvent": [- 129,- {- "event": [- 1,- "String!"- ],- "recordId": [- 3,- "UUID!"- ],- "objectMetadataId": [- 3,- "UUID!"- ],- "properties": [- 15- ]- }- ],- "trackAnalytics": [- 129,- {- "type": [- 382,- "AnalyticsType!"- ],- "name": [- 1- ],- "event": [- 1- ],- "properties": [- 15- ]- }- ],"skipSyncEmailOnboardingStep": [- 158+ 157],"skipBookOnboardingStep": [- 158+ 157],"checkoutSession": [- 156,+ 155,{"recurringInterval": [- 144,+ 143,"SubscriptionInterval!"],"plan": [- 140,+ 139,"BillingPlanKey!"],"requirePaymentMethod": [@@ -7219,19 +7181,19 @@ export default {}],"switchSubscriptionInterval": [- 157+ 156],"switchBillingPlan": [- 157+ 156],"cancelSwitchBillingPlan": [- 157+ 156],"cancelSwitchBillingInterval": [- 157+ 156],"setResourceCreditSubscriptionPrice": [- 157,+ 156,{"priceId": [1,@@ -7240,10 +7202,10 @@ export default {}],"endSubscriptionTrialPeriod": [- 153+ 152],"cancelSwitchResourceCreditPrice": [- 157+ 156],"deleteWorkspaceInvitation": [1,@@ -7255,7 +7217,7 @@ export default {}],"resendWorkspaceInvitation": [- 160,+ 159,{"appTokenId": [1,@@ -7264,7 +7226,7 @@ export default {}],"sendInvitations": [- 160,+ 159,{"emails": [1,@@ -7276,10 +7238,10 @@ export default {}],"createApprovedAccessDomain": [- 135,+ 134,{"input": [- 383,+ 382,"CreateApprovedAccessDomainInput!"]}@@ -7288,16 +7250,16 @@ export default {6,{"input": [- 384,+ 383,"DeleteApprovedAccessDomainInput!"]}],"validateApprovedAccessDomain": [- 135,+ 134,{"input": [- 385,+ 384,"ValidateApprovedAccessDomainInput!"]}@@ -7306,7 +7268,7 @@ export default {122,{"input": [- 386,+ 385,"CreatePageLayoutTabInput!"]}@@ -7319,7 +7281,7 @@ export default {"String!"],"input": [- 387,+ 386,"UpdatePageLayoutTabInput!"]}@@ -7337,7 +7299,7 @@ export default {123,{"input": [- 388,+ 387,"CreatePageLayoutInput!"]}@@ -7350,7 +7312,7 @@ export default {"String!"],"input": [- 389,+ 388,"UpdatePageLayoutInput!"]}@@ -7372,7 +7334,7 @@ export default {"String!"],"input": [- 390,+ 389,"UpdatePageLayoutWithTabsInput!"]}@@ -7405,14 +7367,14 @@ export default {}],"createEmailingDomain": [- 131,+ 130,{"domain": [1,"String!"],"driver": [- 132,+ 131,"EmailingDomainDriver!"]}@@ -7427,7 +7389,7 @@ export default {}],"verifyEmailingDomain": [- 131,+ 130,{"id": [1,@@ -7436,10 +7398,10 @@ export default {}],"sendEmailViaEmailingDomain": [- 134,+ 133,{"input": [- 394,+ 393,"SendEmailViaDomainInput!"]}@@ -7465,7 +7427,7 @@ export default {85,{"input": [- 395,+ 394,"CreatePageLayoutWidgetInput!"]}@@ -7478,7 +7440,7 @@ export default {"String!"],"input": [- 396,+ 395,"UpdatePageLayoutWidgetInput!"]}@@ -7505,16 +7467,16 @@ export default {41,{"input": [- 397,+ 396,"CreateLogicFunctionFromSourceInput!"]}],"executeOneLogicFunction": [- 171,+ 170,{"input": [- 398,+ 397,"ExecuteOneLogicFunctionInput!"]}@@ -7523,7 +7485,7 @@ export default {6,{"input": [- 399,+ 398,"UpdateLogicFunctionFromSourceInput!"]}@@ -7532,7 +7494,7 @@ export default {35,{"input": [- 401,+ 400,"CreateCommandMenuItemInput!"]}@@ -7541,7 +7503,7 @@ export default {35,{"input": [- 402,+ 401,"UpdateCommandMenuItemInput!"]}@@ -7559,7 +7521,7 @@ export default {34,{"input": [- 403,+ 402,"CreateFrontComponentInput!"]}@@ -7568,7 +7530,7 @@ export default {34,{"input": [- 404,+ 403,"UpdateFrontComponentInput!"]}@@ -7586,7 +7548,7 @@ export default {56,{"input": [- 406,+ 405,"CreateOneObjectInput!"]}@@ -7595,7 +7557,7 @@ export default {56,{"input": [- 408,+ 407,"DeleteOneObjectInput!"]}@@ -7604,7 +7566,7 @@ export default {56,{"input": [- 409,+ 408,"UpdateOneObjectInput!"]}@@ -7613,7 +7575,7 @@ export default {47,{"input": [- 411,+ 410,"CreateOneIndexInput!"]}@@ -7622,7 +7584,7 @@ export default {47,{"input": [- 414,+ 413,"DeleteOneIndexInput!"]}@@ -7631,7 +7593,7 @@ export default {25,{"input": [- 415,+ 414,"CreateAgentInput!"]}@@ -7640,7 +7602,7 @@ export default {25,{"input": [- 416,+ 415,"UpdateAgentInput!"]}@@ -7655,7 +7617,7 @@ export default {}],"deleteConnectedAccount": [- 272,+ 271,{"id": [3,@@ -7680,7 +7642,7 @@ export default {29,{"createRoleInput": [- 417,+ 416,"CreateRoleInput!"]}@@ -7689,7 +7651,7 @@ export default {29,{"updateRoleInput": [- 418,+ 417,"UpdateRoleInput!"]}@@ -7707,7 +7669,7 @@ export default {16,{"upsertObjectPermissionsInput": [- 420,+ 419,"UpsertObjectPermissionsInput!"]}@@ -7716,7 +7678,7 @@ export default {27,{"upsertPermissionFlagsInput": [- 422,+ 421,"UpsertPermissionFlagsInput!"]}@@ -7725,16 +7687,16 @@ export default {26,{"upsertFieldPermissionsInput": [- 423,+ 422,"UpsertFieldPermissionsInput!"]}],"upsertRowLevelPermissionPredicates": [- 236,+ 235,{"input": [- 425,+ 424,"UpsertRowLevelPermissionPredicatesInput!"]}@@ -7762,34 +7724,34 @@ export default {}],"runAgent": [- 280,+ 279,{"input": [- 428,+ 427,"RunAgentInput!"]}],"createWebhook": [- 277,+ 276,{"input": [- 429,+ 428,"CreateWebhookInput!"]}],"updateWebhook": [- 277,+ 276,{"input": [- 430,+ 429,"UpdateWebhookInput!"]}],"deleteWebhook": [- 277,+ 276,{"id": [3,@@ -7801,7 +7763,7 @@ export default {44,{"input": [- 432,+ 431,"CreateOneFieldMetadataInput!"]}@@ -7810,7 +7772,7 @@ export default {44,{"input": [- 434,+ 433,"UpdateOneFieldMetadataInput!"]}@@ -7819,7 +7781,7 @@ export default {44,{"input": [- 436,+ 435,"DeleteOneFieldInput!"]}@@ -7828,7 +7790,7 @@ export default {66,{"input": [- 437,+ 436,"CreateViewGroupInput!"]}@@ -7837,7 +7799,7 @@ export default {66,{"inputs": [- 437,+ 436,"[CreateViewGroupInput!]!"]}@@ -7846,7 +7808,7 @@ export default {66,{"input": [- 438,+ 437,"UpdateViewGroupInput!"]}@@ -7855,7 +7817,7 @@ export default {66,{"inputs": [- 438,+ 437,"[UpdateViewGroupInput!]!"]}@@ -7864,7 +7826,7 @@ export default {66,{"input": [- 440,+ 439,"DeleteViewGroupInput!"]}@@ -7873,7 +7835,7 @@ export default {66,{"input": [- 441,+ 440,"DestroyViewGroupInput!"]}@@ -7882,7 +7844,7 @@ export default {319,{"input": [- 442,+ 441,"UpdateMessageFolderInput!"]}@@ -7891,7 +7853,7 @@ export default {319,{"input": [- 444,+ 443,"UpdateMessageFoldersInput!"]}@@ -7900,7 +7862,7 @@ export default {310,{"input": [- 445,+ 444,"UpdateMessageChannelInput!"]}@@ -7909,7 +7871,7 @@ export default {318,{"input": [- 447,+ 446,"CreateEmailGroupChannelInput!"]}@@ -7927,7 +7889,7 @@ export default {305,{"input": [- 448,+ 447,"UpdateCalendarChannelInput!"]}@@ -7957,7 +7919,7 @@ export default {1],"fileAttachments": [- 450,+ 449,"[FileAttachmentInput!]"]}@@ -8024,7 +7986,7 @@ export default {294,{"input": [- 451,+ 450,"CreateSkillInput!"]}@@ -8033,7 +7995,7 @@ export default {294,{"input": [- 452,+ 451,"UpdateSkillInput!"]}@@ -8088,16 +8050,16 @@ export default {}],"getAuthorizationUrlForSSO": [- 245,+ 244,{"input": [- 453,+ 452,"GetAuthorizationUrlForSSOInput!"]}],"getLoginTokenFromCredentials": [- 254,+ 253,{"email": [1,@@ -8123,7 +8085,7 @@ export default {}],"signIn": [- 243,+ 242,{"email": [1,@@ -8145,7 +8107,7 @@ export default {}],"verifyEmailAndGetLoginToken": [- 251,+ 250,{"emailVerificationToken": [1,@@ -8165,7 +8127,7 @@ export default {}],"verifyEmailAndGetWorkspaceAgnosticToken": [- 243,+ 242,{"emailVerificationToken": [1,@@ -8181,7 +8143,7 @@ export default {}],"getAuthTokensFromOTP": [- 253,+ 252,{"otp": [1,@@ -8201,7 +8163,7 @@ export default {}],"signUp": [- 243,+ 242,{"email": [1,@@ -8223,7 +8185,7 @@ export default {}],"signUpInWorkspace": [- 248,+ 247,{"email": [1,@@ -8254,13 +8216,13 @@ export default {}],"signUpInNewWorkspace": [- 248+ 247],"generateTransientToken": [- 249+ 248],"getAuthTokensFromLoginToken": [- 253,+ 252,{"loginToken": [1,@@ -8273,7 +8235,7 @@ export default {}],"authorizeApp": [- 241,+ 240,{"clientId": [1,@@ -8295,7 +8257,7 @@ export default {}],"renewToken": [- 253,+ 252,{"appToken": [1,@@ -8304,7 +8266,7 @@ export default {}],"generateApiKeyToken": [- 252,+ 251,{"apiKeyId": [3,@@ -8320,7 +8282,7 @@ export default {32],"emailPasswordResetLink": [- 244,+ 243,{"email": [1,@@ -8332,7 +8294,7 @@ export default {}],"updatePasswordViaResetToken": [- 246,+ 245,{"passwordResetToken": [1,@@ -8345,10 +8307,10 @@ export default {}],"createApplicationRegistration": [- 202,+ 201,{"input": [- 454,+ 453,"CreateApplicationRegistrationInput!"]}@@ -8357,7 +8319,7 @@ export default {7,{"input": [- 455,+ 454,"UpdateApplicationRegistrationInput!"]}@@ -8372,7 +8334,7 @@ export default {}],"rotateApplicationRegistrationClientSecret": [- 204,+ 203,{"id": [1,@@ -8384,7 +8346,7 @@ export default {5,{"input": [- 457,+ 456,"CreateApplicationRegistrationVariableInput!"]}@@ -8393,7 +8355,7 @@ export default {5,{"input": [- 458,+ 457,"UpdateApplicationRegistrationVariableInput!"]}@@ -8433,7 +8395,7 @@ export default {}],"initiateOTPProvisioning": [- 239,+ 238,{"loginToken": [1,@@ -8446,10 +8408,10 @@ export default {}],"initiateOTPProvisioningForAuthenticatedUser": [- 239+ 238],"deleteTwoFactorAuthenticationMethod": [- 238,+ 237,{"twoFactorAuthenticationMethodId": [3,@@ -8458,7 +8420,7 @@ export default {}],"verifyTwoFactorAuthenticationMethodForAuthenticatedUser": [- 240,+ 239,{"otp": [1,@@ -8482,7 +8444,7 @@ export default {6,{"input": [- 460,+ 459,"UpdateWorkspaceMemberSettingsInput!"]}@@ -8500,7 +8462,7 @@ export default {}],"resendEmailVerificationToken": [- 222,+ 221,{"email": [1,@@ -8516,7 +8478,7 @@ export default {76,{"data": [- 461,+ 460,"ActivateWorkspaceInput!"]}@@ -8525,7 +8487,7 @@ export default {76,{"data": [- 462,+ 461,"UpdateWorkspaceInput!"]}@@ -8534,13 +8496,13 @@ export default {76],"checkCustomDomainValidRecords": [- 235+ 234],"runWorkspaceMigration": [6,{"workspaceMigration": [- 463,+ 462,"WorkspaceMigrationInput!"]}@@ -8555,43 +8517,81 @@ export default {}],"createOIDCIdentityProvider": [- 227,+ 226,{"input": [- 466,+ 465,"SetupOIDCSsoInput!"]}],"createSAMLIdentityProvider": [- 227,+ 226,{"input": [- 467,+ 466,"SetupSAMLSsoInput!"]}],"deleteSSOIdentityProvider": [- 223,+ 222,{"input": [- 468,+ 467,"DeleteSsoInput!"]}],"editSSOIdentityProvider": [- 224,+ 223,{"input": [- 469,+ 468,"EditSsoInput!"]}],+ "createObjectEvent": [+ 290,+ {+ "event": [+ 1,+ "String!"+ ],+ "recordId": [+ 3,+ "UUID!"+ ],+ "objectMetadataId": [+ 3,+ "UUID!"+ ],+ "properties": [+ 15+ ]+ }+ ],+ "trackAnalytics": [+ 290,+ {+ "type": [+ 469,+ "AnalyticsType!"+ ],+ "name": [+ 1+ ],+ "event": [+ 1+ ],+ "properties": [+ 15+ ]+ }+ ],"duplicateDashboard": [- 289,+ 288,{"id": [3,@@ -8600,7 +8600,7 @@ export default {}],"impersonate": [- 257,+ 256,{"userId": [3,@@ -8613,7 +8613,7 @@ export default {}],"sendEmail": [- 290,+ 289,{"input": [470,@@ -8622,7 +8622,7 @@ export default {}],"startChannelSync": [- 281,+ 280,{"connectedAccountId": [3,@@ -8631,7 +8631,7 @@ export default {}],"saveImapSmtpCaldavAccount": [- 276,+ 275,{"handle": [1,@@ -8647,7 +8647,7 @@ export default {}],"updateLabPublicFeatureFlag": [- 173,+ 172,{"input": [474,@@ -8656,7 +8656,7 @@ export default {}],"createPublicDomain": [- 266,+ 265,{"domain": [1,@@ -8668,7 +8668,7 @@ export default {}],"updatePublicDomain": [- 266,+ 265,{"domain": [1,@@ -8689,7 +8689,7 @@ export default {}],"checkPublicDomainValidRecords": [- 235,+ 234,{"domain": [1,@@ -8734,7 +8734,7 @@ export default {6],"createDevelopmentApplication": [- 261,+ 260,{"universalIdentifier": [1,@@ -8756,7 +8756,7 @@ export default {}],"syncApplication": [- 262,+ 261,{"manifest": [15,@@ -8768,7 +8768,7 @@ export default {}],"uploadApplicationFile": [- 263,+ 262,{"file": [346,@@ -8856,7 +8856,7 @@ export default {3],"type": [- 163+ 162],"name": [1@@ -9543,7 +9543,6 @@ export default {1]},- "AnalyticsType": {},"CreateApprovedAccessDomainInput": {"domain": [1@@ -9647,7 +9646,7 @@ export default {3],"tabs": [- 391+ 390],"__typename": [1@@ -9670,7 +9669,7 @@ export default {89],"widgets": [- 392+ 391],"__typename": [1@@ -9693,7 +9692,7 @@ export default {3],"gridPosition": [- 393+ 392],"position": [15@@ -9774,7 +9773,7 @@ export default {3],"gridPosition": [- 393+ 392],"position": [15@@ -9800,7 +9799,7 @@ export default {3],"gridPosition": [- 393+ 392],"position": [15@@ -9872,7 +9871,7 @@ export default {3],"update": [- 400+ 399],"__typename": [1@@ -10032,7 +10031,7 @@ export default {3],"update": [- 405+ 404],"__typename": [1@@ -10051,7 +10050,7 @@ export default {},"CreateOneObjectInput": {"object": [- 407+ 406],"__typename": [1@@ -10111,7 +10110,7 @@ export default {},"UpdateOneObjectInput": {"update": [- 410+ 409],"id": [3@@ -10166,7 +10165,7 @@ export default {},"CreateOneIndexInput": {"index": [- 412+ 411],"__typename": [1@@ -10177,7 +10176,7 @@ export default {3],"fields": [- 413+ 412],"indexType": [48@@ -10324,7 +10323,7 @@ export default {},"UpdateRoleInput": {"update": [- 419+ 418],"id": [3@@ -10379,7 +10378,7 @@ export default {3],"objectPermissions": [- 421+ 420],"__typename": [1@@ -10421,7 +10420,7 @@ export default {3],"fieldPermissions": [- 424+ 423],"__typename": [1@@ -10452,10 +10451,10 @@ export default {3],"predicates": [- 426+ 425],"predicateGroups": [- 427+ 426],"__typename": [1@@ -10549,7 +10548,7 @@ export default {3],"update": [- 431+ 430],"__typename": [1@@ -10574,7 +10573,7 @@ export default {},"CreateOneFieldMetadataInput": {"field": [- 433+ 432],"__typename": [1@@ -10647,7 +10646,7 @@ export default {3],"update": [- 435+ 434],"__typename": [1@@ -10739,7 +10738,7 @@ export default {3],"update": [- 439+ 438],"__typename": [1@@ -10783,7 +10782,7 @@ export default {3],"update": [- 443+ 442],"__typename": [1@@ -10802,7 +10801,7 @@ export default {3],"update": [- 443+ 442],"__typename": [1@@ -10813,7 +10812,7 @@ export default {3],"update": [- 446+ 445],"__typename": [1@@ -10858,7 +10857,7 @@ export default {3],"update": [- 449+ 448],"__typename": [1@@ -10974,7 +10973,7 @@ export default {1],"update": [- 456+ 455],"__typename": [1@@ -11022,7 +11021,7 @@ export default {1],"update": [- 459+ 458],"__typename": [1@@ -11140,7 +11139,7 @@ export default {},"WorkspaceMigrationInput": {"actions": [- 464+ 463],"__typename": [1@@ -11148,7 +11147,7 @@ export default {},"WorkspaceMigrationDeleteActionInput": {"type": [- 465+ 464],"metadataName": [322@@ -11214,12 +11213,13 @@ export default {3],"status": [- 180+ 179],"__typename": [1]},+ "AnalyticsType": {},"SendEmailInput": {"connectedAccountId": [1@@ -11324,7 +11324,7 @@ export default {"FileFolder": {},"Subscription": {"onEventSubscription": [- 170,+ 169,{"eventStreamId": [1,@@ -11333,7 +11333,7 @@ export default {}],"logicFunctionLogs": [- 237,+ 236,{"input": [479,@@ -11350,6 +11350,15 @@ export default {]}],+ "eventLogsLive": [+ 291,+ {+ "table": [+ 332,+ "EventLogTable!"+ ]+ }+ ],"__typename": [1]diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 377f8aff3a3..98bc3762db4 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -4933,12 +4933,18 @@ export type StandardOverrides = {export type Subscription = {__typename?: 'Subscription';+ eventLogsLive?: Maybe<Array<EventLogRecord>>;logicFunctionLogs: LogicFunctionLogs;onAgentChatEvent: AgentChatEvent;onEventSubscription?: Maybe<EventSubscription>;};+export type SubscriptionEventLogsLiveArgs = {+ table: EventLogTable;+};++export type SubscriptionLogicFunctionLogsArgs = {input: LogicFunctionLogsInput;};@@ -7404,7 +7410,14 @@ export type EventLogsQueryVariables = Exact<{}>;-export type EventLogsQuery = { __typename?: 'Query', eventLogs: { __typename?: 'EventLogQueryResult', totalCount: number, records: Array<{ __typename?: 'EventLogRecord', event: string, timestamp: string, userId?: string | null, properties?: any | null, recordId?: string | null, objectMetadataId?: string | null, isCustom?: boolean | null }>, pageInfo: { __typename?: 'EventLogPageInfo', endCursor?: string | null, hasNextPage: boolean } } };+export type EventLogsQuery = { __typename?: 'Query', eventLogs: { __typename?: 'EventLogQueryResult', totalCount: number, records: Array<{ __typename?: 'EventLogRecord', event: string, timestamp: string, userId?: string | null, properties?: any | null, recordId?: string | null, objectMetadataId?: string | null }>, pageInfo: { __typename?: 'EventLogPageInfo', endCursor?: string | null, hasNextPage: boolean } } };++export type EventLogsLiveSubscriptionVariables = Exact<{+ table: EventLogTable;+}>;+++export type EventLogsLiveSubscription = { __typename?: 'Subscription', eventLogsLive?: Array<{ __typename?: 'EventLogRecord', event: string, timestamp: string, userId?: string | null, properties?: any | null, recordId?: string | null, objectMetadataId?: string | null }> | null };export type UpdateLabPublicFeatureFlagMutationVariables = Exact<{input: UpdateLabPublicFeatureFlagInput;@@ -8255,7 +8268,8 @@ export const SetEnterpriseKeyDocument = {"kind":"Document","definitions":[{"kindexport const EnterpriseCheckoutSessionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EnterpriseCheckoutSession"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"billingInterval"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enterpriseCheckoutSession"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"billingInterval"},"value":{"kind":"Variable","name":{"kind":"Name","value":"billingInterval"}}}]}]}}]} as unknown as DocumentNode<EnterpriseCheckoutSessionQuery, EnterpriseCheckoutSessionQueryVariables>;export const EnterprisePortalSessionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EnterprisePortalSession"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"returnUrlPath"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enterprisePortalSession"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"returnUrlPath"},"value":{"kind":"Variable","name":{"kind":"Name","value":"returnUrlPath"}}}]}]}}]} as unknown as DocumentNode<EnterprisePortalSessionQuery, EnterprisePortalSessionQueryVariables>;export const EnterpriseSubscriptionStatusDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EnterpriseSubscriptionStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enterpriseSubscriptionStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"licensee"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"isCancellationScheduled"}}]}}]}}]} as unknown as DocumentNode<EnterpriseSubscriptionStatusQuery, EnterpriseSubscriptionStatusQueryVariables>;-export const EventLogsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EventLogs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EventLogQueryInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"eventLogs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"event"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"properties"}},{"kind":"Field","name":{"kind":"Name","value":"recordId"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}}]}}]} as unknown as DocumentNode<EventLogsQuery, EventLogsQueryVariables>;+export const EventLogsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EventLogs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EventLogQueryInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"eventLogs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"event"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"properties"}},{"kind":"Field","name":{"kind":"Name","value":"recordId"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"endCursor"}},{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}}]}}]}}]}}]} as unknown as DocumentNode<EventLogsQuery, EventLogsQueryVariables>;+export const EventLogsLiveDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"EventLogsLive"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"table"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EventLogTable"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"eventLogsLive"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"table"},"value":{"kind":"Variable","name":{"kind":"Name","value":"table"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"event"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"properties"}},{"kind":"Field","name":{"kind":"Name","value":"recordId"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}}]}}]}}]} as unknown as DocumentNode<EventLogsLiveSubscription, EventLogsLiveSubscriptionVariables>;export const UpdateLabPublicFeatureFlagDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateLabPublicFeatureFlag"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateLabPublicFeatureFlagInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateLabPublicFeatureFlag"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}}]}}]}}]} as unknown as DocumentNode<UpdateLabPublicFeatureFlagMutation, UpdateLabPublicFeatureFlagMutationVariables>;export const UploadWorkspaceMemberProfilePictureDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UploadWorkspaceMemberProfilePicture"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"file"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Upload"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"uploadWorkspaceMemberProfilePicture"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"file"},"value":{"kind":"Variable","name":{"kind":"Name","value":"file"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}}]}}]} as unknown as DocumentNode<UploadWorkspaceMemberProfilePictureMutation, UploadWorkspaceMemberProfilePictureMutationVariables>;export const UpdateUserEmailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateUserEmail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"newEmail"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"verifyEmailRedirectPath"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateUserEmail"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"newEmail"},"value":{"kind":"Variable","name":{"kind":"Name","value":"newEmail"}}},{"kind":"Argument","name":{"kind":"Name","value":"verifyEmailRedirectPath"},"value":{"kind":"Variable","name":{"kind":"Name","value":"verifyEmailRedirectPath"}}}]}]}}]} as unknown as DocumentNode<UpdateUserEmailMutation, UpdateUserEmailMutationVariables>;diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogDatePickerInput.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogDatePickerInput.tsxindex 9603ff5cc6e..ac813405d75 100644--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogDatePickerInput.tsx+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogDatePickerInput.tsx@@ -1,4 +1 @@-export {- SettingsDatePickerInput as EventLogDatePickerInput,- type SettingsDatePickerInputProps as EventLogDatePickerInputProps,-} from '@/settings/components/SettingsDatePickerInput';+export { SettingsDatePickerInput as EventLogDatePickerInput } from '@/settings/components/SettingsDatePickerInput';diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsxindex 653f31e35ba..1038f24b9d6 100644--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogResultsTable.tsx@@ -12,18 +12,16 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';import {type EventLogRecord,- EventLogTable,+ type EventLogTable,} from '~/generated-metadata/graphql';import {type ColumnConfig,getColumnsForEventLogTable,} from '@/settings/event-logs/utils/getColumnsForEventLogTable';-import { EventLogJsonCell } from '@/settings/event-logs/components/EventLogJsonCell';type EventLogResultsTableProps = {records: EventLogRecord[];@@ -106,9 +104,6 @@ export const EventLogResultsTable = ({const { theme } = useContext(ThemeContext);const { t } = useLingui();- const showObjectEventColumns = selectedTable === EventLogTable.OBJECT_EVENT;- const showApplicationLogColumns =- selectedTable === EventLogTable.APPLICATION_LOG;const baseColumns = getColumnsForEventLogTable(selectedTable);const [columnWidths, setColumnWidths] = useState<Record<string, number>>(() =>@@ -117,7 +112,6 @@ export const EventLogResultsTable = ({const [resizingColumn, setResizingColumn] = useState<string | null>(null);- // Reset column widths when switching tables to avoid undefined widths for new columnsuseEffect(() => {setColumnWidths(Object.fromEntries(baseColumns.map((col) => [col.id, col.defaultWidth])),@@ -242,85 +236,21 @@ export const EventLogResultsTable = ({</StyledResizableHeaderContainer>))}</TableRow>- {records.map((record, index) => (+ {records.map((record) => (<TableRow- key={`${record.timestamp}-${record.event}-${index}`}+ key={`${record.timestamp}-${record.event}`}gridTemplateColumns={gridTemplateColumns}>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.event}- </TableCell>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {beautifyPastDateRelativeToNow(record.timestamp)}- </TableCell>- {showApplicationLogColumns ? (- <>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.properties?.level ?? '-'}- </TableCell>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.properties?.message ?? '-'}- </TableCell>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.properties?.executionId ?? '-'}- </TableCell>- </>- ) : (- <>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.userId ?? '-'}- </TableCell>- {showObjectEventColumns && (- <>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.recordId ?? '-'}- </TableCell>- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- {record.objectMetadataId ?? '-'}- </TableCell>- </>- )}- <TableCell- overflow="hidden"- textOverflow="ellipsis"- whiteSpace="nowrap"- >- <EventLogJsonCell value={record.properties} />- </TableCell>- </>- )}+ {baseColumns.map((column) => (+ <TableCell+ key={column.id}+ overflow="hidden"+ textOverflow="ellipsis"+ whiteSpace="nowrap"+ >+ {column.renderCell(record)}+ </TableCell>+ ))}</TableRow>))}</Table>diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogTableSelector.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogTableSelector.tsxindex c6c93fffbe4..9903d7faf54 100644--- a/packages/twenty-front/src/modules/settings/event-logs/components/EventLogTableSelector.tsx+++ b/packages/twenty-front/src/modules/settings/event-logs/components/EventLogTableSelector.tsx@@ -1,3 +1,5 @@+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';import { Select } from '@/ui/input/components/Select';@@ -8,34 +10,26 @@ type EventLogTableSelectorProps = {onChange: (value: EventLogTable) => void;};+const TABLE_LABELS: Record<EventLogTable, MessageDescriptor> = {+ [EventLogTable.PAGEVIEW]: msg`Page Views`,+ [EventLogTable.WORKSPACE_EVENT]: msg`Workspace Events`,+ [EventLogTable.OBJECT_EVENT]: msg`Object Events`,+ [EventLogTable.USAGE_EVENT]: msg`Usage Events`,+ [EventLogTable.APPLICATION_LOG]: msg`Application Logs`,+};+export const EventLogTableSelector = ({value,onChange,}: EventLogTableSelectorProps) => {const { t } = useLingui();- const options = [- {- value: EventLogTable.PAGEVIEW,- label: t`Page Views`,- },- {- value: EventLogTable.WORKSPACE_EVENT,- label: t`Workspace Events`,- },- {- value: EventLogTable.OBJECT_EVENT,- label: t`Object Events`,- },- {- value: EventLogTable.USAGE_EVENT,- label: t`Usage Events`,- },- {- value: EventLogTable.APPLICATION_LOG,- label: t`Application Logs`,- },- ];+ const options = (+ Object.entries(TABLE_LABELS) as [EventLogTable, MessageDescriptor][]+ ).map(([table, label]) => ({+ value: table,+ label: t(label),+ }));return (<Selectdiff --git a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsxindex 25ca1fe5cf9..b29bc9acd4a 100644--- a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx+++ b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx@@ -1,24 +1,51 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';+import { useMemo, useState } from 'react';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { billingState } from '@/client-config/states/billingState';import { isClickHouseConfiguredState } from '@/client-config/states/isClickHouseConfiguredState';import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';-import { SettingsEnterpriseFeatureGateCard } from '@/settings/components/SettingsEnterpriseFeatureGateCard';+import { SettingsOptionCardContentButton } from '@/settings/components/SettingsOptions/SettingsOptionCardContentButton';import { EventLogFilters } from '@/settings/event-logs/components/EventLogFilters';import { EventLogResultsTable } from '@/settings/event-logs/components/EventLogResultsTable';import { EventLogTableSelector } from '@/settings/event-logs/components/EventLogTableSelector';+import { useEventLogsLiveStream } from '@/settings/event-logs/hooks/useEventLogsLiveStream';import { useEventLogs } from '@/settings/event-logs/hooks/useQueryEventLogs';import { type EventLogFiltersState } from '@/settings/event-logs/types/EventLogFiltersState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { SettingsPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { IconRefresh } from 'twenty-ui/display';-import { IconButton } from 'twenty-ui/input';+import {+ IconArrowUp,+ IconLock,+ IconPlayerPause,+ IconPlayerPlay,+} from 'twenty-ui/display';+import { Button, IconButton } from 'twenty-ui/input';import { Card } from 'twenty-ui/layout';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { EventLogTable } from '~/generated-metadata/graphql';+import {+ BillingEntitlementKey,+ EventLogTable,+} from '~/generated-metadata/graphql';+import { useNavigateSettings } from '~/hooks/useNavigateSettings';+import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';++const StyledRoot = styled.div`+ box-sizing: border-box;+ display: flex;+ flex: 1;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[6]};+ margin: 0 auto;+ max-width: 760px;+ min-height: 0;+ padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[8]}+ ${themeCssVariables.spacing[8]};+ width: 100%;+`;const StyledCardContent = styled.div`display: flex;@@ -40,8 +67,10 @@ const StyledSelectorGrow = styled.div`const StyledResults = styled.div`display: flex;+ flex: 1;flex-direction: column;gap: ${themeCssVariables.spacing[2]};+ min-height: 0;`;const StyledRecordCount = styled.span`@@ -50,10 +79,9 @@ const StyledRecordCount = styled.span`font-size: ${themeCssVariables.font.size.sm};`;-// The results table scrolls internally and loads more as you reach the bottom,-// so it needs a bounded height.const StyledTableWrapper = styled.div`- height: 480px;+ flex: 1;+ min-height: 0;overflow: hidden;`;@@ -64,45 +92,64 @@ export const SettingsLogs = () => {const currentWorkspace = useAtomStateValue(currentWorkspaceState);const isClickHouseConfigured = useAtomStateValue(isClickHouseConfiguredState);+ const billing = useAtomStateValue(billingState);+ const navigateSettings = useNavigateSettings();- const hasEnterpriseAccess =- currentWorkspace?.hasValidSignedEnterpriseKey === true;+ const isBillingEnabled = billing?.isBillingEnabled ?? false;+ const hasAuditLogsEntitlement =+ currentWorkspace?.billingEntitlements?.some(+ (entitlement) =>+ entitlement.key === BillingEntitlementKey.AUDIT_LOGS &&+ entitlement.value,+ ) === true;const [selectedTable, setSelectedTable] = useState<EventLogTable>(EventLogTable.PAGEVIEW,);const [filters, setFilters] = useState<EventLogFiltersState>({});+ const [isPaused, setIsPaused] = useState(false);const isApplicationLog = selectedTable === EventLogTable.APPLICATION_LOG;const canQuery =- isClickHouseConfigured && (isApplicationLog || hasEnterpriseAccess);-- const {- records,- totalCount,- hasNextPage,- loading,- error,- refetch,- loadMore,- } = useEventLogs(- {- table: selectedTable,- filters: {- eventType: filters.eventType,- userWorkspaceId: filters.userWorkspaceId,- dateRange: filters.dateRange- ? {- start: filters.dateRange.start?.toISOString(),- end: filters.dateRange.end?.toISOString(),- }- : undefined,- recordId: filters.recordId,- objectMetadataId: filters.objectMetadataId,+ isClickHouseConfigured && (isApplicationLog || hasAuditLogsEntitlement);++ const { records, totalCount, hasNextPage, loading, error, loadMore } =+ useEventLogs(+ {+ table: selectedTable,+ filters: {+ eventType: filters.eventType,+ userWorkspaceId: filters.userWorkspaceId,+ dateRange: filters.dateRange+ ? {+ start: filters.dateRange.start?.toISOString(),+ end: filters.dateRange.end?.toISOString(),+ }+ : undefined,+ recordId: filters.recordId,+ objectMetadataId: filters.objectMetadataId,+ },+ first: RECORDS_PER_PAGE,},- first: RECORDS_PER_PAGE,- },- { skip: !canQuery },+ { skip: !canQuery },+ );++ const hasActiveFilters =+ isDefined(filters.eventType) ||+ isDefined(filters.userWorkspaceId) ||+ isDefined(filters.recordId) ||+ isDefined(filters.objectMetadataId) ||+ isDefined(filters.dateRange?.start) ||+ isDefined(filters.dateRange?.end);++ const liveRecords = useEventLogsLiveStream({+ table: selectedTable,+ enabled: !isPaused && !hasActiveFilters && canQuery,+ });++ const displayedRecords = useMemo(+ () => [...liveRecords, ...records],+ [liveRecords, records],);const handleTableChange = (table: EventLogTable) => {@@ -114,39 +161,63 @@ export const SettingsLogs = () => {setFilters(newFilters);};+ const renderUpgradeCard = () => (+ <Card rounded>+ <SettingsOptionCardContentButton+ Icon={IconLock}+ title={t`Upgrade to access audit logs`}+ description={t`Only application logs are available on your current plan. Other log types require an Enterprise subscription.`}+ Button={+ <Button+ title={t`Upgrade`}+ variant="primary"+ accent="blue"+ size="small"+ Icon={IconArrowUp}+ onClick={() =>+ navigateSettings(+ isBillingEnabled+ ? SettingsPath.Billing+ : SettingsPath.AdminPanelEnterprise,+ )+ }+ />+ }+ />+ </Card>+ );+const renderResults = () => {- if (!isApplicationLog && !hasEnterpriseAccess) {- return (- <SettingsEnterpriseFeatureGateCard- title={t`Enterprise feature`}- description={t`Upgrade to Enterprise to access this log type.`}- buttonTitle={t`Activate`}- />- );+ if (!isApplicationLog && !hasAuditLogsEntitlement) {+ return renderUpgradeCard();}if (!isClickHouseConfigured) {return (<SettingsEmptyPlaceholder>- {t`Audit logs require ClickHouse to be configured. Please contact your administrator.`}+ {t`Logs require ClickHouse to be configured. Please contact your administrator.`}</SettingsEmptyPlaceholder>);}if (isDefined(error)) {+ if (isGraphqlErrorOfType(error, 'NO_ENTITLEMENT')) {+ return renderUpgradeCard();+ }+return (<SettingsEmptyPlaceholder>- {t`Something went wrong while loading audit logs. Please try again.`}+ {t`Something went wrong while loading logs. Please try again.`}</SettingsEmptyPlaceholder>);}return (<StyledResults>- <StyledRecordCount>{t`${records.length} of ${totalCount}`}</StyledRecordCount>+ <StyledRecordCount>{t`${displayedRecords.length} of ${totalCount + liveRecords.length}`}</StyledRecordCount><StyledTableWrapper><EventLogResultsTable- records={records}+ records={displayedRecords}loading={loading}hasNextPage={hasNextPage}onLoadMore={loadMore}@@ -158,7 +229,7 @@ export const SettingsLogs = () => {};return (- <>+ <StyledRoot><Card rounded fullWidth><StyledCardContent><StyledSelectorRow>@@ -168,17 +239,15 @@ export const SettingsLogs = () => {onChange={handleTableChange}/></StyledSelectorGrow>- <IconButton- Icon={IconRefresh}- variant="secondary"- size="medium"- ariaLabel={t`Refresh`}- onClick={() => {- if (canQuery) {- void refetch();- }- }}- />+ {canQuery && (+ <IconButton+ Icon={isPaused ? IconPlayerPlay : IconPlayerPause}+ variant="secondary"+ size="medium"+ ariaLabel={isPaused ? t`Resume` : t`Pause`}+ onClick={() => setIsPaused((previous) => !previous)}+ />+ )}</StyledSelectorRow><EventLogFilterstable={selectedTable}@@ -189,6 +258,6 @@ export const SettingsLogs = () => {</Card>{renderResults()}- </>+ </StyledRoot>);};diff --git a/packages/twenty-front/src/modules/settings/event-logs/graphql/queries/getEventLogs.ts b/packages/twenty-front/src/modules/settings/event-logs/graphql/queries/getEventLogs.tsindex c0ac6a8de9f..072916adcb7 100644--- a/packages/twenty-front/src/modules/settings/event-logs/graphql/queries/getEventLogs.ts+++ b/packages/twenty-front/src/modules/settings/event-logs/graphql/queries/getEventLogs.ts@@ -10,7 +10,6 @@ export const GET_EVENT_LOGS = gql`propertiesrecordIdobjectMetadataId- isCustom}totalCountpageInfo {diff --git a/packages/twenty-front/src/modules/settings/event-logs/graphql/subscriptions/EventLogsLiveSubscription.ts b/packages/twenty-front/src/modules/settings/event-logs/graphql/subscriptions/EventLogsLiveSubscription.tsnew file mode 100644index 00000000000..34b03f111fd--- /dev/null+++ b/packages/twenty-front/src/modules/settings/event-logs/graphql/subscriptions/EventLogsLiveSubscription.ts@@ -0,0 +1,14 @@+import { gql } from '@apollo/client';++export const EVENT_LOGS_LIVE_SUBSCRIPTION = gql`+ subscription EventLogsLive($table: EventLogTable!) {+ eventLogsLive(table: $table) {+ event+ timestamp+ userId+ properties+ recordId+ objectMetadataId+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/event-logs/hooks/useEventLogsLiveStream.ts b/packages/twenty-front/src/modules/settings/event-logs/hooks/useEventLogsLiveStream.tsnew file mode 100644index 00000000000..e48232c7903--- /dev/null+++ b/packages/twenty-front/src/modules/settings/event-logs/hooks/useEventLogsLiveStream.ts@@ -0,0 +1,68 @@+import { print, type ExecutionResult } from 'graphql';+import { useEffect, useState } from 'react';++import { EVENT_LOGS_LIVE_SUBSCRIPTION } from '@/settings/event-logs/graphql/subscriptions/EventLogsLiveSubscription';+import { sseClientState } from '@/sse-db-event/states/sseClientState';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { captureException } from '@sentry/react';+import { isDefined } from 'twenty-shared/utils';++import {+ type EventLogRecord,+ type EventLogTable,+} from '~/generated-metadata/graphql';++type EventLogsLivePayload = {+ eventLogsLive: EventLogRecord[] | null;+};++const EVENT_LOGS_LIVE_SUBSCRIPTION_QUERY = print(EVENT_LOGS_LIVE_SUBSCRIPTION);++export const useEventLogsLiveStream = ({+ table,+ enabled,+}: {+ table: EventLogTable;+ enabled: boolean;+}): EventLogRecord[] => {+ const sseClient = useAtomStateValue(sseClientState);+ const [liveRecords, setLiveRecords] = useState<EventLogRecord[]>([]);++ useEffect(() => {+ setLiveRecords([]);+ }, [table]);++ useEffect(() => {+ if (!enabled) {+ setLiveRecords([]);+ }+ }, [enabled]);++ useEffect(() => {+ if (!enabled || !isDefined(sseClient)) {+ return;+ }++ const dispose = sseClient.subscribe<EventLogsLivePayload>(+ {+ query: EVENT_LOGS_LIVE_SUBSCRIPTION_QUERY,+ variables: { table },+ },+ {+ next: (value: ExecutionResult<EventLogsLivePayload>) => {+ const incoming = value.data?.eventLogsLive;++ if (isDefined(incoming) && incoming.length > 0) {+ setLiveRecords((previous) => [...incoming, ...previous]);+ }+ },+ error: (error) => captureException(error),+ complete: () => {},+ },+ );++ return () => dispose();+ }, [enabled, sseClient, table]);++ return liveRecords;+};diff --git a/packages/twenty-front/src/modules/settings/event-logs/hooks/useQueryEventLogs.ts b/packages/twenty-front/src/modules/settings/event-logs/hooks/useQueryEventLogs.tsindex edf417da1d7..5c55049a32a 100644--- a/packages/twenty-front/src/modules/settings/event-logs/hooks/useQueryEventLogs.ts+++ b/packages/twenty-front/src/modules/settings/event-logs/hooks/useQueryEventLogs.ts@@ -20,7 +20,7 @@ export const useEventLogs = (input: EventLogQueryInput,options?: { skip?: boolean },) => {- const { data, loading, error, refetch, fetchMore } = useQuery<+ const { data, loading, error, fetchMore } = useQuery<EventLogsData,EventLogsVariables>(GET_EVENT_LOGS, {@@ -70,7 +70,6 @@ export const useEventLogs = (hasNextPage,loading,error,- refetch,loadMore,};};diff --git a/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.ts b/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.tsdeleted file mode 100644index 65488c98e86..00000000000--- a/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.ts+++ /dev/null@@ -1,121 +0,0 @@-import { msg } from '@lingui/core/macro';-import { type MessageDescriptor } from '@lingui/core';--import { EventLogTable } from '~/generated-metadata/graphql';--export type ColumnConfig = {- id: string;- label: MessageDescriptor;- minWidth: number;- defaultWidth: number;-};--const DEFAULT_COLUMNS: ColumnConfig[] = [- { id: 'event', label: msg`Event`, minWidth: 100, defaultWidth: 200 },- {- id: 'timestamp',- label: msg`Timestamp`,- minWidth: 100,- defaultWidth: 150,- },- { id: 'userId', label: msg`User`, minWidth: 100, defaultWidth: 150 },- {- id: 'properties',- label: msg`Properties`,- minWidth: 200,- defaultWidth: 400,- },-];--const OBJECT_EVENT_COLUMNS: ColumnConfig[] = [- { id: 'event', label: msg`Event`, minWidth: 100, defaultWidth: 180 },- {- id: 'timestamp',- label: msg`Timestamp`,- minWidth: 100,- defaultWidth: 130,- },- { id: 'userId', label: msg`User`, minWidth: 100, defaultWidth: 130 },- {- id: 'recordId',- label: msg`Record ID`,- minWidth: 100,- defaultWidth: 130,- },- {- id: 'objectMetadataId',- label: msg`Object ID`,- minWidth: 100,- defaultWidth: 130,- },- {- id: 'properties',- label: msg`Properties`,- minWidth: 150,- defaultWidth: 300,- },-];--const USAGE_EVENT_COLUMNS: ColumnConfig[] = [- {- id: 'event',- label: msg`Resource Type`,- minWidth: 100,- defaultWidth: 130,- },- {- id: 'timestamp',- label: msg`Timestamp`,- minWidth: 100,- defaultWidth: 140,- },- { id: 'userId', label: msg`User`, minWidth: 100, defaultWidth: 130 },- {- id: 'properties',- label: msg`Details`,- minWidth: 200,- defaultWidth: 400,- },-];--const APPLICATION_LOG_COLUMNS: ColumnConfig[] = [- {- id: 'event',- label: msg`Function`,- minWidth: 100,- defaultWidth: 160,- },- {- id: 'timestamp',- label: msg`Timestamp`,- minWidth: 100,- defaultWidth: 140,- },- { id: 'level', label: msg`Level`, minWidth: 60, defaultWidth: 80 },- {- id: 'message',- label: msg`Message`,- minWidth: 200,- defaultWidth: 400,- },- {- id: 'executionId',- label: msg`Execution ID`,- minWidth: 100,- defaultWidth: 140,- },-];--const COLUMNS_BY_TABLE: Record<EventLogTable, ColumnConfig[]> = {- [EventLogTable.OBJECT_EVENT]: OBJECT_EVENT_COLUMNS,- [EventLogTable.USAGE_EVENT]: USAGE_EVENT_COLUMNS,- [EventLogTable.APPLICATION_LOG]: APPLICATION_LOG_COLUMNS,- [EventLogTable.WORKSPACE_EVENT]: DEFAULT_COLUMNS,- [EventLogTable.PAGEVIEW]: DEFAULT_COLUMNS,-};--export const getColumnsForEventLogTable = (- table: EventLogTable,-): ColumnConfig[] => {- return COLUMNS_BY_TABLE[table] ?? DEFAULT_COLUMNS;-};diff --git a/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.tsx b/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.tsxnew file mode 100644index 00000000000..7cb05d6da45--- /dev/null+++ b/packages/twenty-front/src/modules/settings/event-logs/utils/getColumnsForEventLogTable.tsx@@ -0,0 +1,125 @@+import { type ReactNode } from 'react';+import { msg } from '@lingui/core/macro';+import { type MessageDescriptor } from '@lingui/core';++import { EventLogJsonCell } from '@/settings/event-logs/components/EventLogJsonCell';+import {+ type EventLogRecord,+ EventLogTable,+} from '~/generated-metadata/graphql';+import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';++export type ColumnConfig = {+ id: string;+ label: MessageDescriptor;+ minWidth: number;+ defaultWidth: number;+ renderCell: (record: EventLogRecord) => ReactNode;+};++const EVENT_COLUMN: ColumnConfig = {+ id: 'event',+ label: msg`Event`,+ minWidth: 100,+ defaultWidth: 200,+ renderCell: (record) => record.event,+};++const TIMESTAMP_COLUMN: ColumnConfig = {+ id: 'timestamp',+ label: msg`Timestamp`,+ minWidth: 100,+ defaultWidth: 150,+ renderCell: (record) => beautifyPastDateRelativeToNow(record.timestamp),+};++const USER_COLUMN: ColumnConfig = {+ id: 'userId',+ label: msg`User`,+ minWidth: 100,+ defaultWidth: 150,+ renderCell: (record) => record.userId ?? '-',+};++const PROPERTIES_COLUMN: ColumnConfig = {+ id: 'properties',+ label: msg`Properties`,+ minWidth: 200,+ defaultWidth: 400,+ renderCell: (record) => <EventLogJsonCell value={record.properties} />,+};++const DEFAULT_COLUMNS: ColumnConfig[] = [+ EVENT_COLUMN,+ TIMESTAMP_COLUMN,+ USER_COLUMN,+ PROPERTIES_COLUMN,+];++const OBJECT_EVENT_COLUMNS: ColumnConfig[] = [+ { ...EVENT_COLUMN, defaultWidth: 180 },+ { ...TIMESTAMP_COLUMN, defaultWidth: 130 },+ { ...USER_COLUMN, defaultWidth: 130 },+ {+ id: 'recordId',+ label: msg`Record ID`,+ minWidth: 100,+ defaultWidth: 130,+ renderCell: (record) => record.recordId ?? '-',+ },+ {+ id: 'objectMetadataId',+ label: msg`Object ID`,+ minWidth: 100,+ defaultWidth: 130,+ renderCell: (record) => record.objectMetadataId ?? '-',+ },+ { ...PROPERTIES_COLUMN, minWidth: 150, defaultWidth: 300 },+];++const USAGE_EVENT_COLUMNS: ColumnConfig[] = [+ { ...EVENT_COLUMN, label: msg`Resource Type`, defaultWidth: 130 },+ { ...TIMESTAMP_COLUMN, defaultWidth: 140 },+ { ...USER_COLUMN, defaultWidth: 130 },+ { ...PROPERTIES_COLUMN, label: msg`Details` },+];++const APPLICATION_LOG_COLUMNS: ColumnConfig[] = [+ { ...EVENT_COLUMN, label: msg`Function`, defaultWidth: 160 },+ { ...TIMESTAMP_COLUMN, defaultWidth: 140 },+ {+ id: 'level',+ label: msg`Level`,+ minWidth: 60,+ defaultWidth: 80,+ renderCell: (record) => record.properties?.level ?? '-',+ },+ {+ id: 'message',+ label: msg`Message`,+ minWidth: 200,+ defaultWidth: 400,+ renderCell: (record) => record.properties?.message ?? '-',+ },+ {+ id: 'executionId',+ label: msg`Execution ID`,+ minWidth: 100,+ defaultWidth: 140,+ renderCell: (record) => record.properties?.executionId ?? '-',+ },+];++const COLUMNS_BY_TABLE: Record<EventLogTable, ColumnConfig[]> = {+ [EventLogTable.OBJECT_EVENT]: OBJECT_EVENT_COLUMNS,+ [EventLogTable.USAGE_EVENT]: USAGE_EVENT_COLUMNS,+ [EventLogTable.APPLICATION_LOG]: APPLICATION_LOG_COLUMNS,+ [EventLogTable.WORKSPACE_EVENT]: DEFAULT_COLUMNS,+ [EventLogTable.PAGEVIEW]: DEFAULT_COLUMNS,+};++export const getColumnsForEventLogTable = (+ table: EventLogTable,+): ColumnConfig[] => {+ return COLUMNS_BY_TABLE[table] ?? DEFAULT_COLUMNS;+};diff --git a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsxindex 309f67cacc3..d24dfc0f6a3 100644--- a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx+++ b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx@@ -50,10 +50,6 @@ export const SettingsGeneral = () => {);const renderActiveTabContent = () => {- if (activeTabId === GENERAL_TAB_LOGS) {- return <SettingsLogs />;- }-if (activeTabId === GENERAL_TAB_SECURITY) {return <SettingsSecuritySettings />;}@@ -97,7 +93,13 @@ export const SettingsGeneral = () => {}links={[{ children: t`Workspace` }, { children: t`General` }]}>- <SettingsPageContainer>{renderActiveTabContent()}</SettingsPageContainer>+ {activeTabId === GENERAL_TAB_LOGS ? (+ <SettingsLogs />+ ) : (+ <SettingsPageContainer>+ {renderActiveTabContent()}+ </SettingsPageContainer>+ )}</SettingsPageLayout>);};diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.exampleindex 04d5a3e4c12..305de015a21 100644--- a/packages/twenty-server/.env.example+++ b/packages/twenty-server/.env.example@@ -35,7 +35,6 @@ FRONTEND_URL=http://localhost:3001# AUTH_GOOGLE_APIS_CALLBACK_URL=http://localhost:3000/auth/google-apis/get-access-token# CODE_INTERPRETER_TYPE=LOCAL# LOGIC_FUNCTION_TYPE=LOCAL-# LOGIC_FUNCTION_LOGS_ENABLED=true# STORAGE_TYPE=local# STORAGE_LOCAL_PATH=.local-storage# SUPPORT_DRIVER=frontdiff --git a/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts b/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.tsindex 2e90c6ba501..08e8f3cfa4e 100644--- a/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts+++ b/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts@@ -105,6 +105,10 @@ describe('ClickHouseService', () => {table: 'test_table',values: testData,format: 'JSONEachRow',+ clickhouse_settings: {+ async_insert: 1,+ wait_for_async_insert: 1,+ },});});diff --git a/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts b/packages/twenty-server/src/database/clickHouse/clickHouse.service.tsindex 66a419febc5..8210d196192 100644--- a/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts+++ b/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts@@ -28,10 +28,6 @@ export class ClickHouseService implements OnModuleInit, OnModuleDestroy {response: true,request: true,},- clickhouse_settings: {- async_insert: 1,- wait_for_async_insert: 1,- },application: 'twenty',log: { level: ClickHouseLogLevel.OFF },});@@ -88,10 +84,6 @@ export class ClickHouseService implements OnModuleInit, OnModuleDestroy {response: true,request: true,},- clickhouse_settings: {- async_insert: 1,- wait_for_async_insert: 1,- },application: 'twenty',log: { level: ClickHouseLogLevel.OFF },});@@ -282,6 +274,10 @@ export class ClickHouseService implements OnModuleInit, OnModuleDestroy {table,values: chunk,format: 'JSONEachRow',+ clickhouse_settings: {+ async_insert: 1,+ wait_for_async_insert: 1,+ },});chunk = [];currentSizeBytes = 0;diff --git a/packages/twenty-server/src/database/clickHouse/clickHouse.util.ts b/packages/twenty-server/src/database/clickHouse/clickHouse.util.tsindex 78dcb038e7f..0da29614049 100644--- a/packages/twenty-server/src/database/clickHouse/clickHouse.util.ts+++ b/packages/twenty-server/src/database/clickHouse/clickHouse.util.ts@@ -12,3 +12,8 @@ export const formatDateTimeForClickHouse = (date: Date | string): string => {export const formatDateForClickHouse = (date: Date): string =>date.toISOString().slice(0, 10);++// ClickHouse returns DateTime64 values as naive strings (YYYY-MM-DD HH:mm:ss.SSS) in UTC.+// Parse them as UTC explicitly, otherwise `new Date` assumes the server's local timezone.+export const parseClickHouseDateTime = (value: string): Date =>+ new Date(`${value.replace(' ', 'T')}Z`);diff --git a/packages/twenty-server/src/database/clickHouse/seeds/fixtures.ts b/packages/twenty-server/src/database/clickHouse/seeds/fixtures.tsindex c4ca8c4e2fa..77fdece5d42 100644--- a/packages/twenty-server/src/database/clickHouse/seeds/fixtures.ts+++ b/packages/twenty-server/src/database/clickHouse/seeds/fixtures.ts@@ -1,9 +1,9 @@-import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-created';-import { OBJECT_RECORD_DELETED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-delete';-import { OBJECT_RECORD_UPDATED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-updated';-import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated';-import { CUSTOM_DOMAIN_DEACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated';-import { type GenericTrackEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';+import { OBJECT_RECORD_DELETED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete';+import { OBJECT_RECORD_UPDATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated';+import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated';+import { CUSTOM_DOMAIN_DEACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated';+import { type GenericTrackEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.tsindex a46fc380abb..6abfab96f26 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts@@ -13,7 +13,7 @@ import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { CreateAuditLogFromInternalEvent } from 'src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event';+import { CreateEventLogFromInternalEvent } from 'src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';@@ -107,24 +107,22 @@ export class EntityEventsToDbListener {),);- if (isAuditLogBatchEvent) {+ if (isAuditLogBatchEvent && action !== DatabaseEventAction.DESTROYED) {promises.push(this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(- CreateAuditLogFromInternalEvent.name,+ CreateEventLogFromInternalEvent.name,batchEvent,),);- if (action !== DatabaseEventAction.DESTROYED) {- promises.push(- this.entityEventsToDbQueueService.add<- WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>- >(- UpsertTimelineActivityFromInternalEvent.name,- batchEvent as WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>,- ),- );- }+ promises.push(+ this.entityEventsToDbQueueService.add<+ WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>+ >(+ UpsertTimelineActivityFromInternalEvent.name,+ batchEvent as WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>,+ ),+ );}await Promise.all(promises);diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.tsindex d7458d8efeb..37acb1b6451 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts@@ -2,34 +2,18 @@ import { Injectable } from '@nestjs/common';import { OnCustomBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-custom-batch-event.decorator';import { USER_SIGNUP_EVENT_NAME } from 'src/engine/api/graphql/workspace-query-runner/constants/user-signup-event-name.constants';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { USER_SIGNUP_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/user/user-signup';import { TelemetryEventType } from 'src/engine/core-modules/telemetry/telemetry-event.type';import { TelemetryService } from 'src/engine/core-modules/telemetry/telemetry.service';import { CustomWorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/custom-workspace-batch-event.type';@Injectable()export class TelemetryListener {- constructor(- private readonly auditService: AuditService,- private readonly telemetryService: TelemetryService,- ) {}+ constructor(private readonly telemetryService: TelemetryService) {}@OnCustomBatchEvent(USER_SIGNUP_EVENT_NAME)async handleUserSignup(payload: CustomWorkspaceEventBatch<TelemetryEventType>,) {- await Promise.all(- payload.events.map(async (eventPayload) =>- this.auditService- .createContext({- userId: eventPayload.userId,- workspaceId: payload.workspaceId,- })- .insertWorkspaceEvent(USER_SIGNUP_EVENT, {}),- ),- );-await this.telemetryService.publish({action: USER_SIGNUP_EVENT_NAME,events: payload.events,diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.tsindex 0fd8100ca5b..d34e4d4738a 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts@@ -3,7 +3,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { TelemetryListener } from 'src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener';import { WorkspaceQueryHookModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { FileModule } from 'src/engine/core-modules/file/file.module';import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';@@ -19,7 +18,6 @@ import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listenWorkspaceDataSourceModule,WorkspaceQueryHookModule,TypeOrmModule.forFeature([FeatureFlagEntity]),- AuditModule,TelemetryModule,FileModule,RecordTransformerModule,diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.tsindex a4233bb0f75..7755ff25a59 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts@@ -20,7 +20,6 @@ import { AdminPanelStatisticsService } from 'src/engine/core-modules/admin-panelimport { AdminPanelUserLookupService } from 'src/engine/core-modules/admin-panel/services/admin-panel-user-lookup.service';import { AdminPanelVersionService } from 'src/engine/core-modules/admin-panel/services/admin-panel-version.service';import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { AuthModule } from 'src/engine/core-modules/auth/auth.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { BillingCustomerEntity } from 'src/engine/core-modules/billing/entities/billing-customer.entity';@@ -67,7 +66,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspacTerminusModule,MetricsModule,FeatureFlagModule,- AuditModule,TelemetryModule,ImpersonationModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.constants.ts b/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.constants.tsdeleted file mode 100644index 3864e162ac5..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.constants.ts+++ /dev/null@@ -1 +0,0 @@-export const APPLICATION_LOG_DRIVER = Symbol('APPLICATION_LOG_DRIVER');diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-definition.ts b/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-definition.tsdeleted file mode 100644index a92af185124..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-definition.ts+++ /dev/null@@ -1,14 +0,0 @@-import { ConfigurableModuleBuilder } from '@nestjs/common';--import { type ApplicationLogsModuleOptions } from 'src/engine/core-modules/application-logs/interfaces/application-logs-module-options.type';--export const {- ConfigurableModuleClass,- MODULE_OPTIONS_TOKEN,- OPTIONS_TYPE,- ASYNC_OPTIONS_TYPE,-} = new ConfigurableModuleBuilder<ApplicationLogsModuleOptions>({- moduleName: 'ApplicationLogsModule',-})- .setClassMethodName('forRoot')- .build();diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-factory.ts b/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-factory.tsdeleted file mode 100644index c6879928821..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module-factory.ts+++ /dev/null@@ -1,14 +0,0 @@-import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';--import { type OPTIONS_TYPE } from 'src/engine/core-modules/application-logs/application-logs.module-definition';-import { ApplicationLogDriver } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.enum';--export const applicationLogsModuleFactory = async (- twentyConfigService: TwentyConfigService,-): Promise<typeof OPTIONS_TYPE> => {- const driverType = twentyConfigService.get('APPLICATION_LOG_DRIVER');-- return {- type: driverType as ApplicationLogDriver,- };-};diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module.ts b/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module.tsdeleted file mode 100644index 829e7391eb3..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.module.ts+++ /dev/null@@ -1,86 +0,0 @@-import { type DynamicModule, Global, Module } from '@nestjs/common';--import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';-import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';-import { APPLICATION_LOG_DRIVER } from 'src/engine/core-modules/application-logs/application-logs.constants';-import {- type ASYNC_OPTIONS_TYPE,- ConfigurableModuleClass,- type OPTIONS_TYPE,-} from 'src/engine/core-modules/application-logs/application-logs.module-definition';-import { ApplicationLogsService } from 'src/engine/core-modules/application-logs/application-logs.service';-import { ClickHouseApplicationLogDriver } from 'src/engine/core-modules/application-logs/drivers/clickhouse.driver';-import { ConsoleApplicationLogDriver } from 'src/engine/core-modules/application-logs/drivers/console.driver';-import { DisabledApplicationLogDriver } from 'src/engine/core-modules/application-logs/drivers/disabled.driver';-import { ApplicationLogDriver } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.enum';--@Global()-@Module({- imports: [ClickHouseModule],- providers: [ApplicationLogsService],- exports: [ApplicationLogsService],-})-export class ApplicationLogsModule extends ConfigurableModuleClass {- static forRoot(options: typeof OPTIONS_TYPE): DynamicModule {- const provider = {- provide: APPLICATION_LOG_DRIVER,- useValue: ApplicationLogsModule.createDriver(options.type),- };- const dynamicModule = super.forRoot(options);-- return {- ...dynamicModule,- providers: [...(dynamicModule.providers ?? []), provider],- };- }-- static forRootAsync(options: typeof ASYNC_OPTIONS_TYPE): DynamicModule {- const provider = {- provide: APPLICATION_LOG_DRIVER,- // oxlint-disable-next-line typescript/no-explicit-any- useFactory: async (- clickHouseService: ClickHouseService,- ...args: unknown[]- ) => {- const config = await options?.useFactory?.(...args);-- if (!config) {- return new DisabledApplicationLogDriver();- }-- return ApplicationLogsModule.createDriver(- config.type,- clickHouseService,- );- },- inject: [ClickHouseService, ...(options.inject || [])],- };- const dynamicModule = super.forRootAsync(options);-- return {- ...dynamicModule,- providers: [...(dynamicModule.providers ?? []), provider],- };- }-- private static createDriver(- type: ApplicationLogDriver,- clickHouseService?: ClickHouseService,- ) {- switch (type) {- case ApplicationLogDriver.CONSOLE:- return new ConsoleApplicationLogDriver();- case ApplicationLogDriver.CLICKHOUSE:- if (!clickHouseService) {- throw new Error(- 'ClickHouseService is required for the ClickHouse application log driver',- );- }-- return new ClickHouseApplicationLogDriver(clickHouseService);- case ApplicationLogDriver.DISABLED:- default:- return new DisabledApplicationLogDriver();- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.service.ts b/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.service.tsdeleted file mode 100644index 569730005b5..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/application-logs.service.ts+++ /dev/null@@ -1,17 +0,0 @@-import { Inject, Injectable } from '@nestjs/common';--import { APPLICATION_LOG_DRIVER } from 'src/engine/core-modules/application-logs/application-logs.constants';-import { type ApplicationLogDriverInterface } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.interface';-import { type ApplicationLogEntry } from 'src/engine/core-modules/application-logs/interfaces/application-log-entry.interface';--@Injectable()-export class ApplicationLogsService {- constructor(- @Inject(APPLICATION_LOG_DRIVER)- private driver: ApplicationLogDriverInterface,- ) {}-- async writeLogs(entries: ApplicationLogEntry[]): Promise<void> {- return this.driver.writeLogs(entries);- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/clickhouse.driver.ts b/packages/twenty-server/src/engine/core-modules/application-logs/drivers/clickhouse.driver.tsdeleted file mode 100644index 24446070eed..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/clickhouse.driver.ts+++ /dev/null@@ -1,35 +0,0 @@-import { Logger } from '@nestjs/common';--import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';-import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';-import { type ApplicationLogEntry } from 'src/engine/core-modules/application-logs/interfaces/application-log-entry.interface';-import { type ApplicationLogDriverInterface } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.interface';--export class ClickHouseApplicationLogDriver implements ApplicationLogDriverInterface {- private readonly logger = new Logger(ClickHouseApplicationLogDriver.name);-- constructor(private readonly clickHouseService: ClickHouseService) {}-- async writeLogs(entries: ApplicationLogEntry[]): Promise<void> {- if (entries.length === 0) {- return;- }-- const rows = entries.map((entry) => ({- timestamp: formatDateTimeForClickHouse(entry.timestamp),- workspaceId: entry.workspaceId,- applicationId: entry.applicationId,- logicFunctionId: entry.logicFunctionId,- logicFunctionName: entry.logicFunctionName,- executionId: entry.executionId,- level: entry.level,- message: entry.message,- }));-- const result = await this.clickHouseService.insert('applicationLog', rows);-- if (!result.success) {- this.logger.error('Failed to insert application logs into ClickHouse');- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/console.driver.ts b/packages/twenty-server/src/engine/core-modules/application-logs/drivers/console.driver.tsdeleted file mode 100644index a6711430d8d..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/console.driver.ts+++ /dev/null@@ -1,29 +0,0 @@-import { Logger } from '@nestjs/common';--import { type ApplicationLogDriverInterface } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.interface';-import { type ApplicationLogEntry } from 'src/engine/core-modules/application-logs/interfaces/application-log-entry.interface';--export class ConsoleApplicationLogDriver implements ApplicationLogDriverInterface {- private readonly logger = new Logger(ConsoleApplicationLogDriver.name);-- async writeLogs(entries: ApplicationLogEntry[]): Promise<void> {- for (const entry of entries) {- const context = `${entry.logicFunctionName}:${entry.executionId}`;-- switch (entry.level) {- case 'ERROR':- this.logger.error(entry.message, undefined, context);- break;- case 'WARN':- this.logger.warn(entry.message, context);- break;- case 'DEBUG':- this.logger.debug(entry.message, context);- break;- default:- this.logger.log(entry.message, context);- break;- }- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/disabled.driver.ts b/packages/twenty-server/src/engine/core-modules/application-logs/drivers/disabled.driver.tsdeleted file mode 100644index ba2429d9752..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/drivers/disabled.driver.ts+++ /dev/null@@ -1,7 +0,0 @@-import { type ApplicationLogDriverInterface } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.interface';--export class DisabledApplicationLogDriver implements ApplicationLogDriverInterface {- async writeLogs(): Promise<void> {- return;- }-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.enum.ts b/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.enum.tsdeleted file mode 100644index b5283aed3ff..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.enum.ts+++ /dev/null@@ -1,5 +0,0 @@-export enum ApplicationLogDriver {- DISABLED = 'DISABLED',- CONSOLE = 'CONSOLE',- CLICKHOUSE = 'CLICKHOUSE',-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.interface.ts b/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.interface.tsdeleted file mode 100644index 7d14a269d9e..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-driver.interface.ts+++ /dev/null@@ -1,5 +0,0 @@-import { type ApplicationLogEntry } from 'src/engine/core-modules/application-logs/interfaces/application-log-entry.interface';--export interface ApplicationLogDriverInterface {- writeLogs(entries: ApplicationLogEntry[]): Promise<void>;-}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-logs-module-options.type.ts b/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-logs-module-options.type.tsdeleted file mode 100644index eb569cf084a..00000000000--- a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-logs-module-options.type.ts+++ /dev/null@@ -1,5 +0,0 @@-import { type ApplicationLogDriver } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.enum';--export type ApplicationLogsModuleOptions = {- type: ApplicationLogDriver;-};diff --git a/packages/twenty-server/src/engine/core-modules/audit/README.md b/packages/twenty-server/src/engine/core-modules/audit/README.mddeleted file mode 100644index da64e829e78..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/README.md+++ /dev/null@@ -1,148 +0,0 @@-# Analytics Module--This module provides analytics tracking functionality for the Twenty application.--## Usage--### Tracking Events--The `AuditService` provides a `createContext` method that returns an object with three methods:--- `insertWorkspaceEvent`: For tracking workspace-level events-- `createObjectEvent`: For tracking object-level events that include record and metadata IDs-- `createPageviewEvent`: For tracking page views--```typescript-import { Injectable } from '@nestjs/common';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/track/custom-domain/custom-domain-activated';--@Injectable()-export class MyService {- constructor(private readonly auditService: AuditService) {}-- async doSomething() {- // Create an analytics context- const auditService = this.auditService.createContext({- workspaceId: 'workspace-id',- userId: 'user-id',- });-- // Track a workspace event- auditService.insertWorkspaceEvent(CUSTOM_DOMAIN_ACTIVATED_EVENT, {});-- // Track an object event- auditService.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {- recordId: 'record-id',- objectMetadataId: 'object-metadata-id',- // other properties- });-- // Track a pageview- auditService.createPageviewEvent('page-name', {- href: '/path',- locale: 'en-US',- // other properties- });- }-}-```--### Adding New Events--To add a new event:--1. Create a new file in the `src/engine/core-modules/analytics/utils/events/track` directory-2. Define the event name, schema, and type-3. Register the event using the `registerEvent` function-4. Update the `TrackEventName` and `TrackEventProperties` types in `src/engine/core-modules/analytics/utils/events/event-types.ts`--Example:--```typescript-// src/engine/core-modules/analytics/utils/events/track/my-feature/my-event.ts-import { z } from 'zod';--import { registerEvent } from 'src/engine/core-modules/analytics/utils/events/track/track';--export const MY_EVENT = 'My Event' as const;-export const myEventSchema = z.object({- event: z.literal(MY_EVENT),- properties: z.object({- myProperty: z.string(),- }),-});--export type MyEventTrackEvent = z.infer<typeof myEventSchema>;--registerEvent(MY_EVENT, myEventSchema);-```--Then update the `events.type.ts` file:--```typescript-// src/engine/core-modules/analytics/types/events.type.ts-import {- MY_EVENT,- MyEventTrackEvent,-} from '../utils/events/track/my-feature/my-event';--// Add to the union type-export type TrackEventName = typeof MY_EVENT;-// ... other event names;--// Add to the TrackEvents interface-export interface TrackEvents {- [MY_EVENT]: MyEventTrackEvent;- // ... other event types-}--// The TrackEventProperties type will automatically use the new event-export type TrackEventProperties<T extends TrackEventName> =- T extends keyof TrackEvents ? TrackEvents[T]['properties'] : object;-```--## API--### AuditService--#### createContext(context?)--Creates an analytics context with the given user ID and workspace ID.--- `context` (optional): An object with `userId` and `workspaceId` properties--Returns an object with the following methods:--- `insertWorkspaceEvent<T extends TrackEventName>(event: T, properties: TrackEventProperties<T>)`: Tracks a workspace-level event-- `createObjectEvent<T extends TrackEventName>(event: T, properties: TrackEventProperties<T> & { recordId: string; objectMetadataId: string })`: Tracks an object-level event-- `createPageviewEvent(name: string, properties: Partial<PageviewProperties>)`: Tracks a pageview--### Types--#### TrackEventName--A union type of all registered event names, plus `string` for backward compatibility.--#### TrackEventProperties<T>--A mapped type that maps each event name to its corresponding properties type. It uses the `TrackEvents` interface to provide a more maintainable and type-safe way to map event names to their properties.--```typescript-// Define the mapping between event names and their event types-export interface TrackEvents {- [EVENT_NAME_1]: Event1Type;- [EVENT_NAME_2]: Event2Type;- // ... other event types-}--// Use the mapping to extract properties for each event type-export type TrackEventProperties<T extends TrackEventName> =- T extends keyof TrackEvents ? TrackEvents[T]['properties'] : object;-```--This approach makes it easier to add new events without having to modify a complex nested conditional type.--#### PageviewProperties--Properties for pageview events, including href, locale, pathname, referrer, sessionId, timeZone, and userAgent.diff --git a/packages/twenty-server/src/engine/core-modules/audit/audit-exception-filter.ts b/packages/twenty-server/src/engine/core-modules/audit/audit-exception-filter.tsdeleted file mode 100644index e355ea932a0..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/audit-exception-filter.ts+++ /dev/null@@ -1,23 +0,0 @@-import { Catch, type ExceptionFilter } from '@nestjs/common';--import { assertUnreachable } from 'twenty-shared/utils';--import {- AuditException,- AuditExceptionCode,-} from 'src/engine/core-modules/audit/audit.exception';-import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';--@Catch(AuditException)-export class AuditExceptionFilter implements ExceptionFilter {- catch(exception: AuditException) {- switch (exception.code) {- case AuditExceptionCode.INVALID_TYPE:- case AuditExceptionCode.INVALID_INPUT:- throw new UserInputError(exception);- default: {- assertUnreachable(exception.code);- }- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/audit/audit.exception.ts b/packages/twenty-server/src/engine/core-modules/audit/audit.exception.tsdeleted file mode 100644index 040ef46f1bc..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/audit.exception.ts+++ /dev/null@@ -1,34 +0,0 @@-import { type MessageDescriptor } from '@lingui/core';-import { msg } from '@lingui/core/macro';-import { assertUnreachable } from 'twenty-shared/utils';--import { CustomException } from 'src/utils/custom-exception';--export enum AuditExceptionCode {- INVALID_TYPE = 'INVALID_TYPE',- INVALID_INPUT = 'INVALID_INPUT',-}--const getAuditExceptionUserFriendlyMessage = (code: AuditExceptionCode) => {- switch (code) {- case AuditExceptionCode.INVALID_TYPE:- return msg`Invalid audit type.`;- case AuditExceptionCode.INVALID_INPUT:- return msg`Invalid audit input.`;- default:- assertUnreachable(code);- }-};--export class AuditException extends CustomException<AuditExceptionCode> {- constructor(- message: string,- code: AuditExceptionCode,- { userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},- ) {- super(message, code, {- userFriendlyMessage:- userFriendlyMessage ?? getAuditExceptionUserFriendlyMessage(code),- });- }-}diff --git a/packages/twenty-server/src/engine/core-modules/audit/audit.module.ts b/packages/twenty-server/src/engine/core-modules/audit/audit.module.tsdeleted file mode 100644index 0d5b5576fd6..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/audit.module.ts+++ /dev/null@@ -1,15 +0,0 @@-import { Module } from '@nestjs/common';--import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';-import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';--import { AuditResolver } from './audit.resolver';--import { AuditService } from './services/audit.service';--@Module({- providers: [AuditResolver, AuditService],- imports: [JwtModule, ClickHouseModule],- exports: [AuditService],-})-export class AuditModule {}diff --git a/packages/twenty-server/src/engine/core-modules/audit/jobs/audit-job.module.ts b/packages/twenty-server/src/engine/core-modules/audit/jobs/audit-job.module.tsdeleted file mode 100644index e59116589a5..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/jobs/audit-job.module.ts+++ /dev/null@@ -1,11 +0,0 @@-import { Module } from '@nestjs/common';--import { AuditModule } from 'src/engine/core-modules/audit/audit.module';-import { CreateAuditLogFromInternalEvent } from 'src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event';-import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';--@Module({- imports: [TimelineActivityModule, AuditModule],- providers: [CreateAuditLogFromInternalEvent],-})-export class AuditJobModule {}diff --git a/packages/twenty-server/src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event.ts b/packages/twenty-server/src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event.tsdeleted file mode 100644index b6435a8dfbb..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/jobs/create-audit-log-from-internal-event.ts+++ /dev/null@@ -1,64 +0,0 @@-import { type ObjectRecordEvent } from 'twenty-shared/database-events';--import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-created';-import { OBJECT_RECORD_DELETED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-delete';-import { OBJECT_RECORD_UPDATED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-updated';-import { OBJECT_RECORD_UPSERTED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-upserted';-import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';-import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';-import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';-import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';--@Processor(MessageQueue.entityEventsToDbQueue)-export class CreateAuditLogFromInternalEvent {- constructor(private readonly auditService: AuditService) {}-- @Process(CreateAuditLogFromInternalEvent.name)- async handle(- workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>,- ): Promise<void> {- for (const eventData of workspaceEventBatch.events) {- // We remove "before" and "after" property for a cleaner/slimmer event payload- const eventProperties =- 'diff' in eventData.properties- ? {- ...eventData.properties,- diff: eventData.properties.diff,- }- : eventData.properties;-- const auditService = this.auditService.createContext({- workspaceId: workspaceEventBatch.workspaceId,- userId: eventData.userId,- });-- // Since these are object record events, we use createObjectEvent- if (workspaceEventBatch.name.endsWith('.updated')) {- await auditService.createObjectEvent(OBJECT_RECORD_UPDATED_EVENT, {- ...eventProperties,- recordId: eventData.recordId,- objectMetadataId: workspaceEventBatch.objectMetadata.id,- });- } else if (workspaceEventBatch.name.endsWith('.created')) {- await auditService.createObjectEvent(OBJECT_RECORD_CREATED_EVENT, {- ...eventProperties,- recordId: eventData.recordId,- objectMetadataId: workspaceEventBatch.objectMetadata.id,- });- } else if (workspaceEventBatch.name.endsWith('.deleted')) {- await auditService.createObjectEvent(OBJECT_RECORD_DELETED_EVENT, {- ...eventProperties,- recordId: eventData.recordId,- objectMetadataId: workspaceEventBatch.objectMetadata.id,- });- } else if (workspaceEventBatch.name.endsWith('.upserted')) {- await auditService.createObjectEvent(OBJECT_RECORD_UPSERTED_EVENT, {- ...eventProperties,- recordId: eventData.recordId,- objectMetadataId: workspaceEventBatch.objectMetadata.id,- });- }- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/audit/services/audit.service.ts b/packages/twenty-server/src/engine/core-modules/audit/services/audit.service.tsdeleted file mode 100644index 89539f29bd9..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/services/audit.service.ts+++ /dev/null@@ -1,98 +0,0 @@-import { Injectable, Logger } from '@nestjs/common';--import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';-import {- type TrackEventName,- type TrackEventProperties,-} from 'src/engine/core-modules/audit/types/events.type';-import {- makePageview,- makeTrackEvent,-} from 'src/engine/core-modules/audit/utils/analytics.utils';-import { type PageviewProperties } from 'src/engine/core-modules/audit/utils/events/pageview/pageview';-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';--@Injectable()-export class AuditService {- private readonly logger = new Logger(AuditService.name);-- constructor(- private readonly twentyConfigService: TwentyConfigService,- private readonly clickHouseService: ClickHouseService,- ) {}-- createContext(context?: {- workspaceId?: string | null | undefined;- userId?: string | null | undefined;- }) {- const contextFields = context- ? {- ...(context.workspaceId ? { workspaceId: context.workspaceId } : {}),- ...(context.userId ? { userId: context.userId } : {}),- }- : {};-- return {- insertWorkspaceEvent: <T extends TrackEventName>(- event: T,- properties: TrackEventProperties<T>,- ) =>- this.preventIfDisabled(() =>- this.clickHouseService.insert('workspaceEvent', [- { ...contextFields, ...makeTrackEvent(event, properties) },- ]),- ),- createObjectEvent: <T extends TrackEventName>(- event: T,- properties: TrackEventProperties<T> & {- recordId: string;- objectMetadataId: string;- isCustom?: boolean;- },- ) => {- const { recordId, objectMetadataId, isCustom, ...restProperties } =- properties;-- return this.preventIfDisabled(() =>- this.clickHouseService.insert('objectEvent', [- {- ...contextFields,- ...makeTrackEvent(- event,- restProperties as unknown as TrackEventProperties<T>,- ),- recordId,- objectMetadataId,- isCustom,- },- ]),- );- },- createPageviewEvent: (- name: string,- properties: Partial<PageviewProperties>,- ) =>- this.preventIfDisabled(() =>- this.clickHouseService.insert('pageview', [- { ...contextFields, ...makePageview(name, properties) },- ]),- ),- };- }-- private async preventIfDisabled(- sendEventOrPageviewFunction: () => Promise<{ success: boolean }>,- ): Promise<{ success: boolean }> {- if (!this.twentyConfigService.get('CLICKHOUSE_URL')) {- return { success: true };- }-- try {- return await sendEventOrPageviewFunction();- } catch (error) {- this.logger.error('Failed to persist audit event to ClickHouse', error);-- return { success: false };- }- }-}diff --git a/packages/twenty-server/src/engine/core-modules/audit/types/common.type.ts b/packages/twenty-server/src/engine/core-modules/audit/types/common.type.tsdeleted file mode 100644index 1a812c5ae4b..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/types/common.type.ts+++ /dev/null@@ -1,2 +0,0 @@-export type AuditCommonPropertiesType = 'timestamp' | 'version';-export type IdentifierType = 'workspaceId' | 'userId';diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring.ts b/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring.tsdeleted file mode 100644index 5ab0e968090..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring.ts+++ /dev/null@@ -1,18 +0,0 @@-import { z } from 'zod';--import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';--export const MONITORING_EVENT = 'Monitoring' as const;-export const monitoringSchema = z.strictObject({- event: z.literal(MONITORING_EVENT),- properties: z.strictObject({- eventName: z.string(),- connectedAccountId: z.string().optional(),- messageChannelId: z.string().optional(),- message: z.string().optional(),- }),-});--export type MonitoringTrackEvent = z.infer<typeof monitoringSchema>;--registerEvent(MONITORING_EVENT, monitoringSchema);diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace-entity/workspace-entity-created.ts b/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace-entity/workspace-entity-created.tsdeleted file mode 100644index d9ed1638499..00000000000--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace-entity/workspace-entity-created.ts+++ /dev/null@@ -1,18 +0,0 @@-import { z } from 'zod';--import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';--export const WORKSPACE_ENTITY_CREATED_EVENT =- 'Workspace Entity Created' as const;-export const workspaceEntityCreatedSchema = z.strictObject({- event: z.literal(WORKSPACE_ENTITY_CREATED_EVENT),- properties: z.strictObject({- name: z.string(),- }),-});--export type WorkspaceEntityCreatedTrackEvent = z.infer<- typeof workspaceEntityCreatedSchema->;--registerEvent(WORKSPACE_ENTITY_CREATED_EVENT, workspaceEntityCreatedSchema);diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.tsindex 17292ce3413..437cbc56a1e 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts@@ -10,7 +10,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicatiimport { ConnectionProviderModule } from 'src/engine/core-modules/application/connection-provider/connection-provider.module';import { ConnectionProviderOAuthController } from 'src/engine/core-modules/application/connection-provider/connection-provider-oauth.controller';import { ApplicationConnectionsModule } from 'src/engine/core-modules/application/connection-provider/connections/application-connections.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { GoogleAPIsAuthController } from 'src/engine/core-modules/auth/controllers/google-apis-auth.controller';import { GoogleAuthController } from 'src/engine/core-modules/auth/controllers/google-auth.controller';import { MicrosoftAPIsAuthController } from 'src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller';@@ -113,7 +113,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';PermissionsModule,TwoFactorAuthenticationModule,ApiKeyModule,- AuditModule,+ EventLogEmitterModule,SubdomainManagerModule,DomainServerConfigModule,ApplicationRegistrationModule,diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.tsindex 89e5d485c1d..c25636f9ce5 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts@@ -4,7 +4,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';import { ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.service';import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';@@ -136,7 +136,7 @@ describe('AuthResolver', () => {useValue: {},},{- provide: AuditService,+ provide: EventLogEmitterService,useValue: {createContext: jest.fn().mockReturnValue({insertWorkspaceEvent: jest.fn(),diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.tsindex 1cdaa7ecda2..67529abe101 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts@@ -12,8 +12,8 @@ import { Repository } from 'typeorm';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.service';import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { MONITORING_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { IMPERSONATION_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation';import {AuthException,AuthExceptionCode,@@ -125,7 +125,7 @@ export class AuthResolver {private userWorkspaceService: UserWorkspaceService,private emailVerificationTokenService: EmailVerificationTokenService,private ssoService: SSOService,- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,private readonly permissionsService: PermissionsService,) {}@@ -717,13 +717,14 @@ export class AuthResolver {toImpersonateUserWorkspace.workspace.id !==impersonatorUserWorkspace.workspace.id;- const auditService = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: workspace.id,userId: impersonatorUserWorkspace.user.id,});- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `${isServerLevelImpersonation ? 'server' : 'workspace'}.impersonation.token_exchange_attempt`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: isServerLevelImpersonation ? 'server' : 'workspace',+ action: 'token_exchange_attempt',message: `Impersonation token exchange attempt for ${targetUserEmail} by ${impersonatorUserWorkspace.user.id}`,});@@ -733,8 +734,9 @@ export class AuthResolver {if (isServerLevelImpersonation) {if (!hasServerLevelImpersonatePermission) {- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: 'server.impersonation.token_exchange_failed',+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'server',+ action: 'token_exchange_failed',message: `Server level impersonation not allowed for ${targetUserEmail} by userId ${impersonatorUserWorkspace.user.id}`,});@@ -744,8 +746,9 @@ export class AuthResolver {);}- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `server.impersonation.token_exchange_success`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'server',+ action: 'token_exchange_success',message: `Impersonation token exchanged for ${targetUserEmail} by userId ${impersonatorUserWorkspace.user.id}`,});@@ -766,8 +769,9 @@ export class AuthResolver {});if (!hasWorkspaceLevelImpersonatePermission) {- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: 'workspace.impersonation.token_exchange_failed',+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'workspace',+ action: 'token_exchange_failed',message: `Impersonation not allowed for ${targetUserEmail} by userId ${impersonatorUserWorkspace.user.id}`,});throw new AuthException(@@ -776,8 +780,9 @@ export class AuthResolver {);}- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: 'workspace.impersonation.token_exchange_success',+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'workspace',+ action: 'token_exchange_success',message: `Impersonation token exchanged for ${targetUserEmail} by userId ${impersonatorUserWorkspace.user.id}`,});diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.tsindex f141dd14beb..44024b2a921 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts@@ -5,7 +5,7 @@ import bcrypt from 'bcrypt';import { type Repository } from 'typeorm';import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import {AuthException,AuthExceptionCode,@@ -161,7 +161,7 @@ describe('AuthService', () => {},},{- provide: AuditService,+ provide: EventLogEmitterService,useValue: {},},{diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.tsindex 430e96df358..dd10384a488 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts@@ -19,7 +19,8 @@ import {AppTokenType,} from 'src/engine/core-modules/app-token/app-token.entity';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { IMPERSONATION_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation';import {AuthException,AuthExceptionCode,@@ -98,7 +99,7 @@ export class AuthService {@InjectRepository(AppTokenEntity)private readonly appTokenRepository: Repository<AppTokenEntity>,private readonly i18nService: I18nService,- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly featureFlagService: FeatureFlagService,private readonly createSSOConnectedAccountService: CreateSSOConnectedAccountService,@@ -426,13 +427,14 @@ export class AuthService {}): Promise<AuthTokens> {const correlationId = randomUUID();- const analytics = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId,userId: _impersonatorUserId,});- await analytics.insertWorkspaceEvent('Monitoring', {- eventName: 'workspace.impersonation.attempted',+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'workspace',+ action: 'attempted',message: `correlationId=${correlationId}; impersonatorUserWorkspaceId=${impersonatorUserWorkspaceId}; targetUserWorkspaceId=${impersonatedUserWorkspaceId}; workspaceId=${workspaceId}`,});@@ -457,8 +459,9 @@ export class AuthService {true,);- await analytics.insertWorkspaceEvent('Monitoring', {- eventName: 'workspace.impersonation.issued',+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: 'workspace',+ action: 'issued',message: `correlationId=${correlationId}; impersonatorUserWorkspaceId=${impersonatorUserWorkspaceId}; targetUserWorkspaceId=${impersonatedUserWorkspaceId}; workspaceId=${workspaceId}`,});diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.tsindex 507c517973f..dec20c0beb7 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts@@ -9,8 +9,9 @@ import { Repository, type DataSource, type QueryRunner } from 'typeorm';import { v4 } from 'uuid';import { USER_SIGNUP_EVENT_NAME } from 'src/engine/api/graphql/workspace-query-runner/constants/user-signup-event-name.constants';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { WORKSPACE_CREATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/workspace/workspace-created';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { USER_SIGNUP_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/user/user-signup';+import { WORKSPACE_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/workspace/workspace-created';import { type AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import {@@ -69,7 +70,7 @@ export class SignInUpService {private readonly applicationService: ApplicationService,private readonly fileCorePictureService: FileCorePictureService,private readonly enterprisePlanService: EnterprisePlanService,- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,@InjectDataSource()private readonly dataSource: DataSource,) {}@@ -384,6 +385,13 @@ export class SignInUpService {undefined,);+ void this.eventLogEmitterService+ .createContext({+ workspaceId: savedUser.currentWorkspace?.id,+ userId: savedUser.id,+ })+ .insertWorkspaceEvent(USER_SIGNUP_EVENT, {});+void this.metricsService.incrementCounterForEvent({key: MetricsKeys.SignUpSuccess,shouldStoreInCache: false,@@ -600,7 +608,7 @@ export class SignInUpService {},);- void this.auditService+ void this.eventLogEmitterService.createContext({ workspaceId }).insertWorkspaceEvent(WORKSPACE_CREATED_EVENT, {});diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.tsindex b924b8c3230..ab08ad88c58 100644--- a/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts+++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts@@ -1,7 +1,7 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { BillingWebhookController } from 'src/engine/core-modules/billing-webhook/billing-webhook.controller';import { BillingWebhookCustomerService } from 'src/engine/core-modules/billing-webhook/services/billing-webhook-customer.service';import { BillingWebhookEntitlementService } from 'src/engine/core-modules/billing-webhook/services/billing-webhook-entitlement.service';@@ -32,7 +32,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache@Module({imports: [- AuditModule,+ EventLogEmitterModule,FeatureFlagModule,StripeModule,MessageQueueModule,diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.tsindex 148e9ce19c6..d4054b8b7a5 100644--- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts+++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts@@ -7,8 +7,8 @@ import { type Repository } from 'typeorm';import type Stripe from 'stripe';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { PAYMENT_RECEIVED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/billing/payment-received';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { PAYMENT_RECEIVED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/billing/payment-received';import { getSubscriptionIdFromInvoice } from 'src/engine/core-modules/billing-webhook/utils/get-subscription-id-from-invoice.util';import {BillingException,@@ -43,7 +43,7 @@ export class BillingWebhookInvoiceService {private readonly billingCreditRolloverService: BillingCreditRolloverService,private readonly resourceCreditService: ResourceCreditService,private readonly stripeInvoiceService: StripeInvoiceService,- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,) {}async processStripeEvent(@@ -169,7 +169,7 @@ export class BillingWebhookInvoiceService {if (isDefined(billingCustomer)) {await this.delaySuspendedWorkspaceCleanup(billingCustomer);- await this.auditService+ void this.eventLogEmitterService.createContext({ workspaceId: billingCustomer.workspaceId }).insertWorkspaceEvent(PAYMENT_RECEIVED_EVENT, {amountPaid: data.object.amount_paid,diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.tsindex 4a6e33c1186..c6c41eaf50a 100644--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts@@ -4,8 +4,6 @@ import { EventEmitterModule } from '@nestjs/event-emitter';import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';import { ActorModule } from 'src/engine/core-modules/actor/actor.module';-import { ApplicationLogsModule } from 'src/engine/core-modules/application-logs/application-logs.module';-import { applicationLogsModuleFactory } from 'src/engine/core-modules/application-logs/application-logs.module-factory';import { AdminPanelModule } from 'src/engine/core-modules/admin-panel/admin-panel.module';import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';import { AppTokenModule } from 'src/engine/core-modules/app-token/app-token.module';@@ -75,9 +73,8 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/import { ChannelSyncModule } from 'src/modules/connected-account/channel-sync/channel-sync.module';import { DashboardModule } from 'src/modules/dashboard/dashboard.module';import { SendEmailModule } from 'src/modules/messaging/message-outbound-manager/send-email.module';-import { AuditModule } from './audit/audit.module';import { ClientConfigModule } from './client-config/client-config.module';-import { EventLogsModule } from './event-logs/event-logs.module';+import { EventLogsViewerModule } from './event-logs/event-logs-viewer.module';import { FileModule } from './file/file.module';@Module({@@ -85,7 +82,6 @@ import { FileModule } from './file/file.module';EnvironmentModule,TwentyConfigModule.forRoot(),HealthModule,- AuditModule,AuthModule,BillingModule,BillingWebhookModule,@@ -143,10 +139,6 @@ import { FileModule } from './file/file.module';useFactory: exceptionHandlerModuleFactory,inject: [TwentyConfigService, HttpAdapterHost],}),- ApplicationLogsModule.forRootAsync({- useFactory: applicationLogsModuleFactory,- inject: [TwentyConfigService],- }),EmailModule.forRoot(),CaptchaModule.forRoot(),EventEmitterModule.forRoot({@@ -163,7 +155,7 @@ import { FileModule } from './file/file.module';ImpersonationModule,TrashCleanupModule,DashboardModule,- EventLogsModule,+ EventLogsViewerModule,PreInstalledAppsModule,AppBillingModule,],@@ -174,7 +166,7 @@ import { FileModule } from './file/file.module';},],exports: [- AuditModule,+ EventLogsViewerModule,AuthModule,FeatureFlagModule,TimelineMessagingModule,diff --git a/packages/twenty-server/src/engine/core-modules/dns-manager/services/dns-manager.service.spec.ts b/packages/twenty-server/src/engine/core-modules/dns-manager/services/dns-manager.service.spec.tsindex 10fdd60e8c4..08c2a97e7ff 100644--- a/packages/twenty-server/src/engine/core-modules/dns-manager/services/dns-manager.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/dns-manager/services/dns-manager.service.spec.ts@@ -5,7 +5,7 @@ import Cloudflare from 'cloudflare';import { type CustomHostnameCreateResponse } from 'cloudflare/resources/custom-hostnames/custom-hostnames';import { AuditContextMock } from 'test/utils/audit-context.mock';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import { DnsManagerException } from 'src/engine/core-modules/dns-manager/exceptions/dns-manager.exception';import { DnsManagerService } from 'src/engine/core-modules/dns-manager/services/dns-manager.service';import { DomainServerConfigService } from 'src/engine/core-modules/domain/domain-server-config/services/domain-server-config.service';@@ -30,7 +30,7 @@ describe('DnsManagerService', () => {},},{- provide: AuditService,+ provide: EventLogEmitterService,useValue: {createContext: AuditContextMock,},diff --git a/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/custom-domain-manager.module.ts b/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/custom-domain-manager.module.tsindex 1b05bd7382d..ae1310f178e 100644--- a/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/custom-domain-manager.module.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/custom-domain-manager.module.ts@@ -1,7 +1,7 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { DnsManagerModule } from 'src/engine/core-modules/dns-manager/dns-manager.module';import { CustomDomainManagerService } from 'src/engine/core-modules/domain/custom-domain-manager/services/custom-domain-manager.service';@@ -13,7 +13,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entTypeOrmModule.forFeature([WorkspaceEntity, PublicDomainEntity]),DnsManagerModule,BillingModule,- AuditModule,+ EventLogEmitterModule,],providers: [CustomDomainManagerService],exports: [CustomDomainManagerService],diff --git a/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/services/custom-domain-manager.service.ts b/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/services/custom-domain-manager.service.tsindex 186da4ad65c..052f3fff4e6 100644--- a/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/services/custom-domain-manager.service.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/custom-domain-manager/services/custom-domain-manager.service.ts@@ -5,9 +5,9 @@ import { msg } from '@lingui/core/macro';import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';import { Repository } from 'typeorm';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated';-import { CUSTOM_DOMAIN_DEACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated';+import { CUSTOM_DOMAIN_DEACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated';import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';import { DomainValidRecords } from 'src/engine/core-modules/dns-manager/dtos/domain-valid-records';@@ -30,7 +30,7 @@ export class CustomDomainManagerService {private readonly publicDomainRepository: Repository<PublicDomainEntity>,private readonly billingService: BillingService,private readonly dnsManagerService: DnsManagerService,- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,) {}async isCustomDomainEnabled(workspaceId: string) {@@ -112,11 +112,11 @@ export class CustomDomainManagerService {await this.workspaceRepository.save(workspace);- const analytics = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: workspace.id,});- void analytics.insertWorkspaceEvent(+ void eventLogContext.insertWorkspaceEvent(workspace.isCustomDomainEnabled? CUSTOM_DOMAIN_ACTIVATED_EVENT: CUSTOM_DOMAIN_DEACTIVATED_EVENT,diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/cleanup/services/event-log-cleanup.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/cleanup/services/event-log-cleanup.service.tsindex a7cda8eb47f..14bd99cebf3 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/cleanup/services/event-log-cleanup.service.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/cleanup/services/event-log-cleanup.service.ts@@ -6,14 +6,7 @@ import { EventLogTable } from 'twenty-shared/types';import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';--const CLICKHOUSE_TABLE_NAMES: Record<EventLogTable, string> = {- [EventLogTable.WORKSPACE_EVENT]: 'workspaceEvent',- [EventLogTable.PAGEVIEW]: 'pageview',- [EventLogTable.OBJECT_EVENT]: 'objectEvent',- [EventLogTable.USAGE_EVENT]: 'usageEvent',- [EventLogTable.APPLICATION_LOG]: 'applicationLog',-};+import { getClickHouseTableName } from 'src/engine/core-modules/event-logs/registry/event-log-registry';export type EventLogCleanupParams = {workspaceId: string;@@ -43,11 +36,9 @@ export class EventLogCleanupService {cutoffDate.setDate(cutoffDate.getDate() - retentionDays);for (const table of Object.values(EventLogTable)) {- const tableName = CLICKHOUSE_TABLE_NAMES[table];+ const tableName = getClickHouseTableName(table);try {- // ClickHouse ALTER TABLE DELETE is async by default- // We use lightweight deletes (mutations) which are efficientconst success = await this.clickHouseService.executeCommand(`ALTER TABLE ${tableName} DELETE WHERE "workspaceId" = {workspaceId:String} AND "timestamp" < {cutoffDate:DateTime64(3)}`,{diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/dtos/event-log-table.enum.ts b/packages/twenty-server/src/engine/core-modules/event-logs/dtos/event-log-table.enum.tsindex 945ecea26be..5d71cc53105 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/dtos/event-log-table.enum.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/dtos/event-log-table.enum.ts@@ -7,5 +7,3 @@ export const registerEventLogTableEnum = () => {name: 'EventLogTable',});};--export { EventLogTable };diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/analytics.utils.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/analytics.utils.spec.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/audit/utils/analytics.utils.spec.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/analytics.utils.spec.tsdiff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/analytics.utils.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/analytics.utils.tssimilarity index 59%rename from packages/twenty-server/src/engine/core-modules/audit/utils/analytics.utils.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/analytics.utils.tsindex f3311d2b482..7ebbd74d866 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/analytics.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/analytics.utils.ts@@ -1,21 +1,20 @@-import { format } from 'date-fns';--import { type AuditCommonPropertiesType } from 'src/engine/core-modules/audit/types/common.type';+import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';+import { type EventCommonPropertiesType } from 'src/engine/core-modules/event-logs/emit/common.type';import {type TrackEventName,type TrackEventProperties,-} from 'src/engine/core-modules/audit/types/events.type';+} from 'src/engine/core-modules/event-logs/emit/events.type';import {type PageviewProperties,pageviewSchema,-} from 'src/engine/core-modules/audit/utils/events/pageview/pageview';+} from 'src/engine/core-modules/event-logs/emit/events/pageview/pageview';import {eventsRegistry,type GenericTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';-const common = (): Record<AuditCommonPropertiesType, string> => ({- timestamp: format(new Date(), 'yyyy-MM-dd HH:mm:ss'),+const common = (): Record<EventCommonPropertiesType, string> => ({+ timestamp: formatDateTimeForClickHouse(new Date()),version: '1',});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.spec.tsnew file mode 100644index 00000000000..d75ff738667--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.spec.ts@@ -0,0 +1,36 @@+import {+ buildPageviewEnvelope,+ computeEventContextFields,+} from 'src/engine/core-modules/event-logs/emit/build-event-envelope';++describe('build-event-envelope', () => {+ describe('computeEventContextFields', () => {+ it('keeps defined ids and drops null/undefined', () => {+ expect(+ computeEventContextFields({ workspaceId: 'w', userId: 'u' }),+ ).toEqual({ workspaceId: 'w', userId: 'u' });+ expect(+ computeEventContextFields({ workspaceId: 'w', userId: null }),+ ).toEqual({ workspaceId: 'w' });+ expect(computeEventContextFields()).toEqual({});+ });+ });++ describe('buildPageviewEnvelope', () => {+ it('tags the envelope with the pageview table and merges context', () => {+ const envelope = buildPageviewEnvelope(+ { workspaceId: 'w', userId: 'u' },+ 'home',+ {},+ );++ expect(envelope.table).toBe('pageview');+ expect(envelope.row).toMatchObject({+ workspaceId: 'w',+ userId: 'u',+ type: 'page',+ name: 'home',+ });+ });+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.tsnew file mode 100644index 00000000000..816d90474ef--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/build-event-envelope.ts@@ -0,0 +1,65 @@+import {+ type TrackEventName,+ type TrackEventProperties,+} from 'src/engine/core-modules/event-logs/emit/events.type';+import {+ type EventContextFields,+ type WorkspaceEventEnvelope,+} from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';+import {+ makePageview,+ makeTrackEvent,+} from 'src/engine/core-modules/event-logs/emit/analytics.utils';+import { type PageviewProperties } from 'src/engine/core-modules/event-logs/emit/events/pageview/pageview';++export const computeEventContextFields = (+ context?: EventContextFields,+): EventContextFields => ({+ ...(context?.workspaceId ? { workspaceId: context.workspaceId } : {}),+ ...(context?.userId ? { userId: context.userId } : {}),+});++export const buildWorkspaceEventEnvelope = <T extends TrackEventName>(+ contextFields: EventContextFields,+ event: T,+ properties: TrackEventProperties<T>,+): WorkspaceEventEnvelope => ({+ table: 'workspaceEvent',+ row: { ...contextFields, ...makeTrackEvent(event, properties) },+});++export const buildObjectEventEnvelope = <T extends TrackEventName>(+ contextFields: EventContextFields,+ event: T,+ properties: TrackEventProperties<T> & {+ recordId: string;+ objectMetadataId: string;+ isCustom?: boolean;+ },+): WorkspaceEventEnvelope => {+ const { recordId, objectMetadataId, isCustom, ...restProperties } =+ properties;++ return {+ table: 'objectEvent',+ row: {+ ...contextFields,+ ...makeTrackEvent(+ event,+ restProperties as unknown as TrackEventProperties<T>,+ ),+ recordId,+ objectMetadataId,+ isCustom,+ },+ };+};++export const buildPageviewEnvelope = (+ contextFields: EventContextFields,+ name: string,+ properties: Partial<PageviewProperties>,+): WorkspaceEventEnvelope => ({+ table: 'pageview',+ row: { ...contextFields, ...makePageview(name, properties) },+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/common.type.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/common.type.tsnew file mode 100644index 00000000000..5e8cc0c02b4--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/common.type.ts@@ -0,0 +1,2 @@+export type EventCommonPropertiesType = 'timestamp' | 'version';+export type IdentifierType = 'workspaceId' | 'userId';diff --git a/packages/twenty-server/src/engine/core-modules/audit/dtos/analytics.dto.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/analytics.dto.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/audit/dtos/analytics.dto.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/analytics.dto.tsdiff --git a/packages/twenty-server/src/engine/core-modules/audit/dtos/create-analytics.input.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-analytics.input.tssimilarity index 70%rename from packages/twenty-server/src/engine/core-modules/audit/dtos/create-analytics.input.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-analytics.input.tsindex 0890c886878..6968bc13a1f 100644--- a/packages/twenty-server/src/engine/core-modules/audit/dtos/create-analytics.input.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-analytics.input.ts@@ -1,16 +1,10 @@import { ArgsType, Field, registerEnumType } from '@nestjs/graphql';-import {- IsEnum,- IsNotEmpty,- IsObject,- IsOptional,- IsString,-} from 'class-validator';+import { IsEnum, IsObject, IsOptional, IsString } from 'class-validator';import GraphQLJSON from 'graphql-type-json';-import { TrackEventName } from 'src/engine/core-modules/audit/types/events.type';-import { type PageviewProperties } from 'src/engine/core-modules/audit/utils/events/pageview/pageview';+import { TrackEventName } from 'src/engine/core-modules/event-logs/emit/events.type';+import { type PageviewProperties } from 'src/engine/core-modules/event-logs/emit/events/pageview/pageview';enum AnalyticsType {PAGEVIEW = 'pageview',@@ -21,19 +15,6 @@ registerEnumType(AnalyticsType, {name: 'AnalyticsType',});-// deprecated-@ArgsType()-export class CreateAnalyticsInput {- @Field({ description: 'Type of the event' })- @IsNotEmpty()- @IsString()- action: string;-- @Field(() => GraphQLJSON, { description: 'Event payload in JSON format' })- @IsObject()- payload: JSON;-}-@ArgsType()export class CreateAnalyticsInputV2 {@Field(() => AnalyticsType)diff --git a/packages/twenty-server/src/engine/core-modules/audit/dtos/create-object-event.input.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-object-event.input.tssimilarity index 89%rename from packages/twenty-server/src/engine/core-modules/audit/dtos/create-object-event.input.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-object-event.input.tsindex e76da938621..6a3664cac87 100644--- a/packages/twenty-server/src/engine/core-modules/audit/dtos/create-object-event.input.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/dtos/create-object-event.input.ts@@ -10,7 +10,7 @@ import {import GraphQLJSON from 'graphql-type-json';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { TrackEventName } from 'src/engine/core-modules/audit/types/events.type';+import { TrackEventName } from 'src/engine/core-modules/event-logs/emit/events.type';@ArgsType()export class CreateObjectEventInput {diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter-exception.filter.tsnew file mode 100644index 00000000000..8e24be9dad5--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter-exception.filter.ts@@ -0,0 +1,23 @@+import { Catch, type ExceptionFilter } from '@nestjs/common';++import { assertUnreachable } from 'twenty-shared/utils';++import {+ EventLogEmitterException,+ EventLogEmitterExceptionCode,+} from 'src/engine/core-modules/event-logs/emit/event-log-emitter.exception';+import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';++@Catch(EventLogEmitterException)+export class EventLogEmitterExceptionFilter implements ExceptionFilter {+ catch(exception: EventLogEmitterException) {+ switch (exception.code) {+ case EventLogEmitterExceptionCode.INVALID_TYPE:+ case EventLogEmitterExceptionCode.INVALID_INPUT:+ throw new UserInputError(exception);+ default: {+ assertUnreachable(exception.code);+ }+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.exception.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.exception.tsnew file mode 100644index 00000000000..35df0f3f03f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.exception.ts@@ -0,0 +1,37 @@+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { assertUnreachable } from 'twenty-shared/utils';++import { CustomException } from 'src/utils/custom-exception';++export enum EventLogEmitterExceptionCode {+ INVALID_TYPE = 'INVALID_TYPE',+ INVALID_INPUT = 'INVALID_INPUT',+}++const getEventLogEmitterExceptionUserFriendlyMessage = (+ code: EventLogEmitterExceptionCode,+) => {+ switch (code) {+ case EventLogEmitterExceptionCode.INVALID_TYPE:+ return msg`Invalid event type.`;+ case EventLogEmitterExceptionCode.INVALID_INPUT:+ return msg`Invalid event input.`;+ default:+ assertUnreachable(code);+ }+};++export class EventLogEmitterException extends CustomException<EventLogEmitterExceptionCode> {+ constructor(+ message: string,+ code: EventLogEmitterExceptionCode,+ { userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},+ ) {+ super(message, code, {+ userFriendlyMessage:+ userFriendlyMessage ??+ getEventLogEmitterExceptionUserFriendlyMessage(code),+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.module.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.module.tsnew file mode 100644index 00000000000..6259655e37f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.module.ts@@ -0,0 +1,11 @@+import { Module } from '@nestjs/common';++import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { EventLogIngestionModule } from 'src/engine/core-modules/event-logs/ingest/event-log-ingestion.module';++@Module({+ imports: [EventLogIngestionModule],+ providers: [EventLogEmitterService],+ exports: [EventLogEmitterService],+})+export class EventLogEmitterModule {}diff --git a/packages/twenty-server/src/engine/core-modules/audit/audit.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.spec.tssimilarity index 80%rename from packages/twenty-server/src/engine/core-modules/audit/audit.resolver.spec.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.spec.tsindex 1fef575dffd..69ede18db75 100644--- a/packages/twenty-server/src/engine/core-modules/audit/audit.resolver.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.spec.ts@@ -1,19 +1,19 @@import { Test, type TestingModule } from '@nestjs/testing';import {- AuditException,- AuditExceptionCode,-} from 'src/engine/core-modules/audit/audit.exception';+ EventLogEmitterException,+ EventLogEmitterExceptionCode,+} from 'src/engine/core-modules/event-logs/emit/event-log-emitter.exception';import { type UserEntity } from 'src/engine/core-modules/user/user.entity';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { AuditResolver } from './audit.resolver';+import { EventLogEmitterResolver } from './event-log-emitter.resolver';-import { AuditService } from './services/audit.service';+import { EventLogEmitterService } from './event-log-emitter.service';-describe('AuditResolver', () => {- let resolver: AuditResolver;- let auditService: jest.Mocked<AuditService>;+describe('EventLogEmitterResolver', () => {+ let resolver: EventLogEmitterResolver;+ let auditService: jest.Mocked<EventLogEmitterService>;beforeEach(async () => {auditService = {@@ -22,15 +22,15 @@ describe('AuditResolver', () => {const module: TestingModule = await Test.createTestingModule({providers: [- AuditResolver,+ EventLogEmitterResolver,{- provide: AuditService,+ provide: EventLogEmitterService,useValue: auditService,},],}).compile();- resolver = module.get<AuditResolver>(AuditResolver);+ resolver = module.get<EventLogEmitterResolver>(EventLogEmitterResolver);});it('should be defined', () => {@@ -141,20 +141,20 @@ describe('AuditResolver', () => {expect(result).toBe('Object event created');});- it('should throw an AuditException for invalid input', async () => {+ it('should throw an EventLogEmitterException for invalid input', async () => {const invalidInput = { type: 'invalid' };await expect(resolver.trackAnalytics(invalidInput as any, undefined, undefined),).rejects.toThrowError(- new AuditException(+ new EventLogEmitterException('Invalid analytics input',- AuditExceptionCode.INVALID_TYPE,+ EventLogEmitterExceptionCode.INVALID_TYPE,),);});- it('should throw an AuditException when workspace is missing for createObjectEvent', async () => {+ it('should throw an EventLogEmitterException when workspace is missing for createObjectEvent', async () => {const input = {event: 'Object Record Created' as const,recordId: 'test-record-id',@@ -164,7 +164,10 @@ describe('AuditResolver', () => {await expect(resolver.createObjectEvent(input, undefined, undefined),).rejects.toThrowError(- new AuditException('Missing workspace', AuditExceptionCode.INVALID_INPUT),+ new EventLogEmitterException(+ 'Missing workspace',+ EventLogEmitterExceptionCode.INVALID_INPUT,+ ),);});});diff --git a/packages/twenty-server/src/engine/core-modules/audit/audit.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.tssimilarity index 65%rename from packages/twenty-server/src/engine/core-modules/audit/audit.resolver.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.tsindex 01a25421eaa..e134d9a1c5d 100644--- a/packages/twenty-server/src/engine/core-modules/audit/audit.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.ts@@ -2,12 +2,12 @@ import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';import { Args, Mutation } from '@nestjs/graphql';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { AuditExceptionFilter } from 'src/engine/core-modules/audit/audit-exception-filter';+import { EventLogEmitterExceptionFilter } from 'src/engine/core-modules/event-logs/emit/event-log-emitter-exception.filter';import {- AuditException,- AuditExceptionCode,-} from 'src/engine/core-modules/audit/audit.exception';-import { CreateObjectEventInput } from 'src/engine/core-modules/audit/dtos/create-object-event.input';+ EventLogEmitterException,+ EventLogEmitterExceptionCode,+} from 'src/engine/core-modules/event-logs/emit/event-log-emitter.exception';+import { CreateObjectEventInput } from 'src/engine/core-modules/event-logs/emit/dtos/create-object-event.input';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { UserEntity } from 'src/engine/core-modules/user/user.entity';@@ -24,24 +24,18 @@ import {isPageviewAnalyticsInput,isTrackAnalyticsInput,} from './dtos/create-analytics.input';-import { AuditService } from './services/audit.service';+import { EventLogEmitterService } from './event-log-emitter.service';@MetadataResolver(() => Analytics)@UsePipes(ResolverValidationPipe)-@UseFilters(AuditExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)-export class AuditResolver {- constructor(private readonly auditService: AuditService) {}-- // preparing for new name- async createPageview(- @Args()- createAnalyticsInput: CreateAnalyticsInputV2,- @AuthWorkspace({ allowUndefined: true })- workspace: WorkspaceEntity | undefined,- @AuthUser({ allowUndefined: true }) user: UserEntity | undefined,- ) {- return this.trackAnalytics(createAnalyticsInput, workspace, user);- }+@UseFilters(+ EventLogEmitterExceptionFilter,+ PreventNestToAutoLogGraphqlErrorsFilter,+)+export class EventLogEmitterResolver {+ constructor(+ private readonly eventLogEmitterService: EventLogEmitterService,+ ) {}@Mutation(() => Analytics)@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)@@ -52,18 +46,18 @@ export class AuditResolver {@AuthUser({ allowUndefined: true }) user: UserEntity | undefined,) {if (!workspace) {- throw new AuditException(+ throw new EventLogEmitterException('Missing workspace',- AuditExceptionCode.INVALID_INPUT,+ EventLogEmitterExceptionCode.INVALID_INPUT,);}- const analyticsContext = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: workspace.id,userId: user?.id,});- return analyticsContext.createObjectEvent(createObjectEventInput.event, {+ return eventLogContext.createObjectEvent(createObjectEventInput.event, {...createObjectEventInput.properties,recordId: createObjectEventInput.recordId,objectMetadataId: createObjectEventInput.objectMetadataId,@@ -80,30 +74,28 @@ export class AuditResolver {workspace: WorkspaceEntity | undefined,@AuthUser({ allowUndefined: true }) user: UserEntity | undefined,) {- const analyticsContext = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: workspace?.id,userId: user?.id,});if (isPageviewAnalyticsInput(createAnalyticsInput)) {- return analyticsContext.createPageviewEvent(+ return eventLogContext.createPageviewEvent(createAnalyticsInput.name,createAnalyticsInput.properties ?? {},);}if (isTrackAnalyticsInput(createAnalyticsInput)) {- // For track events, we need to determine if it's a workspace or object event- // Since we don't have recordId and objectMetadataId in the input, we use insertWorkspaceEvent- return analyticsContext.insertWorkspaceEvent(+ return eventLogContext.insertWorkspaceEvent(createAnalyticsInput.event,createAnalyticsInput.properties ?? {},);}- throw new AuditException(+ throw new EventLogEmitterException('Invalid analytics input',- AuditExceptionCode.INVALID_TYPE,+ EventLogEmitterExceptionCode.INVALID_TYPE,);}}diff --git a/packages/twenty-server/src/engine/core-modules/audit/services/audit.service.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.spec.tssimilarity index 91%rename from packages/twenty-server/src/engine/core-modules/audit/services/audit.service.spec.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.spec.tsindex a60594ba42c..4e852d00172 100644--- a/packages/twenty-server/src/engine/core-modules/audit/services/audit.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.spec.ts@@ -3,21 +3,21 @@ import { Test, type TestingModule } from '@nestjs/testing';import { AuditContextMock } from 'test/utils/audit-context.mock';import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';-import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/audit/utils/events/object-event/object-record-created';-import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated';+import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';+import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated';import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-import { AuditService } from './audit.service';+import { EventLogEmitterService } from './event-log-emitter.service';-describe('AuditService', () => {- let service: AuditService;+describe('EventLogEmitterService', () => {+ let service: EventLogEmitterService;beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({providers: [{- provide: AuditService,+ provide: EventLogEmitterService,useValue: {createContext: AuditContextMock,},@@ -43,7 +43,7 @@ describe('AuditService', () => {],}).compile();- service = module.get<AuditService>(AuditService);+ service = module.get<EventLogEmitterService>(EventLogEmitterService);});it('should be defined', () => {diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.tsnew file mode 100644index 00000000000..43d42cc6e52--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.service.ts@@ -0,0 +1,83 @@+import { Injectable, Logger } from '@nestjs/common';++import {+ buildObjectEventEnvelope,+ buildPageviewEnvelope,+ buildWorkspaceEventEnvelope,+ computeEventContextFields,+} from 'src/engine/core-modules/event-logs/emit/build-event-envelope';+import { type PageviewProperties } from 'src/engine/core-modules/event-logs/emit/events/pageview/pageview';+import {+ type TrackEventName,+ type TrackEventProperties,+} from 'src/engine/core-modules/event-logs/emit/events.type';+import { WorkspaceEventSinkService } from 'src/engine/core-modules/event-logs/ingest/workspace-event-sink.service';+import {+ type EventContextFields,+ type WorkspaceEventEnvelope,+} from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++@Injectable()+export class EventLogEmitterService {+ private readonly logger = new Logger(EventLogEmitterService.name);++ constructor(+ private readonly workspaceEventSinkService: WorkspaceEventSinkService,+ ) {}++ isEnabled(): boolean {+ return this.workspaceEventSinkService.isEnabled();+ }++ async dispatch(events: WorkspaceEventEnvelope[]): Promise<void> {+ if (events.length === 0 || !this.isEnabled()) {+ return;+ }++ await this.workspaceEventSinkService.ingest(events);+ }++ createContext(context?: EventContextFields) {+ const contextFields = computeEventContextFields(context);++ return {+ insertWorkspaceEvent: <T extends TrackEventName>(+ event: T,+ properties: TrackEventProperties<T>,+ ) =>+ this.emit(() =>+ buildWorkspaceEventEnvelope(contextFields, event, properties),+ ),+ createObjectEvent: <T extends TrackEventName>(+ event: T,+ properties: TrackEventProperties<T> & {+ recordId: string;+ objectMetadataId: string;+ isCustom?: boolean;+ },+ ) =>+ this.emit(() =>+ buildObjectEventEnvelope(contextFields, event, properties),+ ),+ createPageviewEvent: (+ name: string,+ properties: Partial<PageviewProperties>,+ ) =>+ this.emit(() => buildPageviewEnvelope(contextFields, name, properties)),+ };+ }++ private async emit(+ buildEnvelope: () => WorkspaceEventEnvelope,+ ): Promise<{ success: boolean }> {+ try {+ await this.dispatch([buildEnvelope()]);++ return { success: true };+ } catch (error) {+ this.logger.error('Failed to emit workspace event', error);++ return { success: false };+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/audit/types/events.type.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events.type.tssimilarity index 57%rename from packages/twenty-server/src/engine/core-modules/audit/types/events.type.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events.type.tsindex 1a85aafe79c..744e868b424 100644--- a/packages/twenty-server/src/engine/core-modules/audit/types/events.type.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events.type.ts@@ -1,64 +1,58 @@import {type OBJECT_RECORD_CREATED_EVENT,type ObjectRecordCreatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/object-event/object-record-created';+} from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';import {type OBJECT_RECORD_DELETED_EVENT,type ObjectRecordDeletedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/object-event/object-record-delete';+} from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete';import {type OBJECT_RECORD_UPDATED_EVENT,type ObjectRecordUpdatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/object-event/object-record-updated';+} from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated';import {type OBJECT_RECORD_UPSERTED_EVENT,type ObjectRecordUpsertedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/object-event/object-record-upserted';+} from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-upserted';import {type CUSTOM_DOMAIN_ACTIVATED_EVENT,type CustomDomainActivatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated';import {type CUSTOM_DOMAIN_DEACTIVATED_EVENT,type CustomDomainDeactivatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated';import {type LOGIC_FUNCTION_EXECUTED_EVENT,type LogicFunctionExecutedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed';import {- type MONITORING_EVENT,- type MonitoringTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring';+ type IMPERSONATION_EVENT,+ type ImpersonationTrackEvent,+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation';import {type USER_SIGNUP_EVENT,type UserSignupTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/user/user-signup';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/user/user-signup';import {type WEBHOOK_RESPONSE_EVENT,type WebhookResponseTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/webhook/webhook-response';import {type PAYMENT_RECEIVED_EVENT,type PaymentReceivedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/billing/payment-received';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/billing/payment-received';import {type WORKSPACE_CREATED_EVENT,type WorkspaceCreatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/workspace/workspace-created';-import {- type WORKSPACE_ENTITY_CREATED_EVENT,- type WorkspaceEntityCreatedTrackEvent,-} from 'src/engine/core-modules/audit/utils/events/workspace-event/workspace-entity/workspace-entity-created';+} from 'src/engine/core-modules/event-logs/emit/events/workspace-event/workspace/workspace-created';-// Define all track event namesexport type TrackEventName =| typeof CUSTOM_DOMAIN_ACTIVATED_EVENT| typeof CUSTOM_DOMAIN_DEACTIVATED_EVENT| typeof LOGIC_FUNCTION_EXECUTED_EVENT| typeof WEBHOOK_RESPONSE_EVENT- | typeof WORKSPACE_ENTITY_CREATED_EVENT- | typeof MONITORING_EVENT+ | typeof IMPERSONATION_EVENT| typeof OBJECT_RECORD_CREATED_EVENT| typeof OBJECT_RECORD_UPDATED_EVENT| typeof OBJECT_RECORD_DELETED_EVENT@@ -67,15 +61,13 @@ export type TrackEventName =| typeof WORKSPACE_CREATED_EVENT| typeof PAYMENT_RECEIVED_EVENT;-// Map event names to their corresponding event typesexport interface TrackEvents {[CUSTOM_DOMAIN_ACTIVATED_EVENT]: CustomDomainActivatedTrackEvent;[CUSTOM_DOMAIN_DEACTIVATED_EVENT]: CustomDomainDeactivatedTrackEvent;[LOGIC_FUNCTION_EXECUTED_EVENT]: LogicFunctionExecutedTrackEvent;[WEBHOOK_RESPONSE_EVENT]: WebhookResponseTrackEvent;- [WORKSPACE_ENTITY_CREATED_EVENT]: WorkspaceEntityCreatedTrackEvent;[USER_SIGNUP_EVENT]: UserSignupTrackEvent;- [MONITORING_EVENT]: MonitoringTrackEvent;+ [IMPERSONATION_EVENT]: ImpersonationTrackEvent;[OBJECT_RECORD_DELETED_EVENT]: ObjectRecordDeletedTrackEvent;[OBJECT_RECORD_CREATED_EVENT]: ObjectRecordCreatedTrackEvent;[OBJECT_RECORD_UPDATED_EVENT]: ObjectRecordUpdatedTrackEvent;diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/common/base-schemas.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/common/base-schemas.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/common/base-schemas.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/common/base-schemas.tsdiff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-created.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-created.tssimilarity index 79%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-created.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-created.tsindex 5daccf50adc..193c791a3f2 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-created.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-created.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const OBJECT_RECORD_CREATED_EVENT = 'Object Record Created' as const;export const objectRecordCreatedSchema = z.object({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-delete.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete.tssimilarity index 79%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-delete.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete.tsindex 143c25c1400..ce6a3adc000 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-delete.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const OBJECT_RECORD_DELETED_EVENT = 'Object Record Deleted' as const;export const objectRecordDeletedSchema = z.object({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-updated.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated.tssimilarity index 79%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-updated.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated.tsindex c19d667a9e2..fa12ecbead8 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-updated.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const OBJECT_RECORD_UPDATED_EVENT = 'Object Record Updated' as const;export const objectRecordUpdatedSchema = z.object({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-upserted.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-upserted.tssimilarity index 80%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-upserted.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-upserted.tsindex 85ab5e79662..84ea61a7bd2 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/object-event/object-record-upserted.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/object-event/object-record-upserted.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const OBJECT_RECORD_UPSERTED_EVENT = 'Object Record Upserted' as const;export const objectRecordUpsertedSchema = z.object({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/pageview/pageview.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/pageview/pageview.tssimilarity index 85%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/pageview/pageview.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/pageview/pageview.tsindex 156143eafe5..fef4b01244f 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/pageview/pageview.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/pageview/pageview.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { baseEventSchema } from 'src/engine/core-modules/audit/utils/events/common/base-schemas';+import { baseEventSchema } from 'src/engine/core-modules/event-logs/emit/events/common/base-schemas';export const pageviewSchema = baseEventSchema.extend({type: z.literal('page'),diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/billing/payment-received.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/billing/payment-received.tssimilarity index 79%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/billing/payment-received.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/billing/payment-received.tsindex 31c90b390c4..66ca1294c76 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/billing/payment-received.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/billing/payment-received.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const PAYMENT_RECEIVED_EVENT = 'Payment Received' as const;export const paymentReceivedSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated.tssimilarity index 80%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated.tsindex 1c236fa9abc..2a08272ed46 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const CUSTOM_DOMAIN_ACTIVATED_EVENT = 'Custom Domain Activated' as const;export const customDomainActivatedSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated.tssimilarity index 81%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated.tsindex 1a20aaf1f0c..05cbc45767b 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-deactivated.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-deactivated.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const CUSTOM_DOMAIN_DEACTIVATED_EVENT ='Custom Domain Deactivated' as const;diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation.tsnew file mode 100644index 00000000000..a5a952c227a--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation.ts@@ -0,0 +1,28 @@+import { z } from 'zod';++import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';++export const IMPERSONATION_EVENT = 'Impersonation' as const;++export const impersonationSchema = z.strictObject({+ event: z.literal(IMPERSONATION_EVENT),+ properties: z.strictObject({+ level: z.enum(['server', 'workspace']),+ action: z.enum([+ 'attempt',+ 'attempted',+ 'issued',+ 'login_token_attempt',+ 'login_token_generated',+ 'login_token_failed',+ 'token_exchange_attempt',+ 'token_exchange_success',+ 'token_exchange_failed',+ ]),+ message: z.string().optional(),+ }),+});++export type ImpersonationTrackEvent = z.infer<typeof impersonationSchema>;++registerEvent(IMPERSONATION_EVENT, impersonationSchema);diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed.tssimilarity index 85%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed.tsindex d75db90a050..6434c224d3c 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const LOGIC_FUNCTION_EXECUTED_EVENT = 'Logic Function Executed' as const;export const logicFunctionExecutedSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/track.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/track.tssimilarity index 88%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/track.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/track.tsindex ac2ef567702..8eb9ba847c0 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/track.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/track.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { baseEventSchema } from 'src/engine/core-modules/audit/utils/events/common/base-schemas';+import { baseEventSchema } from 'src/engine/core-modules/event-logs/emit/events/common/base-schemas';export const genericTrackSchema = baseEventSchema.extend({type: z.literal('track'),diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/user/user-signup.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/user/user-signup.tssimilarity index 76%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/user/user-signup.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/user/user-signup.tsindex 231c7a52c92..c93b2b1bc7f 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/user/user-signup.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/user/user-signup.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const USER_SIGNUP_EVENT = 'User Signup' as const;export const userSignupSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/webhook/webhook-response.tssimilarity index 84%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/webhook/webhook-response.tsindex a77561db650..2bd564e7e93 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/webhook/webhook-response.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const WEBHOOK_RESPONSE_EVENT = 'Webhook Response' as const;export const webhookResponseSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace/workspace-created.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/workspace/workspace-created.tssimilarity index 78%rename from packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace/workspace-created.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/workspace/workspace-created.tsindex 42fba30ad60..8d2db9032fc 100644--- a/packages/twenty-server/src/engine/core-modules/audit/utils/events/workspace-event/workspace/workspace-created.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/events/workspace-event/workspace/workspace-created.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { registerEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { registerEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';export const WORKSPACE_CREATED_EVENT = 'Workspace Created' as const;export const workspaceCreatedSchema = z.strictObject({diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.tsnew file mode 100644index 00000000000..031144e1e01--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts@@ -0,0 +1,96 @@+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';+import { Args, Subscription } from '@nestjs/graphql';++import { PermissionFlagType } from 'twenty-shared/constants';+import { EventLogTable } from 'twenty-shared/types';++import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { EventLogsGraphqlApiExceptionFilter } from 'src/engine/core-modules/event-logs/filters/event-logs-graphql-api-exception.filter';+import { ForbiddenExceptionGraphqlFilter } from 'src/engine/core-modules/event-logs/filters/forbidden-exception-graphql.filter';+import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';+import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';+import { APPLICATION_KEEPALIVE_INTERVAL_MS } from 'src/engine/subscriptions/constants/application-keepalive-interval-ms.constant';+import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';+import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';+import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';+import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';++import { EventLogsService } from './event-logs.service';++import { EventLogRecord } from './dtos/event-log-result.dto';+import { getClickHouseTableName } from './registry/event-log-registry';+import { normalizeEventLogRecords } from './utils/normalize-event-log-records';++type WorkspaceEventLivePayload = {+ table: string;+ rows: Record<string, unknown>[];+};++@MetadataResolver()+@UseFilters(+ ForbiddenExceptionGraphqlFilter,+ AuthGraphqlApiExceptionFilter,+ EventLogsGraphqlApiExceptionFilter,+ PermissionsGraphqlApiExceptionFilter,+ PreventNestToAutoLogGraphqlErrorsFilter,+)+@UsePipes(ResolverValidationPipe)+export class EventLogsLiveResolver {+ constructor(+ private readonly eventLogsService: EventLogsService,+ private readonly subscriptionService: SubscriptionService,+ private readonly workspaceEventLiveService: EventLogLiveService,+ ) {}++ @UseGuards(+ WorkspaceAuthGuard,+ SettingsPermissionGuard(PermissionFlagType.SECURITY),+ )+ @Subscription(() => [EventLogRecord], {+ nullable: true,+ filter: (+ payload: WorkspaceEventLivePayload,+ variables: { table: EventLogTable },+ ) => getClickHouseTableName(variables.table) === payload.table,+ resolve: (+ payload: WorkspaceEventLivePayload,+ variables: { table: EventLogTable },+ ) => normalizeEventLogRecords(payload.rows, variables.table),+ })+ async eventLogsLive(+ @Args('table', { type: () => EventLogTable }) table: EventLogTable,+ @AuthWorkspace() workspace: WorkspaceEntity,+ ) {+ await this.eventLogsService.validateAccess(workspace.id, table);++ const clickHouseTable = getClickHouseTableName(table);++ await this.workspaceEventLiveService.markWatched(+ workspace.id,+ clickHouseTable,+ );++ const iterator = await this.subscriptionService.subscribe({+ channel: SubscriptionChannel.WORKSPACE_EVENTS_CHANNEL,+ workspaceId: workspace.id,+ });++ return wrapAsyncIteratorWithLifecycle(iterator, {+ onHeartbeat: async () => {+ await this.workspaceEventLiveService.markWatched(+ workspace.id,+ clickHouseTable,+ );++ return true;+ },+ heartbeatIntervalMs: APPLICATION_KEEPALIVE_INTERVAL_MS,+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.module.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-viewer.module.tssimilarity index 56%rename from packages/twenty-server/src/engine/core-modules/event-logs/event-logs.module.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/event-logs-viewer.module.tsindex 2bd534b85db..f163209e698 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.module.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-viewer.module.ts@@ -3,13 +3,19 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { EnterpriseModule } from 'src/engine/core-modules/enterprise/enterprise.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';+import { EventLogEmitterResolver } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.resolver';+import { EventLogLiveModule } from 'src/engine/core-modules/event-logs/live/event-log-live.module';import { GuardRedirectModule } from 'src/engine/core-modules/guard-redirect/guard-redirect.module';+import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';+import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';+import { EventLogsLiveResolver } from './event-logs-live.resolver';import { EventLogsResolver } from './event-logs.resolver';import { EventLogsService } from './event-logs.service';@@ -20,9 +26,18 @@ import { EventLogsService } from './event-logs.service';BillingModule,EnterpriseModule,GuardRedirectModule,+ JwtModule,+ EventLogLiveModule,+ EventLogEmitterModule,+ SubscriptionsModule,TypeOrmModule.forFeature([UserWorkspaceEntity]),],- providers: [EventLogsResolver, EventLogsService],+ providers: [+ EventLogsResolver,+ EventLogsLiveResolver,+ EventLogsService,+ EventLogEmitterResolver,+ ],exports: [EventLogsService],})-export class EventLogsModule {}+export class EventLogsViewerModule {}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.tsnew file mode 100644index 00000000000..2dacb52ef52--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts@@ -0,0 +1,79 @@+import { EventLogTable } from 'twenty-shared/types';++import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';+import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';+import { EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';+import { EventLogsExceptionCode } from 'src/engine/core-modules/event-logs/event-logs.exception';+import { EventLogsService } from 'src/engine/core-modules/event-logs/event-logs.service';++describe('EventLogsService.validateAccess', () => {+ let service: EventLogsService;+ let getMainClient: jest.Mock;+ let hasEntitlement: jest.Mock;+ let isValid: jest.Mock;++ beforeEach(() => {+ getMainClient = jest.fn().mockReturnValue({});+ hasEntitlement = jest.fn().mockResolvedValue(true);+ isValid = jest.fn().mockReturnValue(true);++ service = new EventLogsService(+ { getMainClient } as unknown as ClickHouseService,+ { hasEntitlement } as unknown as BillingService,+ { isValid } as unknown as EnterprisePlanService,+ {} as never,+ );+ });++ const validateAccessError = async (table: EventLogTable) =>+ service.validateAccess('ws-1', table).then(+ () => undefined,+ (error) => error,+ );++ it('throws CLICKHOUSE_NOT_CONFIGURED when ClickHouse is unavailable', async () => {+ getMainClient.mockReturnValue(undefined);++ const error = await validateAccessError(EventLogTable.WORKSPACE_EVENT);++ expect(error?.code).toBe(EventLogsExceptionCode.CLICKHOUSE_NOT_CONFIGURED);+ });++ it('allows application logs with no entitlement (free on every plan)', async () => {+ isValid.mockReturnValue(false);+ hasEntitlement.mockResolvedValue(false);++ await expect(+ service.validateAccess('ws-1', EventLogTable.APPLICATION_LOG),+ ).resolves.toBeUndefined();+ expect(hasEntitlement).not.toHaveBeenCalled();+ });++ it('throws NO_ENTITLEMENT for a gated table when the Enterprise plan is invalid (skips the billing call)', async () => {+ isValid.mockReturnValue(false);++ const error = await validateAccessError(EventLogTable.WORKSPACE_EVENT);++ expect(error?.code).toBe(EventLogsExceptionCode.NO_ENTITLEMENT);+ expect(hasEntitlement).not.toHaveBeenCalled();+ });++ it('throws NO_ENTITLEMENT for a gated table when the AUDIT_LOGS entitlement is missing', async () => {+ hasEntitlement.mockResolvedValue(false);++ const error = await validateAccessError(EventLogTable.USAGE_EVENT);++ expect(error?.code).toBe(EventLogsExceptionCode.NO_ENTITLEMENT);+ expect(hasEntitlement).toHaveBeenCalledWith(+ 'ws-1',+ BillingEntitlementKey.AUDIT_LOGS,+ );+ });++ it('allows a gated table when the plan is valid and the entitlement is held', async () => {+ await expect(+ service.validateAccess('ws-1', EventLogTable.OBJECT_EVENT),+ ).resolves.toBeUndefined();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.tsindex 6ac6019375c..039ecdc4c23 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts@@ -9,7 +9,6 @@ import { Repository } from 'typeorm';import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';-import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';import { EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';@@ -21,57 +20,16 @@ import {import { EventLogFiltersInput } from './dtos/event-log-filters.input';import { EventLogQueryInput } from './dtos/event-log-query.input';+import { EventLogQueryResult } from './dtos/event-log-result.dto';import {- EventLogQueryResult,- EventLogRecord,-} from './dtos/event-log-result.dto';--type ClickHouseEventRecord = {- event?: string;- name?: string;- timestamp: string;- userId?: string;- properties?: Record<string, unknown>;- recordId?: string;- objectMetadataId?: string;- isCustom?: boolean;-};--type ClickHouseUsageEventRecord = {- timestamp: string;- userWorkspaceId?: string;- resourceType?: string;- operationType?: string;- quantity?: number;- unit?: string;- creditsUsedMicro?: number;- resourceId?: string;- resourceContext?: string;- metadata?: Record<string, unknown>;-};--type ClickHouseApplicationLogRecord = {- timestamp: string;- applicationId?: string;- logicFunctionId?: string;- logicFunctionName?: string;- executionId?: string;- level?: string;- message?: string;- properties?: Record<string, unknown>;-};+ EVENT_LOG_TYPES,+ getClickHouseTableName,+} from './registry/event-log-registry';+import { normalizeEventLogRecords } from './utils/normalize-event-log-records';const ALLOWED_TABLES = Object.values(EventLogTable);const MAX_LIMIT = 10000;-const CLICKHOUSE_TABLE_NAMES: Record<EventLogTable, string> = {- [EventLogTable.WORKSPACE_EVENT]: 'workspaceEvent',- [EventLogTable.PAGEVIEW]: 'pageview',- [EventLogTable.OBJECT_EVENT]: 'objectEvent',- [EventLogTable.USAGE_EVENT]: 'usageEvent',- [EventLogTable.APPLICATION_LOG]: 'applicationLog',-};-@Injectable()export class EventLogsService {constructor(@@ -93,15 +51,8 @@ export class EventLogsService {}const limit = Math.min(input.first ?? 100, MAX_LIMIT);- const tableName = CLICKHOUSE_TABLE_NAMES[input.table];- const eventFieldName =- input.table === EventLogTable.USAGE_EVENT- ? 'resourceType'- : input.table === EventLogTable.PAGEVIEW- ? 'name'- : input.table === EventLogTable.APPLICATION_LOG- ? 'logicFunctionName'- : 'event';+ const tableName = getClickHouseTableName(input.table);+ const eventFieldName = EVENT_LOG_TYPES[input.table].eventFieldName;const whereClauses: string[] = ['"workspaceId" = {workspaceId:String}'];const params: Record<string, unknown> = { workspaceId };@@ -145,7 +96,7 @@ export class EventLogsService {params.limit = limit + 1;const [records, countResult] = await Promise.all([- this.clickHouseService.select<ClickHouseEventRecord>(query, params),+ this.clickHouseService.select<Record<string, unknown>>(query, params),this.clickHouseService.select<{ totalCount: number }>(countQuery, params),]);@@ -156,7 +107,7 @@ export class EventLogsService {records.pop();}- const normalizedRecords = this.normalizeRecords(records, input.table);+ const normalizedRecords = normalizeEventLogRecords(records, input.table);const lastRecord = normalizedRecords[normalizedRecords.length - 1];const endCursor =hasNextPage && lastRecord@@ -173,7 +124,7 @@ export class EventLogsService {};}- private async validateAccess(+ async validateAccess(workspaceId: string,table: EventLogTable,): Promise<void> {@@ -184,23 +135,20 @@ export class EventLogsService {);}- if (table === EventLogTable.APPLICATION_LOG) {- return;- }+ const requiredEntitlement = EVENT_LOG_TYPES[table].requiresEntitlement;- if (!this.enterprisePlanService.isValid()) {- throw new EventLogsException(- 'Audit logs require an Enterprise subscription.',- EventLogsExceptionCode.NO_ENTITLEMENT,- );+ if (requiredEntitlement === null) {+ return;}- const hasEntitlement = await this.billingService.hasEntitlement(- workspaceId,- BillingEntitlementKey.AUDIT_LOGS,- );+ const hasAccess =+ this.enterprisePlanService.isValid() &&+ (await this.billingService.hasEntitlement(+ workspaceId,+ requiredEntitlement,+ ));- if (!hasEntitlement) {+ if (!hasAccess) {throw new EventLogsException('Audit logs require an Enterprise subscription.',EventLogsExceptionCode.NO_ENTITLEMENT,@@ -226,10 +174,7 @@ export class EventLogsService {params.eventTypePattern = `%${filters.eventType.toLowerCase()}%`;}- // TODO: Legacy event tables (workspaceEvent, pageview, objectEvent) use- // userId because some actions are logged out. Usage events use- // userWorkspaceId directly which is more relevant in a workspace context.- // Consider migrating all event tables to userWorkspaceId for consistency.+ // TODO: non-usage tables filter by userId (some actions are logged out) while usageEvent uses userWorkspaceId; migrate all to userWorkspaceId for consistency.if (isDefined(filters.userWorkspaceId)) {if (table === EventLogTable.APPLICATION_LOG) {// Application logs don't have a user column@@ -279,61 +224,4 @@ export class EventLogsService {private decodeCursor(cursor: string): number {return parseInt(Buffer.from(cursor, 'base64').toString('utf-8'), 10);}-- private normalizeRecords(- records:- | ClickHouseEventRecord[]- | ClickHouseUsageEventRecord[]- | ClickHouseApplicationLogRecord[],- table: EventLogTable,- ): EventLogRecord[] {- if (table === EventLogTable.USAGE_EVENT) {- return (records as ClickHouseUsageEventRecord[]).map((record) => ({- event: record.resourceType ?? '',- timestamp: new Date(record.timestamp),- userId: record.userWorkspaceId,- properties: {- operationType: record.operationType,- quantity: record.quantity,- unit: record.unit,- creditsUsedMicro: record.creditsUsedMicro,- resourceId: record.resourceId,- resourceContext: record.resourceContext,- ...(record.metadata ?? {}),- },- }));- }-- if (table === EventLogTable.APPLICATION_LOG) {- return (records as ClickHouseApplicationLogRecord[]).map((record) => ({- event: record.logicFunctionName ?? '',- timestamp: new Date(record.timestamp),- properties: {- level: record.level,- message: record.message,- executionId: record.executionId,- logicFunctionId: record.logicFunctionId,- applicationId: record.applicationId,- ...(record.properties ?? {}),- },- }));- }-- return (records as ClickHouseEventRecord[]).map((record) => {- const eventName =- table === EventLogTable.PAGEVIEW- ? (record.name ?? '')- : (record.event ?? '');-- return {- event: eventName,- timestamp: new Date(record.timestamp),- userId: record.userId,- properties: record.properties,- recordId: record.recordId,- objectMetadataId: record.objectMetadataId,- isCustom: record.isCustom,- };- });- }}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.spec.tsnew file mode 100644index 00000000000..126a8c6c443--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.spec.ts@@ -0,0 +1,69 @@+import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';+import { ClickHouseEventSink } from 'src/engine/core-modules/event-logs/ingest/clickhouse-event.sink';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++const makePageview = (name: string): WorkspaceEventEnvelope => ({+ table: 'pageview',+ row: { type: 'page', name, properties: {}, timestamp: 't', version: '1' },+});++const applicationLog: WorkspaceEventEnvelope = {+ table: 'applicationLog',+ row: {+ timestamp: 't',+ workspaceId: 'w',+ applicationId: '',+ logicFunctionId: '',+ logicFunctionName: 'fn',+ executionId: 'e',+ level: 'INFO',+ message: 'm',+ },+};++describe('ClickHouseEventSink', () => {+ let sink: ClickHouseEventSink;+ let insert: jest.Mock;+ let getMainClient: jest.Mock;++ beforeEach(() => {+ insert = jest.fn().mockResolvedValue({ success: true });+ getMainClient = jest.fn().mockReturnValue({});++ sink = new ClickHouseEventSink({+ insert,+ getMainClient,+ } as unknown as ClickHouseService);+ });++ it('groups envelopes by table and inserts each group once', async () => {+ const first = makePageview('a');+ const second = makePageview('b');++ await sink.write([first, second, applicationLog]);++ expect(insert).toHaveBeenCalledTimes(2);+ expect(insert).toHaveBeenCalledWith('pageview', [first.row, second.row]);+ expect(insert).toHaveBeenCalledWith('applicationLog', [applicationLog.row]);+ });++ it('no-ops when ClickHouse is not configured', async () => {+ getMainClient.mockReturnValue(undefined);++ await sink.write([makePageview('a')]);++ expect(insert).not.toHaveBeenCalled();+ });++ it('no-ops on an empty batch', async () => {+ await sink.write([]);++ expect(insert).not.toHaveBeenCalled();+ });++ it('throws when a ClickHouse insert fails so the consumer retries', async () => {+ insert.mockResolvedValue({ success: false });++ await expect(sink.write([makePageview('a')])).rejects.toThrow();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.tsnew file mode 100644index 00000000000..acbbe146e5e--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/clickhouse-event.sink.ts@@ -0,0 +1,37 @@+import { Injectable } from '@nestjs/common';++import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';+import { type EventSink } from 'src/engine/core-modules/event-logs/ingest/event-sink';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++@Injectable()+export class ClickHouseEventSink implements EventSink {+ constructor(private readonly clickHouseService: ClickHouseService) {}++ async write(events: WorkspaceEventEnvelope[]): Promise<void> {+ if (events.length === 0 || !this.clickHouseService.getMainClient()) {+ return;+ }++ const rowsByTable = new Map<string, Record<string, unknown>[]>();++ for (const event of events) {+ const rows = rowsByTable.get(event.table) ?? [];++ rows.push(event.row);+ rowsByTable.set(event.table, rows);+ }++ await Promise.all(+ [...rowsByTable.entries()].map(async ([table, rows]) => {+ const result = await this.clickHouseService.insert(table, rows);++ if (!result.success) {+ throw new Error(+ `Failed to insert ${rows.length} ${table} row(s) into ClickHouse`,+ );+ }+ }),+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/console-event.sink.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/console-event.sink.tsnew file mode 100644index 00000000000..4618bc4ff9b--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/console-event.sink.ts@@ -0,0 +1,34 @@+import { Injectable, Logger } from '@nestjs/common';++import { type EventSink } from 'src/engine/core-modules/event-logs/ingest/event-sink';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++@Injectable()+export class ConsoleEventSink implements EventSink {+ private readonly logger = new Logger(ConsoleEventSink.name);++ async write(events: WorkspaceEventEnvelope[]): Promise<void> {+ for (const event of events) {+ if (event.table === 'applicationLog') {+ const context = `${event.row.logicFunctionName}:${event.row.executionId}`;++ switch (event.row.level) {+ case 'ERROR':+ this.logger.error(event.row.message, undefined, context);+ break;+ case 'WARN':+ this.logger.warn(event.row.message, context);+ break;+ case 'DEBUG':+ this.logger.debug(event.row.message, context);+ break;+ default:+ this.logger.log(event.row.message, context);+ break;+ }+ } else {+ this.logger.log(JSON.stringify(event.row), event.table);+ }+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.spec.tsnew file mode 100644index 00000000000..08afea7736f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.spec.ts@@ -0,0 +1,30 @@+import { type ObjectRecordEvent } from 'twenty-shared/database-events';++import { CreateEventLogFromInternalEvent } from 'src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event';+import { WorkspaceEventSinkService } from 'src/engine/core-modules/event-logs/ingest/workspace-event-sink.service';+import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';++describe('CreateEventLogFromInternalEvent', () => {+ it('ingests object events (persist + live fan-out) through the sink pipeline', async () => {+ const ingest = jest.fn().mockResolvedValue(undefined);++ const handler = new CreateEventLogFromInternalEvent({+ isEnabled: () => true,+ ingest,+ } as unknown as WorkspaceEventSinkService);++ const batch = {+ name: 'company.created',+ workspaceId: 'workspace-1',+ objectMetadata: { id: 'object-metadata-1' },+ events: [{ recordId: 'record-1', userId: 'user-1', properties: {} }],+ } as unknown as WorkspaceEventBatch<ObjectRecordEvent>;++ await handler.handle(batch);++ const ingestedEnvelopes = ingest.mock.calls[0]?.[0];++ expect(ingestedEnvelopes).toHaveLength(1);+ expect(ingestedEnvelopes[0].table).toBe('objectEvent');+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.tsnew file mode 100644index 00000000000..5d3c15d463f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event.ts@@ -0,0 +1,84 @@+import { type ObjectRecordEvent } from 'twenty-shared/database-events';+import { isDefined } from 'twenty-shared/utils';++import { WorkspaceEventSinkService } from 'src/engine/core-modules/event-logs/ingest/workspace-event-sink.service';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';+import {+ buildObjectEventEnvelope,+ computeEventContextFields,+} from 'src/engine/core-modules/event-logs/emit/build-event-envelope';+import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';+import { OBJECT_RECORD_DELETED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-delete';+import { OBJECT_RECORD_UPDATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-updated';+import { OBJECT_RECORD_UPSERTED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-upserted';+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';++const OBJECT_EVENT_BY_SUFFIX = {+ '.created': OBJECT_RECORD_CREATED_EVENT,+ '.updated': OBJECT_RECORD_UPDATED_EVENT,+ '.deleted': OBJECT_RECORD_DELETED_EVENT,+ '.upserted': OBJECT_RECORD_UPSERTED_EVENT,+} as const;++@Processor(MessageQueue.entityEventsToDbQueue)+export class CreateEventLogFromInternalEvent {+ constructor(+ private readonly workspaceEventSinkService: WorkspaceEventSinkService,+ ) {}++ @Process(CreateEventLogFromInternalEvent.name)+ async handle(batch: WorkspaceEventBatch<ObjectRecordEvent>): Promise<void> {+ if (!this.workspaceEventSinkService.isEnabled()) {+ return;+ }++ const envelopes = this.toEnvelopes(batch);++ if (envelopes.length === 0) {+ return;+ }++ await this.workspaceEventSinkService.ingest(envelopes);+ }++ private toEnvelopes(+ batch: WorkspaceEventBatch<ObjectRecordEvent>,+ ): WorkspaceEventEnvelope[] {+ const suffix = (+ Object.keys(+ OBJECT_EVENT_BY_SUFFIX,+ ) as (keyof typeof OBJECT_EVENT_BY_SUFFIX)[]+ ).find((candidate) => batch.name.endsWith(candidate));++ if (!isDefined(suffix)) {+ return [];+ }++ const event = OBJECT_EVENT_BY_SUFFIX[suffix];++ return batch.events.map((eventData) =>+ buildObjectEventEnvelope(+ computeEventContextFields({+ workspaceId: batch.workspaceId,+ userId: eventData.userId,+ }),+ event,+ this.objectProperties(batch, eventData),+ ),+ );+ }++ private objectProperties(+ batch: WorkspaceEventBatch<ObjectRecordEvent>,+ eventData: ObjectRecordEvent,+ ) {+ return {+ ...eventData.properties,+ recordId: eventData.recordId,+ objectMetadataId: batch.objectMetadata.id,+ };+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-log-ingestion.module.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-log-ingestion.module.tsnew file mode 100644index 00000000000..709ea9bd291--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-log-ingestion.module.ts@@ -0,0 +1,65 @@+import { Logger, Module } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';+import { ClickHouseEventSink } from 'src/engine/core-modules/event-logs/ingest/clickhouse-event.sink';+import { ConsoleEventSink } from 'src/engine/core-modules/event-logs/ingest/console-event.sink';+import { CreateEventLogFromInternalEvent } from 'src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event';+import {+ getAvailableSinkNames,+ KNOWN_SINK_NAMES,+} from 'src/engine/core-modules/event-logs/ingest/event-sink-availability';+import {+ EVENT_SINKS,+ type EventSink,+} from 'src/engine/core-modules/event-logs/ingest/event-sink';+import { WorkspaceEventSinkService } from 'src/engine/core-modules/event-logs/ingest/workspace-event-sink.service';+import { EventLogLiveModule } from 'src/engine/core-modules/event-logs/live/event-log-live.module';+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++const eventSinksProvider = {+ provide: EVENT_SINKS,+ useFactory: (+ twentyConfigService: TwentyConfigService,+ clickHouseEventSink: ClickHouseEventSink,+ consoleEventSink: ConsoleEventSink,+ ): EventSink[] => {+ const sinkByName: Record<string, EventSink> = {+ clickhouse: clickHouseEventSink,+ console: consoleEventSink,+ };++ const configuredSinkNames = twentyConfigService.get('EVENT_SINKS');++ const unknownSinkNames = configuredSinkNames.filter(+ (name) => !KNOWN_SINK_NAMES.includes(name.toLowerCase() as never),+ );++ if (unknownSinkNames.length > 0) {+ new Logger('WorkspaceEventSinks').warn(+ `Ignoring unknown EVENT_SINKS: ${unknownSinkNames.join(', ')}`,+ );+ }++ return getAvailableSinkNames(configuredSinkNames, {+ hasClickhouseUrl: Boolean(twentyConfigService.get('CLICKHOUSE_URL')),+ })+ .map((name) => sinkByName[name.toLowerCase()])+ .filter(isDefined);+ },+ inject: [TwentyConfigService, ClickHouseEventSink, ConsoleEventSink],+};++@Module({+ imports: [ClickHouseModule, EventLogLiveModule],+ providers: [+ ClickHouseEventSink,+ ConsoleEventSink,+ eventSinksProvider,+ WorkspaceEventSinkService,+ CreateEventLogFromInternalEvent,+ ],+ exports: [WorkspaceEventSinkService],+})+export class EventLogIngestionModule {}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink-availability.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink-availability.tsnew file mode 100644index 00000000000..d2991ac5b76--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink-availability.ts@@ -0,0 +1,19 @@+export const KNOWN_SINK_NAMES = ['clickhouse', 'console'] as const;++export const getAvailableSinkNames = (+ configuredSinkNames: string[],+ { hasClickhouseUrl }: { hasClickhouseUrl: boolean },+): string[] =>+ configuredSinkNames.filter((name) => {+ const lowerCasedName = name.toLowerCase();++ if (lowerCasedName === 'clickhouse') {+ return hasClickhouseUrl;+ }++ if (lowerCasedName === 'console') {+ return true;+ }++ return false;+ });diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink.tsnew file mode 100644index 00000000000..27874c4931a--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/event-sink.ts@@ -0,0 +1,7 @@+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++export type EventSink = {+ write(events: WorkspaceEventEnvelope[]): Promise<void>;+};++export const EVENT_SINKS = Symbol('EVENT_SINKS');diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/ingest/workspace-event-sink.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/workspace-event-sink.service.tsnew file mode 100644index 00000000000..b28f3a98740--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/ingest/workspace-event-sink.service.ts@@ -0,0 +1,30 @@+import { Inject, Injectable } from '@nestjs/common';++import {+ EVENT_SINKS,+ type EventSink,+} from 'src/engine/core-modules/event-logs/ingest/event-sink';+import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++@Injectable()+export class WorkspaceEventSinkService {+ constructor(+ @Inject(EVENT_SINKS)+ private readonly sinks: EventSink[],+ private readonly workspaceEventLiveService: EventLogLiveService,+ ) {}++ isEnabled(): boolean {+ return this.sinks.length > 0;+ }++ async ingest(events: WorkspaceEventEnvelope[]): Promise<void> {+ await this.persist(events);+ await this.workspaceEventLiveService.publishWatched(events);+ }++ private async persist(events: WorkspaceEventEnvelope[]): Promise<void> {+ await Promise.all(this.sinks.map((sink) => sink.write(events)));+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live-ttl.constant.ts b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live-ttl.constant.tsnew file mode 100644index 00000000000..9c7d0f9a285--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live-ttl.constant.ts@@ -0,0 +1 @@+export const EVENT_LOG_LIVE_TTL_MS = 60 * 1_000;diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.module.ts b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.module.tsnew file mode 100644index 00000000000..ecfd72441d8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.module.ts@@ -0,0 +1,12 @@+import { Module } from '@nestjs/common';++import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-storage.module';+import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';+import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';++@Module({+ imports: [CacheStorageModule, SubscriptionsModule],+ providers: [EventLogLiveService],+ exports: [EventLogLiveService],+})+export class EventLogLiveModule {}diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.service.tsnew file mode 100644index 00000000000..52bfd0dd873--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/live/event-log-live.service.ts@@ -0,0 +1,93 @@+import { Injectable, Logger } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';+import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';+import { EVENT_LOG_LIVE_TTL_MS } from 'src/engine/core-modules/event-logs/live/event-log-live-ttl.constant';+import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';+import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';++type WatchedGroup = {+ workspaceId: string;+ table: string;+ rows: Record<string, unknown>[];+};++@Injectable()+export class EventLogLiveService {+ private readonly logger = new Logger(EventLogLiveService.name);++ constructor(+ @InjectCacheStorage(CacheStorageNamespace.EngineSubscriptions)+ private readonly cacheStorageService: CacheStorageService,+ private readonly subscriptionService: SubscriptionService,+ ) {}++ private getPresenceKey(workspaceId: string, key: string): string {+ return `workspaceEventLive:${workspaceId}:${key}`;+ }++ async markWatched(workspaceId: string, key: string): Promise<void> {+ await this.cacheStorageService.set<boolean>(+ this.getPresenceKey(workspaceId, key),+ true,+ EVENT_LOG_LIVE_TTL_MS,+ );+ }++ async isWatched(workspaceId: string, key: string): Promise<boolean> {+ const value = await this.cacheStorageService.get<boolean>(+ this.getPresenceKey(workspaceId, key),+ );++ return isDefined(value);+ }++ async publishWatched(events: WorkspaceEventEnvelope[]): Promise<void> {+ const groups = new Map<string, WatchedGroup>();++ for (const event of events) {+ const workspaceId = event.row.workspaceId;++ if (!isDefined(workspaceId)) {+ continue;+ }++ const key = `${workspaceId}:${event.table}`;+ const group = groups.get(key) ?? {+ workspaceId,+ table: event.table,+ rows: [],+ };++ group.rows.push(event.row);+ groups.set(key, group);+ }++ const results = await Promise.allSettled(+ [...groups.values()].map(async ({ workspaceId, table, rows }) => {+ if (!(await this.isWatched(workspaceId, table))) {+ return;+ }++ await this.subscriptionService.publish({+ channel: SubscriptionChannel.WORKSPACE_EVENTS_CHANNEL,+ workspaceId,+ payload: { table, rows },+ });+ }),+ );++ for (const result of results) {+ if (result.status === 'rejected') {+ this.logger.error(+ 'Failed to publish live workspace events',+ result.reason,+ );+ }+ }+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-entry.interface.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/application-log-entry.interface.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application-logs/interfaces/application-log-entry.interface.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/application-log-entry.interface.tsdiff --git a/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/build-application-log-envelopes.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/build-application-log-envelopes.tsnew file mode 100644index 00000000000..bac7678f77d--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/build-application-log-envelopes.ts@@ -0,0 +1,20 @@+import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';+import { type ApplicationLogEntry } from 'src/engine/core-modules/event-logs/producers/application-log/application-log-entry.interface';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++export const buildApplicationLogEnvelopes = (+ entries: ApplicationLogEntry[],+): WorkspaceEventEnvelope[] =>+ entries.map((entry) => ({+ table: 'applicationLog',+ row: {+ timestamp: formatDateTimeForClickHouse(entry.timestamp),+ workspaceId: entry.workspaceId,+ applicationId: entry.applicationId,+ logicFunctionId: entry.logicFunctionId,+ logicFunctionName: entry.logicFunctionName,+ executionId: entry.executionId,+ level: entry.level,+ message: entry.message,+ },+ }));diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/utils/parse-application-log-lines.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines.spec.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application-logs/utils/parse-application-log-lines.spec.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines.spec.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application-logs/utils/parse-application-log-lines.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines.tssimilarity index 74%rename from packages/twenty-server/src/engine/core-modules/application-logs/utils/parse-application-log-lines.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines.tsindex b00f5e45c45..83db785a42a 100644--- a/packages/twenty-server/src/engine/core-modules/application-logs/utils/parse-application-log-lines.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines.ts@@ -1,5 +1,5 @@-import { type ParsedLogLine } from 'src/engine/core-modules/application-logs/types/parsed-log-line.type';-import { stripAnsiEscapes } from 'src/engine/core-modules/application-logs/utils/strip-ansi-escapes.util';+import { type ParsedLogLine } from 'src/engine/core-modules/event-logs/producers/application-log/parsed-log-line.type';+import { stripAnsiEscapes } from 'src/engine/core-modules/event-logs/producers/application-log/strip-ansi-escapes.util';// Matches: 2024-01-01T00:00:00.000Z INFO some messageconst LOG_LINE_REGEX =diff --git a/packages/twenty-server/src/engine/core-modules/application-logs/types/parsed-log-line.type.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parsed-log-line.type.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application-logs/types/parsed-log-line.type.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/parsed-log-line.type.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application-logs/utils/strip-ansi-escapes.util.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/strip-ansi-escapes.util.spec.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application-logs/utils/strip-ansi-escapes.util.spec.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/strip-ansi-escapes.util.spec.tsdiff --git a/packages/twenty-server/src/engine/core-modules/application-logs/utils/strip-ansi-escapes.util.ts b/packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/strip-ansi-escapes.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/core-modules/application-logs/utils/strip-ansi-escapes.util.tsrename to packages/twenty-server/src/engine/core-modules/event-logs/producers/application-log/strip-ansi-escapes.util.tsdiff --git a/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.spec.tsnew file mode 100644index 00000000000..ab500e66e47--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.spec.ts@@ -0,0 +1,104 @@+import { EventLogTable } from 'twenty-shared/types';++import {+ EVENT_LOG_TYPES,+ getClickHouseTableName,+} from 'src/engine/core-modules/event-logs/registry/event-log-registry';+import { normalizeEventLogRecords } from 'src/engine/core-modules/event-logs/utils/normalize-event-log-records';++describe('event-log registry', () => {+ it('has a complete definition for every EventLogTable', () => {+ for (const table of Object.values(EventLogTable)) {+ const definition = EVENT_LOG_TYPES[table];++ expect(definition).toBeDefined();+ expect(definition.clickHouseTable).toBeTruthy();+ expect(definition.eventFieldName).toBeTruthy();+ }+ });++ it('exposes the ClickHouse table name', () => {+ expect(getClickHouseTableName(EventLogTable.WORKSPACE_EVENT)).toBe(+ 'workspaceEvent',+ );+ expect(getClickHouseTableName(EventLogTable.APPLICATION_LOG)).toBe(+ 'applicationLog',+ );+ });++ it('gates every table except application logs behind an entitlement', () => {+ expect(+ EVENT_LOG_TYPES[EventLogTable.APPLICATION_LOG].requiresEntitlement,+ ).toBeNull();+ expect(+ EVENT_LOG_TYPES[EventLogTable.WORKSPACE_EVENT].requiresEntitlement,+ ).not.toBeNull();+ expect(+ EVENT_LOG_TYPES[EventLogTable.USAGE_EVENT].requiresEntitlement,+ ).not.toBeNull();+ });++ describe('normalize', () => {+ const timestamp = '2026-01-01 00:00:00.000';++ it('maps a workspace event row', () => {+ const record = EVENT_LOG_TYPES[EventLogTable.WORKSPACE_EVENT].normalize({+ event: 'user.signup',+ timestamp,+ userId: 'user-1',+ properties: { a: 1 },+ });++ expect(record.event).toBe('user.signup');+ expect(record.userId).toBe('user-1');+ expect(record.properties).toEqual({ a: 1 });+ });++ it('parses the ClickHouse timestamp as UTC, not server-local time', () => {+ const [record] = normalizeEventLogRecords(+ [{ event: 'user.signup', timestamp }],+ EventLogTable.WORKSPACE_EVENT,+ );++ expect(record.timestamp.toISOString()).toBe('2026-01-01T00:00:00.000Z');+ });++ it('maps a pageview row from the name column', () => {+ const record = EVENT_LOG_TYPES[EventLogTable.PAGEVIEW].normalize({+ name: '/settings',+ timestamp,+ });++ expect(record.event).toBe('/settings');+ });++ it('maps a usage event row (resourceType, userWorkspaceId, folded metadata)', () => {+ const record = EVENT_LOG_TYPES[EventLogTable.USAGE_EVENT].normalize({+ resourceType: 'WORKFLOW_NODE_RUN',+ userWorkspaceId: 'uw-1',+ timestamp,+ quantity: 3,+ metadata: { extra: true },+ });++ expect(record.event).toBe('WORKFLOW_NODE_RUN');+ expect(record.userId).toBe('uw-1');+ expect(record.properties).toMatchObject({ quantity: 3, extra: true });+ });++ it('maps an application log row (logicFunctionName, level, message)', () => {+ const record = EVENT_LOG_TYPES[EventLogTable.APPLICATION_LOG].normalize({+ logicFunctionName: 'myFn',+ timestamp,+ level: 'INFO',+ message: 'hello',+ });++ expect(record.event).toBe('myFn');+ expect(record.properties).toMatchObject({+ level: 'INFO',+ message: 'hello',+ });+ });+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.ts b/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.tsnew file mode 100644index 00000000000..f5ab6ffa0a7--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/registry/event-log-registry.ts@@ -0,0 +1,109 @@+/* @license Enterprise */++import { EventLogTable } from 'twenty-shared/types';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { type EventLogRecord } from 'src/engine/core-modules/event-logs/dtos/event-log-result.dto';+import {+ type ApplicationLogRow,+ type ObjectEventRow,+ type PageviewRow,+ type UsageEventRow,+} from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';++type StoredRow<TRow> = Partial<Omit<TRow, 'type' | 'version'>> & {+ timestamp: string;+};++type StoredEventRow = StoredRow<ObjectEventRow & Pick<PageviewRow, 'name'>>;++export type EventLogTypeDefinition = {+ clickHouseTable: string;+ // null = free on every plan; otherwise the required billing entitlement+ requiresEntitlement: BillingEntitlementKey | null;+ eventFieldName: string;+ // The shared dispatcher stamps `timestamp`; each type maps only its own fields.+ normalize: (+ row: Record<string, unknown>,+ ) => Omit<EventLogRecord, 'timestamp'>;+};++const normalizeGenericEvent =+ (eventFieldName: 'event' | 'name') =>+ (row: Record<string, unknown>): Omit<EventLogRecord, 'timestamp'> => {+ const record = row as StoredEventRow;++ return {+ event: record[eventFieldName] ?? '',+ userId: record.userId ?? undefined,+ properties: record.properties,+ recordId: record.recordId,+ objectMetadataId: record.objectMetadataId,+ isCustom: record.isCustom,+ };+ };++export const EVENT_LOG_TYPES: Record<EventLogTable, EventLogTypeDefinition> = {+ [EventLogTable.WORKSPACE_EVENT]: {+ clickHouseTable: 'workspaceEvent',+ requiresEntitlement: BillingEntitlementKey.AUDIT_LOGS,+ eventFieldName: 'event',+ normalize: normalizeGenericEvent('event'),+ },+ [EventLogTable.PAGEVIEW]: {+ clickHouseTable: 'pageview',+ requiresEntitlement: BillingEntitlementKey.AUDIT_LOGS,+ eventFieldName: 'name',+ normalize: normalizeGenericEvent('name'),+ },+ [EventLogTable.OBJECT_EVENT]: {+ clickHouseTable: 'objectEvent',+ requiresEntitlement: BillingEntitlementKey.AUDIT_LOGS,+ eventFieldName: 'event',+ normalize: normalizeGenericEvent('event'),+ },+ [EventLogTable.USAGE_EVENT]: {+ clickHouseTable: 'usageEvent',+ requiresEntitlement: BillingEntitlementKey.AUDIT_LOGS,+ eventFieldName: 'resourceType',+ normalize: (row) => {+ const record = row as StoredRow<UsageEventRow>;++ return {+ event: record.resourceType ?? '',+ userId: record.userWorkspaceId,+ properties: {+ ...(record.metadata ?? {}),+ operationType: record.operationType,+ quantity: record.quantity,+ unit: record.unit,+ creditsUsedMicro: record.creditsUsedMicro,+ resourceId: record.resourceId,+ resourceContext: record.resourceContext,+ },+ };+ },+ },+ [EventLogTable.APPLICATION_LOG]: {+ clickHouseTable: 'applicationLog',+ requiresEntitlement: null,+ eventFieldName: 'logicFunctionName',+ normalize: (row) => {+ const record = row as StoredRow<ApplicationLogRow>;++ return {+ event: record.logicFunctionName ?? '',+ properties: {+ level: record.level,+ message: record.message,+ executionId: record.executionId,+ logicFunctionId: record.logicFunctionId,+ applicationId: record.applicationId,+ },+ };+ },+ },+};++export const getClickHouseTableName = (table: EventLogTable): string =>+ EVENT_LOG_TYPES[table].clickHouseTable;diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/types/workspace-event-envelope.type.ts b/packages/twenty-server/src/engine/core-modules/event-logs/types/workspace-event-envelope.type.tsnew file mode 100644index 00000000000..bf8e334cbc1--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/types/workspace-event-envelope.type.ts@@ -0,0 +1,62 @@+export type EventContextFields = {+ workspaceId?: string | null;+ userId?: string | null;+};++type AnalyticsEventRow = EventContextFields & {+ type: 'track';+ event: string;+ properties: Record<string, unknown>;+ timestamp: string;+ version: string;+};++export type PageviewRow = EventContextFields & {+ type: 'page';+ name: string;+ properties: Record<string, unknown>;+ timestamp: string;+ version: string;+};++export type ObjectEventRow = AnalyticsEventRow & {+ recordId: string;+ objectMetadataId: string;+ isCustom?: boolean;+};++export type UsageEventRow = {+ timestamp: string;+ workspaceId: string;+ periodStart?: string;+ userWorkspaceId: string;+ resourceType: string;+ operationType: string;+ quantity: number;+ unit: string;+ creditsUsedMicro: number;+ resourceId: string;+ resourceContext: string;+ metadata: Record<string, unknown>;+};++export type ApplicationLogRow = {+ timestamp: string;+ workspaceId: string;+ applicationId: string;+ logicFunctionId: string;+ logicFunctionName: string;+ executionId: string;+ level: string;+ message: string;+};++// The `table` literals must match the registry's clickHouseTable values (EVENT_LOG_TYPES).+export type WorkspaceEventEnvelope =+ | { table: 'workspaceEvent'; row: AnalyticsEventRow }+ | { table: 'pageview'; row: PageviewRow }+ | { table: 'objectEvent'; row: ObjectEventRow }+ | { table: 'usageEvent'; row: UsageEventRow }+ | { table: 'applicationLog'; row: ApplicationLogRow };++export type WorkspaceEventTable = WorkspaceEventEnvelope['table'];diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/utils/normalize-event-log-records.ts b/packages/twenty-server/src/engine/core-modules/event-logs/utils/normalize-event-log-records.tsnew file mode 100644index 00000000000..46800953a22--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/utils/normalize-event-log-records.ts@@ -0,0 +1,14 @@+import { EventLogTable } from 'twenty-shared/types';++import { parseClickHouseDateTime } from 'src/database/clickHouse/clickHouse.util';+import { type EventLogRecord } from 'src/engine/core-modules/event-logs/dtos/event-log-result.dto';+import { EVENT_LOG_TYPES } from 'src/engine/core-modules/event-logs/registry/event-log-registry';++export const normalizeEventLogRecords = (+ records: Record<string, unknown>[],+ table: EventLogTable,+): EventLogRecord[] =>+ records.map((row) => ({+ ...EVENT_LOG_TYPES[table].normalize(row),+ timestamp: parseClickHouseDateTime(row.timestamp as string),+ }));diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/__tests__/impersonation.service.spec.ts b/packages/twenty-server/src/engine/core-modules/impersonation/__tests__/impersonation.service.spec.tsindex 2be99b39265..5eecad9566f 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/__tests__/impersonation.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/__tests__/impersonation.service.spec.ts@@ -3,7 +3,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import {AuthException,AuthExceptionCode,@@ -70,7 +70,7 @@ describe('ImpersonationService', () => {},},{- provide: AuditService,+ provide: EventLogEmitterService,useValue: {createContext: jest.fn().mockReturnValue({insertWorkspaceEvent: jest.fn(),diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.module.ts b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.module.tsindex 2acb4d902e4..f093e44c69d 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.module.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.module.ts@@ -1,7 +1,7 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { AuthModule } from 'src/engine/core-modules/auth/auth.module';import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';import { ImpersonationResolver } from 'src/engine/core-modules/impersonation/impersonation.resolver';@@ -21,7 +21,7 @@ import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.PermissionsModule,RoleModule,UserRoleModule,- AuditModule,+ EventLogEmitterModule,TypeOrmModule.forFeature([UserWorkspaceEntity,WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts b/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.tsindex 91f9936b94e..bcf3a1d492e 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/services/impersonation.service.ts@@ -7,8 +7,8 @@ import { Repository } from 'typeorm';import { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { MONITORING_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/monitoring/monitoring';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { IMPERSONATION_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/impersonation/impersonation';import {AuthException,AuthExceptionCode,@@ -24,7 +24,7 @@ import { PermissionsService } from 'src/engine/metadata-modules/permissions/perm@Injectable()export class ImpersonationService {constructor(- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,private readonly workspaceDomainsService: WorkspaceDomainsService,private readonly loginTokenService: LoginTokenService,private readonly twentyConfigService: TwentyConfigService,@@ -163,19 +163,21 @@ export class ImpersonationService {toImpersonateUserWorkspace: UserWorkspaceEntity,impersonationLevel: 'server' | 'workspace',) {- const auditService = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: impersonatorUserWorkspace.workspace.id,userId: impersonatorUserWorkspace.userId,});- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `${impersonationLevel}.impersonation.attempt`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: impersonationLevel,+ action: 'attempt',message: `Impersonation attempt: targetUserId=${toImpersonateUserWorkspace.user.id}, workspaceId=${toImpersonateUserWorkspace.workspace.id}, impersonatorUserId=${impersonatorUserWorkspace.user.id}`,});try {- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `${impersonationLevel}.impersonation.login_token_attempt`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: impersonationLevel,+ action: 'login_token_attempt',message: `Impersonation token generation attempt for user ${toImpersonateUserWorkspace.user.id}`,});@@ -188,8 +190,9 @@ export class ImpersonationService {},);- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `${impersonationLevel}.impersonation.login_token_generated`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: impersonationLevel,+ action: 'login_token_generated',message: `Impersonation token generated successfully for user ${toImpersonateUserWorkspace.user.id}`,});@@ -203,8 +206,9 @@ export class ImpersonationService {loginToken,};} catch {- await auditService.insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `${impersonationLevel}.impersonation.login_token_failed`,+ void eventLogContext.insertWorkspaceEvent(IMPERSONATION_EVENT, {+ level: impersonationLevel,+ action: 'login_token_failed',message: `Impersonation token generation failed for targetUserId=${toImpersonateUserWorkspace.user.id}`,});throw new AuthException(diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module.tsindex 2697f7049f3..68fac6e03ee 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module.ts@@ -2,7 +2,8 @@ import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';+import { EventLogLiveModule } from 'src/engine/core-modules/event-logs/live/event-log-live.module';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';@@ -15,7 +16,8 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache@Module({imports: [ThrottlerModule,- AuditModule,+ EventLogEmitterModule,+ EventLogLiveModule,TokenModule,SecretEncryptionModule,SubscriptionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.tsindex db019b68c5f..7afd3a4dcd7 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service.ts@@ -17,13 +17,13 @@ import {type LogicFunctionTranspileResult,} from 'src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface';-import { ApplicationLogsService } from 'src/engine/core-modules/application-logs/application-logs.service';-import { parseApplicationLogLines } from 'src/engine/core-modules/application-logs/utils/parse-application-log-lines';+import { buildApplicationLogEnvelopes } from 'src/engine/core-modules/event-logs/producers/application-log/build-application-log-envelopes';+import { parseApplicationLogLines } from 'src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines';import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';import type { FlatApplicationVariable } from 'src/engine/metadata-modules/flat-application-variable/types/flat-application-variable.type';import { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { LOGIC_FUNCTION_EXECUTED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/logic-function/logic-function-executed';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { LOGIC_FUNCTION_EXECUTED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/logic-function/logic-function-executed';import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';import { BillingUsageService } from 'src/engine/core-modules/billing/services/billing-usage.service';import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';@@ -47,6 +47,7 @@ import {import { FlatLogicFunction } from 'src/engine/metadata-modules/logic-function/types/flat-logic-function.type';import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';+import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';import { cleanServerUrl } from 'src/utils/clean-server-url';@@ -78,8 +79,8 @@ export class LogicFunctionExecutorService {private readonly applicationTokenService: ApplicationTokenService,private readonly secretEncryptionService: SecretEncryptionService,private readonly subscriptionService: SubscriptionService,- private readonly auditService: AuditService,- private readonly applicationLogsService: ApplicationLogsService,+ private readonly eventLogLiveService: EventLogLiveService,+ private readonly eventLogEmitterService: EventLogEmitterService,private readonly workspaceEventEmitter: WorkspaceEventEmitter,private readonly billingService: BillingService,private readonly billingUsageService: BillingUsageService,@@ -333,22 +334,11 @@ export class LogicFunctionExecutorService {[DEFAULT_APP_ACCESS_TOKEN_NAME]: applicationAccessToken.token,[DEFAULT_API_KEY_NAME]: applicationAccessToken.token,APPLICATION_ID: flatApplication.id,- // Server variables first, workspace variables override. Workspace-level- // values let a specific tenant customize a server default....serverVariables,...workspaceVariables,};}- // Resolves encrypted server-level variables (ApplicationRegistrationVariable)- // for the application's registration. Returns an empty object when the- // application isn't linked to a registration (legacy LOCAL apps).- //- // Runs on every logic function execution — the query is indexed on- // applicationRegistrationId and filters unfilled rows server-side. Most- // apps have 0-3 server variables so the round-trip is cheap, but if this- // becomes a hot path, move to a WorkspaceCacheProvider mirroring- // WorkspaceApplicationVariableMapCacheService.private async buildServerVariableEnvMap(applicationRegistrationId: string | null,): Promise<Record<string, string>> {@@ -366,16 +356,6 @@ export class LogicFunctionExecutorService {const envMap: Record<string, string> = {};- // ApplicationRegistrationVariable.encryptedValue is always written- // encrypted (ApplicationRegistrationVariableService.createVariable and- // .updateVariable call encrypt unconditionally), independent of- // `isSecret`. `isSecret` is display metadata — the storage contract is- // not conditional, so decryption isn't either.- //- // Registration variables are server-level config — any installed- // application across any workspace must be able to read them — so they- // use the instance-scoped versioned envelope (no workspaceId in the HKDF- // info).for (const variable of serverVariables) {if (variable.encryptedValue !== '') {envMap[variable.key] = this.secretEncryptionService.decryptVersioned(@@ -387,6 +367,46 @@ export class LogicFunctionExecutorService {return envMap;}+ private async publishLogicFunctionLogsToCli({+ result,+ flatApplication,+ flatLogicFunction,+ workspaceId,+ }: {+ result: LogicFunctionExecuteResult;+ workspaceId: string;+ flatLogicFunction: FlatLogicFunction;+ flatApplication: FlatApplication;+ }): Promise<void> {+ try {+ const isWatched = await this.eventLogLiveService.isWatched(+ workspaceId,+ SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ );++ if (!isWatched) {+ return;+ }++ await this.subscriptionService.publish({+ channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ workspaceId,+ payload: {+ logicFunctionLogs: {+ logs: result.logs,+ id: flatLogicFunction.id,+ name: flatLogicFunction.name,+ universalIdentifier: flatLogicFunction.universalIdentifier,+ applicationId: flatApplication.id,+ applicationUniversalIdentifier: flatApplication.universalIdentifier,+ },+ },+ });+ } catch (error) {+ this.logger.error('Failed to publish logic function logs', error);+ }+ }+private async handleExecutionResult({result,flatApplication,@@ -410,26 +430,22 @@ export class LogicFunctionExecutorService {executionId,}));- void this.applicationLogsService.writeLogs(logEntries).catch((error) => {- this.logger.error('Failed to persist application logs', error);- });+ if (this.eventLogEmitterService.isEnabled()) {+ void this.eventLogEmitterService+ .dispatch(buildApplicationLogEnvelopes(logEntries))+ .catch((error) => {+ this.logger.error('Failed to record application logs', error);+ });+ }- await this.subscriptionService.publish({- channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ void this.publishLogicFunctionLogsToCli({+ result,+ flatApplication,+ flatLogicFunction,workspaceId,- payload: {- logicFunctionLogs: {- logs: result.logs,- id: flatLogicFunction.id,- name: flatLogicFunction.name,- universalIdentifier: flatLogicFunction.universalIdentifier,- applicationId: flatApplication.id,- applicationUniversalIdentifier: flatApplication.universalIdentifier,- },- },});- void this.auditService+ void this.eventLogEmitterService.createContext({workspaceId,})diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.tsindex bf64d625b12..8b25db38a22 100644--- a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts+++ b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts@@ -3,7 +3,6 @@ import { ModuleRef } from '@nestjs/core';import { TypeOrmModule } from '@nestjs/typeorm';import { TypeORMModule } from 'src/database/typeorm/typeorm.module';-import { AuditJobModule } from 'src/engine/core-modules/audit/jobs/audit-job.module';import { AuthModule } from 'src/engine/core-modules/auth/auth.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';@@ -15,6 +14,7 @@ import { EmailSenderJob } from 'src/engine/core-modules/email/email-sender.job';import { EmailModule } from 'src/engine/core-modules/email/email.module';import { EmailingDomainModule } from 'src/engine/core-modules/emailing-domain/emailing-domain.module';import { EnterpriseModule } from 'src/engine/core-modules/enterprise/enterprise.module';+import { EventLogIngestionModule } from 'src/engine/core-modules/event-logs/ingest/event-log-ingestion.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { GenerateSdkClientJob } from 'src/engine/core-modules/sdk-client/jobs/generate-sdk-client.job';import { SdkClientModule } from 'src/engine/core-modules/sdk-client/sdk-client.module';@@ -75,7 +75,7 @@ import { WorkflowModule } from 'src/modules/workflow/workflow.module';SdkClientModule,WorkspaceCleanerModule,SubscriptionsModule,- AuditJobModule,+ EventLogIngestionModule,AiAgentMonitorModule,AiChatModule,LogicFunctionModule,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 cc1eb98480a..219e7f5ce49 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@@ -17,7 +17,6 @@ import { type AwsRegion } from 'src/engine/core-modules/twenty-config/interfacesimport { NodeEnvironment } from 'src/engine/core-modules/twenty-config/interfaces/node-environment.interface';import { SupportDriver } from 'src/engine/core-modules/twenty-config/interfaces/support.interface';-import { ApplicationLogDriver } from 'src/engine/core-modules/application-logs/interfaces/application-log-driver.enum';import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';import { CodeInterpreterDriverType } from 'src/engine/core-modules/code-interpreter/code-interpreter.interface';import { EmailDriver } from 'src/engine/core-modules/email/enums/email-driver.enum';@@ -567,15 +566,6 @@ export class ConfigVariables {? LogicFunctionDriverType.LOCAL: LogicFunctionDriverType.DISABLED;- @ConfigVariablesMetadata({- group: ConfigVariablesGroup.LOGIC_FUNCTION_CONFIG,- description:- 'Configure whether console logs from logic functions are displayed in the terminal',- type: ConfigVariableType.BOOLEAN,- })- @IsOptional()- LOGIC_FUNCTION_LOGS_ENABLED: false;-@ConfigVariablesMetadata({group: ConfigVariablesGroup.LOGIC_FUNCTION_CONFIG,description: 'Throttle limit for logic function execution',@@ -946,14 +936,12 @@ export class ConfigVariables {@ConfigVariablesMetadata({group: ConfigVariablesGroup.LOGGING,description:- 'Driver used for application logs (Disabled, Console, or ClickHouse)',- type: ConfigVariableType.ENUM,- options: Object.values(ApplicationLogDriver),+ 'Ordered list of sinks the unified event pipeline writes to (e.g. clickhouse). The first is the read store.',+ type: ConfigVariableType.ARRAY,isEnvOnly: true,})@IsOptional()- @CastToUpperSnakeCase()- APPLICATION_LOG_DRIVER: ApplicationLogDriver = ApplicationLogDriver.DISABLED;+ EVENT_SINKS: string[] = ['clickhouse'];@ConfigVariablesMetadata({group: ConfigVariablesGroup.SUPPORT_CHAT_CONFIG,diff --git a/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.spec.ts b/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.spec.tsnew file mode 100644index 00000000000..92185188b71--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.spec.ts@@ -0,0 +1,79 @@+import { Logger } from '@nestjs/common';++import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';+import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';+import { UsageEventListener } from 'src/engine/core-modules/usage/listeners/usage-event.listener';+import { type UsageEvent } from 'src/engine/core-modules/usage/types/usage-event.type';+import { type CustomWorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/custom-workspace-batch-event.type';++const USAGE_EVENT: UsageEvent = {+ resourceType: UsageResourceType.WORKFLOW,+ operationType: UsageOperationType.WORKFLOW_EXECUTION,+ quantity: 1,+ unit: UsageUnit.INVOCATION,+ creditsUsedMicro: 1,+};++const buildBatch = (+ overrides: Partial<CustomWorkspaceEventBatch<UsageEvent>> = {},+): CustomWorkspaceEventBatch<UsageEvent> =>+ ({+ workspaceId: 'ws-1',+ events: [USAGE_EVENT],+ ...overrides,+ }) as CustomWorkspaceEventBatch<UsageEvent>;++describe('UsageEventListener', () => {+ let listener: UsageEventListener;+ let dispatch: jest.Mock;+ let isEnabled: jest.Mock;++ beforeEach(() => {+ jest.spyOn(Logger.prototype, 'error').mockImplementation();+ dispatch = jest.fn().mockResolvedValue(undefined);+ isEnabled = jest.fn().mockReturnValue(true);++ listener = new UsageEventListener({+ dispatch,+ isEnabled,+ } as unknown as EventLogEmitterService);+ });++ it('dispatchs a usageEvent envelope for each event in the batch', async () => {+ await listener.handleUsageRecordedEvent(buildBatch());++ expect(dispatch).toHaveBeenCalledTimes(1);+ expect(dispatch.mock.calls[0][0]).toEqual([+ expect.objectContaining({+ table: 'usageEvent',+ row: expect.objectContaining({ workspaceId: 'ws-1' }),+ }),+ ]);+ });++ it('skips when the batch has no workspaceId', async () => {+ await listener.handleUsageRecordedEvent(+ buildBatch({ workspaceId: undefined }),+ );++ expect(dispatch).not.toHaveBeenCalled();+ });++ it('skips when no sink is configured', async () => {+ isEnabled.mockReturnValue(false);++ await listener.handleUsageRecordedEvent(buildBatch());++ expect(dispatch).not.toHaveBeenCalled();+ });++ it('swallows dispatch errors (usage analytics is best-effort)', async () => {+ dispatch.mockRejectedValue(new Error('queue down'));++ await expect(+ listener.handleUsageRecordedEvent(buildBatch()),+ ).resolves.toBeUndefined();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.ts b/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.tsindex 1750b03b41a..cf61df84911 100644--- a/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.ts+++ b/packages/twenty-server/src/engine/core-modules/usage/listeners/usage-event.listener.ts@@ -1,30 +1,42 @@/* @license Enterprise */-import { Injectable } from '@nestjs/common';+import { Injectable, Logger } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';import { OnCustomBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-custom-batch-event.decorator';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';import { USAGE_RECORDED } from 'src/engine/core-modules/usage/constants/usage-recorded.constant';-import { UsageEventWriterService } from 'src/engine/core-modules/usage/services/usage-event-writer.service';import { type UsageEvent } from 'src/engine/core-modules/usage/types/usage-event.type';+import { buildUsageEventEnvelopes } from 'src/engine/core-modules/usage/utils/build-usage-event-envelopes';import { CustomWorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/custom-workspace-batch-event.type';@Injectable()export class UsageEventListener {+ private readonly logger = new Logger(UsageEventListener.name);+constructor(- private readonly usageEventWriterService: UsageEventWriterService,+ private readonly eventLogEmitterService: EventLogEmitterService,) {}@OnCustomBatchEvent(USAGE_RECORDED)- handleUsageRecordedEvent(payload: CustomWorkspaceEventBatch<UsageEvent>) {- if (!isDefined(payload.workspaceId)) {+ async handleUsageRecordedEvent(+ payload: CustomWorkspaceEventBatch<UsageEvent>,+ ): Promise<void> {+ if (+ !isDefined(payload.workspaceId) ||+ !this.eventLogEmitterService.isEnabled()+ ) {return;}- this.usageEventWriterService.writeToClickHouse(- payload.workspaceId,- payload.events,- );+ try {+ await this.eventLogEmitterService.dispatch(+ buildUsageEventEnvelopes(payload.workspaceId, payload.events),+ );+ } catch (error) {+ // Usage analytics is best-effort; never fail the emitting flow.+ this.logger.error('Failed to record usage events', error);+ }}}diff --git a/packages/twenty-server/src/engine/core-modules/usage/services/usage-event-writer.service.ts b/packages/twenty-server/src/engine/core-modules/usage/services/usage-event-writer.service.tsdeleted file mode 100644index 83584b7f56c..00000000000--- a/packages/twenty-server/src/engine/core-modules/usage/services/usage-event-writer.service.ts+++ /dev/null@@ -1,47 +0,0 @@-/* @license Enterprise */--import { Injectable, Logger } from '@nestjs/common';--import { ClickHouseService } from 'src/database/clickHouse/clickHouse.service';-import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-import { type UsageEvent } from 'src/engine/core-modules/usage/types/usage-event.type';--@Injectable()-export class UsageEventWriterService {- private readonly logger = new Logger(UsageEventWriterService.name);-- constructor(- private readonly clickHouseService: ClickHouseService,- private readonly twentyConfigService: TwentyConfigService,- ) {}-- writeToClickHouse(workspaceId: string, usageEvents: UsageEvent[]): void {- if (!this.twentyConfigService.get('CLICKHOUSE_URL')) {- return;- }-- const now = formatDateTimeForClickHouse(new Date());-- const rows = usageEvents.map((usageEvent) => ({- timestamp: now,- workspaceId,- periodStart: usageEvent.periodStart- ? formatDateTimeForClickHouse(usageEvent.periodStart)- : undefined,- userWorkspaceId: usageEvent.userWorkspaceId ?? '',- resourceType: usageEvent.resourceType,- operationType: usageEvent.operationType,- quantity: usageEvent.quantity,- unit: usageEvent.unit,- creditsUsedMicro: usageEvent.creditsUsedMicro,- resourceId: usageEvent.resourceId ?? '',- resourceContext: usageEvent.resourceContext ?? '',- metadata: {},- }));-- this.clickHouseService.insert('usageEvent', rows).catch((error) => {- this.logger.error('Failed to write usage events to ClickHouse', error);- });- }-}diff --git a/packages/twenty-server/src/engine/core-modules/usage/usage.module.ts b/packages/twenty-server/src/engine/core-modules/usage/usage.module.tsindex c7c27896d96..7a577c5b2ba 100644--- a/packages/twenty-server/src/engine/core-modules/usage/usage.module.ts+++ b/packages/twenty-server/src/engine/core-modules/usage/usage.module.ts@@ -4,27 +4,23 @@ import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';import { ClickHouseModule } from 'src/database/clickHouse/clickHouse.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';-import { UsageResolver } from 'src/engine/core-modules/usage/usage.resolver';-import { UsageAnalyticsService } from 'src/engine/core-modules/usage/services/usage-analytics.service';-import { UsageEventWriterService } from 'src/engine/core-modules/usage/services/usage-event-writer.service';import { UsageEventListener } from 'src/engine/core-modules/usage/listeners/usage-event.listener';+import { UsageAnalyticsService } from 'src/engine/core-modules/usage/services/usage-analytics.service';+import { UsageResolver } from 'src/engine/core-modules/usage/usage.resolver';+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [ClickHouseModule,+ EventLogEmitterModule,FeatureFlagModule,PermissionsModule,TypeOrmModule.forFeature([UserWorkspaceEntity]),],- providers: [- UsageResolver,- UsageAnalyticsService,- UsageEventWriterService,- UsageEventListener,- ],- exports: [UsageEventWriterService, UsageAnalyticsService],+ providers: [UsageResolver, UsageAnalyticsService, UsageEventListener],+ exports: [UsageAnalyticsService],})export class UsageModule {}diff --git a/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.spec.ts b/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.spec.tsnew file mode 100644index 00000000000..97677bddc39--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.spec.ts@@ -0,0 +1,62 @@+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';+import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';+import { type UsageEvent } from 'src/engine/core-modules/usage/types/usage-event.type';+import { buildUsageEventEnvelopes } from 'src/engine/core-modules/usage/utils/build-usage-event-envelopes';++const usageEvent = (overrides: Partial<UsageEvent> = {}): UsageEvent => ({+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ quantity: 1500,+ unit: UsageUnit.TOKEN,+ creditsUsedMicro: 7500,+ ...overrides,+});++describe('buildUsageEventEnvelopes', () => {+ it('maps each usage event to a usageEvent envelope carrying the workspace + columns', () => {+ const envelopes = buildUsageEventEnvelopes('ws-1', [+ usageEvent({+ userWorkspaceId: 'uw-1',+ resourceId: 'agent-1',+ resourceContext: 'gpt-4o',+ }),+ ]);++ expect(envelopes).toHaveLength(1);+ expect(envelopes[0].table).toBe('usageEvent');+ expect(envelopes[0].row).toMatchObject({+ workspaceId: 'ws-1',+ userWorkspaceId: 'uw-1',+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ quantity: 1500,+ creditsUsedMicro: 7500,+ resourceId: 'agent-1',+ resourceContext: 'gpt-4o',+ });+ });++ it('defaults the optional string columns to empty and omits periodStart when absent', () => {+ const [envelope] = buildUsageEventEnvelopes('ws-1', [usageEvent()]);++ expect(envelope.row).toMatchObject({+ userWorkspaceId: '',+ resourceId: '',+ resourceContext: '',+ });+ expect(+ (envelope.row as { periodStart?: string }).periodStart,+ ).toBeUndefined();+ });++ it('formats periodStart for ClickHouse when present', () => {+ const [envelope] = buildUsageEventEnvelopes('ws-1', [+ usageEvent({ periodStart: new Date('2026-01-01T00:00:00.000Z') }),+ ]);++ expect((envelope.row as { periodStart?: string }).periodStart).toBe(+ '2026-01-01 00:00:00.000',+ );+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.ts b/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.tsnew file mode 100644index 00000000000..b493f9a8b6b--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage/utils/build-usage-event-envelopes.ts@@ -0,0 +1,32 @@+/* @license Enterprise */++import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';+import { type WorkspaceEventEnvelope } from 'src/engine/core-modules/event-logs/types/workspace-event-envelope.type';+import { type UsageEvent } from 'src/engine/core-modules/usage/types/usage-event.type';++export const buildUsageEventEnvelopes = (+ workspaceId: string,+ usageEvents: UsageEvent[],+): WorkspaceEventEnvelope[] => {+ const now = formatDateTimeForClickHouse(new Date());++ return usageEvents.map((usageEvent) => ({+ table: 'usageEvent',+ row: {+ timestamp: now,+ workspaceId,+ periodStart: usageEvent.periodStart+ ? formatDateTimeForClickHouse(usageEvent.periodStart)+ : undefined,+ userWorkspaceId: usageEvent.userWorkspaceId ?? '',+ resourceType: usageEvent.resourceType,+ operationType: usageEvent.operationType,+ quantity: usageEvent.quantity,+ unit: usageEvent.unit,+ creditsUsedMicro: usageEvent.creditsUsedMicro,+ resourceId: usageEvent.resourceId ?? '',+ resourceContext: usageEvent.resourceContext ?? '',+ metadata: {},+ },+ }));+};diff --git a/packages/twenty-server/src/engine/core-modules/user/user.module.ts b/packages/twenty-server/src/engine/core-modules/user/user.module.tsindex a5d33e4f227..293737a96e8 100644--- a/packages/twenty-server/src/engine/core-modules/user/user.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user/user.module.ts@@ -6,7 +6,6 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';import { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';import { EmailVerificationModule } from 'src/engine/core-modules/email-verification/email-verification.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';@@ -48,7 +47,6 @@ import { UserService } from './services/user.service';TypeOrmModule.forFeature([KeyValuePairEntity, UserWorkspaceEntity]),UserVarsModule,UserWorkspaceModule,- AuditModule,UserRoleModule,FeatureFlagModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.tsindex 9e58e342921..b06ddfb685d 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts@@ -7,7 +7,6 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';import { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { PreInstalledAppsModule } from 'src/engine/core-modules/application/pre-installed-apps/pre-installed-apps.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';@@ -56,7 +55,6 @@ import { StandardObjectsPrefillModule } from 'src/engine/workspace-manager/standStandardObjectsPrefillModule,NestjsQueryGraphQLModule.forFeature({imports: [- AuditModule,BillingModule,FileModule,TokenModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.tsindex b3cbaa449df..938da25db05 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { FileModule } from 'src/engine/core-modules/file/file.module';import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module';@@ -30,7 +29,6 @@ import { AgentEntity } from './entities/agent.entity';AiModelsModule,AiAgentRoleModule,ThrottlerModule,- AuditModule,FileModule,ObjectMetadataModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.tsindex 9717b38ef52..4f4e542a855 100644--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts@@ -5,7 +5,7 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogLiveModule } from 'src/engine/core-modules/event-logs/live/event-log-live.module';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';@@ -29,7 +29,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceTypeOrmModule.forFeature([ApplicationEntity, FeatureFlagEntity]),ThrottlerModule,ApplicationModule,- AuditModule,+ EventLogLiveModule,FeatureFlagModule,PermissionsModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.tsindex 96c6cc603be..91228c41004 100644--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts@@ -28,8 +28,11 @@ import { type FlatLogicFunction } from 'src/engine/metadata-modules/logic-functiimport { findFlatLogicFunctionOrThrow } from 'src/engine/metadata-modules/logic-function/utils/find-flat-logic-function-or-throw.util';import { fromFlatLogicFunctionToLogicFunctionDto } from 'src/engine/metadata-modules/logic-function/utils/from-flat-logic-function-to-logic-function-dto.util';import { logicFunctionGraphQLApiExceptionHandler } from 'src/engine/metadata-modules/logic-function/utils/logic-function-graphql-api-exception-handler.utils';+import { APPLICATION_KEEPALIVE_INTERVAL_MS } from 'src/engine/subscriptions/constants/application-keepalive-interval-ms.constant';import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';+import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';+import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard, NoPermissionGuard)@MetadataResolver()@@ -40,6 +43,7 @@ export class LogicFunctionResolver {private readonly logicFunctionFromSourceService: LogicFunctionFromSourceService,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly subscriptionService: SubscriptionService,+ private readonly eventLogLiveService: EventLogLiveService,) {}@Query(() => LogicFunctionDTO)@@ -252,13 +256,31 @@ export class LogicFunctionResolver {},})@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))- logicFunctionLogs(+ async logicFunctionLogs(@Args('input') _: LogicFunctionLogsInput,@AuthWorkspace() workspace: WorkspaceEntity,) {- return this.subscriptionService.subscribe({+ // Register CLI presence (refreshed by the heartbeat) so the executor only publishes when watched.+ await this.eventLogLiveService.markWatched(+ workspace.id,+ SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ );++ const iterator = await this.subscriptionService.subscribe({channel: SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,workspaceId: workspace.id,});++ return wrapAsyncIteratorWithLifecycle(iterator, {+ onHeartbeat: async () => {+ await this.eventLogLiveService.markWatched(+ workspace.id,+ SubscriptionChannel.LOGIC_FUNCTION_LOGS_CHANNEL,+ );++ return true;+ },+ heartbeatIntervalMs: APPLICATION_KEEPALIVE_INTERVAL_MS,+ });}}diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook.job.tsindex c6033407469..eaa78780db3 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook.job.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook.job.ts@@ -2,8 +2,8 @@ import crypto from 'crypto';import { ensureAbsoluteUrl } from 'twenty-shared/utils';-import { AuditService } from 'src/engine/core-modules/audit/services/audit.service';-import { WEBHOOK_RESPONSE_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/webhook/webhook-response';+import { EventLogEmitterService } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.service';+import { WEBHOOK_RESPONSE_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/webhook/webhook-response';import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';@@ -15,7 +15,7 @@ import { type WebhookJobData } from 'src/engine/metadata-modules/webhook/types/w@Processor(MessageQueue.webhookQueue)export class CallWebhookJob {constructor(- private readonly auditService: AuditService,+ private readonly eventLogEmitterService: EventLogEmitterService,private readonly metricsService: MetricsService,private readonly secureHttpClientService: SecureHttpClientService,) {}@@ -46,7 +46,7 @@ export class CallWebhookJob {webhookId: data.webhookId,eventName: data.eventName,};- const auditService = this.auditService.createContext({+ const eventLogContext = this.eventLogEmitterService.createContext({workspaceId: data.workspaceId,});@@ -89,7 +89,7 @@ export class CallWebhookJob {const success = response.status >= 200 && response.status < 300;- void auditService.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {+ void eventLogContext.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {status: response.status,success,...commonPayload,@@ -105,7 +105,7 @@ export class CallWebhookJob {err.message.includes('internal IP address') &&err.message.includes('is not allowed');- void auditService.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {+ void eventLogContext.insertWorkspaceEvent(WEBHOOK_RESPONSE_EVENT, {success: false,...commonPayload,...(err.response && { status: err.response.status }),diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.tsindex fc7a98d8d4c..4a148d12289 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/webhook-job.module.ts@@ -1,6 +1,6 @@import { Module } from '@nestjs/common';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';+import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-client/secure-http-client.module';import { FlatWebhookModule } from 'src/engine/metadata-modules/flat-webhook/flat-webhook.module';@@ -11,7 +11,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache@Module({imports: [- AuditModule,+ EventLogEmitterModule,FlatWebhookModule,MetricsModule,SecureHttpClientModule,diff --git a/packages/twenty-server/src/engine/subscriptions/enums/subscription-channel.enum.ts b/packages/twenty-server/src/engine/subscriptions/enums/subscription-channel.enum.tsindex 856de8f9068..0a92806f93e 100644--- a/packages/twenty-server/src/engine/subscriptions/enums/subscription-channel.enum.ts+++ b/packages/twenty-server/src/engine/subscriptions/enums/subscription-channel.enum.ts@@ -2,4 +2,5 @@ export enum SubscriptionChannel {LOGIC_FUNCTION_LOGS_CHANNEL = 'LOGIC_FUNCTION_LOGS_CHANNEL',EVENT_STREAM_CHANNEL = 'EVENT_STREAM_CHANNEL',AGENT_CHAT_CHANNEL = 'AGENT_CHAT_CHANNEL',+ WORKSPACE_EVENTS_CHANNEL = 'WORKSPACE_EVENTS_CHANNEL',}diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.tsindex de28d9efeca..629cc5fe862 100644--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts@@ -1,7 +1,6 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -34,7 +33,6 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-oRoleEntity,RoleTargetEntity,]),- AuditModule,ContactCreationManagerModule,WorkspaceDataSourceModule,ObjectMetadataRepositoryModule.forFeature([diff --git a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.tsindex e7774d4b7c1..a4f925ffafd 100644--- a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts+++ b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts@@ -1,7 +1,6 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';@@ -11,7 +10,6 @@ import { MessagingMonitoringService } from 'src/modules/messaging/monitoring/ser@Module({imports: [- AuditModule,MessagingCommonModule,TypeOrmModule.forFeature([WorkspaceEntity, MessageChannelEntity]),],diff --git a/packages/twenty-server/src/modules/messaging/monitoring/services/messaging-monitoring.service.ts b/packages/twenty-server/src/modules/messaging/monitoring/services/messaging-monitoring.service.tsindex 9b7c7fb7da1..9c791e3a7d8 100644--- a/packages/twenty-server/src/modules/messaging/monitoring/services/messaging-monitoring.service.ts+++ b/packages/twenty-server/src/modules/messaging/monitoring/services/messaging-monitoring.service.ts@@ -21,18 +21,6 @@ export class MessagingMonitoringService {messageChannelId: _messageChannelId,message: _message,}: MessagingMonitoringTrackInput): Promise<void> {- // TODO: replace once we have Prometheus- /*- await this.auditService- .createContext({- userId,- workspaceId,- })- .insertWorkspaceEvent(MONITORING_EVENT, {- eventName: `messaging.${eventName}`,- connectedAccountId,- messageChannelId,- message,- }); */+ // TODO: emit monitoring once Prometheus lands}}diff --git a/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts b/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.tsindex c9c71b5b2be..ea360127469 100644--- a/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts+++ b/packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts@@ -1,12 +1,11 @@import { Module } from '@nestjs/common';-import { AuditModule } from 'src/engine/core-modules/audit/audit.module';import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';@Module({- imports: [TimelineActivityModule, AuditModule, TwentyORMModule],+ imports: [TimelineActivityModule, TwentyORMModule],providers: [UpsertTimelineActivityFromInternalEvent],})export class TimelineJobModule {}diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/utils/build-code-step-log.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/utils/build-code-step-log.util.tsindex 92f916aa41b..e80b36fd1ae 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/utils/build-code-step-log.util.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/code/utils/build-code-step-log.util.ts@@ -1,6 +1,6 @@import { type WorkflowRunStepLog } from 'twenty-shared/workflow';-import { parseApplicationLogLines } from 'src/engine/core-modules/application-logs/utils/parse-application-log-lines';+import { parseApplicationLogLines } from 'src/engine/core-modules/event-logs/producers/application-log/parse-application-log-lines';import {type LogicFunctionExecuteError,type LogicFunctionExecuteResult,diff --git a/packages/twenty-server/test/integration/audit/suites/clickHouse-usage-event-writer.integration-spec.ts b/packages/twenty-server/test/integration/audit/suites/clickHouse-usage-event-writer.integration-spec.tsdeleted file mode 100644index 4e5d36d70ce..00000000000--- a/packages/twenty-server/test/integration/audit/suites/clickHouse-usage-event-writer.integration-spec.ts+++ /dev/null@@ -1,138 +0,0 @@-import process from 'process';--import {- type ClickHouseClient,- ClickHouseLogLevel,- createClient,-} from '@clickhouse/client';--import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';-import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';-import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';-import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';--const buildUsageEventRow = (- workspaceId: string,- overrides: Partial<{- userWorkspaceId: string;- resourceType: UsageResourceType;- operationType: UsageOperationType;- quantity: number;- unit: UsageUnit;- creditsUsedMicro: number;- resourceId: string;- resourceContext: string;- }> = {},-) => ({- timestamp: formatDateTimeForClickHouse(new Date()),- workspaceId,- userWorkspaceId: overrides.userWorkspaceId ?? '',- resourceType: overrides.resourceType ?? UsageResourceType.AI,- operationType: overrides.operationType ?? UsageOperationType.AI_CHAT_TOKEN,- quantity: overrides.quantity ?? 0,- unit: overrides.unit ?? UsageUnit.TOKEN,- creditsUsedMicro: overrides.creditsUsedMicro ?? 0,- resourceId: overrides.resourceId ?? '',- resourceContext: overrides.resourceContext ?? '',- metadata: {},-});--describe('ClickHouse Usage Event Writer (integration)', () => {- let clickHouseClient: ClickHouseClient;-- beforeAll(async () => {- jest.useRealTimers();-- clickHouseClient = createClient({- url: process.env.CLICKHOUSE_URL,- log: { level: ClickHouseLogLevel.OFF },- });-- await clickHouseClient.query({- query: 'TRUNCATE TABLE usageEvent',- format: 'JSONEachRow',- });- });-- afterAll(async () => {- if (clickHouseClient) {- await clickHouseClient.close();- }- });-- it('should insert a usage event row matching the schema produced by UsageEventWriterService', async () => {- const workspaceId = '00000000-0000-0000-0000-000000000001';-- const row = buildUsageEventRow(workspaceId, {- userWorkspaceId: '00000000-0000-0000-0000-000000000002',- resourceType: UsageResourceType.AI,- operationType: UsageOperationType.AI_CHAT_TOKEN,- quantity: 1500,- unit: UsageUnit.TOKEN,- creditsUsedMicro: 7500,- resourceId: 'agent-123',- resourceContext: 'gpt-4o',- });-- await clickHouseClient.insert({- table: 'usageEvent',- values: [row],- format: 'JSONEachRow',- });-- const queryResult = await clickHouseClient.query({- query: `- SELECT *- FROM usageEvent- WHERE workspaceId = '${workspaceId}'- `,- format: 'JSONEachRow',- });-- const rows = await queryResult.json<Record<string, unknown>>();-- expect(rows).toHaveLength(1);- expect(rows[0].workspaceId).toBe(workspaceId);- expect(rows[0].resourceType).toBe(UsageResourceType.AI);- expect(rows[0].operationType).toBe(UsageOperationType.AI_CHAT_TOKEN);- expect(rows[0].quantity).toBe(1500);- expect(rows[0].unit).toBe(UsageUnit.TOKEN);- expect(rows[0].creditsUsedMicro).toBe(7500);- expect(rows[0].resourceId).toBe('agent-123');- expect(rows[0].resourceContext).toBe('gpt-4o');- });-- it('should insert a usage event with empty optional fields', async () => {- const workspaceId = '00000000-0000-0000-0000-000000000003';-- const row = buildUsageEventRow(workspaceId, {- resourceType: UsageResourceType.WORKFLOW,- operationType: UsageOperationType.WORKFLOW_EXECUTION,- quantity: 1,- unit: UsageUnit.INVOCATION,- creditsUsedMicro: 1,- });-- await clickHouseClient.insert({- table: 'usageEvent',- values: [row],- format: 'JSONEachRow',- });-- const queryResult = await clickHouseClient.query({- query: `- SELECT *- FROM usageEvent- WHERE workspaceId = '${workspaceId}'- `,- format: 'JSONEachRow',- });-- const rows = await queryResult.json<Record<string, unknown>>();-- expect(rows).toHaveLength(1);- expect(rows[0].userWorkspaceId).toBe('');- expect(rows[0].resourceId).toBe('');- expect(rows[0].resourceContext).toBe('');- });-});diff --git a/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.tsindex 4bdad98b213..39fbee4a380 100644--- a/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts@@ -7,12 +7,18 @@ import {} from '@clickhouse/client';import request from 'supertest';+import { formatDateTimeForClickHouse } from 'src/database/clickHouse/clickHouse.util';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';+import { UsageUnit } from 'src/engine/core-modules/usage/enums/usage-unit.enum';+const client = request(`http://localhost:${APP_PORT}`);describe('Event Logs (integration)', () => {let clickHouseClient: ClickHouseClient;const testWorkspaceId = '20202020-1c25-4d02-bf25-6aeccf7ea419';const testUserWorkspaceId = '20202020-3957-45c9-be39-337dc4d9100a';+ const otherUserWorkspaceId = '20202020-0000-4000-8000-0000000000ff';beforeAll(async () => {jest.useRealTimers();@@ -43,10 +49,9 @@ describe('Event Logs (integration)', () => {workspaceId: testWorkspaceId,userId: testUserWorkspaceId,name: i % 2 === 0 ? 'settings/profile' : 'objects/companies',- timestamp: new Date(now.getTime() - i * 60000)- .toISOString()- .replace('T', ' ')- .replace('Z', ''),+ timestamp: formatDateTimeForClickHouse(+ new Date(now.getTime() - i * 60000),+ ),properties: { path: `/settings/${i}` },}));@@ -59,10 +64,9 @@ describe('Event Logs (integration)', () => {: i % 3 === 1? 'user.logout': 'settings.updated',- timestamp: new Date(now.getTime() - i * 120000)- .toISOString()- .replace('T', ' ')- .replace('Z', ''),+ timestamp: formatDateTimeForClickHouse(+ new Date(now.getTime() - i * 120000),+ ),properties: { action: `action_${i}` },}));@@ -70,16 +74,44 @@ describe('Event Logs (integration)', () => {workspaceId: testWorkspaceId,userId: testUserWorkspaceId,event: i % 2 === 0 ? 'company.created' : 'company.updated',- timestamp: new Date(now.getTime() - i * 90000)- .toISOString()- .replace('T', ' ')- .replace('Z', ''),+ timestamp: formatDateTimeForClickHouse(+ new Date(now.getTime() - i * 90000),+ ),properties: { field: `field_${i}` },recordId: `record-${i}`,objectMetadataId: i % 2 === 0 ? 'object-meta-1' : 'object-meta-2',isCustom: i % 4 === 0,}));+ const usageEventRecords = Array.from({ length: 8 }, (_, i) => ({+ workspaceId: testWorkspaceId,+ userWorkspaceId: i < 5 ? testUserWorkspaceId : otherUserWorkspaceId,+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ quantity: (i + 1) * 100,+ unit: UsageUnit.TOKEN,+ creditsUsedMicro: (i + 1) * 500,+ resourceId: `agent-${i}`,+ resourceContext: 'gpt-4o',+ metadata: {},+ timestamp: formatDateTimeForClickHouse(+ new Date(now.getTime() - i * 60000),+ ),+ }));++ const applicationLogRecords = Array.from({ length: 8 }, (_, i) => ({+ workspaceId: testWorkspaceId,+ applicationId: 'app-1',+ logicFunctionId: 'fn-1',+ logicFunctionName: i % 2 === 0 ? 'sendEmail' : 'syncContacts',+ executionId: `exec-${i}`,+ level: i % 2 === 0 ? 'INFO' : 'ERROR',+ message: `log line ${i}`,+ timestamp: formatDateTimeForClickHouse(+ new Date(now.getTime() - i * 60000),+ ),+ }));+await clickHouseClient.insert({table: 'pageview',values: pageviewRecords,@@ -98,6 +130,18 @@ describe('Event Logs (integration)', () => {format: 'JSONEachRow',});+ await clickHouseClient.insert({+ table: 'usageEvent',+ values: usageEventRecords,+ format: 'JSONEachRow',+ });++ await clickHouseClient.insert({+ table: 'applicationLog',+ values: applicationLogRecords,+ format: 'JSONEachRow',+ });+// Wait for ClickHouse async inserts to completeawait new Promise((resolve) => setTimeout(resolve, 2000));};@@ -113,6 +157,12 @@ describe('Event Logs (integration)', () => {await clickHouseClient.command({query: `ALTER TABLE objectEvent DELETE WHERE workspaceId = '${testWorkspaceId}'`,});+ await clickHouseClient.command({+ query: `ALTER TABLE usageEvent DELETE WHERE workspaceId = '${testWorkspaceId}'`,+ });+ await clickHouseClient.command({+ query: `ALTER TABLE applicationLog DELETE WHERE workspaceId = '${testWorkspaceId}'`,+ });} catch {// Ignore cleanup errors}@@ -194,6 +244,46 @@ describe('Event Logs (integration)', () => {expect(record.recordId).toBeDefined();expect(record.objectMetadataId).toBeDefined();});++ it('should query USAGE_EVENT table and fold columns into properties', async () => {+ const response = await makeEventLogsQuery({+ table: 'USAGE_EVENT',+ first: 10,+ });++ expect(response.status).toBe(200);+ expect(response.body.errors).toBeUndefined();+ expect(response.body.data.eventLogs.records.length).toBeGreaterThan(0);++ const record = response.body.data.eventLogs.records[0];++ expect(typeof record.event).toBe('string');+ expect(record.event.length).toBeGreaterThan(0);+ expect(record.userId).toBeDefined();+ expect(record.properties.operationType).toBeDefined();+ expect(record.properties.quantity).toBeDefined();+ expect(record.properties.unit).toBeDefined();+ expect(record.properties.creditsUsedMicro).toBeDefined();+ });++ it('should query APPLICATION_LOG table and fold level/message into properties', async () => {+ const response = await makeEventLogsQuery({+ table: 'APPLICATION_LOG',+ first: 10,+ });++ expect(response.status).toBe(200);+ expect(response.body.errors).toBeUndefined();+ expect(response.body.data.eventLogs.records.length).toBeGreaterThan(0);++ const record = response.body.data.eventLogs.records[0];++ expect(typeof record.event).toBe('string');+ expect(record.event.length).toBeGreaterThan(0);+ expect(record.properties.level).toBeDefined();+ expect(record.properties.message).toBeDefined();+ expect(record.properties.executionId).toBeDefined();+ });});describe('pagination', () => {@@ -425,6 +515,27 @@ describe('Event Logs (integration)', () => {});});+ describe('usage event specific filters', () => {+ it('should filter usage events by userWorkspaceId', async () => {+ const response = await makeEventLogsQuery({+ table: 'USAGE_EVENT',+ first: 50,+ filters: {+ userWorkspaceId: testUserWorkspaceId,+ },+ });++ expect(response.status).toBe(200);+ expect(response.body.data.eventLogs.records.length).toBeGreaterThan(0);++ response.body.data.eventLogs.records.forEach(+ (record: { userId: string }) => {+ expect(record.userId).toBe(testUserWorkspaceId);+ },+ );+ });+ });+describe('combined filters', () => {it('should apply multiple filters together', async () => {const now = new Date();diff --git a/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.tsnew file mode 100644index 00000000000..7bc5083ea9b--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts@@ -0,0 +1,118 @@+import process from 'process';++import {+ type ClickHouseClient,+ ClickHouseLogLevel,+ createClient,+} from '@clickhouse/client';+import gql from 'graphql-tag';++import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';++import { PERSON_GQL_FIELDS } from 'test/integration/constants/person-gql-fields.constants';+import { createManyOperationFactory } from 'test/integration/graphql/utils/create-many-operation-factory.util';+import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { deleteAllRecords } from 'test/integration/utils/delete-all-records';++// End-to-end write path: creating a record fires an objectEvent through+// entityEventsToDbQueue -> the consumer -> the ClickHouse sink.+describe('Object event write (integration)', () => {+ let clickHouseClient: ClickHouseClient;+ let personObjectMetadataId: string;+ const testWorkspaceId = '20202020-1c25-4d02-bf25-6aeccf7ea419';++ beforeAll(async () => {+ jest.useRealTimers();++ clickHouseClient = createClient({+ url: process.env.CLICKHOUSE_URL,+ log: { level: ClickHouseLogLevel.OFF },+ });++ await deleteAllRecords('person');++ const response = await makeMetadataAPIRequest({+ query: gql`+ query {+ objects(paging: { first: 1000 }) {+ edges {+ node {+ id+ nameSingular+ }+ }+ }+ }+ `,+ });++ personObjectMetadataId = response.body.data.objects.edges.find(+ (edge: { node: { id: string; nameSingular: string } }) =>+ edge.node.nameSingular === 'person',+ ).node.id;+ });++ afterAll(async () => {+ await deleteAllRecords('person');++ if (clickHouseClient) {+ await clickHouseClient.close();+ }+ });++ const queryObjectEventsByRecordId = (recordId: string) =>+ clickHouseClient+ .query({+ query: `+ SELECT event, recordId, objectMetadataId, workspaceId+ FROM objectEvent+ WHERE recordId = '${recordId}' AND workspaceId = '${testWorkspaceId}'+ `,+ format: 'JSONEachRow',+ })+ .then((result) =>+ result.json<{+ event: string;+ recordId: string;+ objectMetadataId: string;+ workspaceId: string;+ }>(),+ );++ it('writes an objectEvent row to ClickHouse when a record is created', async () => {+ const createResponse = await makeGraphqlAPIRequest(+ createManyOperationFactory({+ objectMetadataSingularName: 'person',+ objectMetadataPluralName: 'people',+ gqlFields: PERSON_GQL_FIELDS,+ data: [{ name: { firstName: 'Event', lastName: 'Logged' } }],+ }),+ );++ expect(createResponse.body.errors).toBeUndefined();++ const recordId = createResponse.body.data.createPeople[0].id;++ expect(recordId).toBeDefined();++ let rows: Awaited<ReturnType<typeof queryObjectEventsByRecordId>> = [];++ for (let attempt = 0; attempt < 20 && rows.length === 0; attempt++) {+ rows = await queryObjectEventsByRecordId(recordId);++ if (rows.length === 0) {+ await new Promise((resolve) => setTimeout(resolve, 500));+ }+ }++ expect(rows.length).toBeGreaterThanOrEqual(1);+ expect(rows[0].event).toBe(OBJECT_RECORD_CREATED_EVENT);+ expect(rows[0].recordId).toBe(recordId);+ expect(rows[0].objectMetadataId).toBe(personObjectMetadataId);++ await clickHouseClient.command({+ query: `ALTER TABLE objectEvent DELETE WHERE recordId = '${recordId}'`,+ });+ });+});diff --git a/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/event-logs/workspace-event-write.integration-spec.tssimilarity index 94%rename from packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.tsrename to packages/twenty-server/test/integration/graphql/suites/event-logs/workspace-event-write.integration-spec.tsindex 1f4faf416e0..56a0f5c51a7 100644--- a/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/event-logs/workspace-event-write.integration-spec.ts@@ -7,8 +7,8 @@ import {} from '@clickhouse/client';import request from 'supertest';-import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated';-import { type GenericTrackEvent } from 'src/engine/core-modules/audit/utils/events/workspace-event/track';+import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/custom-domain/custom-domain-activated';+import { type GenericTrackEvent } from 'src/engine/core-modules/event-logs/emit/events/workspace-event/track';describe('ClickHouse Event Registration (integration)', () => {let clickHouseClient: ClickHouseClient;diff --git a/packages/twenty-server/test/utils/audit-context.mock.ts b/packages/twenty-server/test/utils/audit-context.mock.tsindex a6d18378071..04a7a81b21a 100644--- a/packages/twenty-server/test/utils/audit-context.mock.ts+++ b/packages/twenty-server/test/utils/audit-context.mock.ts@@ -1,4 +1,4 @@-import { type TrackEventName } from 'src/engine/core-modules/audit/types/events.type';+import { type TrackEventName } from 'src/engine/core-modules/event-logs/emit/events.type';export const AuditContextMock = (params?: {insertWorkspaceEvent?: