diff --git a/codecov.yml b/codecov.yml index a7be602b57a..2349065a6e6 100644 --- a/codecov.yml +++ b/codecov.yml @@ -3,6 +3,9 @@ coverage: patch: default: informational: true + project: + default: + informational: true comment: layout: 'header, diff, flags, files' diff --git a/knip.config.ts b/knip.config.ts index 3d6f9b8dc65..711a6c6f9c0 100644 --- a/knip.config.ts +++ b/knip.config.ts @@ -12,7 +12,12 @@ const config: KnipConfig = { 'src/types/index.ts', 'src/storybook/mocks/**/*.ts' ], - project: ['**/*.{js,ts,vue}', '*.{js,ts,mts}', '!.claude/**'] + project: [ + '**/*.{js,ts,vue}', + '*.{js,ts,mts}', + '!.claude/**', + '!worktrees/**' + ] }, 'apps/desktop-ui': { entry: ['src/i18n.ts'], diff --git a/src/platform/cloud/subscription/composables/useSubscription.test.ts b/src/platform/cloud/subscription/composables/useSubscription.test.ts index ab8d3c04a77..8a8832926ea 100644 --- a/src/platform/cloud/subscription/composables/useSubscription.test.ts +++ b/src/platform/cloud/subscription/composables/useSubscription.test.ts @@ -13,6 +13,7 @@ const { mockGetCheckoutAttribution, mockTelemetry, mockUserId, + mockCurrentUserUid, mockIsCloud, mockAuthStoreInitialized, mockGetBillingStatus, @@ -40,9 +41,11 @@ const { trackSubscription: vi.fn(), trackMonthlySubscriptionSucceeded: vi.fn(), trackMonthlySubscriptionCancelled: vi.fn(), - trackBillingEvent: vi.fn() + trackBillingEvent: vi.fn(), + trackSubscriptionAuthRace: vi.fn() }, mockUserId: { value: 'user-123' }, + mockCurrentUserUid: { value: 'uid-user-123' as string | null }, mockLocalStorage: (() => { const store = new Map() @@ -172,6 +175,9 @@ vi.mock('@/stores/authStore', () => ({ }, get userId() { return mockUserId.value + }, + get currentUser() { + return mockCurrentUserUid.value ? { uid: mockCurrentUserUid.value } : null } })), AuthStoreError: class extends Error {} @@ -199,6 +205,8 @@ describe('useSubscription', () => { mockTelemetry.trackMonthlySubscriptionSucceeded.mockReset() mockTelemetry.trackMonthlySubscriptionCancelled.mockReset() mockTelemetry.trackBillingEvent.mockReset() + mockTelemetry.trackSubscriptionAuthRace.mockReset() + mockCurrentUserUid.value = 'uid-user-123' mockAccessBillingPortal.mockReset() mockAccessBillingPortal.mockResolvedValue(true) mockUserId.value = 'user-123' @@ -427,6 +435,53 @@ describe('useSubscription', () => { expect(canAccessSubscriptionFeatures.value).toBe(true) }) + + it('does not reuse in-flight fetch for a different user', async () => { + let resolveFirst: (value: { + is_active: boolean + has_funds: boolean + }) => void = () => {} + mockGetBillingStatus.mockReturnValueOnce( + new Promise((resolve) => { + resolveFirst = resolve + }) + ) + mockGetBillingStatus.mockResolvedValueOnce({ + is_active: true, + has_funds: true + }) + + const { fetchStatus } = useSubscriptionWithScope() + + const firstFetch = fetchStatus() + + // Switch user identity while first fetch is in-flight + mockCurrentUserUid.value = 'uid-user-456' + const secondFetch = fetchStatus() + + resolveFirst({ is_active: false, has_funds: false }) + await Promise.allSettled([firstFetch, secondFetch]) + + // Two separate fetches must have been made — one per identity + expect(mockGetBillingStatus).toHaveBeenCalledTimes(2) + }) + + it('emits trackSubscriptionAuthRace when identity changes mid-flight', async () => { + const { fetchStatus } = useSubscriptionWithScope() + + // Start a fetch for uid-user-123 + const firstFetch = fetchStatus() + + // Switch identity before the second call + mockCurrentUserUid.value = 'uid-user-456' + const secondFetch = fetchStatus() + + await Promise.allSettled([firstFetch, secondFetch]) + + expect(mockTelemetry.trackSubscriptionAuthRace).toHaveBeenCalledWith( + expect.objectContaining({ uid_changed: true }) + ) + }) }) describe('subscribe', () => { diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts index fa08bb78421..8ed7abb8821 100644 --- a/src/platform/cloud/subscription/composables/useSubscription.ts +++ b/src/platform/cloud/subscription/composables/useSubscription.ts @@ -348,16 +348,35 @@ function useSubscriptionInternal() { } } - // Coalesce concurrent callers so an auth/session-rotation burst mints one fetch. - let inFlightStatusFetch: Promise | null = null + interface InFlightStatusFetch { + ownerUid: string | null + promise: Promise + } + + let inFlightStatusFetch: InFlightStatusFetch | null = null let latestStatusRequestId = 0 async function fetchSubscriptionStatus(): Promise { - if (inFlightStatusFetch) return inFlightStatusFetch - inFlightStatusFetch = performFetchSubscriptionStatus().finally(() => { - inFlightStatusFetch = null - }) - return inFlightStatusFetch + const currentUid = authStore.currentUser?.uid ?? null + + if (inFlightStatusFetch?.ownerUid === currentUid) { + return inFlightStatusFetch.promise + } + + if (inFlightStatusFetch !== null) { + telemetry?.trackSubscriptionAuthRace?.({ uid_changed: true }) + } + + const request: InFlightStatusFetch = { + ownerUid: currentUid, + promise: performFetchSubscriptionStatus().finally(() => { + if (inFlightStatusFetch === request) { + inFlightStatusFetch = null + } + }) + } + inFlightStatusFetch = request + return request.promise } async function performFetchSubscriptionStatus(): Promise { diff --git a/src/platform/telemetry/TelemetryRegistry.ts b/src/platform/telemetry/TelemetryRegistry.ts index 209f3649e43..7588dac11bc 100644 --- a/src/platform/telemetry/TelemetryRegistry.ts +++ b/src/platform/telemetry/TelemetryRegistry.ts @@ -165,6 +165,10 @@ export class TelemetryRegistry implements TelemetryDispatcher { this.dispatch((provider) => provider.trackBillingEvent?.(event)) } + trackSubscriptionAuthRace(metadata: { uid_changed: boolean }): void { + this.dispatch((provider) => provider.trackSubscriptionAuthRace?.(metadata)) + } + trackRunButton(properties: RunButtonProperties): void { this.dispatch((provider) => provider.trackRunButton?.(properties)) } diff --git a/src/platform/telemetry/providers/cloud/ClickHouseTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/ClickHouseTelemetryProvider.ts index d43255f9ed7..86b081a07a3 100644 --- a/src/platform/telemetry/providers/cloud/ClickHouseTelemetryProvider.ts +++ b/src/platform/telemetry/providers/cloud/ClickHouseTelemetryProvider.ts @@ -24,22 +24,30 @@ export class ClickHouseTelemetryProvider implements TelemetryProvider { this.reportMissingNodes(metadata) } - private reportMissingNodes(metadata: WorkflowImportMetadata): void { - if (metadata.missing_node_count <= 0) return + trackSubscriptionAuthRace(metadata: { uid_changed: boolean }): void { + this.sendEvent('subscription_auth_race', metadata) + } + private sendEvent( + eventName: string, + eventData: Record + ): void { api .fetchApi('/internal/cloud_analytics', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - event_name: 'node_missing', - event_data: { - missing_class_types: metadata.missing_node_types, - missing_count: metadata.missing_node_count, - source: metadata.open_source ?? 'unknown' - } - }) + body: JSON.stringify({ event_name: eventName, event_data: eventData }) }) .catch(() => {}) } + + private reportMissingNodes(metadata: WorkflowImportMetadata): void { + if (metadata.missing_node_count <= 0) return + + this.sendEvent('node_missing', { + missing_class_types: metadata.missing_node_types, + missing_count: metadata.missing_node_count, + source: metadata.open_source ?? 'unknown' + }) + } } diff --git a/src/platform/telemetry/types.ts b/src/platform/telemetry/types.ts index 514c347a120..c7f649bd8bb 100644 --- a/src/platform/telemetry/types.ts +++ b/src/platform/telemetry/types.ts @@ -924,6 +924,8 @@ export interface TelemetryProvider { trackBillingEvent?(event: BillingTelemetryEvent): void + trackSubscriptionAuthRace?(metadata: { uid_changed: boolean }): void + // Credit top-up tracking (composition with internal utilities) startTopupTracking?(): void checkForCompletedTopup?(events: AuditLog[] | undefined | null): boolean