Revert "fix: update knip package entrypoints"

This reverts commit 711fa84e3c.

.env_example

@@ -46,3 +46,9 @@ ALGOLIA_API_KEY=684d998c36b67a9a9fce8fc2d8860579
 # SENTRY_ORG=comfy-org
 # SENTRY_PROJECT=cloud-frontend-staging
 # SENTRY_PROJECT_PROD= # prod project slug for sourcemap uploads
+
+# Ashby (apps/website careers page build).
+# Server-only; read inside the Astro build context. Do NOT prefix with PUBLIC_.
+# When unset, the committed snapshot at apps/website/src/data/ashby-roles.snapshot.json is used.
+# WEBSITE_ASHBY_API_KEY=
+# WEBSITE_ASHBY_JOB_BOARD_NAME=comfy-org

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

@@ -2,7 +2,7 @@ name: 'CI: Website E2E'
 
 on:
   push:
-    branches: [main, website/*]
+    branches: [main]
     paths:
       - 'apps/website/**'
       - 'packages/design-system/**'
@@ -17,7 +17,7 @@ on:
       - 'pnpm-lock.yaml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.repository }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:

apps/website/.gitignore

@@ -2,6 +2,7 @@ dist/
 .astro/
 test-results/
 playwright-report/
+results.json
 
 # Platform-specific Playwright snapshots (CI runs Linux)
 *-win32.png

apps/website/README.md

@@ -0,0 +1,123 @@
+# @comfyorg/website
+
+Marketing/brand website built with Astro + Vue.
+
+## Ashby careers integration
+
+`/careers` and `/zh-CN/careers` are rendered from Ashby's public job board
+API at build time. Data flow:
+
+1. `src/pages/careers.astro` awaits `fetchRolesForBuild()` during the
+   Astro build.
+2. `src/utils/ashby.ts` calls
+   `GET https://api.ashbyhq.com/posting-api/job-board/{board}?includeCompensation=false`,
+   validates the envelope and each posting with Zod
+   (`src/utils/ashby.schema.ts`), and maps to the domain type in
+   `src/data/roles.ts`.
+3. On any failure (network, HTTP 4xx/5xx, envelope schema drift),
+   the fetcher falls back to the committed JSON snapshot at
+   `src/data/ashby-roles.snapshot.json`.
+4. `src/utils/ashby.ci.ts` emits GitHub Actions annotations and a
+   `$GITHUB_STEP_SUMMARY` block so stale fetches are visible on green
+   builds.
+
+### Required environment variables
+
+Both are build-time only. Never prefix with `PUBLIC_` (Astro would
+inline that into the client bundle).
+
+| Name                           | Purpose                     | Default (when unset)              |
+| ------------------------------ | --------------------------- | --------------------------------- |
+| `WEBSITE_ASHBY_API_KEY`        | Ashby API key (Basic auth)  | Build uses the committed snapshot |
+| `WEBSITE_ASHBY_JOB_BOARD_NAME` | Ashby public job board slug | Build uses the committed snapshot |
+
+### CI wiring (manual step — required)
+
+This repo's `.github/workflows/*.yaml` changes cannot be pushed by a
+GitHub App. A maintainer must apply the following edits **once**:
+
+**`.github/workflows/ci-website-build.yaml`** — pass the env into the
+build step and run the unit tests before it:
+
+```yaml
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
+
+      - name: Run website unit tests
+        run: pnpm --filter @comfyorg/website test:unit
+
+      - name: Build website
+        env:
+          WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
+          WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ vars.WEBSITE_ASHBY_JOB_BOARD_NAME || 'comfy-org' }}
+        run: pnpm --filter @comfyorg/website build
+
+      - name: Verify API key is not leaked into build output
+        env:
+          WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
+        run: |
+          set +x
+          if [ -z "${WEBSITE_ASHBY_API_KEY:-}" ]; then
+            echo "Secret not available in this run; skipping leak check."
+            exit 0
+          fi
+          # grep -rlF prints only file paths (never match content).
+          MATCHES=$(grep -rlF --exclude-dir=node_modules --null \
+            -e "$WEBSITE_ASHBY_API_KEY" apps/website/dist/ 2>/dev/null \
+            | tr '\0' '\n' || true)
+          if [ -n "$MATCHES" ]; then
+            echo "::error title=Ashby API key leaked into build output::$MATCHES"
+            exit 1
+          fi
+```
+
+**`.github/workflows/ci-vercel-website-preview.yaml`** — add the
+two env vars to the top-level `env:` block so `vercel build` (both
+`deploy-preview` and `deploy-production` jobs) sees them:
+
+```yaml
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_WEBSITE_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_WEBSITE_PROJECT_ID }}
+  VERCEL_TOKEN: ${{ secrets.VERCEL_WEBSITE_TOKEN }}
+  VERCEL_SCOPE: comfyui
+  WEBSITE_ASHBY_API_KEY: ${{ secrets.WEBSITE_ASHBY_API_KEY }}
+  WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ vars.WEBSITE_ASHBY_JOB_BOARD_NAME || 'comfy-org' }}
+```
+
+The secret must also be added to the Vercel project environment
+(`vercel env add WEBSITE_ASHBY_API_KEY …` or via the Vercel UI) so
+that `vercel build` in the preview job has access to it.
+
+Fork PRs do not exercise this path: `ci-vercel-website-preview.yaml`
+receives an empty `VERCEL_TOKEN` for forks and fails at `vercel pull`
+before the build runs. Fork-safe PR interactions (the preview-URL
+comment) are handled by `pr-vercel-website-preview.yaml`.
+
+### Refreshing the snapshot
+
+When a maintainer wants to update the committed snapshot (e.g. after
+onboarding/offboarding roles):
+
+```bash
+WEBSITE_ASHBY_API_KEY=… WEBSITE_ASHBY_JOB_BOARD_NAME=comfy-org \
+  pnpm --filter @comfyorg/website ashby:refresh-snapshot
+git commit apps/website/src/data/ashby-roles.snapshot.json
+```
+
+The script exits non-zero on any non-fresh outcome so stale/empty
+snapshots can't be accidentally committed.
+
+## Scripts
+
+- `pnpm dev` — Astro dev server
+- `pnpm build` — production build to `dist/`
+- `pnpm typecheck` — `astro check`
+- `pnpm test:unit` — Vitest unit tests
+- `pnpm test:e2e` — Playwright E2E tests (requires `pnpm build` first)
+- `pnpm ashby:refresh-snapshot` — refresh the committed careers snapshot

apps/website/astro.config.ts

@@ -7,6 +7,12 @@ export default defineConfig({
   site: 'https://comfy.org',
   output: 'static',
   prefetch: { prefetchAll: true },
+  redirects: {
+    '/cloud/enterprise-case-studies/comfyui-at-architectural-scale-how-moment-factory-reimagined-3d-projection-mapping':
+      '/customers/moment-factory/',
+    '/cloud/enterprise-case-studies/how-series-entertainment-rebuilt-game-and-video-production-with-comfyui':
+      '/customers/series-entertainment/'
+  },
   build: {
     assets: '_website'
   },

apps/website/e2e/careers.spec.ts

@@ -0,0 +1,57 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+test.describe('Careers page @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/careers')
+  })
+
+  test('has correct title', async ({ page }) => {
+    await expect(page).toHaveTitle('Careers — Comfy')
+  })
+
+  test('Roles section heading is visible', async ({ page }) => {
+    await expect(
+      page.getByRole('heading', { name: 'Roles', level: 2 })
+    ).toBeVisible()
+  })
+
+  test('renders at least one role from the snapshot', async ({ page }) => {
+    const roles = page.getByTestId('careers-role-link')
+    await expect(roles.first()).toBeVisible()
+    expect(await roles.count()).toBeGreaterThan(0)
+  })
+
+  test('each role links to jobs.ashbyhq.com', async ({ page }) => {
+    const roles = page.getByTestId('careers-role-link')
+    const count = await roles.count()
+    for (let i = 0; i < count; i++) {
+      const href = await roles.nth(i).getAttribute('href')
+      expect(href).toMatch(/^https:\/\/jobs\.ashbyhq\.com\//)
+    }
+  })
+
+  test('ENGINEERING category filter narrows the role list', async ({
+    page
+  }) => {
+    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)
+  })
+})
+
+test.describe('Careers page (zh-CN) @smoke', () => {
+  test('renders localized heading and roles', async ({ page }) => {
+    await page.goto('/zh-CN/careers')
+    await expect(page).toHaveTitle('招聘 — Comfy')
+    await expect(
+      page.getByRole('heading', { name: '职位', level: 2 })
+    ).toBeVisible()
+    await expect(page.getByTestId('careers-role-link').first()).toBeVisible()
+  })
+})

apps/website/package.json

@@ -9,10 +9,13 @@
     "build": "astro build",
     "preview": "astro preview",
     "typecheck": "astro check",
+    "test:unit": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "test:e2e": "playwright test",
     "test:e2e:local": "cross-env PLAYWRIGHT_LOCAL=1 playwright test",
     "test:visual": "playwright test --project visual",
-    "test:visual:update": "playwright test --project visual --update-snapshots"
+    "test:visual:update": "playwright test --project visual --update-snapshots",
+    "ashby:refresh-snapshot": "tsx ./scripts/refresh-ashby-snapshot.ts"
   },
   "dependencies": {
     "@astrojs/sitemap": "catalog:",
@@ -23,7 +26,8 @@
     "cva": "catalog:",
     "gsap": "catalog:",
     "lenis": "catalog:",
-    "vue": "catalog:"
+    "vue": "catalog:",
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@astrojs/check": "catalog:",
@@ -32,7 +36,9 @@
     "@tailwindcss/vite": "catalog:",
     "astro": "catalog:",
     "tailwindcss": "catalog:",
-    "typescript": "catalog:"
+    "tsx": "catalog:",
+    "typescript": "catalog:",
+    "vitest": "catalog:"
   },
   "nx": {
     "tags": [
@@ -89,6 +95,22 @@
           "command": "astro check"
         }
       },
+      "test:unit": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "vitest run"
+        }
+      },
+      "test:coverage": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "vitest run --coverage"
+        }
+      },
       "test:e2e": {
         "executor": "nx:run-commands",
         "dependsOn": [

apps/website/scripts/refresh-ashby-snapshot.ts

@@ -0,0 +1,33 @@
+import { renameSync, writeFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+import { fetchRolesForBuild } from '../src/utils/ashby'
+
+const snapshotPath = fileURLToPath(
+  new URL('../src/data/ashby-roles.snapshot.json', import.meta.url)
+)
+const tempPath = `${snapshotPath}.tmp`
+
+const outcome = await fetchRolesForBuild()
+
+if (outcome.status !== 'fresh') {
+  const reason = 'reason' in outcome ? outcome.reason : '(none)'
+  console.error(
+    `Snapshot refresh aborted. Outcome: ${outcome.status}; reason: ${reason}`
+  )
+  process.exit(1)
+}
+
+writeFileSync(
+  tempPath,
+  JSON.stringify(outcome.snapshot, null, 2) + '\n',
+  'utf8'
+)
+renameSync(tempPath, snapshotPath)
+const totalRoles = outcome.snapshot.departments.reduce(
+  (n, d) => n + d.roles.length,
+  0
+)
+process.stdout.write(
+  `Wrote snapshot with ${totalRoles} role(s) to ${snapshotPath}\n`
+)

apps/website/src/components/about/StorySection.vue

@@ -0,0 +1,104 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const investors = [
+  { name: 'CRAFT', icon: '/icons/investors/craft.svg' },
+  { name: 'PACE CAPITAL', icon: '/icons/investors/pace-capital.svg' },
+  { name: 'chemistry_', icon: '/icons/investors/chemistry.svg' },
+  { name: 'ABSTRACT', icon: '/icons/investors/abstract.svg' },
+  { name: 'TRUARROW PARTNERS', icon: '/icons/investors/truarrow-partners.svg' },
+  { name: 'ESSENCE', icon: '/icons/investors/essence.svg' }
+]
+</script>
+
+<template>
+  <section class="px-6 py-24 lg:px-20 lg:py-32">
+    <div class="mx-auto text-center">
+      <span
+        class="text-primary-comfy-yellow text-xs font-semibold tracking-widest uppercase"
+      >
+        {{ t('about.story.label', locale) }}
+      </span>
+      <h2
+        class="text-primary-comfy-canvas mt-6 text-3xl font-light lg:text-5xl"
+      >
+        {{ t('about.story.headingBefore', locale)
+        }}<span class="text-primary-comfy-yellow">{{
+          t('about.story.headingHighlight', locale)
+        }}</span
+        >{{ t('about.story.headingAfter', locale) }}
+      </h2>
+      <p class="text-primary-warm-white mt-8 text-base/relaxed lg:text-lg">
+        {{ t('about.story.body', locale) }}
+      </p>
+    </div>
+
+    <!-- Investor card -->
+    <div
+      class="mx-auto mt-16 max-w-5xl rounded-4xl border border-white/10 bg-black/30 p-8 lg:p-12"
+    >
+      <div class="inline-flex items-center">
+        <!-- OUR badge (shorter) -->
+        <div class="relative z-10 flex h-9 items-center">
+          <img src="/icons/node-left.svg" alt="" class="h-full w-auto" />
+          <span
+            class="bg-primary-comfy-yellow text-primary-comfy-ink flex h-full items-center px-2 text-sm font-bold tracking-wider"
+          >
+            OUR
+          </span>
+        </div>
+        <!-- Union connector (overlaps both badges to eliminate seams) -->
+        <img
+          src="/icons/node-union-2size-reverse.svg"
+          alt=""
+          class="relative z-20 -mx-px h-12 w-auto"
+        />
+        <!-- INVESTORS badge (taller) -->
+        <div class="relative z-10 flex h-12 items-center">
+          <span
+            class="bg-primary-comfy-yellow text-primary-comfy-ink flex h-full items-center px-3 text-lg font-bold tracking-wider"
+          >
+            INVESTORS
+          </span>
+          <img src="/icons/node-right.svg" alt="" class="h-full w-auto" />
+        </div>
+      </div>
+      <p
+        class="text-primary-warm-white mt-6 max-w-3xl text-sm/relaxed lg:text-base"
+      >
+        {{ t('about.story.investorsBody', locale) }}
+      </p>
+      <div class="mt-10 grid grid-cols-2 gap-4 sm:grid-cols-3 lg:gap-6">
+        <div
+          v-for="investor in investors"
+          :key="investor.name"
+          class="flex h-16 items-center justify-center rounded-xl border border-white/10 bg-white/5 px-4"
+        >
+          <img
+            :src="investor.icon"
+            :alt="investor.name"
+            class="max-h-8 w-auto"
+          />
+        </div>
+      </div>
+    </div>
+
+    <!-- Quote card -->
+    <div
+      class="bg-primary-comfy-yellow mx-auto mt-12 max-w-5xl rounded-4xl p-10 lg:p-16"
+    >
+      <p class="text-primary-comfy-ink text-xl/relaxed font-medium lg:text-3xl">
+        {{ t('about.quote.text', locale) }}
+      </p>
+      <p
+        class="text-primary-comfy-ink/70 mt-8 text-sm font-semibold lg:text-base"
+      >
+        {{ t('about.quote.attribution', locale) }}
+      </p>
+    </div>
+  </section>
+</template>

apps/website/src/components/careers/RolesSection.vue

@@ -1,121 +1,42 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 
+import type { Department } from '../../data/roles'
 import type { Locale } from '../../i18n/translations'
 
 import { t } from '../../i18n/translations'
 import CategoryNav from '../common/CategoryNav.vue'
 import SectionLabel from '../common/SectionLabel.vue'
 
-const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+const { locale = 'en', departments = [] } = defineProps<{
+  locale?: Locale
+  departments?: readonly Department[]
+}>()
 
 const activeCategory = ref('all')
 
-interface Role {
-  title: string
-  department: string
-  location: string
-  id: string
-}
-
-interface Department {
-  name: string
-  key: string
-  roles: Role[]
-}
-
-const departments: Department[] = [
-  {
-    name: 'ENGINEERING',
-    key: 'engineering',
-    roles: [
-      {
-        title: 'Design Engineer',
-        department: 'Engineering',
-        location: 'San Francisco',
-        id: 'abc787b9-ad85-421c-8218-debd23bea096'
-      },
-      {
-        title: 'Software Engineer',
-        department: 'Engineering',
-        location: 'San Francisco',
-        id: '99dc26c7-51ca-43cd-a1ba-7d475a0f4a40'
-      },
-      {
-        title: 'Product Manager',
-        department: 'Engineering',
-        location: 'London, UK',
-        id: '12dbc26e-9f6d-49bf-83c6-130f7566d03c'
-      },
-      {
-        title: 'Tech Lead Manager, Frontend',
-        department: 'Engineering',
-        location: 'San Francisco',
-        id: 'a0665088-3314-457a-aa7b-12ca5c3eb261'
-      }
-    ]
-  },
-  {
-    name: 'DESIGN',
-    key: 'design',
-    roles: [
-      {
-        title: 'Creative Director',
-        department: 'Design',
-        location: 'San Francisco',
-        id: '49fa0b07-3fa1-4a3a-b2c6-d2cc684ad63f'
-      },
-      {
-        title: 'Graphic Designer',
-        department: 'Design',
-        location: 'London, UK',
-        id: '19ba10aa-4961-45e8-8473-66a8a7a8079d'
-      },
-      {
-        title: 'Freelance Motion Designer',
-        department: 'Design',
-        location: 'Remote',
-        id: 'a7ccc2b4-4d9d-4e04-b39c-28a711995b5b'
-      }
-    ]
-  },
-  {
-    name: 'MARKETING',
-    key: 'marketing',
-    roles: [
-      {
-        title: 'Lifecycle Growth Marketer',
-        department: 'Marketing',
-        location: 'San Francisco',
-        id: 'be74d210-3b50-408c-9f61-8fee8833ce64'
-      },
-      {
-        title: 'Graphic Designer',
-        department: 'Marketing',
-        location: 'London, UK',
-        id: '28dea965-662b-4786-b024-c9a1b6bc1f23'
-      }
-    ]
-  }
-]
+const visibleDepartments = computed(() =>
+  departments.filter((d) => d.roles.length > 0)
+)
 
 const categories = computed(() => [
   { label: 'ALL', value: 'all' },
-  ...departments.map((d) => ({ label: d.name, value: d.key }))
+  ...visibleDepartments.value.map((d) => ({ label: d.name, value: d.key }))
 ])
 
 const filteredDepartments = computed(() =>
   activeCategory.value === 'all'
-    ? departments
-    : departments.filter((d) => d.key === activeCategory.value)
+    ? visibleDepartments.value
+    : visibleDepartments.value.filter((d) => d.key === activeCategory.value)
 )
+
+const hasRoles = computed(() => visibleDepartments.value.length > 0)
 </script>
 
 <template>
-  <section class="px-6 py-20 md:px-20 md:py-32">
+  <section class="px-6 py-20 md:px-20 md:py-32" data-testid="careers-roles">
     <div class="mx-auto max-w-6xl">
       <div class="flex flex-col gap-12 md:flex-row md:gap-20">
-        <!-- Left sidebar -->
         <div class="shrink-0 md:w-48">
           <div
             class="bg-primary-comfy-ink sticky top-20 z-10 py-4 md:top-28 md:py-0"
@@ -126,6 +47,7 @@ const filteredDepartments = computed(() =>
               {{ t('careers.roles.heading', locale) }}
             </h2>
             <CategoryNav
+              v-if="hasRoles"
               v-model="activeCategory"
               :categories="categories"
               class="mt-4"
@@ -133,8 +55,15 @@ const filteredDepartments = computed(() =>
           </div>
         </div>
 
-        <!-- Role listings -->
         <div class="min-w-0 flex-1">
+          <p
+            v-if="!hasRoles"
+            class="text-primary-warm-gray text-base md:text-lg"
+            data-testid="careers-roles-empty"
+          >
+            {{ t('careers.roles.empty', locale) }}
+          </p>
+
           <div
             v-for="dept in filteredDepartments"
             :key="dept.key"
@@ -147,10 +76,11 @@ const filteredDepartments = computed(() =>
             <a
               v-for="role in dept.roles"
               :key="role.id"
-              :href="`https://jobs.ashbyhq.com/comfy-org/${role.id}`"
+              :href="role.applyUrl"
               target="_blank"
               rel="noopener noreferrer"
               class="border-primary-warm-gray/20 group flex items-center justify-between border-b py-5"
+              data-testid="careers-role-link"
             >
               <div class="min-w-0">
                 <span

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

@@ -223,7 +223,7 @@ onUnmounted(() => {
 
       <div class="mt-8 flex flex-col gap-4 lg:flex-row">
         <BrandButton
-          :href="externalLinks.platform"
+          :href="externalLinks.apiKeys"
           size="lg"
           class="text-center lg:min-w-60 lg:p-4"
         >

apps/website/src/components/product/api/StepsSection.vue

@@ -13,13 +13,13 @@ const steps = [
     number: '01',
     titleKey: 'api.steps.step1.title' as const,
     descriptionKey: 'api.steps.step1.description' as const,
-    image: 'https://media.comfy.org/website/api/logo-purple.webp'
+    image: 'https://media.comfy.org/website/enterprise/enterprise_node_1.webp'
   },
   {
     number: '02',
     titleKey: 'api.steps.step2.title' as const,
     descriptionKey: 'api.steps.step2.description' as const,
-    image: 'https://media.comfy.org/website/api/logo-yellow.webp'
+    image: 'https://media.comfy.org/website/enterprise/enterprise_node_2.webp'
   },
   {
     number: '03',
@@ -61,7 +61,7 @@ const steps = [
         class="mt-12 flex flex-col items-center gap-4 lg:flex-row lg:justify-center"
       >
         <BrandButton
-          :href="externalLinks.cloud"
+          :href="externalLinks.apiKeys"
           variant="solid"
           size="lg"
           class="w-full text-center lg:w-auto lg:min-w-48"
@@ -69,7 +69,7 @@ const steps = [
           {{ t('api.hero.getApiKeys', locale) }}
         </BrandButton>
         <BrandButton
-          :href="externalLinks.docs"
+          :href="externalLinks.docsApi"
           variant="outline"
           size="lg"
           class="w-full text-center lg:w-auto lg:min-w-48"

apps/website/src/components/product/enterprise/BYOKeySection.vue

@@ -10,12 +10,12 @@ const cards = [
   {
     titleKey: 'enterprise.byoKey.card1.title' as const,
     descriptionKey: 'enterprise.byoKey.card1.description' as const,
-    image: 'https://media.comfy.org/website/api/logo-purple.webp'
+    image: 'https://media.comfy.org/website/enterprise/enterprise_node_1.webp'
   },
   {
     titleKey: 'enterprise.byoKey.card2.title' as const,
     descriptionKey: 'enterprise.byoKey.card2.description' as const,
-    image: 'https://media.comfy.org/website/api/logo-yellow.webp'
+    image: 'https://media.comfy.org/website/enterprise/enterprise_node_2.webp'
   }
 ]
 </script>

apps/website/src/components/product/enterprise/DataOwnershipSection.vue

@@ -16,9 +16,11 @@ const midRightRef = ref<HTMLElement>()
 const bottomLeftRef = ref<HTMLElement>()
 const bottomRightRef = ref<HTMLElement>()
 
-useParallax([topLeftRef, topRightRef], { trigger: sectionRef, y: 200 })
-useParallax([midLeftRef, midRightRef], { trigger: sectionRef, y: 300 })
-useParallax([bottomLeftRef, bottomRightRef], { trigger: sectionRef, y: 400 })
+const parallaxOpts = { trigger: sectionRef, mediaQuery: '(min-width: 1024px)' }
+
+useParallax([topLeftRef, topRightRef], { ...parallaxOpts, y: 200 })
+useParallax([midLeftRef, midRightRef], { ...parallaxOpts, y: 300 })
+useParallax([bottomLeftRef, bottomRightRef], { ...parallaxOpts, y: 400 })
 </script>
 
 <template>

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

@@ -44,162 +44,303 @@ onMounted(() => {
       <svg
         ref="svgRef"
         class="block size-full"
-        viewBox="600 -50 1000 1100"
+        viewBox="0 0 1600 1046"
         fill="none"
         aria-hidden="true"
       >
-        <!-- Ripple rings -->
-        <path
-          class="ripple-path"
-          d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
-          stroke="#4D3762"
-          stroke-width="2"
-        />
-        <path
-          class="ripple-path ripple-delay-1"
-          d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
-          stroke="#4D3762"
-          stroke-width="2"
-        />
-        <path
-          class="ripple-path ripple-delay-2"
-          d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
-          stroke="#4D3762"
-          stroke-width="2"
-        />
-        <path
-          class="ripple-path ripple-delay-3"
-          d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
-          stroke="#4D3762"
-          stroke-width="2"
-        />
+        <g clip-path="url(#enterpriseHeroClip)">
+          <rect width="1600" height="1046" fill="#211927" />
+          <rect
+            width="800"
+            height="800"
+            transform="translate(712 112)"
+            fill="#211927"
+          />
 
-        <!-- Exploding block cluster -->
-        <g stroke="#4D3762" stroke-width="2">
+          <!-- Ripple rings -->
           <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"
-            fill="#37303F"
+            class="ripple-path"
+            d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
+            stroke="#4D3762"
+            stroke-width="2"
           />
           <path
-            class="block-piece"
-            d="M1098.58 681.434L1098.6 627.449C1098.6 620.273 1093.57 611.548 1087.35 607.961L1040.62 580.981C1036.69 578.709 1029.61 578.814 1025.68 581.087L978.934 608.092C972.72 611.682 967.681 620.409 967.679 627.586L967.665 681.57C967.664 686.114 971.111 692.292 975.046 694.564L1021.78 721.544C1027.99 725.131 1038.06 725.128 1044.28 721.538L1091.02 694.534C1094.96 692.256 1098.58 685.986 1098.58 681.434Z"
-            fill="#251D2B"
+            class="ripple-path delay-1"
+            d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
+            stroke="#4D3762"
+            stroke-width="2"
           />
           <path
-            class="block-piece"
-            d="M1205.98 635.714L1205.97 581.73C1205.97 574.553 1211 565.828 1217.21 562.241L1263.94 535.261C1267.88 532.989 1274.95 533.095 1278.89 535.367L1325.63 562.372C1331.85 565.962 1336.89 574.69 1336.89 581.866L1336.9 635.851C1336.9 640.394 1333.46 646.573 1329.52 648.844L1282.79 675.824C1276.58 679.411 1266.5 679.408 1260.29 675.818L1213.54 648.814C1209.6 646.537 1205.98 640.266 1205.98 635.714Z"
-            fill="#37303F"
+            class="ripple-path delay-2"
+            d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
+            stroke="#4D3762"
+            stroke-width="2"
           />
           <path
-            class="block-piece"
-            d="M1125.83 681.434L1125.81 627.45C1125.81 620.273 1130.84 611.548 1137.06 607.961L1183.79 580.981C1187.72 578.71 1194.8 578.815 1198.73 581.087L1245.48 608.092C1251.69 611.682 1256.73 620.41 1256.73 627.586L1256.75 681.571C1256.75 686.114 1253.3 692.293 1249.36 694.565L1202.63 721.545C1196.42 725.131 1186.35 725.128 1180.13 721.539L1133.39 694.534C1129.45 692.257 1125.83 685.987 1125.83 681.434Z"
-            fill="#251D2B"
+            class="ripple-path delay-3"
+            d="M862.278 684.584L1064.22 801.244C1091.06 816.752 1134.58 816.764 1161.41 801.27L1363.29 684.716C1380.29 674.902 1395.18 648.204 1395.17 628.577L1395.11 395.363C1395.1 364.36 1373.34 326.656 1346.49 311.148L1144.55 194.488C1127.56 184.67 1097 184.223 1080 194.037L878.12 310.591C851.283 326.085 829.535 363.778 829.543 394.78L829.604 627.993C829.61 647.659 845.248 674.747 862.278 684.584Z"
+            stroke="#4D3762"
+            stroke-width="2"
           />
-          <path
-            class="block-piece"
-            d="M1045.67 726.53L1045.66 672.545C1045.65 665.369 1050.69 656.644 1056.9 653.057L1103.63 626.077C1107.57 623.805 1114.64 623.911 1118.57 626.183L1165.32 653.188C1171.53 656.778 1176.57 665.506 1176.57 672.682L1176.59 726.667C1176.59 731.21 1173.14 737.388 1169.21 739.66L1122.48 766.64C1116.26 770.227 1106.19 770.224 1099.98 766.634L1053.23 739.63C1049.29 737.353 1045.67 731.082 1045.67 726.53Z"
-            fill="#37303F"
-          />
-          <path
-            class="block-piece"
-            d="M1175.17 536.369L1175.18 482.384C1175.19 475.208 1170.15 466.483 1163.94 462.896L1117.21 435.916C1113.27 433.644 1106.2 433.749 1102.27 436.022L1055.52 463.027C1049.31 466.617 1044.27 475.344 1044.27 482.521L1044.25 536.506C1044.25 541.049 1047.7 547.227 1051.63 549.499L1098.36 576.479C1104.58 580.066 1114.65 580.063 1120.86 576.473L1167.61 549.469C1171.55 547.191 1175.17 540.921 1175.17 536.369Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1052.83 458.666L1099.57 485.671C1105.79 489.261 1115.86 489.263 1122.07 485.677L1168.8 458.697C1172.74 456.425 1176.19 450.245 1176.18 445.702L1176.17 391.717C1176.17 384.54 1171.13 375.812 1164.92 372.223L1118.17 345.218C1114.24 342.945 1107.16 342.842 1103.23 345.114L1056.5 372.094C1050.28 375.68 1045.25 384.405 1045.25 391.582L1045.27 445.566C1045.27 450.119 1048.89 456.389 1052.83 458.666Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1247.76 420.64L1201.02 393.635C1194.81 390.045 1184.73 390.043 1178.52 393.629L1131.79 420.609C1127.85 422.881 1124.41 429.061 1124.41 433.604L1124.42 487.589C1124.43 494.766 1129.46 503.493 1135.68 507.083L1182.42 534.088C1186.36 536.361 1193.43 536.464 1197.37 534.192L1244.1 507.212C1250.31 503.626 1255.34 494.901 1255.34 487.724L1255.33 433.74C1255.33 429.187 1251.71 422.917 1247.76 420.64Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M975.833 420.641L1022.58 393.636C1028.79 390.047 1038.87 390.044 1045.08 393.63L1091.81 420.61C1095.74 422.882 1099.19 429.062 1099.19 433.606L1099.17 487.59C1099.17 494.767 1094.13 503.495 1087.92 507.085L1041.17 534.089C1037.24 536.362 1030.17 536.465 1026.23 534.194L979.501 507.214C973.288 503.627 968.254 494.902 968.256 487.725L968.27 433.741C968.271 429.188 971.891 422.918 975.833 420.641Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1018.03 536.368L1018.04 482.384C1018.04 475.207 1013.01 466.482 1006.8 462.895L960.065 435.915C956.13 433.644 949.055 433.749 945.121 436.021L898.376 463.026C892.162 466.616 887.123 475.344 887.121 482.52L887.106 536.505C887.105 541.048 890.553 547.227 894.488 549.499L941.218 576.479C947.431 580.065 957.504 580.062 963.718 576.473L1010.46 549.468C1014.4 547.191 1018.02 540.921 1018.03 536.368Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1098.18 582.085L1098.19 528.1C1098.19 520.924 1093.16 512.199 1086.95 508.612L1040.22 481.632C1036.28 479.36 1029.21 479.465 1025.27 481.738L978.528 508.743C972.314 512.333 967.275 521.061 967.273 528.237L967.259 582.222C967.257 586.765 970.705 592.943 974.64 595.215L1021.37 622.195C1027.58 625.782 1037.66 625.779 1043.87 622.189L1090.62 595.185C1094.56 592.907 1098.18 586.637 1098.18 582.085Z"
-            fill="#F2FF59"
-          />
-          <path
-            class="block-piece"
-            d="M1125.42 582.085L1125.4 528.101C1125.4 520.924 1130.43 512.199 1136.65 508.613L1183.38 481.633C1187.31 479.361 1194.39 479.466 1198.32 481.739L1245.07 508.743C1251.28 512.333 1256.32 521.061 1256.32 528.238L1256.34 582.222C1256.34 586.766 1252.89 592.944 1248.95 595.216L1202.22 622.196C1196.01 625.782 1185.94 625.78 1179.72 622.19L1132.98 595.185C1129.04 592.908 1125.42 586.638 1125.42 582.085Z"
-            fill="#F2FF59"
-          />
-          <path
-            class="block-piece"
-            d="M1205.57 536.367L1205.56 482.383C1205.56 475.206 1210.59 466.481 1216.8 462.894L1263.53 435.914C1267.47 433.643 1274.54 433.748 1278.48 436.02L1325.22 463.025C1331.44 466.615 1336.48 475.343 1336.48 482.519L1336.49 536.504C1336.49 541.047 1333.04 547.226 1329.11 549.497L1282.38 576.477C1276.17 580.064 1266.09 580.061 1259.88 576.471L1213.13 549.467C1209.19 547.19 1205.57 540.919 1205.57 536.367Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1045.26 627.181L1045.25 573.197C1045.24 566.02 1050.28 557.295 1056.49 553.709L1103.22 526.729C1107.16 524.457 1114.23 524.562 1118.16 526.835L1164.91 553.839C1171.12 557.429 1176.16 566.157 1176.16 573.333L1176.18 627.318C1176.18 631.862 1172.73 638.04 1168.8 640.312L1122.07 667.292C1115.85 670.878 1105.78 670.876 1099.57 667.286L1052.82 640.281C1048.88 638.004 1045.26 631.734 1045.26 627.181Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1175.17 445.81L1175.18 391.826C1175.18 384.649 1170.15 375.924 1163.94 372.337L1117.21 345.357C1113.27 343.086 1106.2 343.191 1102.26 345.464L1055.52 372.468C1049.3 376.058 1044.26 384.786 1044.26 391.962L1044.25 445.947C1044.25 450.49 1047.69 456.669 1051.63 458.941L1098.36 485.921C1104.57 489.507 1114.64 489.505 1120.86 485.915L1167.6 458.91C1171.55 456.633 1175.17 450.363 1175.17 445.81Z"
-            fill="#F2FF59"
-          />
-          <path
-            class="block-piece"
-            d="M1098.17 491.528L1098.18 437.544C1098.19 430.367 1093.15 421.642 1086.94 418.056L1040.21 391.076C1036.27 388.804 1029.2 388.909 1025.27 391.182L978.52 418.186C972.306 421.776 967.267 430.504 967.265 437.681L967.251 491.665C967.25 496.209 970.697 502.387 974.632 504.659L1021.36 531.639C1027.58 535.225 1037.65 535.223 1043.86 531.633L1090.61 504.628C1094.55 502.351 1098.17 496.081 1098.17 491.528Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1247.76 330.081L1201.02 303.077C1194.81 299.487 1184.73 299.484 1178.52 303.071L1131.79 330.051C1127.85 332.322 1124.41 338.502 1124.41 343.046L1124.42 397.031C1124.43 404.207 1129.46 412.935 1135.67 416.525L1182.42 443.529C1186.35 445.802 1193.43 445.906 1197.36 443.634L1244.09 416.654C1250.31 413.067 1255.34 404.342 1255.34 397.166L1255.32 343.181C1255.32 338.629 1251.7 332.358 1247.76 330.081Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M975.826 330.082L1022.57 303.078C1028.78 299.488 1038.86 299.485 1045.07 303.072L1091.8 330.052C1095.74 332.323 1099.18 338.503 1099.18 343.047L1099.17 397.032C1099.16 404.208 1094.13 412.936 1087.91 416.526L1041.17 443.53C1037.23 445.803 1030.16 445.907 1026.22 443.635L979.493 416.655C973.281 413.068 968.246 404.343 968.248 397.167L968.262 343.182C968.263 338.63 971.884 332.359 975.826 330.082Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1018.02 445.809L1018.04 391.825C1018.04 384.649 1013 375.923 1006.79 372.337L960.061 345.357C956.126 343.085 949.051 343.19 945.117 345.463L898.372 372.468C892.158 376.057 887.119 384.785 887.117 391.962L887.103 445.946C887.101 450.49 890.549 456.668 894.484 458.94L941.215 485.92C947.427 489.507 957.5 489.504 963.714 485.914L1010.46 458.909C1014.4 456.632 1018.02 450.362 1018.02 445.809Z"
-            fill="#37303F"
-          />
-          <path
-            class="block-piece"
-            d="M1205.57 445.809L1205.55 391.824C1205.55 384.648 1210.59 375.923 1216.8 372.336L1263.53 345.356C1267.46 343.084 1274.54 343.189 1278.47 345.462L1325.22 372.467C1331.43 376.057 1336.47 384.784 1336.47 391.961L1336.49 445.946C1336.49 450.489 1333.04 456.667 1329.11 458.939L1282.38 485.919C1276.16 489.506 1266.09 489.503 1259.88 485.913L1213.13 458.909C1209.19 456.631 1205.57 450.361 1205.57 445.809Z"
-            fill="#37303F"
-          />
-          <path
-            class="block-piece"
-            d="M1125.41 491.529L1125.4 437.544C1125.4 430.368 1130.43 421.643 1136.64 418.056L1183.37 391.076C1187.31 388.804 1194.38 388.91 1198.32 391.182L1245.06 418.187C1251.28 421.777 1256.32 430.505 1256.32 437.681L1256.33 491.666C1256.33 496.209 1252.88 502.387 1248.95 504.659L1202.22 531.639C1196.01 535.226 1185.93 535.223 1179.72 531.633L1132.97 504.629C1129.03 502.352 1125.41 496.081 1125.41 491.529Z"
-            fill="#251D2B"
-          />
-          <path
-            class="block-piece"
-            d="M1045.26 536.625L1045.24 482.64C1045.24 475.464 1050.27 466.738 1056.49 463.152L1103.22 436.172C1107.15 433.9 1114.23 434.005 1118.16 436.278L1164.91 463.283C1171.12 466.873 1176.16 475.6 1176.16 482.777L1176.17 536.761C1176.18 541.305 1172.73 547.483 1168.79 549.755L1122.06 576.735C1115.85 580.322 1105.78 580.319 1099.56 576.729L1052.82 549.725C1048.88 547.447 1045.26 541.177 1045.26 536.625Z"
-            fill="#37303F"
-          />
-          <path
-            class="block-piece"
-            d="M1052.82 368.108L1099.57 395.112C1105.78 398.702 1115.85 398.705 1122.07 395.118L1168.8 368.138C1172.73 365.866 1176.18 359.686 1176.18 355.143L1176.16 301.158C1176.16 293.982 1171.12 285.254 1164.91 281.664L1118.16 254.659C1114.23 252.387 1107.15 252.283 1103.22 254.555L1056.49 281.535C1050.28 285.122 1045.24 293.847 1045.24 301.023L1045.26 355.008C1045.26 359.56 1048.88 365.83 1052.82 368.108Z"
-            fill="#37303F"
+
+          <!-- Exploding block cluster -->
+          <g class="block-cluster">
+            <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"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1098.58 681.434L1098.6 627.449C1098.6 620.273 1093.57 611.548 1087.35 607.961L1040.62 580.981C1036.69 578.709 1029.61 578.814 1025.68 581.087L978.934 608.092C972.72 611.682 967.681 620.409 967.679 627.586L967.665 681.57C967.664 686.114 971.111 692.292 975.046 694.564L1021.78 721.544C1027.99 725.131 1038.06 725.128 1044.28 721.538L1091.02 694.534C1094.96 692.256 1098.58 685.986 1098.58 681.434Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1205.98 635.714L1205.97 581.73C1205.97 574.553 1211 565.828 1217.21 562.241L1263.94 535.261C1267.88 532.989 1274.95 533.095 1278.89 535.367L1325.63 562.372C1331.85 565.962 1336.89 574.69 1336.89 581.866L1336.9 635.851C1336.9 640.394 1333.46 646.573 1329.52 648.844L1282.79 675.824C1276.58 679.411 1266.5 679.408 1260.29 675.818L1213.54 648.814C1209.6 646.537 1205.98 640.266 1205.98 635.714Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1125.83 681.434L1125.81 627.45C1125.81 620.273 1130.84 611.548 1137.06 607.961L1183.79 580.981C1187.72 578.71 1194.8 578.815 1198.73 581.087L1245.48 608.092C1251.69 611.682 1256.73 620.41 1256.73 627.586L1256.75 681.571C1256.75 686.114 1253.3 692.293 1249.36 694.565L1202.63 721.545C1196.42 725.131 1186.35 725.128 1180.13 721.539L1133.39 694.534C1129.45 692.257 1125.83 685.987 1125.83 681.434Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1045.67 726.53L1045.66 672.545C1045.65 665.369 1050.69 656.644 1056.9 653.057L1103.63 626.077C1107.57 623.805 1114.64 623.911 1118.57 626.183L1165.32 653.188C1171.53 656.778 1176.57 665.506 1176.57 672.682L1176.59 726.667C1176.59 731.21 1173.14 737.388 1169.21 739.66L1122.48 766.64C1116.26 770.227 1106.19 770.224 1099.98 766.634L1053.23 739.63C1049.29 737.353 1045.67 731.082 1045.67 726.53Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 536.369L1175.18 482.384C1175.19 475.208 1170.15 466.483 1163.94 462.896L1117.21 435.916C1113.27 433.644 1106.2 433.749 1102.27 436.022L1055.52 463.027C1049.31 466.617 1044.27 475.344 1044.27 482.521L1044.25 536.506C1044.25 541.049 1047.7 547.227 1051.63 549.499L1098.36 576.479C1104.58 580.066 1114.65 580.063 1120.86 576.473L1167.61 549.469C1171.55 547.191 1175.17 540.921 1175.17 536.369Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1052.83 458.666L1099.57 485.671C1105.79 489.261 1115.86 489.263 1122.07 485.677L1168.8 458.697C1172.74 456.425 1176.19 450.245 1176.18 445.702L1176.17 391.717C1176.17 384.54 1171.13 375.812 1164.92 372.223L1118.17 345.218C1114.24 342.945 1107.16 342.842 1103.23 345.114L1056.5 372.094C1050.28 375.68 1045.25 384.405 1045.25 391.582L1045.27 445.566C1045.27 450.119 1048.89 456.389 1052.83 458.666Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1247.76 420.64L1201.02 393.635C1194.81 390.045 1184.73 390.043 1178.52 393.629L1131.79 420.609C1127.85 422.881 1124.41 429.061 1124.41 433.604L1124.42 487.589C1124.43 494.766 1129.46 503.493 1135.68 507.083L1182.42 534.088C1186.36 536.361 1193.43 536.464 1197.37 534.192L1244.1 507.212C1250.31 503.626 1255.34 494.901 1255.34 487.724L1255.33 433.74C1255.33 429.187 1251.71 422.917 1247.76 420.64Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M975.833 420.641L1022.58 393.636C1028.79 390.047 1038.87 390.044 1045.08 393.63L1091.81 420.61C1095.74 422.882 1099.19 429.062 1099.19 433.606L1099.17 487.59C1099.17 494.767 1094.13 503.495 1087.92 507.085L1041.17 534.089C1037.24 536.362 1030.17 536.465 1026.23 534.194L979.501 507.214C973.288 503.627 968.254 494.902 968.256 487.725L968.27 433.741C968.271 429.188 971.891 422.918 975.833 420.641Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1018.03 536.368L1018.04 482.384C1018.04 475.207 1013.01 466.482 1006.8 462.895L960.065 435.915C956.13 433.644 949.055 433.749 945.121 436.021L898.376 463.026C892.162 466.616 887.123 475.344 887.121 482.52L887.106 536.505C887.105 541.048 890.553 547.227 894.488 549.499L941.218 576.479C947.431 580.065 957.504 580.062 963.718 576.473L1010.46 549.468C1014.4 547.191 1018.02 540.921 1018.03 536.368Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1018.03 536.368L1018.04 482.384C1018.04 475.207 1013.01 466.482 1006.8 462.895L960.065 435.915C956.13 433.644 949.055 433.749 945.121 436.021L898.376 463.026C892.162 466.616 887.123 475.344 887.121 482.52L887.106 536.505C887.105 541.048 890.553 547.227 894.488 549.499L941.218 576.479C947.431 580.065 957.504 580.062 963.718 576.473L1010.46 549.468C1014.4 547.191 1018.02 540.921 1018.03 536.368Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 536.369L1175.18 482.384C1175.19 475.208 1170.15 466.483 1163.94 462.896L1117.21 435.916C1113.27 433.644 1106.2 433.749 1102.27 436.022L1055.52 463.027C1049.31 466.617 1044.27 475.344 1044.27 482.521L1044.25 536.506C1044.25 541.049 1047.7 547.227 1051.63 549.499L1098.36 576.479C1104.58 580.066 1114.65 580.063 1120.86 576.473L1167.61 549.469C1171.55 547.191 1175.17 540.921 1175.17 536.369Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 536.369L1175.18 482.384C1175.19 475.208 1170.15 466.483 1163.94 462.896L1117.21 435.916C1113.27 433.644 1106.2 433.749 1102.27 436.022L1055.52 463.027C1049.31 466.617 1044.27 475.344 1044.27 482.521L1044.25 536.506C1044.25 541.049 1047.7 547.227 1051.63 549.499L1098.36 576.479C1104.58 580.066 1114.65 580.063 1120.86 576.473L1167.61 549.469C1171.55 547.191 1175.17 540.921 1175.17 536.369Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1098.18 582.085L1098.19 528.1C1098.19 520.924 1093.16 512.199 1086.95 508.612L1040.22 481.632C1036.28 479.36 1029.21 479.465 1025.27 481.738L978.528 508.743C972.314 512.333 967.275 521.061 967.273 528.237L967.259 582.222C967.257 586.765 970.705 592.943 974.64 595.215L1021.37 622.195C1027.58 625.782 1037.66 625.779 1043.87 622.189L1090.62 595.185C1094.56 592.907 1098.18 586.637 1098.18 582.085Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1098.18 582.085L1098.19 528.1C1098.19 520.924 1093.16 512.199 1086.95 508.612L1040.22 481.632C1036.28 479.36 1029.21 479.465 1025.27 481.738L978.528 508.743C972.314 512.333 967.275 521.061 967.273 528.237L967.259 582.222C967.257 586.765 970.705 592.943 974.64 595.215L1021.37 622.195C1027.58 625.782 1037.66 625.779 1043.87 622.189L1090.62 595.185C1094.56 592.907 1098.18 586.637 1098.18 582.085Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1205.57 536.367L1205.56 482.383C1205.56 475.206 1210.59 466.481 1216.8 462.894L1263.53 435.914C1267.47 433.643 1274.54 433.748 1278.48 436.02L1325.22 463.025C1331.44 466.615 1336.48 475.343 1336.48 482.519L1336.49 536.504C1336.49 541.047 1333.04 547.226 1329.11 549.497L1282.38 576.477C1276.17 580.064 1266.09 580.061 1259.88 576.471L1213.13 549.467C1209.19 547.19 1205.57 540.919 1205.57 536.367Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1205.57 536.367L1205.56 482.383C1205.56 475.206 1210.59 466.481 1216.8 462.894L1263.53 435.914C1267.47 433.643 1274.54 433.748 1278.48 436.02L1325.22 463.025C1331.44 466.615 1336.48 475.343 1336.48 482.519L1336.49 536.504C1336.49 541.047 1333.04 547.226 1329.11 549.497L1282.38 576.477C1276.17 580.064 1266.09 580.061 1259.88 576.471L1213.13 549.467C1209.19 547.19 1205.57 540.919 1205.57 536.367Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1125.42 582.085L1125.4 528.101C1125.4 520.924 1130.43 512.199 1136.65 508.613L1183.38 481.633C1187.31 479.361 1194.39 479.466 1198.32 481.739L1245.07 508.743C1251.28 512.333 1256.32 521.061 1256.32 528.238L1256.34 582.222C1256.34 586.766 1252.89 592.944 1248.95 595.216L1202.22 622.196C1196.01 625.782 1185.94 625.78 1179.72 622.19L1132.98 595.185C1129.04 592.908 1125.42 586.638 1125.42 582.085Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1125.42 582.085L1125.4 528.101C1125.4 520.924 1130.43 512.199 1136.65 508.613L1183.38 481.633C1187.31 479.361 1194.39 479.466 1198.32 481.739L1245.07 508.743C1251.28 512.333 1256.32 521.061 1256.32 528.238L1256.34 582.222C1256.34 586.766 1252.89 592.944 1248.95 595.216L1202.22 622.196C1196.01 625.782 1185.94 625.78 1179.72 622.19L1132.98 595.185C1129.04 592.908 1125.42 586.638 1125.42 582.085Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1045.26 627.181L1045.25 573.197C1045.24 566.02 1050.28 557.295 1056.49 553.709L1103.22 526.729C1107.16 524.457 1114.23 524.562 1118.16 526.835L1164.91 553.839C1171.12 557.429 1176.16 566.157 1176.16 573.333L1176.18 627.318C1176.18 631.862 1172.73 638.04 1168.8 640.312L1122.07 667.292C1115.85 670.878 1105.78 670.876 1099.57 667.286L1052.82 640.281C1048.88 638.004 1045.26 631.734 1045.26 627.181Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1045.26 627.181L1045.25 573.197C1045.24 566.02 1050.28 557.295 1056.49 553.709L1103.22 526.729C1107.16 524.457 1114.23 524.562 1118.16 526.835L1164.91 553.839C1171.12 557.429 1176.16 566.157 1176.16 573.333L1176.18 627.318C1176.18 631.862 1172.73 638.04 1168.8 640.312L1122.07 667.292C1115.85 670.878 1105.78 670.876 1099.57 667.286L1052.82 640.281C1048.88 638.004 1045.26 631.734 1045.26 627.181Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 536.372L1175.19 482.387C1175.19 475.211 1170.16 466.485 1163.94 462.899L1117.21 435.919C1113.28 433.647 1106.2 433.752 1102.27 436.025L1055.52 463.03C1049.31 466.62 1044.27 475.347 1044.27 482.524L1044.25 536.508C1044.25 541.052 1047.7 547.23 1051.64 549.502L1098.37 576.482C1104.58 580.069 1114.65 580.066 1120.87 576.476L1167.61 549.472C1171.55 547.194 1175.17 540.924 1175.17 536.372Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1098.18 582.085L1098.2 528.1C1098.2 520.924 1093.16 512.198 1086.95 508.612L1040.22 481.632C1036.29 479.36 1029.21 479.465 1025.28 481.738L978.532 508.743C972.318 512.333 967.279 521.06 967.277 528.237L967.263 582.221C967.261 586.765 970.709 592.943 974.644 595.215L1021.37 622.195C1027.59 625.782 1037.66 625.779 1043.87 622.189L1090.62 595.185C1094.56 592.907 1098.18 586.637 1098.18 582.085Z"
+              fill="#F2FF59"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1125.42 582.085L1125.41 528.1C1125.4 520.924 1130.44 512.198 1136.65 508.612L1183.38 481.632C1187.32 479.36 1194.39 479.465 1198.32 481.738L1245.07 508.743C1251.28 512.333 1256.32 521.06 1256.32 528.237L1256.34 582.221C1256.34 586.765 1252.89 592.943 1248.96 595.215L1202.23 622.195C1196.01 625.782 1185.94 625.779 1179.73 622.189L1132.98 595.184C1129.04 592.907 1125.42 586.637 1125.42 582.085Z"
+              fill="#F2FF59"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1045.26 627.173L1045.25 573.188C1045.25 566.012 1050.28 557.286 1056.49 553.7L1103.22 526.72C1107.16 524.448 1114.23 524.553 1118.17 526.826L1164.91 553.831C1171.13 557.42 1176.17 566.148 1176.17 573.325L1176.18 627.309C1176.18 631.853 1172.74 638.031 1168.8 640.303L1122.07 667.283C1115.86 670.87 1105.79 670.867 1099.57 667.277L1052.83 640.272C1048.88 637.995 1045.26 631.725 1045.26 627.173Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 445.81L1175.18 391.826C1175.18 384.649 1170.15 375.924 1163.94 372.337L1117.21 345.357C1113.27 343.086 1106.2 343.191 1102.26 345.464L1055.52 372.468C1049.3 376.058 1044.26 384.786 1044.26 391.962L1044.25 445.947C1044.25 450.49 1047.69 456.669 1051.63 458.941L1098.36 485.921C1104.57 489.507 1114.64 489.505 1120.86 485.915L1167.6 458.91C1171.55 456.633 1175.17 450.363 1175.17 445.81Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1052.82 368.108L1099.57 395.112C1105.78 398.702 1115.85 398.705 1122.07 395.118L1168.8 368.138C1172.73 365.866 1176.18 359.686 1176.18 355.143L1176.16 301.158C1176.16 293.982 1171.12 285.254 1164.91 281.664L1118.16 254.659C1114.23 252.387 1107.15 252.283 1103.22 254.555L1056.49 281.535C1050.28 285.122 1045.24 293.847 1045.24 301.023L1045.26 355.008C1045.26 359.56 1048.88 365.83 1052.82 368.108Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1247.76 330.081L1201.02 303.077C1194.81 299.487 1184.73 299.484 1178.52 303.071L1131.79 330.051C1127.85 332.322 1124.41 338.502 1124.41 343.046L1124.42 397.031C1124.43 404.207 1129.46 412.935 1135.67 416.525L1182.42 443.529C1186.35 445.802 1193.43 445.906 1197.36 443.634L1244.09 416.654C1250.31 413.067 1255.34 404.342 1255.34 397.166L1255.32 343.181C1255.32 338.629 1251.7 332.358 1247.76 330.081Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M975.826 330.082L1022.57 303.078C1028.78 299.488 1038.86 299.485 1045.07 303.072L1091.8 330.052C1095.74 332.323 1099.18 338.503 1099.18 343.047L1099.17 397.032C1099.16 404.208 1094.13 412.936 1087.91 416.526L1041.17 443.53C1037.23 445.803 1030.16 445.907 1026.22 443.635L979.493 416.655C973.281 413.068 968.246 404.343 968.248 397.167L968.262 343.182C968.263 338.630 971.884 332.359 975.826 330.082Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1018.02 445.809L1018.04 391.825C1018.04 384.649 1013 375.923 1006.79 372.337L960.061 345.357C956.126 343.085 949.051 343.19 945.117 345.463L898.372 372.468C892.158 376.057 887.119 384.785 887.117 391.962L887.103 445.946C887.101 450.49 890.549 456.668 894.484 458.94L941.215 485.92C947.427 489.507 957.5 489.504 963.714 485.914L1010.46 458.909C1014.4 456.632 1018.02 450.362 1018.02 445.809Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1175.17 445.81L1175.18 391.826C1175.18 384.649 1170.15 375.924 1163.94 372.337L1117.21 345.357C1113.27 343.086 1106.2 343.191 1102.26 345.464L1055.52 372.468C1049.3 376.058 1044.26 384.786 1044.26 391.962L1044.25 445.947C1044.25 450.49 1047.69 456.669 1051.63 458.941L1098.36 485.921C1104.57 489.507 1114.64 489.505 1120.86 485.915L1167.6 458.91C1171.55 456.633 1175.17 450.363 1175.17 445.81Z"
+              fill="#F2FF59"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1098.17 491.528L1098.18 437.544C1098.19 430.367 1093.15 421.642 1086.94 418.056L1040.21 391.076C1036.27 388.804 1029.2 388.909 1025.27 391.182L978.52 418.186C972.306 421.776 967.267 430.504 967.265 437.681L967.251 491.665C967.25 496.209 970.697 502.387 974.632 504.659L1021.36 531.639C1027.58 535.225 1037.65 535.223 1043.86 531.633L1090.61 504.628C1094.55 502.351 1098.17 496.081 1098.17 491.528Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1205.57 445.809L1205.55 391.824C1205.55 384.648 1210.59 375.923 1216.8 372.336L1263.53 345.356C1267.46 343.084 1274.54 343.189 1278.47 345.462L1325.22 372.467C1331.43 376.057 1336.47 384.784 1336.47 391.961L1336.49 445.946C1336.49 450.489 1333.04 456.667 1329.11 458.939L1282.38 485.919C1276.16 489.506 1266.09 489.503 1259.88 485.913L1213.13 458.909C1209.19 456.631 1205.57 450.361 1205.57 445.809Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1125.41 491.529L1125.4 437.544C1125.4 430.368 1130.43 421.643 1136.64 418.056L1183.37 391.076C1187.31 388.804 1194.38 388.910 1198.32 391.182L1245.06 418.187C1251.28 421.777 1256.32 430.505 1256.32 437.681L1256.33 491.666C1256.33 496.209 1252.88 502.387 1248.95 504.659L1202.22 531.639C1196.01 535.226 1185.93 535.223 1179.72 531.633L1132.97 504.629C1129.03 502.352 1125.41 496.081 1125.41 491.529Z"
+              fill="#251D2B"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+            <path
+              class="block-piece"
+              d="M1045.26 536.625L1045.24 482.64C1045.24 475.464 1050.27 466.738 1056.49 463.152L1103.22 436.172C1107.15 433.9 1114.23 434.005 1118.16 436.278L1164.91 463.283C1171.12 466.873 1176.16 475.6 1176.16 482.777L1176.17 536.761C1176.18 541.305 1172.73 547.483 1168.79 549.755L1122.06 576.735C1115.85 580.322 1105.78 580.319 1099.56 576.729L1052.82 549.725C1048.88 547.447 1045.26 541.177 1045.26 536.625Z"
+              fill="#37303F"
+              stroke="#4D3762"
+              stroke-width="2"
+            />
+          </g>
+
+          <!-- Left-edge fade -->
+          <rect
+            width="422.621"
+            height="1125.11"
+            transform="matrix(-1 0 0 1 909.219 9.26587)"
+            fill="url(#enterpriseHeroFade)"
+            style="pointer-events: none"
           />
         </g>
-
-        <!-- Left-edge fade -->
-        <rect
-          width="422.621"
-          height="1125.11"
-          transform="matrix(-1 0 0 1 909.219 9.26587)"
-          fill="url(#enterpriseHeroFade)"
-        />
         <defs>
           <linearGradient
             id="enterpriseHeroFade"
@@ -212,6 +353,9 @@ onMounted(() => {
             <stop stop-color="#211927" stop-opacity="0" />
             <stop offset="1" stop-color="#211927" />
           </linearGradient>
+          <clipPath id="enterpriseHeroClip">
+            <rect width="1600" height="1046" fill="white" />
+          </clipPath>
         </defs>
       </svg>
     </div>
@@ -255,13 +399,13 @@ onMounted(() => {
   animation: ripple-effect 4s linear infinite;
 }
 
-.ripple-delay-1 {
+.delay-1 {
   animation-delay: -1s;
 }
-.ripple-delay-2 {
+.delay-2 {
   animation-delay: -2s;
 }
-.ripple-delay-3 {
+.delay-3 {
   animation-delay: -3s;
 }
 
@@ -281,6 +425,11 @@ onMounted(() => {
   }
 }
 
+.block-cluster {
+  transform-origin: center;
+  transform-box: fill-box;
+}
+
 .block-piece {
   transform-origin: center;
   transform-box: fill-box;

apps/website/src/composables/useParallax.ts

@@ -19,6 +19,8 @@ interface ParallaxOptions {
   start?: string
   /** ScrollTrigger end value (default: 'bottom top') */
   end?: string
+  /** Media query string — animation only runs when matched (responsive) */
+  mediaQuery?: string
 }
 
 export function useParallax(
@@ -26,24 +28,27 @@ export function useParallax(
   options: ParallaxOptions = {}
 ) {
   const { fromY = 0, y = 200 } = options
-  let ctx: gsap.Context | undefined
+  let ctx: gsap.Context | gsap.MatchMedia | undefined
 
   onMounted(() => {
+    if (prefersReducedMotion()) return
+
     const triggerEl = options.trigger?.value
-    const els = elements
-      .map((r) => r.value)
-      .filter((el): el is HTMLElement => !!el && el.offsetParent !== null)
-    if (!els.length || prefersReducedMotion()) return
 
-    const trigger = triggerEl ?? els[0]
-    const scrollTrigger = {
-      trigger,
-      start: options.start ?? 'top bottom',
-      end: options.end ?? 'bottom top',
-      scrub: 1
-    }
+    const createAnimations = () => {
+      const els = elements
+        .map((r) => r.value)
+        .filter((el): el is HTMLElement => !!el && el.offsetParent !== null)
+      if (!els.length) return
+
+      const trigger = triggerEl ?? els[0]
+      const scrollTrigger = {
+        trigger,
+        start: options.start ?? 'top bottom',
+        end: options.end ?? 'bottom top',
+        scrub: 1
+      }
 
-    ctx = gsap.context(() => {
       els.forEach((el) => {
         gsap.fromTo(
           el,
@@ -51,7 +56,15 @@ export function useParallax(
           { y: resolve(y, el, trigger), ease: 'none', scrollTrigger }
         )
       })
-    })
+    }
+
+    if (options.mediaQuery) {
+      const mm = gsap.matchMedia()
+      mm.add(options.mediaQuery, createAnimations)
+      ctx = mm
+    } else {
+      ctx = gsap.context(createAnimations)
+    }
   })
 
   onUnmounted(() => {

apps/website/src/config/routes.ts

@@ -27,6 +27,7 @@ export function getRoutes(locale: Locale = 'en'): Routes {
 }
 
 export const externalLinks = {
+  apiKeys: 'https://platform.comfy.org/profile/api-keys',
   blog: 'https://blog.comfy.org/',
   cloud: 'https://cloud.comfy.org',
   discord: 'https://discord.com/invite/comfyorg',

apps/website/src/data/ashby-roles.snapshot.json

@@ -0,0 +1,169 @@
+{
+  "fetchedAt": "2026-04-24T18:59:03.989Z",
+  "departments": [
+    {
+      "name": "DESIGN",
+      "key": "design",
+      "roles": [
+        {
+          "id": "4c5d6afb78652df7",
+          "title": "Freelance Motion Designer",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a7ccc2b4-4d9d-4e04-b39c-28a711995b5b/application"
+        },
+        {
+          "id": "0f5256cf302e552b",
+          "title": "Creative Artist",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/19ba10aa-4961-45e8-8473-66a8a7a8079d/application"
+        },
+        {
+          "id": "e915f2c78b17f93b",
+          "title": "Senior Product Designer",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/b2e864c6-4754-4e04-8f46-1022baa103c3/application"
+        },
+        {
+          "id": "b9f9a23219be7cd4",
+          "title": "Design Engineer",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/abc787b9-ad85-421c-8218-debd23bea096/application"
+        },
+        {
+          "id": "5746486d87874937",
+          "title": "Graphic Designer",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/49fa0b07-3fa1-4a3a-b2c6-d2cc684ad63f/application"
+        },
+        {
+          "id": "547b6ba622c800a5",
+          "title": "Senior Product Designer - Craft",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a32c6769-b791-41f4-9225-50bbd8a1cf0f/application"
+        },
+        {
+          "id": "7bb02634a24763bc",
+          "title": "Staff Product Designer - Systems",
+          "department": "Design",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/0bc8356b-615e-4f40-b632-fd3b2691be34/application"
+        }
+      ]
+    },
+    {
+      "name": "ENGINEERING",
+      "key": "engineering",
+      "roles": [
+        {
+          "id": "102d58e35a8a9817",
+          "title": "Senior Software Engineer, Frontend",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/c3e0584d-5490-491f-aae4-b5922ef63fd2/application"
+        },
+        {
+          "id": "d01d69fba7743905",
+          "title": "Senior Software Engineer, Backend Generalist",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/732f8b39-076d-4847-afe3-f54d4451607e/application"
+        },
+        {
+          "id": "f36f60cfd5bb5910",
+          "title": "Senior/Staff Applied Machine Learning Engineer",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/5cc4d0bc-97b0-463b-8466-3ec1d07f6ac0/application"
+        },
+        {
+          "id": "9d8ec4c65e20b19e",
+          "title": "Software Engineer, Frontend",
+          "department": "Engineering",
+          "location": "Remote",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/99dc26c7-51ca-43cd-a1ba-7d475a0f4a40/application"
+        },
+        {
+          "id": "be94b193d1f4d482",
+          "title": "Tech Lead Manager, Frontend",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a0665088-3314-457a-aa7b-12ca5c3eb261/application"
+        },
+        {
+          "id": "ab48f5db6bd1783c",
+          "title": "Software Engineer, Core ComfyUI Contributor",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/7d4062d6-d500-445a-9a5f-014971af259f/application"
+        },
+        {
+          "id": "c5dff4ee628bdcd1",
+          "title": "Software Engineer, ComfyUI Desktop",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/ad2f76cb-a787-47d8-81c5-7e7f917747c0/application"
+        },
+        {
+          "id": "4302a7aaa87e16e3",
+          "title": "Product Manager, ComfyUI",
+          "department": "Engineering",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/9e4b9029-c3e9-436b-82c4-a1a9f1b8c16e/application"
+        }
+      ]
+    },
+    {
+      "name": "MARKETING",
+      "key": "marketing",
+      "roles": [
+        {
+          "id": "b5803a0d4785d406",
+          "title": "Lifecycle Growth Marketer",
+          "department": "Marketing",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/be74d210-3b50-408c-9f61-8fee8833ce64/application"
+        },
+        {
+          "id": "130d7218d7895bdb",
+          "title": "Partnership & Events Marketing Manager",
+          "department": "Marketing",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/89d3ff75-2055-4e92-9c69-81feff55627c/application"
+        }
+      ]
+    },
+    {
+      "name": "OPERATIONS",
+      "key": "operations",
+      "roles": [
+        {
+          "id": "ec68ae44dd5943c9",
+          "title": "Senior Technical Recruiter",
+          "department": "Operations",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/d5008532-c45d-46e6-ba2c-20489d364362/application"
+        },
+        {
+          "id": "16f556001ce1cef4",
+          "title": "BizOps Strategist",
+          "department": "Operations",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/145b8558-0ab4-43e8-8fac-b59059cf2537/application"
+        },
+        {
+          "id": "8e773a72c1b8e099",
+          "title": "Founding Customer Success Manager",
+          "department": "Operations",
+          "location": "San Francisco",
+          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a1c5c5ed-62ac-4767-af57-a3ba4e0bf5e4/application"
+        }
+      ]
+    }
+  ]
+}

apps/website/src/data/roles.ts

@@ -0,0 +1,18 @@
+export interface Role {
+  id: string
+  title: string
+  department: string
+  location: string
+  applyUrl: string
+}
+
+export interface Department {
+  name: string
+  key: string
+  roles: Role[]
+}
+
+export interface RolesSnapshot {
+  fetchedAt: string
+  departments: Department[]
+}

apps/website/src/i18n/translations.ts

@@ -4,12 +4,12 @@ const translations = {
   // HeroSection
   'hero.title': {
     en: 'Professional Control\nof Visual AI',
-    'zh-CN': '视觉 AI 的\n专业控制'
+    'zh-CN': '视觉 AI 的\n最强可控性'
   },
   'hero.subtitle': {
     en: 'Comfy is the AI creation engine for visual professionals who demand control over every model, every parameter, and every output.',
     'zh-CN':
-      'Comfy 是面向视觉专业人士的 AI 创作引擎，让您掌控每个模型、每个参数和每个输出。'
+      'Comfy 是面向专业视觉人士的 AI 创作引擎。您可以精确掌控每个模型、每个参数和每个输出。'
   },
 
   // ProductShowcaseSection
@@ -20,11 +20,11 @@ const translations = {
   },
   'showcase.subtitle2': {
     en: 'Start from a community template or build from scratch.',
-    'zh-CN': '从社区模板开始，或从零构建。'
+    'zh-CN': '从工作流模板开始，或从零构建。'
   },
   'showcase.feature1.title': {
     en: 'Full Control with Nodes',
-    'zh-CN': '节点式完全控制'
+    'zh-CN': '节点带来的可控性'
   },
   'showcase.feature1.description': {
     en: 'Build powerful AI pipelines by connecting nodes on an infinite canvas. Every model, parameter, and processing step is visible and adjustable.',
@@ -49,8 +49,8 @@ const translations = {
     'zh-CN':
       '浏览和混搭数千个社区共享的工作流。从经过验证的模板开始，按需自定义。'
   },
-  'showcase.badgeHow': { en: 'HOW', 'zh-CN': '如何' },
-  'showcase.badgeWorks': { en: 'WORKS', 'zh-CN': '运作' },
+  'showcase.badgeHow': { en: 'HOW', 'zh-CN': '了解' },
+  'showcase.badgeWorks': { en: 'WORKS', 'zh-CN': '运行方式' },
 
   // UseCaseSection
   'useCase.label': {
@@ -83,8 +83,7 @@ const translations = {
   },
   'useCase.body': {
     en: 'Powered by 60,000+ nodes, thousands of workflows,\nand a community that builds faster than any one company could.',
-    'zh-CN':
-      '由 60,000+ 节点、数千个工作流\n和一个比任何公司都更快构建的社区驱动。'
+    'zh-CN': '60,000+ 节点，数千条工作流，\n一个比任何公司速度都更快的社区。'
   },
   'useCase.cta': {
     en: 'EXPLORE WORKFLOWS',
@@ -164,7 +163,7 @@ const translations = {
   },
   'products.local.cta': {
     en: 'SEE LOCAL FEATURES',
-    'zh-CN': '查看本地版特性'
+    'zh-CN': '查看本地版属性'
   },
   'products.cloud.title': {
     en: 'Comfy\nCloud',
@@ -176,7 +175,7 @@ const translations = {
   },
   'products.cloud.cta': {
     en: 'SEE CLOUD FEATURES',
-    'zh-CN': '查看云端特性'
+    'zh-CN': '查看云端属性'
   },
   'products.api.title': {
     en: 'Comfy\nAPI',
@@ -188,7 +187,7 @@ const translations = {
   },
   'products.api.cta': {
     en: 'SEE API FEATURES',
-    'zh-CN': '查看 API 特性'
+    'zh-CN': '查看 API 属性'
   },
   'products.enterprise.title': {
     en: 'Comfy\nEnterprise',
@@ -200,7 +199,7 @@ const translations = {
   },
   'products.enterprise.cta': {
     en: 'SEE ENTERPRISE FEATURES',
-    'zh-CN': '查看企业版特性'
+    'zh-CN': '查看企业版属性'
   },
 
   // CaseStudySpotlightSection
@@ -1215,7 +1214,7 @@ const translations = {
   'pricing.included.feature4.description': {
     en: 'All plans will include a monthly pool of credits that are spent on active workflow runtime and <a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">Partner Nodes</a> like Nano Banana Pro.',
     'zh-CN':
-      '所有计划均包含每月积分池，可用于工作流运行和<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">合作节点</a>（如 Nano Banana Pro）。'
+      '所有计划均包含每月积分池，可用于工作流运行和<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">合作伙伴节点</a>（如 Nano Banana Pro）。'
   },
   'pricing.included.feature5.title': {
     en: 'Add more credits anytime',
@@ -1245,12 +1244,12 @@ const translations = {
   },
   'pricing.included.feature8.title': {
     en: 'Partner Nodes',
-    'zh-CN': '合作节点'
+    'zh-CN': '合作伙伴节点'
   },
   'pricing.included.feature8.description': {
     en: 'Run <strong>proprietary models</strong> through Comfy\'s <a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">Partner Nodes</a>, such as Nano Banana. The amount of credits each node uses depends on the model and parameters you set in the node, but these credits are the same ones that your monthly subscription comes with. These credits can also be used across Comfy Cloud and local ComfyUI. Read more about Partner nodes <a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">here</a>.',
     'zh-CN':
-      '通过 Comfy 的<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">合作节点</a>运行<strong>专有模型</strong>，如 Nano Banana。每个节点消耗的积分取决于所用模型和参数设置，且与月度订阅积分通用。积分可在 Comfy Cloud 和本地 ComfyUI 间通用。了解更多关于合作节点的信息请点击<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">此处</a>。'
+      '通过 Comfy 的<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">合作伙伴节点</a>运行<strong>专有模型</strong>，如 Nano Banana。每个节点消耗的积分取决于所用模型和参数设置，且与月度订阅积分通用。积分可在 Comfy Cloud 和本地 ComfyUI 间通用。了解更多关于合作伙伴节点的信息请点击<a href="https://docs.comfy.org/tutorials/partner-nodes/overview" class="text-primary-comfy-yellow underline">此处</a>。'
   },
   'pricing.included.feature9.title': {
     en: 'Job queue',
@@ -1505,6 +1504,10 @@ const translations = {
 
   // CareersRolesSection
   'careers.roles.heading': { en: 'Roles', 'zh-CN': '职位' },
+  'careers.roles.empty': {
+    en: 'No open roles right now. Check back soon.',
+    'zh-CN': '目前暂无开放职位，请稍后再来查看。'
+  },
 
   // CareersFAQSection
   'careers.faq.heading': { en: 'Q&A', 'zh-CN': 'Q&A' },

apps/website/src/pages/about.astro

@@ -1,6 +1,7 @@
 ---
 import BaseLayout from '../layouts/BaseLayout.astro'
 import HeroSection from '../components/about/HeroSection.vue'
+import StorySection from '../components/about/StorySection.vue'
 import OurValuesSection from '../components/about/OurValuesSection.vue'
 import ValuesSection from '../components/about/ValuesSection.vue'
 import CareersSection from '../components/about/CareersSection.vue'
@@ -8,6 +9,7 @@ import CareersSection from '../components/about/CareersSection.vue'
 
 <BaseLayout title="About Us — Comfy">
   <HeroSection client:load />
+  <StorySection />
   <OurValuesSection />
   <ValuesSection client:visible />
   <CareersSection />

apps/website/src/pages/careers.astro

@@ -5,6 +5,20 @@ import RolesSection from '../components/careers/RolesSection.vue'
 import WhyJoinSection from '../components/careers/WhyJoinSection.vue'
 import TeamPhotosSection from '../components/careers/TeamPhotosSection.vue'
 import FAQSection from '../components/common/FAQSection.vue'
+import { fetchRolesForBuild } from '../utils/ashby'
+import { reportAshbyOutcome } from '../utils/ashby.ci'
+
+const outcome = await fetchRolesForBuild()
+reportAshbyOutcome(outcome)
+
+if (outcome.status === 'failed') {
+  throw new Error(
+    `Ashby fetch failed and no snapshot is available. Reason: ${outcome.reason}. ` +
+      'Run `pnpm --filter @comfyorg/website ashby:refresh-snapshot` locally and commit the snapshot.'
+  )
+}
+
+const departments = outcome.snapshot.departments
 ---
 
 <BaseLayout
@@ -12,7 +26,7 @@ import FAQSection from '../components/common/FAQSection.vue'
   description="Join the team building the operating system for generative AI. Open roles in engineering, design, marketing, and more."
 >
   <HeroSection />
-  <RolesSection client:visible />
+  <RolesSection departments={departments} client:visible />
   <WhyJoinSection client:visible />
   <TeamPhotosSection client:visible />
   <FAQSection

apps/website/src/pages/zh-CN/about.astro

@@ -1,6 +1,7 @@
 ---
 import BaseLayout from '../../layouts/BaseLayout.astro'
 import HeroSection from '../../components/about/HeroSection.vue'
+import StorySection from '../../components/about/StorySection.vue'
 import OurValuesSection from '../../components/about/OurValuesSection.vue'
 import ValuesSection from '../../components/about/ValuesSection.vue'
 import CareersSection from '../../components/about/CareersSection.vue'
@@ -8,6 +9,7 @@ import CareersSection from '../../components/about/CareersSection.vue'
 
 <BaseLayout title="关于我们 — Comfy" description="了解 ComfyUI 背后的团队和使命——开源的生成式 AI 平台。">
   <HeroSection locale="zh-CN" client:load />
+  <StorySection locale="zh-CN" />
   <OurValuesSection locale="zh-CN" />
   <ValuesSection locale="zh-CN" client:visible />
   <CareersSection locale="zh-CN" />

apps/website/src/pages/zh-CN/careers.astro

@@ -5,6 +5,20 @@ import RolesSection from '../../components/careers/RolesSection.vue'
 import WhyJoinSection from '../../components/careers/WhyJoinSection.vue'
 import TeamPhotosSection from '../../components/careers/TeamPhotosSection.vue'
 import FAQSection from '../../components/common/FAQSection.vue'
+import { fetchRolesForBuild } from '../../utils/ashby'
+import { reportAshbyOutcome } from '../../utils/ashby.ci'
+
+const outcome = await fetchRolesForBuild()
+reportAshbyOutcome(outcome)
+
+if (outcome.status === 'failed') {
+  throw new Error(
+    `Ashby fetch failed and no snapshot is available. Reason: ${outcome.reason}. ` +
+      'Run `pnpm --filter @comfyorg/website ashby:refresh-snapshot` locally and commit the snapshot.'
+  )
+}
+
+const departments = outcome.snapshot.departments
 ---
 
 <BaseLayout
@@ -12,7 +26,7 @@ import FAQSection from '../../components/common/FAQSection.vue'
   description="加入构建生成式 AI 操作系统的团队。工程、设计、市场营销等岗位开放招聘中。"
 >
   <HeroSection locale="zh-CN" />
-  <RolesSection locale="zh-CN" client:visible />
+  <RolesSection locale="zh-CN" departments={departments} client:visible />
   <WhyJoinSection locale="zh-CN" client:visible />
   <TeamPhotosSection client:visible />
   <FAQSection

apps/website/src/pages/zh-CN/index.astro

@@ -10,7 +10,7 @@ import GetStartedSection from '../../components/home/GetStartedSection.vue'
 import BuildWhatSection from '../../components/home/BuildWhatSection.vue'
 ---
 
-<BaseLayout title="Comfy — 视觉 AI 的专业控制">
+<BaseLayout title="Comfy — 视觉 AI 的最强可控性">
   <HeroSection locale="zh-CN" client:load />
   <SocialProofBarSection />
   <ProductShowcaseSection locale="zh-CN" client:load />

apps/website/src/utils/ashby.ci.test.ts

@@ -0,0 +1,130 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { FetchOutcome } from './ashby'
+import type { RolesSnapshot } from '../data/roles'
+
+import { reportAshbyOutcome, resetAshbyReporterForTests } from './ashby.ci'
+
+function baseSnapshot(): RolesSnapshot {
+  return {
+    fetchedAt: new Date().toISOString(),
+    departments: [
+      {
+        name: 'ENGINEERING',
+        key: 'engineering',
+        roles: [
+          {
+            id: 'x',
+            title: 'Design Engineer',
+            department: 'Engineering',
+            location: 'San Francisco',
+            applyUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
+          }
+        ]
+      }
+    ]
+  }
+}
+
+function freshOutcome(droppedCount = 0): FetchOutcome {
+  return {
+    status: 'fresh',
+    droppedCount,
+    droppedRoles:
+      droppedCount === 0
+        ? []
+        : [{ title: 'Bad Role', reason: 'jobUrl: Invalid url' }],
+    snapshot: {
+      fetchedAt: new Date().toISOString(),
+      departments: [
+        {
+          name: 'ENGINEERING',
+          key: 'engineering',
+          roles: [
+            {
+              id: 'x',
+              title: 'Design Engineer',
+              department: 'Engineering',
+              location: 'San Francisco',
+              applyUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
+
+describe('reportAshbyOutcome', () => {
+  let writeSpy: ReturnType<typeof vi.spyOn>
+  let summaryDir: string
+  let summaryPath: string
+  const originalSummary = process.env.GITHUB_STEP_SUMMARY
+
+  beforeEach(() => {
+    resetAshbyReporterForTests()
+    writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true)
+    summaryDir = mkdtempSync(join(tmpdir(), 'ashby-summary-'))
+    summaryPath = join(summaryDir, 'summary.md')
+    writeFileSync(summaryPath, '')
+    process.env.GITHUB_STEP_SUMMARY = summaryPath
+  })
+
+  afterEach(() => {
+    writeSpy.mockRestore()
+    rmSync(summaryDir, { recursive: true, force: true })
+    if (originalSummary === undefined) delete process.env.GITHUB_STEP_SUMMARY
+    else process.env.GITHUB_STEP_SUMMARY = originalSummary
+  })
+
+  it('emits nothing on a clean fresh outcome', () => {
+    reportAshbyOutcome(freshOutcome(0))
+    expect(writeSpy).not.toHaveBeenCalled()
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Fresh')
+  })
+
+  it('emits exactly one set of annotations across repeated calls', () => {
+    reportAshbyOutcome(freshOutcome(1))
+    reportAshbyOutcome(freshOutcome(1))
+    expect(writeSpy).toHaveBeenCalledTimes(1)
+    const annotation = writeSpy.mock.calls[0]![0] as string
+    expect(annotation).toContain('::warning title=Ashby: dropped 1 invalid')
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Dropped')
+  })
+
+  it('emits ::error for auth failures in a stale outcome', () => {
+    reportAshbyOutcome({
+      status: 'stale',
+      reason: 'HTTP 401 Unauthorized',
+      snapshot: baseSnapshot()
+    })
+    const annotation = writeSpy.mock.calls[0]![0] as string
+    expect(annotation).toContain('::error title=Ashby authentication failed')
+  })
+
+  it('emits ::warning for missing-env stale outcomes', () => {
+    reportAshbyOutcome({
+      status: 'stale',
+      reason: 'missing WEBSITE_ASHBY_API_KEY or WEBSITE_ASHBY_JOB_BOARD_NAME',
+      snapshot: baseSnapshot()
+    })
+    const annotation = writeSpy.mock.calls[0]![0] as string
+    expect(annotation).toContain('::warning title=Ashby integration')
+  })
+
+  it('emits ::error for a failed outcome and writes no fresh-only sections', () => {
+    reportAshbyOutcome({ status: 'failed', reason: 'HTTP 500 Server Error' })
+    const annotation = writeSpy.mock.calls[0]![0] as string
+    expect(annotation).toContain('::error title=Ashby fetch failed')
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Failed')
+  })
+
+  it('does not throw when GITHUB_STEP_SUMMARY is not set', () => {
+    delete process.env.GITHUB_STEP_SUMMARY
+    expect(() => reportAshbyOutcome(freshOutcome(0))).not.toThrow()
+  })
+})

apps/website/src/utils/ashby.ci.ts

@@ -0,0 +1,113 @@
+import { appendFileSync } from 'node:fs'
+
+import type { FetchOutcome } from './ashby'
+
+let hasReported = false
+
+export function resetAshbyReporterForTests(): void {
+  hasReported = false
+}
+
+export function reportAshbyOutcome(outcome: FetchOutcome): void {
+  if (hasReported) return
+  hasReported = true
+
+  const lines = buildAnnotations(outcome)
+  for (const line of lines) {
+    process.stdout.write(`${line}\n`)
+  }
+
+  const summaryPath = process.env.GITHUB_STEP_SUMMARY
+  if (summaryPath) {
+    try {
+      appendFileSync(summaryPath, buildStepSummary(outcome))
+    } catch {
+      // Writing the summary is best-effort; do not fail the build if the
+      // runner's summary file is unavailable (e.g. local dev).
+    }
+  }
+}
+
+function buildAnnotations(outcome: FetchOutcome): string[] {
+  if (outcome.status === 'fresh') {
+    if (outcome.droppedCount === 0) return []
+    const roleCount = outcome.droppedCount === 1 ? 'role' : 'roles'
+    const drops = outcome.droppedRoles
+      .map((d) => `  - ${d.title ? `"${d.title}"` : '(untitled)'}: ${d.reason}`)
+      .join('%0A')
+    return [
+      `::warning title=Ashby: dropped ${outcome.droppedCount} invalid ${roleCount}::Dropped roles:%0A${drops}%0A%0AAction items:%0A  1. Fix the posting in Ashby admin (e.g. assign a department, fix the URL).%0A  2. If the v1 schema is too strict for a legitimate case, relax the field in apps/website/src/utils/ashby.schema.ts and add a test.%0A  3. These roles will not appear on the careers page until fixed.`
+    ]
+  }
+
+  if (outcome.status === 'stale') {
+    return [staleAnnotation(outcome.reason)]
+  }
+
+  return [
+    `::error title=Ashby fetch failed and no snapshot is available::Cannot build careers page without data.%0A%0AReason: ${escapeAnnotation(outcome.reason)}%0A%0AAction items:%0A  1. Run \`pnpm --filter @comfyorg/website ashby:refresh-snapshot\` locally with a valid WEBSITE_ASHBY_API_KEY.%0A  2. Commit apps/website/src/data/ashby-roles.snapshot.json.%0A  3. Push and re-run CI.`
+  ]
+}
+
+function staleAnnotation(reason: string): string {
+  const escaped = escapeAnnotation(reason)
+  if (reason.startsWith('missing ')) {
+    return `::warning title=Ashby integration::${escaped}. Falling back to committed snapshot.%0A%0AAction items:%0A  1. If you're a contributor without key access, this is expected. The snapshot will be used.%0A  2. If this is CI, check that the \`WEBSITE_ASHBY_API_KEY\` secret exists in the repo and is referenced in .github/workflows/ci-website-build.yaml.`
+  }
+  if (reason.startsWith('HTTP 401') || reason.startsWith('HTTP 403')) {
+    return `::error title=Ashby authentication failed::${escaped}. The WEBSITE_ASHBY_API_KEY is missing, invalid, or revoked. Build continues with the last-known-good snapshot.%0A%0AAction items:%0A  1. Open Ashby → Settings → API Keys and confirm the key is active.%0A  2. Update the \`WEBSITE_ASHBY_API_KEY\` secret in GitHub Actions and Vercel.%0A  3. Re-run this workflow.`
+  }
+  if (reason.startsWith('envelope')) {
+    return `::error title=Ashby schema mismatch::${escaped}. The Ashby API contract has likely changed. Build continues with the snapshot, but future updates will fail until the schema is fixed.%0A%0AAction items:%0A  1. Check https://developers.ashbyhq.com/reference for API changelog.%0A  2. Update apps/website/src/utils/ashby.schema.ts to match the new shape.`
+  }
+  return `::warning title=Ashby API unavailable::${escaped}. Using last-known-good snapshot.%0A%0AAction items:%0A  1. Check https://status.ashbyhq.com%0A  2. Re-run this workflow once Ashby is healthy.`
+}
+
+function escapeAnnotation(value: string): string {
+  return value.replace(/\r?\n/g, '%0A').replace(/\r/g, '%0D')
+}
+
+function buildStepSummary(outcome: FetchOutcome): string {
+  const header = '## 💼 Careers (Ashby)\n'
+  const rows: Array<[string, string]> = []
+
+  if (outcome.status === 'fresh') {
+    rows.push(['Status', '✅ Fresh (fetched from Ashby)'])
+    rows.push([
+      'Roles',
+      String(
+        outcome.snapshot.departments.reduce((n, d) => n + d.roles.length, 0)
+      )
+    ])
+    rows.push(['Dropped', String(outcome.droppedCount)])
+  } else if (outcome.status === 'stale') {
+    rows.push(['Status', '⚠️ Stale (using snapshot — Ashby fetch failed)'])
+    rows.push([
+      'Roles',
+      String(
+        outcome.snapshot.departments.reduce((n, d) => n + d.roles.length, 0)
+      )
+    ])
+    rows.push(['Reason', outcome.reason])
+    rows.push(['Snapshot age', describeSnapshotAge(outcome.snapshot.fetchedAt)])
+  } else {
+    rows.push(['Status', '❌ Failed (no snapshot available)'])
+    rows.push(['Reason', outcome.reason])
+  }
+
+  const table =
+    '| | |\n|---|---|\n' +
+    rows.map(([k, v]) => `| **${k}** | ${v} |`).join('\n') +
+    '\n'
+
+  return `${header}${table}\n`
+}
+
+function describeSnapshotAge(fetchedAt: string): string {
+  const fetched = new Date(fetchedAt).getTime()
+  if (Number.isNaN(fetched)) return 'unknown'
+  const days = Math.floor((Date.now() - fetched) / 86_400_000)
+  if (days <= 0) return 'today'
+  if (days === 1) return '1 day'
+  return `${days} days`
+}

apps/website/src/utils/ashby.schema.ts

@@ -0,0 +1,17 @@
+import { z } from 'zod'
+
+export const AshbyJobPostingSchema = z.object({
+  title: z.string().min(1),
+  department: z.string().optional(),
+  location: z.string().optional(),
+  isListed: z.boolean(),
+  jobUrl: z.string().url(),
+  applyUrl: z.string().url().optional()
+})
+
+export const AshbyJobBoardResponseSchema = z.object({
+  apiVersion: z.literal('1'),
+  jobs: z.array(z.unknown())
+})
+
+export type AshbyJobPosting = z.infer<typeof AshbyJobPostingSchema>

apps/website/src/utils/ashby.test.ts

@@ -0,0 +1,328 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { AshbyJobPosting } from './ashby.schema'
+import type { RolesSnapshot } from '../data/roles'
+
+import { fetchRolesForBuild, resetAshbyFetcherForTests } from './ashby'
+
+const BASE_URL = 'https://ashby.test'
+const BOARD = 'comfy-org'
+const KEY = 'abc-123-secret'
+
+function validJob(overrides: Partial<AshbyJobPosting> = {}): unknown {
+  return {
+    title: 'Design Engineer',
+    department: 'Engineering',
+    location: 'San Francisco',
+    isListed: true,
+    jobUrl: 'https://jobs.ashbyhq.com/comfy-org/design-engineer',
+    applyUrl: 'https://jobs.ashbyhq.com/comfy-org/design-engineer/apply',
+    ...overrides
+  }
+}
+
+function response(body: unknown, init: Partial<ResponseInit> = {}): Response {
+  const base: ResponseInit = {
+    status: 200,
+    headers: { 'content-type': 'application/json' }
+  }
+  return new Response(JSON.stringify(body), { ...base, ...init })
+}
+
+function makeSnapshot(roleCount = 2): RolesSnapshot {
+  const roles = Array.from({ length: roleCount }, (_, i) => ({
+    id: `snapshot-role-${i}`,
+    title: `Snapshot Role ${i}`,
+    department: 'Engineering',
+    location: 'San Francisco',
+    applyUrl: `https://jobs.ashbyhq.com/comfy-org/snapshot-${i}`
+  }))
+  return {
+    fetchedAt: '2026-04-01T00:00:00.000Z',
+    departments: [{ name: 'ENGINEERING', key: 'engineering', roles }]
+  }
+}
+
+function withSnapshotDir(snapshot: RolesSnapshot | null): URL {
+  const dir = mkdtempSync(join(tmpdir(), 'ashby-test-'))
+  const file = join(dir, 'ashby-roles.snapshot.json')
+  if (snapshot) writeFileSync(file, JSON.stringify(snapshot))
+  return pathToFileURL(file)
+}
+
+describe('fetchRolesForBuild', () => {
+  const savedApiKey = process.env.WEBSITE_ASHBY_API_KEY
+  const savedBoardName = process.env.WEBSITE_ASHBY_JOB_BOARD_NAME
+
+  beforeEach(() => {
+    resetAshbyFetcherForTests()
+    delete process.env.WEBSITE_ASHBY_API_KEY
+    delete process.env.WEBSITE_ASHBY_JOB_BOARD_NAME
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+    process.env.WEBSITE_ASHBY_API_KEY = savedApiKey
+    process.env.WEBSITE_ASHBY_JOB_BOARD_NAME = savedBoardName
+  })
+
+  it('returns fresh when the API succeeds', async () => {
+    const fetchImpl = vi.fn(async () =>
+      response({ apiVersion: '1', jobs: [validJob()] })
+    )
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.droppedCount).toBe(0)
+    expect(outcome.snapshot.departments).toHaveLength(1)
+    expect(outcome.snapshot.departments[0]!.roles[0]!.applyUrl).toMatch(
+      /design-engineer\/apply$/
+    )
+  })
+
+  it('falls back to jobUrl when applyUrl is missing and keeps the role', async () => {
+    const job = validJob()
+    delete (job as Record<string, unknown>).applyUrl
+    const fetchImpl = vi.fn(async () =>
+      response({ apiVersion: '1', jobs: [job] })
+    )
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.snapshot.departments[0]!.roles[0]!.applyUrl).toBe(
+      'https://jobs.ashbyhq.com/comfy-org/design-engineer'
+    )
+  })
+
+  it('drops invalid roles individually and keeps the valid ones', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () =>
+      response({
+        apiVersion: '1',
+        jobs: [validJob(), validJob({ title: 'Bad Role', jobUrl: 'not-a-url' })]
+      })
+    )
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.droppedCount).toBe(1)
+    expect(outcome.droppedRoles[0]!.title).toBe('Bad Role')
+    expect(outcome.snapshot.departments[0]!.roles).toHaveLength(1)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('renders an empty-but-fresh outcome when hiring is paused', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({ apiVersion: '1', jobs: [] }))
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.snapshot.departments).toEqual([])
+    expect(outcome.droppedCount).toBe(0)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('normalizes missing department and location to safe defaults', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const job = validJob()
+    delete (job as Record<string, unknown>).department
+    delete (job as Record<string, unknown>).location
+    const fetchImpl = vi.fn(async () =>
+      response({ apiVersion: '1', jobs: [job] })
+    )
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    const [department] = outcome.snapshot.departments
+    expect(department?.name).toBe('OTHER')
+    expect(department?.roles[0]?.location).toBe('Remote')
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('filters out roles with isListed=false', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () =>
+      response({
+        apiVersion: '1',
+        jobs: [validJob(), validJob({ title: 'Hidden', isListed: false })]
+      })
+    )
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    const titles = outcome.snapshot.departments.flatMap((d) =>
+      d.roles.map((r) => r.title)
+    )
+    expect(titles).not.toContain('Hidden')
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('returns stale with missing env when the snapshot is present', async () => {
+    const snapshot = makeSnapshot()
+    const snapshotUrl = withSnapshotDir(snapshot)
+    const fetchImpl = vi.fn()
+    const outcome = await fetchRolesForBuild({
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^missing /)
+    expect(fetchImpl).not.toHaveBeenCalled()
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('returns failed when both env and snapshot are missing', async () => {
+    const snapshotUrl = withSnapshotDir(null)
+    const outcome = await fetchRolesForBuild({
+      snapshotUrl,
+      fetchImpl: vi.fn() as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('failed')
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('does not retry on HTTP 401', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({}, { status: 401 }))
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^HTTP 401/)
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('retries 5xx up to the configured limit then falls back to snapshot', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({}, { status: 503 }))
+    const sleep = vi.fn(async () => undefined)
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      retryDelaysMs: [1, 1, 1],
+      sleep,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    expect(fetchImpl).toHaveBeenCalledTimes(4)
+    expect(sleep).toHaveBeenCalledTimes(3)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('falls back to snapshot on envelope schema mismatch', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({ apiVersion: '2', jobs: [] }))
+    const outcome = await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^envelope schema/)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('memoizes within a single process', async () => {
+    const fetchImpl = vi.fn(async () =>
+      response({ apiVersion: '1', jobs: [validJob()] })
+    )
+    const opts = {
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    }
+    const [a, b] = await Promise.all([
+      fetchRolesForBuild(opts),
+      fetchRolesForBuild(opts)
+    ])
+    expect(a).toBe(b)
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+  })
+
+  it('never writes to the snapshot file on success', async () => {
+    const snapshot = makeSnapshot()
+    const snapshotUrl = withSnapshotDir(snapshot)
+    const before = new URL(snapshotUrl.href)
+    const fs = await import('node:fs')
+    const initial = fs.readFileSync(before).toString()
+    const fetchImpl = vi.fn(async () =>
+      response({ apiVersion: '1', jobs: [validJob()] })
+    )
+    await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    const after = fs.readFileSync(before).toString()
+    expect(after).toBe(initial)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('does not retry on 4xx auth failures for 403', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({}, { status: 403 }))
+    await fetchRolesForBuild({
+      apiKey: KEY,
+      boardName: BOARD,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+})

apps/website/src/utils/ashby.ts

@@ -0,0 +1,299 @@
+import { createHash } from 'node:crypto'
+import { readFile } from 'node:fs/promises'
+
+import type { AshbyJobPosting } from './ashby.schema'
+import type { Department, Role, RolesSnapshot } from '../data/roles'
+
+import bundledSnapshot from '../data/ashby-roles.snapshot.json' with { type: 'json' }
+import {
+  AshbyJobBoardResponseSchema,
+  AshbyJobPostingSchema
+} from './ashby.schema'
+
+const DEFAULT_BASE_URL = 'https://api.ashbyhq.com'
+const DEFAULT_TIMEOUT_MS = 10_000
+const RETRY_DELAYS_MS = [1_000, 2_000, 4_000]
+
+export interface DroppedRole {
+  title: string
+  reason: string
+}
+
+export type FetchOutcome =
+  | {
+      status: 'fresh'
+      snapshot: RolesSnapshot
+      droppedCount: number
+      droppedRoles: DroppedRole[]
+    }
+  | { status: 'stale'; snapshot: RolesSnapshot; reason: string }
+  | { status: 'failed'; reason: string }
+
+interface FetchRolesOptions {
+  apiKey?: string
+  boardName?: string
+  baseUrl?: string
+  timeoutMs?: number
+  retryDelaysMs?: readonly number[]
+  fetchImpl?: typeof fetch
+  snapshotUrl?: URL
+  sleep?: (ms: number) => Promise<void>
+}
+
+let inflight: Promise<FetchOutcome> | undefined
+
+export function resetAshbyFetcherForTests(): void {
+  inflight = undefined
+}
+
+export function fetchRolesForBuild(
+  options: FetchRolesOptions = {}
+): Promise<FetchOutcome> {
+  inflight ??= doFetchRolesForBuild(options)
+  return inflight
+}
+
+async function doFetchRolesForBuild(
+  options: FetchRolesOptions
+): Promise<FetchOutcome> {
+  const apiKey = options.apiKey ?? process.env.WEBSITE_ASHBY_API_KEY
+  const boardName =
+    options.boardName ?? process.env.WEBSITE_ASHBY_JOB_BOARD_NAME
+
+  if (!apiKey || !boardName) {
+    return fallback(
+      'missing WEBSITE_ASHBY_API_KEY or WEBSITE_ASHBY_JOB_BOARD_NAME',
+      options.snapshotUrl
+    )
+  }
+
+  const result = await tryFetchAndParse(apiKey, boardName, options)
+  if (result.kind === 'ok') {
+    return {
+      status: 'fresh',
+      snapshot: {
+        fetchedAt: new Date().toISOString(),
+        departments: result.departments
+      },
+      droppedCount: result.droppedRoles.length,
+      droppedRoles: result.droppedRoles
+    }
+  }
+
+  return fallback(result.reason, options.snapshotUrl)
+}
+
+async function fallback(
+  reason: string,
+  snapshotUrl: URL | undefined
+): Promise<FetchOutcome> {
+  const snapshot = await readSnapshot(snapshotUrl)
+  if (snapshot) return { status: 'stale', snapshot, reason }
+  return { status: 'failed', reason }
+}
+
+interface FetchOk {
+  kind: 'ok'
+  departments: Department[]
+  droppedRoles: DroppedRole[]
+}
+
+interface FetchErr {
+  kind: 'err'
+  reason: string
+}
+
+async function tryFetchAndParse(
+  apiKey: string,
+  boardName: string,
+  options: FetchRolesOptions
+): Promise<FetchOk | FetchErr> {
+  const baseUrl = options.baseUrl ?? DEFAULT_BASE_URL
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS
+  const retryDelaysMs = options.retryDelaysMs ?? RETRY_DELAYS_MS
+  const fetchImpl = options.fetchImpl ?? fetch
+  const sleep = options.sleep ?? defaultSleep
+
+  const url = `${baseUrl}/posting-api/job-board/${encodeURIComponent(
+    boardName
+  )}?includeCompensation=false`
+  const authHeader = `Basic ${Buffer.from(`${apiKey}:`).toString('base64')}`
+
+  let lastReason = 'unknown error'
+  for (let attempt = 0; attempt <= retryDelaysMs.length; attempt++) {
+    if (attempt > 0) await sleep(retryDelaysMs[attempt - 1])
+
+    const response = await callOnce(fetchImpl, url, authHeader, timeoutMs)
+    if (response.kind === 'err') {
+      lastReason = response.reason
+      if (!response.retryable) return response
+      continue
+    }
+
+    const envelope = AshbyJobBoardResponseSchema.safeParse(response.body)
+    if (!envelope.success) {
+      return {
+        kind: 'err',
+        reason: `envelope schema validation failed: ${envelope.error.issues
+          .map((i) => `${i.path.join('.') || '<root>'}: ${i.message}`)
+          .join('; ')}`
+      }
+    }
+
+    return parseRoles(envelope.data.jobs)
+  }
+
+  return { kind: 'err', reason: lastReason }
+}
+
+type CallResponse =
+  | { kind: 'ok'; body: unknown }
+  | { kind: 'err'; reason: string; retryable: boolean }
+
+async function callOnce(
+  fetchImpl: typeof fetch,
+  url: string,
+  authHeader: string,
+  timeoutMs: number
+): Promise<CallResponse> {
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), timeoutMs)
+  try {
+    const res = await fetchImpl(url, {
+      method: 'GET',
+      headers: {
+        Authorization: authHeader,
+        Accept: 'application/json; version=1'
+      },
+      signal: controller.signal
+    })
+    if (res.ok) {
+      return { kind: 'ok', body: await res.json() }
+    }
+    const retryable =
+      res.status === 429 || (res.status >= 500 && res.status < 600)
+    return {
+      kind: 'err',
+      reason: `HTTP ${res.status} ${res.statusText || ''}`.trim(),
+      retryable
+    }
+  } catch (error) {
+    const reason =
+      error instanceof Error
+        ? `network error: ${error.message}`
+        : 'network error'
+    return { kind: 'err', reason, retryable: true }
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+function parseRoles(jobs: readonly unknown[]): FetchOk {
+  const valid: AshbyJobPosting[] = []
+  const droppedRoles: DroppedRole[] = []
+
+  for (const raw of jobs) {
+    const parsed = AshbyJobPostingSchema.safeParse(raw)
+    if (!parsed.success) {
+      droppedRoles.push({
+        title: extractTitle(raw),
+        reason: parsed.error.issues
+          .map((i) => `${i.path.join('.') || '<root>'}: ${i.message}`)
+          .join('; ')
+      })
+      continue
+    }
+    if (!parsed.data.isListed) continue
+    valid.push(parsed.data)
+  }
+
+  return { kind: 'ok', departments: groupByDepartment(valid), droppedRoles }
+}
+
+function extractTitle(raw: unknown): string {
+  if (
+    raw !== null &&
+    typeof raw === 'object' &&
+    'title' in raw &&
+    typeof (raw as { title: unknown }).title === 'string'
+  ) {
+    return (raw as { title: string }).title
+  }
+  return ''
+}
+
+const DEFAULT_DEPARTMENT = 'Other'
+const DEFAULT_LOCATION = 'Remote'
+
+function groupByDepartment(jobs: readonly AshbyJobPosting[]): Department[] {
+  const byKey = new Map<string, Department>()
+  for (const job of jobs) {
+    const displayDepartment = normalizeDepartment(job.department)
+    const name = displayDepartment.toUpperCase()
+    const key = slugify(name)
+    const existing = byKey.get(key)
+    const role = toDomainRole(job, displayDepartment)
+    if (existing) {
+      existing.roles.push(role)
+    } else {
+      byKey.set(key, { name, key, roles: [role] })
+    }
+  }
+  return [...byKey.values()].sort((a, b) => a.name.localeCompare(b.name))
+}
+
+function toDomainRole(job: AshbyJobPosting, department: string): Role {
+  const applyUrl = job.applyUrl ?? job.jobUrl
+  return {
+    id: createHash('sha1').update(applyUrl).digest('hex').slice(0, 16),
+    title: job.title,
+    department: capitalize(department),
+    location: (job.location ?? '').trim() || DEFAULT_LOCATION,
+    applyUrl
+  }
+}
+
+function normalizeDepartment(raw: string | undefined): string {
+  const trimmed = (raw ?? '').trim()
+  return trimmed.length > 0 ? trimmed : DEFAULT_DEPARTMENT
+}
+
+function slugify(value: string): string {
+  return value
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+}
+
+function capitalize(value: string): string {
+  return value.charAt(0).toUpperCase() + value.slice(1).toLowerCase()
+}
+
+async function readSnapshot(
+  snapshotUrl: URL | undefined
+): Promise<RolesSnapshot | null> {
+  if (!snapshotUrl) {
+    return isRolesSnapshot(bundledSnapshot) ? bundledSnapshot : null
+  }
+  try {
+    const text = await readFile(snapshotUrl, 'utf8')
+    const parsed: unknown = JSON.parse(text)
+    if (isRolesSnapshot(parsed)) return parsed
+    return null
+  } catch {
+    return null
+  }
+}
+
+function isRolesSnapshot(value: unknown): value is RolesSnapshot {
+  if (value === null || typeof value !== 'object') return false
+  const candidate = value as { fetchedAt?: unknown; departments?: unknown }
+  return (
+    typeof candidate.fetchedAt === 'string' &&
+    Array.isArray(candidate.departments)
+  )
+}
+
+function defaultSleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}

apps/website/tsconfig.json

@@ -8,8 +8,10 @@
   "include": [
     "src/**/*",
     "e2e/**/*",
+    "scripts/**/*",
     "astro.config.ts",
-    "playwright.config.ts"
+    "playwright.config.ts",
+    "vitest.config.ts"
   ],
   "exclude": ["src/**/*.stories.ts"],
   "references": [{ "path": "./tsconfig.stories.json" }]

apps/website/vitest.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.ts'],
+    globals: false
+  }
+})

browser_tests/README.md

@@ -51,6 +51,7 @@ DISABLE_VUE_PLUGINS=true
 # Test against dev server (recommended) or backend directly
 PLAYWRIGHT_TEST_URL=http://localhost:5173  # Dev server
 # PLAYWRIGHT_TEST_URL=http://localhost:8188  # Direct backend
+PLAYWRIGHT_SETUP_API_URL=http://localhost:8188  # Setup/auth API when using the dev server URL above
 
 # Path to ComfyUI for backing up user data/settings before tests
 TEST_COMFYUI_DIR=/path/to/your/ComfyUI

browser_tests/assets/widgets/painter_with_input.json

@@ -0,0 +1,74 @@
+{
+  "last_node_id": 2,
+  "last_link_id": 1,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "LoadImage",
+      "pos": [50, 50],
+      "size": [400, 314],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [1]
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["example.png", "image"]
+    },
+    {
+      "id": 1,
+      "type": "Painter",
+      "pos": [450, 50],
+      "size": [450, 550],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 1
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "Painter"
+      },
+      "widgets_values": ["", 512, 512, "#000000"]
+    }
+  ],
+  "links": [[1, 2, 0, 1, 0, "IMAGE"]],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "offset": [0, 0],
+      "scale": 1
+    }
+  },
+  "version": 0.4
+}

browser_tests/fixtures/ComfyPage.ts

@@ -137,6 +137,7 @@ class ComfyMenu {
 
 export class ComfyPage {
   public readonly url: string
+  public readonly apiUrl: string
   // All canvas position operations are based on default view of canvas.
   public readonly canvas: Locator
   public readonly selectionToolbox: Locator
@@ -195,6 +196,7 @@ export class ComfyPage {
     public readonly request: APIRequestContext
   ) {
     this.url = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
+    this.apiUrl = process.env.PLAYWRIGHT_SETUP_API_URL || this.url
     this.canvas = page.locator('#graph-canvas')
     this.selectionToolbox = page.getByTestId(TestIds.selectionToolbox.root)
     this.widgetTextBox = page.getByPlaceholder('text').nth(1)
@@ -236,7 +238,7 @@ export class ComfyPage {
   }
 
   async setupUser(username: string) {
-    const res = await this.request.get(`${this.url}/api/users`)
+    const res = await this.request.get(`${this.apiUrl}/api/users`)
     if (res.status() !== 200)
       throw new Error(`Failed to retrieve users: ${await res.text()}`)
 
@@ -250,7 +252,7 @@ export class ComfyPage {
   }
 
   async createUser(username: string) {
-    const resp = await this.request.post(`${this.url}/api/users`, {
+    const resp = await this.request.post(`${this.apiUrl}/api/users`, {
       data: { username }
     })
 
@@ -262,7 +264,7 @@ export class ComfyPage {
 
   async setupSettings(settings: Record<string, unknown>) {
     const resp = await this.request.post(
-      `${this.url}/api/devtools/set_settings`,
+      `${this.apiUrl}/api/devtools/set_settings`,
       {
         data: settings
       }

browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts

@@ -5,12 +5,14 @@ import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 export class ComfyNodeSearchBoxV2 {
   readonly dialog: Locator
   readonly input: Locator
+  readonly filterSearch: Locator
   readonly results: Locator
   readonly filterOptions: Locator
 
   constructor(readonly page: Page) {
     this.dialog = page.getByRole('search')
-    this.input = this.dialog.locator('input[type="text"]')
+    this.input = this.dialog.getByRole('combobox')
+    this.filterSearch = this.dialog.getByRole('textbox', { name: 'Search' })
     this.results = this.dialog.getByTestId('result-item')
     this.filterOptions = this.dialog.getByTestId('filter-option')
   }

browser_tests/fixtures/components/PublishDialog.ts

@@ -0,0 +1,72 @@
+import type { Locator, Page } from '@playwright/test'
+
+import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
+import { TestIds } from '@e2e/fixtures/selectors'
+
+export class PublishDialog extends BaseDialog {
+  readonly nav: Locator
+  readonly footer: Locator
+  readonly savePrompt: Locator
+  readonly describeStep: Locator
+  readonly finishStep: Locator
+  readonly profilePrompt: Locator
+  readonly gateFlow: Locator
+  readonly nameInput: Locator
+  readonly descriptionTextarea: Locator
+  readonly tagsInput: Locator
+  readonly backButton: Locator
+  readonly nextButton: Locator
+  readonly publishButton: Locator
+
+  constructor(page: Page) {
+    super(page, TestIds.publish.dialog)
+    this.nav = this.root.getByTestId(TestIds.publish.nav)
+    this.footer = this.root.getByTestId(TestIds.publish.footer)
+    this.savePrompt = this.root.getByTestId(TestIds.publish.savePrompt)
+    this.describeStep = this.root.getByTestId(TestIds.publish.describeStep)
+    this.finishStep = this.root.getByTestId(TestIds.publish.finishStep)
+    this.profilePrompt = this.root.getByTestId(TestIds.publish.profilePrompt)
+    this.gateFlow = this.root.getByTestId(TestIds.publish.gateFlow)
+    this.nameInput = this.root.getByTestId(TestIds.publish.nameInput)
+    this.descriptionTextarea = this.describeStep.locator('textarea')
+    this.tagsInput = this.root.getByTestId(TestIds.publish.tagsInput)
+    this.backButton = this.footer.getByRole('button', { name: 'Back' })
+    this.nextButton = this.footer.getByRole('button', { name: 'Next' })
+    this.publishButton = this.footer.getByRole('button', {
+      name: 'Publish to ComfyHub'
+    })
+  }
+
+  // Uses showPublishDialog() via Vite-bundled lazy imports that work in both
+  // dev and production, rather than clicking through the UI.
+  async open(): Promise<void> {
+    await this.page.evaluate(async () => {
+      await window.app!.extensionManager.dialog.showPublishDialog()
+    })
+    await this.waitForVisible()
+  }
+
+  tagSuggestion(name: string): Locator {
+    return this.describeStep.getByText(name, { exact: true })
+  }
+
+  navStep(label: string): Locator {
+    return this.nav.getByRole('button', { name: label })
+  }
+
+  currentNavStep(): Locator {
+    return this.nav.locator('[aria-current="step"]')
+  }
+
+  async goNext(): Promise<void> {
+    await this.nextButton.click()
+  }
+
+  async goBack(): Promise<void> {
+    await this.backButton.click()
+  }
+
+  async goToStep(label: string): Promise<void> {
+    await this.navStep(label).click()
+  }
+}

browser_tests/fixtures/components/SidebarTab.ts

@@ -250,6 +250,26 @@ export class ModelLibrarySidebarTab extends SidebarTab {
   }
 }
 
+type MediaFilterKind = 'image' | 'video' | 'audio' | '3d'
+type MediaFilterLabel = 'Image' | 'Video' | 'Audio' | '3D'
+
+function getMediaFilterLabel(
+  filter: MediaFilterKind | MediaFilterLabel
+): MediaFilterLabel {
+  switch (filter) {
+    case 'image':
+      return 'Image'
+    case 'video':
+      return 'Video'
+    case 'audio':
+      return 'Audio'
+    case '3d':
+      return '3D'
+    default:
+      return filter
+  }
+}
+
 export class AssetsSidebarTab extends SidebarTab {
   // --- Tab navigation ---
   public readonly generatedTab: Locator
@@ -261,6 +281,13 @@ export class AssetsSidebarTab extends SidebarTab {
   // --- Search & filter ---
   public readonly searchInput: Locator
   public readonly settingsButton: Locator
+  public readonly filterButton: Locator
+
+  // --- Filter menu checkboxes (cloud-only, shown inside filter popover) ---
+  public readonly filterImageCheckbox: Locator
+  public readonly filterVideoCheckbox: Locator
+  public readonly filterAudioCheckbox: Locator
+  public readonly filter3DCheckbox: Locator
 
   // --- View mode ---
   public readonly listViewOption: Locator
@@ -269,6 +296,8 @@ export class AssetsSidebarTab extends SidebarTab {
   // --- Sort options (cloud-only, shown inside settings popover) ---
   public readonly sortNewestFirst: Locator
   public readonly sortOldestFirst: Locator
+  public readonly sortLongestFirst: Locator
+  public readonly sortFastestFirst: Locator
 
   // --- Asset cards ---
   public readonly assetCards: Locator
@@ -299,10 +328,17 @@ export class AssetsSidebarTab extends SidebarTab {
     )
     this.searchInput = page.getByPlaceholder('Search Assets...')
     this.settingsButton = page.getByRole('button', { name: 'View settings' })
+    this.filterButton = page.getByRole('button', { name: 'Filter by' })
+    this.filterImageCheckbox = page.getByRole('checkbox', { name: 'Image' })
+    this.filterVideoCheckbox = page.getByRole('checkbox', { name: 'Video' })
+    this.filterAudioCheckbox = page.getByRole('checkbox', { name: 'Audio' })
+    this.filter3DCheckbox = page.getByRole('checkbox', { name: '3D' })
     this.listViewOption = page.getByText('List view')
     this.gridViewOption = page.getByText('Grid view')
     this.sortNewestFirst = page.getByText('Newest first')
     this.sortOldestFirst = page.getByText('Oldest first')
+    this.sortLongestFirst = page.getByText('Generation time (longest first)')
+    this.sortFastestFirst = page.getByText('Generation time (fastest first)')
     this.assetCards = page
       .getByRole('button')
       .and(page.locator('[data-selected]'))
@@ -334,6 +370,12 @@ export class AssetsSidebarTab extends SidebarTab {
     return this.page.getByText(title)
   }
 
+  filterCheckbox(filter: MediaFilterKind | MediaFilterLabel) {
+    return this.page.getByRole('checkbox', {
+      name: getMediaFilterLabel(filter)
+    })
+  }
+
   getAssetCardByName(name: string) {
     return this.assetCards.filter({ hasText: name })
   }
@@ -383,6 +425,29 @@ export class AssetsSidebarTab extends SidebarTab {
       .waitFor({ state: 'visible', timeout: 3000 })
   }
 
+  async openFilterMenu() {
+    await this.dismissToasts()
+    await this.filterButton.click()
+    await this.filterCheckbox('Image').waitFor({
+      state: 'visible',
+      timeout: 3000
+    })
+  }
+
+  async toggleMediaTypeFilter(
+    filter: MediaFilterKind | MediaFilterLabel
+  ): Promise<void> {
+    const checkbox = this.filterCheckbox(filter)
+    const before = await checkbox.getAttribute('aria-checked')
+    await checkbox.click()
+    const expected = before === 'true' ? 'false' : 'true'
+    await expect(checkbox).toHaveAttribute('aria-checked', expected)
+  }
+
+  async getAssetCardOrder(): Promise<string[]> {
+    return await this.assetCards.allInnerTexts()
+  }
+
   async rightClickAsset(name: string) {
     const card = this.getAssetCardByName(name)
     await card.click({ button: 'right' })

browser_tests/fixtures/components/SubgraphBreadcrumbPanel.ts

@@ -10,6 +10,8 @@ export class SubgraphBreadcrumbPanel {
   readonly activeItem: Locator
   readonly missingNodesIcon: Locator
   readonly blueprintTag: Locator
+  readonly rootItem: Locator
+  readonly rootBlueprintTag: Locator
 
   constructor(public readonly page: Page) {
     this.root = page.getByTestId(TestIds.breadcrumb.subgraph)
@@ -23,10 +25,10 @@ export class SubgraphBreadcrumbPanel {
       TestIds.breadcrumb.missingNodesIcon
     )
     this.blueprintTag = this.root.getByTestId(TestIds.breadcrumb.blueprintTag)
-  }
-
-  rootItem(): Locator {
-    return this.page.getByTestId(TestIds.breadcrumb.item('root'))
+    this.rootItem = page.getByTestId(TestIds.breadcrumb.item('root'))
+    this.rootBlueprintTag = this.rootItem.getByTestId(
+      TestIds.breadcrumb.blueprintTag
+    )
   }
 
   subgraphItem(subgraphId: string): Locator {

browser_tests/fixtures/helpers/AssetsHelper.ts

@@ -1,32 +1,72 @@
 import type { Page, Route } from '@playwright/test'
-import type { JobsListResponse } from '@comfyorg/ingest-types'
+import type {
+  CreateAssetExportData,
+  CreateAssetExportResponse,
+  JobsListResponse,
+  ListAssetsResponse
+} from '@comfyorg/ingest-types'
 
-import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type {
+  JobDetail,
+  RawJobListItem
+} from '@/platform/remote/comfyui/jobs/jobTypes'
 
-const jobsListRoutePattern = /\/api\/jobs(?:\?.*)?$/
+const jobsListRoutePattern = '**/api/jobs?*'
+const assetsListRoutePattern = /\/api\/assets(?:\?.*)?$/
+const assetExportRoutePattern = '**/api/assets/export'
 const inputFilesRoutePattern = /\/internal\/files\/input(?:\?.*)?$/
 const historyRoutePattern = /\/api\/history$/
 
+/**
+ * Media kinds supported by the assets sidebar filter UI. The string values
+ * match what the backend stores on `preview_output.mediaType` (`images` is
+ * intentionally plural to match existing API conventions; the others are
+ * singular as emitted by `useMediaAssetGalleryStore`).
+ *
+ * The sidebar filter ultimately matches on the filename extension, so the
+ * fixture also picks an extension-appropriate filename for each kind.
+ */
+export type MediaKindFixture = 'images' | 'video' | 'audio' | '3D'
+
+const DEFAULT_EXTENSION: Record<MediaKindFixture, string> = {
+  images: 'png',
+  video: 'mp4',
+  audio: 'wav',
+  '3D': 'glb'
+}
+
 /** Factory to create a mock completed job with preview output. */
 export function createMockJob(
-  overrides: Partial<RawJobListItem> & { id: string }
+  overrides: Partial<RawJobListItem> & {
+    id: string
+    /**
+     * Optional shorthand to set both `preview_output.mediaType` and an
+     * extension-appropriate filename. Ignored when `preview_output` is also
+     * supplied via `overrides`.
+     */
+    mediaKind?: MediaKindFixture
+  }
 ): RawJobListItem {
+  const { mediaKind, ...rest } = overrides
   const now = Date.now()
+  const extension = mediaKind ? DEFAULT_EXTENSION[mediaKind] : 'png'
+  const mediaType = mediaKind ?? 'images'
+
   return {
     status: 'completed',
     create_time: now,
     execution_start_time: now,
     execution_end_time: now + 5000,
     preview_output: {
-      filename: `output_${overrides.id}.png`,
+      filename: `output_${rest.id}.${extension}`,
       subfolder: '',
       type: 'output',
       nodeId: '1',
-      mediaType: 'images'
+      mediaType
     },
     outputs_count: 1,
     priority: 0,
-    ...overrides
+    ...rest
   }
 }
 
@@ -54,6 +94,46 @@ export function createMockJobs(
   )
 }
 
+/**
+ * Create one job per requested media kind, in the order supplied. Jobs share
+ * a stable timestamp ordering (newer first) so callers can rely on the result
+ * order when mediaType filters are inactive.
+ */
+export function createMixedMediaJobs(
+  kinds: MediaKindFixture[]
+): RawJobListItem[] {
+  const now = Date.now()
+  return kinds.map((kind, i) =>
+    createMockJob({
+      id: `${kind}-${String(i + 1).padStart(3, '0')}`,
+      mediaKind: kind,
+      create_time: now - i * 60_000,
+      execution_start_time: now - i * 60_000,
+      execution_end_time: now - i * 60_000 + 5000
+    })
+  )
+}
+
+/**
+ * Create jobs with explicit `(create_time, execution duration)` pairs so that
+ * sort assertions for newest/oldest and longest/fastest are unambiguous.
+ *
+ * Each spec entry yields a job whose `execution_end_time - execution_start_time`
+ * equals `durationMs`. The first spec becomes id `job-001`, etc.
+ */
+export function createJobsWithExecutionTimes(
+  specs: ReadonlyArray<{ createTime: number; durationMs: number }>
+): RawJobListItem[] {
+  return specs.map((spec, i) =>
+    createMockJob({
+      id: `job-${String(i + 1).padStart(3, '0')}`,
+      create_time: spec.createTime,
+      execution_start_time: spec.createTime,
+      execution_end_time: spec.createTime + spec.durationMs
+    })
+  )
+}
+
 /** Create mock imported file names with various media types. */
 export function createMockImportedFiles(count: number): string[] {
   const extensions = ['png', 'jpg', 'mp4', 'wav', 'glb', 'txt']
@@ -88,12 +168,23 @@ function getExecutionDuration(job: RawJobListItem): number {
 
 export class AssetsHelper {
   private jobsRouteHandler: ((route: Route) => Promise<void>) | null = null
+  private cloudAssetsRouteHandler: ((route: Route) => Promise<void>) | null =
+    null
+  private assetExportRouteHandler: ((route: Route) => Promise<void>) | null =
+    null
   private inputFilesRouteHandler: ((route: Route) => Promise<void>) | null =
     null
   private deleteHistoryRouteHandler: ((route: Route) => Promise<void>) | null =
     null
   private generatedJobs: RawJobListItem[] = []
+  private cloudAssetsResponse: ListAssetsResponse | null = null
+  private assetExportRequests: CreateAssetExportData['body'][] = []
+  private assetExportResponse: CreateAssetExportResponse | null = null
   private importedFiles: string[] = []
+  private readonly jobDetailRouteHandlers = new Map<
+    string,
+    (route: Route) => Promise<void>
+  >()
 
   constructor(private readonly page: Page) {}
 
@@ -170,6 +261,82 @@ export class AssetsHelper {
     await this.page.route(jobsListRoutePattern, this.jobsRouteHandler)
   }
 
+  async mockCloudAssets(response: ListAssetsResponse): Promise<void> {
+    this.cloudAssetsResponse = response
+
+    if (this.cloudAssetsRouteHandler) {
+      return
+    }
+
+    this.cloudAssetsRouteHandler = async (route: Route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(this.cloudAssetsResponse)
+      })
+    }
+
+    await this.page.route(assetsListRoutePattern, this.cloudAssetsRouteHandler)
+  }
+
+  async mockEmptyCloudAssets(): Promise<void> {
+    await this.mockCloudAssets({
+      assets: [],
+      total: 0,
+      has_more: false
+    })
+  }
+
+  async captureAssetExportRequests(
+    response: CreateAssetExportResponse = {
+      task_id: 'asset-export-task',
+      status: 'created'
+    }
+  ): Promise<CreateAssetExportData['body'][]> {
+    this.assetExportRequests = []
+    this.assetExportResponse = response
+
+    if (this.assetExportRouteHandler) {
+      return this.assetExportRequests
+    }
+
+    this.assetExportRouteHandler = async (route: Route) => {
+      this.assetExportRequests.push(
+        route.request().postDataJSON() as CreateAssetExportData['body']
+      )
+
+      await route.fulfill({
+        status: 202,
+        contentType: 'application/json',
+        body: JSON.stringify(this.assetExportResponse)
+      })
+    }
+
+    await this.page.route(assetExportRoutePattern, this.assetExportRouteHandler)
+
+    return this.assetExportRequests
+  }
+
+  async mockJobDetail(jobId: string, detail: JobDetail): Promise<void> {
+    const pattern = `**/api/jobs/${encodeURIComponent(jobId)}`
+    const existingHandler = this.jobDetailRouteHandlers.get(pattern)
+
+    if (existingHandler) {
+      await this.page.unroute(pattern, existingHandler)
+    }
+
+    const handler = async (route: Route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(detail)
+      })
+    }
+
+    this.jobDetailRouteHandlers.set(pattern, handler)
+    await this.page.route(pattern, handler)
+  }
+
   async mockInputFiles(files: string[]): Promise<void> {
     this.importedFiles = [...files]
 
@@ -225,6 +392,9 @@ export class AssetsHelper {
 
   async clearMocks(): Promise<void> {
     this.generatedJobs = []
+    this.cloudAssetsResponse = null
+    this.assetExportRequests = []
+    this.assetExportResponse = null
     this.importedFiles = []
 
     if (this.jobsRouteHandler) {
@@ -232,6 +402,22 @@ export class AssetsHelper {
       this.jobsRouteHandler = null
     }
 
+    if (this.cloudAssetsRouteHandler) {
+      await this.page.unroute(
+        assetsListRoutePattern,
+        this.cloudAssetsRouteHandler
+      )
+      this.cloudAssetsRouteHandler = null
+    }
+
+    if (this.assetExportRouteHandler) {
+      await this.page.unroute(
+        assetExportRoutePattern,
+        this.assetExportRouteHandler
+      )
+      this.assetExportRouteHandler = null
+    }
+
     if (this.inputFilesRouteHandler) {
       await this.page.unroute(
         inputFilesRoutePattern,
@@ -247,5 +433,10 @@ export class AssetsHelper {
       )
       this.deleteHistoryRouteHandler = null
     }
+
+    for (const [pattern, handler] of this.jobDetailRouteHandlers) {
+      await this.page.unroute(pattern, handler)
+    }
+    this.jobDetailRouteHandlers.clear()
   }
 }

browser_tests/fixtures/helpers/CloudAuthHelper.ts

@@ -13,7 +13,11 @@ import type { Page } from '@playwright/test'
  * so the SDK believes a user is signed in. Must be called before navigation.
  */
 export class CloudAuthHelper {
-  constructor(private readonly page: Page) {}
+  private readonly appUrl: string
+
+  constructor(private readonly page: Page) {
+    this.appUrl = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
+  }
 
   /**
    * Set up all auth mocks. Must be called before `comfyPage.setup()`.
@@ -34,7 +38,7 @@ export class CloudAuthHelper {
    */
   private async seedFirebaseIndexedDB(): Promise<void> {
     // Navigate to a lightweight endpoint to get a same-origin context
-    await this.page.goto('http://localhost:8188/api/users')
+    await this.page.goto(`${this.appUrl}/api/users`)
 
     await this.page.evaluate(() => {
       const MOCK_USER_DATA = {

browser_tests/fixtures/helpers/NodeOperationsHelper.ts

@@ -1,6 +1,10 @@
 import type { Locator } from '@playwright/test'
 
-import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type {
+  GraphAddOptions,
+  LGraph,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
 import type {
   ComfyWorkflowJSON,
   NodeId
@@ -39,6 +43,45 @@ export class NodeOperationsHelper {
     })
   }
 
+  async getSelectedNodeIds(): Promise<NodeId[]> {
+    return await this.page.evaluate(() => {
+      const selected = window.app?.canvas?.selected_nodes
+      if (!selected) return []
+      return Object.keys(selected).map(Number)
+    })
+  }
+
+  /**
+   * Add a node to the graph by type.
+   * @param type - The node type (e.g. 'KSampler', 'VAEDecode')
+   * @param options - GraphAddOptions (ghost, skipComputeOrder). When ghost is
+   *   true and cursorPosition is provided, a synthetic MouseEvent is created
+   *   as the dragEvent.
+   * @param cursorPosition - Client coordinates for ghost placement dragEvent
+   */
+  async addNode(
+    type: string,
+    options?: Omit<GraphAddOptions, 'dragEvent'>,
+    cursorPosition?: Position
+  ): Promise<NodeReference> {
+    const id = await this.page.evaluate(
+      ([nodeType, opts, cursor]) => {
+        const node = window.LiteGraph!.createNode(nodeType)!
+        const addOpts: Record<string, unknown> = { ...opts }
+        if (opts?.ghost && cursor) {
+          addOpts.dragEvent = new MouseEvent('click', {
+            clientX: cursor.x,
+            clientY: cursor.y
+          })
+        }
+        window.app!.graph.add(node, addOpts as GraphAddOptions)
+        return node.id
+      },
+      [type, options ?? {}, cursorPosition ?? null] as const
+    )
+    return new NodeReference(id, this.comfyPage)
+  }
+
   /** Remove all nodes from the graph and clean. */
   async clearGraph() {
     await this.comfyPage.settings.setSetting('Comfy.ConfirmClear', false)

browser_tests/fixtures/helpers/PublishApiHelper.ts

@@ -0,0 +1,231 @@
+import type { Page, Route } from '@playwright/test'
+
+import type {
+  AssetInfo,
+  HubAssetUploadUrlResponse,
+  HubLabelInfo,
+  HubLabelListResponse,
+  HubProfile,
+  WorkflowPublishInfo
+} from '@comfyorg/ingest-types'
+
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import { PublishDialog } from '@e2e/fixtures/components/PublishDialog'
+
+import type { ShareableAssetsResponse } from '@/schemas/apiSchema'
+
+const DEFAULT_PROFILE: HubProfile = {
+  username: 'testuser',
+  display_name: 'Test User',
+  description: 'A test creator',
+  avatar_url: undefined
+}
+
+const DEFAULT_TAG_LABELS: HubLabelInfo[] = [
+  { name: 'anime', display_name: 'anime', type: 'tag' },
+  { name: 'upscale', display_name: 'upscale', type: 'tag' },
+  { name: 'faceswap', display_name: 'faceswap', type: 'tag' },
+  { name: 'img2img', display_name: 'img2img', type: 'tag' },
+  { name: 'controlnet', display_name: 'controlnet', type: 'tag' }
+]
+
+const DEFAULT_PUBLISH_RESPONSE: WorkflowPublishInfo = {
+  workflow_id: 'test-workflow-id-456',
+  share_id: 'test-share-id-123',
+  publish_time: new Date().toISOString(),
+  listed: true,
+  assets: []
+}
+
+const DEFAULT_UPLOAD_URL_RESPONSE: HubAssetUploadUrlResponse = {
+  upload_url: 'https://mock-s3.example.com/upload',
+  public_url: 'https://mock-s3.example.com/asset.png',
+  token: 'mock-upload-token'
+}
+
+export class PublishApiHelper {
+  private routeHandlers: Array<{
+    pattern: string
+    handler: (route: Route) => Promise<void>
+  }> = []
+
+  constructor(private readonly page: Page) {}
+
+  async mockProfile(profile: HubProfile | null): Promise<void> {
+    await this.addRoute('**/hub/profiles/me', async (route) => {
+      if (route.request().method() !== 'GET') {
+        await route.continue()
+        return
+      }
+      if (profile === null) {
+        await route.fulfill({ status: 404, body: 'Not found' })
+      } else {
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(profile)
+        })
+      }
+    })
+  }
+
+  async mockTagLabels(
+    labels: HubLabelInfo[] = DEFAULT_TAG_LABELS
+  ): Promise<void> {
+    const response: HubLabelListResponse = { labels }
+    await this.addRoute('**/hub/labels**', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(response)
+      })
+    })
+  }
+
+  async mockPublishStatus(
+    status: 'unpublished' | WorkflowPublishInfo
+  ): Promise<void> {
+    await this.addRoute('**/userdata/*/publish', async (route) => {
+      if (route.request().method() !== 'GET') {
+        await route.continue()
+        return
+      }
+      if (status === 'unpublished') {
+        await route.fulfill({ status: 404, body: 'Not found' })
+      } else {
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(status)
+        })
+      }
+    })
+  }
+
+  async mockShareableAssets(assets: AssetInfo[] = []): Promise<void> {
+    const response: ShareableAssetsResponse = { assets }
+    await this.addRoute('**/assets/from-workflow', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(response)
+      })
+    })
+  }
+
+  async mockPublishWorkflow(
+    response: WorkflowPublishInfo = DEFAULT_PUBLISH_RESPONSE
+  ): Promise<void> {
+    await this.removeRoutes('**/hub/workflows')
+    await this.addRoute('**/hub/workflows', async (route) => {
+      if (route.request().method() !== 'POST') {
+        await route.continue()
+        return
+      }
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(response)
+      })
+    })
+  }
+
+  async mockPublishWorkflowError(
+    statusCode = 500,
+    message = 'Failed to publish workflow'
+  ): Promise<void> {
+    await this.removeRoutes('**/hub/workflows')
+    await this.addRoute('**/hub/workflows', async (route) => {
+      if (route.request().method() !== 'POST') {
+        await route.continue()
+        return
+      }
+      await route.fulfill({
+        status: statusCode,
+        contentType: 'application/json',
+        body: JSON.stringify({ message })
+      })
+    })
+  }
+
+  async mockUploadUrl(
+    response: HubAssetUploadUrlResponse = DEFAULT_UPLOAD_URL_RESPONSE
+  ): Promise<void> {
+    await this.addRoute('**/hub/assets/upload-url', async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(response)
+      })
+    })
+  }
+
+  async setupDefaultMocks(options?: {
+    hasProfile?: boolean
+    hasPrivateAssets?: boolean
+  }): Promise<void> {
+    const { hasProfile = true, hasPrivateAssets = false } = options ?? {}
+
+    await this.mockProfile(hasProfile ? DEFAULT_PROFILE : null)
+    await this.mockTagLabels()
+    await this.mockPublishStatus('unpublished')
+    await this.mockShareableAssets(
+      hasPrivateAssets
+        ? [
+            {
+              id: 'asset-1',
+              name: 'my_model.safetensors',
+              preview_url: '',
+              storage_url: '',
+              model: true,
+              public: false,
+              in_library: true
+            }
+          ]
+        : []
+    )
+    await this.mockPublishWorkflow()
+    await this.mockUploadUrl()
+  }
+
+  async cleanup(): Promise<void> {
+    for (const { pattern, handler } of this.routeHandlers) {
+      await this.page.unroute(pattern, handler)
+    }
+    this.routeHandlers = []
+  }
+
+  private async addRoute(
+    pattern: string,
+    handler: (route: Route) => Promise<void>
+  ): Promise<void> {
+    this.routeHandlers.push({ pattern, handler })
+    await this.page.route(pattern, handler)
+  }
+
+  private async removeRoutes(pattern: string): Promise<void> {
+    const handlers = this.routeHandlers.filter(
+      (route) => route.pattern === pattern
+    )
+    for (const { handler } of handlers) {
+      await this.page.unroute(pattern, handler)
+    }
+    this.routeHandlers = this.routeHandlers.filter(
+      (route) => route.pattern !== pattern
+    )
+  }
+}
+
+export const publishFixture = comfyPageFixture.extend<{
+  publishApi: PublishApiHelper
+  publishDialog: PublishDialog
+}>({
+  publishApi: async ({ comfyPage }, use) => {
+    const helper = new PublishApiHelper(comfyPage.page)
+    await use(helper)
+    await helper.cleanup()
+  },
+  publishDialog: async ({ comfyPage }, use) => {
+    await use(new PublishDialog(comfyPage.page))
+  }
+})

browser_tests/fixtures/selectors.ts

@@ -59,6 +59,9 @@ export const TestIds = {
     missingModelCopyName: 'missing-model-copy-name',
     missingModelCopyUrl: 'missing-model-copy-url',
     missingModelDownload: 'missing-model-download',
+    missingModelActions: 'missing-model-actions',
+    missingModelDownloadAll: 'missing-model-download-all',
+    missingModelRefresh: 'missing-model-refresh',
     missingModelImportUnsupported: 'missing-model-import-unsupported',
     missingMediaGroup: 'error-group-missing-media',
     missingMediaRow: 'missing-media-row',
@@ -209,6 +212,18 @@ export const TestIds = {
     imageLoadError: 'error-loading-image',
     videoLoadError: 'error-loading-video'
   },
+  publish: {
+    dialog: 'publish-dialog',
+    savePrompt: 'publish-save-prompt',
+    describeStep: 'publish-describe-step',
+    finishStep: 'publish-finish-step',
+    footer: 'publish-footer',
+    profilePrompt: 'publish-profile-prompt',
+    nav: 'publish-nav',
+    gateFlow: 'publish-gate-flow',
+    nameInput: 'publish-name-input',
+    tagsInput: 'publish-tags-input'
+  },
   loading: {
     overlay: 'loading-overlay'
   },

browser_tests/helpers/perfReporter.ts

@@ -56,7 +56,13 @@ export function writePerfReport(
   gitSha = process.env.GITHUB_SHA ?? 'local',
   branch = process.env.GITHUB_HEAD_REF ?? 'local'
 ) {
-  if (!readdirSync('test-results', { withFileTypes: true }).length) return
+  let entries
+  try {
+    entries = readdirSync('test-results', { withFileTypes: true })
+  } catch {
+    return
+  }
+  if (!entries.length) return
 
   let tempFiles: string[]
   try {

browser_tests/helpers/promotedWidgets.ts

@@ -1,6 +1,6 @@
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 
-type PromotedWidgetEntry = [string, string]
+export type PromotedWidgetEntry = [string, string]
 
 function isPromotedWidgetEntry(entry: unknown): entry is PromotedWidgetEntry {
   return (

browser_tests/tests/cloud-asset-default.spec.ts

@@ -1,4 +1,5 @@
 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'
@@ -12,25 +13,35 @@ function makeAssetsResponse(assets: Asset[]): ListAssetsResponse {
 }
 
 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<{ stubCloudAssets: void }>({
+const test = comfyPageFixture.extend<{
+  cloudAssetRequests: string[]
+  stubCloudAssets: void
+}>({
+  cloudAssetRequests: async ({ page: _page }, use) => {
+    await use([])
+  },
   stubCloudAssets: [
-    async ({ page }, use) => {
-      const pattern = '**/api/assets?*'
-      await page.route(pattern, (route) =>
-        route.fulfill({
+    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)
+      await page.unroute(pattern, assetsRouteHandler)
     },
     { auto: true }
   ]
@@ -42,23 +53,36 @@ test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
   })
 
   test('should use first cloud asset when server default is not in assets', async ({
+    cloudAssetRequests,
     comfyPage
   }) => {
-    // The default workflow contains a CheckpointLoaderSimple node whose
-    // server default (from object_info) is a local file not in cloud assets.
-    // Wait for the existing node's asset widget to mount, confirming the
-    // assets store has been populated from the stub before adding a new node.
+    // Wait for the checkpoint asset query to complete and the existing widget
+    // to upgrade into asset mode before creating a fresh node. The current
+    // default node may keep a previously resolved value; what matters is that
+    // 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')
+        })
+      )
+      .toBe(true)
+
     await expect
       .poll(
         () =>
-          comfyPage.page.evaluate(() => {
+          comfyPage.page.evaluate((waitingForWidgetType) => {
             const node = window.app!.graph.nodes.find(
               (n: { type: string }) => n.type === 'CheckpointLoaderSimple'
             )
-            return node?.widgets?.find(
-              (w: { name: string }) => w.name === 'ckpt_name'
-            )?.type
-          }),
+            return (
+              node?.widgets?.find(
+                (w: { name: string }) => w.name === 'ckpt_name'
+              )?.type ?? waitingForWidgetType
+            )
+          }, WAITING_FOR_WIDGET_TYPE),
         { timeout: 10_000 }
       )
       .toBe('asset')
@@ -81,15 +105,22 @@ test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
     await expect
       .poll(
         () =>
-          comfyPage.page.evaluate((id) => {
-            const node = window.app!.graph.getNodeById(id)
-            const widget = node?.widgets?.find(
-              (w: { name: string }) => w.name === 'ckpt_name'
-            )
-            if (widget?.type !== 'asset') return 'waiting:type'
-            const val = String(widget?.value ?? '')
-            return val === 'Select model' ? 'waiting:value' : val
-          }, nodeId),
+          comfyPage.page.evaluate(
+            ({ id, waitingForWidgetType, waitingForWidgetValue }) => {
+              const node = window.app!.graph.getNodeById(id)
+              const widget = node?.widgets?.find(
+                (w: { name: string }) => w.name === 'ckpt_name'
+              )
+              if (widget?.type !== 'asset') return waitingForWidgetType
+              const val = String(widget?.value ?? '')
+              return val === 'Select model' ? waitingForWidgetValue : val
+            },
+            {
+              id: nodeId,
+              waitingForWidgetType: WAITING_FOR_WIDGET_TYPE,
+              waitingForWidgetValue: WAITING_FOR_WIDGET_VALUE
+            }
+          ),
         { timeout: 15_000 }
       )
       .toBe(CLOUD_ASSETS[0].name)

browser_tests/tests/dialogs/publishDialog.spec.ts

@@ -0,0 +1,306 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { PublishDialog } from '@e2e/fixtures/components/PublishDialog'
+
+import { publishFixture as test } from '@e2e/fixtures/helpers/PublishApiHelper'
+
+const PUBLISH_FEATURE_FLAGS = {
+  comfyhub_upload_enabled: true,
+  comfyhub_profile_gate_enabled: true
+} as const
+
+async function saveAndOpenPublishDialog(
+  comfyPage: ComfyPage,
+  dialog: PublishDialog,
+  workflowName: string
+): Promise<void> {
+  await comfyPage.menu.topbar.saveWorkflow(workflowName)
+  const overwriteDialog = comfyPage.page.locator(
+    '.p-dialog:has-text("Overwrite")'
+  )
+  // Bounded wait: point-in-time isVisible() can miss dialogs that open
+  // slightly after saveWorkflow() resolves.
+  try {
+    await overwriteDialog.waitFor({ state: 'visible', timeout: 500 })
+    await comfyPage.confirmDialog.click('overwrite')
+  } catch {
+    // No overwrite dialog — workflow name was unique.
+  }
+
+  await dialog.open()
+}
+
+test.describe('Publish dialog - wizard navigation', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks()
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-publish-wf')
+  })
+
+  test('opens on the Describe step by default', async ({ publishDialog }) => {
+    await expect(publishDialog.describeStep).toBeVisible()
+    await expect(publishDialog.nameInput).toBeVisible()
+    await expect(publishDialog.descriptionTextarea).toBeVisible()
+  })
+
+  test('pre-fills workflow name from active workflow', async ({
+    publishDialog
+  }) => {
+    await expect(publishDialog.nameInput).toHaveValue(/test-publish-wf/)
+  })
+
+  test('Next button navigates to Examples step', async ({ publishDialog }) => {
+    await publishDialog.goNext()
+    await expect(publishDialog.describeStep).toBeHidden()
+    // Examples step should show thumbnail toggle and upload area
+    await expect(
+      publishDialog.root.getByText('Select a thumbnail')
+    ).toBeVisible()
+  })
+
+  test('Back button returns to Describe step from Examples', async ({
+    publishDialog
+  }) => {
+    await publishDialog.goNext()
+    await expect(publishDialog.describeStep).toBeHidden()
+
+    await publishDialog.goBack()
+    await expect(publishDialog.describeStep).toBeVisible()
+  })
+
+  test('navigates through all steps to Finish', async ({ publishDialog }) => {
+    await publishDialog.goNext() // → Examples
+    await publishDialog.goNext() // → Finish
+    await expect(publishDialog.finishStep).toBeVisible()
+    await expect(publishDialog.publishButton).toBeVisible()
+  })
+
+  test('clicking nav step navigates directly', async ({ publishDialog }) => {
+    await publishDialog.goToStep('Finish publishing')
+    await expect(publishDialog.finishStep).toBeVisible()
+
+    await publishDialog.goToStep('Describe your workflow')
+    await expect(publishDialog.describeStep).toBeVisible()
+  })
+
+  test('closes dialog via Escape key', async ({ comfyPage, publishDialog }) => {
+    await comfyPage.page.keyboard.press('Escape')
+    await expect(publishDialog.root).toBeHidden()
+  })
+})
+
+test.describe('Publish dialog - Describe step', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks()
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-describe-wf')
+  })
+
+  test('allows editing the workflow name', async ({ publishDialog }) => {
+    await publishDialog.nameInput.clear()
+    await publishDialog.nameInput.fill('My Custom Workflow')
+    await expect(publishDialog.nameInput).toHaveValue('My Custom Workflow')
+  })
+
+  test('allows editing the description', async ({ publishDialog }) => {
+    await publishDialog.descriptionTextarea.fill(
+      'A great workflow for anime art'
+    )
+    await expect(publishDialog.descriptionTextarea).toHaveValue(
+      'A great workflow for anime art'
+    )
+  })
+
+  test('displays tag suggestions from mocked API', async ({
+    publishDialog
+  }) => {
+    await expect(publishDialog.root.getByText('anime')).toBeVisible()
+    await expect(publishDialog.root.getByText('upscale')).toBeVisible()
+  })
+
+  // TODO(#11548): Tag click emits update:tags but the tag does not appear in
+  // the active list during E2E. Needs investigation of the parent state
+  // binding.
+  test.fixme('clicking a tag suggestion adds it', async ({ publishDialog }) => {
+    await publishDialog.root.getByText('anime').click()
+
+    await expect(publishDialog.tagsInput.getByText('anime')).toBeVisible()
+  })
+})
+
+test.describe('Publish dialog - Examples step', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks()
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-examples-wf')
+    await publishDialog.goNext() // Navigate to Examples step
+  })
+
+  test('shows thumbnail type toggle options', async ({ publishDialog }) => {
+    await expect(
+      publishDialog.root.getByText('Image', { exact: true })
+    ).toBeVisible()
+    await expect(
+      publishDialog.root.getByText('Video', { exact: true })
+    ).toBeVisible()
+    await expect(
+      publishDialog.root.getByText('Image comparison', { exact: true })
+    ).toBeVisible()
+  })
+
+  test('shows example image upload tile', async ({ publishDialog }) => {
+    await expect(
+      publishDialog.root.getByRole('button', { name: 'Upload example image' })
+    ).toBeVisible()
+  })
+})
+
+test.describe('Publish dialog - Finish step with profile', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks({ hasProfile: true })
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-finish-wf')
+    await publishDialog.goToStep('Finish publishing')
+  })
+
+  test('shows profile card with username', async ({ publishDialog }) => {
+    await expect(publishDialog.finishStep).toBeVisible()
+    await expect(publishDialog.root.getByText('@testuser')).toBeVisible()
+    await expect(publishDialog.root.getByText('Test User')).toBeVisible()
+  })
+
+  test('publish button is enabled when no private assets', async ({
+    publishDialog
+  }) => {
+    await expect(publishDialog.publishButton).toBeEnabled()
+  })
+})
+
+test.describe('Publish dialog - Finish step with private assets', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks({
+      hasProfile: true,
+      hasPrivateAssets: true
+    })
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-assets-wf')
+    await publishDialog.goToStep('Finish publishing')
+  })
+
+  test('publish button is disabled until assets acknowledged', async ({
+    publishDialog
+  }) => {
+    await expect(publishDialog.finishStep).toBeVisible()
+    await expect(publishDialog.publishButton).toBeDisabled()
+
+    const checkbox = publishDialog.finishStep.getByRole('checkbox')
+    await checkbox.check()
+
+    await expect(publishDialog.publishButton).toBeEnabled()
+  })
+})
+
+test.describe('Publish dialog - no profile', () => {
+  test.beforeEach(async ({ comfyPage, publishApi, publishDialog }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks({ hasProfile: false })
+    await saveAndOpenPublishDialog(
+      comfyPage,
+      publishDialog,
+      'test-noprofile-wf'
+    )
+    await publishDialog.goToStep('Finish publishing')
+  })
+
+  test('shows profile creation prompt when user has no profile', async ({
+    publishDialog
+  }) => {
+    await expect(publishDialog.profilePrompt).toBeVisible()
+    await expect(
+      publishDialog.root.getByText('Create a profile to publish to ComfyHub')
+    ).toBeVisible()
+  })
+
+  test('clicking create profile CTA shows profile creation form', async ({
+    publishDialog
+  }) => {
+    await publishDialog.root
+      .getByRole('button', { name: 'Create a profile' })
+      .click()
+    await expect(publishDialog.gateFlow).toBeVisible()
+  })
+})
+
+test.describe('Publish dialog - unsaved workflow', () => {
+  test.beforeEach(async ({ comfyPage, publishApi }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+    await publishApi.setupDefaultMocks()
+    // Don't save workflow — open dialog on the default temporary workflow
+  })
+
+  test('shows save prompt for temporary workflow', async ({
+    comfyPage,
+    publishDialog
+  }) => {
+    // Create a new workflow to ensure it's temporary
+    await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
+    await publishDialog.open()
+
+    await expect(publishDialog.savePrompt).toBeVisible()
+    await expect(
+      publishDialog.root.getByText(
+        'You must save your workflow before publishing'
+      )
+    ).toBeVisible()
+    // Nav should be hidden when save is required
+    await expect(publishDialog.nav).toBeHidden()
+  })
+})
+
+test.describe('Publish dialog - submission', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.featureFlags.setFlags(PUBLISH_FEATURE_FLAGS)
+  })
+
+  test('successful publish closes dialog', async ({
+    comfyPage,
+    publishApi,
+    publishDialog
+  }) => {
+    await publishApi.setupDefaultMocks({ hasProfile: true })
+    await saveAndOpenPublishDialog(comfyPage, publishDialog, 'test-submit-wf')
+    await publishDialog.goToStep('Finish publishing')
+    await expect(publishDialog.finishStep).toBeVisible()
+
+    await publishDialog.publishButton.click()
+    await expect(publishDialog.root).toBeHidden({ timeout: 10_000 })
+  })
+
+  test('failed publish shows error toast', async ({
+    comfyPage,
+    publishApi,
+    publishDialog
+  }) => {
+    await publishApi.setupDefaultMocks({ hasProfile: true })
+    // Override publish mock with error response
+    await publishApi.mockPublishWorkflowError(500, 'Internal error')
+
+    await saveAndOpenPublishDialog(
+      comfyPage,
+      publishDialog,
+      'test-submit-fail-wf'
+    )
+    await publishDialog.goToStep('Finish publishing')
+    await expect(publishDialog.finishStep).toBeVisible()
+
+    await publishDialog.publishButton.click()
+
+    // Error toast should appear
+    await expect(comfyPage.toast.visibleToasts.first()).toBeVisible({
+      timeout: 10_000
+    })
+    // Dialog should remain open
+    await expect(publishDialog.root).toBeVisible()
+  })
+})

browser_tests/tests/nodeGhostPlacement.spec.ts

@@ -22,18 +22,14 @@ async function addGhostAtCenter(comfyPage: ComfyPage) {
   await comfyPage.page.mouse.move(centerX, centerY)
   await comfyPage.nextFrame()
 
-  const nodeId = await comfyPage.page.evaluate(
-    ([clientX, clientY]) => {
-      const node = window.LiteGraph!.createNode('VAEDecode')!
-      const event = new MouseEvent('click', { clientX, clientY })
-      window.app!.graph.add(node, { ghost: true, dragEvent: event })
-      return node.id
-    },
-    [centerX, centerY] as const
+  const nodeRef = await comfyPage.nodeOps.addNode(
+    'VAEDecode',
+    { ghost: true },
+    { x: centerX, y: centerY }
   )
   await comfyPage.nextFrame()
 
-  return { nodeId, centerX, centerY }
+  return { nodeId: nodeRef.id, centerX, centerY }
 }
 
 function getNodeById(comfyPage: ComfyPage, nodeId: number | string) {
@@ -80,7 +76,6 @@ for (const mode of ['litegraph', 'vue'] as const) {
         },
         [centerX, centerY] as const
       )
-      await comfyPage.nextFrame()
 
       expect(Math.abs(result.diffX)).toBeLessThan(5)
       expect(Math.abs(result.diffY)).toBeLessThan(5)
@@ -153,5 +148,127 @@ for (const mode of ['litegraph', 'vue'] as const) {
       const after = await getNodeById(comfyPage, nodeId)
       expect(after).toBeNull()
     })
+
+    test('moving ghost onto existing node and clicking places correctly', async ({
+      comfyPage
+    }) => {
+      // Get existing KSampler node from the default workflow
+      const [ksamplerRef] =
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      const ksamplerPos = await ksamplerRef.getPosition()
+      const ksamplerSize = await ksamplerRef.getSize()
+      const targetX = Math.round(ksamplerPos.x + ksamplerSize.width / 2)
+      const targetY = Math.round(ksamplerPos.y + ksamplerSize.height / 2)
+
+      // Start ghost placement away from the existing node
+      const startX = 50
+      const startY = 50
+      await comfyPage.page.mouse.move(startX, startY, { steps: 20 })
+      await comfyPage.nextFrame()
+
+      const ghostRef = await comfyPage.nodeOps.addNode(
+        'VAEDecode',
+        { ghost: true },
+        { x: startX, y: startY }
+      )
+      await comfyPage.nextFrame()
+
+      // Move ghost onto the existing node
+      await comfyPage.page.mouse.move(targetX, targetY, { steps: 20 })
+      await comfyPage.nextFrame()
+
+      // Click to finalize — on top of the existing node
+      await comfyPage.page.mouse.click(targetX, targetY)
+      await comfyPage.nextFrame()
+
+      // Ghost should be placed (no longer ghost)
+      const ghostResult = await getNodeById(comfyPage, ghostRef.id)
+      expect(ghostResult).not.toBeNull()
+      expect(ghostResult!.ghost).toBe(false)
+
+      // Ghost node should have moved from its start position toward where we clicked
+      const ghostPos = await ghostRef.getPosition()
+      expect(
+        Math.abs(ghostPos.x - startX) > 20 || Math.abs(ghostPos.y - startY) > 20
+      ).toBe(true)
+
+      // Existing node should NOT be selected
+      const selectedIds = await comfyPage.nodeOps.getSelectedNodeIds()
+      expect(selectedIds).not.toContain(ksamplerRef.id)
+    })
+
+    test(
+      'subgraph blueprint added from search box enters ghost mode',
+      { tag: ['@subgraph'] },
+      async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeSearchBoxImpl',
+          'default'
+        )
+        await comfyPage.searchBoxV2.reload(comfyPage)
+
+        // Convert a node to a subgraph and publish it as a blueprint
+        const nodeRef = await comfyPage.nodeOps.getNodeRefById('3')
+        await nodeRef.click('title')
+        await comfyPage.nextFrame()
+        await comfyPage.command.executeCommand('Comfy.Graph.ConvertToSubgraph')
+        await comfyPage.nextFrame()
+        await comfyPage.nextFrame()
+        const subgraphNodes =
+          await comfyPage.nodeOps.getNodeRefsByTitle('New Subgraph')
+        expect(subgraphNodes).toHaveLength(1)
+        const subgraphNode = subgraphNodes[0]
+
+        const blueprintName = `ghost-test-${Date.now()}`
+        await subgraphNode.click('title')
+        await comfyPage.command.executeCommand('Comfy.PublishSubgraph', {
+          name: blueprintName
+        })
+        await expect(comfyPage.visibleToasts).toHaveCount(1, { timeout: 5000 })
+        await comfyPage.toast.closeToasts(1)
+
+        const nodeCountBefore = await comfyPage.nodeOps.getGraphNodesCount()
+
+        // Open v2 search box and search for the published blueprint
+        await comfyPage.canvasOps.doubleClick()
+        const { searchBoxV2 } = comfyPage
+        await expect(searchBoxV2.input).toBeVisible()
+
+        await searchBoxV2.input.fill(blueprintName)
+        await expect(searchBoxV2.results.first()).toBeVisible()
+
+        // Click the result to add the node (v2 search box uses ghost mode)
+        await searchBoxV2.results.first().click()
+        await comfyPage.nextFrame()
+
+        // A new node should exist on the graph in ghost mode
+        const nodeCountAfter = await comfyPage.nodeOps.getGraphNodesCount()
+        expect(nodeCountAfter).toBe(nodeCountBefore + 1)
+
+        const ghostNodeId = await comfyPage.page.evaluate(() => {
+          return window.app!.canvas.state.ghostNodeId
+        })
+        expect(ghostNodeId).not.toBeNull()
+
+        const ghostState = await getNodeById(comfyPage, ghostNodeId!)
+        expect(ghostState).not.toBeNull()
+        expect(ghostState!.ghost).toBe(true)
+
+        // Wait for search box to close, then click to confirm placement
+        await expect(searchBoxV2.input).toBeHidden()
+        await comfyPage.nextFrame()
+        const viewport = comfyPage.page.viewportSize()!
+        await comfyPage.page.mouse.click(
+          Math.round(viewport.width / 2),
+          Math.round(viewport.height / 2)
+        )
+        await comfyPage.nextFrame()
+
+        const afterPlace = await getNodeById(comfyPage, ghostNodeId!)
+        expect(afterPlace).not.toBeNull()
+        expect(afterPlace!.ghost).toBe(false)
+      }
+    )
   })
 }

browser_tests/tests/nodeSearchBoxV2.spec.ts

@@ -56,7 +56,9 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
   })
 
   test.describe('Category navigation', () => {
-    test('Favorites shows only bookmarked nodes', async ({ comfyPage }) => {
+    test('Bookmarked filter shows only bookmarked nodes', async ({
+      comfyPage
+    }) => {
       const { searchBoxV2 } = comfyPage
       await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
         'KSampler'
@@ -66,7 +68,7 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
       await comfyPage.canvasOps.doubleClick()
       await expect(searchBoxV2.input).toBeVisible()
 
-      await searchBoxV2.categoryButton('favorites').click()
+      await searchBoxV2.filterBarButton('Bookmarked').click()
 
       await expect(searchBoxV2.results).toHaveCount(1)
       await expect(searchBoxV2.results.first()).toContainText('KSampler')
@@ -101,7 +103,7 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
       await expect(searchBoxV2.filterOptions.first()).toBeVisible()
 
       // Type to narrow and select MODEL
-      await searchBoxV2.input.fill('MODEL')
+      await searchBoxV2.filterSearch.fill('MODEL')
       await searchBoxV2.filterOptions
         .filter({ hasText: 'MODEL' })
         .first()

browser_tests/tests/nodeSearchBoxV2Extended.spec.ts

@@ -97,7 +97,7 @@ test.describe('Node search box V2 extended', { tag: '@node' }, () => {
       // Apply Input filter with MODEL type
       await searchBoxV2.filterBarButton('Input').click()
       await expect(searchBoxV2.filterOptions.first()).toBeVisible()
-      await searchBoxV2.input.fill('MODEL')
+      await searchBoxV2.filterSearch.fill('MODEL')
       await searchBoxV2.filterOptions
         .filter({ hasText: 'MODEL' })
         .first()

browser_tests/tests/painter.spec.ts

@@ -163,7 +163,7 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
         .poll(() => cursor.evaluate((el: HTMLElement) => el.style.transform))
         .not.toBe(transform1)
 
-      await comfyPage.page.mouse.move(0, 0)
+      await comfyPage.page.mouse.move(box.x + box.width + 50, box.y)
       await expect(cursor).toBeHidden()
     })
 
@@ -187,7 +187,10 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
         box.y + box.height * 0.5,
         { steps: 10 }
       )
-      await comfyPage.page.mouse.move(box.x - 20, box.y + box.height * 0.5)
+      await comfyPage.page.mouse.move(
+        box.x + box.width + 20,
+        box.y + box.height * 0.5
+      )
       await comfyPage.page.mouse.up()
 
       await comfyPage.nextFrame()
@@ -408,6 +411,7 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
 
       await expect
         .poll(() => canvas.evaluate((el: HTMLCanvasElement) => el.width))
+        // default 512 + slider step 64 = 576
         .toBe(576)
     })
 
@@ -493,6 +497,29 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
           .toBe(false)
       }
     )
+
+    test('Clear on empty canvas is harmless', async ({ comfyPage }) => {
+      const painterWidget = comfyPage.vueNodes
+        .getNodeLocator('1')
+        .locator('.widget-expands')
+      const canvas = painterWidget.locator('canvas')
+
+      await expect
+        .poll(() => hasCanvasContent(canvas), {
+          message: 'canvas should start empty'
+        })
+        .toBe(false)
+
+      await painterWidget
+        .getByTestId('painter-clear-button')
+        .dispatchEvent('click')
+
+      await expect
+        .poll(() => hasCanvasContent(canvas), {
+          message: 'canvas should still be empty after clearing empty canvas'
+        })
+        .toBe(false)
+    })
   })
 
   test.describe('Serialization', () => {
@@ -560,36 +587,6 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
   })
 
   test.describe('Eraser', () => {
-    test('Eraser removes previously drawn content', async ({ comfyPage }) => {
-      const node = comfyPage.vueNodes.getNodeLocator('1')
-      const painterWidget = node.locator('.widget-expands')
-      const canvas = painterWidget.locator('canvas')
-      await expect(canvas).toBeVisible()
-
-      await drawStroke(comfyPage.page, canvas)
-      await comfyPage.nextFrame()
-      await expect.poll(() => hasCanvasContent(canvas)).toBe(true)
-
-      await painterWidget.getByRole('button', { name: 'Eraser' }).click()
-      await drawStroke(comfyPage.page, canvas)
-      await comfyPage.nextFrame()
-
-      await expect
-        .poll(
-          () =>
-            canvas.evaluate((el: HTMLCanvasElement) => {
-              const ctx = el.getContext('2d')
-              if (!ctx) return false
-              const cx = Math.floor(el.width / 2)
-              const cy = Math.floor(el.height / 2)
-              const { data } = ctx.getImageData(cx - 5, cy - 5, 10, 10)
-              return data.every((v, i) => i % 4 !== 3 || v === 0)
-            }),
-          { message: 'erased area should be transparent' }
-        )
-        .toBe(true)
-    })
-
     test('Eraser on empty canvas adds no content', async ({ comfyPage }) => {
       const node = comfyPage.vueNodes.getNodeLocator('1')
       const painterWidget = node.locator('.widget-expands')
@@ -604,18 +601,318 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
     })
   })
 
-  test('Multiple strokes accumulate on the canvas', async ({ comfyPage }) => {
+  test.describe('Serialization — unchanged canvas', () => {
+    test(
+      'Unchanged canvas does not re-upload on second serialization',
+      { tag: '@slow' },
+      async ({ comfyPage }) => {
+        let uploadCount = 0
+
+        await comfyPage.page.route('**/upload/image', async (route) => {
+          uploadCount++
+          const mockResponse: UploadImageResponse = { name: 'painter-test.png' }
+          await route.fulfill({
+            status: 200,
+            contentType: 'application/json',
+            body: JSON.stringify(mockResponse)
+          })
+        })
+
+        const canvas = comfyPage.vueNodes
+          .getNodeLocator('1')
+          .locator('.widget-expands canvas')
+
+        await drawStroke(comfyPage.page, canvas)
+        await triggerSerialization(comfyPage.page)
+        expect(uploadCount, 'first serialization should upload once').toBe(1)
+
+        await triggerSerialization(comfyPage.page)
+        expect(
+          uploadCount,
+          'second serialization without new drawing should not re-upload'
+        ).toBe(1)
+      }
+    )
+  })
+
+  test.describe('Settings persistence', () => {
+    test('Tool selection is saved to node properties', async ({
+      comfyPage
+    }) => {
+      const painterWidget = comfyPage.vueNodes
+        .getNodeLocator('1')
+        .locator('.widget-expands')
+
+      await painterWidget.getByRole('button', { name: 'Eraser' }).click()
+
+      await expect
+        .poll(
+          () =>
+            comfyPage.page.evaluate(() => {
+              const graph = window.graph as TestGraphAccess | undefined
+              return graph?._nodes_by_id?.['1']?.properties?.painterTool as
+                | string
+                | undefined
+            }),
+          { message: 'painterTool property should update to eraser' }
+        )
+        .toBe('eraser')
+    })
+
+    test('Brush size change is saved to node properties', async ({
+      comfyPage
+    }) => {
+      const sizeRow = comfyPage.vueNodes
+        .getNodeLocator('1')
+        .locator('.widget-expands')
+        .getByTestId('painter-size-row')
+      const sizeSlider = sizeRow.getByRole('slider')
+
+      await expect(
+        sizeRow.getByTestId('painter-size-value'),
+        'brush size should start at default 20'
+      ).toHaveText('20')
+
+      await sizeSlider.focus()
+      for (let i = 0; i < 10; i++) {
+        await sizeSlider.press('ArrowRight')
+      }
+
+      await expect
+        .poll(
+          () =>
+            comfyPage.page.evaluate(() => {
+              const graph = window.graph as TestGraphAccess | undefined
+              return graph?._nodes_by_id?.['1']?.properties
+                ?.painterBrushSize as number | undefined
+            }),
+          { message: 'painterBrushSize property should update to 30' }
+        )
+        .toBe(30)
+    })
+  })
+
+  test('Controls collapse to single column in compact mode', async ({
+    comfyPage
+  }) => {
+    const painterWidget = comfyPage.vueNodes
+      .getNodeLocator('1')
+      .locator('.widget-expands')
+    const toolLabel = painterWidget.getByText('Tool', { exact: true })
+
+    await expect(
+      toolLabel,
+      'tool label should be visible in two-column layout'
+    ).toBeVisible()
+
+    await comfyPage.page.evaluate(() => {
+      const graph = window.graph as TestGraphAccess | undefined
+      const node = graph?._nodes_by_id?.['1']
+      if (node) {
+        node.size = [200, 400]
+        window.app!.canvas.setDirty(true, true)
+      }
+    })
+
+    await expect(
+      toolLabel,
+      'tool label should hide in compact single-column layout'
+    ).toBeHidden()
+  })
+
+  test('Multiple sequential strokes at different positions all accumulate', async ({
+    comfyPage
+  }) => {
     const canvas = comfyPage.vueNodes
       .getNodeLocator('1')
       .locator('.widget-expands canvas')
     await expect(canvas).toBeVisible()
 
-    await drawStroke(comfyPage.page, canvas, { yPct: 0.3 })
+    await drawStroke(comfyPage.page, canvas, { yPct: 0.25 })
+    await drawStroke(comfyPage.page, canvas, { yPct: 0.5 })
+    await drawStroke(comfyPage.page, canvas, { yPct: 0.75 })
     await comfyPage.nextFrame()
-    await expect.poll(() => hasCanvasContent(canvas)).toBe(true)
 
-    await drawStroke(comfyPage.page, canvas, { yPct: 0.7 })
-    await comfyPage.nextFrame()
-    await expect.poll(() => hasCanvasContent(canvas)).toBe(true)
+    const hasContentAtRow = (yFraction: number) =>
+      canvas.evaluate((el: HTMLCanvasElement, y: number) => {
+        const ctx = el.getContext('2d')
+        if (!ctx) return false
+        const cy = Math.floor(el.height * y)
+        const { data } = ctx.getImageData(0, cy - 5, el.width, 10)
+        for (let i = 3; i < data.length; i += 4) {
+          if (data[i] > 0) return true
+        }
+        return false
+      }, yFraction)
+
+    await expect
+      .poll(() => hasContentAtRow(0.25), {
+        message: 'top stroke should be present'
+      })
+      .toBe(true)
+    await expect
+      .poll(() => hasContentAtRow(0.5), {
+        message: 'middle stroke should be present'
+      })
+      .toBe(true)
+    await expect
+      .poll(() => hasContentAtRow(0.75), {
+        message: 'bottom stroke should be present'
+      })
+      .toBe(true)
   })
 })
+
+test.describe(
+  'Painter — input image connection',
+  { tag: ['@widget', '@vue-nodes', '@slow'] },
+  () => {
+    test.setTimeout(60_000)
+
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.page.evaluate(() => window.app?.graph?.clear())
+      await comfyPage.workflow.loadWorkflow('widgets/painter_with_input')
+    })
+
+    test('Width, height, and bg_color controls hide when input is connected', async ({
+      comfyPage
+    }) => {
+      const painterWidget = comfyPage.vueNodes
+        .getNodeLocator('1')
+        .locator('.widget-expands')
+
+      await expect(
+        painterWidget.getByTestId('painter-width-row'),
+        'width row should be hidden when input is connected'
+      ).toBeHidden()
+      await expect(
+        painterWidget.getByTestId('painter-height-row'),
+        'height row should be hidden when input is connected'
+      ).toBeHidden()
+      await expect(
+        painterWidget.getByTestId('painter-bg-color-row'),
+        'background color row should be hidden when input is connected'
+      ).toBeHidden()
+      await expect(
+        painterWidget.getByTestId('painter-dimension-text'),
+        'dimension text should be visible when input is connected'
+      ).toBeVisible()
+    })
+
+    test('Canvas resizes to match input image dimensions after execution', async ({
+      comfyPage
+    }) => {
+      await comfyPage.runButton.click()
+
+      const node = comfyPage.vueNodes.getNodeLocator('1')
+      const img = node.locator('.widget-expands img')
+      await expect(
+        img,
+        'input image should appear after execution'
+      ).toBeVisible({
+        timeout: 30_000
+      })
+
+      await expect
+        .poll(
+          () =>
+            img.evaluate(
+              (el: HTMLImageElement) => el.complete && el.naturalWidth > 0
+            ),
+          {
+            message: 'input image should be fully decoded',
+            timeout: 30_000
+          }
+        )
+        .toBe(true)
+
+      const { nw, nh } = await img.evaluate((el: HTMLImageElement) => ({
+        nw: el.naturalWidth,
+        nh: el.naturalHeight
+      }))
+
+      const canvas = node.locator('.widget-expands canvas')
+      await expect
+        .poll(() => canvas.evaluate((el: HTMLCanvasElement) => el.width), {
+          message: 'canvas width should match input image natural width'
+        })
+        .toBe(nw)
+      await expect
+        .poll(() => canvas.evaluate((el: HTMLCanvasElement) => el.height), {
+          message: 'canvas height should match input image natural height'
+        })
+        .toBe(nh)
+    })
+
+    test('Drawing over input image produces content on canvas', async ({
+      comfyPage
+    }) => {
+      await comfyPage.runButton.click()
+
+      const node = comfyPage.vueNodes.getNodeLocator('1')
+      const img = node.locator('.widget-expands img')
+      await expect(
+        img,
+        'input image should appear after execution'
+      ).toBeVisible({
+        timeout: 30_000
+      })
+      await expect
+        .poll(
+          () =>
+            img.evaluate(
+              (el: HTMLImageElement) => el.complete && el.naturalWidth > 0
+            ),
+          { message: 'input image should be fully decoded', timeout: 30_000 }
+        )
+        .toBe(true)
+
+      const nw = await img.evaluate((el: HTMLImageElement) => el.naturalWidth)
+      const canvas = node.locator('.widget-expands canvas')
+      await expect
+        .poll(() => canvas.evaluate((el: HTMLCanvasElement) => el.width), {
+          message: 'canvas should resize to match input image width',
+          timeout: 15_000
+        })
+        .toBe(nw)
+
+      // Use dispatchEvent to bypass the LiteGraph canvas z-index overlay that
+      // intercepts coordinate-based hit testing from page.mouse
+      const box = await canvas.boundingBox()
+      if (!box) throw new Error('Canvas bounding box not found')
+      const startX = box.x + box.width * 0.3
+      const endX = box.x + box.width * 0.7
+      const midY = box.y + box.height * 0.5
+      const pointerOpts = {
+        bubbles: true,
+        cancelable: true,
+        pointerId: 1,
+        button: 0,
+        isPrimary: true
+      }
+      await canvas.dispatchEvent('pointerdown', {
+        ...pointerOpts,
+        clientX: startX,
+        clientY: midY
+      })
+      for (let i = 1; i <= 10; i++) {
+        await canvas.dispatchEvent('pointermove', {
+          ...pointerOpts,
+          clientX: startX + (endX - startX) * (i / 10),
+          clientY: midY
+        })
+      }
+      await canvas.dispatchEvent('pointerup', {
+        ...pointerOpts,
+        clientX: endX,
+        clientY: midY
+      })
+
+      await expect
+        .poll(() => hasCanvasContent(canvas), {
+          message: 'drawing over input image should produce canvas content'
+        })
+        .toBe(true)
+    })
+  }
+)

browser_tests/tests/propertiesPanel/errorsTabMissingModels.spec.ts

@@ -99,5 +99,58 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
       )
       await expect(downloadButton.first()).toBeVisible()
     })
+
+    test('Should render Download all and Refresh actions for one downloadable model', async ({
+      comfyPage
+    }) => {
+      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+
+      await expect(
+        comfyPage.page.getByTestId(TestIds.dialogs.missingModelActions)
+      ).toBeVisible()
+      await expect(
+        comfyPage.page.getByTestId(TestIds.dialogs.missingModelDownloadAll)
+      ).toBeVisible()
+      await expect(
+        comfyPage.page.getByTestId(TestIds.dialogs.missingModelRefresh)
+      ).toBeVisible()
+    })
+
+    test('Should clear resolved missing model when Refresh is clicked', async ({
+      comfyPage
+    }) => {
+      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+      await comfyPage.page.route(/\/object_info$/, async (route) => {
+        const response = await route.fetch()
+        const objectInfo = await response.json()
+        const ckptName =
+          objectInfo.CheckpointLoaderSimple.input.required.ckpt_name
+        ckptName[0] = [...ckptName[0], 'fake_model.safetensors']
+        await route.fulfill({ response, json: objectInfo })
+      })
+
+      const objectInfoResponse = comfyPage.page.waitForResponse((response) => {
+        const url = new URL(response.url())
+        return url.pathname.endsWith('/object_info') && response.ok()
+      })
+      const modelFoldersResponse = comfyPage.page.waitForResponse(
+        (response) => {
+          const url = new URL(response.url())
+          return url.pathname.endsWith('/experiment/models') && response.ok()
+        }
+      )
+      const refreshButton = comfyPage.page.getByTestId(
+        TestIds.dialogs.missingModelRefresh
+      )
+
+      await Promise.all([
+        objectInfoResponse,
+        modelFoldersResponse,
+        refreshButton.click()
+      ])
+      await expect(
+        comfyPage.page.getByTestId(TestIds.dialogs.missingModelsGroup)
+      ).toBeHidden()
+    })
   })
 })

browser_tests/tests/sidebar/assets-filter.spec.ts

@@ -0,0 +1,232 @@
+import { expect } from '@playwright/test'
+
+import type {
+  Asset,
+  JobsListResponse,
+  ListAssetsResponse
+} from '@comfyorg/ingest-types'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import { createMixedMediaJobs } from '@e2e/fixtures/helpers/AssetsHelper'
+
+// The assets sidebar's media-type filter menu only renders in cloud mode
+// (`MediaAssetFilterBar.vue` gates `MediaAssetFilterButton` behind `isCloud`).
+// We tag tests `@cloud` so they run against the cloud Playwright project,
+// and register both `/api/assets` and `/api/jobs` route handlers as auto
+// fixtures — Playwright runs auto fixtures before the `comfyPage` fixture's
+// internal `setup()`, so the page first-loads with mocks already in place.
+// See cloud-asset-default.spec.ts for the same pattern.
+
+const MIXED_JOBS = createMixedMediaJobs(['images', 'video', 'audio', '3D'])
+
+// MediaAssetCard renders the filename *without* extension via
+// getFilenameDetails(...).filename, so card-text matching uses the basename.
+function expectCardText(index: number): string {
+  const filename = MIXED_JOBS[index]?.preview_output?.filename
+  if (!filename) {
+    throw new Error(
+      `MIXED_JOBS[${index}].preview_output.filename is missing — ` +
+        'createMixedMediaJobs contract changed.'
+    )
+  }
+  return filename.replace(/\.[^.]+$/, '')
+}
+
+const imageCardName = expectCardText(0)
+const videoCardName = expectCardText(1)
+const audioCardName = expectCardText(2)
+const threeDCardName = expectCardText(3)
+
+function makeAssetsResponse(assets: Asset[]): ListAssetsResponse {
+  return { assets, total: assets.length, has_more: false }
+}
+
+function makeJobsResponseBody() {
+  return {
+    jobs: MIXED_JOBS,
+    pagination: {
+      offset: 0,
+      limit: MIXED_JOBS.length,
+      total: MIXED_JOBS.length,
+      has_more: false
+    }
+  } satisfies {
+    jobs: unknown[]
+    pagination: JobsListResponse['pagination']
+  }
+}
+
+const test = comfyPageFixture.extend<{
+  stubCloudAssets: void
+  stubJobs: void
+  stubInputFiles: void
+}>({
+  stubCloudAssets: [
+    async ({ page }, use) => {
+      const pattern = '**/api/assets?*'
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeAssetsResponse([]))
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ],
+  stubJobs: [
+    async ({ page }, use) => {
+      const pattern = /\/api\/jobs(?:\?.*)?$/
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeJobsResponseBody())
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ],
+  stubInputFiles: [
+    async ({ page }, use) => {
+      const pattern = /\/internal\/files\/input(?:\?.*)?$/
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify([])
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ]
+})
+
+test.describe('Assets sidebar - media type filter', { tag: '@cloud' }, () => {
+  test('Filter menu opens and exposes all four media-type checkboxes', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+
+    await expect(tab.filterImageCheckbox).toBeVisible()
+    await expect(tab.filterVideoCheckbox).toBeVisible()
+    await expect(tab.filterAudioCheckbox).toBeVisible()
+    await expect(tab.filter3DCheckbox).toBeVisible()
+    for (const cb of [
+      tab.filterImageCheckbox,
+      tab.filterVideoCheckbox,
+      tab.filterAudioCheckbox,
+      tab.filter3DCheckbox
+    ]) {
+      await expect(cb).toHaveAttribute('aria-checked', 'false')
+    }
+  })
+
+  test('Selecting only "Image" hides non-image assets', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('image')
+
+    await expect(tab.assetCards).toHaveCount(1)
+    await expect(tab.getAssetCardByName(imageCardName)).toBeVisible()
+    await expect(tab.getAssetCardByName(videoCardName)).toHaveCount(0)
+    await expect(tab.getAssetCardByName(audioCardName)).toHaveCount(0)
+    await expect(tab.getAssetCardByName(threeDCardName)).toHaveCount(0)
+  })
+
+  test('Selecting only "Video" hides non-video assets', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('video')
+
+    await expect(tab.assetCards).toHaveCount(1)
+    await expect(tab.getAssetCardByName(videoCardName)).toBeVisible()
+  })
+
+  test('Selecting only "Audio" hides non-audio assets', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('audio')
+
+    await expect(tab.assetCards).toHaveCount(1)
+    await expect(tab.getAssetCardByName(audioCardName)).toBeVisible()
+  })
+
+  test('Selecting only "3D" hides non-3D assets', async ({ comfyPage }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('3d')
+
+    await expect(tab.assetCards).toHaveCount(1)
+    await expect(tab.getAssetCardByName(threeDCardName)).toBeVisible()
+  })
+
+  test('Multiple filters combine via OR (image + video)', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('image')
+    await tab.toggleMediaTypeFilter('video')
+
+    await expect(tab.assetCards).toHaveCount(2)
+    await expect(tab.getAssetCardByName(imageCardName)).toBeVisible()
+    await expect(tab.getAssetCardByName(videoCardName)).toBeVisible()
+    await expect(tab.getAssetCardByName(audioCardName)).toHaveCount(0)
+    await expect(tab.getAssetCardByName(threeDCardName)).toHaveCount(0)
+  })
+
+  test('Unchecking the active filter restores previously hidden cards', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(MIXED_JOBS.length)
+
+    await tab.openFilterMenu()
+    await tab.toggleMediaTypeFilter('image')
+    await expect(tab.assetCards).toHaveCount(1)
+
+    await tab.toggleMediaTypeFilter('image')
+
+    // TODO(#11635): the 3D preview card does not remount after a filter
+    // toggle restores it (only image/video/audio reappear). Image, video,
+    // and audio cover the restoration path; once #11635 is fixed, add the
+    // 3D card back to this assertion list.
+    await expect(tab.getAssetCardByName(imageCardName)).toBeVisible({
+      timeout: 10_000
+    })
+    await expect(tab.getAssetCardByName(videoCardName)).toBeVisible()
+    await expect(tab.getAssetCardByName(audioCardName)).toBeVisible()
+  })
+})

browser_tests/tests/sidebar/assets-sort.spec.ts

@@ -0,0 +1,206 @@
+import { expect } from '@playwright/test'
+
+import type {
+  Asset,
+  JobsListResponse,
+  ListAssetsResponse
+} from '@comfyorg/ingest-types'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import { createJobsWithExecutionTimes } from '@e2e/fixtures/helpers/AssetsHelper'
+
+// The assets sidebar's sort options live inside the settings popover and are
+// only rendered in cloud mode (`MediaAssetFilterBar.vue`:
+// `:show-sort-options="isCloud"`). We tag tests `@cloud` so they run against
+// the cloud Playwright project, and register `/api/assets`, `/api/jobs`, and
+// `/internal/files/input` route handlers as auto fixtures — Playwright runs
+// auto fixtures before the `comfyPage` fixture's internal `setup()`, so the
+// page first-loads with mocks already in place.
+
+// Three jobs whose `(create_time, duration)` axes are intentionally
+// misaligned so newest/oldest and longest/fastest sorts produce *different*
+// orderings — preventing false-pass tests where one ordering accidentally
+// satisfies another.
+//
+//   spec      create_time    duration (ms)
+//   ----------------------------------------
+//   job-001       1000             5000      (oldest, mid duration)
+//   job-002       2000            10000      (mid age, longest)
+//   job-003       3000             3000      (newest, shortest)
+const SORT_JOBS = createJobsWithExecutionTimes([
+  { createTime: 1000, durationMs: 5000 },
+  { createTime: 2000, durationMs: 10000 },
+  { createTime: 3000, durationMs: 3000 }
+])
+
+// MediaAssetCard renders the filename *without* extension via
+// getFilenameDetails(...).filename, so card-text matching uses the basename.
+const NAME_BY_ID: Record<string, string> = {
+  'job-001': 'output_job-001',
+  'job-002': 'output_job-002',
+  'job-003': 'output_job-003'
+}
+
+function makeAssetsResponse(assets: Asset[]): ListAssetsResponse {
+  return { assets, total: assets.length, has_more: false }
+}
+
+function makeJobsResponseBody() {
+  return {
+    jobs: SORT_JOBS,
+    pagination: {
+      offset: 0,
+      limit: SORT_JOBS.length,
+      total: SORT_JOBS.length,
+      has_more: false
+    }
+  } satisfies {
+    jobs: unknown[]
+    pagination: JobsListResponse['pagination']
+  }
+}
+
+const test = comfyPageFixture.extend<{
+  stubCloudAssets: void
+  stubJobs: void
+  stubInputFiles: void
+}>({
+  stubCloudAssets: [
+    async ({ page }, use) => {
+      const pattern = '**/api/assets?*'
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeAssetsResponse([]))
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ],
+  stubJobs: [
+    async ({ page }, use) => {
+      const pattern = /\/api\/jobs(?:\?.*)?$/
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeJobsResponseBody())
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ],
+  stubInputFiles: [
+    async ({ page }, use) => {
+      const pattern = /\/internal\/files\/input(?:\?.*)?$/
+      await page.route(pattern, (route) =>
+        route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify([])
+        })
+      )
+      await use()
+      await page.unroute(pattern)
+    },
+    { auto: true }
+  ]
+})
+
+test.describe('Assets sidebar - sort options', { tag: '@cloud' }, () => {
+  test('Settings menu exposes all four sort options in cloud mode', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    await tab.openSettingsMenu()
+
+    await expect(tab.sortNewestFirst).toBeVisible()
+    await expect(tab.sortOldestFirst).toBeVisible()
+    await expect(tab.sortLongestFirst).toBeVisible()
+    await expect(tab.sortFastestFirst).toBeVisible()
+  })
+
+  test('Default order is newest first (descending create_time)', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    // Cards should appear in the order: job-003, job-002, job-001
+    await expect(tab.assetCards.nth(0)).toContainText(NAME_BY_ID['job-003'])
+    await expect(tab.assetCards.nth(1)).toContainText(NAME_BY_ID['job-002'])
+    await expect(tab.assetCards.nth(2)).toContainText(NAME_BY_ID['job-001'])
+  })
+
+  test('"Oldest first" reverses the order', async ({ comfyPage }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    await tab.openSettingsMenu()
+    await tab.sortOldestFirst.click()
+
+    await expect(tab.assetCards.nth(0)).toContainText(NAME_BY_ID['job-001'])
+    await expect(tab.assetCards.nth(1)).toContainText(NAME_BY_ID['job-002'])
+    await expect(tab.assetCards.nth(2)).toContainText(NAME_BY_ID['job-003'])
+  })
+
+  test('"Longest first" puts the slowest job at the top', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    await tab.openSettingsMenu()
+    await tab.sortLongestFirst.click()
+
+    // Expected: job-002 (10s), job-001 (5s), job-003 (3s)
+    await expect(tab.assetCards.nth(0)).toContainText(NAME_BY_ID['job-002'])
+    await expect(tab.assetCards.nth(1)).toContainText(NAME_BY_ID['job-001'])
+    await expect(tab.assetCards.nth(2)).toContainText(NAME_BY_ID['job-003'])
+  })
+
+  test('"Fastest first" puts the quickest job at the top', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    await tab.openSettingsMenu()
+    await tab.sortFastestFirst.click()
+
+    // Expected: job-003 (3s), job-001 (5s), job-002 (10s)
+    await expect(tab.assetCards.nth(0)).toContainText(NAME_BY_ID['job-003'])
+    await expect(tab.assetCards.nth(1)).toContainText(NAME_BY_ID['job-001'])
+    await expect(tab.assetCards.nth(2)).toContainText(NAME_BY_ID['job-002'])
+  })
+
+  test('Sort persists when the search input is edited', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets(SORT_JOBS.length)
+
+    await tab.openSettingsMenu()
+    await tab.sortOldestFirst.click()
+
+    // Type a query that matches all three jobs, then clear it; sort order
+    // must remain "oldest first".
+    await tab.searchInput.fill('output_job')
+    await tab.searchInput.fill('')
+
+    await expect(tab.assetCards.nth(0)).toContainText(NAME_BY_ID['job-001'])
+    await expect(tab.assetCards.nth(2)).toContainText(NAME_BY_ID['job-003'])
+  })
+})

browser_tests/tests/sidebar/assets.spec.ts

@@ -5,7 +5,10 @@ import {
   createMockJob,
   createMockJobs
 } from '@e2e/fixtures/helpers/AssetsHelper'
-import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type {
+  JobDetail,
+  RawJobListItem
+} from '@/platform/remote/comfyui/jobs/jobTypes'
 
 // ---------------------------------------------------------------------------
 // Shared fixtures
@@ -62,6 +65,37 @@ const SAMPLE_IMPORTED_FILES = [
   'audio_clip.wav'
 ]
 
+const JOB_GAMMA_DETAIL: JobDetail = {
+  ...SAMPLE_JOBS[2],
+  outputs: {
+    '3': {
+      images: [
+        {
+          filename: 'abstract_art.png',
+          subfolder: '',
+          type: 'output'
+        },
+        {
+          filename: 'abstract_art_alt.png',
+          subfolder: '',
+          type: 'output'
+        }
+      ]
+    }
+  }
+}
+
+const cloudTest = test.extend<{ mockCloudAssetSidebarData: void }>({
+  mockCloudAssetSidebarData: async ({ comfyPage }, use) => {
+    await comfyPage.assets.mockOutputHistory(SAMPLE_JOBS)
+    await comfyPage.assets.mockEmptyCloudAssets()
+
+    await use()
+
+    await comfyPage.assets.clearMocks()
+  }
+})
+
 // ==========================================================================
 // 1. Empty states
 // ==========================================================================
@@ -633,6 +667,96 @@ test.describe('Assets sidebar - bulk actions', () => {
   })
 })
 
+cloudTest.describe('Assets sidebar - cloud exports', { tag: '@cloud' }, () => {
+  cloudTest(
+    'Single job selection uses preserve naming strategy',
+    async ({ comfyPage, mockCloudAssetSidebarData }) => {
+      void mockCloudAssetSidebarData
+      const exportRequests = await comfyPage.assets.captureAssetExportRequests()
+
+      const tab = comfyPage.menu.assetsTab
+      await tab.open()
+      await tab.waitForAssets()
+
+      await tab.assetCards.first().click()
+      await expect(tab.downloadSelectedButton).toBeVisible()
+
+      await tab.downloadSelectedButton.click()
+
+      await expect.poll(() => exportRequests).toHaveLength(1)
+
+      const payload = exportRequests[0]
+      expect(payload.job_ids).toEqual(['job-gamma'])
+      expect(payload.job_asset_name_filters).toBeUndefined()
+      expect(payload.naming_strategy).toBe('preserve')
+    }
+  )
+
+  cloudTest(
+    'Multiple selected assets from one job use preserve naming strategy',
+    async ({ comfyPage, mockCloudAssetSidebarData }) => {
+      void mockCloudAssetSidebarData
+      const exportRequests = await comfyPage.assets.captureAssetExportRequests()
+      await comfyPage.assets.mockJobDetail('job-gamma', JOB_GAMMA_DETAIL)
+
+      const tab = comfyPage.menu.assetsTab
+      await tab.open()
+      await tab.waitForAssets()
+
+      await tab.assetCards
+        .first()
+        .getByRole('button', { name: 'See more outputs' })
+        .click()
+      await expect(tab.backToAssetsButton).toBeVisible()
+      await expect.poll(() => tab.assetCards.count()).toBe(2)
+
+      await tab.assetCards.first().click()
+      await comfyPage.page.keyboard.down('Control')
+      await tab.assetCards.nth(1).click()
+      await comfyPage.page.keyboard.up('Control')
+
+      await expect(tab.selectedCards).toHaveCount(2)
+      await tab.downloadSelectedButton.click()
+
+      await expect.poll(() => exportRequests).toHaveLength(1)
+
+      const payload = exportRequests[0]
+      expect(payload.job_ids).toEqual(['job-gamma'])
+      expect(payload.job_asset_name_filters?.['job-gamma']?.toSorted()).toEqual(
+        ['abstract_art.png', 'abstract_art_alt.png']
+      )
+      expect(payload.naming_strategy).toBe('preserve')
+    }
+  )
+
+  cloudTest(
+    'Multiple selected jobs use job-time naming strategy',
+    async ({ comfyPage, mockCloudAssetSidebarData }) => {
+      void mockCloudAssetSidebarData
+      const exportRequests = await comfyPage.assets.captureAssetExportRequests()
+
+      const tab = comfyPage.menu.assetsTab
+      await tab.open()
+      await tab.waitForAssets()
+
+      await tab.assetCards.nth(1).click()
+      await comfyPage.page.keyboard.down('Control')
+      await tab.assetCards.nth(2).click()
+      await comfyPage.page.keyboard.up('Control')
+
+      await expect(tab.selectedCards).toHaveCount(2)
+      await tab.downloadSelectedButton.click()
+
+      await expect.poll(() => exportRequests).toHaveLength(1)
+
+      const payload = exportRequests[0]
+      expect(payload.job_ids?.toSorted()).toEqual(['job-alpha', 'job-beta'])
+      expect(payload.job_asset_name_filters).toBeUndefined()
+      expect(payload.naming_strategy).toBe('group_by_job_time')
+    }
+  )
+})
+
 // ==========================================================================
 // 9. Pagination
 // ==========================================================================
@@ -772,3 +896,119 @@ test.describe('Assets sidebar - delete confirmation', () => {
     await expect(tab.assetCards).toHaveCount(initialCount)
   })
 })
+
+// ==========================================================================
+// 12. Media type filter (cloud-only)
+// ==========================================================================
+
+const MIXED_MEDIA_JOBS: RawJobListItem[] = [
+  createMockJob({
+    id: 'job-image',
+    create_time: 1000,
+    execution_start_time: 1000,
+    execution_end_time: 1010,
+    preview_output: {
+      filename: 'photo.png',
+      subfolder: '',
+      type: 'output',
+      nodeId: '1',
+      mediaType: 'images'
+    },
+    outputs_count: 1
+  }),
+  createMockJob({
+    id: 'job-video',
+    create_time: 2000,
+    execution_start_time: 2000,
+    execution_end_time: 2010,
+    preview_output: {
+      filename: 'clip.mp4',
+      subfolder: '',
+      type: 'output',
+      nodeId: '2',
+      mediaType: 'video'
+    },
+    outputs_count: 1
+  }),
+  createMockJob({
+    id: 'job-audio',
+    create_time: 3000,
+    execution_start_time: 3000,
+    execution_end_time: 3010,
+    preview_output: {
+      filename: 'track.mp3',
+      subfolder: '',
+      type: 'output',
+      nodeId: '3',
+      mediaType: 'audio'
+    },
+    outputs_count: 1
+  })
+]
+
+// Filter button is guarded by isCloud (compile-time). The cloud CI project
+// cannot use comfyPageFixture (auth required). Enable once cloud E2E infra
+// supports authenticated comfyPage setup.
+test.describe('Assets sidebar - media type filter', () => {
+  test.fixme(true, 'Requires DISTRIBUTION=cloud build with auth bypass')
+
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.assets.mockOutputHistory(MIXED_MEDIA_JOBS)
+    await comfyPage.assets.mockInputFiles([])
+    await comfyPage.setup()
+  })
+
+  test.afterEach(async ({ comfyPage }) => {
+    await comfyPage.assets.clearMocks()
+  })
+
+  test('Filter menu shows media type options', async ({ comfyPage }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+
+    await tab.openFilterMenu()
+
+    await expect(tab.filterCheckbox('Image')).toBeVisible()
+    await expect(tab.filterCheckbox('Video')).toBeVisible()
+    await expect(tab.filterCheckbox('Audio')).toBeVisible()
+    await expect(tab.filterCheckbox('3D')).toBeVisible()
+  })
+
+  test('Unchecking image filter hides image assets', async ({ comfyPage }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets()
+
+    const initialCount = tab.assetCards
+    await expect(
+      initialCount,
+      'All three mixed-media jobs should render'
+    ).toHaveCount(3)
+
+    // Open filter menu and enable only image filter (selecting a filter
+    // restricts to that type only, hiding unselected types)
+    await tab.openFilterMenu()
+    await tab.filterCheckbox('Image').click()
+
+    // Only the image asset should remain
+    await expect(tab.assetCards).toHaveCount(1, { timeout: 5000 })
+    await expect(tab.getAssetCardByName('photo.png')).toBeVisible()
+  })
+
+  test('Re-enabling filter restores hidden assets', async ({ comfyPage }) => {
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+    await tab.waitForAssets()
+
+    const initialCount = await tab.assetCards.count()
+
+    // Enable image filter to restrict to images only
+    await tab.openFilterMenu()
+    await tab.filterCheckbox('Image').click()
+    await expect(tab.assetCards).toHaveCount(1, { timeout: 5000 })
+
+    // Uncheck image filter to remove all filters (restores all assets)
+    await tab.filterCheckbox('Image').click()
+    await expect(tab.assetCards).toHaveCount(initialCount, { timeout: 5000 })
+  })
+})

browser_tests/tests/subgraph/subgraphBreadcrumb.spec.ts

@@ -251,7 +251,7 @@ test.describe('Subgraph Breadcrumb', { tag: ['@subgraph'] }, () => {
     await comfyPage.workflow.loadWorkflow(NESTED_WORKFLOW)
     await enterNestedSubgraphs(comfyPage)
 
-    await expect(subgraphBreadcrumb.panel.rootItem()).toBeAttached()
+    await expect(subgraphBreadcrumb.panel.rootItem).toBeAttached()
     await expect(
       subgraphBreadcrumb.panel.subgraphItem(SUBGRAPH_2_ID)
     ).toContainText(SUBGRAPH_2_NAME)
@@ -265,12 +265,65 @@ test.describe('Subgraph Breadcrumb', { tag: ['@subgraph'] }, () => {
     )
   })
 
+  test(
+    'shows Blueprint tag only when editing a published blueprint',
+    {
+      tag: ['@vue-nodes']
+    },
+    async ({ comfyPage, subgraphBreadcrumb }) => {
+      const { panel } = subgraphBreadcrumb
+      const blueprintName = `bp-breadcrumb-tag-${Date.now()}`
+
+      await test.step('Tag is not shown on a normal workflow', async () => {
+        await expect(panel.blueprintTag).toHaveCount(0)
+      })
+
+      await test.step('Convert to Subgraph', async () => {
+        const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+        await comfyPage.contextMenu.openForVueNode(ksampler.header)
+        await comfyPage.contextMenu.clickMenuItemExact('Convert to Subgraph')
+      })
+
+      const subgraphNodeId = await comfyPage.subgraph.findSubgraphNodeId()
+      const subgraphNode =
+        await comfyPage.nodeOps.getNodeRefById(subgraphNodeId)
+
+      await test.step('Unpublished subgraph does not show the blueprint tag', async () => {
+        await subgraphNode.centerOnNode()
+        await comfyPage.vueNodes.enterSubgraph(subgraphNodeId)
+        await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+        await expect(panel.blueprintTag).toHaveCount(0)
+        await comfyPage.subgraph.exitViaBreadcrumb()
+      })
+
+      await test.step('Publish the subgraph as a blueprint', async () => {
+        await subgraphNode.click('title')
+        await comfyPage.subgraph.publishSubgraph(blueprintName)
+      })
+
+      await test.step('Open the blueprint from the node library', async () => {
+        const tab = comfyPage.menu.nodeLibraryTabV2
+        await tab.open()
+        await tab.getFolder('My Blueprints').click()
+        await tab.getFolder('User').click()
+
+        const blueprintNode = tab.getNode(blueprintName)
+        await expect(blueprintNode).toBeVisible()
+        await blueprintNode.getByRole('button', { name: 'Edit' }).click()
+      })
+
+      await test.step('Blueprint tag renders on the root breadcrumb', async () => {
+        await expect(panel.rootBlueprintTag).toBeVisible()
+      })
+    }
+  )
+
   test('collapses when overflowing and expands when there is room', async ({
     comfyPage,
     subgraphBreadcrumb
   }) => {
     const { panel } = subgraphBreadcrumb
-    const rootItem = panel.rootItem()
+    const rootItem = panel.rootItem
     const subgraph2Item = panel.subgraphItem(SUBGRAPH_2_ID)
     const subgraph3Item = panel.subgraphItem(SUBGRAPH_3_ID)
     const originalViewport = comfyPage.page.viewportSize()

browser_tests/tests/subgraph/subgraphSerialization.spec.ts

@@ -1,39 +1,73 @@
 import { expect } from '@playwright/test'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { getPromotedWidgets } from '@e2e/helpers/promotedWidgets'
+import { comfyExpect, comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { SubgraphHelper } from '@e2e/fixtures/helpers/SubgraphHelper'
+import { TestIds } from '@e2e/fixtures/selectors'
+import type { PromotedWidgetEntry } from '@e2e/helpers/promotedWidgets'
+import {
+  getPromotedWidgetCount,
+  getPromotedWidgetNames,
+  getPromotedWidgets
+} from '@e2e/helpers/promotedWidgets'
 
 const DUPLICATE_IDS_WORKFLOW = 'subgraphs/subgraph-nested-duplicate-ids'
 const LEGACY_PREFIXED_WORKFLOW =
   'subgraphs/nested-subgraph-legacy-prefixed-proxy-widgets'
+const MULTI_INSTANCE_WORKFLOW =
+  'subgraphs/subgraph-multi-instance-promoted-text-values'
 
-test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
-  const getPromotedHostWidgetValues = async (
-    comfyPage: ComfyPage,
-    nodeIds: string[]
-  ) => {
-    return comfyPage.page.evaluate((ids) => {
-      const graph = window.app!.canvas.graph!
+async function expectPromotedWidgetsToResolveToInteriorNodes(
+  comfyPage: ComfyPage,
+  hostSubgraphNodeId: string,
+  widgets: PromotedWidgetEntry[]
+) {
+  expect(widgets.length).toBeGreaterThan(0)
+
+  const interiorNodeIds = widgets.map(([id]) => id)
+  const results = await comfyPage.page.evaluate(
+    ([hostId, ids]) => {
+      const graph = window.app!.graph!
+      const hostNode = graph.getNodeById(Number(hostId))
+      if (!hostNode?.isSubgraphNode()) return ids.map(() => false)
 
       return ids.map((id) => {
-        const node = graph.getNodeById(id)
-        if (
-          !node ||
-          typeof node.isSubgraphNode !== 'function' ||
-          !node.isSubgraphNode()
-        ) {
-          return { id, values: [] as unknown[] }
-        }
-
-        return {
-          id,
-          values: (node.widgets ?? []).map((widget) => widget.value)
-        }
+        const interiorNode = hostNode.subgraph.getNodeById(Number(id))
+        return interiorNode !== null && interiorNode !== undefined
       })
-    }, nodeIds)
-  }
+    },
+    [hostSubgraphNodeId, interiorNodeIds] as const
+  )
 
+  expect(results).toEqual(widgets.map(() => true))
+}
+
+async function getPromotedHostWidgetValues(
+  comfyPage: ComfyPage,
+  nodeIds: string[]
+) {
+  return comfyPage.page.evaluate((ids) => {
+    const graph = window.app!.canvas.graph!
+
+    return ids.map((id) => {
+      const node = graph.getNodeById(id)
+      if (
+        !node ||
+        typeof node.isSubgraphNode !== 'function' ||
+        !node.isSubgraphNode()
+      ) {
+        return { id, values: [] as unknown[] }
+      }
+
+      return {
+        id,
+        values: (node.widgets ?? []).map((widget) => widget.value)
+      }
+    })
+  }, nodeIds)
+}
+
+test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
   test('Promoted widget remains usable after serialize and reload', async ({
     comfyPage
   }) => {
@@ -86,54 +120,434 @@ test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
     await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(false)
   })
 
-  test.describe('Legacy prefixed proxyWidget normalization', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
-    })
-
-    test('Legacy-prefixed promoted widget renders with the normalized label after load', async ({
+  test.describe('Deterministic proxyWidgets Hydrate', () => {
+    test('proxyWidgets entries map to real interior node IDs after load', async ({
       comfyPage
     }) => {
-      await comfyPage.workflow.loadWorkflow(LEGACY_PREFIXED_WORKFLOW)
-      await comfyPage.vueNodes.waitForNodes()
-
-      const outerNode = comfyPage.vueNodes.getNodeLocator('5')
-      await expect(outerNode).toBeVisible()
-
-      const textarea = outerNode
-        .getByRole('textbox', { name: 'string_a' })
-        .first()
-      await expect(textarea).toBeVisible()
-      await expect(textarea).toBeDisabled()
-    })
-
-    test('Multiple instances of the same subgraph keep distinct promoted widget values after load and reload', async ({
-      comfyPage
-    }) => {
-      const workflowName =
-        'subgraphs/subgraph-multi-instance-promoted-text-values'
-      const hostNodeIds = ['11', '12', '13']
-      const expectedValues = ['Alpha\n', 'Beta\n', 'Gamma\n']
-
-      await comfyPage.workflow.loadWorkflow(workflowName)
-
-      const initialValues = await getPromotedHostWidgetValues(
-        comfyPage,
-        hostNodeIds
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-promoted-text-widget'
       )
-      expect(initialValues.map(({ values }) => values[0])).toEqual(
-        expectedValues
+
+      const widgets = await getPromotedWidgets(comfyPage, '11')
+      expect(widgets.length).toBeGreaterThan(0)
+
+      for (const [interiorNodeId] of widgets) {
+        expect(Number(interiorNodeId)).toBeGreaterThan(0)
+      }
+
+      await expectPromotedWidgetsToResolveToInteriorNodes(
+        comfyPage,
+        '11',
+        widgets
+      )
+    })
+
+    test('proxyWidgets entries survive double round-trip without drift', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-multiple-promoted-widgets'
+      )
+
+      const initialWidgets = await getPromotedWidgets(comfyPage, '11')
+      expect(initialWidgets.length).toBeGreaterThan(0)
+      await expectPromotedWidgetsToResolveToInteriorNodes(
+        comfyPage,
+        '11',
+        initialWidgets
       )
 
       await comfyPage.subgraph.serializeAndReload()
 
-      const reloadedValues = await getPromotedHostWidgetValues(
+      const afterFirst = await getPromotedWidgets(comfyPage, '11')
+      await expectPromotedWidgetsToResolveToInteriorNodes(
         comfyPage,
-        hostNodeIds
+        '11',
+        afterFirst
       )
-      expect(reloadedValues.map(({ values }) => values[0])).toEqual(
-        expectedValues
+
+      await comfyPage.subgraph.serializeAndReload()
+
+      const afterSecond = await getPromotedWidgets(comfyPage, '11')
+      await expectPromotedWidgetsToResolveToInteriorNodes(
+        comfyPage,
+        '11',
+        afterSecond
+      )
+
+      expect(afterFirst).toEqual(initialWidgets)
+      expect(afterSecond).toEqual(initialWidgets)
+    })
+
+    test('Compressed target_slot (-1) entries are hydrated to real IDs', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-compressed-target-slot'
+      )
+
+      const widgets = await getPromotedWidgets(comfyPage, '2')
+      expect(widgets.length).toBeGreaterThan(0)
+
+      for (const [interiorNodeId] of widgets) {
+        expect(interiorNodeId).not.toBe('-1')
+        expect(Number(interiorNodeId)).toBeGreaterThan(0)
+      }
+
+      await expectPromotedWidgetsToResolveToInteriorNodes(
+        comfyPage,
+        '2',
+        widgets
       )
     })
   })
+
+  test.describe('Legacy And Round-Trip Coverage', () => {
+    let previousUseNewMenu: unknown
+
+    test.beforeEach(async ({ comfyPage }) => {
+      previousUseNewMenu =
+        await comfyPage.settings.getSetting('Comfy.UseNewMenu')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    })
+
+    test.afterEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.UseNewMenu',
+        previousUseNewMenu
+      )
+    })
+
+    test('Legacy -1 proxyWidgets entries are hydrated to concrete interior node IDs', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-compressed-target-slot'
+      )
+
+      const promotedWidgets = await getPromotedWidgets(comfyPage, '2')
+      expect(promotedWidgets.length).toBeGreaterThan(0)
+      expect(
+        promotedWidgets.some(([interiorNodeId]) => interiorNodeId === '-1')
+      ).toBe(false)
+      expect(
+        promotedWidgets.some(
+          ([interiorNodeId, widgetName]) =>
+            interiorNodeId !== '-1' && widgetName === 'batch_size'
+        )
+      ).toBe(true)
+    })
+
+    test('Promoted widgets survive serialize -> loadGraphData round-trip', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-promoted-text-widget'
+      )
+
+      const beforePromoted = await getPromotedWidgetNames(comfyPage, '11')
+      expect(beforePromoted).toContain('text')
+
+      await comfyPage.subgraph.serializeAndReload()
+
+      const afterPromoted = await getPromotedWidgetNames(comfyPage, '11')
+      expect(afterPromoted).toContain('text')
+
+      const widgetCount = await getPromotedWidgetCount(comfyPage, '11')
+      expect(widgetCount).toBeGreaterThan(0)
+    })
+
+    test('Multi-link input representative stays stable through save/reload', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-multiple-promoted-widgets'
+      )
+
+      const beforeSnapshot = await getPromotedWidgets(comfyPage, '11')
+      expect(beforeSnapshot.length).toBeGreaterThan(0)
+
+      await comfyPage.subgraph.serializeAndReload()
+
+      const afterSnapshot = await getPromotedWidgets(comfyPage, '11')
+      expect(afterSnapshot).toEqual(beforeSnapshot)
+    })
+
+    test('Cloning a subgraph node keeps promoted widget entries on original and clone', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-promoted-text-widget'
+      )
+
+      const originalNode = await comfyPage.nodeOps.getNodeRefById('11')
+      const originalPos = await originalNode.getPosition()
+
+      await comfyPage.page.mouse.move(originalPos.x + 16, originalPos.y + 16)
+      await comfyPage.page.keyboard.down('Alt')
+      try {
+        await comfyPage.page.mouse.down()
+        await comfyPage.page.mouse.move(originalPos.x + 72, originalPos.y + 72)
+        await comfyPage.page.mouse.up()
+      } finally {
+        await comfyPage.page.keyboard.up('Alt')
+      }
+
+      async function collectSubgraphNodeIds() {
+        return comfyPage.page.evaluate(() => {
+          const graph = window.app!.canvas.graph!
+          return graph.nodes
+            .filter(
+              (n) =>
+                typeof n.isSubgraphNode === 'function' && n.isSubgraphNode()
+            )
+            .map((n) => String(n.id))
+        })
+      }
+
+      await expect
+        .poll(async () => (await collectSubgraphNodeIds()).length)
+        .toBeGreaterThan(1)
+
+      const subgraphNodeIds = await collectSubgraphNodeIds()
+      for (const nodeId of subgraphNodeIds) {
+        const promotedWidgets = await getPromotedWidgets(comfyPage, nodeId)
+        expect(promotedWidgets.length).toBeGreaterThan(0)
+        expect(
+          promotedWidgets.some(([, widgetName]) => widgetName === 'text')
+        ).toBe(true)
+      }
+    })
+  })
+
+  test.describe('Duplicate ID Remapping', () => {
+    test('All node IDs are globally unique after loading', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      const result = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.canvas.graph!
+        const allGraphs = [graph, ...graph.subgraphs.values()]
+        const allIds = allGraphs
+          .flatMap((g) => g._nodes)
+          .map((n) => n.id)
+          .filter((id): id is number => typeof id === 'number')
+
+        return { allIds, uniqueCount: new Set(allIds).size }
+      })
+
+      expect(result.uniqueCount).toBe(result.allIds.length)
+      expect(result.allIds.length).toBeGreaterThanOrEqual(10)
+    })
+
+    test('Root graph node IDs are preserved as canonical', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      const rootIds = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.canvas.graph!
+        return graph._nodes
+          .map((n) => n.id)
+          .filter((id): id is number => typeof id === 'number')
+          .sort((a, b) => a - b)
+      })
+
+      expect(rootIds).toEqual([1, 2, 5])
+    })
+
+    test('Promoted widget tuples are stable after full page reload boot path', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      const beforeSnapshot =
+        await comfyPage.subgraph.getHostPromotedTupleSnapshot()
+      expect(beforeSnapshot.length).toBeGreaterThan(0)
+      expect(
+        beforeSnapshot.some(({ promotedWidgets }) => promotedWidgets.length > 0)
+      ).toBe(true)
+
+      await comfyPage.page.reload()
+      await comfyPage.page.waitForFunction(() => !!window.app)
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      await expect
+        .poll(() => comfyPage.subgraph.getHostPromotedTupleSnapshot(), {
+          timeout: 5_000
+        })
+        .toEqual(beforeSnapshot)
+    })
+
+    test('All links reference valid nodes in their graph', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      const invalidLinks = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.canvas.graph!
+        const labeledGraphs: [string, typeof graph][] = [
+          ['root', graph],
+          ...[...graph.subgraphs.entries()].map(
+            ([id, sg]) => [`subgraph:${id}`, sg] as [string, typeof graph]
+          )
+        ]
+
+        const SENTINEL_IDS = new Set([-1, -10, -20])
+        const isSentinelNodeId = (id: number | string): id is number =>
+          typeof id === 'number' && SENTINEL_IDS.has(id)
+
+        const checkEndpoint = (
+          label: string,
+          kind: 'origin_id' | 'target_id',
+          id: number | string,
+          g: typeof graph
+        ): string | null => {
+          if (isSentinelNodeId(id)) return null
+          if (typeof id !== 'number' || !g._nodes_by_id[id]) {
+            return `${label}: ${kind} ${id} invalid or not found`
+          }
+          return null
+        }
+
+        return labeledGraphs.flatMap(([label, g]) =>
+          [...g._links.values()].flatMap((link) =>
+            [
+              checkEndpoint(label, 'origin_id', link.origin_id, g),
+              checkEndpoint(label, 'target_id', link.target_id, g)
+            ].filter((e): e is string => e !== null)
+          )
+        )
+      })
+
+      expect(invalidLinks).toEqual([])
+    })
+
+    test('Subgraph navigation works after ID remapping', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(DUPLICATE_IDS_WORKFLOW)
+
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('5')
+      await subgraphNode.navigateIntoSubgraph()
+
+      await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+
+      await comfyPage.keyboard.press('Escape')
+
+      await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(false)
+    })
+  })
+
+  /**
+   * Regression test for legacy-prefixed proxyWidget normalization.
+   *
+   * Older serialized workflows stored proxyWidget entries with prefixed widget
+   * names like "6: 3: string_a" instead of plain "string_a". This caused
+   * resolution failures during configure, resulting in missing promoted widgets.
+   *
+   * The fixture contains an outer SubgraphNode (id 5) whose proxyWidgets array
+   * has a legacy-prefixed entry: ["6", "6: 3: string_a"]. After normalization
+   * the promoted widget should render with the clean name "string_a".
+   *
+   * See: https://github.com/Comfy-Org/ComfyUI_frontend/pull/10573
+   */
+  test.describe(
+    'Legacy Prefixed proxyWidget Normalization',
+    { tag: ['@subgraph', '@widget'] },
+    () => {
+      let previousVueNodesEnabled: unknown
+
+      test.beforeEach(async ({ comfyPage }) => {
+        previousVueNodesEnabled = await comfyPage.settings.getSetting(
+          'Comfy.VueNodes.Enabled'
+        )
+        await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      })
+
+      test.afterEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting(
+          'Comfy.VueNodes.Enabled',
+          previousVueNodesEnabled
+        )
+      })
+
+      test('Loads without console warnings about failed widget resolution', async ({
+        comfyPage
+      }) => {
+        const { warnings, dispose } = SubgraphHelper.collectConsoleWarnings(
+          comfyPage.page
+        )
+
+        try {
+          await comfyPage.workflow.loadWorkflow(LEGACY_PREFIXED_WORKFLOW)
+
+          comfyExpect(warnings).toEqual([])
+        } finally {
+          dispose()
+        }
+      })
+
+      test('Legacy-prefixed promoted widget renders with the normalized label after load', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(LEGACY_PREFIXED_WORKFLOW)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const outerNode = comfyPage.vueNodes.getNodeLocator('5')
+        await expect(outerNode).toBeVisible()
+
+        const textarea = outerNode
+          .getByRole('textbox', { name: 'string_a' })
+          .first()
+        await expect(textarea).toBeVisible()
+        await expect(textarea).toBeDisabled()
+      })
+
+      test('No legacy-prefixed or disconnected widgets remain on the node', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(LEGACY_PREFIXED_WORKFLOW)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const outerNode = comfyPage.vueNodes.getNodeLocator('5')
+        await expect(outerNode).toBeVisible()
+
+        const widgetRows = outerNode.getByTestId(TestIds.widgets.widget)
+        await expect(widgetRows).toHaveCount(2)
+
+        for (const row of await widgetRows.all()) {
+          await expect(
+            row.getByLabel('string_a', { exact: true })
+          ).toBeVisible()
+        }
+      })
+    }
+  )
+
+  test('Multiple instances of the same subgraph keep distinct promoted widget values after load and reload', async ({
+    comfyPage
+  }) => {
+    const hostNodeIds = ['11', '12', '13']
+    const expectedValues = ['Alpha\n', 'Beta\n', 'Gamma\n']
+
+    await comfyPage.workflow.loadWorkflow(MULTI_INSTANCE_WORKFLOW)
+
+    const initialValues = await getPromotedHostWidgetValues(
+      comfyPage,
+      hostNodeIds
+    )
+    expect(initialValues.map(({ values }) => values[0])).toEqual(expectedValues)
+
+    await comfyPage.subgraph.serializeAndReload()
+
+    const reloadedValues = await getPromotedHostWidgetValues(
+      comfyPage,
+      hostNodeIds
+    )
+    expect(reloadedValues.map(({ values }) => values[0])).toEqual(
+      expectedValues
+    )
+  })
 })

browser_tests/tests/vueNodes/widgets/imageCrop.spec.ts

@@ -196,6 +196,48 @@ test.describe('Image Crop', { tag: ['@widget', '@vue-nodes'] }, () => {
         })
         .toStrictEqual(before)
     })
+
+    test('Selecting a ratio preset auto-enables aspect ratio lock', async ({
+      comfyPage
+    }) => {
+      const node = comfyPage.vueNodes.getNodeLocator('1')
+
+      await expect(
+        node.getByRole('button', { name: 'Lock aspect ratio' }),
+        'lock button should start in unlocked state'
+      ).toBeVisible()
+
+      await node.getByRole('combobox').click()
+      await comfyPage.page
+        .getByRole('option', { name: '4:3', exact: true })
+        .click()
+
+      await expect(
+        node.getByRole('button', { name: 'Unlock aspect ratio' }),
+        'selecting a preset should auto-lock the ratio'
+      ).toBeVisible()
+    })
+
+    test('Unlocking after a preset selection shows Custom in ratio dropdown', async ({
+      comfyPage
+    }) => {
+      const node = comfyPage.vueNodes.getNodeLocator('1')
+
+      await node.getByRole('combobox').click()
+      await comfyPage.page
+        .getByRole('option', { name: '1:1', exact: true })
+        .click()
+      await expect(
+        node.getByRole('button', { name: 'Unlock aspect ratio' })
+      ).toBeVisible()
+
+      await node.getByRole('button', { name: 'Unlock aspect ratio' }).click()
+
+      await expect(
+        node.getByRole('combobox'),
+        'dropdown should revert to Custom after unlock'
+      ).toContainText('Custom')
+    })
   })
 
   test.describe(
@@ -813,6 +855,339 @@ test.describe('Image Crop', { tag: ['@widget', '@vue-nodes'] }, () => {
           await comfyPage.page.unroute('**/api/view**')
         }
       })
+
+      test('Selecting 16:9 ratio adjusts crop height proportionally', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 50,
+          y: 50,
+          width: 360,
+          height: 360
+        })
+
+        const before = await getCropValue(comfyPage, 2)
+        if (!before) throw new Error('missing crop')
+        const expectedHeight = Math.round(before.width / (16 / 9))
+
+        await node.getByRole('combobox').click()
+        await comfyPage.page
+          .getByRole('option', { name: '16:9', exact: true })
+          .click()
+
+        await expect
+          .poll(
+            async () => {
+              const v = await getCropValue(comfyPage, 2)
+              if (!v || v.width !== before.width) return false
+              return Math.abs(v.height - expectedHeight) <= 2
+            },
+            { message: '16:9 ratio should adjust crop height proportionally' }
+          )
+          .toBe(true)
+      })
+
+      test('Selecting Custom from ratio dropdown unlocks aspect ratio', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 50,
+          y: 50,
+          width: 200,
+          height: 200
+        })
+
+        await node.getByRole('combobox').click()
+        await comfyPage.page
+          .getByRole('option', { name: '1:1', exact: true })
+          .click()
+        await expect(
+          node
+            .locator('[data-testid^="crop-resize-"]')
+            .filter({ visible: true }),
+          'preset selection should lock ratio and show 4 handles'
+        ).toHaveCount(4)
+
+        await node.getByRole('combobox').click()
+        await comfyPage.page
+          .getByRole('option', { name: 'Custom', exact: true })
+          .click()
+
+        await expect(
+          node
+            .locator('[data-testid^="crop-resize-"]')
+            .filter({ visible: true }),
+          'selecting Custom should unlock ratio and restore 8 handles'
+        ).toHaveCount(8)
+      })
+
+      test('Unlock button releases locked ratio and restores all 8 resize handles', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+
+        await node.getByRole('button', { name: 'Lock aspect ratio' }).click()
+
+        await expect(
+          node
+            .locator('[data-testid^="crop-resize-"]')
+            .filter({ visible: true }),
+          'lock should reduce handles to 4'
+        ).toHaveCount(4)
+        await expect(
+          node.getByRole('button', { name: 'Unlock aspect ratio' }),
+          'lock button aria-label should update after locking'
+        ).toBeVisible()
+
+        await node.getByRole('button', { name: 'Unlock aspect ratio' }).click()
+
+        await expect(
+          node
+            .locator('[data-testid^="crop-resize-"]')
+            .filter({ visible: true }),
+          'unlock should restore all 8 handles'
+        ).toHaveCount(8)
+        await expect(
+          node.getByRole('button', { name: 'Lock aspect ratio' }),
+          'lock button aria-label should revert after unlocking'
+        ).toBeVisible()
+      })
+
+      test('Constrained resize from NW corner adjusts origin and dimensions proportionally', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 150,
+          y: 140,
+          width: 200,
+          height: 150
+        })
+        await node.getByRole('button', { name: 'Lock aspect ratio' }).click()
+
+        const before = await getCropValue(comfyPage, 2)
+        if (!before) throw new Error('missing crop')
+        const ratio = before.width / before.height
+
+        await dragOnLocator(
+          comfyPage,
+          node.getByTestId('crop-resize-nw'),
+          -45,
+          -35
+        )
+
+        await expect
+          .poll(
+            async () => {
+              const v = await getCropValue(comfyPage, 2)
+              if (!v) return false
+              return (
+                v.x < before.x &&
+                v.y < before.y &&
+                v.width > before.width &&
+                v.height > before.height &&
+                Math.abs(v.width / v.height - ratio) < 0.06
+              )
+            },
+            {
+              message:
+                'constrained NW resize should grow box and maintain aspect ratio'
+            }
+          )
+          .toBe(true)
+      })
+
+      test('Constrained resize clamps to image boundary while maintaining ratio', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        const img = node.locator('img')
+        await waitForImageNaturalSize(img)
+        const { nw, nh } = await img.evaluate((el: HTMLImageElement) => ({
+          nw: el.naturalWidth,
+          nh: el.naturalHeight
+        }))
+
+        await setCropBounds(comfyPage, 2, {
+          x: nw - 100,
+          y: nh - 75,
+          width: 80,
+          height: 60
+        })
+        await node.getByRole('button', { name: 'Lock aspect ratio' }).click()
+
+        const before = await getCropValue(comfyPage, 2)
+        if (!before) throw new Error('missing crop')
+        const initialRatio = before.width / before.height
+
+        await dragOnLocator(
+          comfyPage,
+          node.getByTestId('crop-resize-se'),
+          600,
+          400
+        )
+
+        await expect
+          .poll(
+            async () => {
+              const v = await getCropValue(comfyPage, 2)
+              if (!v) return false
+              const withinBounds = v.x + v.width <= nw && v.y + v.height <= nh
+              const ratio = v.width / v.height
+              const ratioPreserved = Math.abs(ratio - initialRatio) < 0.05
+              return withinBounds && ratioPreserved
+            },
+            {
+              message:
+                'constrained resize should stay within image boundaries and preserve aspect ratio'
+            }
+          )
+          .toBe(true)
+      })
+
+      test('Constrained NW corner resize clamps at top-left image boundary', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 30,
+          y: 25,
+          width: 160,
+          height: 120
+        })
+        await node.getByRole('button', { name: 'Lock aspect ratio' }).click()
+
+        await dragOnLocator(
+          comfyPage,
+          node.getByTestId('crop-resize-nw'),
+          -400,
+          -300
+        )
+
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.x ?? -1, {
+            message: 'constrained NW resize should clamp x to image boundary'
+          })
+          .toBeGreaterThanOrEqual(0)
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.y ?? -1, {
+            message: 'constrained NW resize should clamp y to image boundary'
+          })
+          .toBeGreaterThanOrEqual(0)
+      })
+
+      test('Constrained resize enforces minimum crop size', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 100,
+          y: 100,
+          width: 60,
+          height: 60
+        })
+        await node.getByRole('button', { name: 'Lock aspect ratio' }).click()
+
+        await dragOnLocator(
+          comfyPage,
+          node.getByTestId('crop-resize-se'),
+          -300,
+          -300
+        )
+
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.width ?? 0, {
+            message: 'constrained resize should respect minimum width'
+          })
+          .toBeGreaterThanOrEqual(MIN_CROP_SIZE)
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.height ?? 0, {
+            message: 'constrained resize should respect minimum height'
+          })
+          .toBeGreaterThanOrEqual(MIN_CROP_SIZE)
+      })
+
+      test('Incrementing X in BoundingBox moves crop box right', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 100,
+          y: 80,
+          width: 200,
+          height: 150
+        })
+
+        const before = await getCropValue(comfyPage, 2)
+        if (!before) throw new Error('missing crop')
+
+        await node
+          .getByTestId('bounding-box-x')
+          .getByTestId('increment')
+          .click()
+
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.x, {
+            message: 'incrementing X should move crop right by 1'
+          })
+          .toBe(before.x + 1)
+      })
+
+      test('Incrementing Width in BoundingBox increases crop width', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 100,
+          y: 80,
+          width: 200,
+          height: 150
+        })
+
+        const before = await getCropValue(comfyPage, 2)
+        if (!before) throw new Error('missing crop')
+
+        await node
+          .getByTestId('bounding-box-width')
+          .getByTestId('increment')
+          .click()
+
+        await expect
+          .poll(async () => (await getCropValue(comfyPage, 2))?.width, {
+            message: 'incrementing Width should increase crop width by 1'
+          })
+          .toBe(before.width + 1)
+      })
+
+      test('BoundingBox numeric inputs reflect crop position after drag', async ({
+        comfyPage
+      }) => {
+        const node = comfyPage.vueNodes.getNodeLocator('2')
+        await setCropBounds(comfyPage, 2, {
+          x: 50,
+          y: 60,
+          width: 200,
+          height: 150
+        })
+
+        const xInput = node.getByTestId('bounding-box-x').locator('input')
+
+        await expect
+          .poll(async () => Number(await xInput.inputValue()), {
+            message: 'X input should show initial crop x value'
+          })
+          .toBe(50)
+
+        await dragOnLocator(comfyPage, node.getByTestId('crop-overlay'), 40, 20)
+
+        await expect
+          .poll(async () => Number(await xInput.inputValue()), {
+            message: 'X input should update after crop drag'
+          })
+          .toBeGreaterThan(50)
+      })
     }
   )
 

eslint.config.ts

@@ -285,9 +285,12 @@ export default defineConfig([
             'Use vi.mock() with vi.hoisted() instead of vi.doMock(). See docs/testing/vitest-patterns.md'
         }
       ],
-      // Tests routinely define stub and harness components side-by-side with the
-      // system under test, which is a distinct use case from production SFCs.
-      'vue/one-component-per-file': 'off'
+      // Tests routinely define stub and harness components side-by-side with
+      // the system under test and stub emits for documentation only — these
+      // production-SFC rules are noise in a test file.
+      'vue/one-component-per-file': 'off',
+      'vue/no-reserved-component-names': 'off',
+      'vue/no-unused-emit-declarations': 'off'
     }
   },
   {

knip.config.ts

@@ -17,6 +17,9 @@ const config: KnipConfig = {
       entry: ['src/i18n.ts'],
       project: ['src/**/*.{js,ts,vue}']
     },
+    'packages/design-system': {
+      project: ['src/**/*.{css,js,ts}']
+    },
     'packages/tailwind-utils': {
       project: ['src/**/*.{js,ts}']
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.44.9",
+  "version": "1.44.12",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",

packages/design-system/src/css/style.css

@@ -589,8 +589,6 @@
   background-color: color-mix(in srgb, currentColor 20%, transparent);
   font-weight: 700;
   border-radius: 0.25rem;
-  padding: 0 0.125rem;
-  margin: -0.125rem 0.125rem;
 }
 
 @utility scrollbar-hide {

packages/ingest-types/src/types.gen.ts

@@ -3825,14 +3825,14 @@ export type CreateAssetExportData = {
     /**
      * Strategy for naming files in the ZIP:
      * - group_by_job_id: Group assets by job ID as a parent directory (e.g., "833a1b5c-beab-436a-ae8e-f07e7cd7b2c4/ComfyUI_00001_.png")
-     * - prepend_job_id: Prepend job ID to filenames for uniqueness (e.g., "833a1b5c-beab-436a-ae8e-f07e7cd7b2c4_ComfyUI_00001_.png")
+     * - group_by_job_time: Group assets by job execution time as parent directories
      * - preserve: Use original asset names, skip duplicates (first one wins)
      * - asset_id: Use the asset ID as the filename (e.g., "833a1b5c-beab-436a-ae8e-f07e7cd7b2c4.png")
      *
      */
     naming_strategy?:
       | 'group_by_job_id'
-      | 'prepend_job_id'
+      | 'group_by_job_time'
       | 'preserve'
       | 'asset_id'
     /**

packages/ingest-types/src/zod.gen.ts

@@ -1818,7 +1818,7 @@ export const zCreateAssetExportData = z.object({
     job_ids: z.array(z.string()).optional(),
     asset_ids: z.array(z.string()).optional(),
     naming_strategy: z
-      .enum(['group_by_job_id', 'prepend_job_id', 'preserve', 'asset_id'])
+      .enum(['group_by_job_id', 'group_by_job_time', 'preserve', 'asset_id'])
       .optional(),
     job_asset_name_filters: z.record(z.array(z.string()).min(1)).optional()
   }),

packages/registry-types/src/comfyRegistryTypes.ts

@@ -14495,7 +14495,7 @@ export interface components {
              * @description The ID of the model to call
              * @enum {string}
              */
-            model: "wan2.5-t2v-preview" | "wan2.5-i2v-preview" | "wan2.6-t2v" | "wan2.6-i2v" | "wan2.6-r2v" | "wan2.7-i2v" | "wan2.7-t2v" | "wan2.7-r2v" | "wan2.7-videoedit";
+            model: "wan2.5-t2v-preview" | "wan2.5-i2v-preview" | "wan2.6-t2v" | "wan2.6-i2v" | "wan2.6-r2v" | "wan2.7-i2v" | "wan2.7-t2v" | "wan2.7-r2v" | "wan2.7-videoedit" | "happyhorse-1.0-t2v" | "happyhorse-1.0-i2v" | "happyhorse-1.0-r2v" | "happyhorse-1.0-video-edit";
             /** @description Enter basic information, such as prompt words, etc. */
             input: {
                 /**

packages/shared-frontend-utils/src/formatUtil.test.ts

@@ -202,6 +202,28 @@ describe('formatUtil', () => {
         '<span class="highlight">foo</span> bar <span class="highlight">foo</span>'
       )
     })
+
+    it('should highlight cross-word matches', () => {
+      const result = highlightQuery('convert image to mask', 'geto', false)
+      expect(result).toBe(
+        'convert ima<span class="highlight">ge to</span> mask'
+      )
+    })
+
+    it('should not match across line breaks', () => {
+      const result = highlightQuery('ge\nto', 'geto', false)
+      expect(result).toBe('ge\nto')
+    })
+
+    it('should not match across tabs', () => {
+      const result = highlightQuery('ge\tto', 'geto', false)
+      expect(result).toBe('ge\tto')
+    })
+
+    it('should not match across multiple spaces', () => {
+      const result = highlightQuery('ge  to', 'geto', false)
+      expect(result).toBe('ge  to')
+    })
   })
 
   describe('getFilenameDetails', () => {

packages/shared-frontend-utils/src/formatUtil.ts

@@ -74,10 +74,14 @@ export function highlightQuery(
     text = DOMPurify.sanitize(text)
   }
 
-  // Escape special regex characters in the query string
-  const escapedQuery = query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  // Escape special regex characters, then join with an optional single
+  // space so cross-word matches (e.g. "geto" → "imaGE TO") are
+  // highlighted without spanning tabs, newlines, or multi-space gaps.
+  const pattern = Array.from(query)
+    .map((ch) => ch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+    .join('[ ]?')
 
-  const regex = new RegExp(`(${escapedQuery})`, 'gi')
+  const regex = new RegExp(`(${pattern})`, 'gi')
   return text.replace(regex, '<span class="highlight">$1</span>')
 }
 

packages/tailwind-utils/src/index.ts

@@ -1,9 +1,17 @@
 import { clsx } from 'clsx'
 import type { ClassArray } from 'clsx'
-import { twMerge } from 'tailwind-merge'
+import { extendTailwindMerge } from 'tailwind-merge'
 
 export type { ClassValue } from 'clsx'
 
+const twMerge = extendTailwindMerge({
+  extend: {
+    classGroups: {
+      'font-size': ['text-xxs', 'text-xxxs']
+    }
+  }
+})
+
 export function cn(...inputs: ClassArray) {
   return twMerge(clsx(inputs))
 }

pnpm-lock.yaml

@@ -952,6 +952,9 @@ importers:
       vue:
         specifier: 'catalog:'
         version: 3.5.13(typescript@5.9.3)
+      zod:
+        specifier: 'catalog:'
+        version: 3.25.76
     devDependencies:
       '@astrojs/check':
         specifier: 'catalog:'
@@ -971,9 +974,15 @@ importers:
       tailwindcss:
         specifier: 'catalog:'
         version: 4.2.0
+      tsx:
+        specifier: 'catalog:'
+        version: 4.19.4
       typescript:
         specifier: 'catalog:'
         version: 5.9.3
+      vitest:
+        specifier: 'catalog:'
+        version: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
   packages/design-system:
     dependencies:
@@ -14105,6 +14114,14 @@ snapshots:
     optionalDependencies:
       vite: 8.0.0(@types/node@24.10.4)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
+  '@vitest/mocker@4.0.16(vite@8.0.0(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 4.0.16
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 8.0.0(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+
   '@vitest/pretty-format@3.2.4':
     dependencies:
       tinyrainbow: 2.0.0
@@ -14139,7 +14156,7 @@ snapshots:
       sirv: 3.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vitest: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@24.10.4)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vitest: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -20320,6 +20337,48 @@ snapshots:
       - tsx
       - yaml
 
+  vitest@4.0.16(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2):
+    dependencies:
+      '@vitest/expect': 4.0.16
+      '@vitest/mocker': 4.0.16(vite@8.0.0(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      '@vitest/pretty-format': 4.0.16
+      '@vitest/runner': 4.0.16
+      '@vitest/snapshot': 4.0.16
+      '@vitest/spy': 4.0.16
+      '@vitest/utils': 4.0.16
+      es-module-lexer: 1.7.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.3
+      std-env: 3.10.0
+      tinybench: 2.9.0
+      tinyexec: 1.0.4
+      tinyglobby: 0.2.15
+      tinyrainbow: 3.0.3
+      vite: 8.0.0(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@opentelemetry/api': 1.9.0
+      '@types/node': 25.0.3
+      '@vitest/ui': 4.0.16(vitest@4.0.16)
+      happy-dom: 20.0.11
+      jsdom: 27.4.0
+    transitivePeerDependencies:
+      - '@vitejs/devtools'
+      - esbuild
+      - jiti
+      - less
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - terser
+      - tsx
+      - yaml
+
   void-elements@3.1.0: {}
 
   volar-service-css@0.0.70(@volar/language-service@2.4.28):

src/components/boundingbox/WidgetBoundingBox.test.ts

@@ -26,7 +26,7 @@ const ScrubableNumberInputStub = defineComponent({
     step: { type: Number, default: 1 },
     disabled: { type: Boolean, default: false }
   },
-  // eslint-disable-next-line vue/no-unused-emit-declarations
+
   emits: ['update:modelValue'],
   template: `
     <input

src/components/boundingbox/WidgetBoundingBox.vue

@@ -3,19 +3,43 @@
     <label class="content-center text-xs text-node-component-slot-text">
       {{ $t('boundingBox.x') }}
     </label>
-    <ScrubableNumberInput v-model="x" :min="0" :step="1" :disabled />
+    <ScrubableNumberInput
+      v-model="x"
+      :min="0"
+      :step="1"
+      :disabled
+      data-testid="bounding-box-x"
+    />
     <label class="content-center text-xs text-node-component-slot-text">
       {{ $t('boundingBox.y') }}
     </label>
-    <ScrubableNumberInput v-model="y" :min="0" :step="1" :disabled />
+    <ScrubableNumberInput
+      v-model="y"
+      :min="0"
+      :step="1"
+      :disabled
+      data-testid="bounding-box-y"
+    />
     <label class="content-center text-xs text-node-component-slot-text">
       {{ $t('boundingBox.width') }}
     </label>
-    <ScrubableNumberInput v-model="width" :min="1" :step="1" :disabled />
+    <ScrubableNumberInput
+      v-model="width"
+      :min="1"
+      :step="1"
+      :disabled
+      data-testid="bounding-box-width"
+    />
     <label class="content-center text-xs text-node-component-slot-text">
       {{ $t('boundingBox.height') }}
     </label>
-    <ScrubableNumberInput v-model="height" :min="1" :step="1" :disabled />
+    <ScrubableNumberInput
+      v-model="height"
+      :min="1"
+      :step="1"
+      :disabled
+      data-testid="bounding-box-height"
+    />
   </div>
 </template>
 

src/components/breadcrumb/SubgraphBreadcrumbItem.vue

@@ -26,7 +26,7 @@
     <Tag
       v-if="item.isBlueprint"
       data-testid="subgraph-breadcrumb-blueprint-tag"
-      value="Blueprint"
+      :value="t('breadcrumbsMenu.blueprint')"
       severity="primary"
     />
     <i v-if="isActive" class="pi pi-angle-down text-2xs"></i>

src/components/curve/WidgetCurve.test.ts

@@ -0,0 +1,251 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, ref } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      curveWidget: {
+        linear: 'Linear',
+        monotone_cubic: 'Smooth',
+        step: 'Step'
+      }
+    }
+  }
+})
+
+const upstreamHolder = vi.hoisted(() => ({
+  ref: null as { value: unknown } | null
+}))
+
+vi.mock('@/composables/useUpstreamValue', async () => {
+  const { ref } = await import('vue')
+  return {
+    useUpstreamValue: () => {
+      upstreamHolder.ref = upstreamHolder.ref ?? ref<unknown>(undefined)
+      return upstreamHolder.ref
+    },
+    singleValueExtractor: () => () => undefined
+  }
+})
+
+const outputsHolder = vi.hoisted(() => ({
+  nodeOutputs: {} as Record<string, unknown>
+}))
+
+vi.mock('@/stores/nodeOutputStore', () => ({
+  useNodeOutputStore: () => outputsHolder
+}))
+
+import WidgetCurve from './WidgetCurve.vue'
+import type { CurveData } from './types'
+
+const CurveEditorStub = defineComponent({
+  name: 'CurveEditor',
+  props: {
+    modelValue: { type: Array, default: () => [] },
+    disabled: { type: Boolean, default: false },
+    interpolation: { type: String, default: '' },
+    histogram: { type: Object, default: null }
+  },
+  emits: ['update:modelValue'],
+  template: `
+    <div data-testid="curve-editor"
+      :data-disabled="String(disabled)"
+      :data-interpolation="interpolation"
+      :data-has-histogram="String(!!histogram)"
+      :data-points="JSON.stringify(modelValue)"
+      @click="$emit('update:modelValue', [[0,0],[0.5,1],[1,0]])"
+    />
+  `
+})
+
+const SelectStub = defineComponent({
+  name: 'Select',
+  props: { modelValue: { type: String, default: '' } },
+  emits: ['update:modelValue'],
+  template: `
+    <div data-testid="interp-select" :data-value="modelValue">
+      <button
+        data-testid="select-linear"
+        @click="$emit('update:modelValue', 'linear')"
+      >linear</button>
+      <slot />
+    </div>
+  `
+})
+const Passthrough = defineComponent({
+  name: 'SelectPassthrough',
+  template: '<slot />'
+})
+
+function makeWidget(
+  overrides: Partial<SimplifiedWidget<CurveData>> = {}
+): SimplifiedWidget<CurveData> {
+  return {
+    name: 'curve_w',
+    type: 'curve',
+    value: {
+      points: [
+        [0, 0],
+        [1, 1]
+      ],
+      interpolation: 'monotone_cubic'
+    },
+    options: {},
+    ...overrides
+  } as unknown as SimplifiedWidget<CurveData>
+}
+
+function setUpstream(value: CurveData | undefined) {
+  if (!upstreamHolder.ref) upstreamHolder.ref = { value: undefined }
+  upstreamHolder.ref.value = value
+}
+
+function renderWidget(
+  widget: SimplifiedWidget<CurveData>,
+  initialModel: CurveData = {
+    points: [
+      [0, 0],
+      [1, 1]
+    ],
+    interpolation: 'monotone_cubic'
+  }
+) {
+  const value = ref<CurveData>(initialModel)
+  const Harness = defineComponent({
+    components: { WidgetCurve },
+    setup: () => ({ value, widget }),
+    template: '<WidgetCurve v-model="value" :widget="widget" />'
+  })
+  const utils = render(Harness, {
+    global: {
+      plugins: [i18n],
+      stubs: {
+        CurveEditor: CurveEditorStub,
+        Select: SelectStub,
+        SelectContent: Passthrough,
+        SelectTrigger: Passthrough,
+        SelectValue: Passthrough,
+        SelectItem: Passthrough
+      }
+    }
+  })
+  return { ...utils, value }
+}
+
+describe('WidgetCurve', () => {
+  beforeEach(() => {
+    upstreamHolder.ref = null
+    outputsHolder.nodeOutputs = {}
+  })
+
+  describe('Point forwarding', () => {
+    it('forwards model points to CurveEditor', () => {
+      renderWidget(makeWidget(), {
+        points: [
+          [0, 0],
+          [0.5, 0.2],
+          [1, 1]
+        ],
+        interpolation: 'monotone_cubic'
+      })
+      const parsed = JSON.parse(
+        screen.getByTestId('curve-editor').dataset.points!
+      )
+      expect(parsed).toEqual([
+        [0, 0],
+        [0.5, 0.2],
+        [1, 1]
+      ])
+    })
+
+    it('updates v-model when CurveEditor emits new points', async () => {
+      const { value } = renderWidget(makeWidget())
+      const user = userEvent.setup()
+      await user.click(screen.getByTestId('curve-editor'))
+      expect(value.value.points).toEqual([
+        [0, 0],
+        [0.5, 1],
+        [1, 0]
+      ])
+    })
+
+    it('preserves interpolation when points change', async () => {
+      const { value } = renderWidget(makeWidget(), {
+        points: [
+          [0, 0],
+          [1, 1]
+        ],
+        interpolation: 'linear'
+      })
+      const user = userEvent.setup()
+      await user.click(screen.getByTestId('curve-editor'))
+      expect(value.value.interpolation).toBe('linear')
+    })
+  })
+
+  describe('Interpolation select', () => {
+    it('shows the Select when not disabled', () => {
+      renderWidget(makeWidget())
+      expect(screen.getByTestId('interp-select')).toBeInTheDocument()
+    })
+
+    it('hides the Select when disabled', () => {
+      renderWidget(makeWidget({ options: { disabled: true } }))
+      expect(screen.queryByTestId('interp-select')).toBeNull()
+    })
+
+    it('updates interpolation in v-model when Select emits a change', async () => {
+      const { value } = renderWidget(makeWidget())
+      const user = userEvent.setup()
+      await user.click(screen.getByTestId('select-linear'))
+      expect(value.value.interpolation).toBe('linear')
+    })
+
+    it('preserves points when interpolation changes', async () => {
+      const original: CurveData = {
+        points: [
+          [0, 0],
+          [0.3, 0.8],
+          [1, 1]
+        ],
+        interpolation: 'monotone_cubic'
+      }
+      const { value } = renderWidget(makeWidget(), original)
+      const user = userEvent.setup()
+      await user.click(screen.getByTestId('select-linear'))
+      expect(value.value.points).toEqual(original.points)
+    })
+  })
+
+  describe('Disabled state + upstream', () => {
+    it('uses upstream curve when disabled and upstream is available', () => {
+      const upstream: CurveData = {
+        points: [
+          [0, 0],
+          [0.5, 0.5],
+          [1, 1]
+        ],
+        interpolation: 'linear'
+      }
+      setUpstream(upstream)
+      renderWidget(
+        makeWidget({
+          options: { disabled: true },
+          linkedUpstream: { nodeId: 'n1' }
+        })
+      )
+      const parsed = JSON.parse(
+        screen.getByTestId('curve-editor').dataset.points!
+      )
+      expect(parsed).toEqual(upstream.points)
+    })
+  })
+})

src/components/graph/selectionToolbox/MaskEditorButton.test.ts

@@ -0,0 +1,77 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import MaskEditorButton from '@/components/graph/selectionToolbox/MaskEditorButton.vue'
+
+const mockExecute = vi.hoisted(() => vi.fn())
+const mockSelectionState = vi.hoisted(() => ({
+  isSingleImageNode: { value: true }
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({ execute: mockExecute })
+}))
+
+vi.mock('@/composables/graph/useSelectionState', () => ({
+  useSelectionState: () => mockSelectionState
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  globalInjection: true,
+  locale: 'en',
+  messages: {
+    en: {
+      commands: {
+        Comfy_MaskEditor_OpenMaskEditor: { label: 'Open in Mask Editor' }
+      }
+    }
+  }
+})
+
+const renderButton = () =>
+  render(MaskEditorButton, {
+    global: {
+      plugins: [i18n],
+      directives: { tooltip: () => {} }
+    }
+  })
+
+describe('MaskEditorButton', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockSelectionState.isSingleImageNode = ref(true)
+  })
+
+  it('should render with the localized aria-label when a single image node is selected', () => {
+    renderButton()
+
+    expect(
+      screen.getByRole('button', { name: 'Open in Mask Editor' })
+    ).toBeInTheDocument()
+  })
+
+  it('should hide via v-show when no single image node is selected', () => {
+    mockSelectionState.isSingleImageNode = ref(false)
+    renderButton()
+
+    const btn = screen.getByLabelText('Open in Mask Editor', {
+      selector: 'button'
+    })
+    expect(btn.getAttribute('style') ?? '').toContain('display: none')
+  })
+
+  it('should execute the OpenMaskEditor command on click', async () => {
+    const user = userEvent.setup()
+    renderButton()
+
+    await user.click(
+      screen.getByRole('button', { name: 'Open in Mask Editor' })
+    )
+
+    expect(mockExecute).toHaveBeenCalledWith('Comfy.MaskEditor.OpenMaskEditor')
+  })
+})

src/components/imagecrop/WidgetImageCrop.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable vue/no-reserved-component-names */
 import { render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -100,7 +99,7 @@ const WidgetBoundingBoxStub = defineComponent({
     modelValue: { type: Object, default: () => ({}) },
     disabled: { type: Boolean, default: false }
   },
-  // eslint-disable-next-line vue/no-unused-emit-declarations
+
   emits: ['update:modelValue'],
   template: `<div data-testid="bbox-child"
     :data-disabled="String(disabled)"

src/components/maskeditor/BrushCursor.test.ts

@@ -0,0 +1,178 @@
+import { render, screen } from '@testing-library/vue'
+import { reactive } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import BrushCursor from '@/components/maskeditor/BrushCursor.vue'
+import { BrushShape } from '@/extensions/core/maskeditor/types'
+
+const initialMock = () =>
+  reactive({
+    brushVisible: true,
+    brushPreviewGradientVisible: false,
+    brushSettings: {
+      type: BrushShape.Arc,
+      size: 20,
+      opacity: 0.7,
+      hardness: 1,
+      stepSize: 5
+    },
+    zoomRatio: 1,
+    cursorPoint: { x: 100, y: 50 },
+    panOffset: { x: 0, y: 0 }
+  })
+
+let mockStore: ReturnType<typeof initialMock>
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+const styleOf = (el: Element): string => el.getAttribute('style') ?? ''
+
+const renderCursor = (containerRef?: HTMLElement) =>
+  render(BrushCursor, {
+    props: containerRef ? { containerRef } : {}
+  })
+
+const getBrushEl = (): HTMLElement => screen.getByTestId('brush-cursor')
+
+const getGradientEl = (): HTMLElement =>
+  screen.getByTestId('brush-cursor-gradient')
+
+describe('BrushCursor', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    document.body.innerHTML = ''
+    mockStore = initialMock()
+  })
+
+  describe('opacity', () => {
+    it('should be 1 when brushVisible is true', () => {
+      renderCursor()
+      expect(styleOf(getBrushEl())).toContain('opacity: 1')
+    })
+
+    it('should be 0 when brushVisible is false', () => {
+      mockStore.brushVisible = false
+      renderCursor()
+      expect(styleOf(getBrushEl())).toContain('opacity: 0')
+    })
+  })
+
+  describe('size and shape', () => {
+    it('should compute size as 2 * effectiveBrushSize * zoomRatio', () => {
+      // size=20, hardness=1 → effective=20; zoom=2 → diameter = 80
+      mockStore.brushSettings.size = 20
+      mockStore.brushSettings.hardness = 1
+      mockStore.zoomRatio = 2
+
+      renderCursor()
+
+      const style = styleOf(getBrushEl())
+      expect(style).toContain('width: 80px')
+      expect(style).toContain('height: 80px')
+    })
+
+    it('should grow effective size when hardness drops below 1', () => {
+      mockStore.brushSettings.size = 100
+      mockStore.brushSettings.hardness = 0
+      mockStore.zoomRatio = 1
+
+      renderCursor()
+
+      // effective = 100 * (1 + 1.0 * 0.5) = 150 → diameter = 300
+      expect(styleOf(getBrushEl())).toContain('width: 300px')
+    })
+
+    it('should use 50% borderRadius for Arc brush', () => {
+      mockStore.brushSettings.type = BrushShape.Arc
+      renderCursor()
+      expect(styleOf(getBrushEl())).toContain('border-radius: 50%')
+    })
+
+    it('should use 0% borderRadius for Rect brush', () => {
+      mockStore.brushSettings.type = BrushShape.Rect
+      renderCursor()
+      expect(styleOf(getBrushEl())).toContain('border-radius: 0%')
+    })
+  })
+
+  describe('position', () => {
+    it('should anchor to cursorPoint plus panOffset minus radius (no container)', () => {
+      mockStore.cursorPoint = { x: 200, y: 300 }
+      mockStore.panOffset = { x: 50, y: 25 }
+      mockStore.brushSettings.size = 20
+      mockStore.brushSettings.hardness = 1
+      mockStore.zoomRatio = 1
+
+      renderCursor()
+
+      // radius = effective(20,1) * 1 = 20
+      // left = 200 + 50 - 20 = 230
+      // top = 300 + 25 - 20 = 305
+      const style = styleOf(getBrushEl())
+      expect(style).toContain('left: 230px')
+      expect(style).toContain('top: 305px')
+    })
+
+    it('should subtract container offset when containerRef is provided', () => {
+      mockStore.cursorPoint = { x: 200, y: 300 }
+      mockStore.panOffset = { x: 0, y: 0 }
+      mockStore.brushSettings.size = 20
+      mockStore.brushSettings.hardness = 1
+      mockStore.zoomRatio = 1
+
+      const container = document.createElement('div')
+      vi.spyOn(container, 'getBoundingClientRect').mockReturnValue({
+        left: 30,
+        top: 60,
+        right: 0,
+        bottom: 0,
+        width: 0,
+        height: 0,
+        x: 0,
+        y: 0,
+        toJSON: () => ({})
+      } as DOMRect)
+
+      renderCursor(container)
+
+      // left = 200 + 0 - 20 - 30 = 150; top = 300 + 0 - 20 - 60 = 220
+      const style = styleOf(getBrushEl())
+      expect(style).toContain('left: 150px')
+      expect(style).toContain('top: 220px')
+    })
+  })
+
+  describe('gradient preview', () => {
+    it('should be hidden by default', () => {
+      mockStore.brushPreviewGradientVisible = false
+      renderCursor()
+      expect(styleOf(getGradientEl())).toContain('display: none')
+    })
+
+    it('should be visible when brushPreviewGradientVisible is true', () => {
+      mockStore.brushPreviewGradientVisible = true
+      renderCursor()
+      expect(styleOf(getGradientEl())).toContain('display: block')
+    })
+
+    it('should use a flat fill at hardness=1', () => {
+      mockStore.brushPreviewGradientVisible = true
+      mockStore.brushSettings.hardness = 1
+      mockStore.brushSettings.size = 20
+      renderCursor()
+
+      // hard brush: getEffectiveHardness = (20*1)/20 = 1 → flat color
+      const style = styleOf(getGradientEl())
+      expect(style).toContain('rgba(255, 0, 0, 0.5)')
+      expect(style).not.toContain('radial-gradient')
+    })
+
+    // The radial-gradient (hardness < 1) branch uses a multi-line template
+    // literal as the background value; happy-dom's CSS parser drops the
+    // declaration entirely, so we can't assert on the rendered style. The
+    // underlying math (getEffectiveBrushSize / getEffectiveHardness) is
+    // covered by brushUtils.test.ts.
+  })
+})

src/components/maskeditor/BrushCursor.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     id="maskEditor_brush"
+    data-testid="brush-cursor"
     :style="{
       position: 'absolute',
       opacity: brushOpacity,
@@ -15,6 +16,7 @@
   >
     <div
       id="maskEditor_brushPreviewGradient"
+      data-testid="brush-cursor-gradient"
       :style="{
         display: gradientVisible ? 'block' : 'none',
         background: gradientBackground

src/components/maskeditor/BrushSettingsPanel.test.ts

@@ -0,0 +1,230 @@
+/* eslint-disable testing-library/no-container, testing-library/no-node-access -- shape buttons are unlabeled divs and number inputs have no aria labels */
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { reactive } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import BrushSettingsPanel from '@/components/maskeditor/BrushSettingsPanel.vue'
+import { BrushShape } from '@/extensions/core/maskeditor/types'
+
+const initialMock = () => ({
+  brushSettings: reactive({
+    type: BrushShape.Arc,
+    size: 10,
+    opacity: 0.7,
+    hardness: 1,
+    stepSize: 5
+  }),
+  rgbColor: '#FF0000',
+  colorInput: null as HTMLInputElement | null,
+  setBrushSize: vi.fn(),
+  setBrushOpacity: vi.fn(),
+  setBrushHardness: vi.fn(),
+  setBrushStepSize: vi.fn(),
+  resetBrushToDefault: vi.fn()
+})
+
+let mockStore: ReturnType<typeof initialMock>
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/components/maskeditor/controls/SliderControl.vue', () => ({
+  default: {
+    name: 'SliderControlStub',
+    props: ['label', 'min', 'max', 'step', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button data-slider="true" @click="$emit('update:modelValue', 0.5)">{{ modelValue }}</button>`
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      maskEditor: {
+        brushSettings: 'Brush Settings',
+        brushShape: 'Brush Shape',
+        colorSelector: 'Color Selector',
+        thickness: 'Thickness',
+        opacity: 'Opacity',
+        hardness: 'Hardness',
+        stepSize: 'Step Size',
+        resetToDefault: 'Reset to Default'
+      }
+    }
+  }
+})
+
+const renderPanel = () =>
+  render(BrushSettingsPanel, { global: { plugins: [i18n] } })
+
+const setNumberInput = (input: HTMLInputElement, value: string): void => {
+  input.value = value
+  input.dispatchEvent(new Event('input', { bubbles: true }))
+}
+
+describe('BrushSettingsPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMock()
+  })
+
+  describe('brush shape buttons', () => {
+    it('should set brushSettings.type to Arc when arc button clicked', async () => {
+      mockStore.brushSettings.type = BrushShape.Rect
+      const { container } = renderPanel()
+      const user = userEvent.setup()
+
+      const arcEl = container.querySelector(
+        '.maskEditor_sidePanelBrushShapeCircle'
+      )
+      await user.click(arcEl as Element)
+
+      expect(mockStore.brushSettings.type).toBe(BrushShape.Arc)
+    })
+
+    it('should set brushSettings.type to Rect when rect button clicked', async () => {
+      const { container } = renderPanel()
+      const user = userEvent.setup()
+
+      const rectEl = container.querySelector(
+        '.maskEditor_sidePanelBrushShapeSquare'
+      )
+      await user.click(rectEl as Element)
+
+      expect(mockStore.brushSettings.type).toBe(BrushShape.Rect)
+    })
+  })
+
+  describe('reset button', () => {
+    it('should call resetBrushToDefault when clicked', async () => {
+      const user = userEvent.setup()
+      renderPanel()
+
+      await user.click(screen.getByRole('button', { name: 'Reset to Default' }))
+
+      expect(mockStore.resetBrushToDefault).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('numeric inputs', () => {
+    it('should call setBrushSize when size number input changes', () => {
+      const { container } = renderPanel()
+      const sizeInput = container.querySelectorAll(
+        'input[type="number"]'
+      )[0] as HTMLInputElement
+
+      setNumberInput(sizeInput, '50')
+
+      expect(mockStore.setBrushSize).toHaveBeenCalledWith(50)
+    })
+
+    it('should call setBrushOpacity when opacity number input changes', () => {
+      const { container } = renderPanel()
+      const opacityInput = container.querySelectorAll(
+        'input[type="number"]'
+      )[1] as HTMLInputElement
+
+      setNumberInput(opacityInput, '0.4')
+
+      expect(mockStore.setBrushOpacity).toHaveBeenCalledWith(0.4)
+    })
+
+    it('should call setBrushHardness when hardness number input changes', () => {
+      const { container } = renderPanel()
+      const hardnessInput = container.querySelectorAll(
+        'input[type="number"]'
+      )[2] as HTMLInputElement
+
+      setNumberInput(hardnessInput, '0.6')
+
+      expect(mockStore.setBrushHardness).toHaveBeenCalledWith(0.6)
+    })
+
+    it('should call setBrushStepSize when step number input changes', () => {
+      const { container } = renderPanel()
+      const stepInput = container.querySelectorAll(
+        'input[type="number"]'
+      )[3] as HTMLInputElement
+
+      setNumberInput(stepInput, '20')
+
+      expect(mockStore.setBrushStepSize).toHaveBeenCalledWith(20)
+    })
+  })
+
+  describe('size slider (logarithmic)', () => {
+    it('should call setBrushSize with Math.round(Math.pow(250, value))', () => {
+      const { container } = renderPanel()
+      const sizeSlider = container.querySelectorAll(
+        '[data-slider="true"]'
+      )[0] as HTMLElement
+
+      sizeSlider.click()
+      // value = 0.5 → Math.round(Math.pow(250, 0.5)) = 16
+      expect(mockStore.setBrushSize).toHaveBeenCalledWith(16)
+    })
+
+    it('should map size 250 to slider value 1', () => {
+      mockStore.brushSettings.size = 250
+      const { container } = renderPanel()
+      const sizeSlider = container.querySelectorAll(
+        '[data-slider="true"]'
+      )[0] as HTMLElement
+
+      // Math.log(250) / Math.log(250) = 1
+      expect(sizeSlider.textContent).toContain('1')
+    })
+
+    it('should return cached raw slider value when size matches the mapping', async () => {
+      mockStore.setBrushSize.mockImplementation((size: number) => {
+        mockStore.brushSettings.size = size
+      })
+      const { container } = renderPanel()
+      const sizeSlider = container.querySelectorAll(
+        '[data-slider="true"]'
+      )[0] as HTMLElement
+
+      // Click sets rawSliderValue=0.5 → setBrushSize(16) → size=16
+      // → next getter run sees cached match → returns 0.5
+      sizeSlider.click()
+      await new Promise((resolve) => setTimeout(resolve, 0))
+
+      expect(sizeSlider.textContent).toContain('0.5')
+    })
+  })
+
+  describe('color input', () => {
+    it('should v-model rgbColor on the color input', () => {
+      const { container } = renderPanel()
+      const colorInput = container.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+
+      colorInput.value = '#00ff00'
+      colorInput.dispatchEvent(new Event('input', { bubbles: true }))
+
+      expect(mockStore.rgbColor).toBe('#00ff00')
+    })
+
+    it('should expose color input ref to the store on mount', () => {
+      const { container } = renderPanel()
+      const colorInput = container.querySelector('input[type="color"]')
+
+      expect(mockStore.colorInput).toBe(colorInput)
+    })
+
+    it('should clear store.colorInput on unmount', () => {
+      const { unmount } = renderPanel()
+      expect(mockStore.colorInput).not.toBeNull()
+
+      unmount()
+
+      expect(mockStore.colorInput).toBeNull()
+    })
+  })
+})

src/components/maskeditor/ColorSelectSettingsPanel.test.ts

@@ -0,0 +1,168 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import ColorSelectSettingsPanel from '@/components/maskeditor/ColorSelectSettingsPanel.vue'
+import { ColorComparisonMethod } from '@/extensions/core/maskeditor/types'
+
+const mockStore = vi.hoisted(() => ({
+  colorSelectTolerance: 20,
+  selectionOpacity: 100,
+  colorSelectLivePreview: false,
+  applyWholeImage: false,
+  colorComparisonMethod: 'simple' as ColorComparisonMethod,
+  maskBoundary: false,
+  maskTolerance: 0,
+  setColorSelectTolerance: vi.fn(),
+  setSelectionOpacity: vi.fn(),
+  setMaskTolerance: vi.fn()
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/components/maskeditor/controls/SliderControl.vue', () => ({
+  default: {
+    name: 'SliderControlStub',
+    props: ['label', 'min', 'max', 'step', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button data-control="slider" :aria-label="label" @click="$emit('update:modelValue', 99)">{{ modelValue }}</button>`
+  }
+}))
+
+vi.mock('@/components/maskeditor/controls/ToggleControl.vue', () => ({
+  default: {
+    name: 'ToggleControlStub',
+    props: ['label', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button data-control="toggle" :aria-label="label" @click="$emit('update:modelValue', !modelValue)">{{ modelValue }}</button>`
+  }
+}))
+
+vi.mock('@/components/maskeditor/controls/DropdownControl.vue', () => ({
+  default: {
+    name: 'DropdownControlStub',
+    props: ['label', 'options', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button data-control="dropdown" :aria-label="label" @click="$emit('update:modelValue', 'lab')">{{ modelValue }}</button>`
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      maskEditor: {
+        colorSelectSettings: 'Color Select Settings',
+        tolerance: 'Tolerance',
+        selectionOpacity: 'Selection Opacity',
+        livePreview: 'Live Preview',
+        applyToWholeImage: 'Apply to Whole Image',
+        method: 'Method',
+        stopAtMask: 'Stop at mask',
+        maskTolerance: 'Mask Tolerance'
+      }
+    }
+  }
+})
+
+const renderPanel = () =>
+  render(ColorSelectSettingsPanel, { global: { plugins: [i18n] } })
+
+describe('ColorSelectSettingsPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore.colorSelectTolerance = 20
+    mockStore.selectionOpacity = 100
+    mockStore.colorSelectLivePreview = false
+    mockStore.applyWholeImage = false
+    mockStore.colorComparisonMethod = ColorComparisonMethod.Simple
+    mockStore.maskBoundary = false
+    mockStore.maskTolerance = 0
+  })
+
+  it('should call setColorSelectTolerance when tolerance slider emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Tolerance' }))
+
+    expect(mockStore.setColorSelectTolerance).toHaveBeenCalledWith(99)
+  })
+
+  it('should call setSelectionOpacity when selection opacity slider emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Selection Opacity' }))
+
+    expect(mockStore.setSelectionOpacity).toHaveBeenCalledWith(99)
+  })
+
+  it('should toggle colorSelectLivePreview when live preview toggle emits', async () => {
+    const user = userEvent.setup()
+    mockStore.colorSelectLivePreview = false
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Live Preview' }))
+
+    expect(mockStore.colorSelectLivePreview).toBe(true)
+  })
+
+  it('should toggle applyWholeImage when whole-image toggle emits', async () => {
+    const user = userEvent.setup()
+    mockStore.applyWholeImage = false
+    renderPanel()
+
+    await user.click(
+      screen.getByRole('button', { name: 'Apply to Whole Image' })
+    )
+
+    expect(mockStore.applyWholeImage).toBe(true)
+  })
+
+  it('should set comparison method when dropdown emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Method' }))
+
+    expect(mockStore.colorComparisonMethod).toBe(ColorComparisonMethod.LAB)
+  })
+
+  it('should toggle maskBoundary when stop-at-mask toggle emits', async () => {
+    const user = userEvent.setup()
+    mockStore.maskBoundary = false
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Stop at mask' }))
+
+    expect(mockStore.maskBoundary).toBe(true)
+  })
+
+  it('should call setMaskTolerance when mask tolerance slider emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Mask Tolerance' }))
+
+    expect(mockStore.setMaskTolerance).toHaveBeenCalledWith(99)
+  })
+
+  it('should reflect store values on the controls', () => {
+    mockStore.colorSelectTolerance = 77
+    mockStore.colorComparisonMethod = ColorComparisonMethod.HSL
+
+    renderPanel()
+
+    expect(
+      screen.getByRole('button', { name: 'Tolerance' }).textContent
+    ).toContain('77')
+    expect(
+      screen.getByRole('button', { name: 'Method' }).textContent
+    ).toContain('hsl')
+  })
+})

src/components/maskeditor/ImageLayerSettingsPanel.test.ts

@@ -0,0 +1,281 @@
+/* eslint-disable testing-library/no-container, testing-library/no-node-access -- layer rows have unlabeled checkboxes and the blend-mode select has no role-friendly label */
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { reactive } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { useToolManager } from '@/composables/maskeditor/useToolManager'
+import ImageLayerSettingsPanel from '@/components/maskeditor/ImageLayerSettingsPanel.vue'
+import { MaskBlendMode, Tools } from '@/extensions/core/maskeditor/types'
+
+type ToolManager = ReturnType<typeof useToolManager>
+
+const initialMock = () =>
+  reactive({
+    maskOpacity: 0.8,
+    maskBlendMode: MaskBlendMode.Black,
+    activeLayer: 'mask' as 'mask' | 'rgb',
+    currentTool: Tools.MaskPen,
+    image: { src: 'https://example.com/base.png' } as { src: string } | null,
+    maskCanvas: null as HTMLCanvasElement | null,
+    rgbCanvas: null as HTMLCanvasElement | null,
+    imgCanvas: null as HTMLCanvasElement | null,
+    setMaskOpacity: vi.fn()
+  })
+
+let mockStore: ReturnType<typeof initialMock>
+const mockUpdateMaskColor = vi.fn().mockResolvedValue(undefined)
+const mockSetActiveLayer = vi.fn()
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/composables/maskeditor/useCanvasManager', () => ({
+  useCanvasManager: () => ({ updateMaskColor: mockUpdateMaskColor })
+}))
+
+vi.mock('@/components/maskeditor/controls/SliderControl.vue', () => ({
+  default: {
+    name: 'SliderControlStub',
+    props: ['label', 'min', 'max', 'step', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button data-slider="true" @click="$emit('update:modelValue', 0.3)">{{ modelValue }}</button>`
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      maskEditor: {
+        layers: 'Layers',
+        maskOpacity: 'Mask Opacity',
+        maskBlendingOptions: 'Mask Blending Options',
+        black: 'Black',
+        white: 'White',
+        negative: 'Negative',
+        maskLayer: 'Mask Layer',
+        paintLayer: 'Paint Layer',
+        baseImageLayer: 'Base Image Layer',
+        activateLayer: 'Activate Layer',
+        baseLayerPreview: 'Base layer preview'
+      }
+    }
+  }
+})
+
+const renderPanel = (props?: Record<string, unknown>) =>
+  render(ImageLayerSettingsPanel, {
+    global: { plugins: [i18n] },
+    props
+  })
+
+const makeCanvas = (): HTMLCanvasElement => document.createElement('canvas')
+
+describe('ImageLayerSettingsPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMock()
+  })
+
+  describe('mask opacity slider', () => {
+    it('should call setMaskOpacity and update mask canvas opacity', async () => {
+      const user = userEvent.setup()
+      const canvas = makeCanvas()
+      mockStore.maskCanvas = canvas
+      const { container } = renderPanel()
+
+      await user.click(
+        container.querySelector('[data-slider="true"]') as HTMLElement
+      )
+
+      expect(mockStore.setMaskOpacity).toHaveBeenCalledWith(0.3)
+      expect(canvas.style.opacity).toBe('0.3')
+    })
+
+    it('should leave canvas alone when no maskCanvas is set', async () => {
+      const user = userEvent.setup()
+      const { container } = renderPanel()
+
+      await expect(
+        user.click(
+          container.querySelector('[data-slider="true"]') as HTMLElement
+        )
+      ).resolves.not.toThrow()
+
+      expect(mockStore.setMaskOpacity).toHaveBeenCalledWith(0.3)
+    })
+  })
+
+  describe('blend mode select', () => {
+    it.each([
+      ['black', MaskBlendMode.Black],
+      ['white', MaskBlendMode.White],
+      ['negative', MaskBlendMode.Negative],
+      ['unknown-fallback', MaskBlendMode.Black]
+    ] as const)('should map %s to MaskBlendMode.%s', async (raw, expected) => {
+      const { container } = renderPanel()
+      const select = container.querySelector('select') as HTMLSelectElement
+
+      Object.defineProperty(select, 'value', {
+        value: raw,
+        configurable: true
+      })
+      select.dispatchEvent(new Event('change', { bubbles: true }))
+
+      await new Promise((r) => setTimeout(r, 0))
+
+      expect(mockStore.maskBlendMode).toBe(expected)
+      expect(mockUpdateMaskColor).toHaveBeenCalled()
+    })
+  })
+
+  describe('layer visibility checkboxes', () => {
+    it('should toggle mask canvas opacity to maskOpacity when checked, 0 when unchecked', async () => {
+      const user = userEvent.setup()
+      const canvas = makeCanvas()
+      mockStore.maskCanvas = canvas
+      mockStore.maskOpacity = 0.5
+
+      const { container } = renderPanel()
+      const checkbox = container.querySelectorAll(
+        'input[type="checkbox"]'
+      )[0] as HTMLInputElement
+
+      await user.click(checkbox)
+      expect(canvas.style.opacity).toBe('0')
+
+      await user.click(checkbox)
+      expect(canvas.style.opacity).toBe('0.5')
+    })
+
+    it('should toggle paint (rgb) canvas opacity between 0 and 1', async () => {
+      const user = userEvent.setup()
+      const canvas = makeCanvas()
+      mockStore.rgbCanvas = canvas
+
+      const { container } = renderPanel()
+      const checkbox = container.querySelectorAll(
+        'input[type="checkbox"]'
+      )[1] as HTMLInputElement
+
+      await user.click(checkbox)
+      expect(canvas.style.opacity).toBe('0')
+
+      await user.click(checkbox)
+      expect(canvas.style.opacity).toBe('1')
+    })
+
+    it('should toggle base image canvas opacity between 0 and 1', async () => {
+      const user = userEvent.setup()
+      const canvas = makeCanvas()
+      mockStore.imgCanvas = canvas
+
+      const { container } = renderPanel()
+      const checkbox = container.querySelectorAll(
+        'input[type="checkbox"]'
+      )[2] as HTMLInputElement
+
+      await user.click(checkbox)
+      expect(canvas.style.opacity).toBe('0')
+    })
+
+    it('should not throw when toggling visibility for missing canvases', async () => {
+      const user = userEvent.setup()
+      const { container } = renderPanel()
+      const checkboxes = container.querySelectorAll('input[type="checkbox"]')
+
+      for (const cb of checkboxes) {
+        await expect(user.click(cb as HTMLInputElement)).resolves.not.toThrow()
+      }
+    })
+  })
+
+  describe('activate layer buttons', () => {
+    it('should forward the layer to toolManager.setActiveLayer when clicked', async () => {
+      const user = userEvent.setup()
+      mockStore.activeLayer = 'rgb'
+
+      renderPanel({
+        toolManager: {
+          setActiveLayer: mockSetActiveLayer
+        } as unknown as ToolManager
+      })
+
+      const [maskBtn] = screen.getAllByRole('button', {
+        name: 'Activate Layer'
+      })
+      await user.click(maskBtn)
+
+      expect(mockSetActiveLayer).toHaveBeenCalledWith('mask')
+    })
+
+    it('should not throw when toolManager prop is omitted', async () => {
+      const user = userEvent.setup()
+      mockStore.activeLayer = 'rgb'
+
+      renderPanel()
+      const [maskBtn] = screen.getAllByRole('button', {
+        name: 'Activate Layer'
+      })
+
+      await expect(user.click(maskBtn)).resolves.not.toThrow()
+    })
+
+    it('should mark the active-layer button disabled', () => {
+      mockStore.activeLayer = 'mask'
+
+      renderPanel()
+      const [maskBtn] = screen.getAllByRole('button', {
+        name: 'Activate Layer'
+      })
+
+      expect(maskBtn.hasAttribute('disabled')).toBe(true)
+    })
+  })
+
+  describe('paint layer activate visibility', () => {
+    const styleOf = (el: Element): string => el.getAttribute('style') ?? ''
+
+    it('should hide paint activate button when current tool is not Eraser', () => {
+      mockStore.currentTool = Tools.MaskPen
+      const { container } = renderPanel()
+      const buttons = Array.from(container.querySelectorAll('button'))
+      const paintBtn = buttons.find((b) => styleOf(b).includes('display:'))
+
+      expect(paintBtn).toBeDefined()
+      expect(styleOf(paintBtn as Element)).toContain('display: none')
+    })
+
+    it('should show paint activate button when current tool is Eraser', () => {
+      mockStore.currentTool = Tools.Eraser
+      const { container } = renderPanel()
+      const buttons = Array.from(container.querySelectorAll('button'))
+      const paintBtn = buttons.find((b) => styleOf(b).includes('display:'))
+
+      expect(paintBtn).toBeDefined()
+      expect(styleOf(paintBtn as Element)).toContain('display: block')
+    })
+  })
+
+  describe('base image preview', () => {
+    it('should render base image src from store', () => {
+      mockStore.image = { src: 'https://example.com/img.png' }
+      renderPanel()
+      const img = screen.getByAltText('Base layer preview')
+
+      expect((img as HTMLImageElement).src).toBe('https://example.com/img.png')
+    })
+
+    it('should render empty src when no image', () => {
+      mockStore.image = null
+      renderPanel()
+      const img = screen.getByAltText('Base layer preview')
+
+      expect(img.getAttribute('src')).toBe('')
+    })
+  })
+})

src/components/maskeditor/MaskEditorContent.test.ts

@@ -0,0 +1,354 @@
+import { render, screen, waitFor } from '@testing-library/vue'
+import { reactive } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import MaskEditorContent from '@/components/maskeditor/MaskEditorContent.vue'
+
+const mockKeyboard = vi.hoisted(() => ({
+  addListeners: vi.fn(),
+  removeListeners: vi.fn()
+}))
+
+const mockPanZoom = vi.hoisted(() => ({
+  initializeCanvasPanZoom: vi.fn().mockResolvedValue(undefined),
+  invalidatePanZoom: vi.fn().mockResolvedValue(undefined)
+}))
+
+const mockBrushDrawing = vi.hoisted(() => ({
+  initGPUResources: vi.fn().mockResolvedValue(undefined),
+  initPreviewCanvas: vi.fn(),
+  saveBrushSettings: vi.fn()
+}))
+
+const mockToolManager = vi.hoisted(() => ({
+  brushDrawing: mockBrushDrawing
+}))
+
+const mockImageLoader = vi.hoisted(() => ({
+  loadImages: vi.fn().mockResolvedValue({ width: 100, height: 100 })
+}))
+
+const mockMaskEditorLoader = vi.hoisted(() => ({
+  loadFromNode: vi.fn().mockResolvedValue(undefined)
+}))
+
+const mockCanvasHistory = vi.hoisted(() => ({
+  saveInitialState: vi.fn(),
+  clearStates: vi.fn()
+}))
+
+const initialMockStore = () =>
+  reactive({
+    activeLayer: 'mask' as 'mask' | 'rgb',
+    maskCanvas: null as HTMLCanvasElement | null,
+    rgbCanvas: null as HTMLCanvasElement | null,
+    imgCanvas: null as HTMLCanvasElement | null,
+    canvasContainer: null as HTMLElement | null,
+    canvasBackground: null as HTMLElement | null,
+    canvasHistory: mockCanvasHistory,
+    resetState: vi.fn()
+  })
+
+let mockStore: ReturnType<typeof initialMockStore>
+
+const mockDataStore = vi.hoisted(() => ({
+  reset: vi.fn()
+}))
+
+const mockDialogStore = vi.hoisted(() => ({
+  closeDialog: vi.fn()
+}))
+
+vi.mock('@/composables/maskeditor/useKeyboard', () => ({
+  useKeyboard: () => mockKeyboard
+}))
+
+vi.mock('@/composables/maskeditor/usePanAndZoom', () => ({
+  usePanAndZoom: () => mockPanZoom
+}))
+
+vi.mock('@/composables/maskeditor/useToolManager', () => ({
+  useToolManager: () => mockToolManager
+}))
+
+vi.mock('@/composables/maskeditor/useImageLoader', () => ({
+  useImageLoader: () => mockImageLoader
+}))
+
+vi.mock('@/composables/maskeditor/useMaskEditorLoader', () => ({
+  useMaskEditorLoader: () => mockMaskEditorLoader
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/stores/maskEditorDataStore', () => ({
+  useMaskEditorDataStore: () => mockDataStore
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => mockDialogStore
+}))
+
+vi.mock('@/components/common/LoadingOverlay.vue', () => ({
+  default: {
+    name: 'LoadingOverlayStub',
+    props: ['loading', 'size'],
+    template: `<div data-testid="loading-overlay" :data-loading="loading" />`
+  }
+}))
+
+vi.mock('@/components/maskeditor/ToolPanel.vue', () => ({
+  default: {
+    name: 'ToolPanelStub',
+    props: ['toolManager'],
+    template: '<div data-testid="tool-panel-stub" />'
+  }
+}))
+
+vi.mock('@/components/maskeditor/PointerZone.vue', () => ({
+  default: {
+    name: 'PointerZoneStub',
+    props: ['toolManager', 'panZoom'],
+    template: '<div data-testid="pointer-zone-stub" />'
+  }
+}))
+
+vi.mock('@/components/maskeditor/SidePanel.vue', () => ({
+  default: {
+    name: 'SidePanelStub',
+    props: ['toolManager'],
+    template: '<div data-testid="side-panel-stub" />'
+  }
+}))
+
+vi.mock('@/components/maskeditor/BrushCursor.vue', () => ({
+  default: {
+    name: 'BrushCursorStub',
+    props: ['containerRef'],
+    template: '<div data-testid="brush-cursor-stub" />'
+  }
+}))
+
+const observeSpy = vi.fn()
+const disconnectSpy = vi.fn()
+let lastResizeCallback: ResizeObserverCallback | null = null
+
+class MockResizeObserver {
+  observe = observeSpy
+  disconnect = disconnectSpy
+  unobserve = vi.fn()
+  constructor(cb: ResizeObserverCallback) {
+    lastResizeCallback = cb
+  }
+}
+
+// `node` only flows into mocked `loader.loadFromNode`, so a typed sentinel
+// with a stable identity is enough — we never read its fields.
+const fakeNode = { id: 1, title: 'test-node' } as unknown as LGraphNode
+
+const renderContent = () =>
+  render(MaskEditorContent, { props: { node: fakeNode } })
+
+let originalResizeObserver: typeof ResizeObserver | undefined
+
+describe('MaskEditorContent', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMockStore()
+    mockMaskEditorLoader.loadFromNode.mockResolvedValue(undefined)
+    mockImageLoader.loadImages.mockResolvedValue({ width: 100, height: 100 })
+    mockPanZoom.initializeCanvasPanZoom.mockResolvedValue(undefined)
+    mockBrushDrawing.initGPUResources.mockResolvedValue(undefined)
+    originalResizeObserver = globalThis.ResizeObserver
+    globalThis.ResizeObserver =
+      MockResizeObserver as unknown as typeof ResizeObserver
+  })
+
+  afterEach(() => {
+    globalThis.ResizeObserver =
+      originalResizeObserver as unknown as typeof ResizeObserver
+  })
+
+  describe('mount', () => {
+    it('should add keyboard listeners on mount', () => {
+      renderContent()
+      expect(mockKeyboard.addListeners).toHaveBeenCalledTimes(1)
+    })
+
+    it('should observe the container with a ResizeObserver', async () => {
+      renderContent()
+      await waitFor(() => expect(observeSpy).toHaveBeenCalledTimes(1))
+    })
+
+    it('should invalidate pan/zoom on resize', async () => {
+      renderContent()
+      await waitFor(() => expect(observeSpy).toHaveBeenCalled())
+      mockPanZoom.invalidatePanZoom.mockClear()
+
+      lastResizeCallback?.([], {} as ResizeObserver)
+      await new Promise((r) => setTimeout(r, 0))
+
+      expect(mockPanZoom.invalidatePanZoom).toHaveBeenCalledTimes(1)
+    })
+
+    it('should assign canvas refs to the store before init', async () => {
+      renderContent()
+      await waitFor(() => expect(mockStore.maskCanvas).not.toBeNull())
+      expect(mockStore.rgbCanvas).not.toBeNull()
+      expect(mockStore.imgCanvas).not.toBeNull()
+      expect(mockStore.canvasContainer).not.toBeNull()
+      expect(mockStore.canvasBackground).not.toBeNull()
+    })
+  })
+
+  describe('init flow', () => {
+    it('should run the init chain in the documented order', async () => {
+      renderContent()
+
+      await waitFor(() => {
+        expect(mockBrushDrawing.initPreviewCanvas).toHaveBeenCalled()
+      })
+
+      const orderOf = (fn: { mock: { invocationCallOrder: number[] } }) =>
+        fn.mock.invocationCallOrder[0]
+
+      expect(orderOf(mockMaskEditorLoader.loadFromNode)).toBeLessThan(
+        orderOf(mockImageLoader.loadImages)
+      )
+      expect(orderOf(mockImageLoader.loadImages)).toBeLessThan(
+        orderOf(mockPanZoom.initializeCanvasPanZoom)
+      )
+      expect(orderOf(mockPanZoom.initializeCanvasPanZoom)).toBeLessThan(
+        orderOf(mockCanvasHistory.saveInitialState)
+      )
+      expect(orderOf(mockCanvasHistory.saveInitialState)).toBeLessThan(
+        orderOf(mockBrushDrawing.initGPUResources)
+      )
+      expect(orderOf(mockBrushDrawing.initGPUResources)).toBeLessThan(
+        orderOf(mockBrushDrawing.initPreviewCanvas)
+      )
+      expect(mockMaskEditorLoader.loadFromNode).toHaveBeenCalledWith(fakeNode)
+    })
+
+    it('should reveal the child UI components after init succeeds', async () => {
+      renderContent()
+
+      expect(await screen.findByTestId('tool-panel-stub')).toBeInTheDocument()
+      expect(await screen.findByTestId('pointer-zone-stub')).toBeInTheDocument()
+      expect(await screen.findByTestId('side-panel-stub')).toBeInTheDocument()
+      expect(await screen.findByTestId('brush-cursor-stub')).toBeInTheDocument()
+    })
+
+    it('should size the GPU preview canvas to match the mask canvas', async () => {
+      // Force the mask canvas to non-default dimensions during init so the
+      // assertion below proves the source actually copies width/height across
+      // (default 300x150 on both would make the test tautological).
+      mockBrushDrawing.initGPUResources.mockImplementationOnce(async () => {
+        if (mockStore.maskCanvas) {
+          mockStore.maskCanvas.width = 999
+          mockStore.maskCanvas.height = 777
+        }
+      })
+      renderContent()
+
+      await waitFor(() => {
+        expect(mockBrushDrawing.initPreviewCanvas).toHaveBeenCalled()
+      })
+
+      const previewCanvas = mockBrushDrawing.initPreviewCanvas.mock
+        .calls[0][0] as HTMLCanvasElement
+      expect(previewCanvas.width).toBe(999)
+      expect(previewCanvas.height).toBe(777)
+    })
+  })
+
+  describe('init error', () => {
+    it('should close the dialog and log when loader.loadFromNode rejects', async () => {
+      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      mockMaskEditorLoader.loadFromNode.mockRejectedValueOnce(
+        new Error('load failed')
+      )
+
+      renderContent()
+
+      await waitFor(() => {
+        expect(mockDialogStore.closeDialog).toHaveBeenCalledTimes(1)
+      })
+      expect(errorSpy).toHaveBeenCalledWith(
+        '[MaskEditorContent] Initialization failed:',
+        expect.any(Error)
+      )
+      errorSpy.mockRestore()
+    })
+
+    it('should close the dialog and log when initializeCanvasPanZoom rejects', async () => {
+      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      mockPanZoom.initializeCanvasPanZoom.mockRejectedValueOnce(
+        new Error('panzoom failed')
+      )
+
+      renderContent()
+
+      await waitFor(() => {
+        expect(mockDialogStore.closeDialog).toHaveBeenCalledTimes(1)
+      })
+      expect(errorSpy).toHaveBeenCalledWith(
+        '[MaskEditorContent] Initialization failed:',
+        expect.any(Error)
+      )
+      errorSpy.mockRestore()
+    })
+  })
+
+  describe('drag handling', () => {
+    it('should prevent default on dragstart with Ctrl held', () => {
+      renderContent()
+      const root = screen.getByTestId('mask-editor-root')
+
+      const event = new DragEvent('dragstart', {
+        bubbles: true,
+        cancelable: true
+      })
+      // happy-dom doesn't propagate ctrlKey through the DragEvent constructor.
+      Object.defineProperty(event, 'ctrlKey', { value: true })
+      root.dispatchEvent(event)
+
+      expect(event.defaultPrevented).toBe(true)
+    })
+
+    it('should not prevent default on plain dragstart without Ctrl', () => {
+      renderContent()
+      const root = screen.getByTestId('mask-editor-root')
+
+      const event = new DragEvent('dragstart', {
+        bubbles: true,
+        cancelable: true
+      })
+      Object.defineProperty(event, 'ctrlKey', { value: false })
+      root.dispatchEvent(event)
+
+      expect(event.defaultPrevented).toBe(false)
+    })
+  })
+
+  describe('unmount cleanup', () => {
+    it('should run the full cleanup chain on unmount', async () => {
+      const { unmount } = renderContent()
+      await waitFor(() =>
+        expect(mockBrushDrawing.initGPUResources).toHaveBeenCalled()
+      )
+
+      unmount()
+
+      expect(mockBrushDrawing.saveBrushSettings).toHaveBeenCalledTimes(1)
+      expect(mockKeyboard.removeListeners).toHaveBeenCalledTimes(1)
+      expect(mockCanvasHistory.clearStates).toHaveBeenCalledTimes(1)
+      expect(mockStore.resetState).toHaveBeenCalledTimes(1)
+      expect(mockDataStore.reset).toHaveBeenCalledTimes(1)
+    })
+  })
+})

src/components/maskeditor/MaskEditorContent.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="containerRef"
+    data-testid="mask-editor-root"
     class="maskEditor-dialog-root flex size-full flex-col"
     @contextmenu.prevent
     @dragstart="handleDragStart"

src/components/maskeditor/PaintBucketSettingsPanel.test.ts

@@ -0,0 +1,87 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import PaintBucketSettingsPanel from '@/components/maskeditor/PaintBucketSettingsPanel.vue'
+
+const mockStore = vi.hoisted(() => ({
+  paintBucketTolerance: 5,
+  fillOpacity: 100,
+  setPaintBucketTolerance: vi.fn(),
+  setFillOpacity: vi.fn()
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/components/maskeditor/controls/SliderControl.vue', () => ({
+  default: {
+    name: 'SliderControlStub',
+    props: ['label', 'min', 'max', 'step', 'modelValue'],
+    emits: ['update:modelValue'],
+    template: `<button :aria-label="label" @click="$emit('update:modelValue', 42)">{{ modelValue }}</button>`
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      maskEditor: {
+        paintBucketSettings: 'Paint Bucket Settings',
+        tolerance: 'Tolerance',
+        fillOpacity: 'Fill Opacity'
+      }
+    }
+  }
+})
+
+const renderPanel = () =>
+  render(PaintBucketSettingsPanel, { global: { plugins: [i18n] } })
+
+describe('PaintBucketSettingsPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore.paintBucketTolerance = 5
+    mockStore.fillOpacity = 100
+  })
+
+  it('should bind tolerance slider to store value', () => {
+    mockStore.paintBucketTolerance = 87
+    renderPanel()
+
+    expect(
+      screen.getByRole('button', { name: 'Tolerance' }).textContent
+    ).toContain('87')
+  })
+
+  it('should bind fill opacity slider to store value', () => {
+    mockStore.fillOpacity = 33
+    renderPanel()
+
+    expect(
+      screen.getByRole('button', { name: 'Fill Opacity' }).textContent
+    ).toContain('33')
+  })
+
+  it('should call setPaintBucketTolerance when tolerance slider emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Tolerance' }))
+
+    expect(mockStore.setPaintBucketTolerance).toHaveBeenCalledWith(42)
+  })
+
+  it('should call setFillOpacity when fill opacity slider emits', async () => {
+    const user = userEvent.setup()
+    renderPanel()
+
+    await user.click(screen.getByRole('button', { name: 'Fill Opacity' }))
+
+    expect(mockStore.setFillOpacity).toHaveBeenCalledWith(42)
+  })
+})

src/components/maskeditor/PointerZone.test.ts

@@ -0,0 +1,184 @@
+import { render, screen } from '@testing-library/vue'
+import { reactive, nextTick } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { usePanAndZoom } from '@/composables/maskeditor/usePanAndZoom'
+import type { useToolManager } from '@/composables/maskeditor/useToolManager'
+
+import PointerZone from '@/components/maskeditor/PointerZone.vue'
+
+type ToolManager = ReturnType<typeof useToolManager>
+type PanZoom = ReturnType<typeof usePanAndZoom>
+
+const initialMock = () =>
+  reactive({
+    pointerZone: null as HTMLElement | null,
+    isPanning: false,
+    brushVisible: true
+  })
+
+let mockStore: ReturnType<typeof initialMock>
+
+const mockToolManager = vi.hoisted(() => ({
+  handlePointerDown: vi.fn().mockResolvedValue(undefined),
+  handlePointerMove: vi.fn().mockResolvedValue(undefined),
+  handlePointerUp: vi.fn().mockResolvedValue(undefined),
+  updateCursor: vi.fn()
+}))
+
+const mockPanZoom = vi.hoisted(() => ({
+  handleTouchStart: vi.fn(),
+  handleTouchMove: vi.fn().mockResolvedValue(undefined),
+  handleTouchEnd: vi.fn(),
+  zoom: vi.fn().mockResolvedValue(undefined),
+  updateCursorPosition: vi.fn()
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+const renderZone = () =>
+  render(PointerZone, {
+    props: {
+      toolManager: mockToolManager as unknown as ToolManager,
+      panZoom: mockPanZoom as unknown as PanZoom
+    }
+  })
+
+const getZone = (): HTMLDivElement =>
+  screen.getByTestId('pointer-zone') as HTMLDivElement
+
+describe('PointerZone', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMock()
+  })
+
+  describe('mount', () => {
+    it('should expose its root element to the store on mount', () => {
+      renderZone()
+      expect(mockStore.pointerZone).toBe(getZone())
+    })
+  })
+
+  describe('pointer event forwarding', () => {
+    it.each([
+      ['pointerdown', 'handlePointerDown'],
+      ['pointermove', 'handlePointerMove'],
+      ['pointerup', 'handlePointerUp']
+    ] as const)(
+      'should forward %s to toolManager.%s',
+      async (eventName, handlerName) => {
+        renderZone()
+        const zone = getZone()
+
+        zone.dispatchEvent(new Event(eventName, { bubbles: true }))
+        await nextTick()
+
+        expect(mockToolManager[handlerName]).toHaveBeenCalledTimes(1)
+      }
+    )
+
+    it('should hide brush and clear cursor on pointerleave', () => {
+      renderZone()
+      const zone = getZone()
+      zone.style.cursor = 'crosshair'
+      mockStore.brushVisible = true
+
+      zone.dispatchEvent(new Event('pointerleave', { bubbles: true }))
+
+      expect(mockStore.brushVisible).toBe(false)
+      expect(zone.style.cursor).toBe('')
+    })
+
+    it('should call toolManager.updateCursor on pointerenter', () => {
+      renderZone()
+      const zone = getZone()
+
+      zone.dispatchEvent(new Event('pointerenter', { bubbles: true }))
+
+      expect(mockToolManager.updateCursor).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('touch event forwarding', () => {
+    it.each([
+      ['touchstart', 'handleTouchStart'],
+      ['touchmove', 'handleTouchMove'],
+      ['touchend', 'handleTouchEnd']
+    ] as const)(
+      'should forward %s to panZoom.%s',
+      async (eventName, handlerName) => {
+        renderZone()
+        const zone = getZone()
+
+        zone.dispatchEvent(new Event(eventName, { bubbles: true }))
+        await nextTick()
+
+        expect(mockPanZoom[handlerName]).toHaveBeenCalledTimes(1)
+      }
+    )
+  })
+
+  describe('wheel handling', () => {
+    it('should call panZoom.zoom and update cursor position with the wheel coords', async () => {
+      renderZone()
+      const zone = getZone()
+
+      const event = new WheelEvent('wheel', { bubbles: true, deltaY: -1 })
+      // happy-dom doesn't propagate clientX/clientY through the WheelEvent
+      // constructor, so set them directly on the event instance.
+      Object.defineProperty(event, 'clientX', { value: 123 })
+      Object.defineProperty(event, 'clientY', { value: 45 })
+      zone.dispatchEvent(event)
+      // Flush awaited zoom() then the follow-up updateCursorPosition call
+      await new Promise((resolve) => setTimeout(resolve, 0))
+
+      expect(mockPanZoom.zoom).toHaveBeenCalledTimes(1)
+      expect(mockPanZoom.updateCursorPosition).toHaveBeenCalledWith({
+        x: 123,
+        y: 45
+      })
+    })
+  })
+
+  describe('isPanning watcher', () => {
+    it('should set cursor to "grabbing" when panning starts', async () => {
+      renderZone()
+      const zone = getZone()
+
+      mockStore.isPanning = true
+      await nextTick()
+
+      expect(zone.style.cursor).toBe('grabbing')
+    })
+
+    it('should call toolManager.updateCursor when panning ends', async () => {
+      renderZone()
+
+      mockStore.isPanning = true
+      await nextTick()
+      mockToolManager.updateCursor.mockClear()
+      mockStore.isPanning = false
+      await nextTick()
+
+      expect(mockToolManager.updateCursor).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('contextmenu', () => {
+    it('should prevent default on contextmenu', () => {
+      renderZone()
+      const zone = getZone()
+
+      const event = new Event('contextmenu', {
+        bubbles: true,
+        cancelable: true
+      })
+      zone.dispatchEvent(event)
+
+      expect(event.defaultPrevented).toBe(true)
+    })
+  })
+})

src/components/maskeditor/PointerZone.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="pointerZoneRef"
+    data-testid="pointer-zone"
     class="h-full w-[calc(100%-4rem-220px)]"
     @pointerdown="handlePointerDown"
     @pointermove="handlePointerMove"

src/components/maskeditor/SettingsPanelContainer.test.ts

@@ -0,0 +1,70 @@
+import { render } from '@testing-library/vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import SettingsPanelContainer from '@/components/maskeditor/SettingsPanelContainer.vue'
+import { Tools } from '@/extensions/core/maskeditor/types'
+
+const mockStore = vi.hoisted(() => ({
+  currentTool: 'pen' as Tools
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/components/maskeditor/BrushSettingsPanel.vue', () => ({
+  default: {
+    name: 'BrushSettingsPanelStub',
+    template: '<div>brush-panel</div>'
+  }
+}))
+
+vi.mock('@/components/maskeditor/ColorSelectSettingsPanel.vue', () => ({
+  default: {
+    name: 'ColorSelectSettingsPanelStub',
+    template: '<div>color-panel</div>'
+  }
+}))
+
+vi.mock('@/components/maskeditor/PaintBucketSettingsPanel.vue', () => ({
+  default: {
+    name: 'PaintBucketSettingsPanelStub',
+    template: '<div>bucket-panel</div>'
+  }
+}))
+
+describe('SettingsPanelContainer', () => {
+  beforeEach(() => {
+    mockStore.currentTool = Tools.MaskPen
+  })
+
+  it('should render PaintBucketSettingsPanel when current tool is MaskBucket', () => {
+    mockStore.currentTool = Tools.MaskBucket
+    const { container } = render(SettingsPanelContainer)
+    expect(container.textContent).toContain('bucket-panel')
+  })
+
+  it('should render ColorSelectSettingsPanel when current tool is MaskColorFill', () => {
+    mockStore.currentTool = Tools.MaskColorFill
+    const { container } = render(SettingsPanelContainer)
+    expect(container.textContent).toContain('color-panel')
+  })
+
+  it('should render BrushSettingsPanel for any other tool', () => {
+    mockStore.currentTool = Tools.MaskPen
+    const { container } = render(SettingsPanelContainer)
+    expect(container.textContent).toContain('brush-panel')
+  })
+
+  it('should render BrushSettingsPanel for Eraser', () => {
+    mockStore.currentTool = Tools.Eraser
+    const { container } = render(SettingsPanelContainer)
+    expect(container.textContent).toContain('brush-panel')
+  })
+
+  it('should render BrushSettingsPanel for PaintPen', () => {
+    mockStore.currentTool = Tools.PaintPen
+    const { container } = render(SettingsPanelContainer)
+    expect(container.textContent).toContain('brush-panel')
+  })
+})

src/components/maskeditor/SidePanel.test.ts

@@ -0,0 +1,49 @@
+import { render, screen } from '@testing-library/vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { useToolManager } from '@/composables/maskeditor/useToolManager'
+
+import SidePanel from '@/components/maskeditor/SidePanel.vue'
+
+type ToolManager = ReturnType<typeof useToolManager>
+
+vi.mock('@/components/maskeditor/SettingsPanelContainer.vue', () => ({
+  default: {
+    name: 'SettingsPanelContainerStub',
+    template: '<div data-testid="settings-panel-stub">settings</div>'
+  }
+}))
+
+vi.mock('@/components/maskeditor/ImageLayerSettingsPanel.vue', () => ({
+  default: {
+    name: 'ImageLayerSettingsPanelStub',
+    props: ['toolManager'],
+    template:
+      '<div data-testid="image-layer-stub">image-layer:{{ toolManager?.tag ?? "none" }}</div>'
+  }
+}))
+
+describe('SidePanel', () => {
+  it('should render both child panels', () => {
+    render(SidePanel)
+
+    expect(screen.getByTestId('settings-panel-stub')).toBeInTheDocument()
+    expect(screen.getByTestId('image-layer-stub')).toBeInTheDocument()
+  })
+
+  it('should forward toolManager prop to ImageLayerSettingsPanel', () => {
+    const toolManager = { tag: 'my-tool-manager' } as unknown as ToolManager
+
+    render(SidePanel, { props: { toolManager } })
+
+    expect(screen.getByTestId('image-layer-stub').textContent).toContain(
+      'my-tool-manager'
+    )
+  })
+
+  it('should render with no toolManager passed through', () => {
+    render(SidePanel)
+
+    expect(screen.getByTestId('image-layer-stub').textContent).toContain('none')
+  })
+})

src/components/maskeditor/ToolPanel.test.ts

@@ -0,0 +1,155 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { reactive } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { useToolManager } from '@/composables/maskeditor/useToolManager'
+
+import ToolPanel from '@/components/maskeditor/ToolPanel.vue'
+import { Tools, allTools } from '@/extensions/core/maskeditor/types'
+
+type ToolManager = ReturnType<typeof useToolManager>
+
+vi.mock('@/extensions/core/maskeditor/constants', () => ({
+  iconsHtml: {
+    pen: '<svg data-testid="icon-pen" />',
+    rgbPaint: '<svg data-testid="icon-rgbPaint" />',
+    eraser: '<svg data-testid="icon-eraser" />',
+    paintBucket: '<svg data-testid="icon-paintBucket" />',
+    colorSelect: '<svg data-testid="icon-colorSelect" />'
+  }
+}))
+
+const initialMock = () =>
+  reactive({
+    currentTool: Tools.MaskPen as Tools,
+    displayZoomRatio: 1,
+    image: null as { width: number; height: number } | null,
+    resetZoom: vi.fn()
+  })
+
+let mockStore: ReturnType<typeof initialMock>
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      maskEditor: {
+        clickToResetZoom: 'Click to reset zoom'
+      }
+    }
+  }
+})
+
+const mockToolManager = vi.hoisted(() => ({
+  switchTool: vi.fn()
+}))
+
+const renderPanel = () =>
+  render(ToolPanel, {
+    global: { plugins: [i18n] },
+    props: { toolManager: mockToolManager as unknown as ToolManager }
+  })
+
+const getToolButton = (tool: Tools): HTMLElement => {
+  const btns = screen.getAllByTestId('tool-button')
+  const match = btns.find((b) => b.dataset.tool === tool)
+  if (!match) throw new Error(`tool button for "${tool}" not found`)
+  return match
+}
+
+describe('ToolPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMock()
+  })
+
+  describe('tool list rendering', () => {
+    it('should render one button per tool in allTools', () => {
+      renderPanel()
+      expect(screen.getAllByTestId('tool-button')).toHaveLength(allTools.length)
+    })
+
+    it('should render the icon HTML for each tool', () => {
+      renderPanel()
+      for (const tool of allTools) {
+        expect(screen.getByTestId(`icon-${tool}`)).toBeInTheDocument()
+      }
+    })
+  })
+
+  describe('current tool highlight', () => {
+    it.each([Tools.MaskPen, Tools.Eraser, Tools.PaintPen] as const)(
+      'should mark the %s button as selected when it is the current tool',
+      (tool) => {
+        mockStore.currentTool = tool
+        renderPanel()
+
+        expect(getToolButton(tool).className).toContain(
+          'maskEditor_toolPanelContainerSelected'
+        )
+      }
+    )
+
+    it('should not mark non-current tools as selected', () => {
+      mockStore.currentTool = Tools.MaskPen
+      renderPanel()
+
+      for (const tool of allTools) {
+        if (tool === Tools.MaskPen) continue
+        expect(getToolButton(tool).className).not.toContain(
+          'maskEditor_toolPanelContainerSelected'
+        )
+      }
+    })
+  })
+
+  describe('tool selection', () => {
+    it('should call toolManager.switchTool with the clicked tool', async () => {
+      const user = userEvent.setup()
+      renderPanel()
+
+      await user.click(getToolButton(Tools.Eraser))
+
+      expect(mockToolManager.switchTool).toHaveBeenCalledWith(Tools.Eraser)
+    })
+  })
+
+  describe('zoom indicator', () => {
+    it('should render rounded zoom percentage from displayZoomRatio', () => {
+      mockStore.displayZoomRatio = 1.236
+      renderPanel()
+
+      expect(screen.getByTestId('zoom-percentage').textContent).toBe('124%')
+    })
+
+    it('should render image dimensions when an image is loaded', () => {
+      mockStore.image = { width: 800, height: 600 }
+      renderPanel()
+
+      expect(screen.getByTestId('zoom-dimensions').textContent).toBe('800x600')
+    })
+
+    it('should render a single-space placeholder when no image', () => {
+      mockStore.image = null
+      renderPanel()
+
+      expect(screen.getByTestId('zoom-dimensions').textContent).toBe(' ')
+    })
+
+    it('should call resetZoom when the zoom indicator is clicked', async () => {
+      const user = userEvent.setup()
+      renderPanel()
+
+      await user.click(screen.getByTestId('zoom-percentage'))
+
+      expect(mockStore.resetZoom).toHaveBeenCalledTimes(1)
+    })
+  })
+})

src/components/maskeditor/ToolPanel.vue

@@ -4,6 +4,8 @@
       <div
         v-for="tool in allTools"
         :key="tool"
+        data-testid="tool-button"
+        :data-tool="tool"
         :class="[
           'maskEditor_toolPanelContainer hover:bg-secondary-background-hover',
           { maskEditor_toolPanelContainerSelected: currentTool === tool }
@@ -23,8 +25,12 @@
       :title="t('maskEditor.clickToResetZoom')"
       @click="onResetZoom"
     >
-      <span class="text-sm text-text-secondary">{{ zoomText }}</span>
-      <span class="text-xs text-text-secondary">{{ dimensionsText }}</span>
+      <span data-testid="zoom-percentage" class="text-sm text-text-secondary">{{
+        zoomText
+      }}</span>
+      <span data-testid="zoom-dimensions" class="text-xs text-text-secondary">{{
+        dimensionsText
+      }}</span>
     </div>
   </div>
 </template>

src/components/maskeditor/controls/DropdownControl.test.ts

@@ -0,0 +1,79 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+
+import DropdownControl from './DropdownControl.vue'
+
+const renderComponent = (
+  props: {
+    label?: string
+    options?: string[] | { label: string; value: string | number }[]
+    modelValue?: string | number
+  } = {},
+  onUpdate?: (value: string | number) => void
+) => {
+  const user = userEvent.setup()
+  const utils = render(DropdownControl, {
+    props: {
+      label: 'Mode',
+      options: ['One', 'Two', 'Three'],
+      modelValue: 'One',
+      ...props,
+      'onUpdate:modelValue': onUpdate
+    }
+  })
+  return { user, ...utils }
+}
+
+describe('DropdownControl', () => {
+  it('should render the label', () => {
+    renderComponent({ label: 'Brush Mode' })
+    expect(screen.getByText('Brush Mode')).toBeInTheDocument()
+  })
+
+  it('should expand string options to {label,value} pairs', () => {
+    renderComponent({ options: ['Alpha', 'Beta'], modelValue: 'Alpha' })
+
+    const select = screen.getByRole('combobox') as HTMLSelectElement
+    const values = Array.from(select.options).map((o) => o.value)
+    const labels = Array.from(select.options).map((o) => o.textContent?.trim())
+
+    expect(values).toEqual(['Alpha', 'Beta'])
+    expect(labels).toEqual(['Alpha', 'Beta'])
+  })
+
+  it('should preserve {label,value} options as-is', () => {
+    renderComponent({
+      options: [
+        { label: 'High', value: 1 },
+        { label: 'Low', value: 2 }
+      ],
+      modelValue: 1
+    })
+
+    const select = screen.getByRole('combobox') as HTMLSelectElement
+    expect(Array.from(select.options).map((o) => o.value)).toEqual(['1', '2'])
+    expect(
+      Array.from(select.options).map((o) => o.textContent?.trim())
+    ).toEqual(['High', 'Low'])
+  })
+
+  it('should reflect modelValue as the selected option', () => {
+    renderComponent({ options: ['One', 'Two'], modelValue: 'Two' })
+    expect((screen.getByRole('combobox') as HTMLSelectElement).value).toBe(
+      'Two'
+    )
+  })
+
+  it('should emit update:modelValue with the chosen string value', async () => {
+    const onUpdate = vi.fn()
+    const { user } = renderComponent(
+      { options: ['One', 'Two', 'Three'], modelValue: 'One' },
+      onUpdate
+    )
+
+    await user.selectOptions(screen.getByRole('combobox'), 'Three')
+
+    expect(onUpdate).toHaveBeenCalledWith('Three')
+  })
+})

src/components/maskeditor/controls/SliderControl.test.ts

@@ -0,0 +1,64 @@
+import { render, screen } from '@testing-library/vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import SliderControl from './SliderControl.vue'
+
+const renderComponent = (
+  props: {
+    label?: string
+    min?: number
+    max?: number
+    step?: number
+    modelValue?: number
+  } = {},
+  onUpdate?: (value: number) => void
+) => {
+  return render(SliderControl, {
+    props: {
+      label: 'Brush Size',
+      min: 1,
+      max: 100,
+      modelValue: 10,
+      ...props,
+      'onUpdate:modelValue': onUpdate
+    }
+  })
+}
+
+const setSliderValue = (input: HTMLInputElement, value: string): void => {
+  input.value = value
+  input.dispatchEvent(new Event('input', { bubbles: true }))
+}
+
+describe('SliderControl', () => {
+  it('should render the label', () => {
+    renderComponent({ label: 'Hardness' })
+    expect(screen.getByText('Hardness')).toBeInTheDocument()
+  })
+
+  it('should expose min, max, step and modelValue on the input', () => {
+    renderComponent({ min: 0, max: 50, step: 5, modelValue: 25 })
+
+    const input = screen.getByRole('slider') as HTMLInputElement
+    expect(input.min).toBe('0')
+    expect(input.max).toBe('50')
+    expect(input.step).toBe('5')
+    expect(input.value).toBe('25')
+  })
+
+  it('should default step to 1 when not provided', () => {
+    renderComponent({ min: 0, max: 10, modelValue: 5 })
+
+    expect((screen.getByRole('slider') as HTMLInputElement).step).toBe('1')
+  })
+
+  it('should emit update:modelValue with a number when input changes', () => {
+    const onUpdate = vi.fn()
+    renderComponent({ min: 1, max: 100, modelValue: 10 }, onUpdate)
+
+    setSliderValue(screen.getByRole('slider') as HTMLInputElement, '42')
+
+    expect(onUpdate).toHaveBeenLastCalledWith(42)
+    expect(typeof onUpdate.mock.calls.at(-1)![0]).toBe('number')
+  })
+})

src/components/maskeditor/controls/ToggleControl.test.ts

@@ -0,0 +1,60 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+
+import ToggleControl from './ToggleControl.vue'
+
+const renderComponent = (
+  props: { label?: string; modelValue?: boolean } = {},
+  onUpdate?: (value: boolean) => void
+) => {
+  const user = userEvent.setup()
+  const utils = render(ToggleControl, {
+    props: {
+      label: 'Smoothing',
+      modelValue: false,
+      ...props,
+      'onUpdate:modelValue': onUpdate
+    }
+  })
+  return { user, ...utils }
+}
+
+describe('ToggleControl', () => {
+  it('should render the label', () => {
+    renderComponent({ label: 'Pressure Sensitivity' })
+    expect(screen.getByText('Pressure Sensitivity')).toBeInTheDocument()
+  })
+
+  it('should reflect modelValue=false as unchecked', () => {
+    renderComponent({ modelValue: false })
+    expect((screen.getByRole('checkbox') as HTMLInputElement).checked).toBe(
+      false
+    )
+  })
+
+  it('should reflect modelValue=true as checked', () => {
+    renderComponent({ modelValue: true })
+    expect((screen.getByRole('checkbox') as HTMLInputElement).checked).toBe(
+      true
+    )
+  })
+
+  it('should emit update:modelValue=true when toggled on', async () => {
+    const onUpdate = vi.fn()
+    const { user } = renderComponent({ modelValue: false }, onUpdate)
+
+    await user.click(screen.getByRole('checkbox'))
+
+    expect(onUpdate).toHaveBeenCalledWith(true)
+  })
+
+  it('should emit update:modelValue=false when toggled off', async () => {
+    const onUpdate = vi.fn()
+    const { user } = renderComponent({ modelValue: true }, onUpdate)
+
+    await user.click(screen.getByRole('checkbox'))
+
+    expect(onUpdate).toHaveBeenCalledWith(false)
+  })
+})

src/components/maskeditor/dialog/TopBarHeader.test.ts

@@ -0,0 +1,262 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { reactive } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import TopBarHeader from '@/components/maskeditor/dialog/TopBarHeader.vue'
+
+const mockCanvasHistory = vi.hoisted(() => ({
+  undo: vi.fn(),
+  redo: vi.fn()
+}))
+
+const initialMock = () =>
+  reactive({
+    canvasHistory: mockCanvasHistory,
+    brushVisible: true,
+    triggerClear: vi.fn()
+  })
+
+let mockStore: ReturnType<typeof initialMock>
+
+const mockDialogStore = vi.hoisted(() => ({
+  closeDialog: vi.fn()
+}))
+
+const mockCanvasTools = vi.hoisted(() => ({
+  invertMask: vi.fn(),
+  clearMask: vi.fn()
+}))
+
+const mockCanvasTransform = vi.hoisted(() => ({
+  rotateCounterclockwise: vi.fn().mockResolvedValue(undefined),
+  rotateClockwise: vi.fn().mockResolvedValue(undefined),
+  mirrorHorizontal: vi.fn().mockResolvedValue(undefined),
+  mirrorVertical: vi.fn().mockResolvedValue(undefined)
+}))
+
+const mockSaver = vi.hoisted(() => ({
+  save: vi.fn().mockResolvedValue(undefined)
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: () => mockStore
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => mockDialogStore
+}))
+
+vi.mock('@/composables/maskeditor/useCanvasTools', () => ({
+  useCanvasTools: () => mockCanvasTools
+}))
+
+vi.mock('@/composables/maskeditor/useCanvasTransform', () => ({
+  useCanvasTransform: () => mockCanvasTransform
+}))
+
+vi.mock('@/composables/maskeditor/useMaskEditorSaver', () => ({
+  useMaskEditorSaver: () => mockSaver
+}))
+
+vi.mock('@/components/ui/button/Button.vue', () => ({
+  default: {
+    name: 'ButtonStub',
+    props: ['variant', 'disabled'],
+    template:
+      '<button :data-variant="variant" :disabled="disabled"><slot /></button>'
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        save: 'Save',
+        saving: 'Saving',
+        cancel: 'Cancel'
+      },
+      maskEditor: {
+        title: 'Mask Editor',
+        invert: 'Invert',
+        clear: 'Clear',
+        undo: 'Undo',
+        redo: 'Redo',
+        rotateLeft: 'Rotate Left',
+        rotateRight: 'Rotate Right',
+        mirrorHorizontal: 'Mirror Horizontal',
+        mirrorVertical: 'Mirror Vertical'
+      }
+    }
+  }
+})
+
+const renderHeader = () => render(TopBarHeader, { global: { plugins: [i18n] } })
+
+describe('TopBarHeader', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockStore = initialMock()
+  })
+
+  describe('title', () => {
+    it('should render the localized title', () => {
+      renderHeader()
+      expect(screen.getByText('Mask Editor')).toBeInTheDocument()
+    })
+  })
+
+  describe('history buttons', () => {
+    it('should call canvasHistory.undo when undo button is clicked', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: 'Undo' }))
+
+      expect(mockCanvasHistory.undo).toHaveBeenCalledTimes(1)
+    })
+
+    it('should call canvasHistory.redo when redo button is clicked', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: 'Redo' }))
+
+      expect(mockCanvasHistory.redo).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('canvas transform buttons', () => {
+    it.each([
+      ['Rotate Left', 'rotateCounterclockwise'],
+      ['Rotate Right', 'rotateClockwise'],
+      ['Mirror Horizontal', 'mirrorHorizontal'],
+      ['Mirror Vertical', 'mirrorVertical']
+    ] as const)(
+      'should call canvasTransform.%s when %s button is clicked',
+      async (label, method) => {
+        const user = userEvent.setup()
+        renderHeader()
+
+        await user.click(screen.getByRole('button', { name: label }))
+
+        expect(mockCanvasTransform[method]).toHaveBeenCalledTimes(1)
+      }
+    )
+
+    it.each([
+      ['Rotate Left', 'rotateCounterclockwise', 'Rotate left failed:'],
+      ['Rotate Right', 'rotateClockwise', 'Rotate right failed:'],
+      ['Mirror Horizontal', 'mirrorHorizontal', 'Mirror horizontal failed:'],
+      ['Mirror Vertical', 'mirrorVertical', 'Mirror vertical failed:']
+    ] as const)(
+      'should swallow and log errors from %s',
+      async (label, method, expectedMsg) => {
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+        mockCanvasTransform[method].mockRejectedValueOnce(new Error('boom'))
+        const user = userEvent.setup()
+        renderHeader()
+
+        await user.click(screen.getByRole('button', { name: label }))
+
+        expect(errorSpy).toHaveBeenCalledWith(
+          `[TopBarHeader] ${expectedMsg}`,
+          expect.any(Error)
+        )
+        errorSpy.mockRestore()
+      }
+    )
+  })
+
+  describe('mask edit buttons', () => {
+    it('should call canvasTools.invertMask on Invert click', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: 'Invert' }))
+
+      expect(mockCanvasTools.invertMask).toHaveBeenCalledTimes(1)
+    })
+
+    it('should call clearMask and store.triggerClear on Clear click', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: 'Clear' }))
+
+      expect(mockCanvasTools.clearMask).toHaveBeenCalledTimes(1)
+      expect(mockStore.triggerClear).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('save', () => {
+    it('should hide brush, save, and close the dialog on success', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+      mockStore.brushVisible = true
+
+      await user.click(screen.getByRole('button', { name: /save/i }))
+
+      expect(mockStore.brushVisible).toBe(false)
+      expect(mockSaver.save).toHaveBeenCalledTimes(1)
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledTimes(1)
+    })
+
+    it('should switch the button text to "Saving" and disable the button while saving', async () => {
+      let resolve!: () => void
+      mockSaver.save.mockReturnValueOnce(
+        new Promise<void>((r) => {
+          resolve = r
+        })
+      )
+      const user = userEvent.setup()
+      renderHeader()
+
+      const clickPromise = user.click(
+        screen.getByRole('button', { name: /save/i })
+      )
+      const savingBtn = await screen.findByRole('button', { name: 'Saving' })
+      expect(savingBtn).toBeDisabled()
+
+      resolve()
+      await clickPromise
+    })
+
+    it('should restore brush + button state and log on save failure', async () => {
+      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      mockSaver.save.mockRejectedValueOnce(new Error('save failed'))
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: /save/i }))
+
+      expect(mockStore.brushVisible).toBe(true)
+      expect(errorSpy).toHaveBeenCalledWith(
+        '[TopBarHeader] Save failed:',
+        expect.any(Error)
+      )
+      expect(mockDialogStore.closeDialog).not.toHaveBeenCalled()
+      // After failure, the Save button reads "Save" again (not "Saving")
+      expect(
+        screen.getByRole('button', { name: /save/i }).textContent?.trim()
+      ).toBe('Save')
+      errorSpy.mockRestore()
+    })
+  })
+
+  describe('cancel', () => {
+    it('should close the dialog with the global-mask-editor key', async () => {
+      const user = userEvent.setup()
+      renderHeader()
+
+      await user.click(screen.getByRole('button', { name: 'Cancel' }))
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
+        key: 'global-mask-editor'
+      })
+    })
+  })
+})

src/components/node/CreditBadge.vue

@@ -0,0 +1,28 @@
+<template>
+  <span
+    :class="
+      cn(
+        'flex h-5 shrink-0 items-center bg-component-node-widget-background p-1 text-xs',
+        rest ? 'rounded-l-full pr-1' : 'rounded-full'
+      )
+    "
+  >
+    <i class="icon-[lucide--component] h-full bg-amber-400" />
+    <span class="truncate" v-text="text" />
+  </span>
+  <span
+    v-if="rest"
+    class="-ml-2.5 max-w-max min-w-0 grow basis-0 truncate rounded-r-full bg-component-node-widget-background"
+  >
+    <span class="pr-2" v-text="rest" />
+  </span>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+defineProps<{
+  text: string
+  rest?: string
+}>()
+</script>

src/components/node/NodePreviewCard.vue

@@ -1,9 +1,14 @@
 <template>
   <div
-    class="flex w-50 flex-col overflow-hidden rounded-2xl border border-border-default bg-base-background"
+    class="flex flex-col overflow-hidden rounded-lg border border-border-default bg-base-background"
+    :style="{ width: `${BASE_WIDTH_PX * (scaleFactor / BASE_SCALE)}px` }"
   >
     <div ref="previewContainerRef" class="overflow-hidden p-3">
-      <div ref="previewWrapperRef" class="origin-top-left scale-50">
+      <div
+        ref="previewWrapperRef"
+        class="origin-top-left"
+        :style="{ transform: `scale(${scaleFactor})` }"
+      >
         <LGraphNodePreview :node-def="nodeDef" position="relative" />
       </div>
     </div>
@@ -18,21 +23,21 @@
       <!-- Category Path -->
       <p
         v-if="showCategoryPath && nodeDef.category"
-        class="-mt-1 text-xs text-muted-foreground"
+        class="-mt-1 truncate text-xs text-muted-foreground"
       >
-        {{ nodeDef.category.replaceAll('/', ' > ') }}
+        {{ categoryPath }}
       </p>
 
       <!-- Badges -->
-      <div class="flex flex-wrap gap-2 empty:hidden">
-        <NodePricingBadge :node-def="nodeDef" />
+      <div class="flex flex-wrap gap-2 overflow-hidden empty:hidden">
+        <NodePricingBadge class="max-w-full truncate" :node-def="nodeDef" />
         <NodeProviderBadge :node-def="nodeDef" />
       </div>
 
       <!-- Description -->
       <p
         v-if="nodeDef.description"
-        class="m-0 text-2xs/normal font-normal text-muted-foreground"
+        class="m-0 max-h-[30vh] overflow-y-auto text-2xs/normal font-normal text-muted-foreground"
       >
         {{ nodeDef.description }}
       </p>
@@ -99,17 +104,20 @@ import NodeProviderBadge from '@/components/node/NodeProviderBadge.vue'
 import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 
-const SCALE_FACTOR = 0.5
+const BASE_WIDTH_PX = 200
+const BASE_SCALE = 0.5
 const PREVIEW_CONTAINER_PADDING_PX = 24
 
 const {
   nodeDef,
   showInputsAndOutputs = true,
-  showCategoryPath = false
+  showCategoryPath = false,
+  scaleFactor = 0.5
 } = defineProps<{
   nodeDef: ComfyNodeDefImpl
   showInputsAndOutputs?: boolean
   showCategoryPath?: boolean
+  scaleFactor?: number
 }>()
 
 const previewContainerRef = ref<HTMLElement>()
@@ -118,11 +126,13 @@ const previewWrapperRef = ref<HTMLElement>()
 useResizeObserver(previewWrapperRef, (entries) => {
   const entry = entries[0]
   if (entry && previewContainerRef.value) {
-    const scaledHeight = entry.contentRect.height * SCALE_FACTOR
+    const scaledHeight = entry.contentRect.height * scaleFactor
     previewContainerRef.value.style.height = `${scaledHeight + PREVIEW_CONTAINER_PADDING_PX}px`
   }
 })
 
+const categoryPath = computed(() => nodeDef.category?.replaceAll('/', ' / '))
+
 const inputs = computed(() => {
   if (!nodeDef.inputs) return []
   return Object.entries(nodeDef.inputs)

src/components/node/NodePricingBadge.vue

@@ -1,18 +1,13 @@
 <template>
-  <BadgePill
-    v-if="nodeDef.api_node"
-    v-show="priceLabel"
-    :text="priceLabel"
-    icon="icon-[comfy--credits]"
-    border-style="#f59e0b"
-    filled
-  />
+  <span v-if="nodeDef.api_node && priceLabel">
+    <CreditBadge :text="priceLabel" />
+  </span>
 </template>
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 
-import BadgePill from '@/components/common/BadgePill.vue'
+import CreditBadge from '@/components/node/CreditBadge.vue'
 import { evaluateNodeDefPricing } from '@/composables/node/useNodePricing'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 

src/components/range/WidgetRange.test.ts

@@ -42,7 +42,7 @@ const RangeEditorStub = defineComponent({
     histogram: { type: Object, default: null },
     display: { type: String, default: '' }
   },
-  // eslint-disable-next-line vue/no-unused-emit-declarations
+
   emits: ['update:modelValue'],
   template: `
     <div data-testid="range-editor"

src/components/rightSidePanel/errors/TabErrors.test.ts

@@ -5,6 +5,8 @@ import PrimeVue from 'primevue/config'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 import TabErrors from './TabErrors.vue'
+import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
+import type { MissingModelCandidate } from '@/platform/missingModel/types'
 
 vi.mock('@/scripts/app', () => ({
   app: {
@@ -50,6 +52,12 @@ describe('TabErrors.vue', () => {
           rightSidePanel: {
             noErrors: 'No errors',
             noneSearchDesc: 'No results found',
+            missingModels: {
+              missingModelsTitle: 'Missing Models',
+              downloadAll: 'Download all',
+              refresh: 'Refresh',
+              refreshing: 'Refreshing missing models.'
+            },
             promptErrors: {
               prompt_no_outputs: {
                 desc: 'Prompt has no outputs'
@@ -82,7 +90,7 @@ describe('TabErrors.vue', () => {
             template: '<div><slot name="label" /><slot /></div>'
           },
           Button: {
-            template: '<button><slot /></button>'
+            template: '<button v-bind="$attrs"><slot /></button>'
           }
         }
       }
@@ -241,4 +249,58 @@ describe('TabErrors.vue', () => {
     expect(screen.getByTestId('runtime-error-panel')).toBeInTheDocument()
     expect(screen.getAllByText('RuntimeError: Out of memory')).toHaveLength(1)
   })
+
+  it('shows missing model Refresh in the section header when no model is downloadable', async () => {
+    const missingModel = {
+      nodeId: '1',
+      nodeType: 'CheckpointLoaderSimple',
+      widgetName: 'ckpt_name',
+      name: 'local-only.safetensors',
+      directory: 'checkpoints',
+      isMissing: true,
+      isAssetSupported: true
+    } satisfies MissingModelCandidate
+
+    const { user } = renderComponent({
+      missingModel: {
+        missingModelCandidates: [missingModel]
+      }
+    })
+    const missingModelStore = useMissingModelStore()
+
+    expect(screen.getByText('Missing Models (1)')).toBeInTheDocument()
+    expect(
+      screen.queryByTestId('missing-model-actions')
+    ).not.toBeInTheDocument()
+
+    await user.click(screen.getByTestId('missing-model-header-refresh'))
+
+    expect(missingModelStore.refreshMissingModels).toHaveBeenCalled()
+  })
+
+  it('keeps missing model Refresh in the card actions when models are downloadable', () => {
+    const missingModel = {
+      nodeId: '1',
+      nodeType: 'CheckpointLoaderSimple',
+      widgetName: 'ckpt_name',
+      name: 'downloadable.safetensors',
+      url: 'https://huggingface.co/comfy/test/resolve/main/downloadable.safetensors',
+      directory: 'checkpoints',
+      isMissing: true,
+      isAssetSupported: true
+    } satisfies MissingModelCandidate
+
+    renderComponent({
+      missingModel: {
+        missingModelCandidates: [missingModel]
+      }
+    })
+
+    expect(
+      screen.queryByTestId('missing-model-header-refresh')
+    ).not.toBeInTheDocument()
+    expect(screen.getByTestId('missing-model-actions')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /Download all/ })).toBeVisible()
+    expect(screen.getByRole('button', { name: 'Refresh' })).toBeVisible()
+  })
 })

src/components/rightSidePanel/errors/TabErrors.vue

@@ -101,18 +101,6 @@
                     : t('rightSidePanel.missingNodePacks.installAll')
                 }}
               </Button>
-              <Button
-                v-else-if="
-                  group.type === 'missing_model' &&
-                  downloadableModels.length > 1
-                "
-                variant="secondary"
-                size="sm"
-                class="mr-2 h-8 shrink-0 rounded-lg text-sm"
-                @click.stop="downloadAllModels"
-              >
-                {{ downloadAllLabel }}
-              </Button>
               <Button
                 v-else-if="group.type === 'swap_nodes'"
                 v-tooltip.top="
@@ -128,6 +116,47 @@
               >
                 {{ t('nodeReplacement.replaceAll', 'Replace All') }}
               </Button>
+              <Button
+                v-else-if="
+                  group.type === 'missing_model' &&
+                  showMissingModelHeaderRefresh
+                "
+                data-testid="missing-model-header-refresh"
+                variant="secondary"
+                size="sm"
+                class="mr-2 h-8 shrink-0 rounded-lg text-sm"
+                :aria-busy="missingModelStore.isRefreshingMissingModels"
+                :aria-disabled="missingModelStore.isRefreshingMissingModels"
+                @click.stop="handleMissingModelRefresh"
+              >
+                <DotSpinner
+                  v-if="missingModelStore.isRefreshingMissingModels"
+                  aria-hidden="true"
+                  duration="1s"
+                  :size="12"
+                />
+                <i
+                  v-else
+                  aria-hidden="true"
+                  class="icon-[lucide--refresh-cw] size-4 shrink-0"
+                />
+                {{ t('rightSidePanel.missingModels.refresh') }}
+              </Button>
+              <span
+                v-if="
+                  group.type === 'missing_model' &&
+                  showMissingModelHeaderRefresh
+                "
+                role="status"
+                aria-live="polite"
+                class="sr-only"
+              >
+                {{
+                  missingModelStore.isRefreshingMissingModels
+                    ? t('rightSidePanel.missingModels.refreshing')
+                    : ''
+                }}
+              </span>
             </div>
           </template>
 
@@ -238,14 +267,10 @@ import SwapNodesCard from '@/platform/nodeReplacement/components/SwapNodesCard.v
 import MissingModelCard from '@/platform/missingModel/components/MissingModelCard.vue'
 import MissingMediaCard from '@/platform/missingMedia/components/MissingMediaCard.vue'
 import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types'
-import {
-  downloadModel,
-  isModelDownloadable
-} from '@/platform/missingModel/missingModelDownload'
-import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
-import { formatSize } from '@/utils/formatUtil'
 import Button from '@/components/ui/button/Button.vue'
 import DotSpinner from '@/components/common/DotSpinner.vue'
+import { getDownloadableModels } from '@/platform/missingModel/missingModelViewUtils'
+import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
 import { useErrorActions } from './useErrorActions'
@@ -267,6 +292,7 @@ const { focusNode, enterSubgraph } = useFocusNode()
 const { openGitHubIssues, contactSupport } = useErrorActions()
 const settingStore = useSettingStore()
 const rightSidePanelStore = useRightSidePanelStore()
+const missingModelStore = useMissingModelStore()
 const { shouldShowManagerButtons, shouldShowInstallButton, openManager } =
   useManagerState()
 const { missingNodePacks } = useMissingNodes()
@@ -307,6 +333,23 @@ const {
   swapNodeGroups
 } = useErrorGroups(searchQuery, t)
 
+const missingModelDownloadableModels = computed(() => {
+  if (isCloud) return []
+
+  return getDownloadableModels(missingModelGroups.value)
+})
+
+const showMissingModelHeaderRefresh = computed(
+  () =>
+    !isCloud &&
+    missingModelGroups.value.length > 0 &&
+    missingModelDownloadableModels.value.length === 0
+)
+
+function handleMissingModelRefresh() {
+  void missingModelStore.refreshMissingModels()
+}
+
 const singleRuntimeErrorGroup = computed(() => {
   if (filteredGroups.value.length !== 1) return null
   const group = filteredGroups.value[0]
@@ -321,45 +364,6 @@ const singleRuntimeErrorCard = computed(
   () => singleRuntimeErrorGroup.value?.cards[0] ?? null
 )
 
-const missingModelStore = useMissingModelStore()
-
-const downloadableModels = computed(() => {
-  if (isCloud) return []
-  return missingModelGroups.value.flatMap((group) =>
-    group.models
-      .filter(
-        (m) =>
-          m.representative.url &&
-          m.representative.directory &&
-          isModelDownloadable({
-            name: m.representative.name,
-            url: m.representative.url,
-            directory: m.representative.directory
-          })
-      )
-      .map((m) => ({
-        name: m.representative.name,
-        url: m.representative.url!,
-        directory: m.representative.directory!
-      }))
-  )
-})
-
-const downloadAllLabel = computed(() => {
-  const base = t('rightSidePanel.missingModels.downloadAll')
-  const total = downloadableModels.value.reduce(
-    (sum, m) => sum + (missingModelStore.fileSizes[m.url] ?? 0),
-    0
-  )
-  return total > 0 ? `${base} (${formatSize(total)})` : base
-})
-
-function downloadAllModels() {
-  for (const model of downloadableModels.value) {
-    downloadModel(model, missingModelStore.folderPaths)
-  }
-}
-
 const isAllCollapsed = computed({
   get() {
     return filteredGroups.value.every((g) => isSectionCollapsed(g.title))