test: add final CodeRabbit DrJKL canary

Exercises current #13486 path instructions against representative DrJKL PR #13362 feedback: app credential cleanup, LGraph sparse links, PartnerNodesList rootGraph coverage, compressWidgetInputSlots sparse links, drop handler cleanup, execution error fixtures, global mocks, change-detector assertions, as-never casts, and hand-rolled LiteGraph builders.

Verified with: pnpm typecheck and git diff --check.

.coderabbit.yaml

@@ -68,9 +68,52 @@ reviews:
     - path: '**/*.test.ts'
       instructions: |
         Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, and `docs/guidance/vitest.md` as required review context for every changed Vitest test file.
+        Review changed tests in the context of production files changed in the same PR; flag missing behavioral coverage for changed behavior, change-detector tests, mock-heavy tests, snapshot abuse, fragile assertions, missing edge cases, unclear setup, shared mutable state, and test isolation problems.
+        Prefer colocated behavioral tests named after the source file, and require tests for production changes to exercise the changed runtime or public entrypoint directly. Helper-only coverage is insufficient when the changed branch is reached through a higher-level runtime path.
+        Build partial mocks with fromPartial<T>() from @total-typescript/shoehorn; flag `as unknown as` double assertions, `as never`, and fromAny().
+        Mock only at seams (Pinia stores, settings, third-party libraries); flag mocked type guards or sibling composables.
+        Use a real createI18n instance rather than vi.mock('vue-i18n').
+        Flag bare expect(fn).not.toThrow() as a sole assertion, assertions that echo stub return values, tautological assertions, and .mock.results assertions.
+        For rejected promises, thrown errors, and failed async calls, require assertions for post-error state cleanup and side-effect rollback, especially auth tokens, API keys, globals, listeners, timers, subscriptions, and caches that production mutates before awaiting.
+        For tests around queuing or request flows that temporarily set `api.authToken` or `api.apiKey`, require rejected-path coverage that makes the awaited request reject and then asserts both credential fields are cleared. Success-path cleanup alone is insufficient.
+        Tests that call setup methods which install document, canvas, window, or prototype listeners must remove those listeners or isolate the EventTarget per test; repeated listener setup followed by later event dispatches is order-dependent.
+        Reuse established shared helpers such as `src/utils/__tests__/litegraphTestUtils.ts` and `src/utils/__tests__/executionErrorTestUtils.ts`; flag hand-rolled litegraph node/canvas/subgraph/workflow builders and inline `required_input_missing` fixtures when a shared helper exists.
+        For store tests that exercise real store behavior, require `createTestingPinia({ stubActions: false })`; flag plain `createPinia()` unless the test explicitly needs a real Pinia plugin path.
+        Use @testing-library/vue for component tests, not @vue/test-utils.
+        For platform-owned types and descriptors such as Response, CustomEvent, DOM events, navigator.clipboard, fetch, URL, console methods, timers, and browser APIs, require real instances or teardown that restores the original value or descriptor. `vi.clearAllMocks()` and `vi.unstubAllGlobals()` alone do not restore mocked implementations or descriptors changed with Object.defineProperty.
+        Async helpers and callbacks must be awaited or asserted with `.resolves` / `.rejects`; flag dropped promises that only pass while the current implementation is synchronous.
+        When a fixture cast hides a too-wide production signature, suggest narrowing the production type instead of casting the fixture.
+        Flag process-level listeners (process.on('unhandledRejection')) in tests; assert the rejected promise directly.
+        Tests should import the module under test from its public entrypoint, not deep internal paths.
+    - path: 'src/scripts/app.ts'
+      instructions: |
+        When app queuing code temporarily assigns `api.authToken` or `api.apiKey` before awaiting `api.queuePrompt`, require app tests for both resolved and rejected `api.queuePrompt` paths.
+        The rejected-path test must populate both credential sources, make `api.queuePrompt` reject, call `app.queuePrompt`, and prove both credential fields are cleared after rejection. Success-path cleanup alone is insufficient.
+    - path: 'src/lib/litegraph/src/LGraph.ts'
+      instructions: |
+        When changes touch `LGraph.configure()`, graph deserialization, link loading, or nullable serialized links, require a direct regression test that constructs an `LGraph` and calls `configure()` with the changed serialized shape.
+        Helper-only coverage is insufficient. For sparse legacy links, expect a v0.4 payload with `links: [null, validLink]` to not throw and still create the valid link.
+    - path: 'src/renderer/extensions/linearMode/PartnerNodesList.vue'
+      instructions: |
+        When behavior changes which graph `PartnerNodesList` traverses, require a focused component test for `PartnerNodesList` itself.
+        If the change switches from `app.graph` to `app.rootGraph`, the test should arrange different badge nodes in each graph and assert the rendered badge list comes from `rootGraph`. Coverage through a parent test that stubs `PartnerNodesList` is insufficient.
+    - path: 'src/utils/litegraphUtil.ts'
+      instructions: |
+        When link-retargeting or widget-slot compression logic such as `compressWidgetInputSlots()` changes to guard nullable or sparse links, require direct coverage of the malformed legacy shape.
+        For sparse links, tests should include `links: [null, validLink]` and assert the valid link is still retargeted while the null entry is ignored. Coverage in `linkFixer.test.ts` or other helper tests is insufficient for this production path.
     - path: 'src/lib/litegraph/**/*.test.ts'
       instructions: |
-        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, `docs/guidance/vitest.md`, and `docs/testing/litegraph-testing.md` as required review context for every changed litegraph Vitest test file.
+        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, and `docs/guidance/vitest.md` as required review context for every changed litegraph Vitest test file.
+        Reuse shared factories in `src/utils/__tests__/litegraphTestUtils.ts` instead of hand-rolling litegraph node, canvas, graph, subgraph, or workflow builders.
+        Flag mocked litegraph classes when a real instance or shared factory would exercise behavior directly.
+        When a PR changes litegraph graph deserialization, link loading, nullable serialized links, or sparse legacy link handling, require direct regression coverage for the changed runtime path. Helper-only coverage in a different utility is insufficient.
+        For `LGraph.configure()` sparse legacy links, expect a test that constructs an `LGraph`, calls `configure()` with a v0.4 payload containing `links: [null, validLink]`, asserts it does not throw, and asserts the valid link is still created.
+        For link-retargeting or widget-slot compression changes such as `compressWidgetInputSlots()`, expect a direct test of the compression path with `links: [null, validLink]` that proves the valid link is still retargeted while the null entry is ignored.
     - path: '{browser_tests,apps/website/e2e}/**/*.spec.ts'
       instructions: |
-        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, and `docs/guidance/playwright.md` as required review context for every changed Playwright test file.
+        Treat `.agents/checks/test-quality.md` and `docs/testing/README.md` as required review context for every changed Playwright test file.
+        Flag missing behavioral coverage, change-detector tests, mock-heavy tests, snapshot abuse, fragile assertions, missing edge cases, unclear setup, and test isolation problems.
+        Every route.fulfill() body must be typed with generated types or schemas from packages/ingest-types, packages/registry-types, src/workbench/extensions/manager/types/generatedManagerTypes.ts, or src/schemas/; flag untyped inline JSON objects.
+        Never use waitForTimeout; use Locator actions and auto-retrying assertions instead.
+        Restrict page.evaluate() to reading internal state or fixture setup; flag any page.evaluate() that drives UI actions when a Playwright action method exists.
+        New shared test helpers must be Playwright fixtures via base.extend(), not properties added to ComfyPage.

.github/workflows/ci-tests-e2e.yaml

@@ -73,8 +73,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-        shardTotal: [16]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -93,7 +93,7 @@ jobs:
       # Run sharded tests (browsers pre-installed in container)
       - name: Run Playwright tests (Shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
         id: playwright
-        run: pnpm exec playwright test --project=chromium --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: pnpm exec playwright test --project=chromium --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob
         env:
           PLAYWRIGHT_BLOB_OUTPUT_DIR: ./blob-report
           COLLECT_COVERAGE: 'true'
@@ -150,7 +150,7 @@ jobs:
       # Run tests (browsers pre-installed in container)
       - name: Run Playwright tests (${{ matrix.browser }})
         id: playwright
-        run: pnpm exec playwright test --project=${{ matrix.browser }}
+        run: pnpm exec playwright test --project=${{ matrix.browser }} --reporter=blob
         env:
           PLAYWRIGHT_BLOB_OUTPUT_DIR: ./blob-report
 

.github/workflows/ci-website-build.yaml

@@ -40,6 +40,3 @@ jobs:
           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
-
-      - name: Validate JSON-LD structured data
-        run: pnpm --filter @comfyorg/website validate:jsonld

.github/workflows/cla.yml

@@ -38,11 +38,9 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
           PR_AUTHOR: ${{ github.event.pull_request.user.login || github.event.issue.user.login }}
           BASE_ALLOWLIST: action@github.com,actions-user,ampagent,claude,comfy-pr-bot,GitHub Action,github-actions,github-actions[bot],Glary Bot,Glary-Bot,*[bot]
-        # For each commit emit the GitHub login when the author/committer email resolves to a GitHub account
-        # otherwise fall back to the raw git name.
         run: |
           others=$(gh api "repos/${{ github.repository }}/pulls/${PR_NUMBER}/commits" --paginate \
-            --jq '.[] | (.author.login // .commit.author.name // empty), (.committer.login // .commit.committer.name // empty)' \
+            --jq '.[] | (.author.login // empty), (.committer.login // empty)' \
             | sort -u | grep -vix "${PR_AUTHOR}" | paste -sd, -)
           if [ -n "$others" ]; then
             echo "allowlist=${BASE_ALLOWLIST},${others}" >> "$GITHUB_OUTPUT"

.github/workflows/pr-backport.yaml

@@ -278,49 +278,32 @@ jobs:
               continue
             fi
 
-            # Create backport branch. A failure here (e.g. dirty state left
-            # by a prior target) must not abort the loop and skip remaining
-            # targets, so fall back to a clean checkout and record the error.
-            if ! git checkout -B "${BACKPORT_BRANCH}" "origin/${TARGET_BRANCH}"; then
-              echo "::error::Failed to create branch ${BACKPORT_BRANCH} for ${TARGET_BRANCH}"
-              FAILED="${FAILED}${TARGET_BRANCH}:branch-create-failed "
-              git checkout main || git checkout -f main
-              echo "::endgroup::"
-              continue
-            fi
+            # Create backport branch
+            git checkout -b "${BACKPORT_BRANCH}" "origin/${TARGET_BRANCH}"
 
             # Try cherry-pick
             if git cherry-pick "${MERGE_COMMIT}"; then
               if [ "$REMOTE_BACKPORT_EXISTS" = true ]; then
-                PUSH_CMD=(git push --force-with-lease origin "${BACKPORT_BRANCH}")
+                git push --force-with-lease origin "${BACKPORT_BRANCH}"
               else
-                PUSH_CMD=(git push origin "${BACKPORT_BRANCH}")
+                git push origin "${BACKPORT_BRANCH}"
               fi
-
-              # A push failure for one target must not abort the loop and
-              # prevent remaining targets from being attempted.
-              if "${PUSH_CMD[@]}"; then
-                echo "${BACKPORT_BRANCH}" >> "$CREATED_BRANCHES_FILE"
-                SUCCESS="${SUCCESS}${TARGET_BRANCH}:${BACKPORT_BRANCH} "
-                echo "Successfully created backport branch: ${BACKPORT_BRANCH}"
-              else
-                echo "::error::Failed to push ${BACKPORT_BRANCH} for ${TARGET_BRANCH}"
-                FAILED="${FAILED}${TARGET_BRANCH}:push-failed "
-              fi
-
+              echo "${BACKPORT_BRANCH}" >> "$CREATED_BRANCHES_FILE"
+              SUCCESS="${SUCCESS}${TARGET_BRANCH}:${BACKPORT_BRANCH} "
+              echo "Successfully created backport branch: ${BACKPORT_BRANCH}"
               # Return to main (keep the branch, we need it for PR)
-              git checkout main || git checkout -f main
+              git checkout main
             else
               # Get conflict info
               CONFLICTS=$(git diff --name-only --diff-filter=U | tr '\n' ',')
-              git cherry-pick --abort || true
+              git cherry-pick --abort
 
               echo "::error::Cherry-pick failed due to conflicts"
               FAILED="${FAILED}${TARGET_BRANCH}:conflicts:${CONFLICTS} "
 
               # Clean up the failed branch
-              git checkout main || git checkout -f main
-              git branch -D "${BACKPORT_BRANCH}" || true
+              git checkout main
+              git branch -D "${BACKPORT_BRANCH}"
             fi
 
             echo "::endgroup::"
@@ -401,10 +384,6 @@ jobs:
 
             **Reason:** Merge conflicts detected during cherry-pick of `${MERGE_COMMIT_SHORT}`
 
-            The auto-backport could not be completed automatically. Please backport
-            manually onto branch `${BACKPORT_BRANCH}` (from `origin/${target}`) and
-            open a PR to `${target}`.
-
             <details>
             <summary>📄 Conflicting files</summary>
 
@@ -437,37 +416,19 @@ jobs:
             MERGE_COMMIT=$(jq -r '.pull_request.merge_commit_sha' "$GITHUB_EVENT_PATH")
           fi
 
-          # Post a comment without letting a single failed `gh pr comment` (e.g.
-          # a locked issue, as happened for PR #13359, or a transient API error)
-          # abort the step under `set -e` and swallow the remaining failures.
-          post_comment() {
-            local body="$1"
-            local context="$2"
-            if ! gh pr comment "${PR_NUMBER}" --body "${body}"; then
-              echo "::warning::Could not comment on PR #${PR_NUMBER} about ${context}. Manual backport required."
-            fi
-          }
-
           for failure in ${{ steps.backport.outputs.failed }}; do
             IFS=':' read -r target reason conflicts <<< "${failure}"
 
-            SAFE_TARGET=$(echo "$target" | tr '/' '-')
-            BACKPORT_BRANCH="backport-${PR_NUMBER}-to-${SAFE_TARGET}"
-
             if [ "${reason}" = "branch-missing" ]; then
-              post_comment "@${PR_AUTHOR} Backport failed: Branch \`${target}\` does not exist" "missing branch ${target}"
+              gh pr comment "${PR_NUMBER}" --body "@${PR_AUTHOR} Backport failed: Branch \`${target}\` does not exist"
 
             elif [ "${reason}" = "already-exists" ]; then
-              post_comment "@${PR_AUTHOR} Commit \`${MERGE_COMMIT}\` already exists on branch \`${target}\`. No backport needed." "already-backported ${target}"
-
-            elif [ "${reason}" = "branch-create-failed" ]; then
-              gh pr comment "${PR_NUMBER}" --body "@${PR_AUTHOR} Backport to \`${target}\` failed: could not create the backport branch. Please retry or backport manually."
-
-            elif [ "${reason}" = "push-failed" ]; then
-              gh pr comment "${PR_NUMBER}" --body "@${PR_AUTHOR} Backport to \`${target}\` cherry-picked cleanly but the push failed. Please retry or push the backport branch manually."
+              gh pr comment "${PR_NUMBER}" --body "@${PR_AUTHOR} Commit \`${MERGE_COMMIT}\` already exists on branch \`${target}\`. No backport needed."
 
             elif [ "${reason}" = "conflicts" ]; then
               CONFLICTS_INLINE=$(echo "${conflicts}" | tr ',' ' ')
+              SAFE_TARGET=$(echo "$target" | tr '/' '-')
+              BACKPORT_BRANCH="backport-${PR_NUMBER}-to-${SAFE_TARGET}"
               PR_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}"
 
               export PR_NUMBER PR_URL MERGE_COMMIT target BACKPORT_BRANCH CONFLICTS_INLINE
