Merge branch 'dante/canonical-billing-status' into dante/retire-consolidated-billing-flag

Author: dante01yoon

src/platform/cloud/subscription/composables/useSubscription.test.ts

@@ -16,13 +16,15 @@ const {
   mockIsCloud,
   mockAuthStoreInitialized,
   mockGetBillingStatus,
+  mockActiveWorkspaceId,
   mockSetWorkspaceBillingRail,
   mockLocalStorage
 } = vi.hoisted(() => ({
   mockIsLoggedIn: { value: false },
   mockIsCloud: { value: true },
   mockAuthStoreInitialized: { value: true },
   mockGetBillingStatus: vi.fn(),
+  mockActiveWorkspaceId: { value: 'workspace-123' as string | null },
   mockSetWorkspaceBillingRail: vi.fn(),
   mockReportError: vi.fn(),
   mockAccessBillingPortal: vi.fn(),
@@ -146,7 +148,9 @@ vi.mock('@/platform/workspace/api/workspaceApi', () => ({
 
 vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
   useTeamWorkspaceStore: () => ({
-    activeWorkspaceId: 'workspace-123',
+    get activeWorkspaceId() {
+      return mockActiveWorkspaceId.value
+    },
     setWorkspaceBillingRail: mockSetWorkspaceBillingRail
   })
 }))
@@ -198,6 +202,7 @@ describe('useSubscription', () => {
     mockUserId.value = 'user-123'
     mockIsCloud.value = true
     mockAuthStoreInitialized.value = true
+    mockActiveWorkspaceId.value = 'workspace-123'
     mockGetBillingStatus.mockResolvedValue({
       is_active: false,
       has_funds: false,
@@ -352,6 +357,31 @@ describe('useSubscription', () => {
       )
     })
 
+    it('does not apply status after the active workspace changes', async () => {
+      let resolveStatus: (value: {
+        is_active: boolean
+        has_funds: boolean
+        billing_rail: 'stripe'
+      }) => void = () => {}
+      mockGetBillingStatus.mockReturnValue(
+        new Promise((resolve) => {
+          resolveStatus = resolve
+        })
+      )
+
+      const { fetchStatus } = useSubscriptionWithScope()
+      const statusRequest = fetchStatus()
+      mockActiveWorkspaceId.value = 'workspace-456'
+      resolveStatus({
+        is_active: true,
+        has_funds: true,
+        billing_rail: 'stripe'
+      })
+      await statusRequest
+
+      expect(mockSetWorkspaceBillingRail).not.toHaveBeenCalled()
+    })
+
     it('coalesces concurrent callers into one fetch', async () => {
       let resolveStatus: (value: {
         is_active: boolean

src/platform/cloud/subscription/composables/useSubscription.ts

@@ -315,6 +315,7 @@ function useSubscriptionInternal() {
 
   // Coalesce concurrent callers so an auth/session-rotation burst mints one fetch.
   let inFlightStatusFetch: Promise<BillingStatusResponse | null> | null = null
+  let latestStatusRequestId = 0
 
   async function fetchSubscriptionStatus(): Promise<BillingStatusResponse | null> {
     if (inFlightStatusFetch) return inFlightStatusFetch
@@ -327,6 +328,8 @@ function useSubscriptionInternal() {
   async function performFetchSubscriptionStatus(): Promise<BillingStatusResponse | null> {
     if (!isCloud) return null
 
+    const requestId = ++latestStatusRequestId
+    const workspaceId = workspaceStore.activeWorkspaceId
     let statusData: BillingStatusResponse
     try {
       statusData = await workspaceApi.getBillingStatus()
@@ -337,10 +340,16 @@ function useSubscriptionInternal() {
         })
       )
     }
+    if (
+      requestId !== latestStatusRequestId ||
+      workspaceId !== workspaceStore.activeWorkspaceId
+    ) {
+      return null
+    }
     subscriptionStatus.value = statusData
-    if (workspaceStore.activeWorkspaceId && statusData.billing_rail) {
+    if (workspaceId && statusData.billing_rail) {
       workspaceStore.setWorkspaceBillingRail(
-        workspaceStore.activeWorkspaceId,
+        workspaceId,
         statusData.billing_rail
       )
     }