fix: revert checkout ref pin to avoid running fork code in privileged context

The workflow_run trigger has access to secrets.CODECOV_TOKEN. Checking out workflow_run.head_sha would let fork PRs control code executed via .github/actions/setup-frontend (pnpm install). The default checkout (default branch) is safe, and --ignore-errors source already tolerates source file mismatches in genhtml. Addresses review feedback: https://github.com/Comfy-Org/ComfyUI_frontend/pull/11381#discussion_r3107765436
fix: harden e2e coverage workflow and fix GH Pages deploy
2026-05-06 06:01:58 +00:00 · 2026-05-01 21:03:18 -07:00 · 2026-05-01 21:03:18 -07:00
19 changed files with 250 additions and 1157 deletions
--- a/.github/actions/ashby-pull/action.yaml
+++ b/.github/actions/ashby-pull/action.yaml
@@ -1,23 +0,0 @@
-name: Ashby Pull
-description: 'Refresh the apps/website Ashby roles snapshot from the Ashby job board API'
-inputs:
-  api_key:
-    description: 'Ashby API key (WEBSITE_ASHBY_API_KEY).'
-    required: true
-  job_board_name:
-    description: 'Ashby job board name (WEBSITE_ASHBY_JOB_BOARD_NAME).'
-    required: true
-runs:
-  using: 'composite'
-  steps:
-    # Note: this action assumes the frontend repo is checked out at the workspace root.
-
-    - name: Setup frontend
-      uses: ./.github/actions/setup-frontend
-
-    - name: Refresh Ashby snapshot
-      shell: bash
-      env:
-        WEBSITE_ASHBY_API_KEY: ${{ inputs.api_key }}
-        WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ inputs.job_board_name }}
-      run: pnpm --filter @comfyorg/website ashby:refresh-snapshot
--- a/.github/workflows/ci-tests-e2e-coverage.yaml
+++ b/.github/workflows/ci-tests-e2e-coverage.yaml
@@ -104,14 +104,16 @@ jobs:
          if [ ! -s coverage/playwright/coverage.lcov ]; then
            echo "No coverage data; generating placeholder report."
            mkdir -p coverage/html
-            echo '<html><body><h1>No E2E coverage data available for this run.</h1></body></html>' > coverage/html/index.html
+            WORKFLOW_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}"
+            echo "<html><body><h1>No E2E coverage data available for this run.</h1><p><a href=\"${WORKFLOW_URL}\">View workflow run</a></p></body></html>" > coverage/html/index.html
            exit 0
          fi
          genhtml coverage/playwright/coverage.lcov \
            -o coverage/html \
            --title "ComfyUI E2E Coverage" \
            --no-function-coverage \
-            --precision 1
+            --precision 1 \
+            --ignore-errors source

      - name: Upload HTML report artifact
        uses: actions/upload-artifact@v6
@@ -122,7 +124,9 @@ jobs:

  deploy:
    needs: merge
-    if: github.event.workflow_run.head_branch == 'main'
+    if: >
+      github.event.workflow_run.head_branch == 'main' &&
+      github.event.workflow_run.event == 'push'
    runs-on: ubuntu-latest
    permissions:
      pages: write
--- a/.github/workflows/ci-vercel-website-preview.yaml
+++ b/.github/workflows/ci-vercel-website-preview.yaml
@@ -52,9 +52,6 @@ jobs:
        run: vercel pull --yes --environment=preview

      - name: Build project artifacts
-        env:
-          WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
-          WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ secrets.WEBSITE_ASHBY_JOB_BOARD_NAME }}
        run: vercel build

      - name: Fetch head commit metadata
@@ -149,9 +146,6 @@ jobs:
        run: vercel pull --yes --environment=production

      - name: Build project artifacts
-        env:
-          WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
-          WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ secrets.WEBSITE_ASHBY_JOB_BOARD_NAME }}
        run: vercel build --prod

      - name: Deploy project artifacts to Vercel
--- a/.github/workflows/ci-website-build.yaml
+++ b/.github/workflows/ci-website-build.yaml
@@ -36,7 +36,4 @@ jobs:
        uses: ./.github/actions/setup-frontend

      - name: Build website
-        env:
-          WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
-          WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ secrets.WEBSITE_ASHBY_JOB_BOARD_NAME }}
        run: pnpm --filter @comfyorg/website build
--- a/.github/workflows/release-website.yaml
+++ b/.github/workflows/release-website.yaml
@@ -1,59 +0,0 @@
-# Description: Manual workflow to refresh the apps/website Ashby roles snapshot
-# and open a PR. Merging the PR triggers the existing Vercel website production
-# deploy via ci-vercel-website-preview.yaml.
-name: 'Release: Website'
-
-on:
-  workflow_dispatch:
-
-concurrency:
-  group: release-website
-  cancel-in-progress: true
-
-jobs:
-  refresh-snapshot:
-    if: github.repository == 'Comfy-Org/ComfyUI_frontend'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          ref: main
-          persist-credentials: false
-
-      - name: Refresh Ashby snapshot
-        uses: ./.github/actions/ashby-pull
-        with:
-          api_key: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
-          job_board_name: ${{ secrets.WEBSITE_ASHBY_JOB_BOARD_NAME }}
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
-        with:
-          token: ${{ secrets.PR_GH_TOKEN }}
-          commit-message: 'chore(website): refresh Ashby roles snapshot'
-          title: 'chore(website): refresh Ashby roles snapshot'
-          body: |
-            Automated refresh of `apps/website/src/data/ashby-roles.snapshot.json`
-            from the Ashby job board API.
-
-            **Flow:**
-            1. `Release: Website` workflow ran (manual trigger).
-            2. This PR opens with the regenerated snapshot.
-            3. `CI: Vercel Website Preview` deploys a preview for review.
-            4. Merging to `main` triggers the production Vercel deploy.
-
-            The snapshot fallback in `apps/website/src/utils/ashby.ts` remains
-            intact: builds without `WEBSITE_ASHBY_API_KEY` continue to use the
-            committed snapshot.
-
-            Triggered by workflow run `${{ github.run_id }}`.
-          branch: chore/refresh-ashby-snapshot-${{ github.run_id }}
-          base: main
-          labels: |
-            Release:Website
-          delete-branch: true
--- a/apps/website/public/robots.txt
+++ b/apps/website/public/robots.txt
@@ -1,33 +1,4 @@
-# robots.txt for comfy.org
-# Open to all crawlers — including AI/LLM bots — for maximum visibility
-# in AI-powered search, chat-based answer engines, and traditional search.
-# Granular UAs are listed explicitly to signal intent; rules are shared
-# via stacked user-agent records (RFC 9309 §2.2).
-
 User-agent: *