@@ -483,10 +444,10 @@ jobs:
               CONFLICTS_BLOCK=$(echo "${conflicts}" | tr ',' '\n')
               MERGE_COMMIT_SHORT="${MERGE_COMMIT:0:7}"
 
-              export target MERGE_COMMIT_SHORT BACKPORT_BRANCH CONFLICTS_BLOCK AGENT_PROMPT PR_AUTHOR
-              COMMENT_BODY=$(envsubst '${target} ${MERGE_COMMIT_SHORT} ${BACKPORT_BRANCH} ${CONFLICTS_BLOCK} ${AGENT_PROMPT} ${PR_AUTHOR}' <<<"$COMMENT_BODY_TEMPLATE")
+              export target MERGE_COMMIT_SHORT CONFLICTS_BLOCK AGENT_PROMPT PR_AUTHOR
+              COMMENT_BODY=$(envsubst '${target} ${MERGE_COMMIT_SHORT} ${CONFLICTS_BLOCK} ${AGENT_PROMPT} ${PR_AUTHOR}' <<<"$COMMENT_BODY_TEMPLATE")
 
-              post_comment "${COMMENT_BODY}" "cherry-pick conflict on ${target} (backport manually onto ${BACKPORT_BRANCH})"
+              gh pr comment "${PR_NUMBER}" --body "${COMMENT_BODY}"
             fi
           done
 

.github/workflows/pr-cursor-review.yaml

@@ -29,7 +29,7 @@ jobs:
     # SHA-pinned per zizmor `unpinned-uses: hash-pin`. Bump this SHA to pick up
     # upstream changes; keep `workflows_ref` matching so prompts/scripts load
     # from the same commit as the workflow definition.
-    uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@df507e6bae179c567ad3849370f99dae588985dc # github-workflows main (df507e6)
+    uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@047ca48febe3a6647608ed2e0c4331b491cb9d6a # github-workflows#9
     with:
       # Overriding diff_excludes replaces the reusable default wholesale, so
       # this restates the generated/vendored defaults and adds this repo's heavy
