Merge branch 'main' into bl/asset-scenario-browsing

2026-05-23 06:10:32 +00:00 · 2026-05-11 16:50:43 -07:00
parent 94853510c3 74caeb0b0b
commit 73ee772f27
312 changed files with 22211 additions and 1920 deletions
--- a/.coderabbit.yaml
+++ b/.coderabbit.yaml
@@ -19,15 +19,26 @@ reviews:
      - name: End-to-end regression coverage for fixes
        mode: error
        instructions: |
-          Use only PR metadata already available in the review context: the PR title, commit subjects in this PR, the files changed in this PR relative to the PR base (equivalent to `base...head`), and the PR description.
-          Do not rely on shell commands. Do not inspect reverse diffs, files changed only on the base branch, or files outside this PR. If the changed-file list or commit subjects are unavailable, mark the check inconclusive instead of guessing.
+          Use only PR metadata already available in the review context:
+            - the PR title
+            - commit subjects in this PR
+            - The files changed in this PR relative to the PR base (equivalent to `base...head`)
+            - the PR description.
+          Do not rely on shell commands.
+          Do not inspect reverse diffs, files changed only on the base branch, or files outside this PR.
+          If the changed-file list or commit subjects are unavailable, mark the check inconclusive instead of guessing.

-          Pass if at least one of the following is true:
-          1. Neither the PR title nor any commit subject in the PR uses bug-fix language such as `fix`, `fixed`, `fixes`, `fixing`, `bugfix`, or `hotfix`.
-          2. The PR changes at least one file under `browser_tests/`.
-          3. The PR description includes a concrete, non-placeholder explanation of why an end-to-end regression test was not added.
+          Fail if all of the following are true:
+          1. The PR title and/or any commit subject in the PR uses bug-fix language such as `fix`, `fixed`, `fixes`, `fixing`, `bugfix`, or `hotfix`.
+          2. The PR changes files under `src/` or `packages/` related to the main frontend application but the PR does not change at least one file under `browser_tests/`.
+          3. The PR description lacks a concrete explanation of why an end-to-end regression test was not added.
+
+          Do not fail if the changes are exclusively in `apps/website`, just documentation changes, or changes related to CI processes.
+          The goal is to make sure that fixes include End-to-End regression tests. Do not insist on tests when the PR is not fixing a bug.
+
+          Pass otherwise.
+          When failing, mention which bug-fix signal you found and ask the author to either add or update a Playwright regression test under `browser_tests/` or add a concrete explanation in the PR description of why an end-to-end regression test is not practical.

-          Fail otherwise. When failing, mention which bug-fix signal you found and ask the author to either add or update a Playwright regression test under `browser_tests/` or add a concrete explanation in the PR description of why an end-to-end regression test is not practical.
      - name: ADR compliance for entity/litegraph changes
        mode: warning
        instructions: |
--- a/.github/workflows/ci-perf-report.yaml
+++ b/.github/workflows/ci-perf-report.yaml
@@ -54,10 +54,14 @@ jobs:
      - name: Start ComfyUI server
        uses: ./.github/actions/start-comfyui-server

+      # PRs run each test once to keep wall time bounded; main runs 3× so the
+      # baseline saved to perf-data has enough samples to median over noise.
      - name: Run performance tests
        id: perf
        continue-on-error: true
-        run: pnpm exec playwright test --project=performance --workers=1 --repeat-each=3
+        env:
+          PERF_REPEAT: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && '3' || '2' }}
+        run: pnpm exec playwright test --project=performance --workers=1 --repeat-each=$PERF_REPEAT

      - name: Upload perf metrics
        if: always()
--- a/.github/workflows/ci-tests-e2e-coverage.yaml
+++ b/.github/workflows/ci-tests-e2e-coverage.yaml
@@ -20,6 +20,8 @@ jobs:
      github.event.workflow_run.conclusion == 'success'
    runs-on: ubuntu-latest
    timeout-minutes: 10
+    outputs:
+      has-coverage: ${{ steps.coverage-shards.outputs.has-coverage }}

    steps:
      - name: Checkout repository
@@ -37,31 +39,33 @@ jobs:
          path: temp/coverage-shards
          if_no_artifact_found: warn

+      - name: Detect shard coverage data
+        id: coverage-shards
+        run: |
+          if [ -d temp/coverage-shards ] && find temp/coverage-shards -name 'coverage.lcov' -type f | grep -q .; then
+            echo "has-coverage=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has-coverage=false" >> "$GITHUB_OUTPUT"
+            echo "No E2E coverage shard artifacts found; treating this run as skipped." >> "$GITHUB_STEP_SUMMARY"
+          fi
+
      - name: Install lcov
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        run: sudo apt-get install -y -qq lcov

      - name: Merge shard coverage into single LCOV
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        run: |
          mkdir -p coverage/playwright
          LCOV_FILES=$(find temp/coverage-shards -name 'coverage.lcov' -type f)
-          if [ -z "$LCOV_FILES" ]; then
-            echo "No coverage.lcov files found"
-            touch coverage/playwright/coverage.lcov
-            exit 0
-          fi
          ADD_ARGS=""
          for f in $LCOV_FILES; do ADD_ARGS="$ADD_ARGS -a $f"; done
          lcov $ADD_ARGS -o coverage/playwright/coverage.lcov
          wc -l coverage/playwright/coverage.lcov

      - name: Validate merged coverage
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        run: |
-          SHARD_COUNT=$(find temp/coverage-shards -name 'coverage.lcov' -type f | wc -l | tr -d ' ')
-          if [ "$SHARD_COUNT" -eq 0 ]; then
-            echo "::notice::No shard coverage files; upstream E2E was likely skipped."
-            exit 0
-          fi
-
          MERGED_SF=$(grep -c '^SF:' coverage/playwright/coverage.lcov || echo 0)
          MERGED_LH=$(awk -F: '/^LH:/{s+=$2}END{print s+0}' coverage/playwright/coverage.lcov)
          MERGED_LF=$(awk -F: '/^LF:/{s+=$2}END{print s+0}' coverage/playwright/coverage.lcov)
@@ -82,7 +86,7 @@ jobs:
          done

      - name: Upload merged coverage data
-        if: always()
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        uses: actions/upload-artifact@v6
        with:
          name: e2e-coverage
@@ -91,7 +95,7 @@ jobs:
          if-no-files-found: warn

      - name: Upload E2E coverage to Codecov
-        if: always()
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
        with:
          files: coverage/playwright/coverage.lcov
@@ -100,6 +104,7 @@ jobs:
          fail_ci_if_error: false

      - name: Generate HTML coverage report
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        run: |
          if [ ! -s coverage/playwright/coverage.lcov ]; then
            echo "No coverage data; generating placeholder report."
@@ -114,6 +119,7 @@ jobs:
            --precision 1

      - name: Upload HTML report artifact
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
        uses: actions/upload-artifact@v6
        with:
          name: e2e-coverage-html
@@ -122,7 +128,9 @@ jobs:

  deploy:
    needs: merge
-    if: github.event.workflow_run.head_branch == 'main'
+    if: >
+      github.event.workflow_run.head_branch == 'main' &&
+      needs.merge.outputs.has-coverage == 'true'
    runs-on: ubuntu-latest
    permissions:
      pages: write
--- a/.github/workflows/ci-vercel-website-preview.yaml
+++ b/.github/workflows/ci-vercel-website-preview.yaml
@@ -4,6 +4,9 @@ name: 'CI: Vercel Website Preview'
 on:
  pull_request:
    types: [opened, synchronize, reopened]
+    branches-ignore:
+      - 'core/**'
+      - 'cloud/**'
    paths:
      - 'apps/website/**'
      - 'packages/design-system/**'
--- a/apps/website/e2e/careers.spec.ts
+++ b/apps/website/e2e/careers.spec.ts
@@ -32,16 +32,34 @@ test.describe('Careers page @smoke', () => {
    }
  })

-  test('ENGINEERING category filter narrows the role list', async ({
+  test('clicking a department button scrolls to and activates that section', async ({
    page
  }) => {
+    const rolesSection = page.getByTestId('careers-roles')
+    await rolesSection.scrollIntoViewIfNeeded()
+    await expect(rolesSection).toBeVisible()
+
    const allCount = await page.getByTestId('careers-role-link').count()
-    await page.getByRole('button', { name: 'ENGINEERING', exact: true }).click()
-    const engineeringLocator = page.getByTestId('careers-role-link')
-    await expect(engineeringLocator.first()).toBeVisible()
-    const engineeringCount = await engineeringLocator.count()
-    expect(engineeringCount).toBeLessThanOrEqual(allCount)
-    expect(engineeringCount).toBeGreaterThan(0)
+
+    const engineeringButton = page.getByRole('button', {
+      name: 'ENGINEERING',
+      exact: true
+    })
+
+    // RolesSection is hydrated via `client:visible`. Once the button responds
+    // to a click by flipping aria-pressed, Vue is hydrated and the rest of
+    // the locator logic is in effect.
+    await expect(async () => {
+      await engineeringButton.click()
+      await expect(engineeringButton).toHaveAttribute('aria-pressed', 'true', {
+        timeout: 1_000
+      })
+    }).toPass({ timeout: 10_000 })
+
+    const engineeringSection = page.locator('#careers-dept-engineering')
+    await expect(engineeringSection).toBeInViewport()
+
+    expect(await page.getByTestId('careers-role-link').count()).toBe(allCount)
  })
 })

--- a/apps/website/e2e/content-section.spec.ts
+++ b/apps/website/e2e/content-section.spec.ts
@@ -0,0 +1,61 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+const M4_PRO_14_INCH_VIEWPORT = { width: 2016, height: 1310 }
+const LAST_SECTION_HASH = '#contact'
+
+test.describe(
+  'ContentSection scroll-spy @smoke',
+  {
+    annotation: [
+      {
+        type: 'issue',
+        description:
+          'https://linear.app/comfyorg/issue/FE-604/bug-bottom-badge-not-activating-on-scroll-at-high-resolution-3024x1964'
+      },
+      {
+        type: 'environment',
+        description:
+          '14" MacBook M4 Pro logical viewport reported in FE-604; /privacy-policy reproduces because of its short trailing sections'
+      }
+    ]
+  },
+  () => {
+    test.use({ viewport: M4_PRO_14_INCH_VIEWPORT })
+
+    test('activates the last badge when user scrolls to the bottom', async ({
+      page
+    }) => {
+      await page.goto('/privacy-policy')
+
+      const sidebarNav = page.getByRole('navigation', {
+        name: 'Category filter'
+      })
+      const badges = sidebarNav.getByRole('button')
+      const lastBadge = badges.last()
+
+      await expect(badges.first()).toHaveAttribute('aria-pressed', 'true')
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'false')
+
+      await page.evaluate(() =>
+        window.scrollTo(0, document.documentElement.scrollHeight)
+      )
+
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'true')
+    })
+
+    test('activates the last badge when page mounts already at the bottom via trailing hash', async ({
+      page
+    }) => {
+      await page.goto(`/privacy-policy${LAST_SECTION_HASH}`)
+
+      const sidebarNav = page.getByRole('navigation', {
+        name: 'Category filter'
+      })
+      const lastBadge = sidebarNav.getByRole('button').last()
+
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'true')
+    })
+  }
+)
--- a/apps/website/e2e/customers.spec.ts
+++ b/apps/website/e2e/customers.spec.ts
@@ -0,0 +1,33 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+test.describe('Customers @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/customers')
+  })
+
+  test('hero image declares intrinsic dimensions so layout reserves space before load', async ({
+    page
+  }) => {
+    const heroImage = page.locator('img[alt="Comfy 3D logo"]')
+    await expect(heroImage).toBeVisible()
+    await expect(heroImage).toHaveAttribute('width', /^\d+$/)
+    await expect(heroImage).toHaveAttribute('height', /^\d+$/)
+
+    // Regression guard: an unloaded <img> without intrinsic dimensions
+    // collapses to ~0px, then jumps to its natural size on load and pushes
+    // the video below it. Reserved space must persist before bytes arrive.
+    const heightWhileUnloaded = await page.evaluate(() => {
+      const img = document.querySelector<HTMLImageElement>(
+        'img[alt="Comfy 3D logo"]'
+      )
+      if (!img) return null
+      img.removeAttribute('src')
+      return img.getBoundingClientRect().height
+    })
+
+    expect(heightWhileUnloaded).not.toBeNull()
+    expect(heightWhileUnloaded!).toBeGreaterThan(100)
+  })
+})
--- a/apps/website/e2e/demos.spec.ts
+++ b/apps/website/e2e/demos.spec.ts
@@ -1,27 +1,71 @@
 import { expect, test } from '@playwright/test'