-User-agent: Googlebot
-User-agent: Bingbot
-User-agent: DuckDuckBot
-User-agent: GPTBot
-User-agent: ChatGPT-User
-User-agent: OAI-SearchBot
-User-agent: Google-Extended
-User-agent: ClaudeBot
-User-agent: Claude-Web
-User-agent: anthropic-ai
-User-agent: PerplexityBot
-User-agent: Perplexity-User
-User-agent: Applebot
-User-agent: Applebot-Extended
-User-agent: Bytespider
-User-agent: Amazonbot
-User-agent: CCBot
-User-agent: Meta-ExternalAgent
-User-agent: Meta-ExternalFetcher
-User-agent: Diffbot
 Allow: /
-Disallow: /_astro/
-Disallow: /_website/
-Disallow: /_vercel/

-Sitemap: https://comfy.org/sitemap-index.xml
+Sitemap: https://comfy.org/sitemap-0.xml
--- a/apps/website/vercel.json
+++ b/apps/website/vercel.json
@@ -7,15 +7,6 @@
  "github": {
    "enabled": false
  },
-  "headers": [
-    {
-      "source": "/(.*)",
-      "has": [
-        { "type": "host", "value": "website-frontend-comfyui.vercel.app" }
-      ],
-      "headers": [{ "key": "X-Robots-Tag", "value": "index, follow" }]
-    }
-  ],
  "redirects": [
    {
      "source": "/pricing",
--- a/browser_tests/assets/default.json
+++ b/browser_tests/assets/default.json
@@ -119,15 +119,7 @@
        { "name": "CLIP", "type": "CLIP", "links": [3, 5], "slot_index": 1 },
        { "name": "VAE", "type": "VAE", "links": [8], "slot_index": 2 }
      ],
-      "properties": {
-        "models": [
-          {
-            "name": "v1-5-pruned-emaonly-fp16.safetensors",
-            "url": "https://huggingface.co/Comfy-Org/stable-diffusion-v1-5-archive/resolve/main/v1-5-pruned-emaonly-fp16.safetensors",
-            "directory": "checkpoints"
-          }
-        ]
-      },
+      "properties": {},
      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
    }
  ],
--- a/browser_tests/fixtures/selectors.ts
+++ b/browser_tests/fixtures/selectors.ts
@@ -211,8 +211,7 @@ export const TestIds = {
  queue: {
    overlayToggle: 'queue-overlay-toggle',
    clearHistoryAction: 'clear-history-action',
-    jobAssetsList: 'job-assets-list',
-    notificationBanner: 'queue-notification-banner'
+    jobAssetsList: 'job-assets-list'
  },
  errors: {
    imageLoadError: 'error-loading-image',
--- a/browser_tests/tests/queueNotificationBanners.spec.ts
+++ b/browser_tests/tests/queueNotificationBanners.spec.ts
@@ -1,164 +0,0 @@
-import type { Page } from '@playwright/test'
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-// Mirrors BANNER_DISMISS_DELAY_MS in src/composables/queue/useQueueNotificationBanners.ts.
-// Duplicated here to avoid pulling production source (and its litegraph
-// transitive deps) into the Playwright TS loader.
-const BANNER_DISMISS_DELAY_MS = 4000
-const BANNER_ASSERT_TIMEOUT_MS = BANNER_DISMISS_DELAY_MS + 2000
-
-const REQUEST_ID_PRIMARY = 1
-const REQUEST_ID_SECONDARY = 2
-const REQUEST_ID_MISMATCH = 999
-
-let nextRequestId = 1000
-const newRequestId = () => nextRequestId++
-
-function bannerLocator(page: Page) {
-  return page.getByTestId(TestIds.queue.notificationBanner)
-}
-
-type DispatchOpts = { batchCount?: number; requestId?: number }
-
-function dispatchPromptQueueing(page: Page, opts: DispatchOpts = {}) {
-  return page.evaluate(
-    ([batchCount, requestId]) => {
-      window.app!.api.dispatchCustomEvent('promptQueueing', {
-        batchCount,
-        requestId
-      })
-    },
-    [opts.batchCount ?? 1, opts.requestId ?? newRequestId()]
-  )
-}
-
-function dispatchPromptQueued(page: Page, opts: DispatchOpts = {}) {
-  return page.evaluate(
-    ([batchCount, requestId]) => {
-      window.app!.api.dispatchCustomEvent('promptQueued', {
-        number: 0,
-        batchCount,
-        requestId
-      })
-    },
-    [opts.batchCount ?? 1, opts.requestId ?? newRequestId()]
-  )
-}
-
-test.describe('Queue notification banners', { tag: ['@ui'] }, () => {
-  test.describe('Queuing lifecycle', () => {
-    test('promptQueueing event shows a queueing banner', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueueing(comfyPage.page)
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toBeVisible()
-      await expect(banner).toContainText('queuing')
-    })
-
-    test('promptQueued upgrades a pending banner to queued', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueueing(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_PRIMARY
-      })
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toContainText('queuing')
-
-      await dispatchPromptQueued(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_PRIMARY
-      })
-
-      await expect(banner).toContainText('queued')
-    })
-
-    test('promptQueued with batch count > 1 shows plural text', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueued(comfyPage.page, { batchCount: 3 })
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toBeVisible()
-      await expect(banner).toContainText('3')
-      await expect(banner).toContainText('jobs added to queue')
-    })
-
-    test('promptQueued with mismatched requestId enqueues a separate queued banner', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueueing(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_PRIMARY
-      })
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toContainText('queuing')
-
-      await dispatchPromptQueued(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_MISMATCH
-      })
-
-      // Pending banner is not upgraded — still shows "queuing".
-      await expect(banner).toContainText('queuing')
-
-      // After the pending banner auto-dismisses, the queued banner appears.
-      await expect(banner).toContainText('queued', {
-        timeout: BANNER_ASSERT_TIMEOUT_MS
-      })
-    })
-  })
-
-  test.describe('Auto-dismiss', () => {
-    test('Banner auto-dismisses after timeout', async ({ comfyPage }) => {
-      await dispatchPromptQueued(comfyPage.page)
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toBeVisible()
-      await expect(banner).toBeHidden({ timeout: BANNER_ASSERT_TIMEOUT_MS })
-    })
-  })
-
-  test.describe('Notification queue (FIFO)', () => {
-    test('Second notification shows after first auto-dismisses', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueued(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_PRIMARY
-      })
-      await dispatchPromptQueued(comfyPage.page, {
-        batchCount: 2,
-        requestId: REQUEST_ID_SECONDARY
-      })
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toContainText('Job queued')
-      await expect(banner).toContainText('2 jobs added to queue', {
-        timeout: BANNER_ASSERT_TIMEOUT_MS
-      })
-    })
-  })
-
-  test.describe('Direct queued event (no pending predecessor)', () => {
-    test('promptQueued without prior queueing shows queued banner directly', async ({
-      comfyPage
-    }) => {
-      await dispatchPromptQueued(comfyPage.page, {
-        batchCount: 1,
-        requestId: REQUEST_ID_PRIMARY
-      })
-
-      const banner = bannerLocator(comfyPage.page)
-      await expect(banner).toBeVisible()
-      await expect(banner).toContainText('queued')
-    })
-  })
-})
--- a/src/components/queue/QueueNotificationBannerHost.vue
+++ b/src/components/queue/QueueNotificationBannerHost.vue
@@ -5,7 +5,6 @@
    role="status"
    aria-live="polite"
    aria-atomic="true"