@@ -48,7 +48,7 @@ jobs:
         :!**/*-snapshots/**
         :!src/workbench/extensions/manager/types/generatedManagerTypes.ts
       # Load the prompts/scripts from the same ref as `uses:`.
-      workflows_ref: df507e6bae179c567ad3849370f99dae588985dc
+      workflows_ref: 047ca48febe3a6647608ed2e0c4331b491cb9d6a
     secrets:
       CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
       # Optional — enables start/complete Slack DMs to the triggerer.

.github/workflows/release-biweekly-comfyui.yaml

@@ -23,10 +23,6 @@ on:
         required: false
         default: 'Comfy-Org/ComfyUI'
         type: string
-      target_branch:
-        description: 'Optional: force a specific release branch, e.g. core/1.47 or core/2.0. Overrides the pin-derived target — use to skip a dead minor or do an out-of-cadence / major release.'
-        required: false
-        type: string
 
 jobs:
   check-release-week:
@@ -53,15 +49,12 @@ jobs:
           fi
 
       - name: Summary
-        env:
-          TARGET_BRANCH_OVERRIDE: ${{ inputs.target_branch }}
         run: |
           echo "## Release Check" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- Is release week: ${{ steps.check.outputs.is_release_week }}" >> $GITHUB_STEP_SUMMARY
           echo "- Manual trigger: ${{ github.event_name == 'workflow_dispatch' }}" >> $GITHUB_STEP_SUMMARY
           echo "- Release type: ${{ inputs.release_type || 'minor (scheduled)' }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Target branch override: ${TARGET_BRANCH_OVERRIDE:-(none — pin-derived)}" >> $GITHUB_STEP_SUMMARY
 
   resolve-version:
     needs: check-release-week
@@ -110,7 +103,6 @@ jobs:
         working-directory: frontend
         env:
           RELEASE_TYPE: ${{ inputs.release_type || 'minor' }}
-          TARGET_BRANCH: ${{ inputs.target_branch }}
         run: |
           set -euo pipefail
 

apps/website/e2e/affiliates.spec.ts

@@ -76,14 +76,10 @@ test.describe('Affiliates landing — desktop interactions', () => {
       return match?.textContent ?? null
     })
     expect(faqJsonLd, 'FAQ JSON-LD script').not.toBeNull()
-    const graph = JSON.parse(faqJsonLd!)['@graph'] as {
-      '@type': string
-      mainEntity?: unknown[]
-    }[]
-    const faqPage = graph.find((node) => node['@type'] === 'FAQPage')
-    expect(faqPage, 'FAQPage node in @graph').toBeDefined()
-    expect(Array.isArray(faqPage!.mainEntity)).toBe(true)
-    expect(faqPage!.mainEntity!.length).toBe(FAQ_COUNT)
+    const parsed = JSON.parse(faqJsonLd!)
+    expect(parsed['@type']).toBe('FAQPage')
+    expect(Array.isArray(parsed.mainEntity)).toBe(true)
+    expect(parsed.mainEntity.length).toBe(FAQ_COUNT)
   })
 
   test('Apply Now CTA opens the application form in a new tab', async ({

apps/website/e2e/brand.spec.ts

@@ -1,51 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { BRAND_ASSETS_ZIP, BRAND_GUIDELINES_PDF } from '../src/data/brandAssets'
-import { test } from './fixtures/blockExternalMedia'
-
-test.describe('Brand portal @smoke', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/brand')
-  })
-
-  test('renders each brand guideline section', async ({ page }) => {
-    await expect(
-      page.getByRole('heading', { level: 1, name: 'Create with ComfyUI' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'One mark, many dimensions.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Every color earns its place.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Precise, never cute.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Trademark guidelines.' })
-    ).toBeVisible()
-  })
-
-  test('shows all four marks', async ({ page }) => {
-    const logos = page.locator('#logos')
-    for (const name of [
-      'Core Logo',
-      'Logomark',
-      'Icon',
-      'Amplified Logomark'
-    ]) {
-      await expect(logos.getByText(name, { exact: true })).toBeVisible()
-    }
-  })
-
-  test('the hero ctas open the gated guidelines and the logo bundle', async ({
-    page
-  }) => {
-    await expect(
-      page.getByRole('link', { name: 'View brand guidelines' })
-    ).toHaveAttribute('href', BRAND_GUIDELINES_PDF)
-    await expect(
-      page.getByRole('link', { name: 'Download logos' })
-    ).toHaveAttribute('href', BRAND_ASSETS_ZIP)
-  })
-})

apps/website/e2e/careers.spec.ts

@@ -8,7 +8,7 @@ test.describe('Careers page @smoke', () => {
   })
 
   test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Careers - Comfy')
+    await expect(page).toHaveTitle('Careers — Comfy')
   })
 
   test('Roles section heading is visible', async ({ page }) => {
@@ -72,7 +72,7 @@ test.describe('Careers page role links', () => {
 test.describe('Careers page (zh-CN) @smoke', () => {
   test('renders localized heading and roles', async ({ page }) => {
     await page.goto('/zh-CN/careers')
-    await expect(page).toHaveTitle('招聘 - Comfy')
+    await expect(page).toHaveTitle('招聘 — Comfy')
     await expect(
       page.getByRole('heading', { name: '职位', level: 2 })
     ).toBeVisible()

apps/website/e2e/cloud-nodes.spec.ts

@@ -9,7 +9,7 @@ test.describe('Cloud nodes page @smoke', () => {
 
   test('has correct title', async ({ page }) => {
     await expect(page).toHaveTitle(
-      'Custom-node packs on Comfy Cloud - supported by default'
+      'Custom-node packs on Comfy Cloud — supported by default'
     )
   })
 

apps/website/e2e/cloud.spec.ts

@@ -8,7 +8,7 @@ test.describe('Cloud page @smoke', () => {
   })
 
   test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Comfy Cloud - AI in the Cloud')
+    await expect(page).toHaveTitle('Comfy Cloud — AI in the Cloud')
   })
 
   test('HeroSection heading and subtitle are visible', async ({ page }) => {
@@ -40,7 +40,7 @@ test.describe('Cloud page @smoke', () => {
     }
   })
 
-  test('AIModelsSection heading and 6 model cards are visible', async ({
+  test('AIModelsSection heading and 5 model cards are visible', async ({
     page
   }) => {
     const heading = page.getByRole('heading', { name: /leading AI models/i })
@@ -49,7 +49,7 @@ test.describe('Cloud page @smoke', () => {
     const section = heading.locator('xpath=ancestor::section')
     const grid = section.locator('.grid')
     const modelCards = grid.locator('a[href="https://comfy.org/workflows"]')
-    await expect(modelCards).toHaveCount(6)
+    await expect(modelCards).toHaveCount(5)
   })
 
   test('AIModelsSection CTA links to workflows', async ({ page }) => {

apps/website/e2e/download.spec.ts

@@ -16,7 +16,7 @@ test.describe('Download page @smoke', () => {
 
   test('has correct title', async ({ page }) => {
     await expect(page).toHaveTitle(
-      'Download Comfy Desktop - Run AI on Your Hardware'
+      'Download Comfy Desktop — Run AI on Your Hardware'
     )
   })
 

apps/website/e2e/homepage.spec.ts

@@ -17,7 +17,7 @@ test.describe('Homepage @smoke', () => {
   })
 
   test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Comfy - Professional Control of Visual AI')
+    await expect(page).toHaveTitle('Comfy — Professional Control of Visual AI')
   })
 
   test('HeroSection heading is visible', async ({ page }) => {

apps/website/e2e/learning.spec.ts

@@ -1,158 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { learningTutorials } from '../src/data/learningTutorials'
-import { t } from '../src/i18n/translations'
-import { test } from './fixtures/blockExternalMedia'
-
-const tutorialButtonName = (title: string, locale: 'en' | 'zh-CN') =>
-  `${t('learning.tutorials.titlePrefix', locale)} ${title}`
-
-test.describe('Learning page @smoke', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/learning')
-  })
-
-  test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Learning - Comfy')
-  })
-
-  test('hero headline references ComfyUI', async ({ page }) => {
-    const heading = page.getByRole('heading', { level: 1 })
-    await expect(heading).toBeVisible()
-    await expect(heading).toContainText(t('learning.heroTitle.before', 'en'))
-    await expect(heading).toContainText('ComfyUI')
-    await expect(heading).toContainText(t('learning.heroTitle.line2', 'en'))
-  })
-
-  test('featured workflow section shows title and author', async ({ page }) => {
-    await expect(
-      page.getByRole('heading', {
-        name: t('learning.featured.title', 'en'),
-        level: 2
-      })
-    ).toBeVisible()
-    await expect(
-      page.getByText(t('learning.featured.author', 'en'))
-    ).toBeVisible()
-  })
-
-  test('renders every tutorial from the data source', async ({ page }) => {
-    await expect(
-      page.getByRole('heading', {
-        name: t('learning.tutorials.heading', 'en'),
-        level: 2
-      })
-    ).toBeVisible()
-
-    for (const tutorial of learningTutorials) {
-      await expect(
-        page.getByRole('button', {
-          name: tutorialButtonName(tutorial.title.en, 'en')
-        })
-      ).toBeVisible()
-    }
-  })
-
-  test('tutorials with a workflow link expose an external Try Workflow link', async ({
-    page
-  }) => {
-    const linkedTutorials = learningTutorials.filter(
-      (tutorial) => tutorial.href
-    )
-    const workflowLinks = page.getByRole('link', {
-      name: t('cta.tryWorkflow', 'en')
-    })
-    const hrefs = await workflowLinks.evaluateAll((links) =>
-      links.map((link) => link.getAttribute('href'))
-    )
-    for (const tutorial of linkedTutorials) {
-      expect(hrefs).toContain(tutorial.href)
-    }
-  })
-
-  test('call to action links to contact sales', async ({ page }) => {
-    await expect(
-      page.getByRole('heading', {
-        name: t('learning.cta.heading', 'en'),
-        level: 2
-      })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('link', { name: t('learning.cta.contactSales', 'en') })
-    ).toHaveAttribute('href', '/contact')
-  })
-})
-
-test.describe('Learning tutorial dialog', () => {
-  test('opens a tutorial video and dismisses via the close button', async ({
-    page
-  }) => {
-    const [firstTutorial] = learningTutorials
-    await page.goto('/learning')
-
-    const openButton = page.getByRole('button', {
-      name: tutorialButtonName(firstTutorial.title.en, 'en')
-    })
-    await openButton.scrollIntoViewIfNeeded()
-
-    const dialog = page.getByRole('dialog', { name: firstTutorial.title.en })
-    // TutorialsSection is hydrated via `client:visible`; retry the click until
-    // Vue responds by opening the dialog.
-    await expect(async () => {
-      await openButton.click()
-      await expect(dialog).toBeVisible({ timeout: 1_000 })
-    }).toPass({ timeout: 10_000 })
-
-    await expect(
-      dialog.getByRole('heading', { level: 2, name: firstTutorial.title.en })
-    ).toBeVisible()
-
-    await dialog
-      .getByRole('button', { name: t('gallery.detail.close', 'en') })
-      .click()
-    await expect(dialog).toBeHidden()
-  })
-
-  test('dismisses the dialog with the Escape key', async ({ page }) => {
-    const [firstTutorial] = learningTutorials
-    await page.goto('/learning')
-
-    const openButton = page.getByRole('button', {
-      name: tutorialButtonName(firstTutorial.title.en, 'en')
-    })
-    await openButton.scrollIntoViewIfNeeded()
-
-    const dialog = page.getByRole('dialog', { name: firstTutorial.title.en })
-    await expect(async () => {
-      await openButton.click()
-      await expect(dialog).toBeVisible({ timeout: 1_000 })
-    }).toPass({ timeout: 10_000 })
-
-    await page.keyboard.press('Escape')
-    await expect(dialog).toBeHidden()
-  })
-})
-
-test.describe('Learning page (zh-CN) @smoke', () => {
-  test('renders localized title, headings, and tutorials', async ({ page }) => {
-    await page.goto('/zh-CN/learning')
-
-    await expect(page).toHaveTitle('学习 - Comfy')
-    await expect(page.getByRole('heading', { level: 1 })).toContainText(
-      /[一-鿿]/
-    )
-    await expect(
-      page.getByRole('heading', {
-        name: t('learning.tutorials.heading', 'zh-CN'),
-        level: 2
-      })
-    ).toBeVisible()
-
-    const [firstTutorial] = learningTutorials
-    await expect(
-      page.getByRole('button', {
-        name: tutorialButtonName(firstTutorial.title['zh-CN'], 'zh-CN')
-      })
-    ).toBeVisible()
-  })
-})

apps/website/e2e/mcp.spec.ts

@@ -1,112 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { test } from './fixtures/blockExternalMedia'
-
-const MCP_ENDPOINT = 'https://cloud.comfy.org/mcp'
-
-test.describe('MCP page @smoke', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/mcp')
-  })
-
-  test('hero and how-it-works INSTALL MCP CTAs anchor to setup', async ({
-    page
-  }) => {
-    const installLinks = page.getByRole('link', { name: 'INSTALL MCP' })
-    await expect(installLinks).toHaveCount(2)
-    for (const link of await installLinks.all()) {
-      await expect(link).toHaveAttribute('href', '#setup')
-    }
-  })
-
-  test('setup section shows both install options', async ({ page }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    await expect(
-      setup.getByRole('heading', {
-        name: 'Ask your agent to install Comfy MCP'
-      })
-    ).toBeVisible()
-    await expect(
-      setup.getByRole('heading', { name: 'Install manually' })
-    ).toBeVisible()
-    await expect(setup.getByText(MCP_ENDPOINT, { exact: true })).toBeVisible()
-  })
-
-  test('client tabs swap install instructions', async ({ page }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    const activePanel = setup.locator('[role="tabpanel"][data-state="active"]')
-
-    // Claude Code is the default tab and carries the CLI command
-    await expect(
-      setup.getByRole('tab', { name: 'Claude Code' })
-    ).toHaveAttribute('data-state', 'active')
-    await expect(activePanel).toContainText(
-      `claude mcp add --transport http comfy-cloud ${MCP_ENDPOINT}`
-    )
-
-    await setup.getByRole('tab', { name: 'Claude Desktop' }).click()
-    await expect(activePanel).toContainText('Add custom connector')
-
-    await setup.getByRole('tab', { name: 'Cursor' }).click()
-    await expect(activePanel).toContainText('X-API-Key')
-    await expect(
-      activePanel.getByRole('link', { name: 'platform.comfy.org' })
-    ).toHaveAttribute('href', 'https://platform.comfy.org/profile/api-keys')
-
-    await setup.getByRole('tab', { name: 'Codex' }).click()
-    await expect(activePanel).toContainText(
-      `codex mcp add comfy-cloud --url ${MCP_ENDPOINT}`
-    )
-  })
-
-  test('skills plugin link lives in the agent option card', async ({
-    page
-  }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    await expect(
-      setup.getByRole('link', { name: 'View on GitHub' })
-    ).toHaveAttribute('href', 'https://github.com/Comfy-Org/comfy-skills')
-  })
-
-  test('capabilities section shows all six tool cards', async ({ page }) => {
-    for (const title of [
-      'Generate anything',
-      'Search the ecosystem',
-      'Run real workflows',
-      'Direct any model',
-      'Generate in batches',
-      'Ship it as an app'
-    ]) {
-      await expect(
-        page.getByRole('heading', { name: title, exact: true })
-      ).toBeVisible()
-    }
-  })
-
-  test('FAQ lists nine questions and autolinks the server URL', async ({
-    page
-  }) => {
-    const triggers = page.locator('[id^="faq-trigger-"]')
-    await triggers.first().scrollIntoViewIfNeeded()
-    await expect(triggers).toHaveCount(9)
-
-    await page.getByRole('button', { name: "What's the server URL?" }).click()
-    await expect(
-      page.getByRole('link', { name: MCP_ENDPOINT, exact: true })
-    ).toHaveAttribute('href', MCP_ENDPOINT)
-  })
-})
-
-test.describe('MCP page zh-CN @smoke', () => {
-  test('setup section renders localized options', async ({ page }) => {
-    await page.goto('/zh-CN/mcp')
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    await expect(setup.getByText('方式一')).toBeVisible()
-    await expect(setup.getByRole('heading', { name: '手动安装' })).toBeVisible()
-    await expect(setup.getByText(MCP_ENDPOINT, { exact: true })).toBeVisible()
-  })
-})

apps/website/e2e/navigation.spec.ts

@@ -31,26 +31,6 @@ test.describe('Desktop navigation @smoke', () => {
     }
   })
 
-  test('NEW badge shows on Products and Community only', async ({ page }) => {
-    const nav = page.getByRole('navigation', { name: 'Main navigation' })
-    const desktopLinks = nav.getByTestId('desktop-nav-links')
-
-    for (const label of ['Products', 'Community']) {
-      await expect(
-        desktopLinks
-          .getByRole('button', { name: label })
-          .getByText('NEW', { exact: true })
-      ).toBeVisible()
-    }
-
-    await expect(
-      desktopLinks.getByRole('button', { name: 'Company' }).getByText('NEW')
-    ).toHaveCount(0)
-    await expect(
-      desktopLinks.getByRole('link', { name: 'Pricing' }).getByText('NEW')
-    ).toHaveCount(0)
-  })
-
   test('CTA buttons are visible', async ({ page }) => {
     const nav = page.getByRole('navigation', { name: 'Main navigation' })
     const desktopCTA = nav.getByTestId('desktop-nav-cta')
@@ -137,27 +117,6 @@ test.describe('Mobile menu @mobile', () => {
     }
   })
 
-  test('NEW badge shows on Products and Community only', async ({ page }) => {
-    await page.getByRole('button', { name: 'Toggle menu' }).click()
-
-    const menu = page.getByRole('dialog')
-
-    for (const label of ['Products', 'Community']) {
-      await expect(
-        menu.getByRole('button', { name: label }).getByText('NEW', {
-          exact: true
-        })
-      ).toBeVisible()
-    }
-
-    await expect(
-      menu.getByRole('button', { name: 'Company' }).getByText('NEW')
-    ).toHaveCount(0)
-    await expect(
-      menu.getByRole('link', { name: 'Pricing' }).getByText('NEW')
-    ).toHaveCount(0)
-  })
-
   test('clicking section with subitems drills down and back works', async ({
     page
   }) => {

apps/website/e2e/payment.spec.ts

@@ -22,7 +22,7 @@ test.describe('Payment success page @smoke', () => {
   })
 
   test('has correct title and is noindex', async ({ page }) => {
-    await expect(page).toHaveTitle('Payment Successful - Comfy')
+    await expect(page).toHaveTitle('Payment Successful — Comfy')
     await expectNoIndex(page)
   })
 
@@ -54,7 +54,7 @@ test.describe('Payment failed page @smoke', () => {
   })
 
   test('has correct title and is noindex', async ({ page }) => {
-    await expect(page).toHaveTitle('Payment Failed - Comfy')
+    await expect(page).toHaveTitle('Payment Failed — Comfy')
     await expectNoIndex(page)
   })
 
@@ -84,7 +84,7 @@ test.describe('Payment failed page @smoke', () => {
 test.describe('Payment pages zh-CN @smoke', () => {
   test('zh-CN success page renders and links correctly', async ({ page }) => {
     await page.goto('/zh-CN/payment/success')
-    await expect(page).toHaveTitle('支付成功 - Comfy')
+    await expect(page).toHaveTitle('支付成功 — Comfy')
     await expectNoIndex(page)
     await expect(
       page.getByRole('heading', { name: '支付成功', level: 1 })
@@ -99,7 +99,7 @@ test.describe('Payment pages zh-CN @smoke', () => {
 
   test('zh-CN failed page renders and links correctly', async ({ page }) => {
     await page.goto('/zh-CN/payment/failed')
-    await expect(page).toHaveTitle('支付失败 - Comfy')
+    await expect(page).toHaveTitle('支付失败 — Comfy')
     await expectNoIndex(page)
     await expect(
       page.getByRole('heading', { name: '无法完成支付', level: 1 })

apps/website/package.json

@@ -17,8 +17,7 @@
     "test:visual:update": "playwright test --project visual --update-snapshots",
     "ashby:refresh-snapshot": "tsx ./scripts/refresh-ashby-snapshot.ts",
     "cloud-nodes:refresh-snapshot": "tsx ./scripts/refresh-cloud-nodes-snapshot.ts",
-    "generate:models": "tsx ./scripts/generate-models.ts",
-    "validate:jsonld": "tsx ./scripts/validate-jsonld.ts"
+    "generate:models": "tsx ./scripts/generate-models.ts"
   },
   "dependencies": {
     "@astrojs/sitemap": "catalog:",

apps/website/public/icons/comfyicon.svg

@@ -1,4 +0,0 @@
-<svg width="275" height="275" viewBox="0 0 275 275" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="274.66" height="274.66" rx="63.5555" fill="#211927"/>
-<path d="M177.456 174.409C177.713 173.538 177.854 172.621 177.854 171.656C177.854 166.313 173.546 161.983 168.232 161.983H125.108C122.791 162.006 120.894 160.124 120.894 157.794C120.894 157.37 120.965 156.97 121.058 156.594L132.67 115.926C133.162 114.137 134.801 112.819 136.72 112.819L180.008 112.772C189.138 112.772 196.84 106.582 199.158 98.1335L205.666 75.4696C205.877 74.6695 205.994 73.7987 205.994 72.9279C205.994 67.6091 201.71 63.3022 196.419 63.3022H144.048C134.965 63.3022 127.286 69.4448 124.921 77.7996L120.52 93.2618C120.005 95.0269 118.389 96.3213 116.47 96.3213H103.898C94.8846 96.3213 87.276 102.346 84.8412 110.607L69.0152 166.172C68.7811 166.996 68.6641 167.89 68.6641 168.784C68.6641 174.127 72.9717 178.457 78.2861 178.457H90.6472C92.9649 178.457 94.8612 180.34 94.8612 182.693C94.8612 183.093 94.8144 183.494 94.6973 183.87L90.3194 199.191C90.1087 200.015 89.9683 200.862 89.9683 201.733C89.9683 207.052 94.2525 211.359 99.5434 211.359L151.938 211.312C161.045 211.312 168.724 205.145 171.065 196.744L177.432 174.433L177.456 174.409Z" fill="#F2FF59"/>
-</svg>

apps/website/scripts/validate-jsonld.ts

@@ -1,129 +0,0 @@
-import { readFileSync, readdirSync } from 'node:fs'
-import { join } from 'node:path'
-
-import { collectGraphIds } from '../src/utils/jsonLd'
-
-const DIST_DIR = join(process.cwd(), 'dist')
-const JSON_LD_BLOCK =
-  /<script[^>]*type=["']application\/ld\+json["'][^>]*>([\s\S]*?)<\/script>/gi
-
-interface Violation {
-  file: string
-  message: string
-}
-
-function htmlFiles(dir: string): string[] {
-  return readdirSync(dir, { recursive: true })
-    .map(String)
-    .filter((entry) => entry.endsWith('.html'))
-    .map((entry) => join(dir, entry))
-}
-
-function typesOf(node: Record<string, unknown>): string[] {
-  const type = node['@type']
-  if (typeof type === 'string') return [type]
-  if (Array.isArray(type)) {
-    return type.filter((t): t is string => typeof t === 'string')
-  }
-  return []
-}
-
-function hasValidPrice(node: Record<string, unknown>): boolean {
-  const price = node.price
-  const priceStr = price == null ? '' : String(price).trim()
-  return priceStr !== '' && !Number.isNaN(Number(priceStr))
-}
-
-function checkHonesty(
-  value: unknown,
-  file: string,
-  violations: Violation[]
-): void {
-  const walk = (node: unknown): void => {
-    if (Array.isArray(node)) {
-      node.forEach(walk)
-      return
-    }
-    if (!node || typeof node !== 'object') return
-    const record = node as Record<string, unknown>
-    const types = typesOf(record)
-    if (types.includes('Review') || types.includes('AggregateRating')) {
-      violations.push({
-        file,
-        message: `dishonest node type ${types.join('/')}`
-      })
-    }
-    if ('aggregateRating' in record || 'review' in record) {
-      violations.push({
-        file,
-        message: 'node carries a review/aggregateRating'
-      })
-    }
-    if (
-      types.includes('Offer') &&
-      (!hasValidPrice(record) || !record.priceCurrency)
-    ) {
-      violations.push({
-        file,
-        message: 'Offer missing priceCurrency or a concrete price'
-      })
-    }
-    Object.values(record).forEach(walk)
-  }
-  walk(value)
-}
-
-function validateFile(file: string): Violation[] {
-  const html = readFileSync(file, 'utf8')
-  const violations: Violation[] = []
-  const definedIds = new Set<string>()
-  const referencedIds: string[] = []
-
-  for (const match of html.matchAll(JSON_LD_BLOCK)) {
-    let parsed: unknown
-    try {
-      parsed = JSON.parse(match[1])
-    } catch (error) {
-      violations.push({ file, message: `invalid JSON-LD: ${String(error)}` })
-      continue
-    }
-    checkHonesty(parsed, file, violations)
-    const { defined, references } = collectGraphIds(parsed)
-    defined.forEach((id) => definedIds.add(id))
-    referencedIds.push(...references)
-  }
-
-  for (const id of referencedIds) {
-    if (!definedIds.has(id)) {
-      violations.push({ file, message: `unresolved @id reference: ${id}` })
-    }
-  }
-
-  return violations
-}
-
-function main(): void {
-  const files = htmlFiles(DIST_DIR)
-
-  if (files.length === 0) {
-    console.error(
-      `JSON-LD validation found no HTML in ${DIST_DIR} — build first.`
-    )
-    process.exit(1)
-  }
-
-  const violations = files.flatMap(validateFile)
-  if (violations.length > 0) {
-    console.error(`JSON-LD validation failed (${violations.length} issue(s)):`)
-    for (const { file, message } of violations) {
-      console.error(`  ${file.replace(DIST_DIR, 'dist')}: ${message}`)
-    }
-    process.exit(1)
-  }
-
-  process.stdout.write(
-    `JSON-LD validation passed across ${files.length} page(s).\n`
-  )
-}
-
-main()

apps/website/src/components/blocks/FAQSplit01.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
-import { computed, reactive, watch } from 'vue'
+import { reactive, watch } from 'vue'
 
 type Faq = { id: string; question: string; answer: string }
 
@@ -9,31 +9,6 @@ const { faqs } = defineProps<{
   faqs: readonly Faq[]
 }>()
 
-type AnswerPart = { type: 'text' | 'link'; value: string }
-
-function parseAnswer(answer: string): AnswerPart[] {
-  const urlPattern = /https?:\/\/[\w\-./?=&#%~:@+,;]+/g
-  const parts: AnswerPart[] = []
-  let lastIndex = 0
-  for (const match of answer.matchAll(urlPattern)) {
-    const start = match.index ?? 0
-    const url = match[0].replace(/[.,;:]+$/, '')
-    if (start > lastIndex) {
-      parts.push({ type: 'text', value: answer.slice(lastIndex, start) })
-    }
-    parts.push({ type: 'link', value: url })
-    lastIndex = start + url.length
-  }
-  if (lastIndex < answer.length) {
-    parts.push({ type: 'text', value: answer.slice(lastIndex) })
-  }
-  return parts
-}
-
-const parsedFaqs = computed(() =>
-  faqs.map((faq) => ({ ...faq, answerParts: parseAnswer(faq.answer) }))
-)
-
 const expanded = reactive<boolean[]>(faqs.map(() => false))
 
 watch(
@@ -65,7 +40,7 @@ function toggle(index: number) {
       <!-- Right FAQ list -->
       <div class="flex-1">
         <div
-          v-for="(faq, index) in parsedFaqs"
+          v-for="(faq, index) in faqs"
           :key="faq.id"
           class="border-b border-primary-comfy-canvas/20"
         >
@@ -108,23 +83,8 @@ function toggle(index: number) {
             :aria-labelledby="`faq-trigger-${faq.id}`"
             class="pb-6"
           >
-            <p
-              class="text-sm wrap-break-word whitespace-pre-line text-primary-comfy-canvas/70"
-            >
-              <template
-                v-for="(part, partIndex) in faq.answerParts"
-                :key="partIndex"
-              >
-                <a
-                  v-if="part.type === 'link'"
-                  :href="part.value"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  class="text-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 rounded-sm underline underline-offset-2 transition-opacity hover:opacity-70 focus-visible:ring-2 focus-visible:outline-none"
-                  >{{ part.value }}</a
-                >
-                <template v-else>{{ part.value }}</template>
-              </template>
+            <p class="text-sm whitespace-pre-line text-primary-comfy-canvas/70">
+              {{ faq.answer }}
             </p>
           </section>
         </div>

apps/website/src/components/blocks/FeatureGrid01.vue

@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { Component } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import CopyableField from '@/components/ui/copyable-field/CopyableField.vue'
+
+import SectionHeader from '../common/SectionHeader.vue'
+
+type CardAction =
+  | {
+      type: 'link'
+      label: string
+      href: string
+      target?: '_blank'
+      icon?: Component
+      variant?: 'default' | 'outline'
+    }
+  | { type: 'code'; value: string }
+
+export interface FeatureCard {
+  id: string
+  label?: string
+  title: string
+  description: string
+  action?: CardAction
+}
+
+type ColumnCount = 2 | 3 | 4
+
+const {
+  cards,
+  columns = 3,
+  copiedLabel,
+  copyLabel,
+  eyebrow,
+  heading,
+  subtitle
+} = defineProps<{
+  cards: readonly FeatureCard[]
+  columns?: ColumnCount
+  copiedLabel?: string
+  copyLabel?: string
+  eyebrow?: string
+  heading: string
+  subtitle?: string
+}>()
+
+const columnClass: Record<ColumnCount, string> = {
+  2: 'lg:grid-cols-2',
+  3: 'lg:grid-cols-3',
+  4: 'lg:grid-cols-4'
+}
+</script>
+
+<template>
+  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
+    <SectionHeader max-width="xl" :label="eyebrow" align="start">
+      {{ heading }}
+      <template v-if="subtitle" #subtitle>
+        <p class="mt-4 max-w-xl text-sm text-smoke-700 lg:text-base">
+          {{ subtitle }}
+        </p>
+      </template>
+    </SectionHeader>
+
+    <div :class="cn('mt-16 grid grid-cols-1 gap-6', columnClass[columns])">
+      <div
+        v-for="card in cards"
+        :key="card.id"
+        class="bg-transparency-white-t4 flex flex-col rounded-3xl p-6 lg:p-8"
+      >
+        <p
+          v-if="card.label"
+          class="text-primary-comfy-yellow text-xs font-bold tracking-widest uppercase"
+        >
+          {{ card.label }}
+        </p>
+        <h3
+          :class="
+            cn(
+              'text-xl font-light text-primary-comfy-canvas lg:text-2xl',
+              card.label && 'mt-3'
+            )
+          "
+        >
+          {{ card.title }}
+        </h3>
+        <p class="mt-3 text-sm text-smoke-700">
+          {{ card.description }}
+        </p>
+
+        <div v-if="card.action" class="mt-6">
+          <Button
+            v-if="card.action.type === 'link'"
+            as="a"
+            :href="card.action.href"
+            :target="card.action.target"
+            :rel="
+              card.action.target === '_blank'
+                ? 'noopener noreferrer'
+                : undefined
+            "
+            :variant="card.action.variant ?? 'outline'"
+            :append-icon="card.action.icon"
+          >
+            {{ card.action.label }}
+          </Button>
+          <CopyableField
+            v-else
+            :value="card.action.value"
+            :copy-label="copyLabel"
+            :copied-label="copiedLabel"
+          />
+        </div>
+      </div>
+    </div>
+  </section>
+</template>

apps/website/src/components/blocks/FeatureRows01.vue

@@ -8,7 +8,7 @@ import VideoPlayer from '../common/VideoPlayer.vue'
 import type { VideoTrack } from '../common/VideoPlayer.vue'
 
 type RowMedia =
-  | { type: 'image'; src: string; alt?: string; fit?: 'cover' | 'contain' }
+  | { type: 'image'; src: string; alt?: string }
   | {
       type: 'video'
       src: string
@@ -20,7 +20,6 @@ type RowMedia =
       loop?: boolean
       minimal?: boolean
       hideControls?: boolean
-      fit?: 'cover' | 'contain'
     }
 
 export interface FeatureRow {
@@ -59,7 +58,7 @@ const {
         <div
           :class="
             cn(
-              'order-2 flex flex-col justify-center gap-4 p-6 lg:flex-1 lg:p-12',
+              'order-2 flex flex-col justify-center gap-4 p-6 lg:w-1/2 lg:p-12',
               i % 2 === 0 ? 'lg:order-1' : 'lg:order-2'
             )
           "
@@ -73,11 +72,10 @@ const {
         </div>
 
         <!-- Media: image or video -->
-        <!-- 620/364 and w-155 (620px) match the card media asset dimensions -->
         <div
           :class="
             cn(
-              'relative order-1 aspect-620/364 w-full lg:w-155 lg:shrink-0',
+              'order-1 flex lg:w-1/2',
               i % 2 === 0 ? 'lg:order-2' : 'lg:order-1'
             )
           "
@@ -88,12 +86,7 @@ const {
             :alt="row.media.alt ?? row.title"
             loading="lazy"
             decoding="async"
-            :class="
-              cn(
-                'absolute inset-0 size-full rounded-4xl',
-                row.media.fit === 'contain' ? 'object-contain' : 'object-cover'
-              )
-            "
+            class="aspect-4/3 w-full rounded-4xl object-cover"
           />
           <VideoPlayer
             v-else
@@ -106,13 +99,7 @@ const {
             :loop="row.media.loop"
             :minimal="row.media.minimal"
             :hide-controls="row.media.hideControls"
-            :fit="row.media.fit"
-            :class="
-              cn(
-                'absolute inset-0 size-full',
-                row.media.fit === 'contain' && 'bg-transparent'
-              )
-            "
+            class="w-full"
           />
         </div>
       </GlassCard>

apps/website/src/components/blocks/HeroBackdrop01.stories.ts

@@ -1,41 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import HeroBackdrop01 from './HeroBackdrop01.vue'
-
-const sampleImage =
-  'https://images.unsplash.com/photo-1451187580459-43490279c0fa?auto=format&fit=crop&w=1600&q=80'
-
-const meta: Meta<typeof HeroBackdrop01> = {
-  title: 'Website/Blocks/HeroBackdrop01',
-  component: HeroBackdrop01,
-  tags: ['autodocs'],
-  args: {
-    backdrop: { type: 'image', src: sampleImage, alt: 'Abstract gradient' },
-    title: 'Build anything\nwith ComfyUI',
-    subtitle:
-      'A powerful, modular visual interface for building and running AI workflows.'
-  }
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {}
-
-export const WithBadge: Story = {
-  args: {
-    badgeText: 'New'
-  }
-}
-
-export const WithFootnote: Story = {
-  args: {
-    footnote: 'Available on Windows, macOS, and Linux.'
-  }
-}
-
-export const NoBackdrop: Story = {
-  args: {
-    backdrop: undefined
-  }
-}

apps/website/src/components/blocks/HeroBackdrop01.vue

@@ -1,193 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-
-import { computed } from 'vue'
-import type { HTMLAttributes } from 'vue'
-
-import { prefersReducedMotion } from '../../composables/useReducedMotion'
-import ProductHeroBadge from '../common/ProductHeroBadge.vue'
-
-type Backdrop =
-  | { type: 'image'; src: string; alt?: string }
-  | { type: 'video'; src: string; poster?: string; alt?: string }
-
-const {
-  backdrop,
-  mobileBackdrop,
-  badgeText,
-  badgeLogoSrc,
-  badgeLogoAlt,
-  title,
-  subtitle,
-  footnote,
-  class: className
-} = defineProps<{
-  backdrop?: Backdrop
-  mobileBackdrop?: Backdrop
-  badgeText?: string
-  badgeLogoSrc?: string
-  badgeLogoAlt?: string
-  title: string
-  subtitle?: string
-  footnote?: string
-  class?: HTMLAttributes['class']
-}>()
-
-// Respect prefers-reduced-motion: don't autoplay the looping backdrop video
-// (WCAG 2.2.2). The paused video falls back to its poster/first frame.
-const reduceMotion = computed(() => prefersReducedMotion())
-
-// Removing the reactive `autoplay` attribute only suppresses the *initial*
-// play; it can't pause a video the browser has already started. That is
-// exactly the SSR case: the server renders `autoplay` (it can't read the
-// client's motion preference), the browser begins playback on parse, and the
-// post-hydration attribute removal is too late. Pause on mount so
-// reduced-motion users get the poster frame instead of a looping video.
-const pauseIfReduced = (el: unknown) => {
-  if (el instanceof HTMLVideoElement && reduceMotion.value) el.pause()
-}
-
-// On mobile the backdrop is an in-flow rounded card above the content; on
-// desktop it is the full-bleed background behind it. A single element serves
-// both roles via responsive classes — mobileBackdrop only swaps the source.
-const sharedBackdropClass =
-  'relative aspect-3/2 w-full rounded-3xl object-cover lg:absolute lg:inset-0 lg:aspect-auto lg:size-full lg:rounded-none'
-
-// When both breakpoints use images, serve them from a single responsive <img>
-// so the browser fetches only the source matching the viewport. Two
-// `hidden`/`lg:hidden`-toggled <img> layers would each download (display:none
-// does not stop the fetch), doubling the high-priority load on an
-// LCP-critical hero. Videos or a mixed image/video pair can't collapse this
-// way and fall back to breakpoint-toggled layers below.
-const responsiveImage = computed(() => {
-  if (backdrop?.type !== 'image') return null
-  if (mobileBackdrop && mobileBackdrop.type !== 'image') return null
-  const base = mobileBackdrop ?? backdrop
-  return {
-    src: base.src,
-    alt: backdrop.alt ?? mobileBackdrop?.alt ?? '',
-    // Larger-viewport source; omitted when one image serves both breakpoints.
-    desktopSrc: mobileBackdrop ? backdrop.src : undefined
-  }
-})
-
-// Fallback for videos and mixed image/video pairs: toggle assets by breakpoint.
-const backdropLayers = computed(() => {
-  if (!backdrop) return []
-  if (mobileBackdrop) {
-    return [
-      {
-        backdrop: mobileBackdrop,
-        class: 'relative aspect-3/2 w-full rounded-3xl object-cover lg:hidden'
-      },
-      {
-        backdrop,
-        class: 'absolute inset-0 hidden size-full object-cover lg:block'
-      }
-    ]
-  }
-  return [{ backdrop, class: sharedBackdropClass }]
-})
-
-const scrimShape = 'farthest-side at 50% 50%'
-const scrimStyle = {
-  background: `radial-gradient(${scrimShape}, color-mix(in srgb, var(--color-primary-warm-white) 80%, transparent) 0%, transparent 80%)`,
-  maskImage: `radial-gradient(${scrimShape}, #000 45%, transparent 90%)`,
-  WebkitMaskImage: `radial-gradient(${scrimShape}, #000 45%, transparent 90%)`
-}
-</script>
-
-<template>
-  <section
-    :class="cn('max-w-9xl mx-auto px-4 pt-4 lg:px-6 lg:pt-6', className)"
-  >
-    <div class="relative overflow-hidden rounded-3xl">
-      <slot name="backdrop">
-        <picture v-if="responsiveImage" class="contents">
-          <source
-            v-if="responsiveImage.desktopSrc"
-            :srcset="responsiveImage.desktopSrc"
-            media="(min-width: 1024px)"
-          />
-          <img
-            :src="responsiveImage.src"
-            :alt="responsiveImage.alt"
-            fetchpriority="high"
-            decoding="async"
-            :class="sharedBackdropClass"
-          />
-        </picture>
-
-        <template v-else>
-          <template v-for="(layer, i) in backdropLayers" :key="i">
-            <video
-              v-if="layer.backdrop.type === 'video'"
-              :ref="pauseIfReduced"
-              :src="layer.backdrop.src"
-              :poster="layer.backdrop.poster"
-              :aria-label="layer.backdrop.alt"
-              :aria-hidden="layer.backdrop.alt ? undefined : true"
-              :autoplay="!reduceMotion"
-              loop
-              muted
-              playsinline
-              preload="metadata"
-              :class="layer.class"
-            />
-            <img
-              v-else
-              :src="layer.backdrop.src"
-              :alt="layer.backdrop.alt ?? ''"
-              fetchpriority="high"
-              decoding="async"
-              :class="layer.class"
-            />
-          </template>
-        </template>
-      </slot>
-
-      <div
-        class="relative flex flex-col justify-center px-0 pt-6 pb-8 lg:min-h-176 lg:px-16 lg:py-24"
-      >
-        <div class="relative w-full max-w-xl">
-          <div
-            aria-hidden="true"
-            class="pointer-events-none absolute -inset-12 hidden backdrop-blur-md lg:-inset-16 lg:block"
-            :style="scrimStyle"
-          />
-
-          <div class="relative">
-            <ProductHeroBadge
-              v-if="badgeText"
-              :text="badgeText"
-              :logo-src="badgeLogoSrc"
-              :logo-alt="badgeLogoAlt"
-            />
-
-            <h1
-              class="mt-10 text-4xl/tight font-light tracking-tight whitespace-pre-line text-primary-comfy-canvas lg:text-6xl/tight lg:text-primary-comfy-ink"
-            >
-              {{ title }}
-            </h1>
-
-            <p
-              v-if="subtitle"
-              class="mt-8 max-w-md text-base text-primary-comfy-canvas lg:text-lg lg:text-primary-comfy-ink"
-            >
-              {{ subtitle }}
-            </p>
-
-            <p
-              v-if="footnote"
-              class="mt-10 text-sm text-primary-comfy-canvas lg:text-primary-comfy-ink"
-            >
-              {{ footnote }}
-            </p>
-
-            <slot />
-          </div>
-        </div>
-      </div>
-    </div>
-  </section>
-</template>

apps/website/src/components/common/BrandButton.vue

@@ -35,6 +35,8 @@ const resolvedRel = computed(() =>
       )
     "
   >
-    <slot />
+    <span class="ppformula-text-center">
+      <slot />
+    </span>
   </component>
 </template>

apps/website/src/components/common/CategoryNav.vue

@@ -38,7 +38,7 @@ const emit = defineEmits<{
     >
       <span v-if="modelValue === category.value" class="relative inline-block">
         <span
-          class="bg-primary-comfy-yellow inline-flex items-center rounded-lg px-4 py-2"
+          class="bg-primary-comfy-yellow ppformula-text-center inline-flex items-center rounded-lg px-4 py-2"
         >
           {{ category.label }}
         </span>
@@ -50,7 +50,7 @@ const emit = defineEmits<{
       </span>
       <span
         v-else
-        class="bg-transparency-white-t4 inline-flex items-center rounded-lg px-4 py-2"
+        class="bg-transparency-white-t4 ppformula-text-center inline-flex items-center rounded-lg px-4 py-2"
       >
         {{ category.label }}
       </span>

apps/website/src/components/common/ContentSection.vue

@@ -259,7 +259,7 @@ function scrollToSection(id: string) {
         <!-- Read more CTA -->
         <div v-if="readMoreHref" class="mt-8 flex justify-center">
           <BrandButton :href="readMoreHref" variant="solid" size="lg">
-            <span class="flex items-center gap-2">
+            <span class="ppformula-text-center flex items-center gap-2">
               {{ t('customers.story.readMore' as TranslationKey, locale) }}
               <span class="text-base">↗</span>
             </span>

apps/website/src/components/common/HeaderMain/HeaderMain.vue

@@ -33,7 +33,7 @@ const ctaButtons = [
 
 <template>
   <nav
-    class="sticky top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
+    class="fixed inset-x-0 top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
     aria-label="Main navigation"
   >
     <a

apps/website/src/components/common/HeaderMain/HeaderMainDesktop.vue

@@ -16,7 +16,6 @@ import type { NavItem } from '../../../data/mainNavigation'
 import type { Locale } from '../../../i18n/translations'
 import NavColumn from './NavColumn.vue'
 import NavFeaturedCard from './NavFeaturedCard.vue'
-import NewBadge from './NewBadge.vue'
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 const mainNavigation = getMainNavigation(locale)
@@ -43,10 +42,7 @@ function isNavItemActive(navItem: NavItem, path: string): boolean {
           <NavigationMenuTrigger
             :active="isNavItemActive(navItem, currentPath)"
           >
-            <span class="inline-flex items-center gap-1">
-              <span>{{ navItem.label }}</span>
-              <NewBadge v-if="navItem.badge" :locale="locale" size="xxs" />
-            </span>
+            {{ navItem.label }}
           </NavigationMenuTrigger>
           <NavigationMenuContent class="w-auto" data-testid="nav-dropdown">
             <ul class="flex w-max gap-16">
@@ -70,7 +66,9 @@ function isNavItemActive(navItem: NavItem, path: string): boolean {
           :active="isNavItemActive(navItem, currentPath)"
           :class="navigationMenuTriggerStyle()"
         >
-          <a :href="navItem.href">{{ navItem.label }}</a>
+          <a :href="navItem.href" class="ppformula-text-center">{{
+            navItem.label
+          }}</a>
         </NavigationMenuLink>
       </NavigationMenuItem>
     </NavigationMenuList>

apps/website/src/components/common/HeaderMain/HeaderMainMobile.vue

@@ -8,7 +8,6 @@ import { lockScroll, unlockScroll } from '../../../composables/scrollLock'
 import type { Locale } from '../../../i18n/translations.ts'
 import { t } from '../../../i18n/translations.ts'
 import NavLinkContent from './NavLinkContent.vue'
-import NewBadge from './NewBadge.vue'
 import Sheet from '@/components/ui/sheet/Sheet.vue'
 import SheetContent from '@/components/ui/sheet/SheetContent.vue'
 import SheetDescription from '@/components/ui/sheet/SheetDescription.vue'
@@ -97,8 +96,7 @@ onUnmounted(() => {
                   :href="item.columns ? undefined : item.href"
                   @click="item.columns && (activeSection = item.label)"
                 >
-                  <span>{{ item.label }}</span>
-                  <NewBadge v-if="item.badge" :locale="locale" size="xxs" />
+                  {{ item.label }}
                   <template #append>
                     <ChevronRight class="size-7" />
                   </template>

apps/website/src/components/common/HeaderMain/NavLinkContent.vue

@@ -1,17 +1,20 @@
 <script setup lang="ts">
+import Badge from '@/components/ui/badge/Badge.vue'
 import { ArrowUpRight } from '@lucide/vue'
 
 import type { NavColumnItem } from '../../../data/mainNavigation'
 import type { Locale } from '../../../i18n/translations'
-import NewBadge from './NewBadge.vue'
+import { t } from '../../../i18n/translations'
 
 defineProps<{ item: NavColumnItem; locale: Locale }>()
 </script>
 
 <template>
   <span class="flex items-center gap-2">
-    <span>{{ item.label }}</span>
-    <NewBadge v-if="item.badge" :locale="locale" size="xs" />
+    <span class="ppformula-text-center">{{ item.label }}</span>
+    <Badge v-if="item.badge" size="xs" variant="accent">
+      {{ t('nav.badgeNew', locale) }}
+    </Badge>
     <ArrowUpRight
       v-if="item.external"
       class="text-primary-comfy-yellow size-4"

apps/website/src/components/common/HeaderMain/NewBadge.vue

@@ -1,15 +0,0 @@
-<script setup lang="ts">
-import Badge from '@/components/ui/badge/Badge.vue'
-
-import type { BadgeVariants } from '@/components/ui/badge'
-import type { Locale } from '../../../i18n/translations'
-import { t } from '../../../i18n/translations'
-
-defineProps<{ locale: Locale; size?: BadgeVariants['size'] }>()
-</script>
-
-<template>
-  <Badge :size="size" variant="accent">
-    {{ t('nav.badgeNew', locale) }}
-  </Badge>
-</template>

apps/website/src/components/common/JsonLdGraph.astro

@@ -1,12 +0,0 @@
----
-import type { JsonLdGraph } from '../../utils/jsonLd'
-import { escapeJsonLd } from '../../utils/escapeJsonLd'
-
-interface Props {
-  graph: JsonLdGraph
-}
-
-const { graph } = Astro.props
----
-
-<script is:inline type="application/ld+json" set:html={escapeJsonLd(graph)} />

apps/website/src/components/common/ProductCard.vue

@@ -30,12 +30,7 @@ const { title, description, cta, href, bg } = defineProps<{
       <p class="text-sm text-white/70">
         {{ description }}
       </p>
-      <Button
-        as="span"
-        variant="default"
-        size="sm"
-        class="mt-4 h-auto whitespace-normal"
-      >
+      <Button as="span" variant="default" size="sm" class="mt-4">
         {{ cta }}
       </Button>
     </div>

apps/website/src/components/common/SiteFooter.vue

@@ -85,9 +85,7 @@ const companyColumn: { title: string; links: FooterLink[] } = {
   links: [
     { label: t('footer.about', locale), href: routes.about },
     { label: t('nav.careers', locale), href: routes.careers },
-    { label: t('nav.brand', locale), href: routes.brand },
     { label: t('footer.termsOfService', locale), href: routes.termsOfService },
-    { label: t('footer.enterpriseMsa', locale), href: routes.enterpriseMsa },
     { label: t('footer.privacyPolicy', locale), href: routes.privacyPolicy }
   ]
 }
@@ -176,7 +174,10 @@ const contactColumn: { title: string; links: FooterLink[] } = {
       </div>
 
       <!-- Logo -->
-      <canvas ref="canvasRef" class="pointer-events-none size-52 lg:mt-28" />
+      <canvas
+        ref="canvasRef"
+        class="pointer-events-none size-52 opacity-80 lg:mt-28"
+      />
     </div>
   </footer>
 </template>

apps/website/src/components/common/VideoPlayer.vue

@@ -10,7 +10,6 @@ import {
   whenever
 } from '@vueuse/core'
 import { computed, shallowRef, useTemplateRef, watch } from 'vue'
-import type { HTMLAttributes } from 'vue'
 
 import { t } from '../../i18n/translations'
 import type { Locale } from '../../i18n/translations'
@@ -31,9 +30,7 @@ const {
   autoplay = false,
   loop = false,
   minimal = false,
-  hideControls = false,
-  fit = 'cover',
-  class: className
+  hideControls = false
 } = defineProps<{
   locale?: Locale
   src?: string
@@ -43,8 +40,6 @@ const {
   loop?: boolean
   minimal?: boolean
   hideControls?: boolean
-  fit?: 'cover' | 'contain'
-  class?: HTMLAttributes['class']
 }>()
 
 const playerEl = useTemplateRef<HTMLDivElement>('playerEl')
@@ -194,12 +189,7 @@ function toggleFullscreen() {
 <template>
   <div
     ref="playerEl"
-    :class="
-      cn(
-        'relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black',
-        className
-      )
-    "
+    class="relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black"
     @pointermove="showControls"
     @pointerdown="showControls"
     @focusin="showControls"
@@ -207,9 +197,7 @@ function toggleFullscreen() {
     <video
       v-if="src"
       ref="videoEl"
-      :class="
-        cn('size-full', fit === 'contain' ? 'object-contain' : 'object-cover')
-      "
+      class="size-full object-cover"
       :src
       :poster
       :preload="autoplay ? 'auto' : 'metadata'"

apps/website/src/components/customers/WhatsNextSection.vue

@@ -46,7 +46,7 @@ const {
             <span class="text-lg font-bold">›</span>
           </span>
           <span
-            class="text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
+            class="ppformula-text-center text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
           >
             {{ t('customers.story.viewArticle' as TranslationKey, locale) }}
           </span>

apps/website/src/components/demos/DemoNavSection.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { Locale, TranslationKey } from '../../i18n/translations'
 
-import { localizeHref } from '../../config/routes'
 import { t } from '../../i18n/translations'
 
 const {
@@ -16,7 +15,8 @@ const {
   locale?: Locale
 }>()
 
-const nextHref = localizeHref(`/demos/${nextSlug}`, locale)
+const localePrefix = locale === 'en' ? '' : `/${locale}`
+const nextHref = `${localePrefix}/demos/${nextSlug}`
 </script>
 
 <template>
@@ -48,7 +48,7 @@ const nextHref = localizeHref(`/demos/${nextSlug}`, locale)
             <span class="text-lg font-bold">›</span>
           </span>
           <span
-            class="text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
+            class="ppformula-text-center text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
           >
             {{ t('demos.nav.viewDemo' as TranslationKey, locale) }}
           </span>

apps/website/src/components/legal/enterpriseMsaSections.test.ts

@@ -1,46 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { getRoutes } from '../../config/routes'
-import { hasKey, translationKeys } from '../../i18n/translations'
-
-const PREFIX = 'enterprise-msa'
-
-function deriveMsaSectionIds(): string[] {
-  const labelRegex = new RegExp(`^${PREFIX}\\.([0-9]+-[a-z-]+)\\.label$`)
-  const ids: string[] = []
-  for (const key of translationKeys) {
-    const match = key.match(labelRegex)
-    if (match && !ids.includes(match[1])) ids.push(match[1])
-  }
-  return ids
-}
-
-describe('enterprise MSA i18n', () => {
-  it('every derived section has a title and at least one block', () => {
-    const sectionIds = deriveMsaSectionIds()
-    expect(sectionIds.length).toBeGreaterThan(0)
-    for (const id of sectionIds) {
-      expect(hasKey(`${PREFIX}.${id}.title`)).toBe(true)
-      expect(hasKey(`${PREFIX}.${id}.block.0`)).toBe(true)
-    }
-  })
-
-  it('exposes the page-chrome keys the .astro file references', () => {
-    for (const suffix of [
-      'effective-date',
-      'page.title',
-      'page.description',
-      'page.heading',
-      'page.tocLabel',
-      'page.effectiveDateLabel',
-      'page.parties'
-    ]) {
-      expect(hasKey(`${PREFIX}.${suffix}`)).toBe(true)
-    }
-  })
-
-  it('serves the enterprise MSA at the canonical /enterprise-msa path regardless of locale', () => {
-    expect(getRoutes('en').enterpriseMsa).toBe('/enterprise-msa')
-    expect(getRoutes('zh-CN').enterpriseMsa).toBe('/enterprise-msa')
-  })
-})

apps/website/src/components/pricing/PriceSection.vue

@@ -159,7 +159,9 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
             <span
               class="bg-primary-comfy-yellow font-formula-narrow flex items-center px-2 text-sm font-bold tracking-wider text-primary-comfy-ink"
             >
-              {{ t('pricing.badge.popular', locale) }}
+              <span class="ppformula-text-center">
+                {{ t('pricing.badge.popular', locale) }}
+              </span>
             </span>
             <img
               src="/icons/node-right.svg"
@@ -263,7 +265,9 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
               <span
                 class="bg-primary-comfy-yellow flex items-center px-2 text-[10px] font-bold tracking-wider text-primary-comfy-ink"
               >
-                {{ t('pricing.badge.popular', locale) }}
+                <span class="ppformula-text-center">
+                  {{ t('pricing.badge.popular', locale) }}
+                </span>
               </span>
               <img
                 src="/icons/node-right.svg"

apps/website/src/components/product/local/DownloadLocalButton.vue

@@ -76,8 +76,12 @@ const buttons = computed<ButtonSpec[]>(() => {
     @click="captureDownloadClick(btn.key)"
   >
     <span class="inline-flex items-center gap-2">
-      <img :src="btn.icon" alt="" class="size-5 -translate-y-0.75" />
-      {{ label }}
+      <img
+        :src="btn.icon"
+        alt=""
+        class="ppformula-text-center size-5 -translate-y-0.75"
+      />
+      <span class="ppformula-text-center">{{ label }}</span>
     </span>
   </BrandButton>
 </template>

apps/website/src/components/product/local/HeroSection.vue

@@ -305,7 +305,7 @@ onUnmounted(() => {
           size="lg"
           class="lg:min-w-60 lg:p-4"
         >
-          <span class="inline-flex items-center gap-2">
+          <span class="ppformula-text-center inline-flex items-center gap-2">
             <i
               class="icon-mask size-5 -translate-y-px mask-[url('/icons/social/github.svg')]"
               aria-hidden="true"

apps/website/src/components/ui/badge/Badge.vue

@@ -30,7 +30,7 @@ const {
     <slot name="prepend">
       <component :is="prependIcon" v-if="prependIcon" />
     </slot>
-    <span>
+    <span class="ppformula-text-center">
       <slot />
     </span>
     <slot name="append">

apps/website/src/components/ui/badge/index.ts

@@ -6,15 +6,14 @@ export const badgeVariants = cva({
   variants: {
     size: {
       md: 'px-4 py-1 text-xs',
-      xs: 'px-2 py-0.5 text-[9px]',
-      xxs: 'px-1.5 py-px text-[8px]'
+      xs: 'px-2 py-0.5 text-[9px]'
     },
     variant: {
       default: 'bg-transparency-ink-t80',
       subtle: 'bg-transparency-white-t4 text-primary-comfy-canvas',
       category: 'text-primary-comfy-yellow px-0 font-semibold uppercase',
       accent:
-        'before:bg-primary-comfy-yellow relative isolate overflow-visible rounded-none bg-transparent font-bold tracking-wide text-primary-comfy-ink uppercase before:absolute before:inset-0 before:-z-10 before:-skew-x-12 before:rounded-sm'
+        'before:bg-primary-comfy-yellow relative isolate overflow-visible rounded-none bg-transparent px-2 py-0.5 text-[9px] font-bold tracking-wide text-primary-comfy-ink uppercase before:absolute before:inset-0 before:-z-10 before:-skew-x-12 before:rounded-sm'
     }
   },
   defaultVariants: {

apps/website/src/components/ui/button-mask/index.ts

@@ -78,7 +78,7 @@ export const buttonMaskBadgeVariants = cva({
 })
 
 export const BUTTON_MASK_LABEL_CLASS = [
-  'relative inline-block align-baseline',
+  'ppformula-text-center relative inline-block align-baseline',
   '[will-change:mask-size,-webkit-mask-size]',
   '[mask-image:linear-gradient(black,black)] [-webkit-mask-image:linear-gradient(black,black)]',
   'mask-no-repeat [-webkit-mask-repeat:no-repeat]',

apps/website/src/components/ui/button-pill/ButtonPill.vue

@@ -38,7 +38,13 @@ const {
     :disabled
     :class="cn(buttonPillVariants({ variant, size, iconPosition }), className)"
   >
-    <span class="relative leading-none transition-all duration-500">
+    <span
+      :class="
+        cn(
+          'ppformula-text-center relative leading-none transition-all duration-500'
+        )
+      "
+    >
       <slot />
     </span>
     <span

apps/website/src/components/ui/button/Button.vue

@@ -40,7 +40,7 @@ const {
     <slot name="prepend">
       <component :is="prependIcon" v-if="prependIcon" />
     </slot>
-    <span>
+    <span class="ppformula-text-center">
       <slot />
     </span>
     <slot name="append">

apps/website/src/components/ui/button/index.ts

@@ -20,8 +20,6 @@ export const buttonVariants = cva(
         link: "text-primary-comfy-yellow h-auto justify-start px-0 py-1 text-base uppercase hover:opacity-90 [&_svg:not([class*='size-'])]:size-6",
         underlineLink:
           "text-primary-comfy-yellow relative h-auto justify-start px-0 py-1 uppercase after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-full after:origin-left after:scale-x-0 after:bg-current after:transition-transform after:duration-200 hover:opacity-90 hover:after:scale-x-100 [&_svg:not([class*='size-'])]:size-6",
-        inline:
-          'text-primary-comfy-yellow inline h-auto rounded-none p-0 align-baseline text-sm font-normal tracking-normal whitespace-normal hover:opacity-90 [&>span]:top-0 [&>span]:underline',
         nav: 'text-primary-warm-white hover:text-primary-comfy-yellow h-auto justify-between px-0 py-1 text-start text-2xl font-medium',
         navMuted:
           'hover:text-primary-comfy-yellow h-auto w-full justify-between px-0 py-1 text-start text-2xl font-medium text-primary-comfy-canvas uppercase'

apps/website/src/components/ui/copyable-field/CopyableField.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
 import { Check, Copy } from '@lucide/vue'
 import { useClipboard } from '@vueuse/core'
 
-import { computed } from 'vue'
-
 // Interactive: the copy button is inert until its host island is hydrated.
 // Render under a `client:*` directive (e.g. `client:visible`) when the page
 // needs it to work.
@@ -14,8 +11,6 @@ const {
   copiedLabel = 'Copied'
 } = defineProps<{ value: string; copyLabel?: string; copiedLabel?: string }>()
 
-const multiline = computed(() => value.includes('\n'))
-
 const { copy, copied } = useClipboard({ copiedDuring: 2000 })
 
 function handleCopy() {
@@ -25,32 +20,15 @@ function handleCopy() {
 
 <template>
   <div
-    :class="
-      cn(
-        'bg-transparency-white-t4 border-primary-warm-gray flex gap-2 rounded-xl border px-4 py-3',
-        multiline ? 'items-start' : 'items-center'
-      )
-    "
+    class="bg-transparency-white-t4 border-primary-warm-gray flex items-center gap-2 rounded-xl border px-4 py-3"
   >
-    <span
-      :class="
-        cn(
-          'flex-1 font-mono text-xs text-primary-comfy-canvas',
-          multiline ? 'wrap-break-word whitespace-pre-line' : 'truncate'
-        )
-      "
-    >
+    <span class="flex-1 truncate font-mono text-xs text-primary-comfy-canvas">
       {{ value }}
     </span>
     <button
       type="button"
       :aria-label="copied ? copiedLabel : copyLabel"
-      :class="
-        cn(
-          'text-primary-warm-gray shrink-0 cursor-pointer transition-colors hover:text-primary-comfy-canvas',
-          multiline && 'mt-0.5'
-        )
-      "
+      class="text-primary-warm-gray shrink-0 cursor-pointer transition-colors hover:text-primary-comfy-canvas"
       @click="handleCopy"
     >
       <component :is="copied ? Check : Copy" class="size-4" />

apps/website/src/components/ui/icon-button/IconButton.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import type { PrimitiveProps } from 'reka-ui'
-import type { HTMLAttributes } from 'vue'
-import type { IconButtonVariants } from '.'
-import { Primitive } from 'reka-ui'
-import { cn } from '@comfyorg/tailwind-utils'
-import { iconButtonVariants } from '.'
-
-interface Props extends PrimitiveProps {
-  variant?: IconButtonVariants['variant']
-  size?: IconButtonVariants['size']
-  class?: HTMLAttributes['class']
-  disabled?: boolean
-}
-
-const {
-  as = 'button',
-  asChild,
-  variant,
-  size,
-  class: className,
-  disabled
-} = defineProps<Props>()
-</script>
-
-<template>
-  <Primitive
-    data-slot="icon-button"
-    :data-variant="variant"
-    :data-size="size"
-    :as
-    :as-child
-    :disabled
-    :class="cn(iconButtonVariants({ variant, size }), className)"
-  >
-    <slot />
-  </Primitive>
-</template>

apps/website/src/components/ui/icon-button/index.ts

@@ -1,28 +0,0 @@
-import type { VariantProps } from 'class-variance-authority'
-import { cva } from 'class-variance-authority'
-
-export const iconButtonVariants = cva(
-  [
-    'focus-visible:border-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 inline-flex shrink-0 cursor-pointer items-center justify-center rounded-2xl transition-all duration-200 outline-none focus-visible:ring-3 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0'
-  ],
-  {
-    variants: {
-      variant: {
-        ghost:
-          'text-primary-warm-white hover:text-primary-comfy-yellow bg-transparent',
-        outline:
-          'text-primary-comfy-yellow hover:bg-primary-comfy-yellow border-primary-comfy-yellow border-2 bg-primary-comfy-ink hover:text-primary-comfy-ink'
-      },
-      size: {
-        sm: 'size-8',
-        default: 'size-10',
-        lg: 'size-14'
-      }
-    },
-    defaultVariants: {
-      variant: 'ghost',
-      size: 'default'
-    }
-  }
-)
-export type IconButtonVariants = VariantProps<typeof iconButtonVariants>

apps/website/src/components/ui/navigation-menu/NavigationMenuTrigger.vue

@@ -30,7 +30,7 @@ const forwardedProps = useForwardProps(computed(() => ({ ...restProps })))
     :data-active="active ? '' : undefined"
     :class="cn(navigationMenuTriggerStyle(), 'group', className)"
   >
-    <span>
+    <span class="ppformula-text-center">
       <slot />
     </span>
     <ChevronDown

apps/website/src/composables/useBannerDismissal.ts

@@ -1,75 +0,0 @@
-import { onMounted, ref } from 'vue'
-
-import { BANNER_DISMISS_ATTR, BANNER_STORAGE_KEY } from '../utils/banner'
-
-type ClosedBanners = Record<string, boolean>
-
-function readClosedBanners(): ClosedBanners {
-  try {
-    const raw = localStorage.getItem(BANNER_STORAGE_KEY)
-    return raw ? (JSON.parse(raw) as ClosedBanners) : {}
-  } catch {
-    return {}
-  }
-}
-
-function writeClosedBanners(value: ClosedBanners): void {
-  try {
-    localStorage.setItem(BANNER_STORAGE_KEY, JSON.stringify(value))
-  } catch {
-    // Storage unavailable (private mode / quota) — dismissal just won't persist.
-  }
-}
-
-/** The stable part of a version key (everything before `_v<hash>`). */
-function versionPrefix(version: string): string {
-  const idx = version.lastIndexOf('_v')
-  return idx === -1 ? version : version.slice(0, idx)
-}
-
-/**
- * Client-side dismissal persisted in localStorage, keyed by a content-aware
- * `version`. The banner renders visible in the static HTML (so non-dismissers
- * see no pop-in); an inline pre-hydration script hides an already-dismissed
- * banner before paint, and this composable then removes it from the DOM on mount.
- */
-export function useBannerDismissal(version: string) {
-  const isVisible = ref(true)
-
-  onMounted(() => {
-    const stored = readClosedBanners()
-    const prefix = versionPrefix(version)
-
-    // Prune stale versions of THIS banner+locale; keep other banners/locales
-    // and the current version.
-    const cleaned: ClosedBanners = Object.create(null) as ClosedBanners
-    let pruned = false
-    for (const key of Object.keys(stored)) {
-      if (versionPrefix(key) !== prefix || key === version) {
-        cleaned[key] = stored[key]
-      } else {
-        pruned = true
-      }
-    }
-    if (pruned) writeClosedBanners(cleaned)
-
-    isVisible.value = !cleaned[version]
-  })
-
-  function close(): void {
-    isVisible.value = false
-    const stored = readClosedBanners()
-    stored[version] = true
-    writeClosedBanners(stored)
-  }
-
-  // Call once the close transition has finished. Sets the pre-paint hide signal
-  // so the banner doesn't flash back in on a ClientRouter (view-transition)
-  // navigation — where the inline <head> script does not re-run but <html>
-  // persists. Deferred to after the animation so the leave transition can play.
-  function persistHidden(): void {
-    document.documentElement.setAttribute(BANNER_DISMISS_ATTR, '')
-  }
-
-  return { isVisible, close, persistHidden }
-}

