test(workspace): align retired flag coverage

Amp-Thread-ID: https://ampcode.com/threads/T-019fc8cd-b288-7161-a590-cd76d51212bf
Co-authored-by: Amp <amp@ampcode.com>

Author: dante01yoon

browser_tests/tests/currentUserPopoverCredits.spec.ts

@@ -2,10 +2,7 @@ import { expect } from '@playwright/test'
 
 import type { CloudSubscriptionStatusResponse } from '@/platform/cloud/subscription/composables/useSubscription'
 import type { RemoteConfig } from '@/platform/remoteConfig/types'
-import type {
-  BillingStatusResponse,
-  WorkspaceWithRole
-} from '@/platform/workspace/api/workspaceApi'
+import type { WorkspaceWithRole } from '@/platform/workspace/api/workspaceApi'
 import type { WorkspaceTokenResponse } from '@/platform/workspace/stores/workspaceAuthStore'
 import type { operations } from '@/types/comfyRegistryTypes'
 import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
@@ -54,20 +51,6 @@ const mockSubscriptionStatus: CloudSubscriptionStatusResponse = {
   end_date: FUTURE_DATE
 }
 
-// The facade routes a Cloud personal workspace through `/api/billing/*`. The
-// cancelled-but-active state maps to `is_active: true`
-// with `subscription_status: 'canceled'`; a paid tier keeps "Add credits"
-// visible (free tier would swap it for "Upgrade to add credits").
-const mockBillingStatus: BillingStatusResponse = {
-  is_active: true,
-  subscription_status: 'canceled',
-  subscription_tier: 'PRO',
-  subscription_duration: 'MONTHLY',
-  has_funds: true,
-  cancel_at: FUTURE_DATE,
-  renewal_date: FUTURE_DATE
-}
-
 // ~6.3M credits — a 7-digit balance is what pushes the second action button out
 // of the popover before the fix.
 const mockBalance: CustomerBalanceResponse = {
@@ -126,31 +109,6 @@ const test = comfyPageFixture.extend({
       })
     )
 
-    // The popover sources its data from the workspace billing endpoints.
-    await page.route('**/api/billing/status', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockBillingStatus)
-      })
-    )
-
-    await page.route('**/api/billing/balance', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(mockBalance)
-      })
-    )
-
-    await page.route('**/api/billing/plans', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify({ plans: [] })
-      })
-    )
-
     await use(page)
   }
 })

browser_tests/tests/dialogs/creditsTile.spec.ts

@@ -4,7 +4,6 @@ import type { Page, Request } from '@playwright/test'
 import type { RemoteConfig } from '@/platform/remoteConfig/types'
 import type {
   BillingOpStatusResponse,
-  BillingStatusResponse,
   CreateTopupResponse
 } from '@/platform/workspace/api/workspaceApi'
 