-    data-testid="queue-notification-banner"
  >
    <QueueNotificationBanner :notification="currentNotification" />
  </div>
--- a/src/lib/litegraph/src/LGraphNode.ts
+++ b/src/lib/litegraph/src/LGraphNode.ts
@@ -98,21 +98,6 @@ import type { WidgetTypeMap } from './widgets/widgetMap'

 // #region Types

-/**
- * Canonical identifier type for a litegraph node.
- *
- * This is the single source of truth for node IDs across the litegraph
- * library and the workflow schema layer. Other modules SHOULD import
- * `NodeId` from here (or via the workflow schema re-export) rather than
- * declaring local `string` / `number | string` aliases.
- *
- * Note: `src/renderer/core/layout/types.ts` deliberately defines a
- * narrower `NodeId = string` for the Vue-node renderer, where IDs are
- * normalized to strings. That is a separate, intentionally-narrower
- * layered alias — see the JSDoc there.
- *
- * Tracking issue for full migration: #11428.
- */
 export type NodeId = number | string

 export type NodeProperty = string | number | boolean | object
--- a/src/platform/workflow/validation/schemas/workflowSchema.ts
+++ b/src/platform/workflow/validation/schemas/workflowSchema.ts
@@ -1,9 +1,7 @@
 import { z } from 'zod'
 import type { SafeParseReturnType } from 'zod'
 import { fromZodError } from 'zod-validation-error'
-
 import type { RendererType } from '@/lib/litegraph/src/LGraph'