apps/website/src/composables/useCurrentPath.test.ts

@@ -1,31 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { isHrefActive } from './useCurrentPath'
-
-describe('isHrefActive', () => {
-  it('matches the current page', () => {
-    expect(isHrefActive('/mcp', '/mcp')).toBe(true)
-  })
-
-  it('does not match other pages', () => {
-    expect(isHrefActive('/mcp', '/pricing')).toBe(false)
-  })
-
-  it('matches regardless of a trailing slash', () => {
-    expect(isHrefActive('/mcp', '/mcp/')).toBe(true)
-  })
-
-  it('ignores query and hash on the href', () => {
-    expect(isHrefActive('/mcp?ref=banner#setup', '/mcp')).toBe(true)
-  })
-
-  it('never matches an external href', () => {
-    expect(
-      isHrefActive('https://docs.comfy.org/agent-tools/cloud', '/mcp')
-    ).toBe(false)
-  })
-
-  it('never matches an empty href', () => {
-    expect(isHrefActive('', '/mcp')).toBe(false)
-  })
-})

apps/website/src/config/banner.ts

@@ -1,85 +0,0 @@
-import type { ButtonVariants } from '../components/ui/button'
-import type { Locale, TranslationKey } from '../i18n/translations'
-
-import { t } from '../i18n/translations'
-import { resolveRel } from '../utils/cta'
-import { localizeHref } from './routes'
-
-// The banner "CMS": a single typed config resolved through i18n at build time.
-// `isActive` is the master on/off switch (supersedes the old SHOW_ANNOUNCEMENT_BANNER).
-// NOTE: on this static site, `startsAt`/`endsAt` are evaluated at BUILD time — the
-// window gates on the last deploy, not the visitor's exact clock.
-
-interface BannerLinkConfig {
-  readonly href: string
-  readonly titleKey: TranslationKey
-  readonly target?: boolean
-  readonly buttonVariant?: NonNullable<ButtonVariants['variant']>
-}
-
-export interface BannerConfig {
-  readonly id: string
-  readonly isActive: boolean
-  readonly startsAt?: string
-  readonly endsAt?: string
-  /** Empty/undefined = all locales. */
-  readonly targetLocales?: readonly Locale[]
-  /** v1 only supports 'sitewide'. */
-  readonly targetSections?: readonly string[]
-  readonly titleKey: TranslationKey
-  readonly descriptionKey?: TranslationKey
-  readonly link?: BannerLinkConfig
-}
-
-interface BannerLinkData {
-  readonly href: string
-  readonly title: string
-  readonly target?: '_blank'
-  readonly rel?: string
-  readonly buttonVariant?: NonNullable<ButtonVariants['variant']>
-}
-
-export interface BannerData {
-  readonly id: string
-  readonly title: string
-  readonly description?: string
-  readonly link?: BannerLinkData
-}
-
-export const bannerConfig: BannerConfig = {
-  id: 'announcement',
-  isActive: true,
-  targetSections: ['sitewide'],
-  titleKey: 'launches.banner.text',
-  link: {
-    href: '/mcp',
-    titleKey: 'launches.banner.cta',
-    buttonVariant: 'underlineLink'
-  }
-}
-
-/** Resolve a config's i18n keys into display strings for the given locale. */
-export function getBannerData(
-  config: BannerConfig,
-  locale: Locale
-): BannerData {
-  const { link } = config
-  const target = link?.target ? '_blank' : undefined
-
-  return {
-    id: config.id,
-    title: t(config.titleKey, locale),
-    description: config.descriptionKey
-      ? t(config.descriptionKey, locale)
-      : undefined,
-    link: link
-      ? {
-          href: localizeHref(link.href, locale),
-          title: t(link.titleKey, locale),
-          target,
-          rel: resolveRel({ target: target ?? '_self' }),
-          buttonVariant: link.buttonVariant
-        }
-      : undefined
-  }
-}