@@ -29,8 +28,8 @@ import {
  * shared `comfyPage` fixture can't boot (it expects the OSS devtools backend).
  * Instead this drives a raw page: mock Firebase auth + every boot endpoint so
  * the cloud app initializes against fully stubbed data. The facade routes a
- * personal workspace through the workspace `/api/billing/*` endpoints (mocked
- * with an active Pro subscription). The tile
+ * personal workspace through the legacy `/customers/*` endpoints (mocked with
+ * an active Pro subscription). The tile
  * should then render its total / progress bar / monthly+additional breakdown /
  * add-credits.
  */
@@ -42,8 +41,6 @@ const jsonRoute = (body: unknown) => ({
   body: JSON.stringify(body)
 })
 
-// Legacy `/customers/balance` and workspace `/api/billing/balance` share the
-// same response shape, so one body fulfills both endpoints.
 const balanceRoute = (balance: {
   amount: number
   monthly: number
@@ -60,14 +57,6 @@ const balanceRoute = (balance: {
 // 6000 -> 12,660 total; 5000 -> 10,550 monthly remaining; 1000 -> 2,110 extra.
 const DEFAULT_BALANCE = { amount: 6000, monthly: 5000, prepaid: 1000 }
 
-const mockBillingStatus: BillingStatusResponse = {
-  is_active: true,
-  subscription_tier: 'PRO',
-  subscription_duration: 'MONTHLY',
-  renewal_date: '2099-02-20T12:00:00Z',
-  has_funds: true
-}
-
 async function mockCloudBoot(page: Page, billingControlEnabled = true) {
   // Frontend-origin boot endpoints (proxied to the backend in production).
   // `/api/features` is the remote-config source for the billing UX rollout.
@@ -125,7 +114,7 @@ async function mockCloudBoot(page: Page, billingControlEnabled = true) {
     )
   )
 
-  // Legacy billing (flag-off path, api.comfy.org/customers/*).
+  // Legacy account billing (api.comfy.org/customers/*).
   await page.route('**/customers/cloud-subscription-status', (r) =>
     r.fulfill(
       jsonRoute({
@@ -140,32 +129,16 @@ async function mockCloudBoot(page: Page, billingControlEnabled = true) {
   await page.route('**/customers/balance', (r) =>
     r.fulfill(balanceRoute(DEFAULT_BALANCE))
   )
-
-  // Workspace billing (flag-on path) — a personal workspace now routes through
-  // `/api/billing/*`.
-  await page.route('**/api/billing/status', (r) =>
-    r.fulfill(jsonRoute(mockBillingStatus))
-  )
-  await page.route('**/api/billing/balance', (r) =>
-    r.fulfill(balanceRoute(DEFAULT_BALANCE))
-  )
-  await page.route('**/api/billing/plans', (r) =>
-    r.fulfill(jsonRoute({ plans: [] }))
-  )
 }
 
 async function mockBalance(
   page: Page,
   balance: { amount: number; monthly: number; prepaid: number }
 ) {
   await page.unroute('**/customers/balance')
-  await page.unroute('**/api/billing/balance')
   await page.route('**/customers/balance', (r) =>
     r.fulfill(balanceRoute(balance))
   )
-  await page.route('**/api/billing/balance', (r) =>
-    r.fulfill(balanceRoute(balance))
-  )
 }
 
 async function openSettings(page: Page) {

src/platform/auth/session/useSessionCookie.test.ts

@@ -200,7 +200,7 @@ describe('useSessionCookie', () => {
     expect(finalHeaders.get('Authorization')).toBe('Bearer firebase-user-a')
   })
 
-  it('does not let strict Firebase creation join a weaker request', async () => {
+  it('lets strict creation join an in-flight Firebase request on Cloud', async () => {
     mockGetAuthHeader.mockResolvedValue(null)
     mockGetIdToken.mockResolvedValue('firebase-id-token')
     vi.mocked(globalThis.fetch).mockResolvedValue(
@@ -218,6 +218,7 @@ describe('useSessionCookie', () => {
       vi.mocked(globalThis.fetch).mock.calls[0][1]?.headers
     )
     expect(headers.get('Authorization')).toBe('Bearer firebase-id-token')
+    expect(mockGetAuthHeader).not.toHaveBeenCalled()
   })
 
   it('serializes session deletion after an in-flight creation', async () => {

src/platform/settings/composables/useSettingUI.ts

@@ -3,7 +3,6 @@ import type { Component } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
 import { isCloud, isDesktop } from '@/platform/distribution/types'
@@ -58,7 +57,6 @@ export function useSettingUI(
 
   const { flags } = useFeatureFlags()
   const { shouldRenderVueNodes } = useVueFeatureFlags()
-  const { isActiveSubscription, type: billingType } = useBillingContext()
   const { workspaceRole } = useWorkspaceUI()
 
   const settingRoot = computed<SettingTreeNode>(() => {
@@ -139,33 +137,6 @@ export function useSettingUI(
     )
   }
 
-  const subscriptionPanel: SettingPanelItem | null =
-    !isCloud || !window.__CONFIG__?.subscription_required
-      ? null
-      : {
-          node: {
-            key: 'subscription',
-            label: 'PlanCredits',
-            children: []
-          },
-          component: defineAsyncComponent(
-            () =>
-              import('@/platform/cloud/subscription/components/SubscriptionPanel.vue')
-          )
-        }
-
-  const shouldShowPlanCreditsPanel = computed(() => {
-    if (!subscriptionPanel) return false
-    return isActiveSubscription.value
-  })
-
-  const shouldShowLegacyPlanCreditsPanel = computed(
-    () =>
-      isLoggedIn.value &&
-      billingType.value === 'legacy' &&
-      shouldShowPlanCreditsPanel.value
-  )
-
   const userPanel: SettingPanelItem = {
     node: {
       key: 'user',
@@ -303,9 +274,6 @@ export function useSettingUI(
       keybindingPanel,
       extensionPanel,
       ...(isDesktop ? [serverConfigPanel] : []),
-      ...(shouldShowPlanCreditsPanel.value && subscriptionPanel
-        ? [subscriptionPanel]
-        : []),
       ...(shouldShowSecretsPanel.value ? [secretsPanel] : [])
     ].filter((panel) => panel !== null && panel.component)
   )
@@ -396,9 +364,6 @@ export function useSettingUI(
       label: 'Account',
       children: [
         userPanel.node,
-        ...(shouldShowLegacyPlanCreditsPanel.value && subscriptionPanel
-          ? [subscriptionPanel.node]
-          : []),
         ...(shouldShowSecretsPanel.value ? [secretsPanel.node] : []),
         ...(isLoggedIn.value &&
         !(isCloud && window.__CONFIG__?.subscription_required)