feat(billing): flag legacy billing migration

browser_tests/tests/billingFacadeConsumers.spec.ts

@@ -57,7 +57,8 @@ async function mockCloudBoot(
   const billingRequests = {
     legacyStatus: 0,
     legacyBalance: 0,
-    workspaceStatus: 0
+    workspaceStatus: 0,
+    workspaceBalance: 0
   }
 
   await page.route('**/api/features', (r) => r.fulfill(jsonRoute(remoteConfig)))
@@ -125,6 +126,7 @@ async function mockCloudBoot(
     )
   })
   await page.route('**/api/billing/balance', (r) => {
+    billingRequests.workspaceBalance++
     return r.fulfill(jsonRoute(mockWorkspaceBalance))
   })
   await page.route('**/api/billing/plans', (r) =>
@@ -200,6 +202,31 @@ test.describe('Billing facade consumers (FE-933)', { tag: '@cloud' }, () => {
     expect(billingRequests.legacyBalance).toBeGreaterThan(0)
   })
 
+  test('rollout flag migrates a legacy Stripe workspace to workspace billing', async ({
+    page
+  }) => {
+    test.setTimeout(60_000)
+
+    const billingRequests = await mockCloudBoot(
+      page,
+      {
+        is_active: true,
+        subscription_tier: 'PRO',
+        subscription_duration: 'MONTHLY',
+        has_funds: true
+      },
+      { legacy_billing_migration_enabled: true },
+      'legacy_stripe'
+    )
+    await bootApp(page)
+
+    await expect
+      .poll(() => billingRequests.workspaceBalance, { timeout: 30_000 })
+      .toBeGreaterThan(0)
+    expect(billingRequests.legacyStatus).toBe(0)
+    expect(billingRequests.legacyBalance).toBe(0)
+  })
+
   test('subscribe-to-run routes an inactive FREE user to the pricing table', async ({
     page
   }) => {

src/composables/billing/useBillingContext.test.ts

@@ -7,6 +7,10 @@ import type {
   BillingStatusResponse,
   Plan
 } from '@/platform/workspace/api/workspaceApi'
+import {
+  remoteConfig,
+  remoteConfigState
+} from '@/platform/remoteConfig/remoteConfig'
 
 import { useBillingContext } from './useBillingContext'
 
@@ -166,12 +170,15 @@ vi.mock('@/platform/workspace/api/workspaceApi', () => ({
       currency: 'usd'
     })),
     subscribe: vi.fn(async () => ({ status: 'subscribed' })),
-    previewSubscribe: vi.fn(async () => ({ allowed: true }))
+    previewSubscribe: vi.fn(async () => ({ allowed: true })),
+    createTopup: vi.fn(async () => undefined)
   }
 }))
 
 describe('useBillingContext', () => {
   beforeEach(() => {
+    remoteConfig.value = {}
+    remoteConfigState.value = 'unloaded'
     mockIsPersonal.value = true
     mockBillingRail.value = undefined
     mockSetWorkspaceBillingRail.mockImplementation(
@@ -340,6 +347,22 @@ describe('useBillingContext', () => {
     expect(mockPurchaseCredits).toHaveBeenCalledWith(5)
   })
 
+  it('routes migrated legacy Stripe topups through workspace billing', async () => {
+    remoteConfig.value = { legacy_billing_migration_enabled: true }
+    remoteConfigState.value = 'authenticated'
+    mockBillingRail.value = 'legacy_stripe'
+
+    const context = useBillingContext()
+    await nextTick()
+    vi.clearAllMocks()
+
+    expect(context.type.value).toBe('workspace')
+    await context.topup(500)
+
+    expect(workspaceApi.createTopup).toHaveBeenCalledWith(500)
+    expect(mockPurchaseCredits).not.toHaveBeenCalled()
+  })
+
   it('switches billing adapters before refreshing a migrated balance', async () => {
     mockBillingRail.value = 'legacy_stripe'
     mockBillingStatus.value = {

src/composables/billing/useBillingRouting.test.ts

@@ -4,16 +4,31 @@ import type { BillingRail } from '@/platform/workspace/api/workspaceApi'
 
 import { useBillingRouting } from './useBillingRouting'
 
-const { mockIsCloud, mockActiveWorkspace, mockActiveWorkspaceBillingRail } =
-  vi.hoisted(() => ({
-    mockIsCloud: { value: true },
-    mockActiveWorkspace: {
-      value: null as { id: string; type: 'personal' | 'team' } | null
-    },
-    mockActiveWorkspaceBillingRail: {
-      value: null as BillingRail | null
+const {
+  mockIsCloud,
+  mockLegacyBillingMigrationEnabled,
+  mockActiveWorkspace,
+  mockActiveWorkspaceBillingRail
+} = vi.hoisted(() => ({
+  mockIsCloud: { value: true },
+  mockLegacyBillingMigrationEnabled: { value: false },
+  mockActiveWorkspace: {
+    value: null as { id: string; type: 'personal' | 'team' } | null
+  },
+  mockActiveWorkspaceBillingRail: {
+    value: null as BillingRail | null
+  }
+}))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: {
+      get legacyBillingMigrationEnabled() {
+        return mockLegacyBillingMigrationEnabled.value
+      }
     }
-  }))
+  })
+}))
 
 vi.mock('@/platform/distribution/types', () => ({
   get isCloud() {
@@ -38,6 +53,7 @@ const team = { id: 'w-team', type: 'team' as const }
 describe('useBillingRouting', () => {
   beforeEach(() => {
     mockIsCloud.value = true
+    mockLegacyBillingMigrationEnabled.value = false
     mockActiveWorkspace.value = personal
     mockActiveWorkspaceBillingRail.value = null
   })
@@ -71,6 +87,16 @@ describe('useBillingRouting', () => {
     expect(shouldUseUnifiedPricing.value).toBe(true)
   })
 
+  it('migrates legacy Stripe personal workspaces behind the rollout flag', () => {
+    mockLegacyBillingMigrationEnabled.value = true
+    mockActiveWorkspaceBillingRail.value = 'legacy_stripe'
+
+    const { type, shouldUseWorkspaceBilling } = useBillingRouting()
+
+    expect(type.value).toBe('workspace')
+    expect(shouldUseWorkspaceBilling.value).toBe(true)
+  })
+
   it('uses workspace billing for migrated Stripe personal workspaces', () => {
     mockActiveWorkspace.value = personal
     mockActiveWorkspaceBillingRail.value = 'stripe'

src/composables/billing/useBillingRouting.ts

@@ -1,5 +1,6 @@
 import { computed } from 'vue'
 
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { isCloud } from '@/platform/distribution/types'
 import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
 
@@ -9,10 +10,11 @@ import type { BillingType } from './types'
  * Selects the billing backend for the active workspace: legacy user-scoped
  * (`/customers/*`) or workspace-scoped (`/api/billing/*`). Personal workspaces
  * use workspace billing unless an explicit legacy Stripe rail selects legacy
- * account operations. An unloaded workspace remains legacy during bootstrap,
- * and OSS always uses legacy billing.
+ * account operations and its migration flag is off. An unloaded workspace
+ * remains legacy during bootstrap, and OSS always uses legacy billing.
  */
 export function useBillingRouting() {
+  const { flags } = useFeatureFlags()
   const workspaceStore = useTeamWorkspaceStore()
 
   const shouldUseUnifiedPricing = computed(() => {
@@ -29,7 +31,8 @@ export function useBillingRouting() {
 
     if (
       workspaceType === 'personal' &&
-      workspaceStore.activeWorkspaceBillingRail === 'legacy_stripe'
+      workspaceStore.activeWorkspaceBillingRail === 'legacy_stripe' &&
+      !flags.legacyBillingMigrationEnabled
     ) {
       return 'legacy'
     }

src/composables/useFeatureFlags.test.ts

@@ -8,6 +8,7 @@ import {
 import * as distributionTypes from '@/platform/distribution/types'
 import {
   cachedBillingControlEnabled,
+  cachedLegacyBillingMigrationEnabled,
   cachedV1PaymentRecovery,
   remoteConfig,
   remoteConfigState
@@ -207,6 +208,64 @@ describe('useFeatureFlags', () => {
     })
   })
 
+  describe('legacyBillingMigrationEnabled', () => {
+    beforeEach(() => {
+      vi.mocked(distributionTypes).isCloud = true
+      remoteConfigState.value = 'authenticated'
+    })
+
+    afterEach(() => {
+      vi.mocked(distributionTypes).isCloud = false
+      remoteConfigState.value = 'unloaded'
+      remoteConfig.value = {}
+      cachedLegacyBillingMigrationEnabled.value = undefined
+    })
+
+    it('migrates legacy billing when enabled by remote config', () => {
+      remoteConfig.value = { legacy_billing_migration_enabled: true }
+
+      const { flags } = useFeatureFlags()
+
+      expect(flags.legacyBillingMigrationEnabled).toBe(true)
+    })
+
+    it('keeps migration off when remote config explicitly disables it', () => {
+      remoteConfig.value = { legacy_billing_migration_enabled: false }
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const { flags } = useFeatureFlags()
+
+      expect(flags.legacyBillingMigrationEnabled).toBe(false)
+    })
+
+    it('uses the server feature when authenticated config leaves it unset', () => {
+      vi.mocked(api.getServerFeature).mockImplementation(
+        (path, defaultValue) =>
+          path === ServerFeatureFlag.LEGACY_BILLING_MIGRATION_ENABLED
+            ? true
+            : defaultValue
+      )
+
+      const { flags } = useFeatureFlags()
+
+      expect(flags.legacyBillingMigrationEnabled).toBe(true)
+      expect(api.getServerFeature).toHaveBeenCalledWith(
+        ServerFeatureFlag.LEGACY_BILLING_MIGRATION_ENABLED,
+        false
+      )
+    })
+
+    it('keeps legacy billing when the rollout flag is unset', () => {
+      vi.mocked(api.getServerFeature).mockImplementation(
+        (_path, defaultValue) => defaultValue
+      )
+
+      const { flags } = useFeatureFlags()
+
+      expect(flags.legacyBillingMigrationEnabled).toBe(false)
+    })
+  })
+
   describe('onboardingTourEnabled', () => {
     afterEach(() => {
       remoteConfig.value = {}
@@ -296,6 +355,7 @@ describe('useFeatureFlags', () => {
       remoteConfigState.value = 'unloaded'
       remoteConfig.value = {}
       cachedBillingControlEnabled.value = undefined
+      cachedLegacyBillingMigrationEnabled.value = undefined
       cachedV1PaymentRecovery.value = undefined
     })
 
@@ -304,21 +364,25 @@ describe('useFeatureFlags', () => {
       remoteConfigState.value = 'unloaded'
       remoteConfig.value = {}
       cachedBillingControlEnabled.value = undefined
+      cachedLegacyBillingMigrationEnabled.value = undefined
       cachedV1PaymentRecovery.value = undefined
     })
 
     it('returns the cached session value during the auth window', () => {
       cachedBillingControlEnabled.value = true
+      cachedLegacyBillingMigrationEnabled.value = true
       cachedV1PaymentRecovery.value = true
 
       const { flags } = useFeatureFlags()
       expect(flags.billingControlEnabled).toBe(true)
+      expect(flags.legacyBillingMigrationEnabled).toBe(true)
       expect(flags.v1PaymentRecovery).toBe(true)
     })
 
     it('defaults to false during the auth window when nothing is cached', () => {
       const { flags } = useFeatureFlags()
       expect(flags.billingControlEnabled).toBe(false)
+      expect(flags.legacyBillingMigrationEnabled).toBe(false)
       expect(flags.v1PaymentRecovery).toBe(false)
     })
 

src/composables/useFeatureFlags.ts

@@ -4,6 +4,7 @@ import type { Ref } from 'vue'
 import { isCloud, isNightly } from '@/platform/distribution/types'
 import {
   cachedBillingControlEnabled,
+  cachedLegacyBillingMigrationEnabled,
   cachedV1PaymentRecovery,
   isAuthenticatedConfigLoaded,
   remoteConfig
@@ -34,6 +35,7 @@ export enum ServerFeatureFlag {
   SHOW_SIGNIN_BUTTON = 'show_signin_button',
   UNIFIED_CLOUD_AUTH = 'unified_cloud_auth',
   BILLING_CONTROL_ENABLED = 'billing_control_enabled',
+  LEGACY_BILLING_MIGRATION_ENABLED = 'legacy_billing_migration_enabled',
   V1_PAYMENT_RECOVERY = 'v1_payment_recovery',
   FREE_TIER_JOB_ALLOWANCE_ENABLED = 'free_tier_job_allowance_enabled',
   CHURNKEY_APP_ID = 'churnkey_app_id',
@@ -204,6 +206,13 @@ export function useFeatureFlags() {
         cachedBillingControlEnabled
       )
     },
+    get legacyBillingMigrationEnabled() {
+      return resolveAuthGatedFlag(
+        ServerFeatureFlag.LEGACY_BILLING_MIGRATION_ENABLED,
+        remoteConfig.value.legacy_billing_migration_enabled,
+        cachedLegacyBillingMigrationEnabled
+      )
+    },
     get v1PaymentRecovery() {
       return resolveAuthGatedFlag(
         ServerFeatureFlag.V1_PAYMENT_RECOVERY,