apps/website/src/config/pricing.ts

@@ -1,53 +0,0 @@
-import { t } from '../i18n/translations'
-import type { Locale, TranslationKey } from '../i18n/translations'
-import { externalLinks } from './routes'
-
-interface PricingTier {
-  slug: string
-  labelKey: TranslationKey
-  priceKey: TranslationKey
-}
-
-const tiers: PricingTier[] = [
-  {
-    slug: 'standard',
-    labelKey: 'pricing.plan.standard.label',
-    priceKey: 'pricing.plan.standard.price'
-  },
-  {
-    slug: 'creator',
-    labelKey: 'pricing.plan.creator.label',
-    priceKey: 'pricing.plan.creator.price'
-  },
-  {
-    slug: 'pro',
-    labelKey: 'pricing.plan.pro.label',
-    priceKey: 'pricing.plan.pro.price'
-  }
-]
-
-export interface PricingOffer {
-  name: string
-  price: string
-  url: string
-}
-
-export function pricingOffers(locale: Locale): PricingOffer[] {
-  return tiers.flatMap((tier) => {
-    const display = t(tier.priceKey, locale).trim()
-    const match = /^\$(\d+(?:\.\d+)?)$/.exec(display)
-    if (!match) {
-      console.warn(
-        `pricingOffers: skipping tier "${tier.slug}" (${locale}) — price "${display}" is not a plain USD amount`
-      )
-      return []
-    }
-    return [
-      {
-        name: t(tier.labelKey, locale),
-        price: match[1],
-        url: `${externalLinks.cloud}/cloud/subscribe?tier=${tier.slug}&cycle=monthly`
-      }
-    ]
-  })
-}

