Merge remote-tracking branch 'origin/main' into feat/onboarding-getting-started

2026-07-17 01:07:56 +00:00 · 2026-07-17 00:31:31 +05:30
parent 1d2ac9ca27 d1d55585f9
commit 897e92f434
184 changed files with 9153 additions and 774 deletions
--- a/.github/workflows/ci-tests-e2e.yaml
+++ b/.github/workflows/ci-tests-e2e.yaml
@@ -73,8 +73,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        shardTotal: [16]
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
@@ -93,7 +93,7 @@ jobs:
      # Run sharded tests (browsers pre-installed in container)
      - name: Run Playwright tests (Shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
        id: playwright
-        run: pnpm exec playwright test --project=chromium --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=blob
+        run: pnpm exec playwright test --project=chromium --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
        env:
          PLAYWRIGHT_BLOB_OUTPUT_DIR: ./blob-report
          COLLECT_COVERAGE: 'true'
@@ -150,7 +150,7 @@ jobs:
      # Run tests (browsers pre-installed in container)
      - name: Run Playwright tests (${{ matrix.browser }})
        id: playwright
-        run: pnpm exec playwright test --project=${{ matrix.browser }} --reporter=blob
+        run: pnpm exec playwright test --project=${{ matrix.browser }}
        env:
          PLAYWRIGHT_BLOB_OUTPUT_DIR: ./blob-report

--- a/.github/workflows/release-biweekly-comfyui.yaml
+++ b/.github/workflows/release-biweekly-comfyui.yaml
@@ -23,6 +23,10 @@ on:
        required: false
        default: 'Comfy-Org/ComfyUI'
        type: string
+      target_branch:
+        description: 'Optional: force a specific release branch, e.g. core/1.47 or core/2.0. Overrides the pin-derived target — use to skip a dead minor or do an out-of-cadence / major release.'
+        required: false
+        type: string

 jobs:
  check-release-week:
@@ -49,12 +53,15 @@ jobs:
          fi

      - name: Summary
+        env:
+          TARGET_BRANCH_OVERRIDE: ${{ inputs.target_branch }}
        run: |
          echo "## Release Check" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
          echo "- Is release week: ${{ steps.check.outputs.is_release_week }}" >> $GITHUB_STEP_SUMMARY
          echo "- Manual trigger: ${{ github.event_name == 'workflow_dispatch' }}" >> $GITHUB_STEP_SUMMARY
          echo "- Release type: ${{ inputs.release_type || 'minor (scheduled)' }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Target branch override: ${TARGET_BRANCH_OVERRIDE:-(none — pin-derived)}" >> $GITHUB_STEP_SUMMARY

  resolve-version:
    needs: check-release-week
@@ -103,6 +110,7 @@ jobs:
        working-directory: frontend
        env:
          RELEASE_TYPE: ${{ inputs.release_type || 'minor' }}
+          TARGET_BRANCH: ${{ inputs.target_branch }}
        run: |
          set -euo pipefail

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

  test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Careers — Comfy')
+    await expect(page).toHaveTitle('Careers - Comfy')
  })

  test('Roles section heading is visible', async ({ page }) => {
@@ -72,7 +72,7 @@ test.describe('Careers page role links', () => {
 test.describe('Careers page (zh-CN) @smoke', () => {
  test('renders localized heading and roles', async ({ page }) => {
    await page.goto('/zh-CN/careers')
-    await expect(page).toHaveTitle('招聘 — Comfy')
+    await expect(page).toHaveTitle('招聘 - Comfy')
    await expect(
      page.getByRole('heading', { name: '职位', level: 2 })
    ).toBeVisible()
--- a/apps/website/e2e/cloud-nodes.spec.ts
+++ b/apps/website/e2e/cloud-nodes.spec.ts
@@ -9,7 +9,7 @@ test.describe('Cloud nodes page @smoke', () => {

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

--- a/apps/website/e2e/cloud.spec.ts
+++ b/apps/website/e2e/cloud.spec.ts
@@ -8,7 +8,7 @@ test.describe('Cloud page @smoke', () => {
  })

  test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Comfy Cloud — AI in the Cloud')
+    await expect(page).toHaveTitle('Comfy Cloud - AI in the Cloud')
  })

  test('HeroSection heading and subtitle are visible', async ({ page }) => {
--- a/apps/website/e2e/download.spec.ts
+++ b/apps/website/e2e/download.spec.ts
@@ -16,7 +16,7 @@ test.describe('Download page @smoke', () => {

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

--- a/apps/website/e2e/homepage.spec.ts
+++ b/apps/website/e2e/homepage.spec.ts
@@ -17,7 +17,7 @@ test.describe('Homepage @smoke', () => {
  })

  test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Comfy — Professional Control of Visual AI')
+    await expect(page).toHaveTitle('Comfy - Professional Control of Visual AI')
  })

  test('HeroSection heading is visible', async ({ page }) => {
--- a/apps/website/e2e/learning.spec.ts
+++ b/apps/website/e2e/learning.spec.ts
@@ -13,7 +13,7 @@ test.describe('Learning page @smoke', () => {
  })

  test('has correct title', async ({ page }) => {
-    await expect(page).toHaveTitle('Learning — Comfy')
+    await expect(page).toHaveTitle('Learning - Comfy')
  })

  test('hero headline references ComfyUI', async ({ page }) => {
@@ -137,7 +137,7 @@ test.describe('Learning page (zh-CN) @smoke', () => {
  test('renders localized title, headings, and tutorials', async ({ page }) => {
    await page.goto('/zh-CN/learning')

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

  test('has correct title and is noindex', async ({ page }) => {
-    await expect(page).toHaveTitle('Payment Successful — Comfy')
+    await expect(page).toHaveTitle('Payment Successful - Comfy')
    await expectNoIndex(page)
  })

@@ -54,7 +54,7 @@ test.describe('Payment failed page @smoke', () => {
  })

  test('has correct title and is noindex', async ({ page }) => {
-    await expect(page).toHaveTitle('Payment Failed — Comfy')
+    await expect(page).toHaveTitle('Payment Failed - Comfy')
    await expectNoIndex(page)
  })

@@ -84,7 +84,7 @@ test.describe('Payment failed page @smoke', () => {
 test.describe('Payment pages zh-CN @smoke', () => {
  test('zh-CN success page renders and links correctly', async ({ page }) => {
    await page.goto('/zh-CN/payment/success')
-    await expect(page).toHaveTitle('支付成功 — Comfy')
+    await expect(page).toHaveTitle('支付成功 - Comfy')
    await expectNoIndex(page)
    await expect(
      page.getByRole('heading', { name: '支付成功', level: 1 })
@@ -99,7 +99,7 @@ test.describe('Payment pages zh-CN @smoke', () => {

  test('zh-CN failed page renders and links correctly', async ({ page }) => {
    await page.goto('/zh-CN/payment/failed')
-    await expect(page).toHaveTitle('支付失败 — Comfy')
+    await expect(page).toHaveTitle('支付失败 - Comfy')
    await expectNoIndex(page)
    await expect(
      page.getByRole('heading', { name: '无法完成支付', level: 1 })
--- a/apps/website/public/icons/comfyicon.svg
+++ b/apps/website/public/icons/comfyicon.svg
@@ -0,0 +1,4 @@
+<svg width="275" height="275" viewBox="0 0 275 275" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="274.66" height="274.66" rx="63.5555" fill="#211927"/>
+<path d="M177.456 174.409C177.713 173.538 177.854 172.621 177.854 171.656C177.854 166.313 173.546 161.983 168.232 161.983H125.108C122.791 162.006 120.894 160.124 120.894 157.794C120.894 157.37 120.965 156.97 121.058 156.594L132.67 115.926C133.162 114.137 134.801 112.819 136.72 112.819L180.008 112.772C189.138 112.772 196.84 106.582 199.158 98.1335L205.666 75.4696C205.877 74.6695 205.994 73.7987 205.994 72.9279C205.994 67.6091 201.71 63.3022 196.419 63.3022H144.048C134.965 63.3022 127.286 69.4448 124.921 77.7996L120.52 93.2618C120.005 95.0269 118.389 96.3213 116.47 96.3213H103.898C94.8846 96.3213 87.276 102.346 84.8412 110.607L69.0152 166.172C68.7811 166.996 68.6641 167.89 68.6641 168.784C68.6641 174.127 72.9717 178.457 78.2861 178.457H90.6472C92.9649 178.457 94.8612 180.34 94.8612 182.693C94.8612 183.093 94.8144 183.494 94.6973 183.87L90.3194 199.191C90.1087 200.015 89.9683 200.862 89.9683 201.733C89.9683 207.052 94.2525 211.359 99.5434 211.359L151.938 211.312C161.045 211.312 168.724 205.145 171.065 196.744L177.432 174.433L177.456 174.409Z" fill="#F2FF59"/>
+</svg>
--- a/apps/website/src/components/blocks/FAQSplit01.vue
+++ b/apps/website/src/components/blocks/FAQSplit01.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
-import { reactive, watch } from 'vue'
+import { computed, reactive, watch } from 'vue'

 type Faq = { id: string; question: string; answer: string }

@@ -9,6 +9,31 @@ const { faqs } = defineProps<{
  faqs: readonly Faq[]
 }>()

+type AnswerPart = { type: 'text' | 'link'; value: string }
+
+function parseAnswer(answer: string): AnswerPart[] {
+  const urlPattern = /https?:\/\/[\w\-./?=&#%~:@+,;]+/g
+  const parts: AnswerPart[] = []
+  let lastIndex = 0
+  for (const match of answer.matchAll(urlPattern)) {
+    const start = match.index ?? 0
+    const url = match[0].replace(/[.,;:]+$/, '')
+    if (start > lastIndex) {
+      parts.push({ type: 'text', value: answer.slice(lastIndex, start) })
+    }
+    parts.push({ type: 'link', value: url })
+    lastIndex = start + url.length
+  }
+  if (lastIndex < answer.length) {
+    parts.push({ type: 'text', value: answer.slice(lastIndex) })
+  }
+  return parts
+}
+
+const parsedFaqs = computed(() =>
+  faqs.map((faq) => ({ ...faq, answerParts: parseAnswer(faq.answer) }))
+)
+
 const expanded = reactive<boolean[]>(faqs.map(() => false))

 watch(
@@ -40,7 +65,7 @@ function toggle(index: number) {
      <!-- Right FAQ list -->
      <div class="flex-1">
        <div
-          v-for="(faq, index) in faqs"
+          v-for="(faq, index) in parsedFaqs"
          :key="faq.id"
          class="border-b border-primary-comfy-canvas/20"
        >
@@ -83,8 +108,23 @@ function toggle(index: number) {
            :aria-labelledby="`faq-trigger-${faq.id}`"
            class="pb-6"
          >
-            <p class="text-sm whitespace-pre-line text-primary-comfy-canvas/70">
-              {{ faq.answer }}
+            <p
+              class="text-sm wrap-break-word whitespace-pre-line text-primary-comfy-canvas/70"
+            >
+              <template
+                v-for="(part, partIndex) in faq.answerParts"
+                :key="partIndex"
+              >
+                <a
+                  v-if="part.type === 'link'"
+                  :href="part.value"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  class="text-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 rounded-sm underline underline-offset-2 transition-opacity hover:opacity-70 focus-visible:ring-2 focus-visible:outline-none"
+                  >{{ part.value }}</a
+                >
+                <template v-else>{{ part.value }}</template>
+              </template>
            </p>
          </section>
        </div>
--- a/apps/website/src/components/blocks/FeatureGrid01.vue
+++ b/apps/website/src/components/blocks/FeatureGrid01.vue
@@ -1,120 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-
-import type { Component } from 'vue'
-
-import Button from '@/components/ui/button/Button.vue'
-import CopyableField from '@/components/ui/copyable-field/CopyableField.vue'
-
-import SectionHeader from '../common/SectionHeader.vue'
-
-type CardAction =
-  | {
-      type: 'link'
-      label: string
-      href: string
-      target?: '_blank'
-      icon?: Component
-      variant?: 'default' | 'outline'
-    }
-  | { type: 'code'; value: string }
-
-export interface FeatureCard {
-  id: string
-  label?: string
-  title: string
-  description: string
-  action?: CardAction
-}
-
-type ColumnCount = 2 | 3 | 4
-
-const {
-  cards,
-  columns = 3,
-  copiedLabel,
-  copyLabel,
-  eyebrow,
-  heading,
-  subtitle
-} = defineProps<{
-  cards: readonly FeatureCard[]
-  columns?: ColumnCount
-  copiedLabel?: string
-  copyLabel?: string
-  eyebrow?: string
-  heading: string
-  subtitle?: string
-}>()
-
-const columnClass: Record<ColumnCount, string> = {
-  2: 'lg:grid-cols-2',
-  3: 'lg:grid-cols-3',
-  4: 'lg:grid-cols-4'
-}
-</script>
-
-<template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
-    <SectionHeader max-width="xl" :label="eyebrow" align="start">
-      {{ heading }}
-      <template v-if="subtitle" #subtitle>
-        <p class="mt-4 max-w-xl text-sm text-smoke-700 lg:text-base">
-          {{ subtitle }}
-        </p>
-      </template>
-    </SectionHeader>
-
-    <div :class="cn('mt-16 grid grid-cols-1 gap-6', columnClass[columns])">
-      <div
-        v-for="card in cards"
-        :key="card.id"
-        class="bg-transparency-white-t4 flex flex-col rounded-3xl p-6 lg:p-8"
-      >
-        <p
-          v-if="card.label"
-          class="text-primary-comfy-yellow text-xs font-bold tracking-widest uppercase"
-        >
-          {{ card.label }}
-        </p>
-        <h3
-          :class="
-            cn(
-              'text-xl font-light text-primary-comfy-canvas lg:text-2xl',
-              card.label && 'mt-3'
-            )
-          "
-        >
-          {{ card.title }}
-        </h3>
-        <p class="mt-3 text-sm text-smoke-700">
-          {{ card.description }}
-        </p>
-
-        <div v-if="card.action" class="mt-6">
-          <Button
-            v-if="card.action.type === 'link'"
-            as="a"
-            :href="card.action.href"
-            :target="card.action.target"
-            :rel="
-              card.action.target === '_blank'
-                ? 'noopener noreferrer'
-                : undefined
-            "
-            :variant="card.action.variant ?? 'outline'"
-            :append-icon="card.action.icon"
-          >
-            {{ card.action.label }}
-          </Button>
-          <CopyableField
-            v-else
-            :value="card.action.value"
-            :copy-label="copyLabel"
-            :copied-label="copiedLabel"
-          />
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
--- a/apps/website/src/components/blocks/FeatureRows01.vue
+++ b/apps/website/src/components/blocks/FeatureRows01.vue
@@ -8,7 +8,7 @@ import VideoPlayer from '../common/VideoPlayer.vue'
 import type { VideoTrack } from '../common/VideoPlayer.vue'

 type RowMedia =
-  | { type: 'image'; src: string; alt?: string }
+  | { type: 'image'; src: string; alt?: string; fit?: 'cover' | 'contain' }
  | {
      type: 'video'
      src: string
@@ -20,6 +20,7 @@ type RowMedia =
      loop?: boolean
      minimal?: boolean
      hideControls?: boolean
+      fit?: 'cover' | 'contain'
    }

 export interface FeatureRow {
@@ -58,7 +59,7 @@ const {
        <div
          :class="
            cn(
-              'order-2 flex flex-col justify-center gap-4 p-6 lg:w-1/2 lg:p-12',
+              'order-2 flex flex-col justify-center gap-4 p-6 lg:flex-1 lg:p-12',
              i % 2 === 0 ? 'lg:order-1' : 'lg:order-2'
            )
          "
@@ -72,10 +73,11 @@ const {
        </div>

        <!-- Media: image or video -->
+        <!-- 620/364 and w-155 (620px) match the card media asset dimensions -->
        <div
          :class="
            cn(
-              'order-1 flex lg:w-1/2',
+              'relative order-1 aspect-620/364 w-full lg:w-155 lg:shrink-0',
              i % 2 === 0 ? 'lg:order-2' : 'lg:order-1'
            )
          "
@@ -86,7 +88,12 @@ const {
            :alt="row.media.alt ?? row.title"
            loading="lazy"
            decoding="async"
-            class="aspect-4/3 w-full rounded-4xl object-cover"
+            :class="
+              cn(
+                'absolute inset-0 size-full rounded-4xl',
+                row.media.fit === 'contain' ? 'object-contain' : 'object-cover'
+              )
+            "
          />
          <VideoPlayer
            v-else
@@ -99,7 +106,13 @@ const {
            :loop="row.media.loop"
            :minimal="row.media.minimal"
            :hide-controls="row.media.hideControls"
-            class="w-full"
+            :fit="row.media.fit"
+            :class="
+              cn(
+                'absolute inset-0 size-full',
+                row.media.fit === 'contain' && 'bg-transparent'
+              )
+            "
          />
        </div>
      </GlassCard>
--- a/apps/website/src/components/common/SiteFooter.vue
+++ b/apps/website/src/components/common/SiteFooter.vue
@@ -85,6 +85,7 @@ const companyColumn: { title: string; links: FooterLink[] } = {
  links: [
    { label: t('footer.about', locale), href: routes.about },
    { label: t('nav.careers', locale), href: routes.careers },
+    { label: t('nav.brand', locale), href: routes.brand },
    { label: t('footer.termsOfService', locale), href: routes.termsOfService },
    { label: t('footer.enterpriseMsa', locale), href: routes.enterpriseMsa },
    { label: t('footer.privacyPolicy', locale), href: routes.privacyPolicy }
@@ -175,10 +176,7 @@ const contactColumn: { title: string; links: FooterLink[] } = {
      </div>

      <!-- Logo -->
-      <canvas
-        ref="canvasRef"
-        class="pointer-events-none size-52 opacity-80 lg:mt-28"
-      />
+      <canvas ref="canvasRef" class="pointer-events-none size-52 lg:mt-28" />
    </div>
  </footer>
 </template>
--- a/apps/website/src/components/common/VideoPlayer.vue
+++ b/apps/website/src/components/common/VideoPlayer.vue
@@ -10,6 +10,7 @@ import {
  whenever
 } from '@vueuse/core'
 import { computed, shallowRef, useTemplateRef, watch } from 'vue'
+import type { HTMLAttributes } from 'vue'

 import { t } from '../../i18n/translations'
 import type { Locale } from '../../i18n/translations'
@@ -30,7 +31,9 @@ const {
  autoplay = false,
  loop = false,
  minimal = false,
-  hideControls = false
+  hideControls = false,
+  fit = 'cover',
+  class: className
 } = defineProps<{
  locale?: Locale
  src?: string
@@ -40,6 +43,8 @@ const {
  loop?: boolean
  minimal?: boolean
  hideControls?: boolean
+  fit?: 'cover' | 'contain'
+  class?: HTMLAttributes['class']
 }>()

 const playerEl = useTemplateRef<HTMLDivElement>('playerEl')
@@ -189,7 +194,12 @@ function toggleFullscreen() {
 <template>
  <div
    ref="playerEl"
-    class="relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black"
+    :class="
+      cn(
+        'relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black',
+        className
+      )
+    "
    @pointermove="showControls"
    @pointerdown="showControls"
    @focusin="showControls"
@@ -197,7 +207,9 @@ function toggleFullscreen() {
    <video
      v-if="src"
      ref="videoEl"
-      class="size-full object-cover"
+      :class="
+        cn('size-full', fit === 'contain' ? 'object-contain' : 'object-cover')
+      "
      :src
      :poster
      :preload="autoplay ? 'auto' : 'metadata'"
--- a/apps/website/src/components/ui/button/index.ts
+++ b/apps/website/src/components/ui/button/index.ts
@@ -20,6 +20,8 @@ export const buttonVariants = cva(
        link: "text-primary-comfy-yellow h-auto justify-start px-0 py-1 text-base uppercase hover:opacity-90 [&_svg:not([class*='size-'])]:size-6",
        underlineLink:
          "text-primary-comfy-yellow relative h-auto justify-start px-0 py-1 uppercase after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-full after:origin-left after:scale-x-0 after:bg-current after:transition-transform after:duration-200 hover:opacity-90 hover:after:scale-x-100 [&_svg:not([class*='size-'])]:size-6",
+        inline:
+          'text-primary-comfy-yellow inline h-auto rounded-none p-0 align-baseline text-sm font-normal tracking-normal whitespace-normal hover:opacity-90 [&>span]:top-0 [&>span]:underline',
        nav: 'text-primary-warm-white hover:text-primary-comfy-yellow h-auto justify-between px-0 py-1 text-start text-2xl font-medium',
        navMuted:
          'hover:text-primary-comfy-yellow h-auto w-full justify-between px-0 py-1 text-start text-2xl font-medium text-primary-comfy-canvas uppercase'
--- a/apps/website/src/config/routes.ts
+++ b/apps/website/src/config/routes.ts
@@ -21,7 +21,8 @@ const baseRoutes = {
  affiliateTerms: '/affiliates/terms',
  contact: '/contact',
  models: '/p/supported-models',
-  mcp: '/mcp'
+  mcp: '/mcp',
+  brand: '/brand'
 } as const

 type Routes = typeof baseRoutes
@@ -87,6 +88,7 @@ export const externalLinks = {
  githubInstall: 'https://github.com/Comfy-Org/ComfyUI#installing',
  instagram: 'https://www.instagram.com/comfyui/',
  linkedin: 'https://www.linkedin.com/company/comfyui',
+  mcpEndpoint: 'https://cloud.comfy.org/mcp',
  mcpSkills: 'https://github.com/Comfy-Org/comfy-skills',
  platform: 'https://platform.comfy.org',
  platformUsage: 'https://platform.comfy.org/profile/usage',
--- a/apps/website/src/data/affiliateBrandAssets.ts
+++ b/apps/website/src/data/affiliateBrandAssets.ts
@@ -1,5 +1,7 @@
 import type { LocalizedText } from '../i18n/translations'

+import { BRAND_ASSETS_ZIP } from './brandAssets'
+
 interface AffiliateBrandAsset {
  id: string
  title: LocalizedText
@@ -7,9 +9,6 @@ interface AffiliateBrandAsset {
  preview: string
 }

-const BRAND_ASSETS_ZIP =
-  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
-
 export const affiliateBrandAssets: readonly AffiliateBrandAsset[] = [
  {
    id: 'core-logo',
--- a/apps/website/src/data/brandAssets.ts
+++ b/apps/website/src/data/brandAssets.ts
@@ -0,0 +1,9 @@
+// Shared brand download URLs served from the media bucket, used by both the
+// affiliate page and the brand portal.
+export const BRAND_ASSETS_ZIP =
+  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
+
+// Brand guidelines live in Google Drive, shared to Comfy Org only, so Google
+// enforces the comfy.org sign-in. Opened in a new tab rather than downloaded.
+export const BRAND_GUIDELINES_PDF =
+  'https://drive.google.com/file/d/1EDt03JTfF_nbbY_H2n67aaUj6k11v3bS/view'
--- a/apps/website/src/data/brandColors.ts
+++ b/apps/website/src/data/brandColors.ts
@@ -0,0 +1,91 @@
+interface BrandColor {
+  name: string
+  hex: string
+  rgb: string
+  hsl: string
+  cmyk: string
+  swatchClass: string
+  textClass: string
+  wide?: boolean
+  border?: boolean
+}
+
+export const brandColors: readonly BrandColor[] = [
+  {
+    name: 'Comfy Yellow',
+    hex: '#F2FF59',
+    rgb: '242, 255, 89',
+    hsl: '65, 100, 67',
+    cmyk: '5, 0, 65, 0',
+    swatchClass: 'bg-primary-comfy-yellow',
+    textClass: 'text-primary-comfy-ink',
+    wide: true
+  },
+  {
+    name: 'Comfy Ink',
+    hex: '#211927',
+    rgb: '33, 25, 39',
+    hsl: '274, 22, 13',
+    cmyk: '15, 36, 0, 85',
+    swatchClass: 'bg-primary-comfy-ink',
+    textClass: 'text-primary-warm-white',
+    border: true
+  },
+  {
+    name: 'Comfy Canvas',
+    hex: '#C2BFB9',
+    rgb: '194, 191, 185',
+    hsl: '40, 7, 74',
+    cmyk: '0, 2, 5, 24',
+    swatchClass: 'bg-primary-comfy-canvas',
+    textClass: 'text-primary-comfy-ink'
+  },
+  {
+    name: 'Comfy Plum',
+    hex: '#49378B',
+    rgb: '73, 55, 139',
+    hsl: '253, 43, 38',
+    cmyk: '47, 60, 0, 45',
+    swatchClass: 'bg-primary-comfy-plum',
+    textClass: 'text-primary-comfy-canvas'
+  },
+  {
+    name: 'Warm White',
+    hex: '#F0EFED',
+    rgb: '240, 239, 237',
+    hsl: '40, 9, 94',
+    cmyk: '0, 0, 1, 6',
+    swatchClass: 'bg-primary-warm-white',
+    textClass: 'text-primary-comfy-ink',
+    wide: true
+  },
+  {
+    name: 'Warm Gray',
+    hex: '#7E7C78',
+    rgb: '126, 124, 120',
+    hsl: '40, 2, 48',
+    cmyk: '0, 2, 5, 51',
+    swatchClass: 'bg-primary-warm-gray',
+    textClass: 'text-primary-warm-white',
+    border: true
+  },
+  {
+    name: 'Cool Gray',
+    hex: '#3C3C3C',
+    rgb: '60, 60, 60',
+    hsl: '0, 0, 24',
+    cmyk: '0, 0, 0, 76',
+    swatchClass: 'bg-secondary-cool-gray',
+    textClass: 'text-primary-warm-white',
+    border: true
+  },
+  {
+    name: 'Mauve',
+    hex: '#4D3762',
+    rgb: '77, 55, 98',
+    hsl: '271, 28, 30',
+    cmyk: '21, 44, 0, 62',
+    swatchClass: 'bg-secondary-mauve',
+    textClass: 'text-primary-warm-white'
+  }
+] as const
--- a/apps/website/src/i18n/translations.ts
+++ b/apps/website/src/i18n/translations.ts
@@ -823,7 +823,7 @@ const translations = {
    'zh-CN': 'Comfy Cloud 支持的自定义节点包'
  },
  'cloudNodes.meta.title': {
-    en: 'Custom-node packs on Comfy Cloud — supported by default',
+    en: 'Custom-node packs on Comfy Cloud - supported by default',
    'zh-CN': 'Comfy Cloud 自定义节点包合集——开箱即用'
  },
  'cloudNodes.meta.description': {
@@ -1845,8 +1845,8 @@ const translations = {

  // MCP – Meta
  'mcp.meta.title': {
-    en: 'Comfy MCP — Drive ComfyUI from any AI agent',
-    'zh-CN': 'Comfy MCP — 让任何 AI 智能体驱动 ComfyUI'
+    en: 'Comfy MCP - Drive ComfyUI from any AI agent',
+    'zh-CN': 'Comfy MCP - 让任何 AI 智能体驱动 ComfyUI'
  },
  'mcp.meta.description': {
    en: 'Comfy MCP exposes the full ComfyUI engine over the Model Context Protocol. Generate images, video, audio, and 3D from Claude Code, Claude Desktop, and any MCP-compatible client.',
@@ -1864,10 +1864,26 @@ const translations = {
    'zh-CN':
      'Comfy MCP 通过模型上下文协议暴露完整的 ComfyUI 引擎——让你的助手能够接入生态系统、构建工作流，并生成图像、视频、音频或 3D 内容。'
  },
-  'mcp.hero.demoPrompt': {
+  'mcp.hero.demoPromptMoodboard': {
+    en: 'turn the brief in this email into a 6-up moodboard',
+    'zh-CN': '把这封邮件里的需求做成六宫格情绪板'
+  },
+  'mcp.hero.demoPromptConcepts': {
+    en: 'sketch three concept frames for the launch page',
+    'zh-CN': '为发布页画三张概念稿'
+  },
+  'mcp.hero.demoPromptKeyart': {
    en: "match this frame's palette, make the hero key art",
    'zh-CN': '匹配这一帧的配色，生成主视觉关键画面'
  },
+  'mcp.hero.demoPromptPbr': {
+    en: 'make a tileable asphalt PBR material, all 5 maps',
+    'zh-CN': '生成可平铺的沥青 PBR 材质，共 5 张贴图'
+  },
+  'mcp.hero.demoPromptUpscale': {
+    en: 'upscale the neon kaiju shot to 4K',
+    'zh-CN': '把霓虹怪兽画面放大到 4K'
+  },
  'mcp.hero.viewDocs': {
    en: 'VIEW DOCS',
    'zh-CN': '查看文档'
@@ -1876,10 +1892,6 @@ const translations = {
    en: 'INSTALL MCP',
    'zh-CN': '安装 MCP'
  },
-  'mcp.hero.runWorkflow': {
-    en: 'RUN A WORKFLOW',
-    'zh-CN': '运行工作流'
-  },
  'mcp.hero.demoGenerate': {
    en: 'GENERATE',
    'zh-CN': '生成'
@@ -1897,60 +1909,90 @@ const translations = {
    'zh-CN': '放大图像'
  },

-  // MCP – SetupStepsSection
+  // MCP – SetupSection
  'mcp.setup.label': {
    en: 'GET STARTED',
    'zh-CN': '快速开始'
  },
  'mcp.setup.heading': {
-    en: 'Set up Comfy MCP in three steps',
-    'zh-CN': '三步完成 Comfy MCP 配置'
+    en: 'Set up Comfy MCP',
+    'zh-CN': '配置 Comfy MCP'
  },
  'mcp.setup.subtitle': {
-    en: 'Add Comfy Cloud as a custom connector in Claude, Cursor, Codex, or any MCP-compatible client. Sign in once, and the full ComfyUI toolset is available right in your chat.',
+    en: 'Two ways to connect: ask your agent to install it, or add the server yourself. Sign in once, and the full ComfyUI toolset is available right in your chat.',
    'zh-CN':
-      '将 Comfy Cloud 添加为 Claude、Cursor、Codex 或任意兼容 MCP 客户端的自定义连接器。登录一次，ComfyUI 全套工具即可直接在对话中使用。'
+      '两种接入方式：让你的智能体自动安装，或自行添加服务器。登录一次，ComfyUI 全套工具即可直接在对话中使用。'
  },
-  'mcp.setup.step1.label': { en: 'STEP 1', 'zh-CN': '第 1 步' },
-  'mcp.setup.step1.title': {
+  'mcp.setup.option1.label': { en: 'OPTION 1', 'zh-CN': '方式一' },
+  'mcp.setup.option1.title': {
    en: 'Ask your agent to install Comfy MCP',
    'zh-CN': '让你的智能体安装 Comfy MCP'
  },
-  'mcp.setup.step1.command': {
+  'mcp.setup.option1.command': {
    en: 'Help me install Comfy MCP.\nFollow the setup guide at {url}',
    'zh-CN': '帮我安装 Comfy MCP。\n请按照 {url} 上的设置指南操作。'
  },
-  'mcp.setup.step1.description': {
+  'mcp.setup.option1.description': {
    en: 'Paste this into Claude, Cursor, Codex, or any MCP-compatible agent. It reads the docs and adds the connector for you.',
    'zh-CN':
      '将它粘贴到 Claude、Cursor、Codex 或任意兼容 MCP 的智能体中。它会读取文档并为你添加连接器。'
  },
-  'mcp.setup.step2.label': { en: 'STEP 2', 'zh-CN': '第 2 步' },
-  'mcp.setup.step2.title': {
-    en: 'Or add it by hand',
-    'zh-CN': '或手动添加'
+  'mcp.setup.option2.label': { en: 'OPTION 2', 'zh-CN': '方式二' },
+  'mcp.setup.option2.title': {
+    en: 'Install manually',
+    'zh-CN': '手动安装'
  },
-  'mcp.setup.step2.description': {
-    en: 'Prefer manual setup? Add Comfy Cloud as a custom connector with the MCP URL. The docs cover every client.',
+  'mcp.setup.option2.description': {
+    en: 'Prefer manual setup? Add this URL as a custom connector or remote MCP server in your client, then sign in when prompted.',
    'zh-CN':
-      '想手动配置？用 MCP URL 将 Comfy Cloud 添加为自定义连接器。文档涵盖各类客户端。'
+      '想手动配置？将此 URL 添加为客户端的自定义连接器或远程 MCP 服务器，然后按提示登录。'
  },
-  'mcp.setup.step2.cta': {
-    en: 'COMFY CLOUD MCP DOCS',
-    'zh-CN': 'COMFY CLOUD MCP 文档'
+  'mcp.setup.option2.tabsLabel': {
+    en: 'Pick your client',
+    'zh-CN': '选择你的客户端'
  },
-  'mcp.setup.step3.label': { en: 'STEP 3', 'zh-CN': '第 3 步' },
-  'mcp.setup.step3.title': {
-    en: 'Connect and sign in',
-    'zh-CN': '连接并登录'
+  'mcp.setup.clients.claudeCode.step': {
+    en: 'Run this in your terminal, then use /mcp to pick comfy-cloud and authenticate.',
+    'zh-CN': '在终端运行以下命令，然后通过 /mcp 选择 comfy-cloud 并完成认证。'
  },
-  'mcp.setup.step3.description': {
-    en: 'Click Connect, sign in, and every Comfy Cloud skill is ready in your client.',
-    'zh-CN': '点击"连接"并登录，所有 Comfy Cloud 技能即可在你的客户端中使用。'
+  'mcp.setup.clients.claudeDesktop.step': {
+    en: 'Click Customize in the sidebar, open Connectors, choose Add custom connector, paste the URL above, and sign in.',
+    'zh-CN':
+      '点击侧边栏的 Customize，进入 Connectors，选择添加自定义连接器，粘贴上方 URL 并登录。'
  },
-  'mcp.setup.step3.cta': {
-    en: 'COMFY CLOUD SKILLS',
-    'zh-CN': 'COMFY CLOUD 技能'
+  'mcp.setup.clients.cursor.step': {
+    en: 'Add the URL above to ~/.cursor/mcp.json with an X-API-Key header. Create your key at ',
+    'zh-CN':
+      '将上方 URL 添加到 ~/.cursor/mcp.json，并附带 X-API-Key 请求头。在此创建密钥：'
+  },
+  'mcp.setup.clients.cursor.linkLabel': {
+    en: 'platform.comfy.org',
+    'zh-CN': 'platform.comfy.org'
+  },
+  'mcp.setup.clients.codex.step': {
+    en: 'Run this in your terminal, then codex mcp login comfy-cloud to sign in.',
+    'zh-CN': '在终端运行以下命令，然后执行 codex mcp login comfy-cloud 登录。'
+  },
+  'mcp.setup.clients.other.name': {
+    en: 'Other clients',
+    'zh-CN': '其他客户端'
+  },
+  'mcp.setup.clients.other.step': {
+    en: 'Add the URL above as a remote MCP server. No OAuth in your client? Use an X-API-Key header instead. Full walkthroughs live in the ',
+    'zh-CN':
+      '将上方 URL 添加为远程 MCP 服务器。客户端不支持 OAuth？改用 X-API-Key 请求头。完整教程见'
+  },
+  'mcp.setup.clients.other.linkLabel': {
+    en: 'setup docs',
+    'zh-CN': '设置文档'
+  },
+  'mcp.setup.skillsNote': {
+    en: 'Using Claude Code? The Comfy skills plugin adds ready-made slash commands. ',
+    'zh-CN': '在用 Claude Code？Comfy 技能插件提供现成的斜杠命令。'
+  },
+  'mcp.setup.skillsLink': {
+    en: 'View on GitHub',
+    'zh-CN': '在 GitHub 上查看'
  },

  // MCP – WhyBuildSection
@@ -1971,9 +2013,9 @@ const translations = {
    'zh-CN': '开放协议，\n任意客户端。'
  },
  'mcp.why.1.description': {
-    en: 'MCP is an open standard, so any MCP-compatible client can connect. Today Comfy supports Claude Code and Claude Desktop, with more clients coming.',
+    en: 'MCP is an open standard, so any MCP-compatible client can connect. Claude Code, Claude Desktop, and Codex sign in with OAuth; every other agent connects with an API key.',
    'zh-CN':
-      'MCP 是开放标准，因此任何兼容 MCP 的客户端都能接入。目前 Comfy 支持 Claude Code 和 Claude Desktop，更多客户端即将推出。'
+      'MCP 是开放标准，因此任何兼容 MCP 的客户端都能接入。Claude Code、Claude Desktop 和 Codex 通过 OAuth 登录，其他智能体使用 API 密钥连接。'
  },
  'mcp.why.2.title': {
    en: 'The full engine,\nnot a sandbox.',
@@ -2037,14 +2079,53 @@ const translations = {
    'zh-CN': '运行真实工作流'
  },
  'mcp.tools.3.description': {
-    en: 'Turn any ComfyUI workflow into a callable tool. The full power of the engine, driven by your agent.',
+    en: 'Submit graphs, track jobs, and pull outputs back. Save and share workflows, reuse a saved one, or open any run on the ComfyUI canvas — the full engine, driven by tool calls.',
    'zh-CN':
-      '将任何 ComfyUI 工作流转换为可调用的工具。由你的智能体驱动完整的引擎能力。'
+      '提交计算图、跟踪任务并取回输出。保存和分享工作流，复用已保存的工作流，或在 ComfyUI 画布上打开任意运行——完整的引擎，由工具调用驱动。'
  },
  'mcp.tools.3.alt': {
    en: 'Comfy MCP running a ComfyUI workflow as a callable tool from a chat',
    'zh-CN': 'Comfy MCP 在对话中将 ComfyUI 工作流作为可调用工具运行'
  },
+  'mcp.tools.4.title': {
+    en: 'Direct any model',
+    'zh-CN': '直接调用任意模型'
+  },
+  'mcp.tools.4.description': {
+    en: 'Kling, Veo, Seedance, Flux, GPT-Image, Nano Banana, and ElevenLabs. Closed partner APIs and open-source models, reached through one set of tools.',
+    'zh-CN':
+      'Kling、Veo、Seedance、Flux、GPT-Image、Nano Banana 和 ElevenLabs。封闭的合作伙伴 API 与开源模型，通过同一套工具即可调用。'
+  },
+  'mcp.tools.4.alt': {
+    en: 'Comfy MCP directing closed partner APIs and open-source models through one set of tools',
+    'zh-CN': 'Comfy MCP 通过同一套工具调用封闭合作伙伴 API 和开源模型'
+  },
+  'mcp.tools.5.title': {
+    en: 'Generate in batches',
+    'zh-CN': '批量生成'
+  },
+  'mcp.tools.5.description': {
+    en: 'Stack a batch on the Queue, track it, and pull back every output. Dozens of runs from a single call.',
+    'zh-CN':
+      '将一批任务加入队列，跟踪进度，并取回每一个输出。一次调用即可完成数十次运行。'
+  },
+  'mcp.tools.5.alt': {
+    en: 'Comfy MCP stacking a batch on the Queue and pulling back every output',
+    'zh-CN': 'Comfy MCP 将一批任务加入队列并取回每个输出'
+  },
+  'mcp.tools.6.title': {
+    en: 'Ship it as an app',
+    'zh-CN': '作为应用发布'
+  },
+  'mcp.tools.6.description': {
+    en: 'Turn any workflow into an app with a shareable URL. Collaborators run it in the browser — only the inputs you expose, nothing to install.',
+    'zh-CN':
+      '将任意工作流变成带可分享链接的应用。协作者在浏览器中运行——只暴露你开放的输入，无需安装任何东西。'
+  },
+  'mcp.tools.6.alt': {
+    en: 'Comfy MCP turning a workflow into a shareable browser app',
+    'zh-CN': 'Comfy MCP 将工作流变成可在浏览器中分享的应用'
+  },

  // MCP – HowItWorksSection
  'mcp.howItWorks.heading': {
@@ -2091,71 +2172,81 @@ const translations = {
    'zh-CN': '支持哪些客户端？'
  },
  'mcp.faq.1.a': {
-    en: 'Claude Code and Claude Desktop today, both signing in with OAuth. Support for more clients is coming.',
+    en: "For Claude Code, Claude Desktop, or Codex, add https://cloud.comfy.org/mcp as a custom connector or remote MCP server in any client, then sign in when prompted.\nFor clients that don't support OAuth, connect with a Comfy API key. Send the docs https://docs.comfy.org/agent-tools/cloud to your agent and it will figure out the installation for you.",
    'zh-CN':
-      '目前支持 Claude Code 和 Claude Desktop，均通过 OAuth 登录。更多客户端的支持即将推出。'
+      '对于 Claude Code、Claude Desktop 或 Codex，在任意客户端中将 https://cloud.comfy.org/mcp 添加为自定义连接器或远程 MCP 服务器，然后在提示时登录。\n对于不支持 OAuth 的客户端，请使用 Comfy API 密钥连接。将文档 https://docs.comfy.org/agent-tools/cloud 发送给你的智能体，它会为你完成安装。'
  },
  'mcp.faq.2.q': {
+    en: "What's the server URL?",
+    'zh-CN': '服务器 URL 是什么？'
+  },
+  'mcp.faq.2.a': {
+    en: 'https://cloud.comfy.org/mcp — add it as a custom connector or remote MCP server in any client, then sign in when prompted.',
+    'zh-CN':
+      'https://cloud.comfy.org/mcp——在任意客户端中将它添加为自定义连接器或远程 MCP 服务器，然后在提示时登录。'
+  },
+  'mcp.faq.3.q': {
    en: 'Do I need an API key?',
    'zh-CN': '我需要 API 密钥吗？'
  },
-  'mcp.faq.2.a': {
-    en: 'Not for Claude Code or Claude Desktop. They use OAuth. An API key is only needed for headless or CI setups with no browser.',
-    'zh-CN':
-      'Claude Code 和 Claude Desktop 不需要，它们使用 OAuth。仅在没有浏览器的无头或 CI 环境中才需要 API 密钥。'
-  },
-  'mcp.faq.3.q': {
-    en: 'Do the slash commands work in Claude Desktop?',
-    'zh-CN': '斜杠命令在 Claude Desktop 中可以使用吗？'
-  },
  'mcp.faq.3.a': {
-    en: 'No. They ship in the Claude Code plugin. Desktop connects to the same MCP server, so the tools work; just ask in plain language.',
+    en: 'Not for Claude Code, Claude Desktop, or Codex. You need a Comfy API key for Cursor, Hermes, and OpenClaw for now. Just copy https://docs.comfy.org/agent-tools/cloud and your agent will figure out the installation for you.',
    'zh-CN':
-      '不可以。斜杠命令包含在 Claude Code 插件中。Claude Desktop 连接的是同一个 MCP 服务器，因此工具可以正常使用；直接用自然语言提问即可。'
+      'Claude Code、Claude Desktop 和 Codex 不需要。Cursor、Hermes 和 OpenClaw 目前需要 Comfy API 密钥。只需复制 https://docs.comfy.org/agent-tools/cloud，你的智能体就会为你完成安装。'
  },
  'mcp.faq.4.q': {
-    en: "The sign-in didn't open a browser.",
-    'zh-CN': '登录时没有打开浏览器。'
+    en: 'Does it cost anything?',
+    'zh-CN': '需要付费吗？'
  },
  'mcp.faq.4.a': {
-    en: 'In Claude Code, run /mcp, select comfy-cloud, and choose Authenticate. In Claude Desktop, reopen the connector from Customize → Connectors.',
+    en: "Connecting is free with a Comfy account, and searching models, nodes, and templates doesn't cost credits. Running a generation uses Comfy Cloud credits and needs a subscription or credit balance. Your agent confirms with you before it spends.",
    'zh-CN':
-      '在 Claude Code 中，运行 /mcp，选择 comfy-cloud，然后选择 Authenticate（授权）。在 Claude Desktop 中，从“自定义 → 连接器”重新打开该连接器。'
+      '使用 Comfy 账户连接是免费的，搜索模型、节点和模板也不消耗积分。运行生成会使用 Comfy Cloud 积分，需要订阅或积分余额。智能体在消费前会先与你确认。'
  },
  'mcp.faq.5.q': {
-    en: 'How do I connect in Claude Code?',
-    'zh-CN': '如何在 Claude Code 中连接？'
+    en: 'Can I use it with my local ComfyUI?',
+    'zh-CN': '可以配合我的本地 ComfyUI 使用吗？'
  },
  'mcp.faq.5.a': {
-    en: 'Add the marketplace and install the comfy-cloud plugin, then run /mcp → comfy-cloud → Authenticate. It adds the connection and slash commands in one step.',
+    en: 'Coming soon. Today, to drive a local ComfyUI, you can use comfy-cli: https://github.com/Comfy-Org/comfy-cli',
    'zh-CN':
-      '添加插件市场并安装 comfy-cloud 插件，然后运行 /mcp → comfy-cloud → Authenticate（授权）。一步即可添加连接和斜杠命令。'
+      '即将推出。目前，若要操作本地 ComfyUI，你可以使用 comfy-cli：https://github.com/Comfy-Org/comfy-cli'
  },
  'mcp.faq.6.q': {
-    en: "What's the server URL for Claude Desktop?",
-    'zh-CN': 'Claude Desktop 的服务器 URL 是什么？'
-  },
-  'mcp.faq.6.a': {
-    en: 'Add a custom connector in Customize → Connectors pointing to https://cloud.comfy.org/mcp, then sign in when prompted.',
-    'zh-CN':
-      '在“自定义 → 连接器”中添加一个指向 https://cloud.comfy.org/mcp 的自定义连接器，然后在提示时登录。'
-  },
-  'mcp.faq.7.q': {
    en: 'What can my agent do once connected?',
    'zh-CN': '连接后我的智能体能做什么？'
  },
-  'mcp.faq.7.a': {
-    en: 'Generate images, video, audio, and 3D; search models, nodes, and templates; and run ComfyUI workflows, all from a chat.',
+  'mcp.faq.6.a': {
+    en: "• Generate images, video, audio, and 3D — including all open-source workflows and partner models like Seedance, GPT-Image, Nano Banana, and Kling\n• Build, edit, and run workflows; save and re-run workflows\n• Run and read in large batches\n• Search models, nodes, and template workflows\n• Read and execute shared workflow URLs\n• Upload and download assets for you\n\nEverything is now in natural language. No nodes, no downloads, no GPU, no node graphs if you don't want them.",
    'zh-CN':
-      '生成图像、视频、音频和 3D；搜索模型、节点和模板；并运行 ComfyUI 工作流——全部在对话中完成。'
+      '• 生成图像、视频、音频和 3D——包括所有开源工作流以及 Seedance、GPT-Image、Nano Banana 和 Kling 等合作伙伴模型\n• 构建、编辑和运行工作流；保存并重新运行工作流\n• 大批量运行和读取\n• 搜索模型、节点和模板工作流\n• 读取并执行分享的工作流链接\n• 为你上传和下载资产\n\n现在一切都用自然语言完成。如果你愿意，无需节点、无需下载、无需 GPU、无需节点图。'
+  },
+  'mcp.faq.7.q': {
+    en: 'Where do my outputs go?',
+    'zh-CN': '我的输出会保存到哪里？'
+  },
+  'mcp.faq.7.a': {
+    en: 'Into your Comfy Cloud asset library, so you can reuse, remix, and share them — and open any run on the canvas to keep editing. You can also ask your agent to download the assets locally for you.',
+    'zh-CN':
+      '保存到你的 Comfy Cloud 资产库，你可以复用、二次创作和分享——还能在画布上打开任意运行继续编辑。你也可以让智能体把资产下载到本地。'
  },
  'mcp.faq.8.q': {
+    en: 'Do slash commands work in Claude Desktop?',
+    'zh-CN': '斜杠命令在 Claude Desktop 中可以使用吗？'
+  },
+  'mcp.faq.8.a': {
+    en: 'No. They ship with the Claude Code comfy-cloud plugin. Desktop connects to the same MCP server, so every tool works; just ask in plain language.',
+    'zh-CN':
+      '不可以。斜杠命令随 Claude Code 的 comfy-cloud 插件一起提供。Claude Desktop 连接的是同一个 MCP 服务器，因此所有工具都能使用；直接用自然语言提问即可。'
+  },
+  'mcp.faq.9.q': {
    en: 'Is it generally available?',
    'zh-CN': '现已正式发布了吗？'
  },
-  'mcp.faq.8.a': {
-    en: 'Comfy Cloud MCP is in open beta and available to everyone.',
-    'zh-CN': 'Comfy Cloud MCP 目前处于公开测试阶段，所有人均可使用。'
+  'mcp.faq.9.a': {
+    en: 'Yes. Comfy Cloud MCP is in open beta and available to everyone with a Comfy account.',
+    'zh-CN':
+      '是的。Comfy Cloud MCP 目前处于公开测试阶段，任何拥有 Comfy 账户的人都可以使用。'
  },

  // SiteNav
@@ -2181,6 +2272,7 @@ const translations = {
  'nav.youtube': { en: 'YouTube', 'zh-CN': 'YouTube' },
  'nav.aboutUs': { en: 'About Us', 'zh-CN': '关于我们' },
  'nav.careers': { en: 'Careers', 'zh-CN': '招聘' },
+  'nav.brand': { en: 'Brand', 'zh-CN': '品牌' },
  'nav.customerStories': { en: 'Customer Stories', 'zh-CN': '客户故事' },
  'nav.launches': { en: 'Launches', 'zh-CN': '发布' },
  'nav.downloadLocal': { en: 'DOWNLOAD DESKTOP', 'zh-CN': '下载桌面版' },
@@ -3483,8 +3575,8 @@ const translations = {
  },

  'affiliate-terms.page.title': {
-    en: 'Affiliate Terms — Comfy',
-    'zh-CN': 'Affiliate Terms — Comfy'
+    en: 'Affiliate Terms - Comfy',
+    'zh-CN': 'Affiliate Terms - Comfy'
  },
  'affiliate-terms.page.description': {
    en: 'Comfy.org Affiliate Program Terms and Conditions.',
@@ -3896,8 +3988,8 @@ const translations = {
      'This document reproduces the current template of the Enterprise Customer Agreement for reference only. The executed Agreement between Comfy and Customer, together with any signed Order Forms, governs the relationship between the parties. To request an executable copy, please contact <a href="mailto:sales@comfy.org" class="text-white underline">sales@comfy.org</a>.'
  },
  'enterprise-msa.page.title': {
-    en: 'Enterprise MSA — Comfy',
-    'zh-CN': 'Enterprise MSA — Comfy'
+    en: 'Enterprise MSA - Comfy',
+    'zh-CN': 'Enterprise MSA - Comfy'
  },
  'enterprise-msa.page.description': {
    en: 'Comfy Enterprise Customer Agreement — the master services agreement that governs Comfy Enterprise deployments of Comfy Cloud, Comfy API, and related products.',
@@ -4361,8 +4453,8 @@ const translations = {

  // Affiliate page (/affiliates) — head metadata
  'affiliate.page.title': {
-    en: 'Comfy.org Affiliate Program — Become a Partner',
-    'zh-CN': 'Comfy.org 联盟计划 — 成为合作伙伴'
+    en: 'Comfy.org Affiliate Program - Become a Partner',
+    'zh-CN': 'Comfy.org 联盟计划 - 成为合作伙伴'
  },
  'affiliate.page.description': {
    en: 'Earn 30% recurring commission for 3 months on every Comfy Cloud subscription you refer. Apply to become a Comfy Partner.',
@@ -4387,8 +4479,8 @@ const translations = {
  // Launches page (/launches) — head metadata
  // zh-CN strings pending native review (see apps/website/.scratch/drops-page/PRD.md)
  'launches.page.title': {
-    en: 'ComfyUI Live Demo & Q&A — June 29 Launch Livestream',
-    'zh-CN': 'ComfyUI 直播演示与问答 — 6 月 29 日发布直播'
+    en: 'ComfyUI Live Demo & Q&A - June 29 Launch Livestream',
+    'zh-CN': 'ComfyUI 直播演示与问答 - 6 月 29 日发布直播'
  },
  'launches.page.description': {
    en: 'Join the ComfyUI livestream on June 29 for a hands-on product demo and live Q&A. See what’s new across desktop, cloud, and community, and get your questions answered.',
@@ -4446,6 +4538,161 @@ const translations = {
  'launches.section.title': {
    en: 'Latest Launches',
    'zh-CN': '最新发布'
+  },
+
+  // Brand Portal page (/brand)
+  'brand.page.title': {
+    en: 'Brand — Comfy',
+    'zh-CN': '品牌 — Comfy'
+  },
+  'brand.page.description': {
+    en: 'The Comfy brand portal: logos, color, typography, and voice. Everything you need to build something that looks and sounds like Comfy.',
+    'zh-CN':
+      'Comfy 品牌门户：标志、色彩、字体与语调。打造与 Comfy 观感一致、表达一致所需的一切。'
+  },
+  'brand.hero.label': {
+    en: 'Brand Portal',
+    'zh-CN': '品牌门户'
+  },
+  'brand.hero.heading': {
+    en: 'Create with ComfyUI',
+    'zh-CN': '用 ComfyUI 创作'
+  },
+  'brand.hero.subheading': {
+    en: 'Logo, color, type, and voice. Everything you need to build something that looks and sounds like us.',
+    'zh-CN': '标志、色彩、字体与语调。打造与我们观感一致、表达一致所需的一切。'
+  },
+  'brand.hero.viewGuidelines': {
+    en: 'View brand guidelines',
+    'zh-CN': '查看品牌规范'
+  },
+  'brand.hero.downloadLogos': {
+    en: 'Download logos',
+    'zh-CN': '下载标志'
+  },
+  'brand.logos.heading': {
+    en: 'One mark, many dimensions.',
+    'zh-CN': '一个标志，多种维度。'
+  },
+  'brand.logos.subheading': {
+    en: 'Logos come in light and dark options. Use as provided. Do not distort, recolor, or outline. Make sure the logo is legible against its background.',
+    'zh-CN':
+      '标志提供浅色和深色两种版本。请按原样使用，不要变形、改色或描边。确保标志在其背景上清晰可辨。'
+  },
+  'brand.colors.heading': {
+    en: 'Every color earns its place.',
+    'zh-CN': '每种颜色都各得其所。'
+  },
+  'brand.colors.subheading': {
+    en: 'Our color palette helps build brand recognition. When people think of Comfy, we want them to associate it with the following colors.',
+    'zh-CN':
+      '我们的调色板有助于建立品牌辨识度。当人们想到 Comfy 时，我们希望他们联想到以下这些颜色。'
+  },
+  'brand.colors.copy': {
+    en: 'Copy',
+    'zh-CN': '复制'
+  },
+  'brand.colors.copied': {
+    en: 'Copied',
+    'zh-CN': '已复制'
+  },
+  'brand.voice.heading': {
+    en: 'Precise, never cute.',
+    'zh-CN': '精准，绝不卖弄。'
+  },
+  'brand.voice.direct.title': {
+    en: 'Direct',
+    'zh-CN': '直接'
+  },
+  'brand.voice.direct.body': {
+    en: 'We state things. We don’t hedge, qualify, or suggest. Short sentences. Active voice. One idea at a time.',
+    'zh-CN':
+      '我们直陈其事。不含糊、不设限、不暗示。短句。主动语态。一次只讲一个观点。'
+  },
+  'brand.voice.precise.title': {
+    en: 'Precise',
+    'zh-CN': '精准'
+  },
+  'brand.voice.precise.body': {
+    en: 'We use the real names for things. Nodes, samplers, seeds, checkpoints. We don’t talk around the product or reach for metaphor when the technical term is already good.',
+    'zh-CN':
+      '我们直呼其名：nodes、samplers、seeds、checkpoints。当技术术语已经足够贴切时，我们不绕弯子，也不借用比喻。'
+  },
+  'brand.voice.human.title': {
+    en: 'Human-first',
+    'zh-CN': '以人为先'
+  },
+  'brand.voice.human.body': {
+    en: 'The human creates. Comfy makes every step visible. We never write as though the AI is doing the work.',
+    'zh-CN':
+      '创作的是人。Comfy 让每一步都清晰可见。我们绝不把功劳写成是 AI 完成的。'
+  },
+  'brand.voice.antihype.title': {
+    en: 'Anti-hype',
+    'zh-CN': '拒绝浮夸'
+  },
+  'brand.voice.antihype.body': {
+    en: 'We don’t write “stunning,” “revolutionary,” or “effortless.” We don’t promise magic. Our tagline says exactly what we mean: Method, not magic.',
+    'zh-CN':
+      '我们不写“惊艳”“革命性”或“毫不费力”。我们不承诺魔法。我们的口号恰如其分：方法，而非魔法。'
+  },
+  'brand.voice.doLabel': {
+    en: 'Do',
+    'zh-CN': '推荐'
+  },
+  'brand.voice.dontLabel': {
+    en: 'Don’t',
+    'zh-CN': '避免'
+  },
+  'brand.voice.do.0': {
+    en: 'Route your prompt through a ControlNet. Wire the output to the VAE decode.',
+    'zh-CN': '让你的 prompt 经过 ControlNet，再将输出连接到 VAE decode。'
+  },
+  'brand.voice.do.1': {
+    en: 'Comfy runs on your hardware. Nothing leaves your machine.',
+    'zh-CN': 'Comfy 在你自己的硬件上运行。任何数据都不会离开你的机器。'
+  },
+  'brand.voice.dont.0': {
+    en: 'Simply connect your AI blocks and watch the magic happen!',
+    'zh-CN': '只需连接你的 AI 模块，见证奇迹的发生！'
+  },
+  'brand.voice.dont.1': {
+    en: 'Oops! Something went wrong. Please try again later.',
+    'zh-CN': '哎呀！出了点问题，请稍后再试。'
+  },
+  'brand.trademark.heading': {
+    en: 'Trademark guidelines.',
+    'zh-CN': '商标使用规范。'
+  },
+  'brand.trademark.body1': {
+    en: 'Comfy and ComfyUI are trademarks of Comfy Org. You’re welcome to reference them in content that accurately describes your work with our platform. Tutorials, reviews, integrations, and affiliate content all qualify.',
+    'zh-CN':
+      'Comfy 和 ComfyUI 是 Comfy Org 的商标。欢迎在准确描述你与我们平台相关工作的内容中引用它们。教程、评测、集成以及联盟内容均可。'
+  },
+  'brand.trademark.body2': {
+    en: 'A few rules: don’t modify the logo, don’t use the Comfy name in your own product or company name, and don’t present your content in a way that implies official endorsement or partnership beyond what’s been agreed.',
+    'zh-CN':
+      '几条规则：不要修改标志，不要在你自己的产品或公司名称中使用 Comfy 这一名称，也不要以暗示官方认可或合作关系（超出双方已达成的约定）的方式呈现你的内容。'
+  },
+  'brand.trademark.body3': {
+    en: 'For permissions outside these guidelines,',
+    'zh-CN': '如需本规范之外的授权，请'
+  },
+  'brand.trademark.contact': {
+    en: 'Contact Us',
+    'zh-CN': '联系我们'
+  },
+  'brand.questions.heading': {
+    en: 'Questions?',
+    'zh-CN': '有疑问？'
+  },
+  'brand.questions.body': {
+    en: 'For press, partnerships, or anything outside these guidelines,',
+    'zh-CN': '如涉及媒体、合作，或本规范未涵盖的任何事宜，请'
+  },
+  'brand.questions.contact': {
+    en: 'Contact Us',
+    'zh-CN': '联系我们'
  }
 } as const satisfies Record<string, Record<Locale, string>>

--- a/apps/website/src/pages/404.astro
+++ b/apps/website/src/pages/404.astro
@@ -3,7 +3,7 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 ---

 <BaseLayout
-  title="404 — Page Not Found — Comfy"
+  title="404 - Page Not Found - Comfy"
  noindex>
  <div
    class="flex w-full flex-col items-center p-4 h-[calc(100dvh-12rem)]">
--- a/apps/website/src/pages/about.astro
+++ b/apps/website/src/pages/about.astro
@@ -16,7 +16,7 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="About Us — Comfy"
+  title="About Us - Comfy"
  pageType="AboutPage"
  mainEntityId={organizationId(siteUrl)}
  breadcrumbs={[
--- a/apps/website/src/pages/brand.astro
+++ b/apps/website/src/pages/brand.astro
@@ -0,0 +1,28 @@
+---
+import BaseLayout from '../layouts/BaseLayout.astro'
+import BrandBackground from '../templates/brand/BrandBackground.vue'
+import BrandHeroSection from '../templates/brand/BrandHeroSection.vue'
+import BrandLogosSection from '../templates/brand/BrandLogosSection.vue'
+import BrandColorSection from '../templates/brand/BrandColorSection.vue'
+import BrandVoiceSection from '../templates/brand/BrandVoiceSection.vue'
+import BrandTrademarkSection from '../templates/brand/BrandTrademarkSection.vue'
+import BrandQuestionsSection from '../templates/brand/BrandQuestionsSection.vue'
+import { t } from '../i18n/translations'
+
+const locale = 'en' as const
+---
+
+<BaseLayout
+  title={t('brand.page.title', locale)}
+  description={t('brand.page.description', locale)}
+>
+  <div class="relative">
+    <BrandBackground client:idle />
+    <BrandHeroSection />
+    <BrandLogosSection />
+    <BrandColorSection client:visible />
+    <BrandVoiceSection />
+    <BrandTrademarkSection />
+    <BrandQuestionsSection />
+  </div>
+</BaseLayout>
--- a/apps/website/src/pages/careers.astro
+++ b/apps/website/src/pages/careers.astro
@@ -42,7 +42,7 @@ const roles = itemListNode(
 ---

 <BaseLayout
-  title="Careers — Comfy"
+  title="Careers - Comfy"
  description="Join the team building the operating system for generative AI. Open roles in engineering, design, marketing, and more."
  pageType="CollectionPage"
  mainEntityId={jsonLdId(url, 'itemlist')}
--- a/apps/website/src/pages/case-studies.astro
+++ b/apps/website/src/pages/case-studies.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 import ComingSoon from '../components/common/ComingSoon.astro'
 ---

-<BaseLayout title="Case Studies — Comfy">
+<BaseLayout title="Case Studies - Comfy">
  <ComingSoon />
 </BaseLayout>
--- a/apps/website/src/pages/cloud/index.astro
+++ b/apps/website/src/pages/cloud/index.astro
@@ -11,7 +11,7 @@ import { t } from '../../i18n/translations'
 ---

 <BaseLayout
-  title="Comfy Cloud — AI in the Cloud"
+  title="Comfy Cloud - AI in the Cloud"
  description={t('cloud.hero.subtitle', 'en')}
  keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'comfy cloud', 'comfy ui application', 'comfyui browser', 'cloud comfyui', 'managed comfyui']}
 >
--- a/apps/website/src/pages/cloud/pricing.astro
+++ b/apps/website/src/pages/cloud/pricing.astro
@@ -20,7 +20,7 @@ const productId = jsonLdId(url, 'product')
 ---

 <BaseLayout
-  title="Pricing — Comfy Cloud"
+  title="Pricing - Comfy Cloud"
  mainEntityId={productId}
  breadcrumbs={[
    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
--- a/apps/website/src/pages/contact.astro
+++ b/apps/website/src/pages/contact.astro
@@ -13,7 +13,7 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="Contact — Comfy"
+  title="Contact - Comfy"
  pageType="ContactPage"
  mainEntityId={organizationId(siteUrl)}
  breadcrumbs={[
--- a/apps/website/src/pages/customers.astro
+++ b/apps/website/src/pages/customers.astro
@@ -11,7 +11,7 @@ import { loadStories } from '../utils/loadStories'
 const stories = (await loadStories('en')).map(toCardProps)
 ---

-<BaseLayout title="Customer Stories — Comfy">
+<BaseLayout title="Customer Stories - Comfy">
  <HeroSection client:load />
  <StorySection stories={stories} />
  <FeedbackSection client:load />
--- a/apps/website/src/pages/customers/[slug].astro
+++ b/apps/website/src/pages/customers/[slug].astro
@@ -17,7 +17,7 @@ export async function getStaticPaths() {
 const { entry, next } = Astro.props
 ---

-<BaseLayout title={`${entry.data.title} — Comfy`}>
+<BaseLayout title={`${entry.data.title} - Comfy`}>
  <DetailHeroSection
    label={entry.data.category}
    title={entry.data.title}
--- a/apps/website/src/pages/demos/[slug].astro
+++ b/apps/website/src/pages/demos/[slug].astro
@@ -58,7 +58,7 @@ const learningResource: JsonLdNode = {
 ---

 <BaseLayout
-  title={`${title} — Comfy`}
+  title={`${title} - Comfy`}
  description={description}
  ogImage={demo.ogImage}
  mainEntityId={learningId}
--- a/apps/website/src/pages/demos/index.astro
+++ b/apps/website/src/pages/demos/index.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
 import ComingSoon from '../../components/common/ComingSoon.astro'
 ---

-<BaseLayout title="Demos — Comfy" description="Interactive demos and tutorials for ComfyUI.">
+<BaseLayout title="Demos - Comfy" description="Interactive demos and tutorials for ComfyUI.">
  <ComingSoon />
 </BaseLayout>
--- a/apps/website/src/pages/download.astro
+++ b/apps/website/src/pages/download.astro
@@ -12,6 +12,7 @@ import {
  absoluteUrl,
  comfyUiApplicationNode,
  comfyUiSoftwareId,
+  comfyUiSourceCodeNode,
  pageContext,
 } from '../utils/jsonLd'

@@ -23,14 +24,14 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="Download Comfy Desktop — Run AI on Your Hardware"
+  title="Download Comfy Desktop - Run AI on Your Hardware"
  description={t('download.hero.subtitle', 'en')}
  mainEntityId={comfyUiSoftwareId(siteUrl)}
  breadcrumbs={[
    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
    { name: t('breadcrumb.download', locale) },
  ]}
-  extraJsonLd={[comfyUiApplicationNode(siteUrl)]}
+  extraJsonLd={[comfyUiApplicationNode(siteUrl), comfyUiSourceCodeNode(siteUrl)]}
  keywords={['comfyui app', 'comfyui desktop app', 'comfyui desktop', 'comfy ui application', 'comfyui download', 'download comfyui', 'comfyui windows', 'comfyui mac', 'comfyui linux']}
 >
  <CloudBannerSection />
--- a/apps/website/src/pages/gallery.astro
+++ b/apps/website/src/pages/gallery.astro
@@ -5,7 +5,7 @@ import GallerySection from '../components/gallery/GallerySection.vue'
 import ContactSection from '../components/gallery/ContactSection.vue'
 ---

-<BaseLayout title="Gallery — Comfy">
+<BaseLayout title="Gallery - Comfy">
  <HeroSection />
  <GallerySection client:load />
  <ContactSection />
--- a/apps/website/src/pages/index.astro
+++ b/apps/website/src/pages/index.astro
@@ -24,7 +24,7 @@ const { siteUrl } = pageContext(
 ---

 <BaseLayout
-  title="Comfy — Professional Control of Visual AI"
+  title="Comfy - Professional Control of Visual AI"
  description={t("hero.subtitle", "en")}
  mainEntityId={comfyUiSoftwareId(siteUrl)}
  extraJsonLd={[
--- a/apps/website/src/pages/learning.astro
+++ b/apps/website/src/pages/learning.astro
@@ -12,7 +12,7 @@ import { externalLinks } from '../config/routes'
 const routes = getRoutes('en')
 ---

-<BaseLayout title="Learning — Comfy">
+<BaseLayout title="Learning - Comfy">
  <HeroSection client:load />
  <FeaturedWorkflowSection client:visible />
  <TutorialsSection client:visible />
--- a/apps/website/src/pages/models.astro
+++ b/apps/website/src/pages/models.astro
@@ -7,7 +7,7 @@ import ProductShowcaseSection from '../components/home/ProductShowcaseSection.vu
 ---

 <BaseLayout
-  title="Models — Comfy"
+  title="Models - Comfy"
  description="Run the world's leading AI models in ComfyUI. Browse every supported model with community workflow templates ready to run."
 >
  <ModelsHeroSection
--- a/apps/website/src/pages/p/supported-models/[slug].astro
+++ b/apps/website/src/pages/p/supported-models/[slug].astro
@@ -103,7 +103,7 @@ const faqPage: JsonLdNode = {
 ---

 <BaseLayout
-  title={`${pageTitle} — Comfy`}
+  title={`${pageTitle} - Comfy`}
  description={pageDescription}
  ogImage={model.thumbnailUrl}
  mainEntityId={softwareId}
--- a/apps/website/src/pages/p/supported-models/index.astro
+++ b/apps/website/src/pages/p/supported-models/index.astro
@@ -43,7 +43,7 @@ const dirLabel: Record<string, string> = {
 ---

 <BaseLayout
-  title={`${title} — Comfy`}
+  title={`${title} - Comfy`}
  description={subtitle}
  pageType="CollectionPage"
  mainEntityId={jsonLdId(url, 'itemlist')}
--- a/apps/website/src/pages/payment/failed.astro
+++ b/apps/website/src/pages/payment/failed.astro
@@ -4,7 +4,7 @@ import PaymentStatusSection from '../../components/payment/PaymentStatusSection.
 ---

 <BaseLayout
-  title="Payment Failed — Comfy"
+  title="Payment Failed - Comfy"
  description="Your payment was not completed."
  noindex
 >
--- a/apps/website/src/pages/payment/success.astro
+++ b/apps/website/src/pages/payment/success.astro
@@ -4,7 +4,7 @@ import PaymentStatusSection from '../../components/payment/PaymentStatusSection.
 ---

 <BaseLayout
-  title="Payment Successful — Comfy"
+  title="Payment Successful - Comfy"
  description="Your payment was processed successfully."
  noindex
 >
--- a/apps/website/src/pages/privacy-policy.astro
+++ b/apps/website/src/pages/privacy-policy.astro
@@ -5,7 +5,7 @@ import HeroSection from '../components/legal/HeroSection.vue'
 ---

 <BaseLayout
-  title="Privacy Policy — Comfy"
+  title="Privacy Policy - Comfy"
  description="Comfy privacy policy. Learn how we collect, use, and protect your personal information."
  noindex
 >
--- a/apps/website/src/pages/privacy/desktop.astro
+++ b/apps/website/src/pages/privacy/desktop.astro
@@ -5,7 +5,7 @@ import HeroSection from '../../components/legal/HeroSection.vue'
 ---

 <BaseLayout
-  title="Desktop Privacy Policy — Comfy"
+  title="Desktop Privacy Policy - Comfy"
  description="Privacy policy for Comfy Desktop. Named processors, lawful basis under GDPR/UK GDPR, retention periods, and your rights."
 >
  <HeroSection title="Desktop Privacy Policy" />
--- a/apps/website/src/pages/terms-of-service.astro
+++ b/apps/website/src/pages/terms-of-service.astro
@@ -6,7 +6,7 @@ import { t } from '../i18n/translations'
 ---

 <BaseLayout
-  title="Terms of Service — Comfy"
+  title="Terms of Service - Comfy"
  description="Terms of Service governing use of the Comfy Products, including Comfy Cloud, Comfy API, and Comfy Enterprise."
  noindex
 >
--- a/apps/website/src/pages/videos.astro
+++ b/apps/website/src/pages/videos.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 import ComingSoon from '../components/common/ComingSoon.astro'
 ---

-<BaseLayout title="Videos — Comfy">
+<BaseLayout title="Videos - Comfy">
  <ComingSoon />
 </BaseLayout>
--- a/apps/website/src/pages/zh-CN/about.astro
+++ b/apps/website/src/pages/zh-CN/about.astro
@@ -16,7 +16,7 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="关于我们 — Comfy"
+  title="关于我们 - Comfy"
  description="了解 ComfyUI 背后的团队和使命——开源的生成式 AI 平台。"
  pageType="AboutPage"
  mainEntityId={organizationId(siteUrl)}
--- a/apps/website/src/pages/zh-CN/brand.astro
+++ b/apps/website/src/pages/zh-CN/brand.astro
@@ -0,0 +1,26 @@
+---
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import BrandBackground from '../../templates/brand/BrandBackground.vue'
+import BrandHeroSection from '../../templates/brand/BrandHeroSection.vue'
+import BrandLogosSection from '../../templates/brand/BrandLogosSection.vue'
+import BrandColorSection from '../../templates/brand/BrandColorSection.vue'
+import BrandVoiceSection from '../../templates/brand/BrandVoiceSection.vue'
+import BrandTrademarkSection from '../../templates/brand/BrandTrademarkSection.vue'
+import BrandQuestionsSection from '../../templates/brand/BrandQuestionsSection.vue'
+import { t } from '../../i18n/translations'
+---
+
+<BaseLayout
+  title={t('brand.page.title', 'zh-CN')}
+  description={t('brand.page.description', 'zh-CN')}
+>
+  <div class="relative">
+    <BrandBackground client:idle />
+    <BrandHeroSection locale="zh-CN" />
+    <BrandLogosSection locale="zh-CN" />
+    <BrandColorSection client:visible locale="zh-CN" />
+    <BrandVoiceSection locale="zh-CN" />
+    <BrandTrademarkSection locale="zh-CN" />
+    <BrandQuestionsSection locale="zh-CN" />
+  </div>
+</BaseLayout>
--- a/apps/website/src/pages/zh-CN/careers.astro
+++ b/apps/website/src/pages/zh-CN/careers.astro
@@ -42,7 +42,7 @@ const roles = itemListNode(
 ---

 <BaseLayout
-  title="招聘 — Comfy"
+  title="招聘 - Comfy"
  description="加入构建生成式 AI 操作系统的团队。工程、设计、市场营销等岗位开放招聘中。"
  pageType="CollectionPage"
  mainEntityId={jsonLdId(url, 'itemlist')}
--- a/apps/website/src/pages/zh-CN/case-studies.astro
+++ b/apps/website/src/pages/zh-CN/case-studies.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
 import ComingSoon from '../../components/common/ComingSoon.astro'
 ---

-<BaseLayout title="案例研究 — Comfy">
+<BaseLayout title="案例研究 - Comfy">
  <ComingSoon />
 </BaseLayout>
--- a/apps/website/src/pages/zh-CN/cloud/index.astro
+++ b/apps/website/src/pages/zh-CN/cloud/index.astro
@@ -11,7 +11,7 @@ import { t } from '../../../i18n/translations'
 ---

 <BaseLayout
-  title="Comfy Cloud — 云端 AI"
+  title="Comfy Cloud - 云端 AI"
  description={t('cloud.hero.subtitle', 'zh-CN')}
  keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'ComfyUI 网页版', 'ComfyUI 云端', 'ComfyUI 应用', 'Comfy Cloud', '云端 ComfyUI']}
 >
--- a/apps/website/src/pages/zh-CN/cloud/pricing.astro
+++ b/apps/website/src/pages/zh-CN/cloud/pricing.astro
@@ -20,7 +20,7 @@ const productId = jsonLdId(url, 'product')
 ---

 <BaseLayout
-  title="定价 — Comfy Cloud"
+  title="定价 - Comfy Cloud"
  mainEntityId={productId}
  breadcrumbs={[
    {
--- a/apps/website/src/pages/zh-CN/contact.astro
+++ b/apps/website/src/pages/zh-CN/contact.astro
@@ -13,7 +13,7 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="联系我们 — Comfy"
+  title="联系我们 - Comfy"
  pageType="ContactPage"
  mainEntityId={organizationId(siteUrl)}
  breadcrumbs={[
--- a/apps/website/src/pages/zh-CN/customers.astro
+++ b/apps/website/src/pages/zh-CN/customers.astro
@@ -11,7 +11,7 @@ import { loadStories } from '../../utils/loadStories'
 const stories = (await loadStories('zh-CN')).map(toCardProps)
 ---

-<BaseLayout title="客户故事 — Comfy">
+<BaseLayout title="客户故事 - Comfy">
  <HeroSection locale="zh-CN" client:load />
  <StorySection stories={stories} locale="zh-CN" />
  <FeedbackSection locale="zh-CN" client:load />
--- a/apps/website/src/pages/zh-CN/customers/[slug].astro
+++ b/apps/website/src/pages/zh-CN/customers/[slug].astro
@@ -17,7 +17,7 @@ export async function getStaticPaths() {
 const { entry, next } = Astro.props
 ---

-<BaseLayout title={`${entry.data.title} — Comfy`}>
+<BaseLayout title={`${entry.data.title} - Comfy`}>
  <DetailHeroSection
    label={entry.data.category}
    title={entry.data.title}
--- a/apps/website/src/pages/zh-CN/demos/[slug].astro
+++ b/apps/website/src/pages/zh-CN/demos/[slug].astro
@@ -58,7 +58,7 @@ const learningResource: JsonLdNode = {
 ---

 <BaseLayout
-  title={`${title} — Comfy`}
+  title={`${title} - Comfy`}
  description={description}
  ogImage={demo.ogImage}
  mainEntityId={learningId}
--- a/apps/website/src/pages/zh-CN/demos/index.astro
+++ b/apps/website/src/pages/zh-CN/demos/index.astro
@@ -3,7 +3,7 @@ import BaseLayout from '../../../layouts/BaseLayout.astro'
 import { t } from '../../../i18n/translations'
 ---

-<BaseLayout title="演示 — Comfy" description="ComfyUI 的互动演示和教程。">
+<BaseLayout title="演示 - Comfy" description="ComfyUI 的互动演示和教程。">
  <section class="flex min-h-[60vh] items-center justify-center px-6">
    <div class="text-center">
      <h1 class="text-primary-comfy-canvas text-4xl font-light">
--- a/apps/website/src/pages/zh-CN/download.astro
+++ b/apps/website/src/pages/zh-CN/download.astro
@@ -12,6 +12,7 @@ import {
  absoluteUrl,
  comfyUiApplicationNode,
  comfyUiSoftwareId,
+  comfyUiSourceCodeNode,
  pageContext,
 } from '../../utils/jsonLd'

@@ -23,7 +24,7 @@ const { siteUrl, locale } = pageContext(
 ---

 <BaseLayout
-  title="下载 Comfy 桌面版 — 在您的硬件上运行 AI"
+  title="下载 Comfy 桌面版 - 在您的硬件上运行 AI"
  description={t('download.hero.subtitle', 'zh-CN')}
  mainEntityId={comfyUiSoftwareId(siteUrl)}
  breadcrumbs={[
@@ -33,7 +34,7 @@ const { siteUrl, locale } = pageContext(
    },
    { name: t('breadcrumb.download', locale) },
  ]}
-  extraJsonLd={[comfyUiApplicationNode(siteUrl)]}
+  extraJsonLd={[comfyUiApplicationNode(siteUrl), comfyUiSourceCodeNode(siteUrl)]}
  keywords={['comfyui app', 'comfyui desktop app', 'comfyui download', 'ComfyUI 下载', 'ComfyUI 桌面应用', 'ComfyUI 应用', 'ComfyUI Windows', 'ComfyUI macOS', 'ComfyUI Linux']}
 >
  <CloudBannerSection locale="zh-CN" />
--- a/apps/website/src/pages/zh-CN/gallery.astro
+++ b/apps/website/src/pages/zh-CN/gallery.astro
@@ -5,7 +5,7 @@ import GallerySection from '../../components/gallery/GallerySection.vue'
 import ContactSection from '../../components/gallery/ContactSection.vue'
 ---

-<BaseLayout title="作品集 — Comfy">
+<BaseLayout title="作品集 - Comfy">
  <HeroSection locale="zh-CN" />
  <GallerySection locale="zh-CN" client:load />
  <ContactSection locale="zh-CN" />
--- a/apps/website/src/pages/zh-CN/index.astro
+++ b/apps/website/src/pages/zh-CN/index.astro
@@ -24,7 +24,7 @@ const { siteUrl } = pageContext(
 ---

 <BaseLayout
-  title="Comfy — 视觉 AI 的最强可控性"
+  title="Comfy - 视觉 AI 的最强可控性"
  description={t('hero.subtitle', 'zh-CN')}
  mainEntityId={comfyUiSoftwareId(siteUrl)}
  extraJsonLd={[comfyUiApplicationNode(siteUrl), comfyUiSourceCodeNode(siteUrl)]}
--- a/apps/website/src/pages/zh-CN/learning.astro
+++ b/apps/website/src/pages/zh-CN/learning.astro
@@ -11,7 +11,7 @@ import { learningEvents } from '../../data/events'
 const routes = getRoutes('zh-CN')
 ---

-<BaseLayout title="学习 — Comfy">
+<BaseLayout title="学习 - Comfy">
  <HeroSection locale="zh-CN" client:load />
  <FeaturedWorkflowSection locale="zh-CN" client:visible />
  <TutorialsSection locale="zh-CN" client:visible />
--- a/apps/website/src/pages/zh-CN/models.astro
+++ b/apps/website/src/pages/zh-CN/models.astro
@@ -7,7 +7,7 @@ import ProductShowcaseSection from '../../components/home/ProductShowcaseSection
 ---

 <BaseLayout
-  title="模型 — Comfy"
+  title="模型 - Comfy"
  description="在 ComfyUI 中运行世界领先的 AI 模型。浏览所有支持的模型及社区工作流模板。"
 >
  <ModelsHeroSection
--- a/apps/website/src/pages/zh-CN/payment/failed.astro
+++ b/apps/website/src/pages/zh-CN/payment/failed.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../../../layouts/BaseLayout.astro'
 import PaymentStatusSection from '../../../components/payment/PaymentStatusSection.vue'
 ---

-<BaseLayout title="支付失败 — Comfy" description="您的支付未能完成。" noindex>
+<BaseLayout title="支付失败 - Comfy" description="您的支付未能完成。" noindex>
  <PaymentStatusSection status="failed" locale="zh-CN" />
 </BaseLayout>
--- a/apps/website/src/pages/zh-CN/payment/success.astro
+++ b/apps/website/src/pages/zh-CN/payment/success.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../../../layouts/BaseLayout.astro'
 import PaymentStatusSection from '../../../components/payment/PaymentStatusSection.vue'
 ---

-<BaseLayout title="支付成功 — Comfy" description="您的支付已成功完成。" noindex>
+<BaseLayout title="支付成功 - Comfy" description="您的支付已成功完成。" noindex>
  <PaymentStatusSection status="success" locale="zh-CN" />
 </BaseLayout>
--- a/apps/website/src/pages/zh-CN/privacy-policy.astro
+++ b/apps/website/src/pages/zh-CN/privacy-policy.astro
@@ -5,7 +5,7 @@ import HeroSection from '../../components/legal/HeroSection.vue'
 ---

 <BaseLayout
-  title="隐私政策 — Comfy"
+  title="隐私政策 - Comfy"
  description="Comfy 隐私政策。了解我们如何收集、使用和保护您的个人信息。"
  noindex
 >
--- a/apps/website/src/pages/zh-CN/privacy/desktop.astro
+++ b/apps/website/src/pages/zh-CN/privacy/desktop.astro
@@ -5,7 +5,7 @@ import HeroSection from '../../../components/legal/HeroSection.vue'
 ---

 <BaseLayout
-  title="Desktop 隐私政策 — Comfy"
+  title="Desktop 隐私政策 - Comfy"
  description="Comfy Desktop 隐私政策。命名的数据处理方、GDPR/UK GDPR 下的合法依据、保留期限和您的权利。"
 >
  <HeroSection title="Desktop 隐私政策" />
--- a/apps/website/src/pages/zh-CN/videos.astro
+++ b/apps/website/src/pages/zh-CN/videos.astro
@@ -3,6 +3,6 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
 import ComingSoon from '../../components/common/ComingSoon.astro'
 ---

-<BaseLayout title="视频 — Comfy">
+<BaseLayout title="视频 - Comfy">
  <ComingSoon />
 </BaseLayout>
--- a/apps/website/src/templates/brand/BrandBackground.vue
+++ b/apps/website/src/templates/brand/BrandBackground.vue
@@ -0,0 +1,112 @@
+<script setup lang="ts">
+import {
+  useEventListener,
+  useIntersectionObserver,
+  useRafFn
+} from '@vueuse/core'
+import { onMounted, ref } from 'vue'
+
+import { prefersReducedMotion } from '../../composables/useReducedMotion'
+
+interface Node {
+  x: number
+  y: number
+  vx: number
+  vy: number
+}
+
+const canvasEl = ref<HTMLCanvasElement | null>(null)
+
+let dpr =
+  typeof window !== 'undefined' ? Math.min(window.devicePixelRatio || 1, 2) : 1
+
+const nodes: Node[] = Array.from({ length: 14 }, () => ({
+  x: Math.random(),
+  y: Math.random(),
+  vx: (Math.random() - 0.5) * 0.0005,
+  vy: (Math.random() - 0.5) * 0.0005
+}))
+
+let ctx: CanvasRenderingContext2D | null = null
+
+function draw() {
+  const el = canvasEl.value
+  if (!el || !ctx) return
+  const w = el.width
+  const h = el.height
+  ctx.clearRect(0, 0, w, h)
+
+  for (const n of nodes) {
+    n.x += n.vx
+    n.y += n.vy
+    if (n.x < 0 || n.x > 1) n.vx *= -1
+    if (n.y < 0 || n.y > 1) n.vy *= -1
+  }
+
+  ctx.strokeStyle = 'rgba(242, 255, 89, 0.18)'
+  ctx.lineWidth = dpr
+  const max = Math.min(w, h) * 0.22
+  for (let i = 0; i < nodes.length; i++) {
+    for (let j = i + 1; j < nodes.length; j++) {
+      const a = nodes[i]
+      const b = nodes[j]
+      const dx = (a.x - b.x) * w
+      const dy = (a.y - b.y) * h
+      const d = Math.hypot(dx, dy)
+      if (d < max) {
+        ctx.globalAlpha = 1 - d / max
+        ctx.beginPath()
+        ctx.moveTo(a.x * w, a.y * h)
+        const mx = ((a.x + b.x) / 2) * w
+        ctx.bezierCurveTo(mx, a.y * h, mx, b.y * h, b.x * w, b.y * h)
+        ctx.stroke()
+      }
+    }
+  }
+
+  ctx.globalAlpha = 1
+  ctx.fillStyle = 'rgba(242, 255, 89, 0.9)'
+  for (const n of nodes) {
+    ctx.beginPath()
+    ctx.arc(n.x * w, n.y * h, 2.5 * dpr, 0, Math.PI * 2)
+    ctx.fill()
+  }
+}
+
+// Resizing clears the canvas bitmap, so repaint immediately afterwards to keep
+// the field visible even when the RAF loop is paused (off screen or
+// reduced-motion). Also refresh dpr in case the window moved to another display.
+function resize() {
+  const el = canvasEl.value
+  if (!el) return
+  dpr = Math.min(window.devicePixelRatio || 1, 2)
+  el.width = el.offsetWidth * dpr
+  el.height = el.offsetHeight * dpr
+  draw()
+}
+
+const { pause, resume } = useRafFn(draw, { immediate: false })
+
+// Only animate while the field is on screen, and honour reduced-motion by
+// painting a single static frame instead of looping.
+useIntersectionObserver(canvasEl, ([entry]) => {
+  if (prefersReducedMotion()) return
+  if (entry?.isIntersecting) resume()
+  else pause()
+})
+
+useEventListener('resize', resize)
+
+onMounted(() => {
+  ctx = canvasEl.value?.getContext('2d') ?? null
+  resize()
+})
+</script>
+
+<template>
+  <canvas
+    ref="canvasEl"
+    aria-hidden="true"
+    class="pointer-events-none absolute inset-x-0 top-0 -z-10 h-screen w-full"
+  />
+</template>
--- a/apps/website/src/templates/brand/BrandColorSection.vue
+++ b/apps/website/src/templates/brand/BrandColorSection.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { cn } from '@comfyorg/tailwind-utils'
+import { useClipboard } from '@vueuse/core'
+import { computed, ref } from 'vue'
+
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import { brandColors } from '../../data/brandColors'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const specRows = ['hex', 'rgb', 'hsl', 'cmyk'] as const
+
+const { copy, copied } = useClipboard({ copiedDuring: 1500 })
+const copiedHex = ref<string | null>(null)
+const copiedValue = ref('')
+
+function copyValue(hex: string, value: string) {
+  copiedHex.value = hex
+  copiedValue.value = value
+  void copy(value)
+}
+
+function isCardCopied(hex: string) {
+  return copied.value && copiedHex.value === hex
+}
+
+const liveMessage = computed(() =>
+  copied.value ? `${t('brand.colors.copied', locale)} ${copiedValue.value}` : ''
+)
+</script>
+
+<template>
+  <section class="max-w-9xl mx-auto px-6 py-10 lg:px-20 lg:py-12">
+    <SectionHeader align="start" max-width="xl">
+      {{ t('brand.colors.heading', locale) }}
+      <template #subtitle>
+        <p class="text-primary-warm-gray mt-4 max-w-2xl text-sm leading-[1.45]">
+          {{ t('brand.colors.subheading', locale) }}
+        </p>
+      </template>
+    </SectionHeader>
+
+    <span class="sr-only" aria-live="polite">{{ liveMessage }}</span>
+
+    <ul class="mt-10 grid grid-cols-2 gap-4 lg:grid-cols-5">
+      <li
+        v-for="color in brandColors"
+        :key="color.hex"
+        :class="
+          cn(
+            'flex min-h-[123px] cursor-pointer flex-col rounded-[30px] p-6',
+            color.swatchClass,
+            color.textClass,
+            color.wide && 'lg:col-span-2',
+            color.border && 'border-primary-warm-gray border-[0.783px]'
+          )
+        "
+        @click="copyValue(color.hex, color.hex)"
+      >
+        <div
+          v-if="isCardCopied(color.hex)"
+          class="flex flex-1 items-center justify-center text-center text-sm font-semibold"
+          aria-hidden="true"
+        >
+          {{ t('brand.colors.copied', locale) }} {{ copiedValue }}
+        </div>
+        <template v-else>
+          <span class="text-xs font-semibold">{{ color.name }}</span>
+          <dl
+            class="mt-3 grid grid-cols-[auto_1fr] gap-x-4 gap-y-0.5 text-xs leading-[1.4]"
+          >
+            <template v-for="row in specRows" :key="row">
+              <dt class="uppercase opacity-50">{{ row }}</dt>
+              <dd>
+                <button
+                  type="button"
+                  :aria-label="`${t('brand.colors.copy', locale)} ${row} ${color[row]}`"
+                  class="cursor-pointer text-left hover:underline"
+                  @click.stop="copyValue(color.hex, color[row])"
+                >
+                  {{ color[row] }}
+                </button>
+              </dd>
+            </template>
+          </dl>
+        </template>
+      </li>
+    </ul>
+  </section>
+</template>
--- a/apps/website/src/templates/brand/BrandHeroSection.vue
+++ b/apps/website/src/templates/brand/BrandHeroSection.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import Button from '../../components/ui/button/Button.vue'
+import { BRAND_ASSETS_ZIP, BRAND_GUIDELINES_PDF } from '../../data/brandAssets'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+</script>
+
+<template>
+  <section
+    class="max-w-9xl mx-auto px-6 pt-4 pb-10 text-center lg:px-20 lg:pb-12"
+  >
+    <p
+      class="text-primary-comfy-yellow text-sm font-extrabold tracking-[0.7px] uppercase"
+    >
+      {{ t('brand.hero.label', locale) }}
+    </p>
+    <h1
+      class="lg:text-6.5xl mx-auto mt-6 max-w-4xl text-4xl leading-[1.3] font-light tracking-[-0.03em] text-primary-comfy-canvas md:text-5xl"
+    >
+      {{ t('brand.hero.heading', locale) }}
+    </h1>
+    <p
+      class="mx-auto mt-6 max-w-2xl text-[17px] leading-[1.6] font-light text-primary-comfy-canvas/80"
+    >
+      {{ t('brand.hero.subheading', locale) }}
+    </p>
+
+    <div
+      class="mt-10 flex flex-col items-center justify-center gap-3 sm:flex-row"
+    >
+      <Button
+        as="a"
+        :href="BRAND_GUIDELINES_PDF"
+        target="_blank"
+        rel="noopener noreferrer"
+        variant="default"
+        class="h-12 w-full px-5 text-sm font-extrabold sm:w-auto"
+      >
+        {{ t('brand.hero.viewGuidelines', locale) }}
+      </Button>
+      <Button
+        as="a"
+        :href="BRAND_ASSETS_ZIP"
+        download
+        variant="outline"
+        class="h-12 w-full px-5 text-sm font-extrabold sm:w-auto"
+      >
+        {{ t('brand.hero.downloadLogos', locale) }}
+      </Button>
+    </div>
+  </section>
+</template>
--- a/apps/website/src/templates/brand/BrandLogosSection.vue
+++ b/apps/website/src/templates/brand/BrandLogosSection.vue
@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import { affiliateBrandAssets } from '../../data/affiliateBrandAssets'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const assets = affiliateBrandAssets.map((asset) =>
+  asset.id === 'icon' ? { ...asset, preview: '/icons/comfyicon.svg' } : asset
+)
+</script>
+
+<template>
+  <section id="logos" class="max-w-9xl mx-auto px-6 py-10 lg:px-20 lg:py-12">
+    <SectionHeader align="start" max-width="xl">
+      {{ t('brand.logos.heading', locale) }}
+      <template #subtitle>
+        <p class="text-primary-warm-gray mt-4 max-w-2xl text-sm leading-[1.45]">
+          {{ t('brand.logos.subheading', locale) }}
+        </p>
+      </template>
+    </SectionHeader>
+
+    <ul class="mt-10 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-4">
+      <li
+        v-for="asset in assets"
+        :key="asset.id"
+        class="flex min-h-60 flex-col rounded-[30px] border-[1.5px] border-white/8 lg:min-h-[285px]"
+      >
+        <div class="flex flex-1 items-center justify-center p-8">
+          <img
+            :src="asset.preview"
+            :alt="asset.title[locale]"
+            :class="
+              cn(
+                'object-contain',
+                asset.id === 'icon'
+                  ? 'size-24 rounded-[23%] border border-white/10'
+                  : 'max-h-24 max-w-[75%]'
+              )
+            "
+            loading="lazy"
+            decoding="async"
+          />
+        </div>
+        <p
+          class="pb-8 text-center text-[21px] font-medium tracking-[1.05px] text-primary-comfy-canvas"
+        >
+          {{ asset.title[locale] }}
+        </p>
+      </li>
+    </ul>
+  </section>
+</template>
--- a/apps/website/src/templates/brand/BrandQuestionsSection.vue
+++ b/apps/website/src/templates/brand/BrandQuestionsSection.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import Button from '../../components/ui/button/Button.vue'
+import { externalLinks } from '../../config/routes.ts'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+</script>
+
+<template>
+  <section
+    class="max-w-9xl mx-auto px-6 pt-10 pb-24 lg:px-20 lg:pt-12 lg:pb-32"
+  >
+    <SectionHeader align="start" max-width="xl">
+      {{ t('brand.questions.heading', locale) }}
+    </SectionHeader>
+
+    <p class="text-primary-warm-gray mt-6 max-w-2xl text-sm leading-[1.6]">
+      {{ t('brand.questions.body', locale) }}
+      <Button
+        as="a"
+        variant="inline"
+        :href="externalLinks.support"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {{ t('brand.questions.contact', locale) }}
+      </Button>
+    </p>
+  </section>
+</template>
--- a/apps/website/src/templates/brand/BrandTrademarkSection.vue
+++ b/apps/website/src/templates/brand/BrandTrademarkSection.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import Button from '../../components/ui/button/Button.vue'
+import { externalLinks } from '../../config/routes.ts'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+</script>
+
+<template>
+  <section class="max-w-9xl mx-auto px-6 py-10 lg:px-20 lg:py-12">
+    <SectionHeader align="start" max-width="xl">
+      {{ t('brand.trademark.heading', locale) }}
+    </SectionHeader>
+
+    <div
+      class="text-primary-warm-gray mt-6 flex max-w-4xl flex-col gap-4 text-sm leading-[1.6]"
+    >
+      <p>{{ t('brand.trademark.body1', locale) }}</p>
+      <p>{{ t('brand.trademark.body2', locale) }}</p>
+      <p>
+        {{ t('brand.trademark.body3', locale) }}
+        <Button
+          as="a"
+          variant="inline"
+          :href="externalLinks.support"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {{ t('brand.trademark.contact', locale) }}
+        </Button>
+      </p>
+    </div>
+  </section>
+</template>
--- a/apps/website/src/templates/brand/BrandVoiceSection.vue
+++ b/apps/website/src/templates/brand/BrandVoiceSection.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const principles = [
+  {
+    title: t('brand.voice.direct.title', locale),
+    body: t('brand.voice.direct.body', locale)
+  },
+  {
+    title: t('brand.voice.precise.title', locale),
+    body: t('brand.voice.precise.body', locale)
+  },
+  {
+    title: t('brand.voice.human.title', locale),
+    body: t('brand.voice.human.body', locale)
+  },
+  {
+    title: t('brand.voice.antihype.title', locale),
+    body: t('brand.voice.antihype.body', locale)
+  }
+]
+
+const doExamples = [
+  t('brand.voice.do.0', locale),
+  t('brand.voice.do.1', locale)
+]
+
+const dontExamples = [
+  t('brand.voice.dont.0', locale),
+  t('brand.voice.dont.1', locale)
+]
+</script>
+
+<template>
+  <section class="max-w-9xl mx-auto px-6 py-10 lg:px-20 lg:py-12">
+    <SectionHeader align="start" max-width="xl">
+      {{ t('brand.voice.heading', locale) }}
+    </SectionHeader>
+
+    <dl class="mt-10 flex max-w-4xl flex-col gap-3.5 text-sm leading-[1.6]">
+      <div v-for="principle in principles" :key="principle.title">
+        <dt class="text-primary-comfy-yellow">{{ principle.title }}</dt>
+        <dd class="text-primary-warm-gray">{{ principle.body }}</dd>
+      </div>
+    </dl>
+
+    <div class="mt-12 grid gap-4 md:grid-cols-2">
+      <div class="bg-transparency-white-t4 flex flex-col gap-4 rounded-4xl p-8">
+        <div class="flex items-center gap-2">
+          <span
+            class="bg-primary-comfy-yellow size-2.5 rounded-full"
+            aria-hidden="true"
+          />
+          <span
+            class="text-sm font-bold tracking-wider text-primary-comfy-canvas uppercase"
+          >
+            {{ t('brand.voice.doLabel', locale) }}
+          </span>
+        </div>
+        <div
+          v-for="example in doExamples"
+          :key="example"
+          class="bg-transparency-ink-t80 rounded-2xl p-5"
+        >
+          <p class="text-base/[1.45] text-primary-comfy-canvas">
+            {{ example }}
+          </p>
+        </div>
+      </div>
+
+      <div class="bg-transparency-white-t4 flex flex-col gap-4 rounded-4xl p-8">
+        <div class="flex items-center gap-2">
+          <span
+            class="bg-primary-warm-gray size-2.5 rounded-full"
+            aria-hidden="true"
+          />
+          <span
+            class="text-primary-warm-gray text-sm font-bold tracking-wider uppercase"
+          >
+            {{ t('brand.voice.dontLabel', locale) }}
+          </span>
+        </div>
+        <div
+          v-for="example in dontExamples"
+          :key="example"
+          class="bg-transparency-ink-t80 rounded-2xl p-5"
+        >
+          <p class="text-primary-warm-gray text-base/[1.45] line-through">
+            {{ example }}
+          </p>
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
--- a/apps/website/src/templates/mcp/ComfyMcpDemo.vue
+++ b/apps/website/src/templates/mcp/ComfyMcpDemo.vue
@@ -7,35 +7,40 @@ import { t } from '../../i18n/translations'

 const { locale = 'en' } = defineProps<{ locale?: Locale }>()

-const PROMPT = t('mcp.hero.demoPrompt', locale)
 const generateLabel = t('mcp.hero.demoGenerate', locale)

+// Each cycle types the prompt that produces the card about to slide in.
 const cards = [
  {
+    promptKey: 'mcp.hero.demoPromptMoodboard',
    actionKey: 'mcp.hero.demoActionGenerateImage',
    file: 'moodboard_v1.png · 6-up',
    tag: 'Gmail',
    thumb: '/images/mcp/mcp-thumb-moodboard.webp'
  },
  {
+    promptKey: 'mcp.hero.demoPromptConcepts',
    actionKey: 'mcp.hero.demoActionGenerateImage',
    file: 'concepts_01–03.png',
    tag: 'Notion',
    thumb: '/images/mcp/mcp-thumb-concepts.webp'
  },
  {
+    promptKey: 'mcp.hero.demoPromptKeyart',
    actionKey: 'mcp.hero.demoActionGenerateImage',
    file: 'hero_keyart.png',
    tag: 'Figma',
    thumb: '/images/mcp/mcp-thumb-keyart.webp'
  },
  {
+    promptKey: 'mcp.hero.demoPromptPbr',
    actionKey: 'mcp.hero.demoActionGenerate3d',
    file: 'asphalt_pbr/ · 5 maps',
    tag: 'Blender',
    thumb: '/images/mcp/mcp-thumb-asphalt.webp'
  },
  {
+    promptKey: 'mcp.hero.demoPromptUpscale',
    actionKey: 'mcp.hero.demoActionUpscale',
    file: 'kaiju_neon_4k.png · 4096',
    tag: null,
@@ -65,15 +70,15 @@ function schedule(fn: () => void, ms: number) {
  }, ms)
 }

-function typePrompt(onDone: () => void) {
+function typePrompt(prompt: string, onDone: () => void) {
  displayedPrompt.value = ''
  promptDone.value = false
  let i = 0

  function step() {
    i++
-    displayedPrompt.value = PROMPT.slice(0, i)
-    if (i < PROMPT.length) {
+    displayedPrompt.value = prompt.slice(0, i)
+    if (i < prompt.length) {
      schedule(step, 35)
    } else {
      promptDone.value = true
@@ -94,8 +99,8 @@ function revealNextCard() {
    return
  }

-  // Type the prompt, then slide in the next card
-  typePrompt(() => {
+  // Type the next card's prompt, then slide that card in
+  typePrompt(t(cards[visibleCount.value].promptKey, locale), () => {
    visibleCount.value++
    schedule(revealNextCard, 400)
  })
--- a/apps/website/src/templates/mcp/FAQSection.vue
+++ b/apps/website/src/templates/mcp/FAQSection.vue
@@ -5,7 +5,7 @@ import { t } from '../../i18n/translations'

 const { locale = 'en' } = defineProps<{ locale?: Locale }>()

-const faqNumbers = [1, 2, 3, 4, 5, 6, 7, 8] as const
+const faqNumbers = [1, 2, 3, 4, 5, 6, 7, 8, 9] as const

 const faqs = faqNumbers.map((n) => ({
  id: String(n),
--- a/apps/website/src/templates/mcp/HeroSection.vue
+++ b/apps/website/src/templates/mcp/HeroSection.vue
@@ -11,9 +11,10 @@ const ctas = mcpCtas(locale)
 </script>

 <template>
+  <!-- 5rem/6.75rem = HeaderMain's rendered height (py-5 / lg:py-8) so the hero fills the viewport below the sticky nav -->
  <HeroSplit01
    :locale="locale"
-    class="min-h-screen"
+    class="min-h-[calc(100svh-5rem)] lg:min-h-[calc(100svh-6.75rem)]"
    badge-text="MCP"
    :title="t('mcp.hero.heading', locale)"
    :subtitle="t('mcp.hero.subtitle', locale)"
--- a/apps/website/src/templates/mcp/HowItWorksSection.vue
+++ b/apps/website/src/templates/mcp/HowItWorksSection.vue
@@ -23,7 +23,7 @@ const steps: FeatureStep[] = stepNumbers.map((n) => ({
  <FeatureGrid02
    :heading="t('mcp.howItWorks.heading', locale)"
    :steps="steps"
-    :primary-cta="ctas.runWorkflow"
+    :primary-cta="ctas.installMcp"
    :secondary-cta="ctas.docs"
  />
 </template>
--- a/apps/website/src/templates/mcp/SetupSection.vue
+++ b/apps/website/src/templates/mcp/SetupSection.vue
@@ -1,69 +1,180 @@
 <script setup lang="ts">
-import { ArrowUpRight } from '@lucide/vue'
+import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'reka-ui'

-import FeatureGrid01 from '../../components/blocks/FeatureGrid01.vue'
-import type { FeatureCard } from '../../components/blocks/FeatureGrid01.vue'
+import SectionHeader from '../../components/common/SectionHeader.vue'
+import SectionLabel from '../../components/common/SectionLabel.vue'
+import CopyableField from '../../components/ui/copyable-field/CopyableField.vue'
 import { externalLinks } from '../../config/routes'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'

 const { locale = 'en' } = defineProps<{ locale?: Locale }>()

-const cards: FeatureCard[] = [
+const agentCommand = t('mcp.setup.option1.command', locale).replace(
+  '{url}',
+  externalLinks.docsMcp
+)
+
+interface McpClient {
+  id: string
+  name: string
+  step: string
+  command?: string
+  link?: { label: string; href: string }
+}
+
+const clients: McpClient[] = [
  {
-    id: 'step1',
-    label: t('mcp.setup.step1.label', locale),
-    title: t('mcp.setup.step1.title', locale),
-    description: t('mcp.setup.step1.description', locale),
-    action: {
-      type: 'code',
-      value: t('mcp.setup.step1.command', locale).replace(
-        '{url}',
-        externalLinks.docsMcp
-      )
+    id: 'claude-code',
+    name: 'Claude Code',
+    step: t('mcp.setup.clients.claudeCode.step', locale),
+    command: `claude mcp add --transport http comfy-cloud ${externalLinks.mcpEndpoint}`
+  },
+  {
+    id: 'claude-desktop',
+    name: 'Claude Desktop',
+    step: t('mcp.setup.clients.claudeDesktop.step', locale)
+  },
+  {
+    id: 'cursor',
+    name: 'Cursor',
+    step: t('mcp.setup.clients.cursor.step', locale),
+    link: {
+      label: t('mcp.setup.clients.cursor.linkLabel', locale),
+      href: externalLinks.apiKeys
    }
  },
  {
-    id: 'step2',
-    label: t('mcp.setup.step2.label', locale),
-    title: t('mcp.setup.step2.title', locale),
-    description: t('mcp.setup.step2.description', locale),
-    action: {
-      type: 'link',
-      label: t('mcp.setup.step2.cta', locale),
-      href: externalLinks.docsMcp,
-      target: '_blank',
-      icon: ArrowUpRight,
-      variant: 'default'
-    }
+    id: 'codex',
+    name: 'Codex',
+    step: t('mcp.setup.clients.codex.step', locale),
+    command: `codex mcp add comfy-cloud --url ${externalLinks.mcpEndpoint}`
  },
  {
-    id: 'step3',
-    label: t('mcp.setup.step3.label', locale),
-    title: t('mcp.setup.step3.title', locale),
-    description: t('mcp.setup.step3.description', locale),
-    action: {
-      type: 'link',
-      label: t('mcp.setup.step3.cta', locale),
-      href: externalLinks.mcpSkills,
-      target: '_blank',
-      icon: ArrowUpRight,
-      variant: 'default'
+    id: 'other',
+    name: t('mcp.setup.clients.other.name', locale),
+    step: t('mcp.setup.clients.other.step', locale),
+    link: {
+      label: t('mcp.setup.clients.other.linkLabel', locale),
+      href: externalLinks.docsMcp
    }
  }
 ]
+
+const copyLabel = t('ui.copy', locale)
+const copiedLabel = t('ui.copied', locale)
 </script>

 <template>
-  <FeatureGrid01
+  <section
    id="setup"
-    class="scroll-mt-24 lg:scroll-mt-36"
-    :eyebrow="t('mcp.setup.label', locale)"
-    :heading="t('mcp.setup.heading', locale)"
-    :subtitle="t('mcp.setup.subtitle', locale)"
-    :columns="3"
-    :cards="cards"
-    :copy-label="t('ui.copy', locale)"
-    :copied-label="t('ui.copied', locale)"
-  />
+    class="max-w-9xl mx-auto scroll-mt-24 px-6 py-16 lg:scroll-mt-36 lg:py-24"
+  >
+    <SectionHeader
+      max-width="xl"
+      :label="t('mcp.setup.label', locale)"
+      align="start"
+    >
+      {{ t('mcp.setup.heading', locale) }}
+      <template #subtitle>
+        <p class="mt-4 max-w-xl text-sm text-smoke-700 lg:text-base">
+          {{ t('mcp.setup.subtitle', locale) }}
+        </p>
+      </template>
+    </SectionHeader>
+
+    <div class="mt-16 grid grid-cols-1 gap-6 lg:grid-cols-2">
+      <div
+        class="bg-transparency-white-t4 flex flex-col rounded-3xl p-6 lg:p-8"
+      >
+        <SectionLabel>{{ t('mcp.setup.option1.label', locale) }}</SectionLabel>
+        <h3
+          class="mt-3 text-xl font-light text-primary-comfy-canvas lg:text-2xl"
+        >
+          {{ t('mcp.setup.option1.title', locale) }}
+        </h3>
+        <p class="mt-3 text-sm text-smoke-700">
+          {{ t('mcp.setup.option1.description', locale) }}
+        </p>
+        <div class="mt-6">
+          <CopyableField
+            :value="agentCommand"
+            :copy-label="copyLabel"
+            :copied-label="copiedLabel"
+          />
+        </div>
+        <p class="mt-auto pt-6 text-sm text-smoke-700">
+          {{ t('mcp.setup.skillsNote', locale)
+          }}<a
+            :href="externalLinks.mcpSkills"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="focus-visible:ring-primary-comfy-yellow/50 rounded-sm text-primary-comfy-canvas underline underline-offset-4 focus-visible:ring-2 focus-visible:outline-none"
+            >{{ t('mcp.setup.skillsLink', locale) }}</a
+          >
+        </p>
+      </div>
+
+      <div
+        class="bg-transparency-white-t4 flex flex-col rounded-3xl p-6 lg:p-8"
+      >
+        <SectionLabel>{{ t('mcp.setup.option2.label', locale) }}</SectionLabel>
+        <h3
+          class="mt-3 text-xl font-light text-primary-comfy-canvas lg:text-2xl"
+        >
+          {{ t('mcp.setup.option2.title', locale) }}
+        </h3>
+        <p class="mt-3 text-sm text-smoke-700">
+          {{ t('mcp.setup.option2.description', locale) }}
+        </p>
+        <div class="mt-6">
+          <CopyableField
+            :value="externalLinks.mcpEndpoint"
+            :copy-label="copyLabel"
+            :copied-label="copiedLabel"
+          />
+        </div>
+
+        <TabsRoot default-value="claude-code" class="mt-6">
+          <TabsList
+            :aria-label="t('mcp.setup.option2.tabsLabel', locale)"
+            class="flex flex-wrap gap-2"
+          >
+            <TabsTrigger
+              v-for="client in clients"
+              :key="client.id"
+              :value="client.id"
+              class="bg-transparency-white-t4 focus-visible:ring-primary-comfy-yellow/50 data-[state=active]:bg-primary-comfy-yellow cursor-pointer rounded-full px-4 py-2 text-xs font-bold tracking-wider text-smoke-700 uppercase transition-colors hover:text-primary-comfy-canvas focus-visible:ring-2 focus-visible:outline-none data-[state=active]:text-primary-comfy-ink"
+            >
+              {{ client.name }}
+            </TabsTrigger>
+          </TabsList>
+          <TabsContent
+            v-for="client in clients"
+            :key="client.id"
+            :value="client.id"
+            class="mt-4 flex min-h-24 flex-col gap-3"
+          >
+            <p class="text-sm text-smoke-700">
+              {{ client.step
+              }}<a
+                v-if="client.link"
+                :href="client.link.href"
+                target="_blank"
+                rel="noopener noreferrer"
+                class="focus-visible:ring-primary-comfy-yellow/50 rounded-sm text-primary-comfy-canvas underline underline-offset-4 focus-visible:ring-2 focus-visible:outline-none"
+                >{{ client.link.label }}</a
+              >
+            </p>
+            <CopyableField
+              v-if="client.command"
+              :value="client.command"
+              :copy-label="copyLabel"
+              :copied-label="copiedLabel"
+            />
+          </TabsContent>
+        </TabsRoot>
+      </div>
+    </div>
+  </section>
 </template>
--- a/apps/website/src/templates/mcp/ToolsSection.vue
+++ b/apps/website/src/templates/mcp/ToolsSection.vue
@@ -7,16 +7,21 @@ import { t } from '../../i18n/translations'
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()

 type ToolMedia =
-  | { type: 'image'; src: string }
+  | { type: 'image'; src: string; fit?: 'cover' | 'contain' }
  | {
      type: 'video'
      src: string
      autoplay?: boolean
      loop?: boolean
      hideControls?: boolean
+      fit?: 'cover' | 'contain'
    }

-const tools: { n: 1 | 2 | 3; media: ToolMedia; altKey?: TranslationKey }[] = [
+const tools: {
+  n: 1 | 2 | 3 | 4 | 5 | 6
+  media: ToolMedia
+  altKey?: TranslationKey
+}[] = [
  {
    n: 1,
    media: {
@@ -40,9 +45,38 @@ const tools: { n: 1 | 2 | 3; media: ToolMedia; altKey?: TranslationKey }[] = [
      src: 'https://media.comfy.org/website/mcp/run-real-workflows.mp4',
      autoplay: true,
      loop: true,
-      hideControls: true
+      hideControls: true,
+      fit: 'contain'
    },
    altKey: 'mcp.tools.3.alt'
+  },
+  {
+    n: 4,
+    media: {
+      type: 'image',
+      src: 'https://media.comfy.org/website/mcp/direct-any-model.png'
+    },
+    altKey: 'mcp.tools.4.alt'
+  },
+  {
+    n: 5,
+    media: {
+      type: 'image',
+      src: 'https://media.comfy.org/website/mcp/generate-in-batches.png'
+    },
+    altKey: 'mcp.tools.5.alt'
+  },
+  {
+    n: 6,
+    media: {
+      type: 'video',
+      src: 'https://media.comfy.org/website/homepage/showcase/ui-overview.webm',
+      autoplay: true,
+      loop: true,
+      hideControls: true,
+      fit: 'contain'
+    },
+    altKey: 'mcp.tools.6.alt'
  }
 ]

--- a/apps/website/src/templates/mcp/ctas.ts
+++ b/apps/website/src/templates/mcp/ctas.ts
@@ -1,4 +1,4 @@
-import { externalLinks, getRoutes } from '../../config/routes'
+import { externalLinks } from '../../config/routes'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'

@@ -9,14 +9,13 @@ export interface McpCta {
 }

 /**
- * Calls-to-action for the MCP page: view the docs, jump to the on-page setup
- * steps, or run a workflow in the cloud. The hero leads with install + docs;
- * the "how it works" section pairs run-a-workflow with docs.
+ * Calls-to-action for the MCP page: view the docs or jump to the on-page
+ * setup options. Both the hero and the "how it works" section pair install
+ * with docs.
 */
 export function mcpCtas(locale: Locale): {
  docs: McpCta
  installMcp: McpCta
-  runWorkflow: McpCta
 } {
  return {
    docs: {
@@ -27,10 +26,6 @@ export function mcpCtas(locale: Locale): {
    installMcp: {
      label: t('mcp.hero.installMcp', locale),
      href: '#setup'
-    },
-    runWorkflow: {
-      label: t('mcp.hero.runWorkflow', locale),
-      href: getRoutes(locale).cloud
    }
  }
 }
--- a/apps/website/src/utils/jsonLd.test.ts
+++ b/apps/website/src/utils/jsonLd.test.ts
@@ -171,6 +171,31 @@ describe('comfyUiSourceCodeNode', () => {
  })
 })

+describe('ComfyUI entity links', () => {
+  it('names the home page as the canonical page for the application', () => {
+    const node = comfyUiApplicationNode(siteUrl)
+    expect(node.mainEntityOfPage).toBe(`${siteUrl}/`)
+  })
+
+  it('links the application back to the source code emitted alongside it', () => {
+    const app = comfyUiApplicationNode(siteUrl)
+    const source = comfyUiSourceCodeNode(siteUrl)
+    expect(app.isBasedOn).toEqual({ '@id': source['@id'] })
+  })
+
+  it('claims no canonical page or source code for third-party software', () => {
+    const node = softwareApplicationNode({
+      siteUrl,
+      id: 'https://comfy.org/p/supported-models/foo/#software',
+      name: 'Foo Model',
+      url: 'https://comfy.org/p/supported-models/foo/',
+      applicationCategory: 'MultimediaApplication'
+    })
+    expect(node.mainEntityOfPage).toBeUndefined()
+    expect(node.isBasedOn).toBeUndefined()
+  })
+})
+
 describe('buildPageGraph', () => {
  const url = 'https://comfy.org/cloud/pricing/'
  const graph = buildPageGraph(
--- a/apps/website/src/utils/jsonLd.ts
+++ b/apps/website/src/utils/jsonLd.ts
@@ -194,6 +194,8 @@ export interface SoftwareAppInput {
  authorName?: string
  isFree?: boolean
  sameAs?: string[]
+  mainEntityOfPage?: string
+  isBasedOnId?: string
 }

 export function softwareApplicationNode(input: SoftwareAppInput): JsonLdNode {
@@ -219,6 +221,8 @@ export function softwareApplicationNode(input: SoftwareAppInput): JsonLdNode {
    author,
    publisher: input.firstParty ? orgRef : undefined,
    sameAs: input.sameAs,
+    mainEntityOfPage: input.mainEntityOfPage,
+    isBasedOn: input.isBasedOnId ? { '@id': input.isBasedOnId } : undefined,
    offers: input.isFree
      ? {
          '@type': 'Offer',
@@ -257,6 +261,10 @@ export function comfyUiSoftwareId(siteUrl: string): string {
  return `${siteUrl}/#software`
 }

+function comfyUiSourceCodeId(siteUrl: string): string {
+  return `${siteUrl}/#sourcecode`
+}
+
 export function comfyUiApplicationNode(siteUrl: string): JsonLdNode {
  return softwareApplicationNode({
    siteUrl,
@@ -267,14 +275,16 @@ export function comfyUiApplicationNode(siteUrl: string): JsonLdNode {
    applicationCategory: 'MultimediaApplication',
    operatingSystem: 'Windows, macOS, Linux',
    isFree: true,
-    sameAs: comfyUiSameAs
+    sameAs: comfyUiSameAs,
+    mainEntityOfPage: `${siteUrl}/`,
+    isBasedOnId: comfyUiSourceCodeId(siteUrl)
  })
 }

 export function comfyUiSourceCodeNode(siteUrl: string): JsonLdNode {
  return softwareSourceCodeNode({
    siteUrl,
-    id: `${siteUrl}/#sourcecode`,
+    id: comfyUiSourceCodeId(siteUrl),
    name: 'ComfyUI',
    codeRepository: externalLinks.github,
    programmingLanguage: 'Python',
--- a/browser_tests/fixtures/components/SidebarTab.ts
+++ b/browser_tests/fixtures/components/SidebarTab.ts
@@ -322,6 +322,9 @@ export class AssetsSidebarTab extends SidebarTab {
  // --- Folder view ---
  public readonly backToAssetsButton: Locator

+  // --- Panel chrome ---
+  public readonly panelHeader: Locator
+
  // --- Loading ---
  public readonly skeletonLoaders: Locator

@@ -358,6 +361,7 @@ export class AssetsSidebarTab extends SidebarTab {
    this.deleteSelectedButton = page.getByTestId('assets-delete-selected')
    this.downloadSelectedButton = page.getByTestId('assets-download-selected')
    this.backToAssetsButton = page.getByText('Back to all assets')
+    this.panelHeader = page.locator('.comfy-vue-side-bar-header')
    this.skeletonLoaders = page.locator(
      '.sidebar-content-container .animate-pulse'
    )
--- a/browser_tests/tests/sidebar/assetsSidebarTab.spec.ts
+++ b/browser_tests/tests/sidebar/assetsSidebarTab.spec.ts
@@ -276,3 +276,255 @@ test.describe('FE-130 assets sidebar route mocks', () => {
    )
  })
 })
+
+test.describe('FE-910 marquee selection and select all', () => {
+  test.beforeEach(async ({ jobsRoutes, page, comfyPage }) => {
+    await jobsRoutes.mockJobsQueue([])
+    await jobsRoutes.mockJobsHistory(generatedJobs)
+    await mockInputFiles(page, ['imported.png'])
+    await mockViewFiles(page, viewFiles)
+    await comfyPage.setup()
+    await comfyPage.menu.assetsTab.open()
+  })
+
+  test('Ctrl/Cmd+A selects every asset while the panel is hovered', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    await tab.getAssetCardByName('alpha').hover()
+    await comfyPage.page.keyboard.press('ControlOrMeta+a')
+
+    await expect(tab.selectedCards).toHaveCount(2)
+  })
+
+  test('a marquee that begins in the panel header selects the cards', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+    await expect(tab.selectedCards).toHaveCount(0)
+
+    const header = await tab.panelHeader.boundingBox()
+    const beta = await tab.getAssetCardByName('beta').boundingBox()
+    if (!header || !beta) {
+      throw new Error('panel header or asset card has no layout box')
+    }
+
+    // Begin the rubber-band in the header (above the grid), then drag down
+    // across both cards.
+    await page.mouse.move(header.x + 24, header.y + 20)
+    await page.mouse.down()
+    await page.mouse.move(beta.x + 8, beta.y + beta.height - 8, { steps: 14 })
+    await page.mouse.up()
+
+    await expect(tab.selectedCards).toHaveCount(2)
+    await expect(tab.selectionFooter).toBeVisible()
+  })
+
+  test('Ctrl/Cmd+A leaves assets unselected while the canvas is hovered', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    const viewport = page.viewportSize()
+    if (!viewport) throw new Error('viewport size is unavailable')
+
+    // Hover the canvas (not the panel); Ctrl/Cmd+A must yield to the canvas.
+    await page.mouse.move(viewport.width - 100, viewport.height / 2)
+    await page.keyboard.press('ControlOrMeta+a')
+
+    await expect(tab.selectedCards).toHaveCount(0)
+  })
+
+  test('a modifier-held marquee adds to the existing selection', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    await tab.getAssetCardByName('alpha').click()
+    await expect(tab.selectedCards).toHaveCount(1)
+
+    const beta = await tab.getAssetCardByName('beta').boundingBox()
+    if (!beta) throw new Error('beta card has no layout box')
+
+    // Hold a modifier so the marquee is additive, then rubber-band over beta.
+    await page.keyboard.down('Control')
+    await page.mouse.move(beta.x + 12, beta.y + 12)
+    await page.mouse.down()
+    await page.mouse.move(beta.x + beta.width - 12, beta.y + beta.height - 12, {
+      steps: 12
+    })
+    await page.mouse.up()
+    await page.keyboard.up('Control')
+
+    await expect(tab.selectedCards).toHaveCount(2)
+  })
+
+  test('a Ctrl/Cmd+Shift marquee removes the covered cards from the selection', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    await tab.getAssetCardByName('alpha').hover()
+    await page.keyboard.press('ControlOrMeta+a')
+    await expect(tab.selectedCards).toHaveCount(2)
+
+    const beta = await tab.getAssetCardByName('beta').boundingBox()
+    if (!beta) throw new Error('beta card has no layout box')
+
+    // Ctrl+Shift makes the marquee subtractive: rubber-band over beta only.
+    await page.keyboard.down('Control')
+    await page.keyboard.down('Shift')
+    await page.mouse.move(beta.x + 12, beta.y + 12)
+    await page.mouse.down()
+    await page.mouse.move(beta.x + beta.width - 12, beta.y + beta.height - 12, {
+      steps: 12
+    })
+    await page.mouse.up()
+    await page.keyboard.up('Shift')
+    await page.keyboard.up('Control')
+
+    await expect(tab.selectedCards).toHaveCount(1)
+    await expect(tab.getAssetCardByName('alpha')).toHaveAttribute(
+      'data-selected',
+      'true'
+    )
+  })
+
+  test('Ctrl/Cmd-dragging from an asset card starts a marquee selection', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+    await expect(tab.selectedCards).toHaveCount(0)
+
+    const alpha = await tab.getAssetCardByName('alpha').boundingBox()
+    const beta = await tab.getAssetCardByName('beta').boundingBox()
+    if (!alpha || !beta) throw new Error('asset cards have no layout box')
+
+    // Ctrl bypasses card drag, so a press that begins on a card rubber-bands.
+    await page.keyboard.down('Control')
+    await page.mouse.move(alpha.x + alpha.width / 2, alpha.y + alpha.height / 2)
+    await page.mouse.down()
+    await page.mouse.move(beta.x + beta.width - 6, beta.y + beta.height - 6, {
+      steps: 12
+    })
+    await page.mouse.up()
+    await page.keyboard.up('Control')
+
+    await expect(tab.selectedCards).toHaveCount(2)
+    await expect(tab.selectionFooter).toBeVisible()
+  })
+
+  test('Ctrl/Cmd-dragging within a single card selects only that card', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    const alpha = tab.getAssetCardByName('alpha')
+    const box = await alpha.boundingBox()
+    if (!box) throw new Error('alpha card has no layout box')
+
+    const start = { x: box.x + box.width / 2, y: box.y + box.height / 2 }
+    await page.keyboard.down('Control')
+    await page.mouse.move(start.x, start.y)
+    await page.mouse.down()
+    await page.mouse.move(start.x + 12, start.y + 12, { steps: 4 })
+    await page.mouse.up()
+    await page.keyboard.up('Control')
+
+    await expect(tab.selectedCards).toHaveCount(1)
+    await expect(alpha).toHaveAttribute('data-selected', 'true')
+  })
+
+  test('Ctrl/Cmd+A in the focused search input does not select assets', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const query = 'alpha'
+
+    await tab.searchInput.fill(query)
+    await expect(tab.assetCards).toHaveCount(1)
+
+    await tab.searchInput.focus()
+    await comfyPage.page.keyboard.press('ControlOrMeta+a')
+
+    await expect(tab.selectedCards).toHaveCount(0)
+    await expect
+      .poll(() =>
+        tab.searchInput.evaluate((el: HTMLInputElement) => {
+          return { start: el.selectionStart, end: el.selectionEnd }
+        })
+      )
+      .toEqual({ start: 0, end: query.length })
+  })
+
+  test('a drag starting in the search input does not marquee-select assets', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    const { page } = comfyPage
+
+    await expect(tab.assetCards).toHaveCount(2)
+
+    const search = await tab.searchInput.boundingBox()
+    const beta = await tab.getAssetCardByName('beta').boundingBox()
+    if (!search || !beta)
+      throw new Error('search box or card has no layout box')
+
+    await page.mouse.move(
+      search.x + search.width / 2,
+      search.y + search.height / 2
+    )
+    await page.mouse.down()
+    await page.mouse.move(beta.x + beta.width / 2, beta.y + beta.height / 2, {
+      steps: 12
+    })
+    await page.mouse.up()
+
+    await expect(tab.selectedCards).toHaveCount(0)
+  })
+
+  test('Ctrl/Cmd+A does not select assets while an aria-modal dialog is open', async ({
+    comfyPage
+  }) => {
+    const tab = comfyPage.menu.assetsTab
+    await expect(tab.assetCards).toHaveCount(2)
+
+    await comfyPage.page.evaluate(() => {
+      const dialog = document.createElement('div')
+      dialog.id = 'test-modal'
+      dialog.setAttribute('role', 'dialog')
+      dialog.setAttribute('aria-modal', 'true')
+      document.body.appendChild(dialog)
+    })
+
+    await tab.getAssetCardByName('alpha').hover()
+    await comfyPage.page.keyboard.press('ControlOrMeta+a')
+
+    await expect(tab.selectedCards).toHaveCount(0)
+
+    await comfyPage.page.evaluate(() => {
+      document.getElementById('test-modal')?.remove()
+    })
+  })
+})
--- a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
@@ -23,6 +23,7 @@ import { webSocketFixture } from '@e2e/fixtures/ws'
 const test = mergeTests(comfyPageFixture, webSocketFixture)

 const ERROR_CLASS = /ring-destructive-background/
+const SLOT_ERROR_CLASS = /before:ring-error/
 const UNKNOWN_NODE_ID = '1'
 const INNER_EXECUTION_ID = '2:1'
 const KSAMPLER_MODEL_INPUT_NAME = 'model'
@@ -69,6 +70,25 @@ async function selectLoadImageNodeForPaste(
  }, localLoadImageId)
 }

+async function getInputSlotIndexByName(
+  comfyPage: ComfyPage,
+  nodeId: string,
+  inputName: string
+): Promise<number> {
+  return comfyPage.page.evaluate(
+    ({ inputName, nodeId }) => {
+      const graph = window.app!.canvas.graph ?? window.app!.graph
+      const node = graph.getNodeById(nodeId)
+      const index = node?.findInputSlot(inputName) ?? -1
+      if (index < 0) {
+        throw new Error(`Input slot "${inputName}" not found`)
+      }
+      return index
+    },
+    { inputName, nodeId: toNodeId(nodeId) }
+  )
+}
+
 async function setupLoadImageErrorScenario(comfyPage: ComfyPage) {
  await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
  const loadImageNode = (
@@ -139,17 +159,10 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
      async ({ comfyPage }) => {
        const ksamplerId = await comfyPage.vueNodes.getNodeIdByTitle('KSampler')
        const ksamplerNode = comfyPage.vueNodes.getNodeLocator(ksamplerId)
-        const modelInputIndex = await comfyPage.page.evaluate(
-          ({ nodeId, inputName }) => {
-            const node = window.app!.graph.getNodeById(nodeId)
-            const index =
-              node?.inputs?.findIndex((input) => input.name === inputName) ?? -1
-            if (index < 0) {
-              throw new Error(`Input slot "${inputName}" not found`)
-            }
-            return index
-          },
-          { nodeId: toNodeId(ksamplerId), inputName: KSAMPLER_MODEL_INPUT_NAME }
+        const modelInputIndex = await getInputSlotIndexByName(
+          comfyPage,
+          ksamplerId,
+          KSAMPLER_MODEL_INPUT_NAME
        )
        const modelInputSlotRow = comfyPage.vueNodes.getInputSlotRow(
          ksamplerId,
@@ -175,7 +188,7 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {

        await expect(modelInputSlotRow).toBeVisible()
        await expect(modelInputSlotRow).toBeInViewport()
-        await expect(modelInputSlotHighlight).toHaveClass(/before:ring-error/)
+        await expect(modelInputSlotHighlight).toHaveClass(SLOT_ERROR_CLASS)
        await expect(
          comfyPage.vueNodes.getNodeInnerWrapper(ksamplerId)
        ).toHaveClass(ERROR_CLASS)
@@ -407,5 +420,76 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {

      await expect(innerWrapper).toHaveClass(ERROR_CLASS)
    })
+
+    test('boundary-linked validation error surfaces on the subgraph host', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+      const subgraphParentId =
+        await comfyPage.vueNodes.getNodeIdByTitle('New Subgraph')
+      const innerWrapper =
+        comfyPage.vueNodes.getNodeInnerWrapper(subgraphParentId)
+      const hostInputIndex = await getInputSlotIndexByName(
+        comfyPage,
+        subgraphParentId,
+        'positive'
+      )
+      const hostInputSlotHighlight =
+        comfyPage.vueNodes.getInputSlotConnectionDot(
+          subgraphParentId,
+          hostInputIndex
+        )
+      await expect(
+        innerWrapper,
+        'subgraph host must mount before injecting validation errors'
+      ).toBeVisible()
+      await expect(
+        innerWrapper,
+        'subgraph host should start without an error ring'
+      ).not.toHaveClass(ERROR_CLASS)
+
+      await test.step('surface the boundary-linked error on the host', async () => {
+        const exec = new ExecutionHelper(comfyPage)
+        await exec.mockValidationFailure({
+          [INNER_EXECUTION_ID]: buildKSamplerError(
+            'required_input_missing',
+            'positive',
+            'Required input is missing: positive'
+          )
+        })
+        await comfyPage.runButton.click()
+        await dismissErrorOverlay(comfyPage)
+
+        await expect(innerWrapper).toHaveClass(ERROR_CLASS)
+        await expect(hostInputSlotHighlight).toHaveClass(SLOT_ERROR_CLASS)
+      })
+
+      await test.step('confirm the interior node does not show the surfaced ring', async () => {
+        await comfyPage.vueNodes.enterSubgraph(subgraphParentId)
+        await comfyPage.nextFrame()
+        await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+        const interiorKSamplerId =
+          await comfyPage.vueNodes.getNodeIdByTitle('KSampler')
+        const interiorPositiveInputIndex = await getInputSlotIndexByName(
+          comfyPage,
+          interiorKSamplerId,
+          'positive'
+        )
+        const interiorPositiveSlotHighlight =
+          comfyPage.vueNodes.getInputSlotConnectionDot(
+            interiorKSamplerId,
+            interiorPositiveInputIndex
+          )
+        const interiorInnerWrapper =
+          comfyPage.vueNodes.getNodeInnerWrapper(interiorKSamplerId)
+
+        await expect(interiorInnerWrapper).toBeVisible()
+        await expect(interiorInnerWrapper).not.toHaveClass(ERROR_CLASS)
+        await expect(interiorPositiveSlotHighlight).toBeVisible()
+        await expect(interiorPositiveSlotHighlight).not.toHaveClass(
+          SLOT_ERROR_CLASS
+        )
+      })
+    })
  })
 })
--- a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
@@ -7,6 +7,45 @@ import {
 import { TestIds } from '@e2e/fixtures/selectors'

 test.describe('Vue Upload Widgets', { tag: '@vue-nodes' }, () => {
+  test.describe('media selection', { tag: '@widget' }, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    })
+
+    test('keeps a selected image loaded when it is selected again', async ({
+      comfyPage
+    }) => {
+      const loadImageNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
+      expect(loadImageNodes, 'Workflow has one Load Image node').toHaveLength(1)
+      const [loadImageNode] = loadImageNodes
+
+      const imageWidget = await loadImageNode.getWidgetByName('image')
+      await expect.poll(() => imageWidget.getValue()).toBe('example.png')
+
+      const node = comfyPage.vueNodes.getNodeByTitle('Load Image')
+      const imageLoadError = node.getByTestId(TestIds.errors.imageLoadError)
+      const selectedImageButton = node.getByRole('button', {
+        name: 'example.png',
+        exact: true
+      })
+      await expect(selectedImageButton).toBeVisible()
+      await expect(imageLoadError).toBeHidden()
+
+      await selectedImageButton.click()
+
+      const menu = comfyPage.page.getByTestId('form-dropdown-menu')
+      await expect(menu).toBeVisible()
+      await menu.getByText('example.png', { exact: true }).click()
+      await expect(menu).toBeHidden()
+
+      await expect(selectedImageButton).toBeFocused()
+      await expect(selectedImageButton).toBeVisible()
+      await expect.poll(() => imageWidget.getValue()).toBe('example.png')
+      await expect(imageLoadError).toBeHidden()
+    })
+  })
+
  test('should hide canvas-only upload buttons', async ({ comfyPage }) => {
    await comfyPage.workflow.loadWorkflow('widgets/all_load_widgets')

--- a/docs/adr/0012-cloud-release-notes-use-comfyui-version.md
+++ b/docs/adr/0012-cloud-release-notes-use-comfyui-version.md
@@ -0,0 +1,74 @@
+# 12. Cloud Release Notes Use the ComfyUI Version
+
+Date: 2026-07-13
+
+## Status
+
+Accepted
+
+<!-- [Proposed | Accepted | Rejected | Deprecated | Superseded by [ADR-NNNN](NNNN-title.md)] -->
+
+## Context
+
+The release-note system (`releaseStore`) decides whether to surface new-release
+UI — the desktop toast/red-dot and the "what's new" popup — by comparing the
+version of the most recent entry in the `/releases` feed against the version the
+user is currently running.
+
+`currentVersion` sourced that "current version" differently per platform:
+
+- on Cloud, from `system_stats.system.cloud_version`,
+- everywhere else, from `system_stats.system.comfyui_version`.
+
+The `/releases` feed, however, is authored in the docs repo and its entries are
+keyed by **ComfyUI** version for every project, including `project: 'cloud'`.
+There is no separate cloud-versioned feed, and the "learn more" link on every
+release note points at <https://docs.comfy.org/changelog>, which only lists
+ComfyUI versions.
+
+This mismatch broke the feature on Cloud (tracked as **FE-1237**):
+
+- Cloud runs a much higher `cloud_version` (e.g. `0.160.1`) than the ComfyUI
+  version the feed entries carry (e.g. `0.27.1`).
+- The comparison therefore resolved as `0.27.1 < 0.160.1` → "already ahead of
+  the latest release" → the popup's `isLatestVersion` gate never passed and the
+  popup never showed.
+- Analytics confirmed the regression: `release_note` clicks fell from 13.4% of
+  clicks over 90 days to 0% over 30 days, and `cloud_release_note` was
+  effectively never clicked.
+
+Two directions could fix the mismatch:
+
+1. Give Cloud its own cloud-versioned release feed and a cloud changelog page.
+2. Compare against the ComfyUI version on Cloud too, so the running version and
+   the feed entries share the same version namespace.
+
+Option 1 requires infrastructure that does not exist: no cloud changelog page,
+and in current practice a single person maintains the changelog in the docs
+repo using ComfyUI versions, updated after each Cloud deploy completes. A
+cloud-versioned popup would deep-link users to a changelog page that has no
+matching entry, which is more confusing than the version label itself.
+
+## Decision
+
+`currentVersion` always uses `comfyui_version`, on Cloud as well as everywhere
+else. `cloud_version` is no longer consulted for release-note version
+comparisons.
+
+The `/releases` request still sends `project: 'cloud'` on Cloud, so Cloud can
+receive a curated subset of release notes; only the version used for comparison
+changes.
+
+## Consequences
+
+- Cloud shows a release note once the running ComfyUI version matches the latest
+  published feed entry — consistent with the practice of updating the changelog
+  after a Cloud deploy lands. Publishing a note for a version Cloud has not yet
+  deployed correctly withholds the popup until the deploy catches up.
+- The popup and its "learn more" link now reference a ComfyUI version that
+  actually exists on the changelog page.
+- `cloud_version` remains available in `system_stats` for other consumers; this
+  decision scopes only to release-note version comparison.
+- If Cloud later wants release notes tied to its own versioning, it would need a
+  cloud-versioned feed **and** a cloud changelog page, at which point this ADR
+  should be revisited.
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@ -21,6 +21,7 @@ An Architecture Decision Record captures an important architectural decision mad
 | [0009](0009-subgraph-promoted-widgets-use-linked-inputs.md) | Subgraph Promoted Widgets Use Linked Inputs | Proposed | 2026-05-05 |
 | [0010](0010-remove-nx-orchestration.md)                     | Remove Nx Orchestration                     | Accepted | 2026-05-19 |
 | [0011](0011-derived-credential-lifecycle.md)                | Derived Credential Lifecycle for Cloud Auth | Proposed | 2026-07-09 |
+| [0012](0012-cloud-release-notes-use-comfyui-version.md)     | Cloud Release Notes Use the ComfyUI Version | Accepted | 2026-07-13 |

 ## Creating a New ADR

--- a/knip.config.ts
+++ b/knip.config.ts
@@ -57,6 +57,9 @@ const config: KnipConfig = {
    // Marketing media tooling — adopted by pages in a follow-up PR
    'apps/website/src/components/common/SiteVideo.vue',
    'apps/website/src/utils/marketingImage.ts',
+    // Pending integration: consumed by the useWorkspaceInvoices seam once
+    // #13591 (Plan & Credits tabs) lands — FE-1245
+    'src/composables/billing/useNextInvoice.ts',
    // Agent review check config, not part of the build
    '.agents/checks/eslint.strict.config.js',
    // Devtools extensions, included dynamically
--- a/packages/comfyui-desktop-bridge-types/comfyDesktopBridge.d.ts
+++ b/packages/comfyui-desktop-bridge-types/comfyDesktopBridge.d.ts
@@ -40,6 +40,11 @@ export type ComfyDesktop2TelemetryProperties = Record<
  ComfyDesktop2TelemetryValue | ComfyDesktop2TelemetryValue[]
 >

+export type ComfyDesktop2FirebaseAuthState =
+  | { status: 'pending' }
+  | { status: 'signed_out' }
+  | { status: 'signed_in'; userId: string }
+
 export interface ComfyDesktop2TerminalBridge {
  subscribe(installationId?: string): Promise<TerminalRestore>
  unsubscribe(installationId?: string): Promise<void>
@@ -60,6 +65,7 @@ export interface ComfyDesktop2LogsBridge {

 export interface ComfyDesktop2TelemetryBridge {
  capture(event: string, properties?: ComfyDesktop2TelemetryProperties): void
+  reportFirebaseAuthState?(state: ComfyDesktop2FirebaseAuthState): void
 }

 export interface ComfyDesktop2Bridge {
--- a/packages/comfyui-desktop-bridge-types/package.json
+++ b/packages/comfyui-desktop-bridge-types/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@comfyorg/comfyui-desktop-bridge-types",
-  "version": "0.1.2",
+  "version": "0.1.3",
  "description": "TypeScript definitions for the Comfy Desktop hosted frontend bridge",
  "homepage": "https://comfy.org",
  "license": "MIT",
--- a/packages/shared-frontend-utils/src/formatUtil.test.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.test.ts
@@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest'
 import {
  appendWorkflowJsonExt,
  ensureWorkflowSuffix,
+  escapeVueI18nMessageSyntax,
  formatLocalizedMediumDate,
  formatLocalizedNumber,
  getFilePathSeparatorVariants,
@@ -477,4 +478,49 @@ describe('formatUtil', () => {
      expect(formatLocalizedMediumDate('not a date', 'en')).toBe('—')
    })
  })
+
+  describe('escapeVueI18nMessageSyntax', () => {
+    it('escapes a literal @ that would break linked-message compilation', () => {
+      expect(
+        escapeVueI18nMessageSyntax('clips (tagged @Audio1-3 in the prompt)')
+      ).toBe("clips (tagged {'@'}Audio1-3 in the prompt)")
+    })
+
+    it('escapes @ in an email address', () => {
+      expect(escapeVueI18nMessageSyntax('support@comfy.org')).toBe(
+        "support{'@'}comfy.org"
+      )
+    })
+
+    it('escapes interpolation braces', () => {
+      expect(escapeVueI18nMessageSyntax('size {w}x{h}')).toBe(
+        "size {'{'}w{'}'}x{'{'}h{'}'}"
+      )
+    })
+
+    it('escapes the plural pipe separator', () => {
+      expect(escapeVueI18nMessageSyntax('foreground | background')).toBe(
+        "foreground {'|'} background"
+      )
+    })
+
+    it('escapes the modulo percent so it cannot re-form %{', () => {
+      expect(escapeVueI18nMessageSyntax('50%{done}')).toBe(
+        "50{'%'}{'{'}done{'}'}"
+      )
+    })
+
+    it('escapes every occurrence in a single pass', () => {
+      expect(escapeVueI18nMessageSyntax('@a @b @c')).toBe(
+        "{'@'}a {'@'}b {'@'}c"
+      )
+    })
+
+    it('leaves strings without syntax characters unchanged', () => {
+      expect(escapeVueI18nMessageSyntax('no special chars here')).toBe(
+        'no special chars here'
+      )
+      expect(escapeVueI18nMessageSyntax('')).toBe('')
+    })
+  })
 })
--- a/packages/shared-frontend-utils/src/formatUtil.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.ts
@@ -178,6 +178,40 @@ export function normalizeI18nKey(key: string) {
  return typeof key === 'string' ? key.replace(/\./g, '_') : ''
 }

+/**
+ * Characters that vue-i18n's message compiler treats as syntax in message text,
+ * so plain text has to escape them to render verbatim through `t()`/`st()`:
+ *
+ * - `@` starts a linked-message reference (`@:key`); malformed usage throws
+ *   `Invalid linked format`.
+ * - `{` / `}` delimit interpolation (`{name}`, `{'literal'}`); an unbalanced
+ *   brace throws `Unterminated/Unbalanced closing brace`.
+ * - `|` separates plural branches, so `a | b` silently renders as one branch.
+ * - `%` forms modulo interpolation when immediately followed by `{` (`%{name}`);
+ *   it must be escaped too, otherwise escaping a following `{` re-forms `%{`.
+ *
+ * The set is a build-inlined `const enum` (`TokenChars`) in
+ * `@intlify/message-compiler` and is not exported, so it is hardcoded here.
+ *
+ * @see https://vue-i18n.intlify.dev/guide/essentials/syntax (Special Characters, Literal interpolation)
+ * @see https://vue-i18n.intlify.dev/guide/essentials/pluralization
+ */
+const VUE_I18N_SYNTAX_CHARS = /[@{}|%]/g
+
+/**
+ * Escapes vue-i18n message-syntax characters as literal interpolations (`{'x'}`)
+ * so arbitrary text renders verbatim instead of being parsed as syntax. This is
+ * the only escape vue-i18n supports; see {@link VUE_I18N_SYNTAX_CHARS}.
+ *
+ * Only apply to values read through the compiler (`t()`/`st()`). Values read raw
+ * via `tm()`/`stRaw()` (e.g. node tooltips) must be left untouched, or the
+ * literal `{'x'}` would surface to users. Apply exactly once to raw text: the
+ * escape output itself contains `{`/`}`, so it is not idempotent.
+ */
+export function escapeVueI18nMessageSyntax(text: string): string {
+  return text.replace(VUE_I18N_SYNTAX_CHARS, (char) => `{'${char}'}`)
+}
+
 /**
 * Takes a dynamic prompt in the format {opt1|opt2|{optA|optB}|} and randomly replaces groups. Supports C style comments.
 * @param input The dynamic prompt to process
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -16,6 +16,7 @@ const maybeLocalOptions: PlaywrightTestConfig = process.env.PLAYWRIGHT_LOCAL
    }
  : {
      retries: process.env.CI ? 3 : 0,
+      workers: process.env.CI ? 2 : undefined,
      use: {
        trace: 'on-first-retry'
      }
@@ -25,7 +26,7 @@ export default defineConfig({
  testDir: './browser_tests',
  fullyParallel: true,
  forbidOnly: !!process.env.CI,
-  reporter: 'html',
+  reporter: process.env.PLAYWRIGHT_BLOB_OUTPUT_DIR ? 'blob' : 'html',
  ...maybeLocalOptions,

  globalSetup: './browser_tests/globalSetup.ts',
--- a/scripts/cicd/resolve-comfyui-release.test.ts
+++ b/scripts/cicd/resolve-comfyui-release.test.ts
@@ -0,0 +1,120 @@
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+
+import {
+  computeTargetVersion,
+  isValidSemver,
+  parseRequirementsVersion,
+  parseTargetBranchOverride
+} from './resolve-comfyui-release'
+
+describe('parseRequirementsVersion', () => {
+  let dir: string
+
+  beforeEach(() => {
+    dir = fs.mkdtempSync(path.join(os.tmpdir(), 'resolve-release-'))
+  })
+
+  afterEach(() => {
+    fs.rmSync(dir, { recursive: true, force: true })
+  })
+
+  function writeRequirements(content: string): string {
+    const filePath = path.join(dir, 'requirements.txt')
+    fs.writeFileSync(filePath, content)
+    return filePath
+  }
+
+  it('parses a pinned == version', () => {
+    const file = writeRequirements(
+      'torch\ncomfyui-frontend-package==1.45.20\nnumpy'
+    )
+    expect(parseRequirementsVersion(file)).toBe('1.45.20')
+  })
+
+  it('parses a >= constraint', () => {
+    const file = writeRequirements('comfyui-frontend-package>=2.0.3')
+    expect(parseRequirementsVersion(file)).toBe('2.0.3')
+  })
+
+  it('returns null when the package is absent', () => {
+    const file = writeRequirements('torch\nnumpy')
+    expect(parseRequirementsVersion(file)).toBeNull()
+  })
+
+  it('returns null when the file is missing', () => {
+    expect(parseRequirementsVersion(path.join(dir, 'nope.txt'))).toBeNull()
+  })
+})
+
+describe('isValidSemver', () => {
+  it('accepts a valid X.Y.Z', () => {
+    expect(isValidSemver('1.45.20')).toBe(true)
+    expect(isValidSemver('2.0.0')).toBe(true)
+  })
+
+  it('rejects non-three-part versions', () => {
+    expect(isValidSemver('1.45')).toBe(false)
+    expect(isValidSemver('1.45.20.1')).toBe(false)
+  })
+
+  it('rejects non-numeric or leading-zero-padded parts', () => {
+    expect(isValidSemver('1.x.0')).toBe(false)
+    expect(isValidSemver('v1.45.20')).toBe(false)
+    expect(isValidSemver('1.045.20')).toBe(false)
+  })
+
+  it('rejects empty / non-string input', () => {
+    expect(isValidSemver('')).toBe(false)
+    // @ts-expect-error exercising runtime guard
+    expect(isValidSemver(undefined)).toBe(false)
+  })
+})
+
+describe('parseTargetBranchOverride', () => {
+  it('parses core/1.47', () => {
+    expect(parseTargetBranchOverride('core/1.47')).toEqual({
+      major: 1,
+      minor: 47,
+      branch: 'core/1.47'
+    })
+  })
+
+  it('parses a major bump core/2.0', () => {
+    expect(parseTargetBranchOverride('core/2.0')).toEqual({
+      major: 2,
+      minor: 0,
+      branch: 'core/2.0'
+    })
+  })
+
+  it('rejects malformed overrides', () => {
+    expect(parseTargetBranchOverride('core/1')).toBeNull()
+    expect(parseTargetBranchOverride('1.47')).toBeNull()
+    expect(parseTargetBranchOverride('core/1.47.0')).toBeNull()
+    expect(parseTargetBranchOverride('release/1.47')).toBeNull()
+    expect(parseTargetBranchOverride('core/v1.47')).toBeNull()
+    expect(parseTargetBranchOverride('')).toBeNull()
+  })
+})
+
+describe('computeTargetVersion', () => {
+  it('bumps patch on a 2.x line when commits exist', () => {
+    expect(computeTargetVersion(2, 0, 'v2.0.3', true)).toBe('2.0.4')
+  })
+
+  it('keeps the tag version when no new commits exist', () => {
+    expect(computeTargetVersion(2, 0, 'v2.0.3', false)).toBe('2.0.3')
+  })
+
+  it('starts a fresh major.minor line at .0 when no tag exists', () => {
+    expect(computeTargetVersion(2, 0, null, true)).toBe('2.0.0')
+    expect(computeTargetVersion(1, 47, null, true)).toBe('1.47.0')
+  })
+
+  it('returns null for a malformed tag', () => {
+    expect(computeTargetVersion(1, 47, 'v1.47', true)).toBeNull()
+  })
+})
--- a/scripts/cicd/resolve-comfyui-release.ts
+++ b/scripts/cicd/resolve-comfyui-release.ts
@@ -81,15 +81,72 @@ function isValidSemver(version: string): boolean {
 }

 /**
- * Get the latest patch tag for a given minor version
+ * Parse a target branch override of the form `core/<major>.<minor>`.
+ * Returns the parsed major/minor and normalized branch, or null if malformed.
 */
-function getLatestPatchTag(repoPath: string, minor: number): string | null {
+function parseTargetBranchOverride(
+  branch: string
+): { major: number; minor: number; branch: string } | null {
+  const match = branch.match(/^core\/(\d+)\.(\d+)$/)
+  if (!match) {
+    return null
+  }
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    branch
+  }
+}
+
+/**
+ * Compute the next release version for a target major.minor line.
+ *
+ * With no prior tag, the line starts at `.0`. With a prior tag, the patch is
+ * bumped when there are pending commits, otherwise the tagged version stands.
+ * Returns null if the tag is not valid semver.
+ */
+function computeTargetVersion(
+  targetMajor: number,
+  targetMinor: number,
+  latestPatchTag: string | null,
+  hasPendingCommits: boolean
+): string | null {
+  if (!latestPatchTag) {
+    return `${targetMajor}.${targetMinor}.0`
+  }
+
+  const tagVersion = latestPatchTag.replace('v', '')
+  if (!isValidSemver(tagVersion)) {
+    return null
+  }
+
+  const existingPatch = Number(tagVersion.split('.')[2])
+  return hasPendingCommits
+    ? `${targetMajor}.${targetMinor}.${existingPatch + 1}`
+    : tagVersion
+}
+
+/**
+ * Check whether a branch exists on origin in the given repo.
+ */
+function branchExists(branch: string, repoPath: string): boolean {
+  return Boolean(exec(`git rev-parse --verify origin/${branch}`, repoPath))
+}
+
+/**
+ * Get the latest patch tag for a given major.minor version
+ */
+function getLatestPatchTag(
+  repoPath: string,
+  major: number,
+  minor: number
+): string | null {
  // Fetch all tags
  exec('git fetch --tags', repoPath)

  // Use git's native version sorting to get the latest tag
  const latestTag = exec(
-    `git tag -l 'v1.${minor}.*' --sort=-version:refname | head -n 1`,
+    `git tag -l 'v${major}.${minor}.*' --sort=-version:refname | head -n 1`,
    repoPath
  )

@@ -101,7 +158,7 @@ function getLatestPatchTag(repoPath: string, minor: number): string | null {
  const validTagRegex = /^v\d+\.\d+\.\d+$/
  if (!validTagRegex.test(latestTag)) {
    console.error(
-      `Latest tag for minor version ${minor} is not valid semver: ${latestTag}`
+      `Latest tag for version ${major}.${minor} is not valid semver: ${latestTag}`
    )
    return null
  }
@@ -132,85 +189,106 @@ function resolveRelease(
    return null
  }

-  const [major, currentMinor, patch] = currentVersion.split('.').map(Number)
+  const [currentMajor, currentMinor] = currentVersion.split('.').map(Number)

  // Fetch all branches
  exec('git fetch origin', frontendRepoPath)

-  // Determine target branch based on release type:
-  //   'patch' → target current minor (hotfix for production version)
-  //   'minor' → try next minor, fall back to current minor (bi-weekly cadence)
-  const releaseTypeInput =
-    process.env.RELEASE_TYPE?.trim().toLowerCase() || 'minor'
-  if (releaseTypeInput !== 'minor' && releaseTypeInput !== 'patch') {
-    console.error(
-      `Invalid RELEASE_TYPE: "${releaseTypeInput}". Expected "minor" or "patch"`
-    )
-    return null
-  }
-  const releaseType: 'minor' | 'patch' = releaseTypeInput
+  // Target major defaults to the current pin's major, but a TARGET_BRANCH
+  // override (below) can retarget both major and minor.
+  let targetMajor = currentMajor
  let targetMinor: number
  let targetBranch: string

-  if (releaseType === 'patch') {
-    targetMinor = currentMinor
-    targetBranch = `core/1.${targetMinor}`
+  const targetBranchOverride = process.env.TARGET_BRANCH?.trim()

-    const branchExists = exec(
-      `git rev-parse --verify origin/${targetBranch}`,
-      frontendRepoPath
-    )
-
-    if (!branchExists) {
+  if (targetBranchOverride) {
+    // Manual override takes precedence over RELEASE_TYPE / pin-derived selection.
+    const parsed = parseTargetBranchOverride(targetBranchOverride)
+    if (!parsed) {
      console.error(
-        `Patch release requested but branch ${targetBranch} does not exist`
+        `Invalid TARGET_BRANCH: "${targetBranchOverride}". Expected format: core/<major>.<minor> (e.g. core/1.47 or core/2.0)`
+      )
+      return null
+    }
+
+    targetMajor = parsed.major
+    targetMinor = parsed.minor
+    targetBranch = parsed.branch
+
+    if (!branchExists(targetBranch, frontendRepoPath)) {
+      console.error(
+        `Manual override branch ${targetBranch} does not exist in frontend repo`
      )
      return null
    }

    console.error(
-      `Patch release: targeting current production branch ${targetBranch}`
+      `Manual override: targeting ${targetBranch} (ignoring release_type)`
    )
  } else {
-    // Try next minor first, fall back to current minor if not available
-    targetMinor = currentMinor + 1
-    targetBranch = `core/1.${targetMinor}`
-
-    const nextMinorExists = exec(
-      `git rev-parse --verify origin/${targetBranch}`,
-      frontendRepoPath
-    )
-
-    if (!nextMinorExists) {
-      // Fall back to current minor for minor release
-      targetMinor = currentMinor
-      targetBranch = `core/1.${targetMinor}`
-
-      const currentMinorExists = exec(
-        `git rev-parse --verify origin/${targetBranch}`,
-        frontendRepoPath
+    // Determine target branch based on release type:
+    //   'patch' → target current minor (hotfix for production version)
+    //   'minor' → try next minor, fall back to current minor (bi-weekly cadence)
+    const releaseTypeInput =
+      process.env.RELEASE_TYPE?.trim().toLowerCase() || 'minor'
+    if (releaseTypeInput !== 'minor' && releaseTypeInput !== 'patch') {
+      console.error(
+        `Invalid RELEASE_TYPE: "${releaseTypeInput}". Expected "minor" or "patch"`
      )
+      return null
+    }
+    const releaseType: 'minor' | 'patch' = releaseTypeInput

-      if (!currentMinorExists) {
+    if (releaseType === 'patch') {
+      targetMinor = currentMinor
+      targetBranch = `core/${targetMajor}.${targetMinor}`
+
+      if (!branchExists(targetBranch, frontendRepoPath)) {
        console.error(
-          `Neither core/1.${currentMinor + 1} nor core/1.${currentMinor} branches exist in frontend repo`
+          `Patch release requested but branch ${targetBranch} does not exist`
        )
        return null
      }

      console.error(
-        `Next minor branch core/1.${currentMinor + 1} not found, falling back to core/1.${currentMinor} for minor release`
+        `Patch release: targeting current production branch ${targetBranch}`
      )
+    } else {
+      // Try next minor first, fall back to current minor if not available
+      targetMinor = currentMinor + 1
+      targetBranch = `core/${targetMajor}.${targetMinor}`
+
+      if (!branchExists(targetBranch, frontendRepoPath)) {
+        // Fall back to current minor for minor release
+        targetMinor = currentMinor
+        targetBranch = `core/${targetMajor}.${targetMinor}`
+
+        if (!branchExists(targetBranch, frontendRepoPath)) {
+          console.error(
+            `Neither core/${targetMajor}.${currentMinor + 1} nor core/${targetMajor}.${currentMinor} branches exist in frontend repo`
+          )
+          return null
+        }
+
+        console.error(
+          `Next minor branch core/${targetMajor}.${currentMinor + 1} not found, falling back to core/${targetMajor}.${currentMinor} for minor release`
+        )
+      }
    }
  }

-  // Get latest patch tag for target minor
-  const latestPatchTag = getLatestPatchTag(frontendRepoPath, targetMinor)
+  // Get latest patch tag for target major.minor
+  const latestPatchTag = getLatestPatchTag(
+    frontendRepoPath,
+    targetMajor,
+    targetMinor
+  )

-  let needsRelease = false
-  let branchHeadSha: string | null = null
+  let needsRelease: boolean
+  let branchHeadSha: string | null
  let tagCommitSha: string | null = null
-  let targetVersion = currentVersion
+  let targetVersion: string

  if (latestPatchTag) {
    // Get commit SHA for the tag
@@ -231,34 +309,23 @@ function resolveRelease(
    const commitCount = parseInt(commitsBetween, 10)
    needsRelease = !isNaN(commitCount) && commitCount > 0

-    // Parse existing patch number and increment if needed
-    const tagVersion = latestPatchTag.replace('v', '')
-
-    // Validate tag version format
-    if (!isValidSemver(tagVersion)) {
+    const nextVersion = computeTargetVersion(
+      targetMajor,
+      targetMinor,
+      latestPatchTag,
+      needsRelease
+    )
+    if (!nextVersion) {
      console.error(
-        `Invalid tag version format: ${tagVersion}. Expected format: X.Y.Z`
+        `Invalid tag version format: ${latestPatchTag}. Expected format: vX.Y.Z`
      )
      return null
    }
-
-    const [, , existingPatch] = tagVersion.split('.').map(Number)
-
-    // Validate existingPatch is a valid number
-    if (!Number.isFinite(existingPatch) || existingPatch < 0) {
-      console.error(`Invalid patch number in tag: ${existingPatch}`)
-      return null
-    }
-
-    if (needsRelease) {
-      targetVersion = `1.${targetMinor}.${existingPatch + 1}`
-    } else {
-      targetVersion = tagVersion
-    }
+    targetVersion = nextVersion
  } else {
-    // No tags exist for this minor version, need to create v1.{targetMinor}.0
+    // No tags exist for this major.minor version, need to create the .0 patch
    needsRelease = true
-    targetVersion = `1.${targetMinor}.0`
+    targetVersion = `${targetMajor}.${targetMinor}.0`
    branchHeadSha = exec(
      `git rev-parse origin/${targetBranch}`,
      frontendRepoPath
@@ -281,26 +348,41 @@ function resolveRelease(
  }
 }

-// Main execution
-const comfyuiRepoPath = process.argv[2]
-const frontendRepoPath = process.argv[3] || process.cwd()
+/**
+ * Main execution: parse args, resolve, and print the JSON result.
+ */
+function main(): void {
+  const comfyuiRepoPath = process.argv[2]
+  const frontendRepoPath = process.argv[3] || process.cwd()

-if (!comfyuiRepoPath) {
-  console.error(
-    'Usage: resolve-comfyui-release.ts <comfyui-repo-path> [frontend-repo-path]'
-  )
-  process.exit(1)
+  if (!comfyuiRepoPath) {
+    console.error(
+      'Usage: resolve-comfyui-release.ts <comfyui-repo-path> [frontend-repo-path]'
+    )
+    process.exit(1)
+  }
+
+  const releaseInfo = resolveRelease(comfyuiRepoPath, frontendRepoPath)
+
+  if (!releaseInfo) {
+    console.error('Failed to resolve release information')
+    process.exit(1)
+  }
+
+  // Output as JSON for GitHub Actions
+  // oxlint-disable-next-line no-console -- stdout is captured by the workflow
+  console.log(JSON.stringify(releaseInfo, null, 2))
 }

-const releaseInfo = resolveRelease(comfyuiRepoPath, frontendRepoPath)
-
-if (!releaseInfo) {
-  console.error('Failed to resolve release information')
-  process.exit(1)
+// Only run when invoked directly, not when imported by tests.
+if (process.argv[1] && import.meta.url === `file://${process.argv[1]}`) {
+  main()
 }

-// Output as JSON for GitHub Actions
-// oxlint-disable-next-line no-console -- stdout is captured by the workflow
-console.log(JSON.stringify(releaseInfo, null, 2))
-
-export { resolveRelease }
+export {
+  computeTargetVersion,
+  isValidSemver,
+  parseRequirementsVersion,
+  parseTargetBranchOverride,
+  resolveRelease
+}
--- a/scripts/collect-i18n-node-defs.ts
+++ b/scripts/collect-i18n-node-defs.ts
@@ -3,7 +3,10 @@ import * as fs from 'fs'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'

 import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage'
-import { normalizeI18nKey } from '../packages/shared-frontend-utils/src/formatUtil'
+import {
+  escapeVueI18nMessageSyntax,
+  normalizeI18nKey
+} from '@/utils/formatUtil'
 import type { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'

 const localePath = './src/locales/en/main.json'
@@ -44,8 +47,6 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
    }
  )

-  console.log(`Collected ${nodeDefs.length} node definitions`)
-
  const allDataTypesLocale = Object.fromEntries(
    nodeDefs
      .flatMap((nodeDef) => {
@@ -60,7 +61,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
        )
        return allDataTypes.map((dataType) => [
          normalizeI18nKey(dataType),
-          dataType
+          escapeVueI18nMessageSyntax(dataType)
        ])
      })
      .sort((a, b) => a[0].localeCompare(b[0]))
@@ -98,7 +99,10 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
        const runtimeWidgets = Object.fromEntries(
          Object.entries(widgetsMappings)
            .sort((a, b) => a[0].localeCompare(b[0]))
-            .map(([key, value]) => [normalizeI18nKey(key), { name: value }])
+            .map(([key, value]) => [
+              normalizeI18nKey(key),
+              { name: value ? escapeVueI18nMessageSyntax(value) : value }
+            ])
        )

        if (Object.keys(runtimeWidgets).length > 0) {
@@ -121,7 +125,10 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
  function extractInputs(nodeDef: ComfyNodeDefImpl) {
    const inputs = Object.fromEntries(
      Object.values(nodeDef.inputs).flatMap((input) => {
-        const name = input.name
+        const name =
+          input.name === undefined
+            ? undefined
+            : escapeVueI18nMessageSyntax(input.name)
        const tooltip = input.tooltip

        if (name === undefined && tooltip === undefined) {
@@ -146,7 +153,10 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
    const outputs = Object.fromEntries(
      nodeDef.outputs.flatMap((output, i) => {
        // Ignore data types if they are already translated in allDataTypesLocale.
-        const name = output.name in allDataTypesLocale ? undefined : output.name
+        const name =
+          output.name === undefined || output.name in allDataTypesLocale
+            ? undefined
+            : escapeVueI18nMessageSyntax(output.name)
        const tooltip = output.tooltip

        if (name === undefined && tooltip === undefined) {
@@ -179,8 +189,12 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
        return [
          normalizeI18nKey(nodeDef.name),
          {
-            display_name: nodeDef.display_name ?? nodeDef.name,
-            description: nodeDef.description || undefined,
+            display_name: escapeVueI18nMessageSyntax(
+              nodeDef.display_name ?? nodeDef.name
+            ),
+            description: nodeDef.description
+              ? escapeVueI18nMessageSyntax(nodeDef.description)
+              : undefined,
            inputs: Object.keys(inputs).length > 0 ? inputs : undefined,
            outputs: extractOutputs(nodeDef)
          }
@@ -192,7 +206,10 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
    nodeDefs.flatMap((nodeDef) =>
      nodeDef.category
        .split('/')
-        .map((category) => [normalizeI18nKey(category), category])
+        .map((category) => [
+          normalizeI18nKey(category),
+          escapeVueI18nMessageSyntax(category)
+        ])
    )
  )

--- a/Show More
+++ b/Show More