Merge remote-tracking branch 'origin/main' into benjcooley/matrix-detection-proof

Author: benjcooley

browser_tests/fixtures/data/subscriptionFixtures.ts

@@ -13,6 +13,9 @@ export function createSubscriptionStatus(
     subscription_tier: 'FREE',
     has_funds: false,
     billing_rail: 'legacy_stripe',
+    max_seats: 0,
+    occupied_seats: 0,
+    team_credit_stop: null,
     ...overrides
   }
 }

browser_tests/tests/billingFacadeConsumers.spec.ts

@@ -50,10 +50,19 @@ const mockWorkspaceBalance: BillingBalanceResponse = {
 
 async function mockCloudBoot(
   page: Page,
-  subscriptionStatus: BillingStatusResponse,
+  subscriptionStatus: Partial<BillingStatusResponse>,
   remoteConfig: RemoteConfig = {},
   billingRail?: BillingStatusResponse['billing_rail']
 ) {
+  const resolvedSubscriptionStatus: BillingStatusResponse = {
+    is_active: false,
+    has_funds: false,
+    max_seats: 0,
+    occupied_seats: 0,
+    team_credit_stop: null,
+    ...subscriptionStatus,
+    ...(billingRail === undefined ? {} : { billing_rail: billingRail })
+  }
   const billingRequests = {
     legacyStatus: 0,
     legacyBalance: 0,
@@ -112,18 +121,13 @@ async function mockCloudBoot(
   })
   await page.route('**/customers/cloud-subscription-status', (r) => {
     billingRequests.legacyStatus++
-    return r.fulfill(jsonRoute(subscriptionStatus))
+    return r.fulfill(jsonRoute(resolvedSubscriptionStatus))
   })
 
   // Cloud personal workspaces route through `/api/billing/*`.
   await page.route('**/api/billing/status', (r) => {
     billingRequests.workspaceStatus++
-    return r.fulfill(
-      jsonRoute({
-        ...subscriptionStatus,
-        billing_rail: billingRail
-      })
-    )
+    return r.fulfill(jsonRoute(resolvedSubscriptionStatus))
   })
   await page.route('**/api/billing/balance', (r) => {
     billingRequests.workspaceBalance++

browser_tests/tests/currentUserPopoverCredits.spec.ts

@@ -53,6 +53,7 @@ const mockBillingStatus: BillingStatusResponse = {
   is_active: true,
   max_seats: 1,
   occupied_seats: 1,
+  team_credit_stop: null,
   subscription_status: 'canceled',
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',

browser_tests/tests/dialogs/creditsTile.spec.ts

@@ -63,6 +63,7 @@ const mockBillingStatus: BillingStatusResponse = {
   is_active: true,
   max_seats: 1,
   occupied_seats: 1,
+  team_credit_stop: null,
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',
   renewal_date: '2099-02-20T12:00:00Z',
@@ -71,12 +72,18 @@ const mockBillingStatus: BillingStatusResponse = {
 
 const freeBillingStatus: BillingStatusResponse = {
   is_active: false,
+  max_seats: 1,
+  occupied_seats: 1,
+  team_credit_stop: null,
   subscription_tier: 'FREE',
   has_funds: true
 }
 
 const endedPersonalBillingStatus: BillingStatusResponse = {
   is_active: false,
+  max_seats: 1,
+  occupied_seats: 1,
+  team_credit_stop: null,
   subscription_status: 'ended',
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',

browser_tests/tests/gettingStartedTour.spec.ts

@@ -49,6 +49,9 @@ const TOUR_FEATURE_FLAGS: RemoteConfig = {
 
 const ACTIVE_SUBSCRIPTION: BillingStatusResponse = {
   is_active: true,
+  max_seats: 1,
+  occupied_seats: 1,
+  team_credit_stop: null,
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',
   renewal_date: '2099-01-01',
@@ -57,6 +60,9 @@ const ACTIVE_SUBSCRIPTION: BillingStatusResponse = {
 
 const INACTIVE_SUBSCRIPTION: BillingStatusResponse = {
   is_active: false,
+  max_seats: 1,
+  occupied_seats: 1,
+  team_credit_stop: null,
   subscription_tier: 'FREE',
   subscription_duration: 'MONTHLY',
   has_funds: false

src/composables/billing/useBillingContext.test.ts

@@ -19,6 +19,7 @@ const DEFAULT_BILLING_STATUS: BillingStatusResponse = {
   max_seats: 73,
   occupied_seats: 72,
   has_funds: true,
+  team_credit_stop: null,
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY'
 }
@@ -190,6 +191,9 @@ describe('useBillingContext', () => {
     mockLegacyStatus.value = {
       is_active: true,
       has_funds: true,
+      max_seats: 0,
+      occupied_seats: 0,
+      team_credit_stop: null,
       renewal_date: '2025-01-01T00:00:00Z'
     }
     mockBillingStatus.value = { ...DEFAULT_BILLING_STATUS }

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

@@ -111,4 +111,21 @@ describe('deriveBillingPolicyState', () => {
       ).toEqual({ kind })
     }
   )
+
+  it.for<[string, boolean]>([
+    ['LocalTeamWithoutActiveSubscription', false],
+    ['CloudTeamWithoutActiveSubscription', true]
+  ])(
+    'preserves an inactive TEAM tier as %s without the isTeamPlan signal (isCloud=%s)',
+    ([kind, isCloud]) => {
+      expect(
+        deriveBillingPolicyState({
+          isCloud,
+          canAccessSubscriptionFeatures: false,
+          isTeamPlan: false,
+          tier: 'TEAM'
+        })
+      ).toEqual({ kind })
+    }
+  )
 })

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

@@ -18,7 +18,7 @@ export function deriveBillingPolicyState(input: {
 }): BillingPolicyState {
   const distribution = input.isCloud ? 'Cloud' : 'Local'
 
-  if (input.isTeamPlan) {
+  if (input.isTeamPlan || input.tier === 'TEAM') {
     return {
       kind: input.canAccessSubscriptionFeatures
         ? `${distribution}AndTeam`
@@ -41,8 +41,6 @@ export function deriveBillingPolicyState(input: {
       return { kind: `${distribution}AndPro` }
     case 'FOUNDERS_EDITION':
       return { kind: `${distribution}AndFounders` }
-    case 'TEAM':
-      return { kind: `${distribution}AndTeam` }
     case null:
       return { kind: `${distribution}AndUnknown` }
     default:

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

@@ -18,6 +18,9 @@ describe('useSubscriptionCancellationWatcher', () => {
   const baseStatus: BillingStatusResponse = {
     is_active: true,
     has_funds: true,
+    max_seats: 0,
+    occupied_seats: 0,
+    team_credit_stop: null,
     renewal_date: '2025-11-16'
   }
 
@@ -62,9 +65,8 @@ describe('useSubscriptionCancellationWatcher', () => {
       if (fetchStatus.mock.calls.length === 2) {
         isActive.value = false
         subscriptionStatus.value = {
+          ...baseStatus,
           is_active: false,
-          has_funds: true,
-          renewal_date: '2025-11-16',
           cancel_at: '2025-12-01'
         }
       }

src/platform/workspace/api/workspaceApi.test.ts

@@ -439,15 +439,23 @@ describe('workspaceApi', () => {
   })
 
   describe('subscription', () => {
-    it('previewSubscribe() sends POST with plan_slug', async () => {
+    it('previewSubscribe() sends only fields defined by the ingest contract', async () => {
       const data = { allowed: true, transition_type: 'new_subscription' }
       mockAxiosInstance.post.mockResolvedValue({ data })
 
-      const result = await workspaceApi.previewSubscribe('pro-monthly')
+      const result = await workspaceApi.previewSubscribe(
+        'team_per_credit_annual',
+        {
+          teamCreditStopId: 'team_700'
+        }
+      )
 
       expect(mockAxiosInstance.post).toHaveBeenCalledWith(
         '/api/billing/preview-subscribe',
-        { plan_slug: 'pro-monthly' },
+        {
+          plan_slug: 'team_per_credit_annual',
+          team_credit_stop_id: 'team_700'
+        },
         { headers: AUTH_HEADER }
       )
       expect(result).toEqual(data)