apps/website/src/config/routes.test.ts

@@ -1,23 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { localizeHref } from './routes'
-
-describe('localizeHref', () => {
-  it('prefixes an internal path for a non-default locale', () => {
-    expect(localizeHref('/mcp', 'zh-CN')).toBe('/zh-CN/mcp')
-  })
-
-  it('leaves the default locale unprefixed', () => {
-    expect(localizeHref('/mcp', 'en')).toBe('/mcp')
-  })
-
-  it('passes external URLs through unchanged', () => {
-    expect(
-      localizeHref('https://docs.comfy.org/agent-tools/cloud', 'zh-CN')
-    ).toBe('https://docs.comfy.org/agent-tools/cloud')
-  })
-
-  it('never prefixes locale-invariant routes', () => {
-    expect(localizeHref('/terms-of-service', 'zh-CN')).toBe('/terms-of-service')
-  })
-})

apps/website/src/config/routes.ts

@@ -15,14 +15,12 @@ const baseRoutes = {
   demos: '/demos',
   learning: '/learning',
   termsOfService: '/terms-of-service',
-  enterpriseMsa: '/enterprise-msa',
   privacyPolicy: '/privacy-policy',
   affiliates: '/affiliates',
   affiliateTerms: '/affiliates/terms',
   contact: '/contact',
   models: '/p/supported-models',
-  mcp: '/mcp',
-  brand: '/brand'
+  mcp: '/mcp'
 } as const
 
 type Routes = typeof baseRoutes
