fix: identify past-due subscriptions precisely

Amp-Thread-ID: https://ampcode.com/threads/T-01a001d5-47e3-720d-8e82-82c45995251e
Co-authored-by: Amp <amp@ampcode.com>

Author: dante01yoon

browser_tests/tests/dialogs/creditsTile.spec.ts

@@ -85,7 +85,7 @@ const endedPersonalBillingStatus: BillingStatusResponse = {
   has_funds: true
 }
 
-const paymentFailedBillingStatus: BillingStatusResponse = {
+const pastDueBillingStatus: BillingStatusResponse = {
   ...mockBillingStatus,
   is_active: false,
   billing_status: 'payment_failed'
@@ -282,12 +282,12 @@ test.describe('Credits tile (Plan & Credits)', { tag: '@cloud' }, () => {
       .toBe('https://billing.example/portal')
   })
 
-  test('keeps billing management available when payment fails', async ({
+  test('keeps billing management available for a past-due subscription', async ({
     page
   }) => {
     test.setTimeout(60_000)
 
-    await mockCloudBoot(page, true, paymentFailedBillingStatus)
+    await mockCloudBoot(page, true, pastDueBillingStatus)
 
     const content = await openPlanAndCredits(page)
     await expect(

src/platform/workspace/components/CurrentUserPopoverWorkspace.test.ts

@@ -16,6 +16,7 @@ const state = vi.hoisted(() => ({
   canAccessSubscriptionFeatures: true,
   isFreeTier: false,
   isCancelled: false,
+  planSlug: 'pro-monthly' as string | null,
   canTopUp: false,
   canManageSubscription: false,
   canManageSubscriptionLifecycle: false,
@@ -60,7 +61,8 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     ),
     isFreeTier: computed(() => state.isFreeTier),
     subscription: computed(() => ({
-      isCancelled: state.isCancelled
+      isCancelled: state.isCancelled,
+      planSlug: state.planSlug
     })),
     balance: ref({ amountMicros: 100 }),
     isLoading: ref(false),
@@ -163,6 +165,7 @@ describe('CurrentUserPopoverWorkspace', () => {
     state.canAccessSubscriptionFeatures = true
     state.isFreeTier = false
     state.isCancelled = false
+    state.planSlug = 'pro-monthly'
     state.canTopUp = false
     state.canManageSubscription = false
     state.canManageSubscriptionLifecycle = false
@@ -253,7 +256,7 @@ describe('CurrentUserPopoverWorkspace', () => {
   })
 
   it.for(['payment_failed', 'paused'])(
-    'keeps Manage plan available instead of Subscribe when billing is %s',
+    'keeps Manage plan available for an existing %s subscription',
     (billingStatus) => {
       state.billingStatus = billingStatus
       state.canAccessSubscriptionFeatures = false
@@ -268,6 +271,22 @@ describe('CurrentUserPopoverWorkspace', () => {
     }
   )
 
+  it('shows Subscribe instead of Manage plan when payment_failed has no plan', () => {
+    state.billingStatus = 'payment_failed'
+    state.canAccessSubscriptionFeatures = false
+    state.canManageSubscription = true
+    state.planSlug = null
+
+    renderComponent('team')
+
+    expect(
+      screen.queryByTestId('manage-plan-menu-item')
+    ).not.toBeInTheDocument()
+    expect(
+      screen.getByRole('button', { name: 'Subscribe' })
+    ).toBeInTheDocument()
+  })
+
   it.for([
     {
       name: 'allows a lifecycle manager to resubscribe a cancelled plan',

src/platform/workspace/components/CurrentUserPopoverWorkspace.vue

@@ -306,19 +306,22 @@ const displayedCredits = computed(() => {
 const showPlansAndPricing = computed(
   () => permissions.value.canManageSubscription
 )
+const hasDelinquentSubscription = computed(
+  () =>
+    (billingStatus.value === 'payment_failed' ||
+      billingStatus.value === 'paused') &&
+    Boolean(subscription.value?.planSlug)
+)
 const showManagePlan = computed(
   () =>
     permissions.value.canManageSubscription &&
-    (canAccessSubscriptionFeatures.value ||
-      billingStatus.value === 'payment_failed' ||
-      billingStatus.value === 'paused')
+    (canAccessSubscriptionFeatures.value || hasDelinquentSubscription.value)
 )
 const showSubscribeAction = computed(
   () =>
     (isCancelled.value && permissions.value.canManageSubscriptionLifecycle) ||
     (!canAccessSubscriptionFeatures.value &&
-      billingStatus.value !== 'payment_failed' &&
-      billingStatus.value !== 'paused' &&
+      !hasDelinquentSubscription.value &&
       permissions.value.canManageSubscription)
 )
 

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

@@ -12,6 +12,7 @@ const state = vi.hoisted(() => ({
   isDeleteDisabled: false,
   isFreeTier: false,
   isInPersonalWorkspace: false,
+  planSlug: 'pro-monthly' as string | null,
   isSubscriptionCancelled: false
 }))
 
@@ -30,7 +31,10 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
   useBillingContext: () => ({
     billingStatus: computed(() => state.billingStatus),
     isFreeTier: computed(() => state.isFreeTier),
-    subscription: computed(() => ({ endDate: '2026-08-01T00:00:00Z' }))
+    subscription: computed(() => ({
+      endDate: '2026-08-01T00:00:00Z',
+      planSlug: state.planSlug
+    }))
   })
 }))
 
@@ -76,6 +80,7 @@ describe('useWorkspaceMenuItems', () => {
     state.isDeleteDisabled = false
     state.isFreeTier = false
     state.isInPersonalWorkspace = false
+    state.planSlug = 'pro-monthly'
     state.isSubscriptionCancelled = false
   })
 
@@ -128,13 +133,26 @@ describe('useWorkspaceMenuItems', () => {
     )
   })
 
-  it('withholds cancellation while a plan is paused', () => {
+  it('allows cancellation while an existing plan is paused', () => {
     state.billingStatus = 'paused'
     state.canManageSubscriptionLifecycle = true
     state.isActiveSubscription = false
 
     const { menuItems } = useWorkspaceMenuItems()
 
+    expect(menuItems.value.map((item) => item.label)).toContain(
+      'subscription.cancelPlan'
+    )
+  })
+
+  it('withholds cancellation when payment_failed has no subscription plan', () => {
+    state.billingStatus = 'payment_failed'
+    state.canManageSubscriptionLifecycle = true
+    state.isActiveSubscription = false
+    state.planSlug = null
+
+    const { menuItems } = useWorkspaceMenuItems()
+
     expect(menuItems.value.map((item) => item.label)).not.toContain(
       'subscription.cancelPlan'
     )

src/platform/workspace/composables/useWorkspaceMenuItems.ts

@@ -66,7 +66,9 @@ export function useWorkspaceMenuItems() {
     () =>
       permissions.value.canManageSubscriptionLifecycle &&
       (isActiveSubscription.value ||
-        billingStatus.value === 'payment_failed') &&
+        ((billingStatus.value === 'payment_failed' ||
+          billingStatus.value === 'paused') &&
+          Boolean(subscription.value?.planSlug))) &&
       !isSubscriptionCancelled.value &&
       !isFreeTier.value
   )