-import type { NodeId } from '@/lib/litegraph/src/LGraphNode'

 const zRendererType = z.enum([
  'LG',
@@ -14,20 +12,9 @@ const zRendererType = z.enum([
 // GroupNode is hacking node id to be a string, so we need to allow that.
 // innerNode.id = `${this.node.id}:${i}`
 // Remove it after GroupNode is redesigned.
-export const zNodeId = z.union([
-  z.number().int(),
-  z.string()
-]) satisfies z.ZodType<NodeId>
+export const zNodeId = z.union([z.number().int(), z.string()])
 const zNodeInputName = z.string()
-
-/**
- * Re-export of the canonical {@link NodeId} type defined in
- * `src/lib/litegraph/src/LGraphNode.ts`. Kept here for ergonomic imports
- * alongside `zNodeId` (the runtime validator) and historical call sites.
- *
- * See issue #11428 for the consolidation rationale.
- */
-export type { NodeId }
+export type NodeId = z.infer<typeof zNodeId>

 /**
 * UUID identifier for a saved workflow.
--- a/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.test.ts
+++ b/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.test.ts
@@ -1,198 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { render, screen } from '@testing-library/vue'
-import userEvent from '@testing-library/user-event'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
-
-import SubscriptionRequiredDialogContentWorkspace from './SubscriptionRequiredDialogContentWorkspace.vue'
-
-const mockHandleSubscribeClick = vi.fn()
-const mockHandleBackToPricing = vi.fn()
-const mockHandleAddCreditCard = vi.fn()
-const mockHandleConfirmTransition = vi.fn()
-const mockHandleResubscribe = vi.fn()
-const mockCheckoutStep = ref<'pricing' | 'preview'>('pricing')
-const mockPreviewData = ref<{ transition_type: string } | null>(null)
-
-vi.mock('@/platform/workspace/composables/useSubscriptionCheckout', () => ({
-  useSubscriptionCheckout: () => ({
-    checkoutStep: mockCheckoutStep,
-    isLoadingPreview: ref(false),
-    loadingTier: ref(null),
-    isSubscribing: ref(false),
-    isResubscribing: ref(false),
-    previewData: mockPreviewData,
-    selectedTierKey: ref('standard'),
-    selectedBillingCycle: ref('yearly'),
-    isPolling: ref(false),
-    handleSubscribeClick: mockHandleSubscribeClick,
-    handleBackToPricing: mockHandleBackToPricing,
-    handleAddCreditCard: mockHandleAddCreditCard,
-    handleConfirmTransition: mockHandleConfirmTransition,
-    handleResubscribe: mockHandleResubscribe
-  })
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      g: { back: 'Back', close: 'Close' },
-      subscription: {
-        plansForWorkspace: 'Plans for {workspace}',
-        teamWorkspace: 'Team'
-      },
-      credits: {
-        topUp: {
-          insufficientTitle: 'Insufficient Credits',
-          insufficientMessage: 'You have run out of credits.'
-        }
-      }
-    }
-  }
-})
-
-const PricingTableStub = {
-  name: 'PricingTableWorkspace',
-  template: `<div data-testid="pricing-table">
-    <button data-testid="subscribe-btn" @click="$emit('subscribe', { tierKey: 'standard', billingCycle: 'yearly' })">Subscribe</button>
-    <button data-testid="resubscribe-btn" @click="$emit('resubscribe')">Resubscribe</button>
-  </div>`
-}
-
-const AddPaymentPreviewStub = {
-  name: 'SubscriptionAddPaymentPreviewWorkspace',
-  template: `<div data-testid="add-payment-preview">
-    <button data-testid="add-card-btn" @click="$emit('addCreditCard')">Add Card</button>
-  </div>`
-}
-
-const TransitionPreviewStub = {
-  name: 'SubscriptionTransitionPreviewWorkspace',
-  template: `<div data-testid="transition-preview">
-    <button data-testid="confirm-btn" @click="$emit('confirm')">Confirm</button>
-  </div>`
-}
-
-function renderComponent(
-  props: { onClose?: () => void; reason?: SubscriptionDialogReason } = {}
-) {
-  return render(SubscriptionRequiredDialogContentWorkspace, {
-    props: {
-      onClose: props.onClose ?? vi.fn(),
-      ...(props.reason ? { reason: props.reason } : {})
-    },
-    global: {
-      plugins: [
-        createTestingPinia({ createSpy: vi.fn, stubActions: false }),
-        i18n
-      ],
-      stubs: {
-        PricingTableWorkspace: PricingTableStub,
-        SubscriptionAddPaymentPreviewWorkspace: AddPaymentPreviewStub,
-        SubscriptionTransitionPreviewWorkspace: TransitionPreviewStub
-      }
-    }
-  })
-}
-
-describe('SubscriptionRequiredDialogContentWorkspace', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockCheckoutStep.value = 'pricing'
-    mockPreviewData.value = null
-  })
-
-  it('shows pricing table on pricing step', () => {
-    renderComponent()
-    expect(screen.getByTestId('pricing-table')).toBeInTheDocument()
-    expect(screen.queryByTestId('add-payment-preview')).not.toBeInTheDocument()
-    expect(screen.queryByTestId('transition-preview')).not.toBeInTheDocument()
-  })
-
-  it('shows close button and hides back button on pricing step', () => {
-    renderComponent()
-    expect(screen.getByLabelText('Close')).toBeInTheDocument()
-    expect(screen.queryByLabelText('Back')).not.toBeInTheDocument()
-  })
-
-  it('calls onClose when close button is clicked', async () => {
-    const user = userEvent.setup()
-    const onClose = vi.fn()
-    renderComponent({ onClose })
-
-    await user.click(screen.getByLabelText('Close'))
-
-    expect(onClose).toHaveBeenCalledOnce()
-  })
-
-  it('shows back button on preview step', () => {
-    mockCheckoutStep.value = 'preview'
-    mockPreviewData.value = { transition_type: 'new_subscription' }
-    renderComponent()
-    expect(screen.getByLabelText('Back')).toBeInTheDocument()
-  })
-
-  it('shows insufficient credits message when reason is out_of_credits', () => {
-    renderComponent({ reason: 'out_of_credits' })
-    expect(screen.getByText('Insufficient Credits')).toBeInTheDocument()
-    expect(screen.getByText('You have run out of credits.')).toBeInTheDocument()
-  })
-
-  it('does not show insufficient credits message without reason', () => {
-    renderComponent()
-    expect(screen.queryByText('Insufficient Credits')).not.toBeInTheDocument()
-  })
-
-  it('shows new subscription preview when transition_type is new_subscription', () => {
-    mockCheckoutStep.value = 'preview'
-    mockPreviewData.value = { transition_type: 'new_subscription' }
-    renderComponent()
-    expect(screen.getByTestId('add-payment-preview')).toBeInTheDocument()
-    expect(screen.queryByTestId('transition-preview')).not.toBeInTheDocument()
-  })
-
-  it('shows transition preview when transition_type is upgrade', () => {
-    mockCheckoutStep.value = 'preview'
-    mockPreviewData.value = { transition_type: 'upgrade' }
-    renderComponent()
-    expect(screen.getByTestId('transition-preview')).toBeInTheDocument()
-    expect(screen.queryByTestId('add-payment-preview')).not.toBeInTheDocument()
-  })
-
-  it('wires subscribe event to handleSubscribeClick', async () => {
-    const user = userEvent.setup()
-    renderComponent()
-
-    await user.click(screen.getByTestId('subscribe-btn'))
-
-    expect(mockHandleSubscribeClick).toHaveBeenCalledWith({
-      tierKey: 'standard',
-      billingCycle: 'yearly'
-    })
-  })
-
-  it('wires resubscribe event to handleResubscribe', async () => {
-    const user = userEvent.setup()
-    renderComponent()
-
-    await user.click(screen.getByTestId('resubscribe-btn'))
-
-    expect(mockHandleResubscribe).toHaveBeenCalled()
-  })
-
-  it('wires back button to handleBackToPricing', async () => {
-    const user = userEvent.setup()
-    mockCheckoutStep.value = 'preview'
-    mockPreviewData.value = { transition_type: 'new_subscription' }
-    renderComponent()
-
-    await user.click(screen.getByLabelText('Back'))
-
-    expect(mockHandleBackToPricing).toHaveBeenCalled()
-  })
-})
--- a/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue
+++ b/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue
@@ -18,7 +18,7 @@
      variant="muted-textonly"
      class="absolute top-2.5 right-2.5 shrink-0 rounded-full text-text-secondary hover:bg-white/10"
      :aria-label="$t('g.close')"
-      @click="onClose"
+      @click="handleClose"
    >
      <i class="pi pi-times text-xl" />
    </Button>
@@ -94,14 +94,28 @@
 </template>

 <script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
 import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { getComfyPlatformBaseUrl } from '@/config/comfyApi'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import { useTelemetry } from '@/platform/telemetry'
+import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
+import type { PreviewSubscribeResponse } from '@/platform/workspace/api/workspaceApi'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore'
 import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
-import { useSubscriptionCheckout } from '@/platform/workspace/composables/useSubscriptionCheckout'

 import PricingTableWorkspace from './PricingTableWorkspace.vue'
 import SubscriptionAddPaymentPreviewWorkspace from './SubscriptionAddPaymentPreviewWorkspace.vue'
 import SubscriptionTransitionPreviewWorkspace from './SubscriptionTransitionPreviewWorkspace.vue'

+type CheckoutStep = 'pricing' | 'preview'
+type CheckoutTierKey = Exclude<TierKey, 'free' | 'founder'>
+
 const { onClose, reason } = defineProps<{
  onClose: () => void
  reason?: SubscriptionDialogReason
@@ -111,22 +125,227 @@ const emit = defineEmits<{
  close: [subscribed: boolean]
 }>()

-const {
-  checkoutStep,
-  isLoadingPreview,
-  loadingTier,
-  isSubscribing,
-  isResubscribing,
-  previewData,
-  selectedTierKey,
-  selectedBillingCycle,
-  isPolling,
-  handleSubscribeClick,
-  handleBackToPricing,
-  handleAddCreditCard,
-  handleConfirmTransition,
-  handleResubscribe
-} = useSubscriptionCheckout(emit)
+const { t } = useI18n()
+const toast = useToast()
+const { subscribe, previewSubscribe, plans, fetchStatus, fetchBalance } =
+  useBillingContext()
+const telemetry = useTelemetry()
+const billingOperationStore = useBillingOperationStore()
+const isPolling = computed(() => billingOperationStore.hasPendingOperations)
+
+const checkoutStep = ref<CheckoutStep>('pricing')
+const isLoadingPreview = ref(false)
+const loadingTier = ref<CheckoutTierKey | null>(null)
+const isSubscribing = ref(false)
+const isResubscribing = ref(false)
+const previewData = ref<PreviewSubscribeResponse | null>(null)
+const selectedTierKey = ref<CheckoutTierKey | null>(null)
+const selectedBillingCycle = ref<BillingCycle>('yearly')
+
+function getApiPlanSlug(
+  tierKey: CheckoutTierKey,
+  billingCycle: BillingCycle
+): string | null {
+  const apiDuration = billingCycle === 'yearly' ? 'ANNUAL' : 'MONTHLY'
+  const apiTier = tierKey.toUpperCase()
+  const plan = plans.value.find(
+    (p) => p.tier === apiTier && p.duration === apiDuration
+  )
+  return plan?.slug ?? null
+}
+
+async function handleSubscribeClick(payload: {
+  tierKey: CheckoutTierKey
+  billingCycle: BillingCycle
+}) {
+  const { tierKey, billingCycle } = payload
+
+  isLoadingPreview.value = true
+  loadingTier.value = tierKey
+  selectedTierKey.value = tierKey
+  selectedBillingCycle.value = billingCycle
+
+  try {
+    const planSlug = getApiPlanSlug(tierKey, billingCycle)
+    if (!planSlug) {
+      toast.add({
+        severity: 'error',
+        summary: 'Unable to subscribe',
+        detail: 'This plan is not available'
+      })
+      return
+    }
+    const response = await previewSubscribe(planSlug)
+
+    if (!response || !response.allowed) {
+      toast.add({
+        severity: 'error',
+        summary: 'Unable to subscribe',
+        detail: response?.reason || 'This plan is not available'
+      })
+      return
+    }
+
+    previewData.value = response
+    checkoutStep.value = 'preview'
+  } catch (error) {
+    const message =
+      error instanceof Error
+        ? error.message
+        : 'Failed to load subscription preview'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message
+    })
+  } finally {
+    isLoadingPreview.value = false
+    loadingTier.value = null
+  }
+}
+
+function handleBackToPricing() {
+  checkoutStep.value = 'pricing'
+  previewData.value = null
+}
+
+async function handleAddCreditCard() {
+  if (!selectedTierKey.value) return
+
+  isSubscribing.value = true
+  try {
+    const planSlug = getApiPlanSlug(
+      selectedTierKey.value,
+      selectedBillingCycle.value
+    )
+    if (!planSlug) return
+    const response = await subscribe(
+      planSlug,
+      `${getComfyPlatformBaseUrl()}/payment/success`,
+      `${getComfyPlatformBaseUrl()}/payment/failed`
+    )
+
+    if (!response) return
+
+    if (response.status === 'subscribed') {
+      telemetry?.trackMonthlySubscriptionSucceeded()
+      toast.add({
+        severity: 'success',
+        summary: t('subscription.required.pollingSuccess'),
+        life: 5000
+      })
+      await Promise.all([fetchStatus(), fetchBalance()])
+      emit('close', true)
+    } else if (
+      response.status === 'needs_payment_method' &&
+      response.payment_method_url
+    ) {
+      window.open(response.payment_method_url, '_blank')
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    } else if (response.status === 'pending_payment') {
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    }
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to subscribe'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message
+    })
+  } finally {
+    isSubscribing.value = false
+  }
+}
+
+async function handleConfirmTransition() {
+  if (!selectedTierKey.value) return
+
+  isSubscribing.value = true
+  try {
+    const planSlug = getApiPlanSlug(
+      selectedTierKey.value,
+      selectedBillingCycle.value
+    )
+    if (!planSlug) return
+    const response = await subscribe(
+      planSlug,
+      `${getComfyPlatformBaseUrl()}/payment/success`,
+      `${getComfyPlatformBaseUrl()}/payment/failed`
+    )
+
+    if (!response) return
+
+    if (response.status === 'subscribed') {
+      telemetry?.trackMonthlySubscriptionSucceeded()
+      toast.add({
+        severity: 'success',
+        summary: t('subscription.required.pollingSuccess'),
+        life: 5000
+      })
+      await Promise.all([fetchStatus(), fetchBalance()])
+      emit('close', true)
+    } else if (
+      response.status === 'needs_payment_method' &&
+      response.payment_method_url
+    ) {
+      window.open(response.payment_method_url, '_blank')
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    } else if (response.status === 'pending_payment') {
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    }
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to update subscription'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message
+    })
+  } finally {
+    isSubscribing.value = false
+  }
+}
+
+async function handleResubscribe() {
+  isResubscribing.value = true
+  try {
+    await workspaceApi.resubscribe()
+    toast.add({
+      severity: 'success',
+      summary: t('subscription.resubscribeSuccess'),
+      life: 5000
+    })
+    await Promise.all([fetchStatus(), fetchBalance()])
+    emit('close', true)
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to resubscribe'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message
+    })
+  } finally {
+    isResubscribing.value = false
+  }
+}
+
+function handleClose() {
+  onClose()
+}
 </script>

 <style scoped>
--- a/src/platform/workspace/composables/useSubscriptionCheckout.test.ts
+++ b/src/platform/workspace/composables/useSubscriptionCheckout.test.ts
@@ -1,369 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed } from 'vue'
-
-import type { Plan } from '@/platform/workspace/api/workspaceApi'
-
-import { findPlanSlug } from './useSubscriptionCheckout'
-
-function makeStandardYearly(): Plan {
-  return {
-    slug: 'standard-yearly',
-    tier: 'STANDARD',
-    duration: 'ANNUAL',
-    price_cents: 1600,
-    credits_cents: 4200,
-    max_seats: 1,
-    availability: { available: true },
-    seat_summary: {
-      seat_count: 1,
-      total_cost_cents: 1600,
-      total_credits_cents: 4200
-    }
-  }
-}
-
-function makeCreatorMonthly(): Plan {
-  return {
-    slug: 'creator-monthly',
-    tier: 'CREATOR',
-    duration: 'MONTHLY',
-    price_cents: 3500,
-    credits_cents: 7400,
-    max_seats: 5,
-    availability: { available: true },
-    seat_summary: {
-      seat_count: 1,
-      total_cost_cents: 3500,
-      total_credits_cents: 7400
-    }
-  }
-}
-
-function allPlans(): Plan[] {
-  return [makeStandardYearly(), makeCreatorMonthly()]
-}
-
-describe('findPlanSlug', () => {
-  it('finds an annual plan by tier key and yearly billing cycle', () => {
-    expect(findPlanSlug(allPlans(), 'standard', 'yearly')).toBe(
-      'standard-yearly'
-    )
-  })
-
-  it('finds a monthly plan by tier key and monthly billing cycle', () => {
-    expect(findPlanSlug(allPlans(), 'creator', 'monthly')).toBe(
-      'creator-monthly'
-    )
-  })
-
-  it('returns null when no plan matches', () => {
-    expect(findPlanSlug(allPlans(), 'standard', 'monthly')).toBeNull()
-  })
-
-  it('returns null for empty plans', () => {
-    expect(findPlanSlug([], 'standard', 'yearly')).toBeNull()
-  })
-})
-
-const {
-  mockSubscribe,
-  mockPreviewSubscribe,
-  mockFetchStatus,
-  mockFetchBalance,
-  mockPlans,
-  mockResubscribe,
-  mockToastAdd
-} = vi.hoisted(() => ({
-  mockSubscribe: vi.fn(),
-  mockPreviewSubscribe: vi.fn(),
-  mockFetchStatus: vi.fn(),
-  mockFetchBalance: vi.fn(),
-  mockPlans: { value: [] as Plan[] },
-  mockResubscribe: vi.fn(),
-  mockToastAdd: vi.fn()
-}))
-
-vi.mock('@/composables/billing/useBillingContext', () => ({
-  useBillingContext: () => ({
-    subscribe: mockSubscribe,
-    previewSubscribe: mockPreviewSubscribe,
-    plans: computed(() => mockPlans.value),
-    fetchStatus: mockFetchStatus,
-    fetchBalance: mockFetchBalance
-  })
-}))
-
-vi.mock('@/platform/workspace/api/workspaceApi', () => ({
-  workspaceApi: { resubscribe: mockResubscribe }
-}))
-
-vi.mock('@/config/comfyApi', () => ({
-  getComfyPlatformBaseUrl: () => 'https://platform.comfy.org'
-}))
-
-vi.mock('primevue/usetoast', () => ({
-  useToast: () => ({ add: mockToastAdd })
-}))
-
-vi.mock('@/platform/telemetry', () => ({
-  useTelemetry: () => ({ trackMonthlySubscriptionSucceeded: vi.fn() })
-}))
-
-vi.mock('vue-i18n', async (importOriginal) => {
-  const actual = await importOriginal()
-  return {
-    ...(actual as Record<string, unknown>),
-    useI18n: () => ({
-      t: (key: string) => key
-    })
-  }
-})
-
-describe('useSubscriptionCheckout', () => {
-  let emit: ReturnType<typeof vi.fn>
-
-  async function setup() {
-    const { useSubscriptionCheckout } =
-      await import('./useSubscriptionCheckout')
-    return useSubscriptionCheckout(emit as never)
-  }
-
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-    vi.clearAllMocks()
-    mockPlans.value = allPlans()
-    emit = vi.fn()
-  })
-
-  describe('handleSubscribeClick', () => {
-    it('transitions to preview on successful preview', async () => {
-      const checkout = await setup()
-      const preview = {
-        allowed: true,
-        transition_type: 'new_subscription' as const,
-        effective_at: '2025-01-01',
-        is_immediate: true,
-        cost_today_cents: 1600,
-        cost_next_period_cents: 1600,
-        credits_today_cents: 4200,
-        credits_next_period_cents: 4200,
-        new_plan: makeStandardYearly().seat_summary
-      }
-      mockPreviewSubscribe.mockResolvedValueOnce(preview)
-
-      await checkout.handleSubscribeClick({
-        tierKey: 'standard',
-        billingCycle: 'yearly'
-      })
-
-      expect(checkout.checkoutStep.value).toBe('preview')
-      expect(checkout.previewData.value).toStrictEqual(preview)
-    })
-
-    it('shows error toast when preview is disallowed', async () => {
-      const checkout = await setup()
-      mockPreviewSubscribe.mockResolvedValueOnce({
-        allowed: false,
-        reason: 'Not allowed'
-      })
-
-      await checkout.handleSubscribeClick({
-        tierKey: 'standard',
-        billingCycle: 'yearly'
-      })
-
-      expect(checkout.checkoutStep.value).toBe('pricing')
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'Not allowed'
-        })
-      )
-    })
-
-    it('shows error toast when plan slug is not found', async () => {
-      const checkout = await setup()
-      mockPlans.value = []
-
-      await checkout.handleSubscribeClick({
-        tierKey: 'standard',
-        billingCycle: 'yearly'
-      })
-
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'This plan is not available'
-        })
-      )
-    })
-
-    it('shows error toast on network failure', async () => {
-      const checkout = await setup()
-      mockPreviewSubscribe.mockRejectedValueOnce(new Error('Network error'))
-
-      await checkout.handleSubscribeClick({
-        tierKey: 'standard',
-        billingCycle: 'yearly'
-      })
-
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'Network error'
-        })
-      )
-    })
-
-    it('resolves monthly billing cycle to correct plan slug', async () => {
-      const checkout = await setup()
-      mockPreviewSubscribe.mockResolvedValueOnce({
-        allowed: true,
-        transition_type: 'new_subscription'
-      })
-
-      await checkout.handleSubscribeClick({
-        tierKey: 'creator',
-        billingCycle: 'monthly'
-      })
-
-      expect(mockPreviewSubscribe).toHaveBeenCalledWith('creator-monthly')
-    })
-  })
-
-  describe('handleBackToPricing', () => {
-    it('resets to pricing step and clears preview data', async () => {
-      const checkout = await setup()
-      checkout.checkoutStep.value = 'preview'
-      checkout.previewData.value = {} as never
-
-      checkout.handleBackToPricing()
-
-      expect(checkout.checkoutStep.value).toBe('pricing')
-      expect(checkout.previewData.value).toBeNull()
-    })
-  })
-
-  describe('handleAddCreditCard', () => {
-    it('emits close on subscribed status', async () => {
-      const checkout = await setup()
-      checkout.selectedTierKey.value = 'standard'
-      checkout.selectedBillingCycle.value = 'yearly'
-      mockSubscribe.mockResolvedValueOnce({
-        status: 'subscribed',
-        billing_op_id: 'op-1'
-      })
-      mockFetchStatus.mockResolvedValueOnce(undefined)
-      mockFetchBalance.mockResolvedValueOnce(undefined)
-
-      await checkout.handleAddCreditCard()
-
-      expect(mockSubscribe).toHaveBeenCalledWith(
-        'standard-yearly',
-        'https://platform.comfy.org/payment/success',
-        'https://platform.comfy.org/payment/failed'
-      )
-      expect(emit).toHaveBeenCalledWith('close', true)
-    })
-
-    it('opens payment URL when needs_payment_method', async () => {
-      const checkout = await setup()
-      checkout.selectedTierKey.value = 'standard'
-      checkout.selectedBillingCycle.value = 'yearly'
-      mockSubscribe.mockResolvedValueOnce({
-        status: 'needs_payment_method',
-        billing_op_id: 'op-2',
-        payment_method_url: 'https://stripe.com/pay'
-      })
-
-      const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-      await checkout.handleAddCreditCard()
-
-      expect(openSpy).toHaveBeenCalledWith('https://stripe.com/pay', '_blank')
-      openSpy.mockRestore()
-    })
-
-    it('shows error toast on subscribe failure', async () => {
-      const checkout = await setup()
-      checkout.selectedTierKey.value = 'standard'
-      checkout.selectedBillingCycle.value = 'yearly'
-      mockSubscribe.mockRejectedValueOnce(new Error('Payment failed'))
-
-      await checkout.handleAddCreditCard()
-
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'Payment failed'
-        })
-      )
-    })
-  })
-
-  describe('handleConfirmTransition', () => {
-    it('emits close on subscribed status', async () => {
-      const checkout = await setup()
-      checkout.selectedTierKey.value = 'standard'
-      checkout.selectedBillingCycle.value = 'yearly'
-      mockSubscribe.mockResolvedValueOnce({
-        status: 'subscribed',
-        billing_op_id: 'op-3'
-      })
-      mockFetchStatus.mockResolvedValueOnce(undefined)
-      mockFetchBalance.mockResolvedValueOnce(undefined)
-
-      await checkout.handleConfirmTransition()
-
-      expect(emit).toHaveBeenCalledWith('close', true)
-    })
-
-    it('shows error toast on failure', async () => {
-      const checkout = await setup()
-      checkout.selectedTierKey.value = 'standard'
-      checkout.selectedBillingCycle.value = 'yearly'
-      mockSubscribe.mockRejectedValueOnce(new Error('Transition error'))
-
-      await checkout.handleConfirmTransition()
-
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'Transition error'
-        })
-      )
-    })
-  })
-
-  describe('handleResubscribe', () => {
-    it('emits close on success', async () => {
-      const checkout = await setup()
-      mockResubscribe.mockResolvedValueOnce({
-        billing_op_id: 'op-4',
-        status: 'active'
-      })
-      mockFetchStatus.mockResolvedValueOnce(undefined)
-      mockFetchBalance.mockResolvedValueOnce(undefined)
-
-      await checkout.handleResubscribe()
-
-      expect(mockResubscribe).toHaveBeenCalled()
-      expect(emit).toHaveBeenCalledWith('close', true)
-    })
-
-    it('shows error toast on failure', async () => {
-      const checkout = await setup()
-      mockResubscribe.mockRejectedValueOnce(new Error('Resubscribe failed'))
-
-      await checkout.handleResubscribe()
-
-      expect(mockToastAdd).toHaveBeenCalledWith(
-        expect.objectContaining({
-          severity: 'error',
-          detail: 'Resubscribe failed'
-        })
-      )
-    })
-  })
-})
--- a/src/platform/workspace/composables/useSubscriptionCheckout.ts
+++ b/src/platform/workspace/composables/useSubscriptionCheckout.ts
@@ -1,210 +0,0 @@
-import { useToast } from 'primevue/usetoast'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { getComfyPlatformBaseUrl } from '@/config/comfyApi'
-import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
-import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
-import { useTelemetry } from '@/platform/telemetry'
-import type {
-  Plan,
-  PreviewSubscribeResponse
-} from '@/platform/workspace/api/workspaceApi'
-import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
-import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore'
-
-type CheckoutStep = 'pricing' | 'preview'
-type CheckoutTierKey = Exclude<TierKey, 'free' | 'founder'>
-
-export function findPlanSlug(
-  plans: Plan[],
-  tierKey: CheckoutTierKey,
-  billingCycle: BillingCycle
-): string | null {
-  const apiDuration = billingCycle === 'yearly' ? 'ANNUAL' : 'MONTHLY'
-  const apiTier = tierKey.toUpperCase()
-  const plan = plans.find(
-    (p) => p.tier === apiTier && p.duration === apiDuration
-  )
-  return plan?.slug ?? null
-}
-
-export function useSubscriptionCheckout(emit: {
-  (e: 'close', subscribed: boolean): void
-}) {
-  const { t } = useI18n()
-  const toast = useToast()
-  const { subscribe, previewSubscribe, plans, fetchStatus, fetchBalance } =
-    useBillingContext()
-  const telemetry = useTelemetry()
-  const billingOperationStore = useBillingOperationStore()
-
-  const checkoutStep = ref<CheckoutStep>('pricing')
-  const isLoadingPreview = ref(false)
-  const loadingTier = ref<CheckoutTierKey | null>(null)
-  const isSubscribing = ref(false)
-  const isResubscribing = ref(false)
-  const previewData = ref<PreviewSubscribeResponse | null>(null)
-  const selectedTierKey = ref<CheckoutTierKey | null>(null)
-  const selectedBillingCycle = ref<BillingCycle>('yearly')
-  const isPolling = computed(() => billingOperationStore.hasPendingOperations)
-
-  function getApiPlanSlug(
-    tierKey: CheckoutTierKey,
-    billingCycle: BillingCycle
-  ): string | null {
-    return findPlanSlug(plans.value, tierKey, billingCycle)
-  }
-
-  async function handleSubscribeClick(payload: {
-    tierKey: CheckoutTierKey
-    billingCycle: BillingCycle
-  }) {
-    const { tierKey, billingCycle } = payload
-
-    isLoadingPreview.value = true
-    loadingTier.value = tierKey
-    selectedTierKey.value = tierKey
-    selectedBillingCycle.value = billingCycle
-
-    try {
-      const planSlug = getApiPlanSlug(tierKey, billingCycle)
-      if (!planSlug) {
-        toast.add({
-          severity: 'error',
-          summary: 'Unable to subscribe',
-          detail: 'This plan is not available'
-        })
-        return
-      }
-      const response = await previewSubscribe(planSlug)
-
-      if (!response || !response.allowed) {
-        toast.add({
-          severity: 'error',
-          summary: 'Unable to subscribe',
-          detail: response?.reason || 'This plan is not available'
-        })
-        return
-      }
-
-      previewData.value = response
-      checkoutStep.value = 'preview'
-    } catch (error) {
-      const message =
-        error instanceof Error
-          ? error.message
-          : 'Failed to load subscription preview'
-      toast.add({
-        severity: 'error',
-        summary: 'Error',
-        detail: message
-      })
-    } finally {
-      isLoadingPreview.value = false
-      loadingTier.value = null
-    }
-  }
-
-  function handleBackToPricing() {
-    checkoutStep.value = 'pricing'
-    previewData.value = null
-  }
-
-  async function handleSubscription() {
-    if (!selectedTierKey.value) return
-
-    isSubscribing.value = true
-    try {
-      const planSlug = getApiPlanSlug(
-        selectedTierKey.value,
-        selectedBillingCycle.value
-      )
-      if (!planSlug) return
-      const response = await subscribe(
-        planSlug,
-        `${getComfyPlatformBaseUrl()}/payment/success`,
-        `${getComfyPlatformBaseUrl()}/payment/failed`
-      )
-
-      if (!response) return
-
-      if (response.status === 'subscribed') {
-        telemetry?.trackMonthlySubscriptionSucceeded()
-        toast.add({
-          severity: 'success',
-          summary: t('subscription.required.pollingSuccess'),
-          life: 5000
-        })
-        await Promise.all([fetchStatus(), fetchBalance()])
-        emit('close', true)
-      } else if (
-        response.status === 'needs_payment_method' &&
-        response.payment_method_url
-      ) {
-        window.open(response.payment_method_url, '_blank')
-        billingOperationStore.startOperation(
-          response.billing_op_id,
-          'subscription'
-        )
-      } else if (response.status === 'pending_payment') {
-        billingOperationStore.startOperation(
-          response.billing_op_id,
-          'subscription'
-        )
-      }
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Failed to subscribe'
-      toast.add({
-        severity: 'error',
-        summary: 'Error',
-        detail: message
-      })
-    } finally {
-      isSubscribing.value = false
-    }
-  }
-
-  async function handleResubscribe() {
-    isResubscribing.value = true
-    try {
-      await workspaceApi.resubscribe()
-      toast.add({
-        severity: 'success',
-        summary: t('subscription.resubscribeSuccess'),
-        life: 5000
-      })
-      await Promise.all([fetchStatus(), fetchBalance()])
-      emit('close', true)
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : 'Failed to resubscribe'
-      toast.add({
-        severity: 'error',
-        summary: 'Error',
-        detail: message
-      })
-    } finally {
-      isResubscribing.value = false
-    }
-  }
-
-  return {
-    checkoutStep,
-    isLoadingPreview,
-    loadingTier,
-    isSubscribing,
-    isResubscribing,
-    previewData,
-    selectedTierKey,
-    selectedBillingCycle,
-    isPolling,
-    handleSubscribeClick,
-    handleBackToPricing,
-    handleAddCreditCard: handleSubscription,
-    handleConfirmTransition: handleSubscription,
-    handleResubscribe
-  }
-}
--- a/src/renderer/core/layout/types.ts
+++ b/src/renderer/core/layout/types.ts
@@ -37,20 +37,6 @@ export interface NodeBoundsUpdate {
  bounds: Bounds
 }

-/**
- * Renderer-internal node identifier.
- *
- * Intentionally narrower than the canonical {@link NodeId} in
- * `src/lib/litegraph/src/LGraphNode.ts` (which is `number | string`).
- * The Vue-node renderer normalizes all incoming IDs to strings before
- * they enter the layout system, so this layered alias documents and
- * enforces that contract at the renderer boundary.
- *
- * If you need a node ID at the litegraph or workflow-schema layer,
- * import `NodeId` from `@/lib/litegraph/src/LGraphNode` instead.
- *
- * See issue #11428 for the layered-types decision.
- */
 export type NodeId = string
 export type LinkId = number
 export type RerouteId = number
--- a/src/scripts/defaultGraph.ts
+++ b/src/scripts/defaultGraph.ts
@@ -115,15 +115,7 @@ export const defaultGraph: ComfyWorkflowJSON = {
        { name: 'CLIP', type: 'CLIP', links: [3, 5], slot_index: 1 },
        { name: 'VAE', type: 'VAE', links: [8], slot_index: 2 }
      ],
-      properties: {
-        models: [
-          {
-            name: 'v1-5-pruned-emaonly-fp16.safetensors',
-            url: 'https://huggingface.co/Comfy-Org/stable-diffusion-v1-5-archive/resolve/main/v1-5-pruned-emaonly-fp16.safetensors',
-            directory: 'checkpoints'
-          }
-        ]
-      },
+      properties: {},
      widgets_values: ['v1-5-pruned-emaonly-fp16.safetensors']
    }
  ],