fix: preserve billing telemetry lifecycle pairing

Amp-Thread-ID: https://ampcode.com/threads/T-019ff637-547e-7498-ac31-b59987908d93
Co-authored-by: Amp <amp@ampcode.com>

Author: dante01yoon

src/platform/telemetry/types.ts

@@ -810,6 +810,7 @@ type ResubscribeBillingEvent = {
   operation: 'resubscribe'
   source: ResubscribeClickMetadata['source']
   payment_intent_source?: PaymentIntentSource
+  duration_ms?: number
 } & (BillingStarted | BillingSucceeded | BillingFailed)
 
 type TopupBillingEvent = {

src/platform/workspace/composables/useDowngradeToPersonal.test.ts

@@ -667,6 +667,38 @@ describe('useDowngradeToPersonal', () => {
   })
 
   describe('downgradeToPersonal telemetry', () => {
+    it('keeps one telemetry attempt across an authoritative reactivation retry', async () => {
+      mockMembers.value = teamWithOwnerAnd('m1')
+      mockPreviewSubscribe.mockResolvedValue({
+        allowed: true,
+        transition_type: 'downgrade',
+        cost_today_cents: 1500
+      })
+      mockSubscribe.mockRejectedValueOnce(
+        Object.assign(new Error('reactivation confirmation required'), {
+          code: 'REACTIVATION_CONFIRMATION_REQUIRED'
+        })
+      )
+      const { downgradeToPersonal } = useDowngradeToPersonal()
+
+      await expect(downgradeToPersonal('founder-monthly')).rejects.toThrow(
+        ReactivationConfirmationRequiredError
+      )
+      await downgradeToPersonal('founder-monthly', true, 1500)
+
+      const lifecycle = mockTrackBillingEvent.mock.calls.map(
+        ([event]) => `${event.operation}.${event.stage}`
+      )
+      expect(lifecycle).toEqual([
+        'downgrade_to_personal.started',
+        'subscription_checkout.started',
+        'operation.started',
+        'downgrade_to_personal.succeeded',
+        'subscription_checkout.succeeded',
+        'operation.succeeded'
+      ])
+    })
+
     it('tracks the start of the downgrade with the pending removal count', async () => {
       mockMembers.value = teamWithOwnerAnd('m1', 'm2')
       const { downgradeToPersonal } = useDowngradeToPersonal()

src/platform/workspace/composables/useDowngradeToPersonal.ts

@@ -31,6 +31,15 @@ export interface DowngradePreview {
   requiresReactivationConfirmation: boolean
 }
 
+interface DowngradeTelemetryAttempt {
+  startedAt: number
+  memberRemovalCount: number
+  memberRemovalFailures: number
+  targetTier?: TierKey
+  targetCycle?: BillingCycle
+  checkoutStartedAt?: number
+}
+
 /** Thrown by `downgradeToPersonal` when the billing authority requires
  *  reactivation consent, so the still-open confirmation can collect it and
  *  retry with `confirmReactivation: true`. */
@@ -66,6 +75,7 @@ export function useDowngradeToPersonal() {
   const { userEmail } = useCurrentUser()
   const { permissions } = useWorkspaceUI()
   const telemetry = useTelemetry()
+  let activeTelemetryAttempt: DowngradeTelemetryAttempt | undefined
 
   const removableMembers = computed(() => {
     const hasFlag = members.value.some((m) => m.isOriginalOwner)
@@ -147,51 +157,54 @@ export function useDowngradeToPersonal() {
     ensureCanDowngrade()
 
     const membersToRemove = removableMembers.value
-    let memberRemovalFailures = 0
-    let targetTier: TierKey | undefined
-    let targetCycle: BillingCycle | undefined
+    const telemetryAttempt = activeTelemetryAttempt ?? {
+      startedAt: Date.now(),
+      memberRemovalCount: membersToRemove.length,
+      memberRemovalFailures: 0
+    }
     let telemetryFailure: BillingFailure | undefined
-    let checkoutStartedAt: number | undefined
 
-    const downgradeStartedAt = Date.now()
-    telemetry?.trackBillingEvent({
-      operation: 'downgrade_to_personal',
-      stage: 'started',
-      outcome: 'pending',
-      member_removal_count: membersToRemove.length,
-      member_removal_failures: 0
-    })
+    if (!activeTelemetryAttempt) {
+      activeTelemetryAttempt = telemetryAttempt
+      telemetry?.trackBillingEvent({
+        operation: 'downgrade_to_personal',
+        stage: 'started',
+        outcome: 'pending',
+        member_removal_count: telemetryAttempt.memberRemovalCount,
+        member_removal_failures: 0
+      })
+    }
 
     function trackSucceeded() {
       const now = Date.now()
       telemetry?.trackBillingEvent({
         operation: 'downgrade_to_personal',
         stage: 'succeeded',
         outcome: 'success',
-        member_removal_count: membersToRemove.length,
-        member_removal_failures: memberRemovalFailures,
-        target_tier: targetTier,
-        duration_ms: now - downgradeStartedAt
+        member_removal_count: telemetryAttempt.memberRemovalCount,
+        member_removal_failures: telemetryAttempt.memberRemovalFailures,
+        target_tier: telemetryAttempt.targetTier,
+        duration_ms: now - telemetryAttempt.startedAt
       })
-      if (checkoutStartedAt === undefined) return
+      if (telemetryAttempt.checkoutStartedAt === undefined) return
       telemetry?.trackBillingEvent({
         operation: 'subscription_checkout',
         stage: 'succeeded',
         outcome: 'success',
-        tier: targetTier,
-        cycle: targetCycle,
+        tier: telemetryAttempt.targetTier,
+        cycle: telemetryAttempt.targetCycle,
         checkout_type: 'change',
-        duration_ms: now - checkoutStartedAt
+        duration_ms: now - telemetryAttempt.checkoutStartedAt
       })
       telemetry?.trackBillingEvent({
         operation: 'operation',
         stage: 'succeeded',
         outcome: 'success',
         operation_type: 'subscription',
-        tier: targetTier,
-        cycle: targetCycle,
+        tier: telemetryAttempt.targetTier,
+        cycle: telemetryAttempt.targetCycle,
         checkout_type: 'change',
-        duration_ms: now - checkoutStartedAt
+        duration_ms: now - telemetryAttempt.checkoutStartedAt
       })
     }
 
@@ -207,10 +220,10 @@ export function useDowngradeToPersonal() {
         )
       }
       ensureCanDowngrade()
-      targetTier = preview.new_plan?.tier
+      telemetryAttempt.targetTier = preview.new_plan?.tier
         ? (toTierKey(preview.new_plan.tier) ?? undefined)
         : undefined
-      targetCycle = preview.new_plan
+      telemetryAttempt.targetCycle = preview.new_plan
         ? preview.new_plan.duration === 'ANNUAL'
           ? 'yearly'
           : 'monthly'
@@ -244,7 +257,7 @@ export function useDowngradeToPersonal() {
         try {
           await workspaceStore.removeMember(member.id)
         } catch (error) {
-          memberRemovalFailures += 1
+          telemetryAttempt.memberRemovalFailures += 1
           telemetryFailure = {
             failure_category: categorizeBillingApiError(error),
             error_code: 'member_removal_failed'
@@ -259,24 +272,26 @@ export function useDowngradeToPersonal() {
       }
 
       ensureCanDowngrade()
-      checkoutStartedAt = Date.now()
-      telemetry?.trackBillingEvent({
-        operation: 'subscription_checkout',
-        stage: 'started',
-        outcome: 'pending',
-        tier: targetTier,
-        cycle: targetCycle,
-        checkout_type: 'change'
-      })
-      telemetry?.trackBillingEvent({
-        operation: 'operation',
-        stage: 'started',
-        outcome: 'pending',
-        operation_type: 'subscription',
-        tier: targetTier,
-        cycle: targetCycle,
-        checkout_type: 'change'
-      })
+      if (telemetryAttempt.checkoutStartedAt === undefined) {
+        telemetryAttempt.checkoutStartedAt = Date.now()
+        telemetry?.trackBillingEvent({
+          operation: 'subscription_checkout',
+          stage: 'started',
+          outcome: 'pending',
+          tier: telemetryAttempt.targetTier,
+          cycle: telemetryAttempt.targetCycle,
+          checkout_type: 'change'
+        })
+        telemetry?.trackBillingEvent({
+          operation: 'operation',
+          stage: 'started',
+          outcome: 'pending',
+          operation_type: 'subscription',
+          tier: telemetryAttempt.targetTier,
+          cycle: telemetryAttempt.targetCycle,
+          checkout_type: 'change'
+        })
+      }
       let response: SubscribeResponse | void
       try {
         response = await subscribe(planSlug, {
@@ -330,18 +345,19 @@ export function useDowngradeToPersonal() {
           response.billing_op_id,
           'subscription',
           {
-            tier: targetTier,
-            cycle: targetCycle,
+            tier: telemetryAttempt.targetTier,
+            cycle: telemetryAttempt.targetCycle,
             checkoutType: 'change',
             downgradeToPersonal: {
-              memberRemovalCount: membersToRemove.length,
-              memberRemovalFailures,
-              targetTier,
-              startedAt: downgradeStartedAt
+              memberRemovalCount: telemetryAttempt.memberRemovalCount,
+              memberRemovalFailures: telemetryAttempt.memberRemovalFailures,
+              targetTier: telemetryAttempt.targetTier,
+              startedAt: telemetryAttempt.startedAt
             },
-            attemptStartedAt: checkoutStartedAt
+            attemptStartedAt: telemetryAttempt.checkoutStartedAt
           }
         )
+        activeTelemetryAttempt = undefined
         return null
       }
 
@@ -350,24 +366,29 @@ export function useDowngradeToPersonal() {
           response.billing_op_id,
           'subscription',
           {
-            tier: targetTier,
-            cycle: targetCycle,
+            tier: telemetryAttempt.targetTier,
+            cycle: telemetryAttempt.targetCycle,
             checkoutType: 'change',
             downgradeToPersonal: {
-              memberRemovalCount: membersToRemove.length,
-              memberRemovalFailures,
-              targetTier,
-              startedAt: downgradeStartedAt
+              memberRemovalCount: telemetryAttempt.memberRemovalCount,
+              memberRemovalFailures: telemetryAttempt.memberRemovalFailures,
+              targetTier: telemetryAttempt.targetTier,
+              startedAt: telemetryAttempt.startedAt
             },
-            attemptStartedAt: checkoutStartedAt
+            attemptStartedAt: telemetryAttempt.checkoutStartedAt
           }
         )
+        activeTelemetryAttempt = undefined
         return null
       }
 
       trackSucceeded()
+      activeTelemetryAttempt = undefined
       return { preview, response }
     } catch (error) {
+      if (error instanceof ReactivationConfirmationRequiredError) {
+        throw error
+      }
       const failure = telemetryFailure ?? {
         failure_category: categorizeBillingApiError(error)
       }
@@ -376,35 +397,36 @@ export function useDowngradeToPersonal() {
         operation: 'downgrade_to_personal',
         stage: 'failed',
         outcome: 'failure',
-        member_removal_count: membersToRemove.length,
-        member_removal_failures: memberRemovalFailures,
-        target_tier: targetTier,
+        member_removal_count: telemetryAttempt.memberRemovalCount,
+        member_removal_failures: telemetryAttempt.memberRemovalFailures,
+        target_tier: telemetryAttempt.targetTier,
         ...failure,
-        duration_ms: now - downgradeStartedAt
+        duration_ms: now - telemetryAttempt.startedAt
       })
-      if (checkoutStartedAt !== undefined) {
+      if (telemetryAttempt.checkoutStartedAt !== undefined) {
         telemetry?.trackBillingEvent({
           operation: 'subscription_checkout',
           stage: 'failed',
           outcome: 'failure',
-          tier: targetTier,
-          cycle: targetCycle,
+          tier: telemetryAttempt.targetTier,
+          cycle: telemetryAttempt.targetCycle,
           checkout_type: 'change',
           ...failure,
-          duration_ms: now - checkoutStartedAt
+          duration_ms: now - telemetryAttempt.checkoutStartedAt
         })
         telemetry?.trackBillingEvent({
           operation: 'operation',
           stage: 'failed',
           outcome: 'failure',
           operation_type: 'subscription',
-          tier: targetTier,
-          cycle: targetCycle,
+          tier: telemetryAttempt.targetTier,
+          cycle: telemetryAttempt.targetCycle,
           checkout_type: 'change',
           ...failure,
-          duration_ms: now - checkoutStartedAt
+          duration_ms: now - telemetryAttempt.checkoutStartedAt
         })
       }
+      activeTelemetryAttempt = undefined
       throw error
     }
   }

src/platform/workspace/composables/useResubscribe.test.ts

@@ -95,6 +95,13 @@ describe('useResubscribe', () => {
       outcome: 'pending',
       source: 'settings_billing_panel'
     })
+    expect(state.trackBillingEvent).toHaveBeenCalledWith({
+      operation: 'resubscribe',
+      stage: 'succeeded',
+      outcome: 'success',
+      source: 'settings_billing_panel',
+      duration_ms: expect.any(Number)
+    })
   })
 
   it('does not report checkout launch as terminal legacy success', async () => {
@@ -143,7 +150,8 @@ describe('useResubscribe', () => {
       stage: 'failed',
       outcome: 'failure',
       source: 'settings_billing_panel',
-      failure_category: 'unknown'
+      failure_category: 'unknown',
+      duration_ms: expect.any(Number)
     })
     expect(isResubscribing.value).toBe(false)
   })

src/platform/workspace/composables/useResubscribe.ts

@@ -30,6 +30,8 @@ export function useResubscribe() {
     }
 
     const source = 'settings_billing_panel' as const
+    const startedAt = Date.now()
+    const isWorkspaceResubscribe = shouldUseWorkspaceBilling.value
 
     useTelemetry()?.trackResubscribeClicked({ source })
     // Emitted before the awaited call so a failure always has a preceding
@@ -49,12 +51,13 @@ export function useResubscribe() {
       // tab, which isn't terminal — its `succeeded` is emitted later, from
       // useSubscription.ts's pending-checkout recovery, once a status poll
       // confirms the payment actually went through.
-      if (shouldUseWorkspaceBilling.value) {
+      if (isWorkspaceResubscribe) {
         useTelemetry()?.trackBillingEvent({
           operation: 'resubscribe',
           stage: 'succeeded',
           outcome: 'success',
-          source
+          source,
+          duration_ms: Date.now() - startedAt
         })
       }
       toast.add({
@@ -72,7 +75,10 @@ export function useResubscribe() {
         stage: 'failed',
         outcome: 'failure',
         source,
-        failure_category: categorizeBillingApiError(error)
+        failure_category: categorizeBillingApiError(error),
+        ...(isWorkspaceResubscribe && {
+          duration_ms: Date.now() - startedAt
+        })
       })
       toast.add({
         severity: 'error',