+import { demos, getNextDemo } from '../src/config/demos'
+import { t } from '../src/i18n/translations'
+
+const escapeRegExp = (value: string): string =>
+  value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+
 test.describe('Demo pages @smoke', () => {
-  test('demo detail page renders hero and embed', async ({ page }) => {
-    await page.goto('/demos/image-to-video')
-    await expect(page.getByRole('heading', { level: 1 })).toBeVisible()
-    await expect(page.getByRole('heading', { level: 1 })).toContainText(
-      'Create a Video from an Image'
-    )
-    const iframe = page.locator('iframe[title*="Interactive demo"]')
-    await expect(iframe).toBeAttached()
-  })
+  for (const demo of demos) {
+    const nextDemo = getNextDemo(demo.slug)

-  test('demo detail page has transcript section', async ({ page }) => {
-    await page.goto('/demos/image-to-video')
-    await expect(
-      page.getByRole('button', { name: /demo transcript/i })
-    ).toBeVisible()
-  })
+    test(`/demos/${demo.slug} renders hero, embed, transcript, and next-demo nav`, async ({
+      page
+    }) => {
+      await page.goto(`/demos/${demo.slug}`)

-  test('demo detail page has next demo navigation', async ({ page }) => {
-    await page.goto('/demos/image-to-video')
-    await expect(page.getByText(/what's next/i)).toBeVisible()
-  })
+      const heading = page.getByRole('heading', { level: 1 })
+      await expect(heading).toBeVisible()
+      await expect(heading).toContainText(t(demo.title, 'en'))
+
+      const ogImage = page.locator('head meta[property="og:image"]')
+      await expect(ogImage).toHaveAttribute(
+        'content',
+        new RegExp(`${escapeRegExp(demo.slug)}-og\\.png`)
+      )
+
+      const iframe = page.locator(
+        `iframe[title*="${t('demos.embed.label', 'en')}"]`
+      )
+      await expect(iframe).toBeAttached()
+      await expect(iframe).toHaveAttribute(
+        'src',
+        new RegExp(escapeRegExp(demo.arcadeId))
+      )
+
+      await expect(
+        page.getByRole('button', { name: /demo transcript/i })
+      ).toBeVisible()
+
+      await expect(
+        page.getByText(t(nextDemo.title, 'en')).first()
+      ).toBeVisible()
+      const nextThumb = page.locator(`img[src="${nextDemo.thumbnail}"]`).first()
+      await expect(nextThumb).toBeAttached()
+      await expect(nextThumb).toBeVisible()
+      const naturalWidth = await nextThumb.evaluate(
+        (img) => (img as HTMLImageElement).naturalWidth
+      )
+      expect(naturalWidth).toBeGreaterThan(1)
+    })
+
+    test(`/zh-CN/demos/${demo.slug} renders localized content`, async ({
+      page
+    }) => {
+      await page.goto(`/zh-CN/demos/${demo.slug}`)
+
+      await expect(page).toHaveURL(/\/zh-CN\/demos\//)
+
+      const heading = page.getByRole('heading', { level: 1 })
+      await expect(heading).toContainText(t(demo.title, 'zh-CN'))
+      await expect(heading).toContainText(/[\u4E00-\u9FFF]/)
+
+      await expect(
+        page.getByText(t(nextDemo.title, 'zh-CN')).first()
+      ).toBeVisible()
+    })
+  }

  test('demo library page renders', async ({ page }) => {
    await page.goto('/demos')
@@ -32,13 +76,4 @@ test.describe('Demo pages @smoke', () => {
    const response = await page.goto('/demos/nonexistent')
    expect(response?.status()).toBe(404)
  })
-
-  test('zh-CN demo page renders localized content', async ({ page }) => {
-    await page.goto('/zh-CN/demos/image-to-video')
-    await expect(page.getByRole('heading', { level: 1 })).toContainText(
-      '从图片创建视频'
-    )
-    const nextDemoLink = page.locator('a[href*="/zh-CN/demos/"]').first()
-    await expect(nextDemoLink).toBeAttached()
-  })
 })
--- a/apps/website/e2e/responsive.spec.ts
+++ b/apps/website/e2e/responsive.spec.ts
@@ -1,3 +1,4 @@
+import type { Page } from '@playwright/test'
 import { expect } from '@playwright/test'

 import { test } from './fixtures/blockExternalMedia'
@@ -47,4 +48,105 @@ test.describe('Mobile layout @mobile', () => {
    const mobileContainer = page.getByTestId('social-proof-mobile')
    await expect(mobileContainer).toBeVisible()
  })
+
+  test.describe('SocialProofBar seamless marquee', () => {
+    test.use({ contextOptions: { reducedMotion: 'no-preference' } })
+
+    test('mobile forward marquee loops seamlessly', async ({ page }) => {
+      const geometry = await measureMarqueeLoopGeometry(
+        page,
+        '[data-testid="social-proof-mobile"] .animate-marquee'
+      )
+      expectSeamlessForwardLoop(geometry)
+    })
+
+    test('mobile reverse marquee loops seamlessly', async ({ page }) => {
+      const geometry = await measureMarqueeLoopGeometry(
+        page,
+        '[data-testid="social-proof-mobile"] .animate-marquee-reverse'
+      )
+      expectSeamlessReverseLoop(geometry)
+    })
+  })
 })
+
+test.describe('Desktop SocialProofBar @smoke', () => {
+  test.use({ contextOptions: { reducedMotion: 'no-preference' } })
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/')
+  })
+
+  test('desktop marquee loops seamlessly', async ({ page }) => {
+    const geometry = await measureMarqueeLoopGeometry(
+      page,
+      '[data-testid="social-proof-desktop"] .animate-marquee'
+    )
+    expectSeamlessForwardLoop(geometry)
+  })
+})
+
+type MarqueeGeometry = {
+  copyWidths: number[]
+  startPositions: number[]
+  endPositions: number[]
+}
+
+async function measureMarqueeLoopGeometry(
+  page: Page,
+  selector: string
+): Promise<MarqueeGeometry> {
+  await page.locator(selector).first().waitFor()
+  return page.evaluate((sel) => {
+    const tracks = Array.from(
+      document.querySelectorAll<HTMLElement>(sel)
+    ).slice(0, 2)
+    const firstAnimation = tracks[0]?.getAnimations()[0]
+    if (!firstAnimation) {
+      throw new Error(`No CSS animation found on ${sel}`)
+    }
+    const duration = firstAnimation.effect?.getTiming().duration
+    if (typeof duration !== 'number' || duration <= 1) {
+      throw new Error(
+        `Animation on ${sel} has unusable duration: ${String(duration)}`
+      )
+    }
+    const setAllTimes = (time: number) => {
+      for (const track of tracks) {
+        for (const anim of track.getAnimations()) {
+          anim.currentTime = time
+        }
+      }
+      void document.body.offsetWidth
+    }
+    const readX = () => tracks.map((track) => track.getBoundingClientRect().x)
+    setAllTimes(0)
+    const startPositions = readX()
+    const copyWidths = tracks.map(
+      (track) => track.getBoundingClientRect().width
+    )
+    setAllTimes(duration - 0.1)
+    const endPositions = readX()
+    return { copyWidths, startPositions, endPositions }
+  }, selector)
+}
+
+function expectTwoMatchingCopies(geometry: MarqueeGeometry) {
+  const { copyWidths } = geometry
+  expect(copyWidths.length, 'expected two duplicate marquee tracks').toBe(2)
+  expect(copyWidths[0]).toBeGreaterThan(0)
+  expect(copyWidths[1]).toBeCloseTo(copyWidths[0], 0)
+}
+
+function expectSeamlessForwardLoop(geometry: MarqueeGeometry) {
+  expectTwoMatchingCopies(geometry)
+  // Copy 2 ends the cycle exactly where copy 1 started, so the restart
+  // (when copy 1 jumps back to its start position) is visually indistinguishable.
+  expect(geometry.endPositions[1]).toBeCloseTo(geometry.startPositions[0], 0)
+}
+
+function expectSeamlessReverseLoop(geometry: MarqueeGeometry) {
+  expectTwoMatchingCopies(geometry)
+  // Reverse marquee: copy 1 ends the cycle where copy 2 started.
+  expect(geometry.endPositions[0]).toBeCloseTo(geometry.startPositions[1], 0)
+}
--- a/apps/website/e2e/visual-responsive.spec.ts
+++ b/apps/website/e2e/visual-responsive.spec.ts
@@ -26,8 +26,8 @@ async function assertNoOverflow(page: Page) {
 }

 async function navigateAndSettle(page: Page, url: string) {
-  await page.goto(url)
-  await page.waitForLoadState('networkidle')
+  await page.goto(url, { waitUntil: 'domcontentloaded' })
+  await page.waitForLoadState('load')
 }

 test.describe('Home', { tag: '@visual' }, () => {
@@ -126,6 +126,7 @@ test.describe('Overflow guards', { tag: '@visual' }, () => {
  const pages = [
    '/',
    '/cloud',
+    '/cloud/enterprise',
    '/cloud/pricing',
    '/contact',
    '/download',
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png
--- a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png
+++ b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -27,6 +27,7 @@
    "gsap": "catalog:",
    "lenis": "catalog:",
    "posthog-js": "catalog:",
+    "three": "catalog:",
    "vue": "catalog:",
    "zod": "catalog:"
  },
--- a/apps/website/playwright.config.ts
+++ b/apps/website/playwright.config.ts
@@ -28,7 +28,7 @@ export default defineConfig({
    ? [['html'], ['json', { outputFile: 'results.json' }]]
    : 'html',
  expect: {
-    toHaveScreenshot: { maxDiffPixels: 50 }
+    toHaveScreenshot: { maxDiffPixels: 100 }
  },
  ...maybeLocalOptions,
  webServer: {
--- a/apps/website/public/images/demos/community-workflows-og.png
+++ b/apps/website/public/images/demos/community-workflows-og.png
--- a/apps/website/public/images/demos/community-workflows-thumb.webp
+++ b/apps/website/public/images/demos/community-workflows-thumb.webp
--- a/apps/website/public/images/demos/image-to-video-og.png
+++ b/apps/website/public/images/demos/image-to-video-og.png
--- a/apps/website/public/images/demos/image-to-video-thumb.webp
+++ b/apps/website/public/images/demos/image-to-video-thumb.webp
--- a/apps/website/public/images/demos/workflow-templates-og.png
+++ b/apps/website/public/images/demos/workflow-templates-og.png
--- a/apps/website/public/images/demos/workflow-templates-thumb.webp
+++ b/apps/website/public/images/demos/workflow-templates-thumb.webp
--- a/apps/website/src/components/careers/RolesSection.vue
+++ b/apps/website/src/components/careers/RolesSection.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { useEventListener, useTemplateRefsList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'

 import type { Department } from '../../data/roles'
 import type { Locale } from '../../i18n/translations'

+import { prefersReducedMotion } from '../../composables/useReducedMotion'
 import { t } from '../../i18n/translations'
+import { scrollTo } from '../../scripts/smoothScroll'
 import CategoryNav from '../common/CategoryNav.vue'
 import SectionLabel from '../common/SectionLabel.vue'

@@ -13,24 +16,72 @@ const { locale = 'en', departments = [] } = defineProps<{
  departments?: readonly Department[]
 }>()

-const activeCategory = ref('all')
-
 const visibleDepartments = computed(() =>
  departments.filter((d) => d.roles.length > 0)
 )

-const categories = computed(() => [
-  { label: 'ALL', value: 'all' },
-  ...visibleDepartments.value.map((d) => ({ label: d.name, value: d.key }))
-])
-
-const filteredDepartments = computed(() =>
-  activeCategory.value === 'all'
-    ? visibleDepartments.value
-    : visibleDepartments.value.filter((d) => d.key === activeCategory.value)
+const categories = computed(() =>
+  visibleDepartments.value.map((d) => ({ label: d.name, value: d.key }))
 )

 const hasRoles = computed(() => visibleDepartments.value.length > 0)
+
+const activeCategory = ref('')
+
+const sectionRefs = useTemplateRefsList<HTMLElement>()
+
+let isScrolling = false
+let pendingFrame = 0
+
+const HEADER_OFFSET = -144
+const ACTIVATION_OFFSET = 300
+
+const deptElementId = (key: string) => `careers-dept-${key}`
+
+function pickActiveSection() {
+  pendingFrame = 0
+  if (isScrolling) return
+  const sections = sectionRefs.value as HTMLElement[]
+  if (sections.length === 0) return
+
+  let active = sections[0]
+  for (const el of sections) {
+    if (el.getBoundingClientRect().top - ACTIVATION_OFFSET <= 0) {
+      active = el
+    } else {
+      break
+    }
+  }
+  activeCategory.value = active.id.replace(/^careers-dept-/, '')
+}
+
+function scheduleUpdate() {
+  if (pendingFrame !== 0) return
+  pendingFrame = requestAnimationFrame(pickActiveSection)
+}
+
+onMounted(pickActiveSection)
+useEventListener('scroll', scheduleUpdate, { passive: true })
+useEventListener('resize', scheduleUpdate, { passive: true })
+
+function scrollToDepartment(deptKey: string) {
+  activeCategory.value = deptKey
+  isScrolling = true
+  const el = document.getElementById(deptElementId(deptKey))
+  if (!el) {
+    isScrolling = false
+    return
+  }
+  scrollTo(el, {
+    offset: HEADER_OFFSET,
+    duration: 0.8,
+    immediate: prefersReducedMotion(),
+    onComplete: () => {
+      isScrolling = false
+      pickActiveSection()
+    }
+  })
+}
 </script>

 <template>
@@ -48,9 +99,10 @@ const hasRoles = computed(() => visibleDepartments.value.length > 0)
            </h2>
            <CategoryNav
              v-if="hasRoles"
-              v-model="activeCategory"
              :categories="categories"
+              :model-value="activeCategory"
              class="mt-4"
+              @update:model-value="scrollToDepartment"
            />
          </div>
        </div>
@@ -65,9 +117,11 @@ const hasRoles = computed(() => visibleDepartments.value.length > 0)
          </p>

          <div
-            v-for="dept in filteredDepartments"
+            v-for="dept in visibleDepartments"
+            :id="deptElementId(dept.key)"
+            :ref="sectionRefs.set"
            :key="dept.key"
-            class="mb-12 last:mb-0"
+            class="mb-12 scroll-mt-24 last:mb-0 md:scroll-mt-36"
          >
            <SectionLabel>
              {{ dept.name }}
--- a/apps/website/src/components/common/ContentSection.vue
+++ b/apps/website/src/components/common/ContentSection.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
-import { useIntersectionObserver, useTemplateRefsList } from '@vueuse/core'
-import { computed, ref } from 'vue'
+import {
+  useEventListener,
+  useIntersectionObserver,
+  useTemplateRefsList
+} from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'

 import type { Locale, TranslationKey } from '../../i18n/translations'

@@ -40,13 +44,25 @@ const activeSection = ref(sections[0]?.id ?? '')

 const sectionRefs = useTemplateRefsList<HTMLElement>()
 let isScrolling = false
+let scrollSafetyTimer: ReturnType<typeof setTimeout> | undefined

 const HEADER_OFFSET = -144
+const BOTTOM_THRESHOLD_PX = 4
+const SCROLL_SAFETY_MS = 1500
+
+function clearScrollLock() {
+  isScrolling = false
+  if (scrollSafetyTimer !== undefined) {
+    clearTimeout(scrollSafetyTimer)
+    scrollSafetyTimer = undefined
+  }
+}

 useIntersectionObserver(
  sectionRefs,
  (entries) => {
    if (isScrolling) return
+    if (isAtBottom()) return
    let best: IntersectionObserverEntry | null = null
    for (const entry of entries) {
      if (!entry.isIntersecting) continue
@@ -58,22 +74,39 @@ useIntersectionObserver(
  { rootMargin: '-20% 0px -60% 0px' }
 )

+function isAtBottom(): boolean {
+  const scrollBottom = window.scrollY + window.innerHeight
+  return (
+    scrollBottom >= document.documentElement.scrollHeight - BOTTOM_THRESHOLD_PX
+  )
+}
+
+function activateLastIfAtBottom() {
+  if (isScrolling) return
+  if (!isAtBottom()) return
+  const lastId = sections[sections.length - 1]?.id
+  if (lastId) activeSection.value = lastId
+}
+
+onMounted(activateLastIfAtBottom)
+useEventListener('scroll', activateLastIfAtBottom, { passive: true })
+
 function scrollToSection(id: string) {
  activeSection.value = id
+  clearScrollLock()
  isScrolling = true
+  scrollSafetyTimer = setTimeout(clearScrollLock, SCROLL_SAFETY_MS)
  const el = document.getElementById(id)
  if (el) {
    scrollTo(el, {
      offset: HEADER_OFFSET,
      duration: 0.8,
      immediate: prefersReducedMotion(),
-      onComplete: () => {
-        isScrolling = false
-      }
+      onComplete: clearScrollLock
    })
    return
  }
-  isScrolling = false
+  clearScrollLock()
 }
 </script>

--- a/apps/website/src/components/common/GitHubStarBadge.vue
+++ b/apps/website/src/components/common/GitHubStarBadge.vue
@@ -13,7 +13,7 @@ const { stars } = defineProps<{
    target="_blank"
    rel="noopener noreferrer"
    :aria-label="`ComfyUI on GitHub — ${stars} stars`"
-    class="hidden shrink-0 items-center gap-2 lg:flex"
+    class="hidden shrink-0 items-center gap-1 lg:flex"
  >
    <NodeBadge
      :segments="[{ text: stars }]"
@@ -22,7 +22,7 @@ const { stars } = defineProps<{
      size-class="h-5 sm:h-5"
    />
    <span
-      class="bg-primary-comfy-yellow block size-7"
+      class="bg-primary-comfy-yellow block size-6 shrink-0"
      aria-hidden="true"
      style="mask: url('/icons/social/github.svg') center / contain no-repeat"
    />
--- a/apps/website/src/components/common/SocialProofBarSection.vue
+++ b/apps/website/src/components/common/SocialProofBarSection.vue
@@ -14,23 +14,28 @@ const logos = [
  'Ubisoft'
 ]

-const desktopLogos = Array.from({ length: 4 }, () => logos).flat()
-const row1 = logos.slice(0, 6)
-const mobileRow1 = [...row1, ...row1]
-const row2 = logos.slice(6)
-const mobileRow2 = [...row2, ...row2]
+const mobileRow1Logos = logos.slice(0, 6)
+const mobileRow2Logos = logos.slice(6)
 </script>

 <template>
  <section class="overflow-hidden py-12">
    <!-- Single row on desktop -->
-    <div class="animate-marquee hidden items-center gap-2 md:flex">
+    <div data-testid="social-proof-desktop" class="hidden w-max gap-2 md:flex">
      <div
-        v-for="(logo, i) in desktopLogos"
-        :key="`${logo}-${i}`"
-        class="flex h-20 w-50 shrink-0 items-center justify-center"
+        v-for="copy in 2"
+        :key="copy"
+        class="animate-marquee flex shrink-0 items-center gap-2"
+        style="--marquee-gap: 0.5rem"
+        :aria-hidden="copy === 2 ? 'true' : undefined"
      >
-        <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+        <div
+          v-for="logo in logos"
+          :key="logo"
+          class="flex h-20 w-50 shrink-0 items-center justify-center"
+        >
+          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+        </div>
      </div>
    </div>

@@ -39,22 +44,38 @@ const mobileRow2 = [...row2, ...row2]
      data-testid="social-proof-mobile"
      class="flex flex-col gap-8 md:hidden"
    >
-      <div class="animate-marquee flex items-center gap-8">
+      <div class="flex w-max gap-8">
        <div
-          v-for="(logo, i) in mobileRow1"
-          :key="`${logo}-${i}`"
-          class="flex h-14 w-40 shrink-0 items-center justify-center"
+          v-for="copy in 2"
+          :key="copy"
+          class="animate-marquee flex shrink-0 items-center gap-8"
+          style="--marquee-gap: 2rem"
+          :aria-hidden="copy === 2 ? 'true' : undefined"
        >
-          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          <div
+            v-for="logo in mobileRow1Logos"
+            :key="logo"
+            class="flex h-14 w-40 shrink-0 items-center justify-center"
+          >
+            <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          </div>
        </div>
      </div>
-      <div class="animate-marquee-reverse flex items-center gap-8">
+      <div class="flex w-max gap-8">
        <div
-          v-for="(logo, i) in mobileRow2"
-          :key="`${logo}-${i}`"
-          class="flex h-14 w-40 shrink-0 items-center justify-center"
+          v-for="copy in 2"
+          :key="copy"
+          class="animate-marquee-reverse flex shrink-0 items-center gap-8"
+          style="--marquee-gap: 2rem"
+          :aria-hidden="copy === 2 ? 'true' : undefined"
        >
-          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          <div
+            v-for="logo in mobileRow2Logos"
+            :key="logo"
+            class="flex h-14 w-40 shrink-0 items-center justify-center"
+          >
+            <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          </div>
        </div>
      </div>
    </div>
--- a/apps/website/src/components/customers/FeedbackSection.vue
+++ b/apps/website/src/components/customers/FeedbackSection.vue
@@ -75,7 +75,7 @@ const progressPercent = computed(() => `${progress.value * 100}%`)
      <!-- Progress bar -->
      <div class="h-1 flex-1 rounded-full bg-white/20">
        <div
-          class="bg-primary-comfy-yellow h-full rounded-full transition-all duration-200"
+          class="bg-primary-comfy-yellow h-full rounded-full"
          :style="{ width: progressPercent }"
        />
      </div>
--- a/apps/website/src/components/customers/HeroSection.vue
+++ b/apps/website/src/components/customers/HeroSection.vue
@@ -5,6 +5,7 @@ import { useHeroAnimation } from '../../composables/useHeroAnimation'
 import SectionLabel from '../common/SectionLabel.vue'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'
+import { ScrollTrigger } from '../../scripts/gsapSetup'
 import VideoPlayer from '../common/VideoPlayer.vue'

 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
@@ -22,6 +23,10 @@ useHeroAnimation({
  logo: logoRef,
  video: videoRef
 })
+
+function handleLogoLoad() {
+  ScrollTrigger.refresh(true)
+}
 </script>

 <template>
@@ -37,7 +42,10 @@ useHeroAnimation({
        <img
          src="https://media.comfy.org/website/customers/c-projection.webp"
          alt="Comfy 3D logo"
-          class="mx-auto w-full max-w-md lg:max-w-none"
+          width="1568"
+          height="1763"
+          class="mx-auto h-auto w-full max-w-md lg:max-w-none"
+          @load="handleLogoLoad"
        />
      </div>

--- a/apps/website/src/components/demos/ArcadeEmbed.vue
+++ b/apps/website/src/components/demos/ArcadeEmbed.vue
@@ -8,10 +8,12 @@ import { t } from '../../i18n/translations'
 const {
  arcadeId,
  title,
+  aspectRatio = 16 / 9,
  locale = 'en'
 } = defineProps<{
  arcadeId: string
  title: string
+  aspectRatio?: number
  locale?: Locale
 }>()

@@ -24,7 +26,8 @@ const loaded = ref(false)
    :aria-label="t('demos.embed.label', locale)"
  >
    <div
-      class="relative mx-auto aspect-video max-w-6xl overflow-hidden rounded-4xl border border-white/10"
+      class="relative mx-auto max-w-6xl overflow-hidden rounded-4xl border border-white/10"
+      :style="{ aspectRatio }"
    >
      <div
        v-if="!loaded"
--- a/apps/website/src/components/home/HeroSection.vue
+++ b/apps/website/src/components/home/HeroSection.vue
@@ -1,24 +1,31 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+
 import type { Locale } from '../../i18n/translations'
 import { externalLinks } from '../../config/routes'
+import { useHeroLogo } from '../../composables/useHeroLogo'
 import { t } from '../../i18n/translations'
 import BrandButton from '../common/BrandButton.vue'

 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const logoContainer = ref<HTMLElement>()
+const { loaded: logoLoaded } = useHeroLogo(logoContainer)
 </script>

 <template>
  <section
    class="relative flex min-h-auto flex-col lg:flex-row lg:items-center"
  >
-    <div class="relative flex-1">
-      <video
-        src="https://media.comfy.org/website/homepage/hero-logo-seq.webm"
-        autoplay
-        loop
-        muted
-        playsinline
-        class="w-full"
+    <div
+      ref="logoContainer"
+      class="relative flex aspect-square w-full flex-1 items-center justify-center"
+    >
+      <img
+        v-show="!logoLoaded"
+        src="https://media.comfy.org/website/homepage/hero-logo-seq/Logo00.webp"
+        alt="Comfy logo"
+        class="w-3/5"
      />
    </div>

--- a/apps/website/src/components/home/UseCaseSection.vue
+++ b/apps/website/src/components/home/UseCaseSection.vue
@@ -25,7 +25,7 @@ const categories: Category[] = [
  {
    label: t('useCase.vfx', locale),
    leftSrc: 'https://media.comfy.org/website/homepage/use-case/left1.webm',
-    rightSrc: 'https://media.comfy.org/website/homepage/use-case/right1.webp'
+    rightSrc: 'https://media.comfy.org/website/homepage/use-case/right1.webm'
  },
  {
    label: t('useCase.advertising', locale),
--- a/apps/website/src/components/pricing/PriceSection.vue
+++ b/apps/website/src/components/pricing/PriceSection.vue
@@ -77,7 +77,10 @@ const plans: PricingPlan[] = [
    ctaKey: 'pricing.plan.creator.cta',
    ctaHref: subscribeUrl('creator'),
    featureIntroKey: 'pricing.plan.creator.featureIntro',
-    features: [{ text: 'pricing.plan.creator.feature1' }],
+    features: [
+      { text: 'pricing.plan.creator.feature1' },
+      { text: 'pricing.plan.creator.feature2' }
+    ],
    isPopular: true
  },
  {
@@ -90,7 +93,10 @@ const plans: PricingPlan[] = [
    ctaKey: 'pricing.plan.pro.cta',
    ctaHref: subscribeUrl('pro'),
    featureIntroKey: 'pricing.plan.pro.featureIntro',
-    features: [{ text: 'pricing.plan.pro.feature1' }]
+    features: [
+      { text: 'pricing.plan.pro.feature1' },
+      { text: 'pricing.plan.pro.feature2' }
+    ]
  },
  {
    id: 'enterprise',
--- a/apps/website/src/components/product/enterprise/HeroSection.vue
+++ b/apps/website/src/components/product/enterprise/HeroSection.vue
@@ -35,20 +35,20 @@ onMounted(() => {

 <template>
  <section
-    class="max-w-9xl relative mx-auto flex flex-col items-center overflow-hidden lg:flex-row-reverse lg:items-center lg:overflow-x-visible lg:overflow-y-clip lg:pb-[min(8vw,10rem)]"
+    class="max-w-9xl relative mx-auto flex flex-col items-center overflow-hidden pt-16 lg:flex-row-reverse lg:items-center lg:overflow-x-visible lg:overflow-y-clip lg:pt-[min(8vw,10rem)] lg:pb-[min(8vw,10rem)]"
  >
    <!-- Illustration (overlaps text slightly; stacks above on mobile, right on lg) -->
    <div
-      class="aspect-square w-4/5 max-w-md scale-150 self-center md:max-w-2xl lg:pointer-events-none lg:z-1 lg:-ml-12 lg:-translate-x-[10%] lg:translate-y-[40px] lg:self-center xl:size-[clamp(32rem,max(40vh,32vw),36rem)] xl:min-h-[min(32vw,24rem)] xl:min-w-[min(24vw,20rem)]"
+      class="aspect-square w-4/5 max-w-md scale-150 self-center md:max-w-2xl lg:pointer-events-none lg:z-1 lg:-ml-12 lg:-translate-x-[10%] lg:self-center xl:size-[clamp(32rem,max(40vh,32vw),36rem)] xl:min-h-[min(32vw,24rem)] xl:min-w-[min(24vw,20rem)]"
    >
      <svg
        ref="svgRef"
-        class="block size-full"
+        class="block size-full overflow-visible"
        viewBox="0 0 1600 1046"
        fill="none"
        aria-hidden="true"
      >
-        <g clip-path="url(#enterpriseHeroClip)">
+        <g>
          <rect width="1600" height="1046" fill="#211927" />
          <rect
            width="800"
@@ -84,7 +84,7 @@ onMounted(() => {
          />

          <!-- Exploding block cluster -->
-          <g class="block-cluster">
+          <g class="block-cluster" clip-path="url(#enterpriseHeroBlockClip)">
            <path
              class="block-piece"
              d="M1018.44 635.715L1018.45 581.73C1018.46 574.554 1013.42 565.829 1007.21 562.242L960.479 535.262C956.544 532.99 949.469 533.096 945.535 535.368L898.79 562.373C892.576 565.963 887.537 574.691 887.535 581.867L887.52 635.852C887.519 640.395 890.967 646.574 894.902 648.845L941.632 675.825C947.845 679.412 957.918 679.409 964.132 675.819L1010.88 648.815C1014.82 646.538 1018.44 640.267 1018.44 635.715Z"
@@ -353,7 +353,7 @@ onMounted(() => {
            <stop stop-color="#211927" stop-opacity="0" />
            <stop offset="1" stop-color="#211927" />
          </linearGradient>
-          <clipPath id="enterpriseHeroClip">
+          <clipPath id="enterpriseHeroBlockClip">
            <rect width="1600" height="1046" fill="white" />
          </clipPath>
        </defs>
--- a/apps/website/src/components/product/local/HeroSection.vue
+++ b/apps/website/src/components/product/local/HeroSection.vue
@@ -276,29 +276,6 @@ onUnmounted(() => {
            fill="#211927"
          />
        </g>
-
-        <!-- Left-edge fade -->
-        <rect
-          x="300"
-          y="150"
-          width="250"
-          height="900"
-          fill="url(#localHeroFadeLeft)"
-        />
-
-        <defs>
-          <linearGradient
-            id="localHeroFadeLeft"
-            x1="550"
-            y1="600"
-            x2="300"
-            y2="600"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#211927" stop-opacity="0" />
-            <stop offset="1" stop-color="#211927" />
-          </linearGradient>
-        </defs>
      </svg>
    </div>

--- a/apps/website/src/components/product/shared/CloudBannerSection.vue
+++ b/apps/website/src/components/product/shared/CloudBannerSection.vue
@@ -8,7 +8,9 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>

 <template>
-  <section class="bg-transparency-white-t4 p-4 text-center lg:px-20 lg:py-8">
+  <section
+    class="bg-transparency-white-t4 relative z-20 p-4 text-center lg:px-20 lg:py-8"
+  >
    <p
      class="text-primary-comfy-canvas relative z-10 text-lg font-semibold lg:text-sm lg:font-normal"
    >
--- a/apps/website/src/composables/useHeroLogo.ts
+++ b/apps/website/src/composables/useHeroLogo.ts
@@ -0,0 +1,328 @@
+import type { Ref } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
+
+import * as THREE from 'three'
+import { SVGLoader } from 'three/addons/loaders/SVGLoader.js'
+
+import { prefersReducedMotion } from './useReducedMotion'
+
+const IMAGE_COUNT = 16
+const BASE_URL = 'https://media.comfy.org/website/homepage/hero-logo-seq'
+
+const SVG_MARKUP = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 375 404"><path fill="#000000" d="M296.597 302.576C297.299 300.205 297.682 297.705 297.682 295.078C297.682 280.529 285.938 268.736 271.45 268.736H153.883C147.564 268.8 142.395 263.673 142.395 257.328C142.395 256.174 142.586 255.084 142.841 254.059L174.499 143.309C175.839 138.438 180.307 134.849 185.541 134.849L303.554 134.72C328.446 134.72 349.444 117.864 355.763 94.8555L373.506 33.1353C374.081 30.9562 374.4 28.5848 374.4 26.2134C374.4 11.7288 362.72 0 348.295 0H205.518C180.754 0 159.819 16.7279 153.373 39.4804L141.373 81.5886C139.969 86.3954 135.565 89.9205 130.332 89.9205H96.0573C71.4845 89.9205 50.7412 106.328 44.1034 128.824L0.957382 280.144C0.319127 282.387 0 284.823 0 287.258C0 301.807 11.7439 313.6 26.2323 313.6H59.9321C66.2508 313.6 71.4207 318.727 71.4207 325.137C71.4207 326.226 71.293 327.316 70.9739 328.341L59.0385 370.065C58.4641 372.308 58.0811 374.615 58.0811 376.987C58.0811 391.471 69.7612 403.2 84.1857 403.2L227.027 403.072C251.855 403.072 272.79 386.28 279.172 363.399L296.533 302.64L296.597 302.576Z"/></svg>`
+
+interface HeroLogoConfig {
+  speed: number
+  tiltX: number
+  tiltZ: number
+  zoom: number
+  fov: number
+  logoColor: string
+  extrudeDepth: number
+  cursorTiltStrength: number
+  bgScale: number
+  slideDuration: number
+}
+
+const DEFAULTS: HeroLogoConfig = {
+  speed: 1,
+  tiltX: -0.1,
+  tiltZ: -0.1,
+  zoom: 7,
+  fov: 50,
+  logoColor: '#F2FF59',
+  extrudeDepth: 200,
+  cursorTiltStrength: 0.5,
+  bgScale: 0.8,
+  slideDuration: 0.4
+}
+
+function buildImageUrls(): string[] {
+  return Array.from({ length: IMAGE_COUNT }, (_, i) => {
+    const index = String(i).padStart(5, '0')
+    return `${BASE_URL}/image_sequence_${index}.webp`
+  })
+}
+
+function parseShapes(): THREE.Shape[] {
+  const loader = new SVGLoader()
+  const svgData = loader.parse(SVG_MARKUP)
+  const shapes: THREE.Shape[] = []
+  svgData.paths.forEach((path) => {
+    shapes.push(...SVGLoader.createShapes(path))
+  })
+  return shapes
+}
+
+function loadTextures(urls: string[]): Promise<THREE.Texture[]> {
+  return Promise.all(
+    urls.map(
+      (url) =>
+        new Promise<THREE.Texture | null>((resolve) => {
+          const img = new Image()
+          img.crossOrigin = 'anonymous'
+          img.onload = () => {
+            const tex = new THREE.Texture(img)
+            tex.needsUpdate = true
+            tex.colorSpace = THREE.SRGBColorSpace
+            resolve(tex)
+          }
+          img.onerror = () => resolve(null)
+          img.src = url
+        })
+    )
+  ).then((results) => results.filter((t): t is THREE.Texture => t !== null))
+}
+
+export function useHeroLogo(
+  containerRef: Ref<HTMLElement | undefined>,
+  config: Partial<HeroLogoConfig> = {}
+) {
+  const cfg = { ...DEFAULTS, ...config }
+  const loaded = ref(false)
+  let cleanup: (() => void) | undefined
+
+  onMounted(async () => {
+    try {
+      const container = containerRef.value
+      if (!container || prefersReducedMotion()) return
+
+      const { width, height } = container.getBoundingClientRect()
+
+      const renderer = new THREE.WebGLRenderer({
+        antialias: true,
+        stencil: true,
+        alpha: true
+      })
+      renderer.setSize(width, height)
+      renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2))
+      renderer.outputColorSpace = THREE.SRGBColorSpace
+      renderer.domElement.style.position = 'absolute'
+      renderer.domElement.style.inset = '0'
+      renderer.domElement.style.width = '100%'
+      renderer.domElement.style.height = '100%'
+      renderer.domElement.style.opacity = '0'
+      renderer.domElement.setAttribute('aria-hidden', 'true')
+      container.appendChild(renderer.domElement)
+
+      let disposed = false
+      const teardowns: Array<() => void> = []
+      cleanup = () => {
+        disposed = true
+        teardowns.forEach((fn) => fn())
+      }
+      teardowns.push(() => {
+        renderer.dispose()
+        renderer.domElement.remove()
+      })
+
+      const scene = new THREE.Scene()
+      const camera = new THREE.PerspectiveCamera(
+        cfg.fov,
+        width / height,
+        0.1,
+        1000
+      )
+      camera.position.z = cfg.zoom
+
+      // SVG shape
+      const shapes = parseShapes()
+      const tempGeo = new THREE.ShapeGeometry(shapes)
+      tempGeo.computeBoundingBox()
+      const bb = tempGeo.boundingBox!
+      const cx = (bb.max.x + bb.min.x) / 2
+      const cy = (bb.max.y + bb.min.y) / 2
+      const scaleFactor = 3 / (bb.max.y - bb.min.y)
+      tempGeo.dispose()
+
+      // Image sequence textures — load first frame eagerly, rest lazily
+      const urls = buildImageUrls()
+      const textures = await loadTextures(urls.slice(0, 1))
+      if (disposed) return
+
+      renderer.domElement.style.opacity = '1'
+      loaded.value = true
+
+      loadTextures(urls.slice(1)).then((rest) => {
+        if (!disposed) textures.push(...rest)
+      })
+
+      // Background plane (stencil read)
+      const bgPlaneGeo = new THREE.PlaneGeometry(14, 14)
+      const bgPlaneMat = new THREE.MeshBasicMaterial({
+        transparent: true,
+        opacity: 1,
+        map: textures[0] ?? null,
+        depthTest: false,
+        depthWrite: false,
+        stencilWrite: true,
+        stencilFunc: THREE.EqualStencilFunc,
+        stencilRef: 1,
+        stencilFail: THREE.KeepStencilOp,
+        stencilZFail: THREE.KeepStencilOp,
+        stencilZPass: THREE.KeepStencilOp
+      })
+      const bgPlane = new THREE.Mesh(bgPlaneGeo, bgPlaneMat)
+      bgPlane.renderOrder = 1
+      bgPlane.scale.set(cfg.bgScale, cfg.bgScale, 1)
+      scene.add(bgPlane)
+
+      // Logo group
+      const group = new THREE.Group()
+      scene.add(group)
+
+      const s = scaleFactor
+      const depth = cfg.extrudeDepth
+
+      // Front face
+      const shapeGeo = new THREE.ShapeGeometry(shapes)
+      shapeGeo.translate(-cx, -cy, 0)
+      shapeGeo.scale(s, -s, s)
+      const shapeMat = new THREE.MeshBasicMaterial({
+        color: cfg.logoColor,
+        side: THREE.DoubleSide,
+        depthTest: false,
+        depthWrite: false,
+        transparent: true
+      })
+      const logoMesh = new THREE.Mesh(shapeGeo, shapeMat)
+      logoMesh.renderOrder = 2
+      group.add(logoMesh)
+
+      // Extrusion stencil mask
+      const extrudeGeo = new THREE.ExtrudeGeometry(shapes, {
+        depth,
+        bevelEnabled: false
+      })
+      extrudeGeo.translate(-cx, -cy, -depth)
+      extrudeGeo.scale(s, -s, s)
+      const extrudeMat = new THREE.MeshBasicMaterial({
+        colorWrite: false,
+        depthWrite: true,
+        depthTest: true,
+        stencilWrite: true,
+        stencilRef: 1,
+        stencilFunc: THREE.AlwaysStencilFunc,
+        stencilZPass: THREE.ReplaceStencilOp,
+        stencilFail: THREE.KeepStencilOp,
+        stencilZFail: THREE.KeepStencilOp,
+        side: THREE.DoubleSide
+      })
+      const extrudeMesh = new THREE.Mesh(extrudeGeo, extrudeMat)
+      extrudeMesh.renderOrder = 0
+      group.add(extrudeMesh)
+
+      // Interaction
+      let isDragging = false
+      let previousX = 0
+      let dragVelocity = 0
+      let currentTiltX = 0
+      let currentTiltY = 0
+      let pointerX = 0
+      let pointerY = 0
+      let rotationT = 0
+      let currentSlide = 0
+      let slideTimer = 0
+      let animationId = 0
+
+      function onMouseMove(e: MouseEvent) {
+        pointerX = (e.clientX / window.innerWidth) * 2 - 1
+        pointerY = (e.clientY / window.innerHeight) * 2 - 1
+      }
+
+      function onPointerDown(e: PointerEvent) {
+        isDragging = true
+        dragVelocity = 0
+        previousX = e.clientX
+      }
+
+      function onPointerMove(e: PointerEvent) {
+        if (!isDragging) return
+        dragVelocity = (e.clientX - previousX) * 0.005
+        rotationT += dragVelocity
+        previousX = e.clientX
+      }
+
+      function onPointerUp() {
+        isDragging = false
+      }
+
+      function onResize() {
+        const rect = container!.getBoundingClientRect()
+        camera.aspect = rect.width / rect.height
+        camera.updateProjectionMatrix()
+        renderer.setSize(rect.width, rect.height)
+      }
+
+      window.addEventListener('mousemove', onMouseMove)
+      renderer.domElement.addEventListener('pointerdown', onPointerDown)
+      window.addEventListener('pointermove', onPointerMove)
+      window.addEventListener('pointerup', onPointerUp)
+      window.addEventListener('resize', onResize)
+
+      const clock = new THREE.Clock()
+
+      function animate() {
+        if (disposed) return
+        animationId = requestAnimationFrame(animate)
+        const dt = clock.getDelta()
+
+        if (!isDragging && Math.abs(dragVelocity) > 0.0001) {
+          dragVelocity *= 0.95
+          rotationT += dragVelocity
+        } else if (!isDragging) {
+          dragVelocity = 0
+        }
+
+        rotationT += cfg.speed * dt
+
+        currentTiltX += (pointerY - currentTiltX) * 0.08
+        currentTiltY += (pointerX - currentTiltY) * 0.08
+
+        group.rotation.y = rotationT % (Math.PI * 2)
+        group.rotation.x = cfg.tiltX - currentTiltX * cfg.cursorTiltStrength
+        group.rotation.z = cfg.tiltZ
+
+        if (textures.length > 1) {
+          slideTimer += dt
+          if (slideTimer >= cfg.slideDuration) {
+            slideTimer = 0
+            currentSlide = (currentSlide + 1) % textures.length
+            bgPlaneMat.map = textures[currentSlide]
+            bgPlaneMat.needsUpdate = true
+          }
+        }
+
+        renderer.render(scene, camera)
+      }
+
+      animate()
+
+      teardowns.push(
+        () => cancelAnimationFrame(animationId),
+        () => window.removeEventListener('mousemove', onMouseMove),
+        () =>
+          renderer.domElement.removeEventListener('pointerdown', onPointerDown),
+        () => window.removeEventListener('pointermove', onPointerMove),
+        () => window.removeEventListener('pointerup', onPointerUp),
+        () => window.removeEventListener('resize', onResize),
+        () => bgPlaneGeo.dispose(),
+        () => bgPlaneMat.dispose(),
+        () => shapeGeo.dispose(),
+        () => shapeMat.dispose(),
+        () => extrudeGeo.dispose(),
+        () => extrudeMat.dispose(),
+        () => textures.forEach((tex) => tex.dispose())
+      )
+    } catch (err) {
+      console.error('[useHeroLogo] initialization failed:', err)
+      cleanup?.()
+    }
+  })
+
+  onUnmounted(() => {
+    cleanup?.()
+  })
+
+  return { loaded }
+}
--- a/apps/website/src/config/demos.ts
+++ b/apps/website/src/config/demos.ts
@@ -15,6 +15,14 @@ interface Demo {
  readonly transcript?: TranslationKey
  readonly publishedDate: string
  readonly modifiedDate: string
+  /**
+   * Width / height of the Arcade demo's source recording (e.g. 1.93 for a
+   * landscape screencast). Sizes the embed container to match so rounded
+   * corners hug the content instead of empty letterbox space. Source from
+   * Arcade's `_serializablePublicFlow.aspectRatio` (which is height/width —
+   * invert it). Defaults to 16/9 if omitted.
+   */
+  readonly aspectRatio?: number
 }

 export const demos: readonly Demo[] = [
@@ -32,7 +40,8 @@ export const demos: readonly Demo[] = [
    difficulty: 'beginner',
    tags: ['templates', 'image', 'video'],
    publishedDate: '2026-04-19',
-    modifiedDate: '2026-04-19'
+    modifiedDate: '2026-04-19',
+    aspectRatio: 1.931
  },
  {
    slug: 'workflow-templates',
@@ -48,7 +57,25 @@ export const demos: readonly Demo[] = [
    difficulty: 'beginner',
    tags: ['getting-started', 'templates', 'workflow'],
    publishedDate: '2026-04-19',
-    modifiedDate: '2026-04-19'
+    modifiedDate: '2026-04-19',
+    aspectRatio: 1.931
+  },
+  {
+    slug: 'community-workflows',
+    arcadeId: 'mqZh17oWDuWIyhK0xwEV',
+    category: 'demos.category.gettingStarted',
+    title: 'demos.community-workflows.title',
+    description: 'demos.community-workflows.description',
+    transcript: 'demos.community-workflows.transcript',
+    ogImage: '/images/demos/community-workflows-og.png',
+    thumbnail: '/images/demos/community-workflows-thumb.webp',
+    estimatedTime: 'demos.duration.2min',
+    durationIso: 'PT2M',
+    difficulty: 'beginner',
+    tags: ['getting-started', 'community', 'workflow', 'hub'],
+    publishedDate: '2026-05-04',
+    modifiedDate: '2026-05-04',
+    aspectRatio: 1.931
  }
 ]

--- a/apps/website/src/i18n/translations.ts
+++ b/apps/website/src/i18n/translations.ts
@@ -1119,6 +1119,10 @@ const translations = {
    en: 'Import your own LoRAs',
    'zh-CN': '导入你自己的 LoRA'
  },
+  'pricing.plan.creator.feature2': {
+    en: '3 concurrent API jobs',
+    'zh-CN': '3 个并发 API 任务'
+  },

  'pricing.plan.pro.label': { en: 'PRO', 'zh-CN': '专业版' },
  'pricing.plan.pro.summary': {
@@ -1143,6 +1147,10 @@ const translations = {
    en: 'Longer workflow runtime (up to 1 hour)',
    'zh-CN': '更长工作流运行时长（最长 1 小时）'
  },
+  'pricing.plan.pro.feature2': {
+    en: '5 concurrent API jobs',
+    'zh-CN': '5 个并发 API 任务'
+  },

  'pricing.enterprise.label': { en: 'ENTERPRISE', 'zh-CN': '企业版' },
  'pricing.enterprise.heading': {
@@ -1599,7 +1607,7 @@ const translations = {
  },
  'nav.comfyHub': { en: 'Comfy Hub', 'zh-CN': 'Comfy Hub' },
  'nav.gallery': { en: 'Gallery', 'zh-CN': '画廊' },
-  'nav.blogs': { en: 'Blogs', 'zh-CN': '博客' },
+  'nav.blogs': { en: 'Blog', 'zh-CN': '博客' },
  'nav.github': { en: 'GitHub', 'zh-CN': 'GitHub' },
  'nav.discord': { en: 'Discord', 'zh-CN': 'Discord' },
  'nav.docs': { en: 'Docs', 'zh-CN': '文档' },
@@ -3562,6 +3570,20 @@ const translations = {
      '<ol><li><strong>打开模板浏览器</strong> — 点击 ComfyUI 侧栏中的模板图标。</li><li><strong>浏览分类</strong> — 模板按任务分类：图像生成、视频、放大等。</li><li><strong>预览模板</strong> — 将鼠标悬停在模板上查看预览。</li><li><strong>加载并自定义</strong> — 点击加载模板，然后修改参数。</li></ol>'
  },

+  'demos.community-workflows.title': {
+    en: 'Explore and Use a Community Workflow from the Hub',
+    'zh-CN': '探索并使用社区工作流'
+  },
+  'demos.community-workflows.description': {
+    en: 'Discover how to find and get started with popular community workflows for generative AI projects.',
+    'zh-CN': '了解如何查找并使用流行的社区工作流来构建生成式 AI 项目。'
+  },
+  'demos.community-workflows.transcript': {
+    en: '<ol><li><strong>Open the Workflow Hub</strong> — From the ComfyUI sidebar, navigate to the community Workflow Hub to browse curated and trending workflows shared by the community.</li><li><strong>Browse popular workflows</strong> — Explore featured projects sorted by popularity, recency, and category to find one that matches your goal.</li><li><strong>Preview a workflow</strong> — Click a workflow card to see example outputs, required models, and a description of what it produces.</li><li><strong>Open in ComfyUI</strong> — Use the "Get Started" action to load the selected community workflow directly onto your canvas.</li><li><strong>Run and customize</strong> — Queue the workflow to generate your first result, then tweak prompts, models, and parameters to make it your own.</li></ol>',
+    'zh-CN':
+      '<ol><li><strong>打开工作流中心</strong> — 在 ComfyUI 侧栏中，进入社区工作流中心，浏览社区分享的精选和热门工作流。</li><li><strong>浏览热门工作流</strong> — 按热度、时间和分类浏览精选项目，找到符合需求的工作流。</li><li><strong>预览工作流</strong> — 点击工作流卡片，查看示例输出、所需模型和功能描述。</li><li><strong>在 ComfyUI 中打开</strong> — 使用"开始使用"按钮，将选中的社区工作流直接加载到画布。</li><li><strong>运行并自定义</strong> — 排队执行工作流以生成首个结果，然后调整提示词、模型和参数。</li></ol>'
+  },
+
  'demos.nav.nextDemo': { en: "What's Next", 'zh-CN': '下一个演示' },
  'demos.nav.viewDemo': { en: 'View Demo', 'zh-CN': '查看演示' },
  'demos.nav.allDemos': { en: 'All Demos', 'zh-CN': '所有演示' },
--- a/apps/website/src/layouts/BaseLayout.astro
+++ b/apps/website/src/layouts/BaseLayout.astro
@@ -10,6 +10,7 @@ import { fetchGitHubStars, formatStarCount } from '../utils/github'
 interface Props {
  title: string
  description?: string
+  keywords?: string[]
  ogImage?: string
  noindex?: boolean
 }
@@ -17,10 +18,13 @@ interface Props {
 const {
  title,
  description = 'Comfy is the AI creation engine for visual professionals who demand control.',
+  keywords,
  ogImage = 'https://media.comfy.org/website/comfy.webp',
  noindex = false,
 } = Astro.props

+const keywordsContent = keywords && keywords.length > 0 ? keywords.join(', ') : undefined
+
 const siteBase = Astro.site ?? 'https://comfy.org'
 const canonicalURL = new URL(Astro.url.pathname, siteBase)
 const ogImageURL = new URL(ogImage, siteBase)
@@ -62,6 +66,7 @@ const websiteJsonLd = {
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="description" content={description} />
+    {keywordsContent && <meta name="keywords" content={keywordsContent} />}
    {noindex && <meta name="robots" content="noindex, nofollow" />}
    <title>{title}</title>

--- a/apps/website/src/pages/cloud/index.astro
+++ b/apps/website/src/pages/cloud/index.astro
@@ -7,9 +7,14 @@ import AudienceSection from '../../components/product/cloud/AudienceSection.vue'
 import PricingSection from '../../components/product/cloud/PricingSection.vue'
 import ProductCardsSection from '../../components/product/cloud/ProductCardsSection.vue'
 import FAQSection from '../../components/product/cloud/FAQSection.vue'
+import { t } from '../../i18n/translations'
 ---

-<BaseLayout title="Comfy Cloud — AI in the Cloud">
+<BaseLayout
+  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']}
+>
  <HeroSection />
  <ReasonSection />
  <AIModelsSection />
--- a/apps/website/src/pages/demos/[slug].astro
+++ b/apps/website/src/pages/demos/[slug].astro
@@ -121,6 +121,7 @@ const breadcrumbJsonLd = {
  <ArcadeEmbed
    arcadeId={demo.arcadeId}
    title={title}
+    aspectRatio={demo.aspectRatio}
    client:load
  />

--- a/apps/website/src/pages/download.astro
+++ b/apps/website/src/pages/download.astro
@@ -7,9 +7,14 @@ import ReasonSection from '../components/product/local/ReasonSection.vue'
 import EcoSystemSection from '../components/product/local/EcoSystemSection.vue'
 import ProductCardsSection from '../components/product/local/ProductCardsSection.vue'
 import FAQSection from '../components/product/local/FAQSection.vue'
+import { t } from '../i18n/translations'
 ---

-<BaseLayout title="Download Comfy — Run AI Locally">
+<BaseLayout
+  title="Download Comfy — Run AI Locally"
+  description={t('download.hero.subtitle', 'en')}
+  keywords={['comfyui app', 'comfyui desktop app', 'comfy ui application', 'comfyui download', 'download comfyui', 'comfyui windows', 'comfyui mac', 'comfyui linux', 'comfyui local']}
+>
  <CloudBannerSection />
  <HeroSection client:load />
  <ReasonSection />
--- a/apps/website/src/pages/index.astro
+++ b/apps/website/src/pages/index.astro
@@ -8,9 +8,14 @@ import UseCaseSection from '../components/home/UseCaseSection.vue'
 import CaseStudySpotlightSection from '../components/home/CaseStudySpotlightSection.vue'
 import GetStartedSection from '../components/home/GetStartedSection.vue'
 import BuildWhatSection from '../components/home/BuildWhatSection.vue'
+import { t } from '../i18n/translations'
 ---

-<BaseLayout title="Comfy — Professional Control of Visual AI">
+<BaseLayout
+  title="Comfy — Professional Control of Visual AI"
+  description={t('hero.subtitle', 'en')}
+  keywords={['comfyui app', 'comfyui web app', 'comfy ui application', 'comfyui application', 'comfy app', 'comfyui', 'visual ai app', 'node-based ai', 'generative ai workflows']}
+>
  <HeroSection client:load />
  <SocialProofBarSection />
  <ProductShowcaseSection client:load />
--- a/apps/website/src/pages/zh-CN/cloud/index.astro
+++ b/apps/website/src/pages/zh-CN/cloud/index.astro
@@ -7,9 +7,14 @@ import AudienceSection from '../../../components/product/cloud/AudienceSection.v
 import PricingSection from '../../../components/product/cloud/PricingSection.vue'
 import ProductCardsSection from '../../../components/product/cloud/ProductCardsSection.vue'
 import FAQSection from '../../../components/product/cloud/FAQSection.vue'
+import { t } from '../../../i18n/translations'
 ---

-<BaseLayout title="Comfy Cloud — 云端 AI">
+<BaseLayout
+  title="Comfy Cloud — 云端 AI"
+  description={t('cloud.hero.subtitle', 'zh-CN')}
+  keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'ComfyUI 网页版', 'ComfyUI 云端', 'ComfyUI 应用', 'Comfy Cloud', '云端 ComfyUI']}
+>
  <HeroSection locale="zh-CN" />
  <ReasonSection locale="zh-CN" />
  <AIModelsSection locale="zh-CN" />
--- a/apps/website/src/pages/zh-CN/demos/[slug].astro
+++ b/apps/website/src/pages/zh-CN/demos/[slug].astro
@@ -122,6 +122,7 @@ const breadcrumbJsonLd = {
  <ArcadeEmbed
    arcadeId={demo.arcadeId}
    title={title}
+    aspectRatio={demo.aspectRatio}
    locale="zh-CN"
    client:load
  />
--- a/apps/website/src/pages/zh-CN/download.astro
+++ b/apps/website/src/pages/zh-CN/download.astro
@@ -7,9 +7,14 @@ import ReasonSection from '../../components/product/local/ReasonSection.vue'
 import EcoSystemSection from '../../components/product/local/EcoSystemSection.vue'
 import ProductCardsSection from '../../components/product/local/ProductCardsSection.vue'
 import FAQSection from '../../components/product/local/FAQSection.vue'
+import { t } from '../../i18n/translations'
 ---

-<BaseLayout title="下载 — Comfy">
+<BaseLayout
+  title="下载 — Comfy"
+  description={t('download.hero.subtitle', 'zh-CN')}
+  keywords={['comfyui app', 'comfyui desktop app', 'comfyui download', 'ComfyUI 下载', 'ComfyUI 桌面应用', 'ComfyUI 应用', 'ComfyUI Windows', 'ComfyUI macOS', 'ComfyUI Linux']}
+>
  <CloudBannerSection locale="zh-CN" />
  <HeroSection locale="zh-CN" client:load />
  <ReasonSection locale="zh-CN" />
--- a/apps/website/src/pages/zh-CN/index.astro
+++ b/apps/website/src/pages/zh-CN/index.astro
@@ -8,9 +8,14 @@ import UseCaseSection from '../../components/home/UseCaseSection.vue'
 import CaseStudySpotlightSection from '../../components/home/CaseStudySpotlightSection.vue'
 import GetStartedSection from '../../components/home/GetStartedSection.vue'
 import BuildWhatSection from '../../components/home/BuildWhatSection.vue'
+import { t } from '../../i18n/translations'
 ---

-<BaseLayout title="Comfy — 视觉 AI 的最强可控性">
+<BaseLayout
+  title="Comfy — 视觉 AI 的最强可控性"
+  description={t('hero.subtitle', 'zh-CN')}
+  keywords={['comfyui app', 'comfyui web app', 'comfyui application', 'ComfyUI 应用', 'ComfyUI 网页版', 'ComfyUI 桌面应用', 'ComfyUI 下载', '可视化 AI', '节点式 AI', '生成式 AI 工作流']}
+>
  <HeroSection locale="zh-CN" client:load />
  <SocialProofBarSection />
  <ProductShowcaseSection locale="zh-CN" client:load />
--- a/apps/website/src/styles/global.css
+++ b/apps/website/src/styles/global.css
@@ -101,13 +101,13 @@
    transform: translateX(0);
  }
  100% {
-    transform: translateX(-50%);
+    transform: translateX(calc(-100% - var(--marquee-gap, 0px)));
  }
 }

@keyframes marquee-reverse {
  0% {
-    transform: translateX(-50%);
+    transform: translateX(calc(-100% - var(--marquee-gap, 0px)));
  }
  100% {
    transform: translateX(0);
@@ -115,11 +115,15 @@
 }

@utility animate-marquee {
-  animation: marquee 30s linear infinite;
+  @media (prefers-reduced-motion: no-preference) {
+    animation: marquee 30s linear infinite;
+  }
 }

@utility animate-marquee-reverse {
-  animation: marquee-reverse 30s linear infinite;
+  @media (prefers-reduced-motion: no-preference) {
+    animation: marquee-reverse 30s linear infinite;
+  }
 }

@keyframes ripple-effect {
--- a/browser_tests/assets/missing/nested_subgraph_installed_model.json
+++ b/browser_tests/assets/missing/nested_subgraph_installed_model.json
@@ -0,0 +1,232 @@
+{
+  "id": "14af6003-d4ee-4dee-8e3d-cbff2e5519b3",
+  "revision": 0,
+  "last_node_id": 205,
+  "last_link_id": 383,
+  "nodes": [
+    {
+      "id": 205,
+      "type": "821645cc-a5d2-468f-990c-17d9de2e0d1b",
+      "pos": [4720, 5820],
+      "size": [400, 470],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "label": "lotus_model",
+          "name": "unet_name_1",
+          "type": "COMBO",
+          "widget": {
+            "name": "unet_name_1"
+          },
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        }
+      ],
+      "properties": {
+        "proxyWidgets": [["76", "unet_name"]]
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "821645cc-a5d2-468f-990c-17d9de2e0d1b",
+        "version": 1,
+        "state": {
+          "lastGroupId": 8,
+          "lastNodeId": 205,
+          "lastLinkId": 383,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Depth to Image (Z-Image-Turbo)",
+        "inputNode": {
+          "id": -10,
+          "bounding": [28, 4936, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1599, 4936, 128, 68]
+        },
+        "inputs": [
+          {
+            "id": "80e6915f-5d59-4d6b-a197-d8c565ad2922",
+            "name": "unet_name_1",
+            "type": "COMBO",
+            "linkIds": [258],
+            "pos": [132, 4960]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "47f9a22d-6619-4917-9447-a7d5d08dceb5",
+            "name": "IMAGE",
+            "type": "IMAGE",
+            "linkIds": [],
+            "pos": [1623, 4960]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 76,
+            "type": "a1134394-29e4-48dc-9b1e-e601a14d6fb8",
+            "pos": [250, 4910],
+            "size": [400, 210],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "name": "unet_name",
+                "type": "COMBO",
+                "widget": {
+                  "name": "unet_name"
+                },
+                "link": 258
+              }
+            ],
+            "outputs": [
+              {
+                "name": "IMAGE",
+                "type": "IMAGE",
+                "links": []
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [["203", "unet_name"]]
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 258,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 76,
+            "target_slot": 0,
+            "type": "COMBO"
+          }
+        ],
+        "extra": {
+          "workflowRendererVersion": "LG",
+          "ds": {
+            "scale": 1,
+            "offset": [-30, -4760]
+          }
+        }
+      },
+      {
+        "id": "a1134394-29e4-48dc-9b1e-e601a14d6fb8",
+        "version": 1,
+        "state": {
+          "lastGroupId": 8,
+          "lastNodeId": 205,
+          "lastLinkId": 383,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Image to Depth Map (Lotus)",
+        "inputNode": {
+          "id": -10,
+          "bounding": [-60, -173, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1650, -173, 128, 68]
+        },
+        "inputs": [
+          {
+            "id": "d721b249-fd2a-441b-9a78-2805f04e2644",
+            "name": "unet_name",
+            "type": "COMBO",
+            "linkIds": [256],
+            "pos": [44, -149]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "2ec278bd-0b66-4b30-9c5b-994d5f638214",
+            "name": "IMAGE",
+            "type": "IMAGE",
+            "linkIds": [],
+            "pos": [1674, -149]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 203,
+            "type": "UNETLoader",
+            "pos": [180, -200],
+            "size": [400, 200],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "name": "unet_name",
+                "type": "COMBO",
+                "widget": {
+                  "name": "unet_name"
+                },
+                "link": 256
+              }
+            ],
+            "outputs": [
+              {
+                "name": "MODEL",
+                "type": "MODEL",
+                "links": []
+              }
+            ],
+            "properties": {},
+            "widgets_values": ["lotus-depth-d-v1-1.safetensors", "default"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 256,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 203,
+            "target_slot": 0,
+            "type": "COMBO"
+          }
+        ],
+        "extra": {
+          "workflowRendererVersion": "LG",
+          "ds": {
+            "scale": 1,
+            "offset": [40, 350]
+          }
+        }
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "workflowRendererVersion": "LG",
+    "ds": {
+      "scale": 1,
+      "offset": [-4500, -5670]
+    }
+  },
+  "version": 0.4
+}
--- a/browser_tests/assets/subgraphs/large-subgraph-80-nodes.json
+++ b/browser_tests/assets/subgraphs/large-subgraph-80-nodes.json
--- a/browser_tests/assets/subgraphs/subgraph-with-link-and-proxied-primitive.json
+++ b/browser_tests/assets/subgraphs/subgraph-with-link-and-proxied-primitive.json
@@ -0,0 +1,179 @@
+{
+  "id": "5c4a1450-26b8-4b34-b5ea-e3465273441e",
+  "revision": 0,
+  "last_node_id": 4,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "16aadaf6-aa66-4041-843e-589a6572a3ac",
+      "pos": [602, 409],
+      "size": [225, 144],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [],
+      "properties": {
+        "proxyWidgets": [
+          ["1", "value"],
+          ["4", "value"]
+        ]
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "16aadaf6-aa66-4041-843e-589a6572a3ac",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 4,
+          "lastLinkId": 2,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [349, 383, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [867, 383, 128, 48]
+        },
+        "inputs": [
+          {
+            "id": "50fd1af4-4f20-434f-9828-6971210be4e9",
+            "name": "value",
+            "type": "STRING",
+            "linkIds": [1],
+            "pos": [453, 407]
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 1,
+            "type": "PrimitiveString",
+            "pos": [537, 368],
+            "size": [270, 108],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 1
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveString"
+            },
+            "widgets_values": [""]
+          },
+          {
+            "id": 3,
+            "type": "PrimitiveInt",
+            "pos": [534.9899497487436, 515.4924623115581],
+            "size": [270, 104],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "INT",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 2
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "INT",
+                "name": "INT",
+                "type": "INT",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveInt"
+            },
+            "widgets_values": [0, "randomize"]
+          },
+          {
+            "id": 4,
+            "type": "PrimitiveNode",
+            "pos": [258.4381232333541, 549.1608040200999],
+            "size": [225, 104],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "name": "INT",
+                "type": "INT",
+                "widget": {
+                  "name": "value"
+                },
+                "links": [2]
+              }
+            ],
+            "properties": {
+              "Run widget replace on values": false
+            },
+            "widgets_values": [0, "randomize"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 2,
+            "origin_id": 4,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "INT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "frontendVersion": "1.44.17"
+  },
+  "version": 0.4
+}
--- a/browser_tests/assets/widgets/load_image_widget_missing_file.json
+++ b/browser_tests/assets/widgets/load_image_widget_missing_file.json
@@ -0,0 +1,42 @@
+{
+  "last_node_id": 10,
+  "last_link_id": 10,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "LoadImage",
+      "pos": [50, 50],
+      "size": [315, 314],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["this-image-does-not-exist-deadbeef.png", "image"]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "offset": [0, 0],
+      "scale": 1
+    }
+  },
+  "version": 0.4
+}
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -190,6 +190,9 @@ export class ComfyPage {
  /** Worker index to test user ID */
  public readonly userIds: string[] = []

+  /** Whether the current test runs in Vue Nodes mode (initialized from `@vue-nodes` tag). */
+  public isVueNodes = false
+
  /** Test user ID for the current context */
  get id() {
    return this.userIds[comfyPageFixture.info().parallelIndex]
@@ -352,6 +355,12 @@ export class ComfyPage {
    await nextFrame(this.page)
  }

+  async idleFrames(count: number) {
+    for (let i = 0; i < count; i++) {
+      await this.nextFrame()
+    }
+  }
+
  async delay(ms: number) {
    return sleep(ms)
  }
@@ -494,6 +503,7 @@ export const comfyPageFixture = base.extend<{
    comfyPage.userIds[parallelIndex] = userId

    const isVueNodes = testInfo.tags.includes('@vue-nodes')
+    comfyPage.isVueNodes = isVueNodes

    try {
      await comfyPage.setupSettings({
--- a/browser_tests/fixtures/VueNodeHelpers.ts
+++ b/browser_tests/fixtures/VueNodeHelpers.ts
@@ -5,6 +5,7 @@ import type { Locator, Page } from '@playwright/test'

 import { TestIds } from '@e2e/fixtures/selectors'
 import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'
+import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'

 export class VueNodeHelpers {
  /**
@@ -37,6 +38,22 @@ export class VueNodeHelpers {
    return this.getNodeLocator(nodeId).getByTestId(TestIds.node.innerWrapper)
  }

+  getInputSlotRow(nodeId: string, slotIndex: number): Locator {
+    return this.getNodeLocator(nodeId)
+      .locator('.lg-slot--input')
+      .filter({
+        has: this.page.locator(
+          `[data-slot-key="${getSlotKey(nodeId, slotIndex, true)}"]`
+        )
+      })
+  }
+
+  getInputSlotConnectionDot(nodeId: string, slotIndex: number): Locator {
+    return this.getInputSlotRow(nodeId, slotIndex).getByTestId(
+      TestIds.node.slotConnectionDot
+    )
+  }
+
  /**
   * Get locator for Vue nodes by the node's title (displayed name in the header).
   * Matches against the actual title element, not the full node body.
@@ -200,13 +217,20 @@ export class VueNodeHelpers {
    }
  }

+  /**
+   * Locator for the Enter Subgraph footer button.
+   */
+  getSubgraphEnterButton(nodeId?: string): Locator {
+    const root = nodeId ? this.getNodeLocator(nodeId) : this.page
+    return root.getByTestId(TestIds.widgets.subgraphEnterButton).first()
+  }
+
  /**
   * Enter the subgraph of a node.
   * @param nodeId - The ID of the node to enter the subgraph of. If not provided, the first matched subgraph will be entered.
   */
  async enterSubgraph(nodeId?: string): Promise<void> {
-    const locator = nodeId ? this.getNodeLocator(nodeId) : this.page
-    const editButton = locator.getByTestId(TestIds.widgets.subgraphEnterButton)
+    const editButton = this.getSubgraphEnterButton(nodeId)

    // The footer tab button extends below the node body (visible area),
    // but its bounding box center overlaps the node body div.
--- a/browser_tests/fixtures/assetApiFixture.ts
+++ b/browser_tests/fixtures/assetApiFixture.ts
@@ -1,8 +1,34 @@
 import { test as base } from '@playwright/test'
+import type { Page, Route } from '@playwright/test'

+import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
 import type { AssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
 import { createAssetHelper } from '@e2e/fixtures/helpers/AssetHelper'

+const ASSETS_ROUTE_PATTERN = /\/api\/assets(?:\?.*)?$/
+const cloudAssetRequestsByPage = new WeakMap<Page, string[]>()
+
+function makeAssetsResponse(assets: ReadonlyArray<Asset>): ListAssetsResponse {
+  return { assets: [...assets], total: assets.length, has_more: false }
+}
+
+export function assetRequestIncludesTag(url: string, tag: string): boolean {
+  const includeTags = new URL(url).searchParams.get('include_tags') ?? ''
+  return includeTags
+    .split(',')
+    .map((value) => value.trim())
+    .filter(Boolean)
+    .includes(tag)
+}
+
+export function countAssetRequestsByTag(
+  requests: string[],
+  tag: string
+): number {
+  return requests.filter((url) => assetRequestIncludesTag(url, tag)).length
+}
+
 export const assetApiFixture = base.extend<{
  assetApi: AssetHelper
 }>({
@@ -14,3 +40,31 @@ export const assetApiFixture = base.extend<{
    await assetApi.clearMocks()
  }
 })
+
+export function createCloudAssetsFixture(assets: ReadonlyArray<Asset>) {
+  return comfyPageFixture.extend<{
+    cloudAssetRequests: string[]
+  }>({
+    page: async ({ page }, use) => {
+      const cloudAssetRequests: string[] = []
+      cloudAssetRequestsByPage.set(page, cloudAssetRequests)
+
+      async function assetsRouteHandler(route: Route) {
+        cloudAssetRequests.push(route.request().url())
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeAssetsResponse(assets))
+        })
+      }
+
+      await page.route(ASSETS_ROUTE_PATTERN, assetsRouteHandler)
+      await use(page)
+      await page.unroute(ASSETS_ROUTE_PATTERN, assetsRouteHandler)
+      cloudAssetRequestsByPage.delete(page)
+    },
+    cloudAssetRequests: async ({ page }, use) => {
+      await use(cloudAssetRequestsByPage.get(page) ?? [])
+    }
+  })
+}
--- a/browser_tests/fixtures/components/Actionbar.ts
+++ b/browser_tests/fixtures/components/Actionbar.ts
@@ -39,10 +39,32 @@ class ComfyQueueButton {
    await this.dropdownButton.click()
    return new ComfyQueueButtonOptions(this.actionbar.page)
  }
+
+  public async openOptions() {
+    const options = new ComfyQueueButtonOptions(this.actionbar.page)
+    if (!(await options.menu.isVisible())) {
+      await this.dropdownButton.click()
+    }
+    return options
+  }
 }

 class ComfyQueueButtonOptions {
-  constructor(public readonly page: Page) {}
+  public readonly menu: Locator
+  public readonly modeItems: Locator
+
+  constructor(public readonly page: Page) {
+    this.menu = page.getByRole('menu')
+    this.modeItems = this.menu.getByRole('menuitem')
+  }
+
+  public modeItem(name: string) {
+    return this.menu.getByRole('menuitem', { name, exact: true })
+  }
+
+  public async selectMode(name: string) {
+    await this.modeItem(name).click()
+  }

  public async setMode(mode: AutoQueueMode) {
    await this.page.evaluate((mode) => {
--- a/browser_tests/fixtures/components/ContextMenu.ts
+++ b/browser_tests/fixtures/components/ContextMenu.ts
@@ -20,6 +20,7 @@ export class ContextMenu {

  async clickMenuItemExact(name: string): Promise<void> {
    await this.page.getByRole('menuitem', { name, exact: true }).click()
+    await this.waitForHidden()
  }

  /**
--- a/browser_tests/fixtures/components/Topbar.ts
+++ b/browser_tests/fixtures/components/Topbar.ts
@@ -82,7 +82,7 @@ export class Topbar {
  }

  getSaveDialog(): Locator {
-    return this.page.locator('.p-dialog-content input')
+    return this.page.getByRole('dialog').getByRole('textbox')
  }

  saveWorkflow(workflowName: string): Promise<void> {
@@ -116,9 +116,9 @@ export class Topbar {

    // Check if a confirmation dialog appeared (e.g., "Overwrite existing file?")
    // If so, return early to let the test handle the confirmation
-    const confirmationDialog = this.page.locator(
-      '.p-dialog:has-text("Overwrite")'
-    )
+    const confirmationDialog = this.page
+      .getByRole('dialog')
+      .filter({ hasText: 'Overwrite' })
    if (await confirmationDialog.isVisible()) {
      return
    }
--- a/browser_tests/fixtures/components/WidgetSelectDropdown.ts
+++ b/browser_tests/fixtures/components/WidgetSelectDropdown.ts
@@ -0,0 +1,12 @@
+import type { Locator } from '@playwright/test'
+
+export class WidgetSelectDropdownFixture {
+  public readonly selection: Locator
+
+  constructor(public readonly root: Locator) {
+    this.selection = root.locator('button span span')
+  }
+  async selectedItem(): Promise<string> {
+    return await this.selection.innerText()
+  }
+}
--- a/browser_tests/fixtures/helpers/AppModeHelper.ts
+++ b/browser_tests/fixtures/helpers/AppModeHelper.ts
@@ -9,13 +9,15 @@ import { BuilderFooterHelper } from '@e2e/fixtures/helpers/BuilderFooterHelper'
 import { BuilderSaveAsHelper } from '@e2e/fixtures/helpers/BuilderSaveAsHelper'
 import { BuilderSelectHelper } from '@e2e/fixtures/helpers/BuilderSelectHelper'
 import { BuilderStepsHelper } from '@e2e/fixtures/helpers/BuilderStepsHelper'
+import { MobileAppHelper } from '@e2e/fixtures/helpers/MobileAppHelper'

 export class AppModeHelper {
-  readonly steps: BuilderStepsHelper
  readonly footer: BuilderFooterHelper
+  readonly mobile: MobileAppHelper
  readonly saveAs: BuilderSaveAsHelper
  readonly select: BuilderSelectHelper
  readonly outputHistory: OutputHistoryComponent
+  readonly steps: BuilderStepsHelper
  readonly widgets: AppModeWidgetHelper

  /** The "Connect an output" popover shown when saving without outputs. */
@@ -60,13 +62,16 @@ export class AppModeHelper {
  public readonly vueNodeSwitchDismissButton: Locator
  /** The "Don't show again" checkbox inside the Vue Node switch popup. */
  public readonly vueNodeSwitchDontShowAgainCheckbox: Locator
+  /** The main content area where outputs are displayed*/
+  public readonly centerPanel: Locator

  constructor(private readonly comfyPage: ComfyPage) {
-    this.steps = new BuilderStepsHelper(comfyPage)
+    this.mobile = new MobileAppHelper(comfyPage)
    this.footer = new BuilderFooterHelper(comfyPage)
    this.saveAs = new BuilderSaveAsHelper(comfyPage)
    this.select = new BuilderSelectHelper(comfyPage)
    this.outputHistory = new OutputHistoryComponent(comfyPage.page)
+    this.steps = new BuilderStepsHelper(comfyPage)
    this.widgets = new AppModeWidgetHelper(comfyPage)

    this.connectOutputPopover = this.page.getByTestId(
@@ -125,6 +130,7 @@ export class AppModeHelper {
    this.vueNodeSwitchDontShowAgainCheckbox = this.page.getByTestId(
      TestIds.appMode.vueNodeSwitchDontShowAgain
    )
+    this.centerPanel = this.page.getByTestId(TestIds.linear.centerPanel)
  }

  private get page(): Page {
--- a/browser_tests/fixtures/helpers/AssetHelper.ts
+++ b/browser_tests/fixtures/helpers/AssetHelper.ts
@@ -215,11 +215,12 @@ export class AssetHelper {
    return this.store.size
  }
  private handleListAssets(route: Route, url: URL) {
-    const includeTags = url.searchParams.get('include_tags')?.split(',') ?? []
+    const includeTags = parseAssetTagParam(url.searchParams.get('include_tags'))
+    const excludeTags = parseAssetTagParam(url.searchParams.get('exclude_tags'))
    const limit = parseInt(url.searchParams.get('limit') ?? '0', 10)
    const offset = parseInt(url.searchParams.get('offset') ?? '0', 10)

-    let filtered = this.getFilteredAssets(includeTags)
+    let filtered = this.getFilteredAssets(includeTags, excludeTags)
    if (limit > 0) {
      filtered = filtered.slice(offset, offset + limit)
    }
@@ -296,15 +297,29 @@ export class AssetHelper {
    this.paginationOptions = null
    this.uploadResponse = null
  }
-  private getFilteredAssets(tags: string[]): Asset[] {
+  private getFilteredAssets(
+    includeTags: string[],
+    excludeTags: string[]
+  ): Asset[] {
    const assets = [...this.store.values()]
-    if (tags.length === 0) return assets

-    return assets.filter((asset) =>
-      tags.every((tag) => (asset.tags ?? []).includes(tag))
+    return assets.filter(
+      (asset) =>
+        includeTags.every((tag) => (asset.tags ?? []).includes(tag)) &&
+        excludeTags.every((tag) => !(asset.tags ?? []).includes(tag))
    )
  }
 }
+
+function parseAssetTagParam(value: string | null): string[] {
+  return (
+    value
+      ?.split(',')
+      .map((tag) => tag.trim())
+      .filter(Boolean) ?? []
+  )
+}
+
 export function createAssetHelper(
  page: Page,
  ...operators: AssetOperator[]
--- a/browser_tests/fixtures/helpers/BuilderSelectHelper.ts
+++ b/browser_tests/fixtures/helpers/BuilderSelectHelper.ts
@@ -127,9 +127,7 @@ export class BuilderSelectHelper {
    await popoverTrigger.click()
    await this.page.getByText('Rename', { exact: true }).click()

-    const dialogInput = this.page.locator(
-      '.p-dialog-content input[type="text"]'
-    )
+    const dialogInput = this.page.getByRole('dialog').getByRole('textbox')
    await dialogInput.fill(newName)
    await this.page.keyboard.press('Enter')
    await dialogInput.waitFor({ state: 'hidden' })
--- a/browser_tests/fixtures/helpers/DragDropHelper.ts
+++ b/browser_tests/fixtures/helpers/DragDropHelper.ts
@@ -1,4 +1,5 @@
 import { readFileSync } from 'fs'
+import { basename } from 'path'

 import type { Page } from '@playwright/test'

@@ -13,6 +14,7 @@ export class DragDropHelper {
  async dragAndDropExternalResource(
    options: {
      fileName?: string
+      filePath?: string
      url?: string
      dropPosition?: Position
      waitForUpload?: boolean
@@ -22,13 +24,14 @@ export class DragDropHelper {
    const {
      dropPosition = { x: 100, y: 100 },
      fileName,
+      filePath,
      url,
      waitForUpload = false,
      preserveNativePropagation = false
    } = options

-    if (!fileName && !url)
-      throw new Error('Must provide either fileName or url')
+    if (!fileName && !filePath && !url)
+      throw new Error('Must provide fileName, filePath, or url')

    const evaluateParams: {
      dropPosition: Position
@@ -39,12 +42,22 @@ export class DragDropHelper {
      preserveNativePropagation: boolean
    } = { dropPosition, preserveNativePropagation }

-    if (fileName) {
-      const filePath = assetPath(fileName)
-      const buffer = readFileSync(filePath)
+    if (fileName || filePath) {
+      const resolvedPath = filePath ?? assetPath(fileName!)
+      const displayName = fileName ?? basename(resolvedPath)
+      let buffer: Buffer
+      try {
+        buffer = readFileSync(resolvedPath)
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error)
+        throw new Error(
+          `Failed to read drag-and-drop fixture at "${resolvedPath}": ${reason}`,
+          { cause: error }
+        )
+      }

-      evaluateParams.fileName = fileName
-      evaluateParams.fileType = getMimeType(fileName)
+      evaluateParams.fileName = displayName
+      evaluateParams.fileType = getMimeType(displayName)
      evaluateParams.buffer = [...new Uint8Array(buffer)]
    }

@@ -148,6 +161,13 @@ export class DragDropHelper {
    return this.dragAndDropExternalResource({ fileName, ...options })
  }

+  async dragAndDropFilePath(
+    filePath: string,
+    options: { dropPosition?: Position; waitForUpload?: boolean } = {}
+  ): Promise<void> {
+    return this.dragAndDropExternalResource({ filePath, ...options })
+  }
+
  async dragAndDropURL(
    url: string,
    options: {
--- a/browser_tests/fixtures/helpers/ExecutionHelper.ts
+++ b/browser_tests/fixtures/helpers/ExecutionHelper.ts
@@ -1,6 +1,10 @@
 import type { WebSocketRoute } from '@playwright/test'

-import type { NodeError, PromptResponse } from '@/schemas/apiSchema'
+import type {
+  NodeError,
+  NodeProgressState,
+  PromptResponse
+} from '@/schemas/apiSchema'
 import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { createMockJob } from '@e2e/fixtures/helpers/AssetsHelper'
@@ -230,6 +234,16 @@ export class ExecutionHelper {
    )
  }

+  /** Send `progress_state` WS event with per-node execution state. */
+  progressState(jobId: string, nodes: Record<string, NodeProgressState>): void {
+    this.requireWs().send(
+      JSON.stringify({
+        type: 'progress_state',
+        data: { prompt_id: jobId, nodes }
+      })
+    )
+  }
+
  /**
   * Complete a job by adding it to mock history, sending execution_success,
   * and triggering a history refresh via a status event.
--- a/browser_tests/fixtures/helpers/MobileAppHelper.ts
+++ b/browser_tests/fixtures/helpers/MobileAppHelper.ts
@@ -0,0 +1,33 @@
+import type { Locator, Page } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { TestIds } from '@e2e/fixtures/selectors'
+
+export class MobileAppHelper {
+  private readonly page: Page
+  readonly contentPanel: Locator
+  readonly navigation: Locator
+  readonly navigationTabs: Locator
+  readonly view: Locator
+  readonly workflows: Locator
+
+  constructor(comfyPage: ComfyPage) {
+    this.page = comfyPage.page
+    this.view = this.page.getByTestId(TestIds.linear.mobile)
+    this.contentPanel = this.page.getByRole('tabpanel')
+    this.navigation = this.page.getByRole('tablist').filter({ hasText: 'Run' })
+    this.navigationTabs = this.navigation.getByRole('tab')
+    this.workflows = this.view.getByTestId(TestIds.linear.mobileWorkflows)
+  }
+
+  async switchWorkflow(workflowName: string) {
+    await this.workflows.click()
+    await this.page.getByRole('menu').getByText(workflowName).click()
+  }
+  async navigateTab(name: 'run' | 'outputs' | 'assets') {
+    await this.navigation.getByRole('tab', { name }).click()
+  }
+  async tap(locator: Locator, { count = 1 }: { count?: number } = {}) {
+    for (let i = 0; i < count; i++) await locator.tap()
+  }
+}
--- a/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
+++ b/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
@@ -18,9 +18,7 @@ export class NodeOperationsHelper {
  public readonly promptDialogInput: Locator

  constructor(private comfyPage: ComfyPage) {
-    this.promptDialogInput = this.page.locator(
-      '.p-dialog-content input[type="text"]'
-    )
+    this.promptDialogInput = this.page.getByRole('dialog').getByRole('textbox')
  }

  private get page() {
--- a/browser_tests/fixtures/helpers/SubgraphHelper.ts
+++ b/browser_tests/fixtures/helpers/SubgraphHelper.ts
@@ -362,6 +362,9 @@ export class SubgraphHelper {

    await this.comfyPage.nextFrame()
    await expect.poll(async () => this.isInSubgraph()).toBe(false)
+    if (this.comfyPage.isVueNodes) {
+      await this.comfyPage.vueNodes.waitForNodes()
+    }
  }

  async countGraphPseudoPreviewEntries(): Promise<number> {
--- a/browser_tests/fixtures/selectors.ts
+++ b/browser_tests/fixtures/selectors.ts
@@ -116,7 +116,8 @@ export const TestIds = {
    titleInput: 'node-title-input',
    pinIndicator: 'node-pin-indicator',
    innerWrapper: 'node-inner-wrapper',
-    mainImage: 'main-image'
+    mainImage: 'main-image',
+    slotConnectionDot: 'slot-connection-dot'
  },
  selectionToolbox: {
    root: 'selection-toolbox',
@@ -143,6 +144,14 @@ export const TestIds = {
    domWidgetTextarea: 'dom-widget-textarea',
    subgraphEnterButton: 'subgraph-enter-button'
  },
+  linear: {
+    centerPanel: 'linear-center-panel',
+    mobile: 'linear-mobile',
+    mobileNavigation: 'linear-mobile-navigation',
+    mobileWorkflows: 'linear-mobile-workflows',
+    outputInfo: 'linear-output-info',
+    widgetContainer: 'linear-widgets'
+  },
  builder: {
    footerNav: 'builder-footer-nav',
    saveButton: 'builder-save-button',
--- a/browser_tests/fixtures/utils/mimeTypeUtil.ts
+++ b/browser_tests/fixtures/utils/mimeTypeUtil.ts
@@ -7,6 +7,9 @@ export function getMimeType(fileName: string): string {
  if (name.endsWith('.avif')) return 'image/avif'
  if (name.endsWith('.webm')) return 'video/webm'
  if (name.endsWith('.mp4')) return 'video/mp4'
+  if (name.endsWith('.mp3')) return 'audio/mpeg'
+  if (name.endsWith('.flac')) return 'audio/flac'
+  if (name.endsWith('.ogg') || name.endsWith('.opus')) return 'audio/ogg'
  if (name.endsWith('.json')) return 'application/json'
  if (name.endsWith('.glb')) return 'model/gltf-binary'
  return 'application/octet-stream'
--- a/browser_tests/fixtures/utils/paths.ts
+++ b/browser_tests/fixtures/utils/paths.ts
@@ -1,3 +1,7 @@
 export function assetPath(fileName: string): string {
  return `./browser_tests/assets/${fileName}`
 }
+
+export function metadataFixturePath(fileName: string): string {
+  return `./src/scripts/metadata/__fixtures__/${fileName}`
+}
--- a/browser_tests/fixtures/utils/vueNodeFixtures.ts
+++ b/browser_tests/fixtures/utils/vueNodeFixtures.ts
@@ -13,6 +13,8 @@ export class VueNodeFixture {
  public readonly collapseButton: Locator
  public readonly collapseIcon: Locator
  public readonly root: Locator
+  public readonly widgets: Locator
+  public readonly imagePreview: Locator

  constructor(private readonly locator: Locator) {
    this.header = locator.locator('[data-testid^="node-header-"]')
@@ -23,6 +25,8 @@ export class VueNodeFixture {
    this.collapseButton = locator.getByTestId('node-collapse-button')
    this.collapseIcon = this.collapseButton.locator('i')
    this.root = locator
+    this.widgets = this.locator.locator('.lg-node-widget')
+    this.imagePreview = locator.locator('.image-preview')
  }

  async getTitle(): Promise<string> {
@@ -39,6 +43,16 @@ export class VueNodeFixture {
    await this.collapseButton.click()
  }

+  /**
+   * Select this node and delete it via the Delete key, waiting for the node
+   * element to leave the DOM before resolving.
+   */
+  async delete(): Promise<void> {
+    await this.header.click()
+    await this.header.press('Delete')
+    await this.locator.waitFor({ state: 'hidden' })
+  }
+
  async getCollapseIconClass(): Promise<string> {
    return (await this.collapseIcon.getAttribute('class')) ?? ''
  }
--- a/browser_tests/tests/appMode.spec.ts
+++ b/browser_tests/tests/appMode.spec.ts
@@ -0,0 +1,154 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+import { WidgetSelectDropdownFixture } from '@e2e/fixtures/components/WidgetSelectDropdown'
+
+test.describe('App mode usage', () => {
+  test('Drag and Drop', async ({ comfyPage, comfyFiles }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+    const { centerPanel } = comfyPage.appMode
+    await comfyPage.appMode.enterAppModeWithInputs([['3', 'seed']])
+    await expect(centerPanel, 'Enter app mode').toBeVisible()
+
+    //an app without an image input will load the workflow
+    await test.step('App without an image input loads workflow', async () => {
+      await comfyPage.dragDrop.dragAndDropFile('workflowInMedia/workflow.webp')
+      await expect(centerPanel).toBeHidden()
+    })
+
+    //prep a load image
+    await test.step('Add a load image node', async () => {
+      await comfyPage.workflow.loadWorkflow('default')
+      await comfyPage.page.mouse.dblclick(200, 200, { delay: 5 })
+      await comfyPage.searchBox.fillAndSelectFirstNode('Load Image')
+      const loadImage = await comfyPage.vueNodes.getNodeLocator('10')
+      await expect(loadImage).toBeVisible()
+    })
+
+    const imageInput = new WidgetSelectDropdownFixture(
+      comfyPage.appMode.linearWidgets.locator('.lg-node-widget')
+    )
+
+    await test.step('Enter app mode with image input', async () => {
+      await comfyPage.appMode.enterAppModeWithInputs([['10', 'image']])
+      await expect(centerPanel).toBeVisible()
+
+      await expect(imageInput.root).toBeVisible()
+    })
+
+    await test.step('Dragging an image redirects to image input', async () => {
+      const initialImage = await imageInput.selectedItem()
+
+      await comfyPage.dragDrop.dragAndDropExternalResource({
+        fileName: 'workflow.webp',
+        filePath: './browser_tests/assets/workflowInMedia/workflow.webp',
+        preserveNativePropagation: true
+      })
+      comfyFiles.deleteAfterTest({ filename: 'workflow.webp', type: 'input' })
+
+      await expect(imageInput.selection).not.toHaveText(initialImage)
+      await expect(
+        centerPanel,
+        'A file with workflow should not open a new workflow'
+      ).toBeVisible()
+    })
+
+    await test.step('Dragging a url redirects to image input', async () => {
+      const secondImage = await imageInput.selectedItem()
+      await comfyPage.dragDrop.dragAndDropURL('/assets/images/og-image.png', {
+        preserveNativePropagation: true
+      })
+      comfyFiles.deleteAfterTest({
+        filename: 'og-image.png',
+        type: 'input'
+      })
+      await expect(imageInput.selection).not.toHaveText(secondImage)
+    })
+  })
+
+  test('Widget Interaction', async ({ comfyPage }) => {
+    await comfyPage.appMode.enterAppModeWithInputs([
+      ['3', 'seed'],
+      ['3', 'sampler_name'],
+      ['6', 'text']
+    ])
+    const seed = comfyPage.appMode.linearWidgets.getByLabel('seed', {
+      exact: true
+    })
+    const { input, incrementButton, decrementButton } =
+      comfyPage.vueNodes.getInputNumberControls(seed)
+    const initialValue = Number(await input.inputValue())
+
+    await seed.dragTo(incrementButton, { steps: 5 })
+    const intermediateValue = Number(await input.inputValue())
+    expect(intermediateValue).toBeGreaterThan(initialValue)
+
+    await seed.dragTo(decrementButton, { steps: 5 })
+    const endValue = Number(await input.inputValue())
+    expect(endValue).toBeLessThan(intermediateValue)
+
+    const sampler = comfyPage.appMode.linearWidgets.getByLabel('sampler_name', {
+      exact: true
+    })
+    await sampler.click()
+
+    await comfyPage.page.getByRole('searchbox').fill('uni')
+    await comfyPage.page.keyboard.press('ArrowDown')
+    await comfyPage.page.keyboard.press('Enter')
+    await expect(sampler).toHaveText('uni_pc')
+
+    //verify values are consistent with litegraph
+  })
+
+  test.describe('Mobile', { tag: ['@mobile'] }, () => {
+    test('panel navigation', async ({ comfyPage }) => {
+      const { mobile } = comfyPage.appMode
+      await comfyPage.appMode.enterAppModeWithInputs([['3', 'steps']])
+      await expect(mobile.view).toBeVisible()
+      await expect(mobile.navigation).toBeVisible()
+
+      await mobile.navigateTab('assets')
+      await expect(mobile.contentPanel).toHaveAccessibleName('Assets')
+
+      const buttons = await mobile.navigationTabs.all()
+      await buttons[0].dragTo(buttons[2], { steps: 5 })
+      await expect(mobile.contentPanel).toHaveAccessibleName('Outputs')
+
+      await mobile.navigateTab('run')
+      await expect(comfyPage.appMode.linearWidgets).toBeInViewport({ ratio: 1 })
+
+      const steps = comfyPage.page.getByRole('spinbutton')
+      const initialValue = Number(await steps.inputValue())
+      await mobile.tap(
+        comfyPage.page.getByRole('button', { name: 'increment' }),
+        { count: 5 }
+      )
+      await expect(steps).toHaveValue(String(initialValue + 5))
+      await mobile.tap(
+        comfyPage.page.getByRole('button', { name: 'decrement' }),
+        { count: 3 }
+      )
+
+      await expect(steps).toHaveValue(String(initialValue + 2))
+    })
+
+    test('workflow selection', async ({ comfyPage }) => {
+      const widgetNames = ['seed', 'steps', 'denoise', 'cfg']
+      for (const name of widgetNames)
+        await comfyPage.appMode.enterAppModeWithInputs([['3', name]])
+      await expect(comfyPage.appMode.mobile.workflows).toBeVisible()
+
+      const widgets = comfyPage.appMode.linearWidgets
+      await comfyPage.appMode.mobile.navigateTab('run')
+      for (let i = 0; i < widgetNames.length; i++) {
+        await comfyPage.appMode.mobile.switchWorkflow(`(${i + 2})`)
+        await expect(widgets.getByText(widgetNames[i])).toBeVisible()
+      }
+    })
+  })
+})
--- a/browser_tests/tests/appModeBuilder.spec.ts
+++ b/browser_tests/tests/appModeBuilder.spec.ts
@@ -0,0 +1,121 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+
+test.describe('App mode builder selection', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.appMode.enableLinearMode()
+  })
+
+  test('Can independently select inputs of same name', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    const items = comfyPage.appMode.select.inputItems
+
+    await comfyPage.vueNodes.selectNodes(['6', '7'])
+    await comfyPage.command.executeCommand('Comfy.Graph.ConvertToSubgraph')
+
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    const prompts = comfyPage.vueNodes
+      .getNodeByTitle('New Subgraph')
+      .locator('.lg-node-widget')
+    const count = await prompts.count()
+    for (let i = 0; i < count; i++) {
+      await expect(prompts.nth(i)).toBeVisible()
+      await prompts.nth(i).click()
+      await expect(items).toHaveCount(i + 1)
+    }
+  })
+
+  test('Can select outputs', async ({ comfyPage }) => {
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToOutputs()
+
+    await comfyPage.nodeOps
+      .getNodeRefById('9')
+      .then((ref) => ref.centerOnNode())
+    const saveImage = await comfyPage.vueNodes.getNodeLocator('9')
+    await saveImage.click()
+
+    const items = comfyPage.appMode.select.inputItems
+    await expect(items).toHaveCount(1)
+  })
+
+  test('Can not select nodes with errors or notes', async ({ comfyPage }) => {
+    //Manually set error state on checkpoint loader
+    //Shouldn't be needed on ci, but has spotty reliability
+    await comfyPage.page.evaluate(() => (graph!.nodes[6].has_errors = true))
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+
+    const items = comfyPage.appMode.select.inputItems
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.appMode.select.selectInputWidget(
+      'Load Checkpoint',
+      'ckpt_name'
+    )
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.workflow.loadWorkflow('nodes/note_nodes')
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.appMode.select.selectInputWidget('Note', 'text')
+    await comfyPage.appMode.select.selectInputWidget('Markdown Note', 'text')
+
+    await expect(items).toHaveCount(0)
+  })
+
+  test('Marks canvas readOnly', async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas is initially editable'
+    ).toHaveCount(1)
+    await comfyPage.page.keyboard.press('Escape')
+
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Entering builder makes the canvas readonly'
+    ).toHaveCount(0)
+
+    await comfyPage.page.keyboard.press('Space')
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas remains readonly after pressing space'
+    ).toHaveCount(0)
+
+    const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+    // oxlint-disable-next-line playwright/no-force-option -- Node container has conditional pointer-events:none that blocks actionability
+    await ksampler.header.dblclick({ force: true })
+    await expect(
+      ksampler.titleEditor.input,
+      'Double clicking node titles will not initiate a rename'
+    ).toBeHidden()
+
+    await comfyPage.page.keyboard.press('Escape')
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas is no longer readonly after exiting'
+    ).toHaveCount(1)
+  })
+})
--- a/browser_tests/tests/assetHelper.spec.ts
+++ b/browser_tests/tests/assetHelper.spec.ts
@@ -133,6 +133,29 @@ test.describe('AssetHelper', () => {
      expect(data.assets[0].id).toBe(STABLE_CHECKPOINT.id)
    })

+    test('GET /assets filters by exclude_tags', async ({
+      comfyPage,
+      assetApi
+    }) => {
+      assetApi.configure(
+        withAsset(STABLE_INPUT_IMAGE),
+        withAsset({
+          ...STABLE_INPUT_IMAGE,
+          id: 'missing-input',
+          tags: ['input', 'missing']
+        })
+      )
+      await assetApi.mock()
+
+      const { body } = await assetApi.fetch(
+        `${comfyPage.url}/api/assets?include_tags=input,&exclude_tags= missing,`
+      )
+      const data = body as { assets: Array<{ id: string }> }
+      expect(data.assets.map((asset) => asset.id)).toEqual([
+        STABLE_INPUT_IMAGE.id
+      ])
+    })
+
    test('GET /assets/:id returns single asset or 404', async ({
      comfyPage,
      assetApi
--- a/browser_tests/tests/cloud-asset-default.spec.ts
+++ b/browser_tests/tests/cloud-asset-default.spec.ts
@@ -1,51 +1,20 @@
 import { expect } from '@playwright/test'
-import type { Route } from '@playwright/test'

-import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
-import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import type { Asset } from '@comfyorg/ingest-types'
+import {
+  assetRequestIncludesTag,
+  createCloudAssetsFixture
+} from '@e2e/fixtures/assetApiFixture'
 import {
  STABLE_CHECKPOINT,
  STABLE_CHECKPOINT_2
 } from '@e2e/fixtures/data/assetFixtures'

-function makeAssetsResponse(assets: Asset[]): ListAssetsResponse {
-  return { assets, total: assets.length, has_more: false }
-}
-
 const CLOUD_ASSETS: Asset[] = [STABLE_CHECKPOINT, STABLE_CHECKPOINT_2]
 const WAITING_FOR_WIDGET_TYPE = 'waiting:type'
 const WAITING_FOR_WIDGET_VALUE = 'waiting:value'

-// Stub /api/assets before the app loads. The local ComfyUI backend has no
-// /api/assets endpoint (returns 503), which poisons the assets store on
-// first load. Narrow pattern avoids intercepting static /assets/*.js bundles.
-//
-// TODO: Consider moving this stub into ComfyPage fixture for all @cloud tests.
-const test = comfyPageFixture.extend<{
-  cloudAssetRequests: string[]
-  stubCloudAssets: void
-}>({
-  cloudAssetRequests: async ({ page: _page }, use) => {
-    await use([])
-  },
-  stubCloudAssets: [
-    async ({ cloudAssetRequests, page }, use) => {
-      const pattern = /\/api\/assets(?:\?.*)?$/
-      const assetsRouteHandler = (route: Route) => {
-        cloudAssetRequests.push(route.request().url())
-        return route.fulfill({
-          status: 200,
-          contentType: 'application/json',
-          body: JSON.stringify(makeAssetsResponse(CLOUD_ASSETS))
-        })
-      }
-      await page.route(pattern, assetsRouteHandler)
-      await use()
-      await page.unroute(pattern, assetsRouteHandler)
-    },
-    { auto: true }
-  ]
-})
+const test = createCloudAssetsFixture(CLOUD_ASSETS)

 test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
  test.afterEach(async ({ comfyPage }) => {
@@ -62,11 +31,9 @@ test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
    // new nodes resolve against the cloud asset list after the fetch.
    await expect
      .poll(() =>
-        cloudAssetRequests.some((url) => {
-          const includeTags =
-            new URL(url).searchParams.get('include_tags') ?? ''
-          return includeTags.split(',').includes('checkpoints')
-        })
+        cloudAssetRequests.some((url) =>
+          assetRequestIncludesTag(url, 'checkpoints')
+        )
      )
      .toBe(true)

--- a/browser_tests/tests/defaultKeybindings.spec.ts
+++ b/browser_tests/tests/defaultKeybindings.spec.ts
@@ -229,9 +229,9 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
      // The dialog appearing proves the keybinding was intercepted by the app.
      await comfyPage.keyboard.press('Control+s')

-      // The Save As dialog should appear (p-dialog overlay)
-      const dialogOverlay = comfyPage.page.locator('.p-dialog-mask')
-      await expect(dialogOverlay).toBeVisible()
+      // The Save As dialog should appear
+      const saveDialog = comfyPage.page.getByRole('dialog')
+      await expect(saveDialog).toBeVisible()

      // Dismiss the dialog
      await comfyPage.keyboard.press('Escape')
--- a/browser_tests/tests/dialogs/publishDialog.spec.ts
+++ b/browser_tests/tests/dialogs/publishDialog.spec.ts
@@ -16,9 +16,9 @@ async function saveAndOpenPublishDialog(
  workflowName: string
 ): Promise<void> {
  await comfyPage.menu.topbar.saveWorkflow(workflowName)
-  const overwriteDialog = comfyPage.page.locator(
-    '.p-dialog:has-text("Overwrite")'
-  )
+  const overwriteDialog = comfyPage.page
+    .getByRole('dialog')
+    .filter({ hasText: 'Overwrite' })
  // Bounded wait: point-in-time isVisible() can miss dialogs that open
  // slightly after saveWorkflow() resolves.
  try {
--- a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png
+++ b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png
--- a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png
+++ b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png
--- a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png
+++ b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png
--- a/browser_tests/tests/keybindingPanel.spec.ts
+++ b/browser_tests/tests/keybindingPanel.spec.ts
@@ -0,0 +1,548 @@
+import type { Locator, Page } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+
+const MULTI_BINDING_COMMAND = 'Comfy.Canvas.DeleteSelectedItems'
+const SINGLE_BINDING_COMMAND = 'Comfy.SaveWorkflow'
+const NO_BINDING_COMMAND = 'TestCommand.KeybindingPanelE2E.NoBinding'
+
+async function searchKeybindings(page: Page, query: string) {
+  await getKeybindingSearchInput(page).fill(query)
+}
+
+async function clearSearch(page: Page) {
+  await getKeybindingSearchInput(page).clear()
+}
+
+function getKeybindingSearchInput(page: Page): Locator {
+  return page.getByPlaceholder('Search Keybindings...')
+}
+
+function getCommandRow(page: Page, commandId: string): Locator {
+  return page
+    .locator('.keybinding-panel tr')
+    .filter({ has: page.locator(`[title="${commandId}"]`) })
+}
+
+function getExpansionContent(page: Page, commandId: string): Locator {
+  // PrimeVue renders the expansion row as the next sibling <tr> of the
+  // expanded row. Scoping by sibling avoids matching unrelated expanded rows.
+  return getCommandRow(page, commandId)
+    .locator('xpath=following-sibling::tr[1]')
+    .getByTestId('keybinding-expansion-content')
+}
+
+async function openContextMenu(page: Page, commandId: string) {
+  const row = getCommandRow(page, commandId)
+  await row.locator(`[title="${commandId}"]`).click({ button: 'right' })
+  await expect(
+    page.getByRole('menuitem', { name: /Change keybinding/i })
+  ).toBeVisible()
+}
+
+function getKeybindingInput(page: Page): Locator {
+  return getEditKeybindingDialog(page).locator('input[autofocus]')
+}
+
+function getEditKeybindingDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Modify keybinding/i })
+}
+
+function getRemoveAllKeybindingsDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Remove all keybindings/i })
+}
+
+function getResetAllKeybindingsDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Reset all keybindings/i })
+}
+
+async function pressComboOnInput(page: Page, combo: string) {
+  const input = getKeybindingInput(page)
+  await expect(input).toBeFocused()
+  await input.press(combo)
+}
+
+async function saveAndCloseKeybindingDialog(page: Page) {
+  const dialog = getEditKeybindingDialog(page)
+  await dialog.getByRole('button', { name: /Save/i }).click()
+  await expect(dialog).toBeHidden()
+}
+
+async function cancelAndCloseDialog(page: Page) {
+  const dialog = getEditKeybindingDialog(page)
+  await dialog.getByRole('button', { name: /Cancel/i }).click()
+  await expect(dialog).toBeHidden()
+}
+
+async function addKeybindingToRow(page: Page, row: Locator, combo: string) {
+  await row.getByRole('button', { name: /Add new keybinding/i }).click()
+  await pressComboOnInput(page, combo)
+  await saveAndCloseKeybindingDialog(page)
+}
+
+test.beforeEach(async ({ comfyPage }) => {
+  await registerNoBindingCommand(comfyPage)
+  await comfyPage.settingDialog.open()
+  await comfyPage.settingDialog.category('Keybinding').click()
+})
+
+test.afterEach(async ({ comfyPage }) => {
+  await comfyPage.settings.setSetting('Comfy.Keybinding.NewBindings', [])
+  await comfyPage.settings.setSetting('Comfy.Keybinding.UnsetBindings', [])
+})
+
+async function registerNoBindingCommand(comfyPage: ComfyPage) {
+  await comfyPage.page.evaluate((commandId) => {
+    const app = window.app!
+    app.registerExtension({
+      name: 'TestExtension.KeybindingPanelE2E',
+      commands: [{ id: commandId, function: () => {} }]
+    })
+  }, NO_BINDING_COMMAND)
+}
+
+test.describe('Keybinding Panel', { tag: '@keyboard' }, () => {
+  test.describe('Row Expansion', () => {
+    test('Click on row with 2+ keybindings toggles expansion', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+      const row = getCommandRow(page, MULTI_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      await row.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      await expect(expansionContent).toBeHidden()
+    })
+
+    test('Click on row with 1 keybinding does not expand', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${SINGLE_BINDING_COMMAND}"]`).click()
+
+      const expansionContent = getExpansionContent(page, SINGLE_BINDING_COMMAND)
+      await expect(expansionContent).toBeHidden()
+    })
+  })
+
+  test.describe('Double-Click', () => {
+    test('Double-click row with 0 keybindings opens Add dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${NO_BINDING_COMMAND}"]`).dblclick()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Double-click row with 1 keybinding opens Edit dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${SINGLE_BINDING_COMMAND}"]`).dblclick()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+  })
+
+  test.describe('Context Menu', () => {
+    test('Right-click row shows context menu with correct items', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      const changeItem = page.getByRole('menuitem', {
+        name: /Change keybinding/i
+      })
+      const addItem = page.getByRole('menuitem', {
+        name: /Add new keybinding/i
+      })
+      const resetItem = page.getByRole('menuitem', {
+        name: /Reset to default/i
+      })
+      const removeItem = page.getByRole('menuitem', {
+        name: /Remove keybinding/i
+      })
+
+      await expect(changeItem).toBeVisible()
+      await expect(addItem).toBeVisible()
+      await expect(resetItem).toBeVisible()
+      await expect(removeItem).toBeVisible()
+
+      await page.keyboard.press('Escape')
+    })
+
+    test("Context menu 'Add new keybinding' opens add dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Add new keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test("Context menu 'Change keybinding' on single-binding command opens edit dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Change keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test("Context menu 'Change keybinding' on multi-binding command expands row", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeHidden()
+
+      await openContextMenu(page, MULTI_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Change keybinding/i }).click()
+
+      await expect(expansionContent).toBeVisible()
+    })
+
+    test("Context menu 'Remove keybinding' after adding second binding shows confirm dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F9')
+
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+      await page.getByRole('menuitem', { name: /Remove keybinding/i }).click()
+
+      const confirmDialog = getRemoveAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await confirmDialog.getByRole('button', { name: /Remove all/i }).click()
+
+      await expect(row.locator('td').nth(1)).toContainText('-')
+    })
+
+    test("Context menu 'Reset to default' resets modified command", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F10')
+
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+      await page.getByRole('menuitem', { name: /Reset to default/i }).click()
+
+      await expect(row.getByRole('button', { name: /Reset/i })).toBeDisabled()
+    })
+
+    test('Context menu items disabled when no keybindings', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      await openContextMenu(page, NO_BINDING_COMMAND)
+
+      const changeItem = page.getByRole('menuitem', {
+        name: /Change keybinding/i
+      })
+      const removeItem = page.getByRole('menuitem', {
+        name: /Remove keybinding/i
+      })
+
+      await expect(changeItem).toHaveAttribute('data-disabled', '')
+      await expect(removeItem).toHaveAttribute('data-disabled', '')
+
+      await page.keyboard.press('Escape')
+    })
+  })
+
+  test.describe('Action Buttons', () => {
+    test('Edit button opens edit dialog for single-binding command', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      const editButton = row.getByRole('button', { name: /^Edit$/i })
+      await expect(editButton).toBeVisible()
+      await editButton.click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Add button opens add dialog', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await row.getByRole('button', { name: /Add new keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Reset button is disabled for unmodified commands', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      const resetButton = row.getByRole('button', { name: /Reset/i })
+      await expect(resetButton).toBeDisabled()
+    })
+
+    test('Reset button resets modified keybinding', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F11')
+
+      const resetButton = row.getByRole('button', { name: /Reset/i })
+      await expect(resetButton).toBeEnabled()
+
+      await resetButton.click()
+
+      await expect(resetButton).toBeDisabled()
+    })
+
+    test('Delete button is disabled for commands with 0 keybindings', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await expect(deleteButton).toBeDisabled()
+    })
+
+    test('Delete button removes single keybinding directly', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F12')
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await expect(deleteButton).toBeEnabled()
+      await deleteButton.click()
+
+      await expect(row.locator('td').nth(1)).toContainText('-')
+    })
+
+    test('Delete button on command with 2+ keybindings shows confirm dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+      const row = getCommandRow(page, MULTI_BINDING_COMMAND)
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await deleteButton.click()
+
+      const confirmDialog = getRemoveAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+
+      await confirmDialog.getByRole('button', { name: /Cancel/i }).click()
+      await expect(confirmDialog).toBeHidden()
+      await expect(row.locator('td').nth(1)).not.toContainText('-')
+    })
+  })
+
+  test.describe('Expanded Row Actions', () => {
+    test('Edit button in expanded row opens edit dialog for that binding', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      const firstBindingRow = expansionContent
+        .getByTestId('keybinding-expansion-binding')
+        .first()
+      await firstBindingRow.getByRole('button', { name: /^Edit$/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Delete button in expanded row removes that binding and collapses', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      const bindingRows = expansionContent.getByTestId(
+        'keybinding-expansion-binding'
+      )
+      await expect
+        .poll(() => bindingRows.count(), {
+          message: 'Expected at least 2 bindings'
+        })
+        .toBeGreaterThanOrEqual(2)
+      const initialBindingCount = await bindingRows.count()
+
+      await bindingRows
+        .first()
+        .getByRole('button', { name: /Remove keybinding/i })
+        .click()
+
+      if (initialBindingCount === 2) {
+        // Expansion auto-collapses when bindings drop below 2
+        await expect(expansionContent).toBeHidden()
+      } else {
+        await expect(bindingRows).toHaveCount(initialBindingCount - 1)
+      }
+    })
+  })
+
+  test.describe('Reset All', () => {
+    test('Reset All button shows confirmation and resets on confirm', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await addKeybindingToRow(page, row, 'Control+Shift+F8')
+
+      await expect(row.getByRole('button', { name: /Reset/i })).toBeEnabled()
+
+      await clearSearch(page)
+
+      const resetAllButton = page
+        .locator('.keybinding-panel')
+        .getByRole('button', { name: /Reset All/i })
+      await resetAllButton.click()
+
+      const confirmDialog = getResetAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await expect(confirmDialog).toContainText(/Reset all keybindings/i)
+
+      await confirmDialog.getByRole('button', { name: /Reset All/i }).click()
+
+      await expect(comfyPage.toast.visibleToasts).toHaveCount(1)
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const rowAfterReset = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(
+        rowAfterReset.getByRole('button', { name: /Reset/i })
+      ).toBeDisabled()
+    })
+
+    test('Reset All confirmation can be cancelled', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      const resetAllButton = page
+        .locator('.keybinding-panel')
+        .getByRole('button', { name: /Reset All/i })
+      await resetAllButton.click()
+
+      const confirmDialog = getResetAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await confirmDialog.getByRole('button', { name: /Cancel/i }).click()
+
+      await expect(confirmDialog).toBeHidden()
+    })
+  })
+
+  test.describe('Search Filter', () => {
+    test('Typing in search clears expanded rows', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      // Changing the filter triggers watch(filters, ...) which clears expansion
+      await searchKeybindings(page, MULTI_BINDING_COMMAND + ' ')
+      await expect(expansionContent).toBeHidden()
+    })
+  })
+})
--- a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png
+++ b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png
--- a/browser_tests/tests/metadataWorkflowImport.spec.ts
+++ b/browser_tests/tests/metadataWorkflowImport.spec.ts
@@ -0,0 +1,62 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+import { metadataFixturePath } from '@e2e/fixtures/utils/paths'
+
+type MetadataFixture = {
+  fileName: string
+  parser: string
+}
+
+// Each fixture embeds the same single-KSampler workflow (see
+// scripts/generate-embedded-metadata-test-files.py), exercising a different
+// parser in src/scripts/metadata/. Dropping the file should import that
+// workflow.
+const FIXTURES: readonly MetadataFixture[] = [
+  { fileName: 'with_metadata.png', parser: 'png' },
+  { fileName: 'with_metadata.avif', parser: 'avif' },
+  { fileName: 'with_metadata.webp', parser: 'webp' },
+  { fileName: 'with_metadata_exif_prefix.webp', parser: 'webp (exif prefix)' },
+  { fileName: 'with_metadata.flac', parser: 'flac' },
+  { fileName: 'with_metadata.mp3', parser: 'mp3' },
+  { fileName: 'with_metadata.opus', parser: 'ogg' },
+  { fileName: 'with_metadata.mp4', parser: 'isobmff' },
+  { fileName: 'with_metadata.webm', parser: 'ebml (webm)' }
+] as const
+
+test.describe(
+  'Metadata drop-to-load workflow import',
+  { tag: ['@workflow'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.nodeOps.clearGraph()
+      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+    })
+
+    for (const { fileName, parser } of FIXTURES) {
+      test(`loads embedded workflow from ${fileName} (${parser})`, async ({
+        comfyPage
+      }) => {
+        await test.step(`drop ${fileName} on canvas`, async () => {
+          await comfyPage.dragDrop.dragAndDropFilePath(
+            metadataFixturePath(fileName)
+          )
+        })
+
+        await test.step('graph contains only the embedded KSampler', async () => {
+          await expect
+            .poll(() => comfyPage.nodeOps.getGraphNodesCount())
+            .toBe(1)
+
+          const ksamplers =
+            await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+          expect(
+            ksamplers,
+            'exactly one KSampler should have been loaded from the fixture'
+          ).toHaveLength(1)
+        })
+      })
+    }
+  }
+)
--- a/browser_tests/tests/nodeBadge.spec.ts
+++ b/browser_tests/tests/nodeBadge.spec.ts
@@ -8,6 +8,9 @@ test.beforeEach(async ({ comfyPage }) => {
  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })

+const DEPRECATED_NODE_TYPE = 'ImageBatch'
+const API_NODE_TYPE = 'FluxProUltraImageNode'
+
 test.describe('Node Badge', { tag: ['@screenshot', '@smoke', '@node'] }, () => {
  test('Can add badge', async ({ comfyPage }) => {
    await comfyPage.page.evaluate(() => {
@@ -141,3 +144,73 @@ test.describe(
    })
  }
 )
+
+for (const vueEnabled of [false, true] as const) {
+  const renderer = vueEnabled ? 'vue' : 'classic'
+  const tag = vueEnabled
+    ? ['@vue-nodes', '@screenshot', '@node']
+    : ['@screenshot', '@node']
+
+  test.describe(`Node lifecycle badge (${renderer})`, { tag }, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Graph.CanvasInfo', false)
+    })
+
+    for (const mode of [NodeBadgeMode.ShowAll, NodeBadgeMode.None] as const) {
+      test(`renders deprecated node with mode=${mode}`, async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.NodeLifeCycleBadgeMode',
+          mode
+        )
+        await comfyPage.nodeOps.clearGraph()
+        await comfyPage.nodeOps.addNode(DEPRECATED_NODE_TYPE, undefined, {
+          x: 100,
+          y: 100
+        })
+        await comfyPage.canvasOps.resetView()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `node-lifecycle-${mode}-${renderer}.png`
+        )
+      })
+    }
+  })
+
+  test.describe(`API pricing badge (${renderer})`, { tag }, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Graph.CanvasInfo', false)
+      await comfyPage.page.evaluate((type) => {
+        const registered = window.LiteGraph!.registered_node_types[type] as {
+          nodeData?: { price_badge?: unknown }
+        }
+        if (!registered?.nodeData) throw new Error(`No nodeData for ${type}`)
+        registered.nodeData.price_badge = {
+          engine: 'jsonata',
+          expr: "{'type': 'text', 'text': '99.9 credits/Run'}",
+          depends_on: { widgets: [], inputs: [], input_groups: [] }
+        }
+      }, API_NODE_TYPE)
+    })
+
+    for (const enabled of [true, false] as const) {
+      test(`renders api node with showApiPricing=${enabled}`, async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.ShowApiPricing',
+          enabled
+        )
+        await comfyPage.nodeOps.clearGraph()
+        await comfyPage.nodeOps.addNode(API_NODE_TYPE, undefined, {
+          x: 100,
+          y: 100
+        })
+        await comfyPage.canvasOps.resetView()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `api-pricing-${enabled ? 'on' : 'off'}-${renderer}.png`
+        )
+      })
+    }
+  })
+}
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-classic-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-classic-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-classic-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-classic-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-classic-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-classic-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-vue-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-vue-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-classic-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-classic-chromium-linux.png
--- a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-vue-chromium-linux.png
+++ b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-vue-chromium-linux.png
--- a/browser_tests/tests/painter.spec.ts
+++ b/browser_tests/tests/painter.spec.ts
@@ -692,19 +692,27 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
    })
  })

-  test('Controls collapse to single column in compact mode', async ({
+  test('Controls stack label above widget in compact mode', async ({
    comfyPage
  }) => {
    const painterWidget = comfyPage.vueNodes
      .getNodeLocator('1')
      .locator('.widget-expands')
    const toolLabel = painterWidget.getByText('Tool', { exact: true })
+    const brushButton = painterWidget.getByText('Brush', { exact: true })

    await expect(
      toolLabel,
-      'tool label should be visible in two-column layout'
+      'tool label should be visible in wide layout'
    ).toBeVisible()

+    const wideLabelBox = await toolLabel.boundingBox()
+    const wideBrushBox = await brushButton.boundingBox()
+    expect(
+      wideLabelBox && wideBrushBox && wideLabelBox.x < wideBrushBox.x,
+      'label should sit to the left of the brush button in wide layout'
+    ).toBe(true)
+
    await comfyPage.page.evaluate(() => {
      const graph = window.graph as TestGraphAccess | undefined
      const node = graph?._nodes_by_id?.['1']
@@ -716,8 +724,22 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {

    await expect(
      toolLabel,
-      'tool label should hide in compact single-column layout'
-    ).toBeHidden()
+      'tool label should remain visible in compact layout'
+    ).toBeVisible()
+
+    await expect
+      .poll(
+        async () => {
+          const labelBox = await toolLabel.boundingBox()
+          const brushBox = await brushButton.boundingBox()
+          if (!labelBox || !brushBox) return false
+          return labelBox.y + labelBox.height <= brushBox.y
+        },
+        {
+          message: 'label should stack above the brush button in compact layout'
+        }
+      )
+      .toBe(true)
  })

  test('Multiple sequential strokes at different positions all accumulate', async ({
--- a/browser_tests/tests/performance.spec.ts
+++ b/browser_tests/tests/performance.spec.ts
@@ -351,6 +351,45 @@ test.describe('Performance', { tag: ['@perf'] }, () => {
    })
  })

+  test(
+    'subgraph transition (enter and exit)',
+    { tag: ['@vue-nodes'] },
+    async ({ comfyPage }, testInfo) => {
+      // Heaviest perf test: loads an 80-node subgraph and pays ~30s/repeat.
+      // The signal is dominated by N=80 mount cost, so a single sample per
+      // CI invocation is sufficient — early-return on subsequent repeats.
+      if (testInfo.repeatEachIndex > 0) return
+
+      // Load workflow with a subgraph containing 80 interior nodes.
+      // Entering the subgraph unmounts root nodes and mounts all 80 interior
+      // nodes synchronously — this is the bottleneck we're measuring.
+      await comfyPage.workflow.loadWorkflow('subgraphs/large-subgraph-80-nodes')
+
+      await comfyPage.idleFrames(30)
+
+      await comfyPage.vueNodes.enterSubgraph()
+      await comfyPage.vueNodes.waitForNodes(80)
+      await comfyPage.idleFrames(30)
+
+      // Exit back to root graph before measuring a fresh enter/exit cycle
+      await comfyPage.subgraph.exitViaBreadcrumb()
+      await comfyPage.idleFrames(10)
+
+      // Start measuring the enter transition
+      await comfyPage.perf.startMeasuring()
+
+      await comfyPage.vueNodes.enterSubgraph()
+      await comfyPage.vueNodes.waitForNodes(80)
+      await comfyPage.idleFrames(30)
+
+      const m = await comfyPage.perf.stopMeasuring('subgraph-transition-enter')
+      recordMeasurement(m)
+      console.log(
+        `Subgraph enter (80 nodes): ${m.taskDurationMs.toFixed(0)}ms task, ${m.layouts} layouts, TBT=${m.totalBlockingTimeMs.toFixed(0)}ms`
+      )
+    }
+  )
+
  test('workflow execution', async ({ comfyPage }) => {
    // Uses lightweight PrimitiveString → PreviewAny workflow (no GPU needed)
    await comfyPage.workflow.loadWorkflow('execution/partial_execution')
--- a/browser_tests/tests/previewAsText.spec.ts
+++ b/browser_tests/tests/previewAsText.spec.ts
@@ -0,0 +1,42 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '../fixtures/ComfyPage'
+
+test.describe('Preview as Text node', () => {
+  test('does not include preview widget values in the API prompt', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.evaluate(() => {
+      const node = window.LiteGraph!.createNode('PreviewAny')!
+      node.pos = [500, 200]
+      window.app!.graph.add(node)
+    })
+
+    // Simulate a previous execution: backend returned text and the frontend
+    // populated the preview widget values. The next prompt submission must
+    // NOT echo those values back as inputs (which would change the cache
+    // signature and trigger a redundant re-execution).
+    await comfyPage.page.evaluate(() => {
+      const node = window.app!.graph.nodes.find((n) => n.type === 'PreviewAny')!
+      for (const widget of node.widgets ?? []) {
+        if (widget.name?.startsWith('preview_')) {
+          widget.value = 'rendered preview content from previous execution'
+        }
+      }
+    })
+
+    const apiWorkflow = await comfyPage.workflow.getExportedWorkflow({
+      api: true
+    })
+
+    const previewEntry = Object.values(apiWorkflow).find(
+      (n) => n.class_type === 'PreviewAny'
+    )
+    expect(previewEntry).toBeDefined()
+
+    expect(previewEntry!.inputs).not.toHaveProperty('preview_markdown')
+    expect(previewEntry!.inputs).not.toHaveProperty('preview_text')
+    expect(previewEntry!.inputs).not.toHaveProperty('previewMode')
+  })
+})
--- a/browser_tests/tests/propertiesPanel/errorsTabCloudMissingModels.spec.ts
+++ b/browser_tests/tests/propertiesPanel/errorsTabCloudMissingModels.spec.ts
@@ -0,0 +1,93 @@
+import { expect } from '@playwright/test'
+
+import type { Asset } from '@comfyorg/ingest-types'
+import {
+  countAssetRequestsByTag,
+  createCloudAssetsFixture
+} from '@e2e/fixtures/assetApiFixture'
+import { TestIds } from '@e2e/fixtures/selectors'
+import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
+
+const WORKFLOW = 'missing/nested_subgraph_installed_model'
+const OUTER_SUBGRAPH_NODE_ID = '205'
+const LOTUS_MODEL_NAME = 'lotus-depth-d-v1-1.safetensors'
+
+const LOTUS_DIFFUSION_MODEL: Asset = {
+  id: 'test-lotus-depth-d-v1-1',
+  name: LOTUS_MODEL_NAME,
+  asset_hash:
+    'blake3:0000000000000000000000000000000000000000000000000000000000000203',
+  size: 1_024,
+  mime_type: 'application/octet-stream',
+  tags: ['models', 'diffusion_models'],
+  created_at: '2026-05-05T00:00:00Z',
+  updated_at: '2026-05-05T00:00:00Z',
+  last_access_time: '2026-05-05T00:00:00Z',
+  user_metadata: {
+    filename: LOTUS_MODEL_NAME
+  }
+}
+
+const test = createCloudAssetsFixture([LOTUS_DIFFUSION_MODEL])
+
+test.describe(
+  'Errors tab - Cloud missing models',
+  { tag: ['@cloud', '@vue-nodes'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.RightSidePanel.ShowErrorsTab',
+        true
+      )
+    })
+
+    test('keeps installed models resolved after returning from a nested subgraph', async ({
+      cloudAssetRequests,
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+      const panel = new PropertiesPanelHelper(comfyPage.page)
+      const errorOverlay = comfyPage.page.getByTestId(
+        TestIds.dialogs.errorOverlay
+      )
+      const errorsTab = panel.root.getByTestId(
+        TestIds.propertiesPanel.errorsTab
+      )
+
+      await expect
+        .poll(
+          () => countAssetRequestsByTag(cloudAssetRequests, 'diffusion_models'),
+          { timeout: 10_000 }
+        )
+        .toBeGreaterThan(0)
+      await expect(errorOverlay).toBeHidden()
+      await panel.open(comfyPage.actionbar.propertiesButton)
+      await expect(errorsTab).toBeHidden()
+      await panel.close()
+
+      await comfyPage.vueNodes.enterSubgraph(OUTER_SUBGRAPH_NODE_ID)
+      await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+      await expect(errorOverlay).toBeHidden()
+
+      const requestCountBeforeRootReturn = countAssetRequestsByTag(
+        cloudAssetRequests,
+        'diffusion_models'
+      )
+
+      await comfyPage.subgraph.exitViaBreadcrumb()
+      await panel.open(comfyPage.actionbar.propertiesButton)
+
+      await expect
+        .poll(
+          () =>
+            countAssetRequestsByTag(cloudAssetRequests, 'diffusion_models') >
+            requestCountBeforeRootReturn,
+          { timeout: 10_000 }
+        )
+        .toBe(true)
+
+      await expect(errorsTab).toBeHidden()
+    })
+  }
+)
--- a/Show More
+++ b/Show More