@@ -37,37 +35,19 @@ type Routes = typeof baseRoutes
 // block in src/i18n/translations.ts for the reasoning.
 //
 // termsOfService: legal-reviewed English-only document, same reasoning.
-//
-// enterpriseMsa: legal-reviewed English-only document (Comfy Enterprise
-// Customer Agreement template), same reasoning. See the comment header
-// in src/pages/enterprise-msa.astro.
 const LOCALE_INVARIANT_ROUTE_KEYS = new Set<keyof Routes>([
   'affiliates',
   'affiliateTerms',
-  'termsOfService',
-  'enterpriseMsa'
+  'termsOfService'
 ])
 
-const LOCALE_INVARIANT_PATHS = new Set<string>(
-  [...LOCALE_INVARIANT_ROUTE_KEYS].map((key) => baseRoutes[key])
-)
-
-/**
- * Prefix an internal path with the locale (`/mcp` → `/zh-CN/mcp`). External
- * URLs and locale-invariant routes pass through unchanged.
- */
-export function localizeHref(href: string, locale: Locale = 'en'): string {
-  if (locale === 'en' || !href.startsWith('/')) return href
-  if (LOCALE_INVARIANT_PATHS.has(href)) return href
-  return `/${locale}${href}`
-}
-
 export function getRoutes(locale: Locale = 'en'): Routes {
   if (locale === 'en') return baseRoutes
+  const prefix = `/${locale}`
   return Object.fromEntries(
-    Object.entries(baseRoutes).map(([key, path]) => [
-      key,
-      localizeHref(path, locale)
+    Object.entries(baseRoutes).map(([k, v]) => [
+      k,
+      LOCALE_INVARIANT_ROUTE_KEYS.has(k as keyof Routes) ? v : `${prefix}${v}`
     ])
   ) as unknown as Routes
 }
@@ -80,23 +60,18 @@ export const externalLinks = {
   cloudStatus: 'https://status.comfy.org',
   discord: 'https://discord.com/invite/comfyorg',
   docs: 'https://docs.comfy.org/',
-  docsApi: 'https://docs.comfy.org/development/cloud/overview#quick-start',
+  docsApi: 'https://docs.comfy.org/api-reference/cloud',
   docsMcp: 'https://docs.comfy.org/agent-tools/cloud',
   docsSubscription: 'https://docs.comfy.org/support/subscription/subscribing',
-  g2ComfyUi: 'https://www.g2.com/products/comfyui',
   github: 'https://github.com/Comfy-Org/ComfyUI',
   githubInstall: 'https://github.com/Comfy-Org/ComfyUI#installing',
   instagram: 'https://www.instagram.com/comfyui/',
-  linkedin: 'https://www.linkedin.com/company/comfyui',
-  mcpEndpoint: 'https://cloud.comfy.org/mcp',
+  mcpServer: 'https://cloud.comfy.org/mcp',
   mcpSkills: 'https://github.com/Comfy-Org/comfy-skills',
   platform: 'https://platform.comfy.org',
   platformUsage: 'https://platform.comfy.org/profile/usage',
   reddit: 'https://www.reddit.com/r/comfyui/',
   support: 'https://support.comfy.org/hc/en-us',
-  wikidataComfyOrg: 'https://www.wikidata.org/wiki/Q130598554',
-  wikidataComfyUi: 'https://www.wikidata.org/wiki/Q127798647',
-  wikipediaComfyUi: 'https://en.wikipedia.org/wiki/ComfyUI',
   workflows: 'https://comfy.org/workflows',
   x: 'https://x.com/ComfyUI',
   youtube: 'https://www.youtube.com/@ComfyOrg'

apps/website/src/data/affiliateBrandAssets.ts

@@ -1,7 +1,5 @@
 import type { LocalizedText } from '../i18n/translations'
 
-import { BRAND_ASSETS_ZIP } from './brandAssets'
-
 interface AffiliateBrandAsset {
   id: string
   title: LocalizedText
@@ -9,6 +7,9 @@ interface AffiliateBrandAsset {
   preview: string
 }
 
+const BRAND_ASSETS_ZIP =
+  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
+
 export const affiliateBrandAssets: readonly AffiliateBrandAsset[] = [
   {
     id: 'core-logo',

apps/website/src/data/brandAssets.ts

@@ -1,9 +0,0 @@
-// Shared brand download URLs served from the media bucket, used by both the
-// affiliate page and the brand portal.
-export const BRAND_ASSETS_ZIP =
-  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
-
-// Brand guidelines live in Google Drive, shared to Comfy Org only, so Google
-// enforces the comfy.org sign-in. Opened in a new tab rather than downloaded.
-export const BRAND_GUIDELINES_PDF =
-  'https://drive.google.com/file/d/1EDt03JTfF_nbbY_H2n67aaUj6k11v3bS/view'

apps/website/src/data/brandColors.ts

@@ -1,91 +0,0 @@
-interface BrandColor {
-  name: string
-  hex: string
-  rgb: string
-  hsl: string
-  cmyk: string
-  swatchClass: string
-  textClass: string
-  wide?: boolean
-  border?: boolean
-}
-
-export const brandColors: readonly BrandColor[] = [
-  {
-    name: 'Comfy Yellow',
-    hex: '#F2FF59',
-    rgb: '242, 255, 89',
-    hsl: '65, 100, 67',
-    cmyk: '5, 0, 65, 0',
-    swatchClass: 'bg-primary-comfy-yellow',
-    textClass: 'text-primary-comfy-ink',
-    wide: true
-  },
-  {
-    name: 'Comfy Ink',
-    hex: '#211927',
-    rgb: '33, 25, 39',
-    hsl: '274, 22, 13',
-    cmyk: '15, 36, 0, 85',
-    swatchClass: 'bg-primary-comfy-ink',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Comfy Canvas',
-    hex: '#C2BFB9',
-    rgb: '194, 191, 185',
-    hsl: '40, 7, 74',
-    cmyk: '0, 2, 5, 24',
-    swatchClass: 'bg-primary-comfy-canvas',
-    textClass: 'text-primary-comfy-ink'
-  },
-  {
-    name: 'Comfy Plum',
-    hex: '#49378B',
-    rgb: '73, 55, 139',
-    hsl: '253, 43, 38',
-    cmyk: '47, 60, 0, 45',
-    swatchClass: 'bg-primary-comfy-plum',
-    textClass: 'text-primary-comfy-canvas'
-  },
-  {
-    name: 'Warm White',
-    hex: '#F0EFED',
-    rgb: '240, 239, 237',
-    hsl: '40, 9, 94',
-    cmyk: '0, 0, 1, 6',
-    swatchClass: 'bg-primary-warm-white',
-    textClass: 'text-primary-comfy-ink',
-    wide: true
-  },
-  {
-    name: 'Warm Gray',
-    hex: '#7E7C78',
-    rgb: '126, 124, 120',
-    hsl: '40, 2, 48',
-    cmyk: '0, 2, 5, 51',
-    swatchClass: 'bg-primary-warm-gray',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Cool Gray',
-    hex: '#3C3C3C',
-    rgb: '60, 60, 60',
-    hsl: '0, 0, 24',
-    cmyk: '0, 0, 0, 76',
-    swatchClass: 'bg-secondary-cool-gray',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Mauve',
-    hex: '#4D3762',
-    rgb: '77, 55, 98',
-    hsl: '271, 28, 30',
-    cmyk: '21, 44, 0, 62',
-    swatchClass: 'bg-secondary-mauve',
-    textClass: 'text-primary-warm-white'
-  }
-] as const

apps/website/src/data/drops.ts

@@ -72,24 +72,6 @@ export const drops: readonly Drop[] = [
       href: { en: '/download', 'zh-CN': '/zh-CN/download' }
     }
   },
-  {
-    id: 'comfy-mcp',
-    badge: NEW_BADGE,
-    category: CLOUD,
-    media: imageFor('Drops_2x2card_MCP.jpg', {
-      en: 'Comfy MCP',
-      'zh-CN': 'Comfy MCP'
-    }),
-    title: { en: 'Comfy MCP', 'zh-CN': 'Comfy MCP' },
-    description: {
-      en: 'The full power of ComfyUI from anywhere — no setup, no GPU required.',
-      'zh-CN': '随时随地体验 ComfyUI 的全部能力 — 无需配置，无需 GPU。'
-    },
-    cta: {
-      label: EXPLORE,
-      href: { en: '/mcp', 'zh-CN': '/zh-CN/mcp' }
-    }
-  },
   {
     id: 'app-mode',
     badge: NEW_BADGE,
@@ -130,6 +112,24 @@ export const drops: readonly Drop[] = [
       href: { en: '/api', 'zh-CN': '/zh-CN/api' }
     }
   },
+  {
+    id: 'comfy-mcp',
+    badge: NEW_BADGE,
+    category: CLOUD,
+    media: imageFor('Drops_2x2card_MCP.jpg', {
+      en: 'Comfy MCP',
+      'zh-CN': 'Comfy MCP'
+    }),
+    title: { en: 'Comfy MCP', 'zh-CN': 'Comfy MCP' },
+    description: {
+      en: 'The full power of ComfyUI from anywhere — no setup, no GPU required.',
+      'zh-CN': '随时随地体验 ComfyUI 的全部能力 — 无需配置，无需 GPU。'
+    },
+    cta: {
+      label: EXPLORE,
+      href: { en: '/mcp', 'zh-CN': '/zh-CN/mcp' }
+    }
+  },
   {
     id: 'community-workflows',
     category: COMMUNITY,

apps/website/src/data/mainNavigation.ts

@@ -30,23 +30,15 @@ export type NavItem =
       label: string
       columns: NavColumn[]
       featured?: NavFeatured
-      badge?: 'new'
       href?: never
     }
-  | {
-      label: string
-      href: string
-      badge?: 'new'
-      columns?: never
-      featured?: never
-    }
+  | { label: string; href: string; columns?: never; featured?: never }
 
 export function getMainNavigation(locale: Locale): NavItem[] {
   const routes = getRoutes(locale)
   return [
     {
       label: t('nav.products', locale),
-      badge: 'new',
       featured: {
         imageSrc: 'https://media.comfy.org/website/nav/mcp-card.webp',
         imageAlt: t('nav.featuredProductsAlt', locale),
@@ -103,7 +95,6 @@ export function getMainNavigation(locale: Locale): NavItem[] {
     { label: t('nav.pricing', locale), href: routes.cloudPricing },
     {
       label: t('nav.community', locale),
-      badge: 'new',
       featured: {
         imageSrc: 'https://media.comfy.org/website/nav/featured-demo-card.jpg',
         imageAlt: t('nav.featuredCommunityAlt', locale),

apps/website/src/layouts/BaseLayout.astro

@@ -5,19 +5,8 @@ import '../styles/global.css'
 import type { Locale } from '../i18n/translations'
 import SiteFooter from '../components/common/SiteFooter.vue'
 import HeaderMain from '../components/common/HeaderMain/HeaderMain.vue'
-import AnnouncementBanner from '../templates/drops/AnnouncementBanner.vue'
-import { bannerConfig, getBannerData } from '../config/banner'
-import { isHrefActive } from '../composables/useCurrentPath'
-import {
-  BANNER_DISMISS_ATTR,
-  BANNER_STORAGE_KEY,
-  createBannerVersion,
-  evaluateBannerVisibility
-} from '../utils/banner'
+import { escapeJsonLd } from '../utils/escapeJsonLd'
 import { fetchGitHubStars, formatStarCount } from '../utils/github'
-import { buildPageGraph, pageContext } from '../utils/jsonLd'
-import type { Crumb, JsonLdNode, WebPageType } from '../utils/jsonLd'
-import JsonLdGraph from '../components/common/JsonLdGraph.astro'
 
 interface Props {
   title: string
@@ -25,10 +14,6 @@ interface Props {
   keywords?: string[]
   ogImage?: string
   noindex?: boolean
-  pageType?: WebPageType
-  breadcrumbs?: Crumb[]
-  mainEntityId?: string
-  extraJsonLd?: (JsonLdNode | null | undefined)[]
 }
 
 const {
@@ -37,54 +22,43 @@ const {
   keywords,
   ogImage = 'https://media.comfy.org/website/comfy.webp',
   noindex = false,
-  pageType,
-  breadcrumbs,
-  mainEntityId,
-  extraJsonLd,
 } = Astro.props
 
 const keywordsContent = keywords && keywords.length > 0 ? keywords.join(', ') : undefined
 
-const { siteUrl, locale, url } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
-const canonicalURL = new URL(url)
-const ogImageURL = new URL(ogImage, Astro.site ?? 'https://comfy.org')
+const siteBase = Astro.site ?? 'https://comfy.org'
+const canonicalURL = new URL(Astro.url.pathname, siteBase)
+const ogImageURL = new URL(ogImage, siteBase)
+const rawLocale = Astro.currentLocale ?? 'en'
+const locale: Locale = rawLocale === 'zh-CN' ? 'zh-CN' : 'en'
 const rawStars = await fetchGitHubStars('Comfy-Org', 'ComfyUI')
 const githubStars = rawStars ? formatStarCount(rawStars) : ''
 
-// Announcement banner — build-time visibility gate + content-hash version key.
-// A promo never advertises the page you are already on, so the banner is
-// suppressed when its CTA points at the current path.
-const bannerData = getBannerData(bannerConfig, locale)
-const bannerVisible =
-  evaluateBannerVisibility(bannerConfig, {
-    currentLocale: locale,
-    currentSection: 'sitewide',
-    now: new Date(),
-  }) && !isHrefActive(bannerData.link?.href ?? '', Astro.url.pathname)
-const bannerVersion = createBannerVersion(bannerData, locale)
-
 const gtmId = 'GTM-NP9JM6K7'
 const gtmEnabled = import.meta.env.PROD
 
-const structuredData = noindex
-  ? undefined
-  : buildPageGraph(
-      { siteUrl, locale },
-      {
-        url,
-        name: title,
-        description,
-        imageUrl: ogImageURL.href,
-        type: pageType,
-        crumbs: breadcrumbs,
-        mainEntityId,
-      },
-      ...(extraJsonLd ?? []),
-    )
+const organizationJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'Organization',
+  name: 'Comfy Org',
+  url: 'https://comfy.org',
+  logo: 'https://comfy.org/icons/logomark.svg',
+  sameAs: [
+    'https://github.com/comfyanonymous/ComfyUI',
+    'https://discord.gg/comfyorg',
+    'https://x.com/comaboratory',
+    'https://reddit.com/r/comfyui',
+    'https://linkedin.com/company/comfyorg',
+    'https://instagram.com/comfyorg',
+  ],
+}
+
+const websiteJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'WebSite',
+  name: 'Comfy',
+  url: 'https://comfy.org',
+}
 ---
 
 <!doctype html>
@@ -126,7 +100,10 @@ const structuredData = noindex
     <meta name="twitter:image" content={ogImageURL.href} />
 
     <!-- Structured Data -->
-    {structuredData && <JsonLdGraph graph={structuredData} />}
+    <script is:inline type="application/ld+json" set:html={escapeJsonLd(organizationJsonLd)} />
+    <script is:inline type="application/ld+json" set:html={escapeJsonLd(websiteJsonLd)} />
+    <slot name="head" />
+
     <slot name="head" />
 
     <!-- Google Tag Manager -->
@@ -146,25 +123,7 @@ const structuredData = noindex
     )}
 
     <ClientRouter />
-
-    <!-- Hide an already-dismissed announcement banner before first paint (no flash/shift). -->
-    {bannerVisible && (
-      <script
-        is:inline
-        define:vars={{
-          bannerVersion,
-          storageKey: BANNER_STORAGE_KEY,
-          dismissAttr: BANNER_DISMISS_ATTR
-        }}
-      >
-        try {
-          const dismissed = JSON.parse(localStorage.getItem(storageKey) || '{}')
-          if (dismissed[bannerVersion]) {
-            document.documentElement.setAttribute(dismissAttr, '')
-          }
-        } catch (e) {}
-      </script>
-    )}
+    <slot name="head" />
   </head>
   <body class="bg-primary-comfy-ink text-white font-formula antialiased overflow-x-clip">
     {gtmEnabled && (
@@ -178,16 +137,8 @@ const structuredData = noindex
       </noscript>
     )}
 
-    {bannerVisible && (
-      <AnnouncementBanner
-        data={bannerData}
-        version={bannerVersion}
-        locale={locale}
-        client:load
-      />
-    )}
     <HeaderMain locale={locale} github-stars={githubStars} client:load />
-    <main>
+    <main class="mt-20 lg:mt-32">
       <slot />
     </main>
     <SiteFooter locale={locale} client:load />

apps/website/src/pages/404.astro

@@ -3,7 +3,7 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 ---
 
 <BaseLayout
-  title="404 - Page Not Found - Comfy"
+  title="404 — Page Not Found — Comfy"
   noindex>
   <div
     class="flex w-full flex-col items-center p-4 h-[calc(100dvh-12rem)]">

apps/website/src/pages/about.astro

@@ -5,25 +5,9 @@ import StorySection from '../components/about/StorySection.vue'
 import OurValuesSection from '../components/about/OurValuesSection.vue'
 import ValuesSection from '../components/about/ValuesSection.vue'
 import CareersSection from '../components/about/CareersSection.vue'
-import { t } from '../i18n/translations'
-import { absoluteUrl, organizationId, pageContext } from '../utils/jsonLd'
-
-const { siteUrl, locale } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
 ---
 
-<BaseLayout
-  title="About Us - Comfy"
-  pageType="AboutPage"
-  mainEntityId={organizationId(siteUrl)}
-  breadcrumbs={[
-    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
-    { name: t('breadcrumb.about', locale) },
-  ]}
->
+<BaseLayout title="About Us — Comfy">
   <HeroSection client:load />
   <StorySection />
   <OurValuesSection />

apps/website/src/pages/affiliates/index.astro

@@ -9,36 +9,34 @@ import HeroSection from '../../templates/affiliate/HeroSection.vue'
 import HowItWorksSection from '../../templates/affiliate/HowItWorksSection.vue'
 import { affiliateFaqs } from '../../data/affiliateFaq'
 import { t } from '../../i18n/translations'
-import type { JsonLdNode } from '../../utils/jsonLd'
-import { absoluteUrl, jsonLdId, pageContext } from '../../utils/jsonLd'
 
-const pageTitle = t('affiliate.page.title', 'en')
-const pageDescription = t('affiliate.page.description', 'en')
-const { locale, url } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
-const faqPage: JsonLdNode = {
+const locale = 'en' as const
+
+const faqJsonLd = {
+  '@context': 'https://schema.org',
   '@type': 'FAQPage',
-  '@id': jsonLdId(url, 'faq'),
   mainEntity: affiliateFaqs.map((faq) => ({
     '@type': 'Question',
     name: faq.question[locale],
-    acceptedAnswer: { '@type': 'Answer', text: faq.answer[locale] },
-  })),
+    acceptedAnswer: {
+      '@type': 'Answer',
+      text: faq.answer[locale]
+    }
+  }))
 }
 ---
 
 <BaseLayout
-  title={pageTitle}
-  description={pageDescription}
-  breadcrumbs={[
-    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
-    { name: pageTitle },
-  ]}
-  extraJsonLd={[faqPage]}
+  title={t('affiliate.page.title', locale)}
+  description={t('affiliate.page.description', locale)}
 >
+  <Fragment slot="head">
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(faqJsonLd)}
+    />
+  </Fragment>
 
   <HeroSection />
   <HowItWorksSection />

apps/website/src/pages/brand.astro

@@ -1,28 +0,0 @@
----
-import BaseLayout from '../layouts/BaseLayout.astro'
-import BrandBackground from '../templates/brand/BrandBackground.vue'
-import BrandHeroSection from '../templates/brand/BrandHeroSection.vue'
-import BrandLogosSection from '../templates/brand/BrandLogosSection.vue'
-import BrandColorSection from '../templates/brand/BrandColorSection.vue'
-import BrandVoiceSection from '../templates/brand/BrandVoiceSection.vue'
-import BrandTrademarkSection from '../templates/brand/BrandTrademarkSection.vue'
-import BrandQuestionsSection from '../templates/brand/BrandQuestionsSection.vue'
-import { t } from '../i18n/translations'
-
-const locale = 'en' as const
----
-
-<BaseLayout
-  title={t('brand.page.title', locale)}
-  description={t('brand.page.description', locale)}
->
-  <div class="relative">
-    <BrandBackground client:idle />
-    <BrandHeroSection />
-    <BrandLogosSection />
-    <BrandColorSection client:visible />
-    <BrandVoiceSection />
-    <BrandTrademarkSection />
-    <BrandQuestionsSection />
-  </div>
-</BaseLayout>

apps/website/src/pages/careers.astro

@@ -7,13 +7,6 @@ import TeamPhotosSection from '../components/careers/TeamPhotosSection.vue'
 import FAQSection from '../components/common/FAQSection.vue'
 import { fetchRolesForBuild } from '../utils/ashby'
 import { reportAshbyOutcome } from '../utils/ashby.ci'
-import { t } from '../i18n/translations'
-import {
-  absoluteUrl,
-  itemListNode,
-  jsonLdId,
-  pageContext,
-} from '../utils/jsonLd'
 
 const outcome = await fetchRolesForBuild()
 reportAshbyOutcome(outcome)
@@ -26,31 +19,11 @@ if (outcome.status === 'failed') {
 }
 
 const departments = outcome.snapshot.departments
-
-const { siteUrl, locale, url } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
-const roles = itemListNode(
-  url,
-  t('breadcrumb.careers', locale),
-  departments.flatMap((department) =>
-    department.roles.map((role) => ({ name: role.title, url: role.jobUrl })),
-  ),
-)
 ---
 
 <BaseLayout
-  title="Careers - Comfy"
+  title="Careers — Comfy"
   description="Join the team building the operating system for generative AI. Open roles in engineering, design, marketing, and more."
-  pageType="CollectionPage"
-  mainEntityId={jsonLdId(url, 'itemlist')}
-  breadcrumbs={[
-    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
-    { name: t('breadcrumb.careers', locale) },
-  ]}
-  extraJsonLd={[roles]}
 >
   <HeroSection />
   <RolesSection departments={departments} client:visible />

apps/website/src/pages/case-studies.astro

@@ -3,6 +3,6 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 import ComingSoon from '../components/common/ComingSoon.astro'
 ---
 
-<BaseLayout title="Case Studies - Comfy">
+<BaseLayout title="Case Studies — Comfy">
   <ComingSoon />
 </BaseLayout>

apps/website/src/pages/cloud/index.astro

@@ -11,7 +11,7 @@ import { t } from '../../i18n/translations'
 ---
 
 <BaseLayout
-  title="Comfy Cloud - AI in the Cloud"
+  title="Comfy Cloud — AI in the Cloud"
   description={t('cloud.hero.subtitle', 'en')}
   keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'comfy cloud', 'comfy ui application', 'comfyui browser', 'cloud comfyui', 'managed comfyui']}
 >

apps/website/src/pages/cloud/pricing.astro

@@ -2,41 +2,9 @@
 import BaseLayout from '../../layouts/BaseLayout.astro'
 import PriceSection from '../../components/pricing/PriceSection.vue'
 import WhatsIncludedSection from '../../components/pricing/WhatsIncludedSection.vue'
-import { pricingOffers } from '../../config/pricing'
-import { t } from '../../i18n/translations'
-import {
-  absoluteUrl,
-  jsonLdId,
-  pageContext,
-  productNode,
-} from '../../utils/jsonLd'
-
-const { siteUrl, locale, url } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
-const productId = jsonLdId(url, 'product')
 ---
 
-<BaseLayout
-  title="Pricing - Comfy Cloud"
-  mainEntityId={productId}
-  breadcrumbs={[
-    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
-    { name: 'Comfy Cloud', url: absoluteUrl(Astro.site, '/cloud') },
-    { name: t('breadcrumb.pricing', locale) },
-  ]}
-  extraJsonLd={[
-    productNode({
-      siteUrl,
-      id: productId,
-      name: 'Comfy Cloud',
-      url,
-      offers: pricingOffers(locale),
-    }),
-  ]}
->
+<BaseLayout title="Pricing — Comfy Cloud">
   <PriceSection client:load />
   <WhatsIncludedSection />
 </BaseLayout>

apps/website/src/pages/cloud/supported-nodes.astro

@@ -4,44 +4,39 @@ import HeroSection from '../../components/cloud-nodes/HeroSection.vue'
 import PackGridSection from '../../components/cloud-nodes/PackGridSection.vue'
 import { t } from '../../i18n/translations'
 import { loadPacksForBuild } from '../../utils/cloudNodes.build'
-import {
-  absoluteUrl,
-  itemListNode,
-  jsonLdId,
-  pageContext,
-} from '../../utils/jsonLd'
+import { escapeJsonLd } from '../../utils/escapeJsonLd'
 
 const packs = await loadPacksForBuild()
 
-const title = t('cloudNodes.meta.title', 'en')
-const description = t('cloudNodes.meta.description', 'en')
-const { url, locale } = pageContext(
-  Astro.site,
-  Astro.url.pathname,
-  Astro.currentLocale,
-)
-const packList = itemListNode(
-  url,
-  title,
-  packs.map((pack) => ({
+const siteBase = Astro.site ?? new URL('https://comfy.org')
+const pageUrl = new URL('/cloud/supported-nodes', siteBase).href
+
+const itemListJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'ItemList',
+  name: 'Custom-node packs supported on Comfy Cloud',
+  url: pageUrl,
+  numberOfItems: packs.length,
+  itemListElement: packs.map((pack, index) => ({
+    '@type': 'ListItem',
+    position: index + 1,
+    url: new URL(`/cloud/supported-nodes/${pack.id}`, siteBase).href,
     name: pack.displayName,
-    url: absoluteUrl(Astro.site, `/cloud/supported-nodes/${pack.id}`),
-  })),
-)
+    image: pack.bannerUrl || pack.iconUrl
+  }))
+}
 ---
 
 <BaseLayout
-  title={title}
-  description={description}
-  pageType="CollectionPage"
-  mainEntityId={jsonLdId(url, 'itemlist')}
-  breadcrumbs={[
-    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
-    { name: 'Comfy Cloud', url: absoluteUrl(Astro.site, '/cloud') },
-    { name: t('breadcrumb.supportedNodes', locale) },
-  ]}
-  extraJsonLd={[packList]}
+  title={t('cloudNodes.meta.title', 'en')}
+  description={t('cloudNodes.meta.description', 'en')}
 >
+  <script
+    is:inline
+    slot="head"
+    type="application/ld+json"
+    set:html={escapeJsonLd(itemListJsonLd)}
+  />
   <HeroSection client:visible />
   <PackGridSection packs={packs} client:visible />
 </BaseLayout>