feat(onboarding): gate the first-run tour to desktop viewports

Reuse one shared desktop-layout clamp across both tours so the first-run gate and the app-mode trigger can't drift, and thread it through the single candidate predicate that the Getting Started screen and the tour share. Also finish a terminal Run tour from the run outcome instead of the click-advance, which was tearing down the engine before the run reported.
test(onboarding): cover the toCoachSteps alignment invariant
2026-07-18 01:38:03 +00:00 · 2026-07-16 21:03:12 +05:30 · 2026-07-16 21:02:05 +05:30 · 2026-07-16 21:01:49 +05:30 · 2026-07-16 21:01:19 +05:30 · 2026-07-16 21:00:47 +05:30
224 changed files with 23737 additions and 5787 deletions
--- a/.fallowrc.json
+++ b/.fallowrc.json
@@ -1,9 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/fallow-rs/fallow/main/schema.json",
-  "entry": ["src/main.ts", "index.html"],
-  "duplicates": {
-    "minOccurrences": 3,
-    "ignore": ["**/*.generated.*", "**/generatedManagerTypes.ts"]
-  },
-  "rules": {}
-}
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,6 @@ packages/registry-types/src/comfyRegistryTypes.ts linguist-generated=true
 packages/ingest-types/src/types.gen.ts linguist-generated=true
 packages/ingest-types/src/zod.gen.ts linguist-generated=true
 src/workbench/extensions/manager/types/generatedManagerTypes.ts linguist-generated=true
+
+# Vendored upstream workflow templates used as resolver test fixtures
+src/renderer/extensions/onboardingTour/__fixtures__/templates/*.json linguist-generated=true
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ yarn.lock
 .eslintcache
 .prettiercache
 .stylelintcache
-.fallow/

 node_modules
 .pnpm-store
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -88,11 +88,6 @@ const config: StorybookConfig = {
            replacement:
              process.cwd() + '/src/storybook/mocks/useFeatureFlags.ts'
          },
-          {
-            find: '@/platform/workspace/composables/useWorkspaceUI',
-            replacement:
-              process.cwd() + '/src/storybook/mocks/useWorkspaceUI.ts'
-          },
          {
            find: '@/platform/workspace/stores/teamWorkspaceStore',
            replacement:
--- a/apps/website/astro.config.ts
+++ b/apps/website/astro.config.ts
@@ -10,13 +10,11 @@ const PAYMENT_STATUSES = ['success', 'failed'] as const
 const LOCALE_PREFIXES = LOCALES.map((locale) =>
  locale === DEFAULT_LOCALE ? '' : `/${locale}`
 )
-const SITEMAP_EXCLUDED_PATHNAMES = new Set([
-  ...LOCALE_PREFIXES.flatMap((prefix) =>
+const SITEMAP_EXCLUDED_PATHNAMES = new Set(
+  LOCALE_PREFIXES.flatMap((prefix) =>
    PAYMENT_STATUSES.map((status) => `${prefix}/payment/${status}`)
-  ),
-  ...LOCALE_PREFIXES.map((prefix) => `${prefix}/individual-submission`),
-  ...LOCALE_PREFIXES.map((prefix) => `${prefix}/booking-confirmation`)
-])
+  )
+)

 function isExcludedFromSitemap(page: string): boolean {
  const pathname = new URL(page).pathname.replace(/\/$/, '')
--- a/apps/website/e2e/brand.spec.ts
+++ b/apps/website/e2e/brand.spec.ts
@@ -1,51 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { BRAND_ASSETS_ZIP, BRAND_GUIDELINES_PDF } from '../src/data/brandAssets'
-import { test } from './fixtures/blockExternalMedia'
-
-test.describe('Brand portal @smoke', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/brand')
-  })
-
-  test('renders each brand guideline section', async ({ page }) => {
-    await expect(
-      page.getByRole('heading', { level: 1, name: 'Create with ComfyUI' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'One mark, many dimensions.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Every color earns its place.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Precise, never cute.' })
-    ).toBeVisible()
-    await expect(
-      page.getByRole('heading', { name: 'Trademark guidelines.' })
-    ).toBeVisible()
-  })
-
-  test('shows all four marks', async ({ page }) => {
-    const logos = page.locator('#logos')
-    for (const name of [
-      'Core Logo',
-      'Logomark',
-      'Icon',
-      'Amplified Logomark'
-    ]) {
-      await expect(logos.getByText(name, { exact: true })).toBeVisible()
-    }
-  })
-
-  test('the hero ctas open the gated guidelines and the logo bundle', async ({
-    page
-  }) => {
-    await expect(
-      page.getByRole('link', { name: 'View brand guidelines' })
-    ).toHaveAttribute('href', BRAND_GUIDELINES_PDF)
-    await expect(
-      page.getByRole('link', { name: 'Download logos' })
-    ).toHaveAttribute('href', BRAND_ASSETS_ZIP)
-  })
-})
--- a/apps/website/e2e/mcp.spec.ts
+++ b/apps/website/e2e/mcp.spec.ts
@@ -1,153 +0,0 @@
-import type { Locator } from '@playwright/test'
-import { expect } from '@playwright/test'
-
-import { test } from './fixtures/blockExternalMedia'
-
-const MCP_ENDPOINT = 'https://cloud.comfy.org/mcp'
-
-// The setup island hydrates on visibility; clicks before hydration are
-// no-ops, so retry until the tab actually activates.
-async function selectClientTab(setup: Locator, name: string) {
-  const tab = setup.getByRole('tab', { name })
-  await expect(async () => {
-    await tab.click()
-    await expect(tab).toHaveAttribute('data-state', 'active', { timeout: 500 })
-  }).toPass()
-}
-
-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('Claude Desktop is the default tab and shows only the connector card', async ({
-    page
-  }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    await expect(
-      setup.getByRole('tab', { name: 'Claude Desktop' })
-    ).toHaveAttribute('data-state', 'active')
-    await expect(
-      setup.getByRole('heading', { name: 'Add Custom Connector' })
-    ).toBeVisible()
-    await expect(setup.getByText(MCP_ENDPOINT, { exact: true })).toBeVisible()
-    await expect(
-      setup.getByRole('heading', {
-        name: 'Ask your agent to install Comfy MCP'
-      })
-    ).toHaveCount(0)
-    await expect(setup.locator('video')).toBeVisible()
-  })
-
-  test('client tabs swap install instructions and agent-card visibility', async ({
-    page
-  }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    const activePanel = setup.locator('[role="tabpanel"][data-state="active"]')
-    const agentHeading = setup.getByRole('heading', {
-      name: 'Ask your agent to install Comfy MCP'
-    })
-
-    await expect(activePanel).toContainText('Add custom connector')
-
-    // First interaction retries until the island hydrates; later switches
-    // assert synchronously so steady-state click regressions fail.
-    await selectClientTab(setup, 'Claude Code Terminal')
-    await expect(activePanel).toContainText(
-      `claude mcp add --transport http comfy-cloud ${MCP_ENDPOINT}`
-    )
-    await expect(
-      setup.getByRole('heading', { name: 'Install manually' })
-    ).toBeVisible()
-    await expect(agentHeading).toBeVisible()
-
-    await setup.getByRole('tab', { name: 'Codex' }).click()
-    await expect(activePanel).toContainText(
-      `codex mcp add comfy-cloud --url ${MCP_ENDPOINT}`
-    )
-    await expect(agentHeading).toHaveCount(0)
-    await expect(setup.locator('video')).toBeVisible()
-
-    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 expect(agentHeading).toBeVisible()
-
-    await setup.getByRole('tab', { name: 'OpenClaw' }).click()
-    await expect(activePanel).toContainText(
-      'openclaw skills install @comfy-org/comfy'
-    )
-    await expect(agentHeading).toBeVisible()
-
-    await setup.getByRole('tab', { name: 'Others' }).click()
-    await expect(activePanel).toContainText('remote MCP server')
-    await expect(agentHeading).toBeVisible()
-  })
-
-  test('skills plugin link lives in the agent option card', async ({
-    page
-  }) => {
-    const setup = page.locator('#setup')
-    await setup.scrollIntoViewIfNeeded()
-    await selectClientTab(setup, 'Claude Code Terminal')
-    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.getByRole('heading', { name: '添加自定义连接器' })
-    ).toBeVisible()
-    await selectClientTab(setup, 'Claude Code Terminal')
-    await expect(setup.getByRole('heading', { name: '手动安装' })).toBeVisible()
-    await expect(setup.getByText(MCP_ENDPOINT, { exact: true })).toBeVisible()
-  })
-})
--- a/apps/website/public/icons/comfyicon.svg
+++ b/apps/website/public/icons/comfyicon.svg
@@ -1,4 +0,0 @@
-<svg width="275" height="275" viewBox="0 0 275 275" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="274.66" height="274.66" rx="63.5555" fill="#211927"/>
-<path d="M177.456 174.409C177.713 173.538 177.854 172.621 177.854 171.656C177.854 166.313 173.546 161.983 168.232 161.983H125.108C122.791 162.006 120.894 160.124 120.894 157.794C120.894 157.37 120.965 156.97 121.058 156.594L132.67 115.926C133.162 114.137 134.801 112.819 136.72 112.819L180.008 112.772C189.138 112.772 196.84 106.582 199.158 98.1335L205.666 75.4696C205.877 74.6695 205.994 73.7987 205.994 72.9279C205.994 67.6091 201.71 63.3022 196.419 63.3022H144.048C134.965 63.3022 127.286 69.4448 124.921 77.7996L120.52 93.2618C120.005 95.0269 118.389 96.3213 116.47 96.3213H103.898C94.8846 96.3213 87.276 102.346 84.8412 110.607L69.0152 166.172C68.7811 166.996 68.6641 167.89 68.6641 168.784C68.6641 174.127 72.9717 178.457 78.2861 178.457H90.6472C92.9649 178.457 94.8612 180.34 94.8612 182.693C94.8612 183.093 94.8144 183.494 94.6973 183.87L90.3194 199.191C90.1087 200.015 89.9683 200.862 89.9683 201.733C89.9683 207.052 94.2525 211.359 99.5434 211.359L151.938 211.312C161.045 211.312 168.724 205.145 171.065 196.744L177.432 174.433L177.456 174.409Z" fill="#F2FF59"/>
-</svg>
--- a/apps/website/public/videos/mcp/setup-claude-desktop-v1.mp4
+++ b/apps/website/public/videos/mcp/setup-claude-desktop-v1.mp4
--- a/apps/website/public/videos/mcp/setup-codex-oauth-v1.mp4
+++ b/apps/website/public/videos/mcp/setup-codex-oauth-v1.mp4
--- 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 { computed, reactive, watch } from 'vue'
+import { reactive, watch } from 'vue'

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

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

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

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

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

        <!-- Media: image or video -->
-        <!-- 620/364 and w-155 (620px) match the card media asset dimensions -->
        <div
          :class="
            cn(
-              'relative order-1 aspect-620/364 w-full lg:w-155 lg:shrink-0',
+              'order-1 flex lg:w-1/2',
              i % 2 === 0 ? 'lg:order-2' : 'lg:order-1'
            )
          "
@@ -88,12 +86,7 @@ const {
            :alt="row.media.alt ?? row.title"
            loading="lazy"
            decoding="async"
-            :class="
-              cn(
-                'absolute inset-0 size-full rounded-4xl',
-                row.media.fit === 'contain' ? 'object-contain' : 'object-cover'
-              )
-            "
+            class="aspect-4/3 w-full rounded-4xl object-cover"
          />
          <VideoPlayer
            v-else
@@ -106,13 +99,7 @@ const {
            :loop="row.media.loop"
            :minimal="row.media.minimal"
            :hide-controls="row.media.hideControls"
-            :fit="row.media.fit"
-            :class="
-              cn(
-                'absolute inset-0 size-full',
-                row.media.fit === 'contain' && 'bg-transparent'
-              )
-            "
+            class="w-full"
          />
        </div>
      </GlassCard>
--- a/apps/website/src/components/booking-confirmation/ResourceList.vue
+++ b/apps/website/src/components/booking-confirmation/ResourceList.vue
@@ -1,20 +0,0 @@
-<script setup lang="ts">
-const { resources } = defineProps<{
-  resources: { label: string; href: string; display: string }[]
-}>()
-</script>
-
-<template>
-  <ul class="flex flex-col gap-3 text-base font-light lg:text-lg">
-    <li v-for="resource in resources" :key="resource.href">
-      <span class="text-primary-comfy-canvas">{{ resource.label }}</span>
-      <span class="text-primary-warm-gray"> — </span>
-      <a
-        :href="resource.href"
-        class="text-primary-comfy-yellow underline underline-offset-4 hover:no-underline"
-      >
-        {{ resource.display }}
-      </a>
-    </li>
-  </ul>
-</template>
--- a/apps/website/src/components/common/SiteFooter.vue
+++ b/apps/website/src/components/common/SiteFooter.vue
@@ -85,7 +85,6 @@ 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 }
--- a/apps/website/src/components/common/VideoPlayer.vue
+++ b/apps/website/src/components/common/VideoPlayer.vue
@@ -10,7 +10,6 @@ import {
  whenever
 } from '@vueuse/core'
 import { computed, shallowRef, useTemplateRef, watch } from 'vue'
-import type { HTMLAttributes } from 'vue'

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

 const playerEl = useTemplateRef<HTMLDivElement>('playerEl')
@@ -95,28 +88,6 @@ watch(videoEl, syncNativeDuration)
 useEventListener(videoEl, 'loadedmetadata', syncNativeDuration)
 useEventListener(videoEl, 'durationchange', syncNativeDuration)

-// The muted attribute only sets defaultMuted, so SSR-rendered autoplay
-// videos count as unmuted and get blocked; force the property and kick
-// playback. Scoped to hideControls (decorative) clips so chrome-visible
-// consumers keep native semantics. flush: 'post' guarantees this runs
-// after useMediaControls' internal muted watcher on the same source.
-watch(
-  [videoEl, () => src],
-  ([el]) => {
-    if (!el || !autoplay || !hideControls) return
-    if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
-      el.pause()
-      return
-    }
-    el.muted = true
-    el.play().catch((error: unknown) => {
-      if (error instanceof Error && error.name === 'AbortError') return
-      console.warn('VideoPlayer autoplay failed', error)
-    })
-  },
-  { flush: 'post' }
-)
-
 const effectiveDuration = computed(() => duration.value || nativeDuration.value)

 // Scrubber (modeled after VueUse demo Scrubber.vue)
@@ -218,12 +189,7 @@ function toggleFullscreen() {
 <template>
  <div
    ref="playerEl"
-    :class="
-      cn(
-        'relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black',
-        className
-      )
-    "
+    class="relative aspect-video overflow-hidden rounded-4xl border border-white/10 bg-black"
    @pointermove="showControls"
    @pointerdown="showControls"
    @focusin="showControls"
@@ -231,10 +197,7 @@ function toggleFullscreen() {
    <video
      v-if="src"
      ref="videoEl"
-      :aria-label="ariaLabel"
-      :class="
-        cn('size-full', fit === 'contain' ? 'object-contain' : 'object-cover')
-      "
+      class="size-full object-cover"
      :src
      :poster
      :preload="autoplay ? 'auto' : 'metadata'"
--- a/apps/website/src/components/individual-submission/PlansPricingCta.vue
+++ b/apps/website/src/components/individual-submission/PlansPricingCta.vue
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-import Button from '../ui/button/Button.vue'
-
-const { href, label } = defineProps<{
-  href: string
-  label: string
-}>()
-</script>
-
-<template>
-  <div class="mt-2 flex justify-center">
-    <Button as="a" :href variant="default" size="lg">
-      {{ label }}
-    </Button>
-  </div>
-</template>
--- a/apps/website/src/components/legal/HeroSection.vue
+++ b/apps/website/src/components/legal/HeroSection.vue
@@ -1,25 +1,12 @@
 <script setup lang="ts">
-import type { HTMLAttributes } from 'vue'
-import { cn } from '@comfyorg/tailwind-utils'
-
-const { title, class: className } = defineProps<{
-  title: string
-  class?: HTMLAttributes['class']
-}>()
+const { title } = defineProps<{ title: string }>()
 </script>

 <template>
  <section
    class="flex items-center justify-center px-6 pt-20 pb-16 lg:pt-32 lg:pb-24"
  >
-    <h1
-      :class="
-        cn(
-          'text-4xl font-light text-primary-comfy-canvas lg:text-6xl',
-          className
-        )
-      "
-    >
+    <h1 class="text-primary-comfy-canvas text-4xl font-light lg:text-6xl">
      {{ title }}
    </h1>
  </section>
--- a/apps/website/src/components/ui/button/index.ts
+++ b/apps/website/src/components/ui/button/index.ts
@@ -20,8 +20,6 @@ export const buttonVariants = cva(
        link: "text-primary-comfy-yellow h-auto justify-start px-0 py-1 text-base uppercase hover:opacity-90 [&_svg:not([class*='size-'])]:size-6",
        underlineLink:
          "text-primary-comfy-yellow relative h-auto justify-start px-0 py-1 uppercase after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-full after:origin-left after:scale-x-0 after:bg-current after:transition-transform after:duration-200 hover:opacity-90 hover:after:scale-x-100 [&_svg:not([class*='size-'])]:size-6",
-        inline:
-          'text-primary-comfy-yellow inline h-auto rounded-none p-0 align-baseline text-sm font-normal tracking-normal whitespace-normal hover:opacity-90 [&>span]:top-0 [&>span]:underline',
        nav: 'text-primary-warm-white hover:text-primary-comfy-yellow h-auto justify-between px-0 py-1 text-start text-2xl font-medium',
        navMuted:
          'hover:text-primary-comfy-yellow h-auto w-full justify-between px-0 py-1 text-start text-2xl font-medium text-primary-comfy-canvas uppercase'
--- a/apps/website/src/config/routes.ts
+++ b/apps/website/src/config/routes.ts
@@ -21,8 +21,7 @@ const baseRoutes = {
  affiliateTerms: '/affiliates/terms',
  contact: '/contact',
  models: '/p/supported-models',
-  mcp: '/mcp',
-  brand: '/brand'
+  mcp: '/mcp'
 } as const

 type Routes = typeof baseRoutes
@@ -88,7 +87,6 @@ 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,7 +1,5 @@
 import type { LocalizedText } from '../i18n/translations'

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

+const BRAND_ASSETS_ZIP =
+  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
+
 export const affiliateBrandAssets: readonly AffiliateBrandAsset[] = [
  {
    id: 'core-logo',
--- a/apps/website/src/data/brandAssets.ts
+++ b/apps/website/src/data/brandAssets.ts
@@ -1,9 +0,0 @@
-// Shared brand download URLs served from the media bucket, used by both the
-// affiliate page and the brand portal.
-export const BRAND_ASSETS_ZIP =
-  'https://media.comfy.org/website/comfy-org-brand-assets.zip'
-
-// Brand guidelines live in Google Drive, shared to Comfy Org only, so Google
-// enforces the comfy.org sign-in. Opened in a new tab rather than downloaded.
-export const BRAND_GUIDELINES_PDF =
-  'https://drive.google.com/file/d/1EDt03JTfF_nbbY_H2n67aaUj6k11v3bS/view'
--- a/apps/website/src/data/brandColors.ts
+++ b/apps/website/src/data/brandColors.ts
@@ -1,91 +0,0 @@
-interface BrandColor {
-  name: string
-  hex: string
-  rgb: string
-  hsl: string
-  cmyk: string
-  swatchClass: string
-  textClass: string
-  wide?: boolean
-  border?: boolean
-}
-
-export const brandColors: readonly BrandColor[] = [
-  {
-    name: 'Comfy Yellow',
-    hex: '#F2FF59',
-    rgb: '242, 255, 89',
-    hsl: '65, 100, 67',
-    cmyk: '5, 0, 65, 0',
-    swatchClass: 'bg-primary-comfy-yellow',
-    textClass: 'text-primary-comfy-ink',
-    wide: true
-  },
-  {
-    name: 'Comfy Ink',
-    hex: '#211927',
-    rgb: '33, 25, 39',
-    hsl: '274, 22, 13',
-    cmyk: '15, 36, 0, 85',
-    swatchClass: 'bg-primary-comfy-ink',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Comfy Canvas',
-    hex: '#C2BFB9',
-    rgb: '194, 191, 185',
-    hsl: '40, 7, 74',
-    cmyk: '0, 2, 5, 24',
-    swatchClass: 'bg-primary-comfy-canvas',
-    textClass: 'text-primary-comfy-ink'
-  },
-  {
-    name: 'Comfy Plum',
-    hex: '#49378B',
-    rgb: '73, 55, 139',
-    hsl: '253, 43, 38',
-    cmyk: '47, 60, 0, 45',
-    swatchClass: 'bg-primary-comfy-plum',
-    textClass: 'text-primary-comfy-canvas'
-  },
-  {
-    name: 'Warm White',
-    hex: '#F0EFED',
-    rgb: '240, 239, 237',
-    hsl: '40, 9, 94',
-    cmyk: '0, 0, 1, 6',
-    swatchClass: 'bg-primary-warm-white',
-    textClass: 'text-primary-comfy-ink',
-    wide: true
-  },
-  {
-    name: 'Warm Gray',
-    hex: '#7E7C78',
-    rgb: '126, 124, 120',
-    hsl: '40, 2, 48',
-    cmyk: '0, 2, 5, 51',
-    swatchClass: 'bg-primary-warm-gray',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Cool Gray',
-    hex: '#3C3C3C',
-    rgb: '60, 60, 60',
-    hsl: '0, 0, 24',
-    cmyk: '0, 0, 0, 76',
-    swatchClass: 'bg-secondary-cool-gray',
-    textClass: 'text-primary-warm-white',
-    border: true
-  },
-  {
-    name: 'Mauve',
-    hex: '#4D3762',
-    rgb: '77, 55, 98',
-    hsl: '271, 28, 30',
-    cmyk: '21, 44, 0, 62',
-    swatchClass: 'bg-secondary-mauve',
-    textClass: 'text-primary-warm-white'
-  }
-] as const
--- a/apps/website/src/i18n/translations.ts
+++ b/apps/website/src/i18n/translations.ts
@@ -83,8 +83,8 @@ const translations = {
      '如果您是 ComfyUI 新手，可以从 App 模式开始——这是工作流的简化视图。您随时可以切换回节点图视图以深入了解。'
  },
  'showcase.feature3.title': {
-    en: 'Community Workflows on Comfy Workflows',
-    'zh-CN': 'Comfy Workflows 上的社区工作流'
+    en: 'Community Workflows on Comfy Hub',
+    'zh-CN': 'Comfy Hub 上的社区工作流'
  },
  'showcase.feature3.description': {
    en: 'Browse and remix thousands of community-shared workflows. Start from a proven template and customize it to your needs.',
@@ -1864,26 +1864,10 @@ const translations = {
    'zh-CN':
      'Comfy MCP 通过模型上下文协议暴露完整的 ComfyUI 引擎——让你的助手能够接入生态系统、构建工作流，并生成图像、视频、音频或 3D 内容。'
  },
-  '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': {
+  'mcp.hero.demoPrompt': {
    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': '查看文档'
@@ -1892,6 +1876,10 @@ const translations = {
    en: 'INSTALL MCP',
    'zh-CN': '安装 MCP'
  },
+  'mcp.hero.runWorkflow': {
+    en: 'RUN A WORKFLOW',
+    'zh-CN': '运行工作流'
+  },
  'mcp.hero.demoGenerate': {
    en: 'GENERATE',
    'zh-CN': '生成'
@@ -1909,100 +1897,60 @@ const translations = {
    'zh-CN': '放大图像'
  },

-  // MCP – SetupSection
+  // MCP – SetupStepsSection
  'mcp.setup.label': {
    en: 'GET STARTED',
    'zh-CN': '快速开始'
  },
  'mcp.setup.heading': {
-    en: 'Set up Comfy MCP',
-    'zh-CN': '配置 Comfy MCP'
+    en: 'Set up Comfy MCP in three steps',
+    'zh-CN': '三步完成 Comfy MCP 配置'
  },
  'mcp.setup.subtitle': {
-    en: 'Two ways to connect: add the server yourself, or ask your agent to install it. Sign in once, and the full ComfyUI toolset is available right in your chat.',
+    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.',
    'zh-CN':
-      '两种接入方式：自行添加服务器，或让你的智能体自动安装。登录一次，ComfyUI 全套工具即可直接在对话中使用。'
+      '将 Comfy Cloud 添加为 Claude、Cursor、Codex 或任意兼容 MCP 客户端的自定义连接器。登录一次，ComfyUI 全套工具即可直接在对话中使用。'
  },
-  'mcp.setup.manual.title': {
-    en: 'Install manually',
-    'zh-CN': '手动安装'
-  },
-  'mcp.setup.manual.description': {
-    en: 'Add this URL as a custom connector or remote MCP server in your client, then sign in when prompted.',
-    'zh-CN':
-      '将此 URL 添加为客户端的自定义连接器或远程 MCP 服务器，然后按提示登录。'
-  },
-  'mcp.setup.manual.tabsLabel': {
-    en: 'Pick your client',
-    'zh-CN': '选择你的客户端'
-  },
-  'mcp.setup.agent.title': {
+  'mcp.setup.step1.label': { en: 'STEP 1', 'zh-CN': '第 1 步' },
+  'mcp.setup.step1.title': {
    en: 'Ask your agent to install Comfy MCP',
    'zh-CN': '让你的智能体安装 Comfy MCP'
  },
-  'mcp.setup.agent.command': {
+  'mcp.setup.step1.command': {
    en: 'Help me install Comfy MCP.\nFollow the setup guide at {url}',
    'zh-CN': '帮我安装 Comfy MCP。\n请按照 {url} 上的设置指南操作。'
  },
-  'mcp.setup.agent.description': {
-    en: 'Prefer to let your agent do it? Paste this into Claude, Cursor, Codex, or any MCP-compatible agent. It reads the docs and adds the connector for you.',
+  'mcp.setup.step1.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 的智能体中。它会读取文档并为你添加连接器。'
+      '将它粘贴到 Claude、Cursor、Codex 或任意兼容 MCP 的智能体中。它会读取文档并为你添加连接器。'
  },
-  '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.step2.label': { en: 'STEP 2', 'zh-CN': '第 2 步' },
+  'mcp.setup.step2.title': {
+    en: 'Or add it by hand',
+    'zh-CN': '或手动添加'
  },
-  'mcp.setup.walkthroughAlt': {
-    en: '{client} setup walkthrough',
-    'zh-CN': '{client} 设置演示'
-  },
-  'mcp.setup.clients.claudeDesktop.manualTitle': {
-    en: 'Add Custom Connector',
-    'zh-CN': '添加自定义连接器'
-  },
-  'mcp.setup.clients.claudeDesktop.step': {
-    en: 'Click Customize in the sidebar, open Connectors, choose Add custom connector, paste the URL above, and sign in.',
+  'mcp.setup.step2.description': {
+    en: 'Prefer manual setup? Add Comfy Cloud as a custom connector with the MCP URL. The docs cover every client.',
    'zh-CN':
-      '点击侧边栏的 Customize，进入 Connectors，选择添加自定义连接器，粘贴上方 URL 并登录。'
+      '想手动配置？用 MCP URL 将 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.step2.cta': {
+    en: 'COMFY CLOUD MCP DOCS',
+    'zh-CN': 'COMFY CLOUD MCP 文档'
  },
-  'mcp.setup.clients.cursor.linkLabel': {
-    en: 'platform.comfy.org',
-    'zh-CN': 'platform.comfy.org'
+  'mcp.setup.step3.label': { en: 'STEP 3', 'zh-CN': '第 3 步' },
+  'mcp.setup.step3.title': {
+    en: 'Connect and sign in',
+    'zh-CN': '连接并登录'
  },
-  '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.step3.description': {
+    en: 'Click Connect, sign in, and every Comfy Cloud skill is ready in your client.',
+    'zh-CN': '点击"连接"并登录，所有 Comfy Cloud 技能即可在你的客户端中使用。'
  },
-  'mcp.setup.clients.openclaw.step': {
-    en: 'Run these in your terminal, then openclaw mcp login comfy to sign in.',
-    'zh-CN': '在终端运行以下命令，然后执行 openclaw mcp login comfy 登录。'
-  },
-  'mcp.setup.clients.other.name': {
-    en: 'Others',
-    '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.setup.step3.cta': {
+    en: 'COMFY CLOUD SKILLS',
+    'zh-CN': 'COMFY CLOUD 技能'
  },

  // MCP – WhyBuildSection
@@ -2023,9 +1971,9 @@ const translations = {
    'zh-CN': '开放协议，\n任意客户端。'
  },
  'mcp.why.1.description': {
-    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.',
+    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.',
    'zh-CN':
-      'MCP 是开放标准，因此任何兼容 MCP 的客户端都能接入。Claude Code、Claude Desktop 和 Codex 通过 OAuth 登录，其他智能体使用 API 密钥连接。'
+      'MCP 是开放标准，因此任何兼容 MCP 的客户端都能接入。目前 Comfy 支持 Claude Code 和 Claude Desktop，更多客户端即将推出。'
  },
  'mcp.why.2.title': {
    en: 'The full engine,\nnot a sandbox.',
@@ -2089,53 +2037,14 @@ const translations = {
    'zh-CN': '运行真实工作流'
  },
  'mcp.tools.3.description': {
-    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.',
+    en: 'Turn any ComfyUI workflow into a callable tool. The full power of the engine, driven by your agent.',
    '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': {
@@ -2182,81 +2091,71 @@ const translations = {
    'zh-CN': '支持哪些客户端？'
  },
  'mcp.faq.1.a': {
-    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.",
+    en: 'Claude Code and Claude Desktop today, both signing in with OAuth. Support for more clients is coming.',
    'zh-CN':
-      '对于 Claude Code、Claude Desktop 或 Codex，在任意客户端中将 https://cloud.comfy.org/mcp 添加为自定义连接器或远程 MCP 服务器，然后在提示时登录。\n对于不支持 OAuth 的客户端，请使用 Comfy API 密钥连接。将文档 https://docs.comfy.org/agent-tools/cloud 发送给你的智能体，它会为你完成安装。'
+      '目前支持 Claude Code 和 Claude Desktop，均通过 OAuth 登录。更多客户端的支持即将推出。'
  },
  '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.3.a': {
-    en: 'Not for Claude Code, Claude Desktop, Codex, or OpenClaw. You need a Comfy API key for Cursor and Hermes for now. Just copy https://docs.comfy.org/agent-tools/cloud and your agent will figure out the installation for you.',
+  '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、Codex 和 OpenClaw 不需要。Cursor 和 Hermes 目前需要 Comfy API 密钥。只需复制 https://docs.comfy.org/agent-tools/cloud，你的智能体就会为你完成安装。'
+      '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.',
+    'zh-CN':
+      '不可以。斜杠命令包含在 Claude Code 插件中。Claude Desktop 连接的是同一个 MCP 服务器，因此工具可以正常使用；直接用自然语言提问即可。'
  },
  'mcp.faq.4.q': {
-    en: 'Does it cost anything?',
-    'zh-CN': '需要付费吗？'
+    en: "The sign-in didn't open a browser.",
+    'zh-CN': '登录时没有打开浏览器。'
  },
  'mcp.faq.4.a': {
-    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.",
+    en: 'In Claude Code, run /mcp, select comfy-cloud, and choose Authenticate. In Claude Desktop, reopen the connector from Customize → Connectors.',
    'zh-CN':
-      '使用 Comfy 账户连接是免费的，搜索模型、节点和模板也不消耗积分。运行生成会使用 Comfy Cloud 积分，需要订阅或积分余额。智能体在消费前会先与你确认。'
+      '在 Claude Code 中，运行 /mcp，选择 comfy-cloud，然后选择 Authenticate（授权）。在 Claude Desktop 中，从“自定义 → 连接器”重新打开该连接器。'
  },
  'mcp.faq.5.q': {
-    en: 'Can I use it with my local ComfyUI?',
-    'zh-CN': '可以配合我的本地 ComfyUI 使用吗？'
+    en: 'How do I connect in Claude Code?',
+    'zh-CN': '如何在 Claude Code 中连接？'
  },
  'mcp.faq.5.a': {
-    en: 'Coming soon. Today, to drive a local ComfyUI, you can use comfy-cli: https://github.com/Comfy-Org/comfy-cli',
+    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.',
    'zh-CN':
-      '即将推出。目前，若要操作本地 ComfyUI，你可以使用 comfy-cli：https://github.com/Comfy-Org/comfy-cli'
+      '添加插件市场并安装 comfy-cloud 插件，然后运行 /mcp → comfy-cloud → Authenticate（授权）。一步即可添加连接和斜杠命令。'
  },
  '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.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——包括所有开源工作流以及 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.',
+    en: 'Generate images, video, audio, and 3D; search models, nodes, and templates; and run ComfyUI workflows, all from a chat.',
    'zh-CN':
-      '保存到你的 Comfy Cloud 资产库，你可以复用、二次创作和分享——还能在画布上打开任意运行继续编辑。你也可以让智能体把资产下载到本地。'
+      '生成图像、视频、音频和 3D；搜索模型、节点和模板；并运行 ComfyUI 工作流——全部在对话中完成。'
  },
  '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.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 账户的人都可以使用。'
+  'mcp.faq.8.a': {
+    en: 'Comfy Cloud MCP is in open beta and available to everyone.',
+    'zh-CN': 'Comfy Cloud MCP 目前处于公开测试阶段，所有人均可使用。'
  },

  // SiteNav
@@ -2272,7 +2171,7 @@ const translations = {
    en: 'Comfy Enterprise',
    'zh-CN': 'Comfy 企业版'
  },
-  'nav.comfyHub': { en: 'Comfy Workflows', 'zh-CN': 'Comfy Workflows' },
+  'nav.comfyHub': { en: 'Comfy Hub', 'zh-CN': 'Comfy Hub' },
  'nav.gallery': { en: 'Gallery', 'zh-CN': '画廊' },
  'nav.learning': { en: 'Learning', 'zh-CN': '学习' },
  'nav.blogs': { en: 'Blog', 'zh-CN': '博客' },
@@ -2282,7 +2181,6 @@ 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': '下载桌面版' },
@@ -4302,8 +4200,8 @@ const translations = {
    'zh-CN': '{count} 个工作流'
  },
  'models.list.contact.label': {
-    en: 'COMFY WORKFLOWS',
-    'zh-CN': 'COMFY WORKFLOWS'
+    en: 'COMFY HUB',
+    'zh-CN': 'COMFY HUB'
  },
  'models.showcase.label': { en: 'AI MODELS', 'zh-CN': 'AI 模型' },
  'models.showcase.heading': {
@@ -4339,9 +4237,9 @@ const translations = {
    'zh-CN': 'Wan 2.2\n文字转视频'
  },
  'models.list.contact.heading': {
-    en: 'Pick a model and explore what the community has built. <a href="https://comfy.org/workflows" target="_blank" rel="noopener noreferrer" class="text-primary-comfy-yellow underline">Browse Comfy Workflows</a> for the newest workflows.',
+    en: 'Pick a model and explore what the community has built. <a href="https://comfy.org/workflows" target="_blank" rel="noopener noreferrer" class="text-primary-comfy-yellow underline">Browse Comfy Hub</a> for the newest workflows.',
    'zh-CN':
-      '选择一个模型，浏览社区的创作成果。<a href="https://comfy.org/workflows" target="_blank" rel="noopener noreferrer" class="text-primary-comfy-yellow underline">访问 Comfy Workflows</a> 查看最新工作流。'
+      '选择一个模型，浏览社区的创作成果。<a href="https://comfy.org/workflows" target="_blank" rel="noopener noreferrer" class="text-primary-comfy-yellow underline">访问 Comfy Hub</a> 查看最新工作流。'
  },

  // Payment status pages
@@ -4548,161 +4446,6 @@ 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/booking-confirmation.astro
+++ b/apps/website/src/pages/booking-confirmation.astro
@@ -1,54 +0,0 @@
---
-import BaseLayout from '../layouts/BaseLayout.astro'
-import ResourceList from '../components/booking-confirmation/ResourceList.vue'
-import HeroSection from '../components/legal/HeroSection.vue'
-import { externalLinks, getRoutes } from '../config/routes'
-
-const routes = getRoutes('en')
-
-const resources = [
-  {
-    label: 'Learning Center',
-    href: routes.learning,
-    display: 'comfy.org/learning'
-  },
-  {
-    label: 'Workflow templates',
-    href: externalLinks.workflows,
-    display: 'comfy.org/workflows'
-  },
-  {
-    label: 'Customer stories',
-    href: routes.customers,
-    display: 'comfy.org/customers'
-  },
-  {
-    label: 'Docs',
-    href: externalLinks.docs,
-    display: 'docs.comfy.org'
-  }
-]
---
-
-<BaseLayout
-  title="You're booked - Comfy"
-  description="Your meeting is booked. Check your email for the calendar invite and meeting link."
-  noindex
->
-  <HeroSection title="You're booked." class="text-center" />
-
-  <section class="-mt-8 px-6 pb-24 lg:-mt-12 lg:pb-40">
-    <div
-      class="text-primary-comfy-canvas mx-auto flex max-w-2xl flex-col gap-10 text-center text-base font-light lg:text-lg"
-    >
-      <p>Check your email for the calendar invite and meeting link!</p>
-
-      <div class="flex flex-col gap-4">
-        <h2 class="text-primary-comfy-yellow text-xl font-semibold italic lg:text-2xl">
-          Resources while you wait
-        </h2>
-        <ResourceList resources={resources} />
-      </div>
-    </div>
-  </section>
-</BaseLayout>
--- a/apps/website/src/pages/brand.astro
+++ b/apps/website/src/pages/brand.astro
@@ -1,28 +0,0 @@
---
-import BaseLayout from '../layouts/BaseLayout.astro'
-import BrandBackground from '../templates/brand/BrandBackground.vue'
-import BrandHeroSection from '../templates/brand/BrandHeroSection.vue'
-import BrandLogosSection from '../templates/brand/BrandLogosSection.vue'
-import BrandColorSection from '../templates/brand/BrandColorSection.vue'
-import BrandVoiceSection from '../templates/brand/BrandVoiceSection.vue'
-import BrandTrademarkSection from '../templates/brand/BrandTrademarkSection.vue'
-import BrandQuestionsSection from '../templates/brand/BrandQuestionsSection.vue'
-import { t } from '../i18n/translations'
-
-const locale = 'en' as const
---
-
-<BaseLayout
-  title={t('brand.page.title', locale)}
-  description={t('brand.page.description', locale)}
->
-  <div class="relative">
-    <BrandBackground client:idle />
-    <BrandHeroSection />
-    <BrandLogosSection />
-    <BrandColorSection client:visible />
-    <BrandVoiceSection />
-    <BrandTrademarkSection />
-    <BrandQuestionsSection />
-  </div>
-</BaseLayout>
--- a/apps/website/src/pages/download.astro
+++ b/apps/website/src/pages/download.astro
@@ -12,7 +12,6 @@ import {
  absoluteUrl,
  comfyUiApplicationNode,
  comfyUiSoftwareId,
-  comfyUiSourceCodeNode,
  pageContext,
 } from '../utils/jsonLd'

@@ -31,7 +30,7 @@ const { siteUrl, locale } = pageContext(
    { name: t('breadcrumb.home', locale), url: absoluteUrl(Astro.site, '/') },
    { name: t('breadcrumb.download', locale) },
  ]}
-  extraJsonLd={[comfyUiApplicationNode(siteUrl), comfyUiSourceCodeNode(siteUrl)]}
+  extraJsonLd={[comfyUiApplicationNode(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/individual-submission.astro
+++ b/apps/website/src/pages/individual-submission.astro
@@ -1,60 +0,0 @@
---
-import BaseLayout from '../layouts/BaseLayout.astro'
-import PlansPricingCta from '../components/individual-submission/PlansPricingCta.vue'
-import HeroSection from '../components/legal/HeroSection.vue'
-import { getRoutes } from '../config/routes'
-
-const routes = getRoutes('en')
---
-
-<BaseLayout
-  title="Thanks for reaching out - Comfy"
-  description="Thanks for reaching out. Based on what you shared, one of our self-serve plans is probably a better fit."
-  noindex
->
-  <HeroSection title="Thanks for reaching out." class="text-center" />
-
-  <section class="-mt-8 px-6 pb-24 lg:-mt-12 lg:pb-40">
-    <div
-      class="text-primary-comfy-canvas mx-auto flex max-w-2xl flex-col gap-6 text-center text-base font-light lg:text-lg"
-    >
-      <p>
-        Based on what you shared, one of our self-serve plans is probably a
-        better fit.
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Standard</strong
-        >,
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Creator</strong
-        >, and
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Pro</strong
-        > for individual creators, plus our new
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Teams</strong
-        > plan for multiple users under shared billing.
-      </p>
-
-      <PlansPricingCta
-        href={routes.cloudPricing}
-        label="See plans and pricing →"
-      />
-
-      <p class="text-primary-warm-gray mt-8 text-sm">
-        Still think you have an enterprise need?<br /> We're happy to assist. Email: <a
-          href="mailto:gtm-team@comfy.org"
-          class="text-primary-comfy-yellow whitespace-nowrap underline underline-offset-4 hover:no-underline"
-          >gtm-team@comfy.org</a
-        >
-      </p>
-
-      <p class="text-primary-warm-gray text-sm">
-        Need help with something else? Email: <a
-          href="mailto:support@comfy.org"
-          class="text-primary-comfy-yellow whitespace-nowrap underline underline-offset-4 hover:no-underline"
-          >support@comfy.org</a
-        >
-      </p>
-    </div>
-  </section>
-</BaseLayout>
--- a/apps/website/src/pages/p/supported-models/[slug].astro
+++ b/apps/website/src/pages/p/supported-models/[slug].astro
@@ -44,7 +44,7 @@ const dirDescriptions: Record<string, string> = {
 }

 const dirDesc = dirDescriptions[model.directory] ?? 'an AI model'
-const whatIsDescription = `${displayName} is ${dirDesc}. You can run it locally in ComfyUI with full control over every parameter, or access it through Comfy Cloud. ComfyUI's node-based workflow editor lets you connect ${displayName} with ControlNets, LoRAs, upscalers, and custom nodes to build any pipeline you need. There are ${model.workflowCount} community workflow templates using ${displayName} on Comfy Workflows, ready to load and customize.`
+const whatIsDescription = `${displayName} is ${dirDesc}. You can run it locally in ComfyUI with full control over every parameter, or access it through Comfy Cloud. ComfyUI's node-based workflow editor lets you connect ${displayName} with ControlNets, LoRAs, upscalers, and custom nodes to build any pipeline you need. There are ${model.workflowCount} community workflow templates using ${displayName} on Comfy Hub, ready to load and customize.`

 const pageTitle = `${displayName} in ComfyUI`
 const pageDescription = `Run ${displayName} in ComfyUI with full parameter control. ${model.workflowCount} community workflow templates, step-by-step tutorials, and free local inference.`
@@ -87,7 +87,7 @@ const faqPage: JsonLdNode = {
      name: `How many ComfyUI workflows use ${displayName}?`,
      acceptedAnswer: {
        '@type': 'Answer',
-        text: `There are ${model.workflowCount} community workflow templates that use ${displayName} on Comfy Workflows. Each template is ready to run in ComfyUI and can be customized to suit your project.`,
+        text: `There are ${model.workflowCount} community workflow templates that use ${displayName} on Comfy Hub. Each template is ready to run in ComfyUI and can be customized to suit your project.`,
      },
    },
    {
--- a/apps/website/src/pages/zh-CN/booking-confirmation.astro
+++ b/apps/website/src/pages/zh-CN/booking-confirmation.astro
@@ -1,54 +0,0 @@
---
-import BaseLayout from '../../layouts/BaseLayout.astro'
-import ResourceList from '../../components/booking-confirmation/ResourceList.vue'
-import HeroSection from '../../components/legal/HeroSection.vue'
-import { externalLinks, getRoutes } from '../../config/routes'
-
-const routes = getRoutes('zh-CN')
-
-const resources = [
-  {
-    label: '学习中心',
-    href: routes.learning,
-    display: 'comfy.org/learning'
-  },
-  {
-    label: '工作流模板',
-    href: externalLinks.workflows,
-    display: 'comfy.org/workflows'
-  },
-  {
-    label: '客户案例',
-    href: routes.customers,
-    display: 'comfy.org/customers'
-  },
-  {
-    label: '文档',
-    href: externalLinks.docs,
-    display: 'docs.comfy.org'
-  }
-]
---
-
-<BaseLayout
-  title="预约成功 - Comfy"
-  description="您的会议已预约成功。请查收邮件中的日历邀请和会议链接。"
-  noindex
->
-  <HeroSection title="预约成功。" class="text-center" />
-
-  <section class="-mt-8 px-6 pb-24 lg:-mt-12 lg:pb-40">
-    <div
-      class="text-primary-comfy-canvas mx-auto flex max-w-2xl flex-col gap-10 text-center text-base font-light lg:text-lg"
-    >
-      <p>请查收邮件中的日历邀请和会议链接！</p>
-
-      <div class="flex flex-col gap-4">
-        <h2 class="text-primary-comfy-yellow text-xl font-semibold italic lg:text-2xl">
-          等待期间的资源
-        </h2>
-        <ResourceList resources={resources} />
-      </div>
-    </div>
-  </section>
-</BaseLayout>
--- a/apps/website/src/pages/zh-CN/brand.astro
+++ b/apps/website/src/pages/zh-CN/brand.astro
@@ -1,26 +0,0 @@
---
-import BaseLayout from '../../layouts/BaseLayout.astro'
-import BrandBackground from '../../templates/brand/BrandBackground.vue'
-import BrandHeroSection from '../../templates/brand/BrandHeroSection.vue'
-import BrandLogosSection from '../../templates/brand/BrandLogosSection.vue'
-import BrandColorSection from '../../templates/brand/BrandColorSection.vue'
-import BrandVoiceSection from '../../templates/brand/BrandVoiceSection.vue'
-import BrandTrademarkSection from '../../templates/brand/BrandTrademarkSection.vue'
-import BrandQuestionsSection from '../../templates/brand/BrandQuestionsSection.vue'
-import { t } from '../../i18n/translations'
---
-
-<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/download.astro
+++ b/apps/website/src/pages/zh-CN/download.astro
@@ -12,7 +12,6 @@ import {
  absoluteUrl,
  comfyUiApplicationNode,
  comfyUiSoftwareId,
-  comfyUiSourceCodeNode,
  pageContext,
 } from '../../utils/jsonLd'

@@ -34,7 +33,7 @@ const { siteUrl, locale } = pageContext(
    },
    { name: t('breadcrumb.download', locale) },
  ]}
-  extraJsonLd={[comfyUiApplicationNode(siteUrl), comfyUiSourceCodeNode(siteUrl)]}
+  extraJsonLd={[comfyUiApplicationNode(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/individual-submission.astro
+++ b/apps/website/src/pages/zh-CN/individual-submission.astro
@@ -1,57 +0,0 @@
---
-import BaseLayout from '../../layouts/BaseLayout.astro'
-import PlansPricingCta from '../../components/individual-submission/PlansPricingCta.vue'
-import HeroSection from '../../components/legal/HeroSection.vue'
-import { getRoutes } from '../../config/routes'
-
-const routes = getRoutes('zh-CN')
---
-
-<BaseLayout
-  title="感谢您的联系 - Comfy"
-  description="感谢您的联系。根据您提供的信息，我们的自助服务套餐之一可能更适合您。"
-  noindex
->
-  <HeroSection title="感谢您的联系。" class="text-center" />
-
-  <section class="-mt-8 px-6 pb-24 lg:-mt-12 lg:pb-40">
-    <div
-      class="text-primary-comfy-canvas mx-auto flex max-w-2xl flex-col gap-6 text-center text-base font-light lg:text-lg"
-    >
-      <p>
-        根据您提供的信息，我们的自助服务套餐之一可能更适合您。面向个人创作者的
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Standard</strong
-        >、
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Creator</strong
-        >
-        和
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Pro</strong
-        >，以及我们全新的
-        <strong class="text-primary-comfy-yellow font-semibold italic">
-          Teams</strong
-        > 套餐，可让多位用户共享账单。
-      </p>
-
-      <PlansPricingCta href={routes.cloudPricing} label="查看套餐与价格 →" />
-
-      <p class="text-primary-warm-gray mt-8 text-sm">
-        仍然认为您有企业级需求？我们很乐意为您提供帮助。邮箱：<a
-          href="mailto:gtm-team@comfy.org"
-          class="text-primary-comfy-yellow whitespace-nowrap underline underline-offset-4 hover:no-underline"
-          >gtm-team@comfy.org</a
-        >
-      </p>
-
-      <p class="text-primary-warm-gray text-sm">
-        需要其他方面的帮助？邮箱：<a
-          href="mailto:support@comfy.org"
-          class="text-primary-comfy-yellow whitespace-nowrap underline underline-offset-4 hover:no-underline"
-          >support@comfy.org</a
-        >
-      </p>
-    </div>
-  </section>
-</BaseLayout>
--- a/apps/website/src/scripts/posthog.test.ts
+++ b/apps/website/src/scripts/posthog.test.ts
@@ -78,28 +78,3 @@ describe('captureDownloadClick', () => {
    expect(hoisted.mockCapture).not.toHaveBeenCalled()
  })
 })
-
-describe('captureMcpClientTabClick', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.resetModules()
-  })
-
-  it('captures the tab click with the client id', async () => {
-    const { initPostHog, captureMcpClientTabClick } = await import('./posthog')
-    initPostHog()
-    captureMcpClientTabClick('claude-code')
-
-    expect(hoisted.mockCapture).toHaveBeenCalledWith(
-      'website:mcp_client_tab_clicked',
-      { client: 'claude-code' }
-    )
-  })
-
-  it('does not capture before PostHog is initialized', async () => {
-    const { captureMcpClientTabClick } = await import('./posthog')
-    captureMcpClientTabClick('cursor')
-
-    expect(hoisted.mockCapture).not.toHaveBeenCalled()
-  })
-})
--- a/apps/website/src/scripts/posthog.ts
+++ b/apps/website/src/scripts/posthog.ts
@@ -49,12 +49,3 @@ export function captureDownloadClick(platform: Platform) {
    console.error('PostHog download click capture failed', error)
  }
 }
-
-export function captureMcpClientTabClick(client: string) {
-  if (!initialized) return
-  try {
-    posthog.capture('website:mcp_client_tab_clicked', { client })
-  } catch (error) {
-    console.error('PostHog MCP client tab capture failed', error)
-  }
-}
--- a/apps/website/src/templates/brand/BrandBackground.vue
+++ b/apps/website/src/templates/brand/BrandBackground.vue
@@ -1,112 +0,0 @@
-<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
@@ -1,93 +0,0 @@
-<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
@@ -1,55 +0,0 @@
-<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
@@ -1,58 +0,0 @@
-<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
@@ -1,33 +0,0 @@
-<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
@@ -1,37 +0,0 @@
-<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
@@ -1,100 +0,0 @@
-<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,40 +7,35 @@ 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,
@@ -70,15 +65,15 @@ function schedule(fn: () => void, ms: number) {
  }, ms)
 }

-function typePrompt(prompt: string, onDone: () => void) {
+function typePrompt(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
@@ -99,8 +94,8 @@ function revealNextCard() {
    return
  }

-  // Type the next card's prompt, then slide that card in
-  typePrompt(t(cards[visibleCount.value].promptKey, locale), () => {
+  // Type the prompt, then slide in the next card
+  typePrompt(() => {
    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, 9] as const
+const faqNumbers = [1, 2, 3, 4, 5, 6, 7, 8] 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,10 +11,9 @@ 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-[calc(100svh-5rem)] lg:min-h-[calc(100svh-6.75rem)]"
+    class="min-h-screen"
    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.installMcp"
+    :primary-cta="ctas.runWorkflow"
    :secondary-cta="ctas.docs"
  />
 </template>
--- a/apps/website/src/templates/mcp/SetupSection.vue
+++ b/apps/website/src/templates/mcp/SetupSection.vue
@@ -1,248 +1,69 @@
 <script setup lang="ts">
-import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'reka-ui'
-import { computed, ref } from 'vue'
+import { ArrowUpRight } from '@lucide/vue'

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

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

-const agentCommand = t('mcp.setup.agent.command', locale).replace(
-  '{url}',
-  externalLinks.docsMcp
-)
-
-interface McpClient {
-  id: string
-  name: string
-  step: string
-  command?: string
-  link?: { label: string; href: string }
-  manualTitle?: string
-  showAgentCard: boolean
-  // Walkthrough clip shown in place of the agent card (source: docs.comfy.org/agent-tools/mcp)
-  video?: string
-}
-
-const clients: McpClient[] = [
+const cards: FeatureCard[] = [
  {
-    id: 'claude-desktop',
-    name: 'Claude Desktop',
-    step: t('mcp.setup.clients.claudeDesktop.step', locale),
-    manualTitle: t('mcp.setup.clients.claudeDesktop.manualTitle', locale),
-    showAgentCard: false,
-    video: '/videos/mcp/setup-claude-desktop-v1.mp4'
+    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 Terminal',
-    step: t('mcp.setup.clients.claudeCode.step', locale),
-    command: `claude mcp add --transport http comfy-cloud ${externalLinks.mcpEndpoint}`,
-    showAgentCard: true
+    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}`,
-    showAgentCard: false,
-    video: '/videos/mcp/setup-codex-oauth-v1.mp4'
-  },
-  {
-    id: 'cursor',
-    name: 'Cursor',
-    step: t('mcp.setup.clients.cursor.step', locale),
-    link: {
-      label: t('mcp.setup.clients.cursor.linkLabel', locale),
-      href: externalLinks.apiKeys
-    },
-    showAgentCard: true
-  },
-  {
-    id: 'openclaw',
-    name: 'OpenClaw',
-    step: t('mcp.setup.clients.openclaw.step', locale),
-    command: `openclaw skills install @comfy-org/comfy\nopenclaw mcp set comfy '{"url":"${externalLinks.mcpEndpoint}","transport":"streamable-http","auth":"oauth"}'`,
-    showAgentCard: true
-  },
-  {
-    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
-    },
-    showAgentCard: true
+    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'
+    }
  }
 ]
-
-const activeClientId = ref(clients[0].id)
-const activeClient = computed(
-  () =>
-    clients.find((client) => client.id === activeClientId.value) ?? clients[0]
-)
-const manualTitle = computed(
-  () => activeClient.value.manualTitle ?? t('mcp.setup.manual.title', locale)
-)
-
-// reka-ui re-emits update:modelValue even when the value is unchanged
-// (re-clicking the active tab), so dedupe before capturing.
-let lastTrackedClientId: string | undefined
-function onClientTabChange(value: string | number | undefined) {
-  if (!value) return
-  const id = String(value)
-  if (id === lastTrackedClientId) return
-  lastTrackedClientId = id
-  captureMcpClientTabClick(id)
-}
-
-const walkthroughLabel = computed(() =>
-  t('mcp.setup.walkthroughAlt', locale).replace(
-    '{client}',
-    activeClient.value.name
-  )
-)
-
-const copyLabel = t('ui.copy', locale)
-const copiedLabel = t('ui.copied', locale)
 </script>

 <template>
-  <section
+  <FeatureGrid01
    id="setup"
-    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>
-
-    <TabsRoot
-      v-model="activeClientId"
-      activation-mode="manual"
-      class="mt-10 block"
-      @update:model-value="onClientTabChange"
-    >
-      <TabsList
-        :aria-label="t('mcp.setup.manual.tabsLabel', locale)"
-        class="grid grid-cols-1 gap-px rounded-2xl border border-white/15 bg-primary-comfy-ink p-1 min-[360px]:grid-cols-2 lg:inline-flex lg:flex-nowrap"
-      >
-        <TabsTrigger
-          v-for="client in clients"
-          :key="client.id"
-          :value="client.id"
-          class="focus-visible:ring-primary-comfy-yellow/50 data-[state=active]:bg-primary-comfy-yellow shrink-0 cursor-pointer rounded-lg bg-white/8 px-2 py-2.5 text-[10px] font-bold tracking-wider whitespace-nowrap 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 lg:rounded-none lg:px-6 lg:text-xs lg:first:rounded-l-xl lg:last:rounded-r-xl"
-        >
-          {{ client.name }}
-        </TabsTrigger>
-      </TabsList>
-
-      <div class="mt-10 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"
-        >
-          <h3 class="text-xl font-light text-primary-comfy-canvas lg:text-2xl">
-            {{ manualTitle }}
-          </h3>
-          <p class="mt-3 text-sm text-smoke-700">
-            {{ t('mcp.setup.manual.description', locale) }}
-          </p>
-          <div class="mt-6">
-            <CopyableField
-              :value="externalLinks.mcpEndpoint"
-              :copy-label="copyLabel"
-              :copied-label="copiedLabel"
-            />
-          </div>
-          <TabsContent
-            v-for="client in clients"
-            :key="client.id"
-            :value="client.id"
-            class="mt-6 flex min-h-36 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>
-        </div>
-
-        <div
-          class="bg-transparency-white-t4 flex flex-col rounded-3xl"
-          :class="
-            activeClient.showAgentCard
-              ? 'p-6 lg:p-8'
-              : 'relative overflow-hidden max-lg:aspect-video'
-          "
-        >
-          <template v-if="activeClient.showAgentCard">
-            <h3
-              class="text-xl font-light text-primary-comfy-canvas lg:text-2xl"
-            >
-              {{ t('mcp.setup.agent.title', locale) }}
-            </h3>
-            <p class="mt-3 text-sm text-smoke-700">
-              {{ t('mcp.setup.agent.description', locale) }}
-            </p>
-            <div class="mt-6">
-              <CopyableField
-                :value="agentCommand"
-                :copy-label="copyLabel"
-                :copied-label="copiedLabel"
-              />
-            </div>
-            <p class="mt-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>
-          </template>
-          <VideoPlayer
-            v-else-if="activeClient.video"
-            :key="activeClient.id"
-            :locale="locale"
-            :aria-label="walkthroughLabel"
-            :src="activeClient.video"
-            autoplay
-            loop
-            hide-controls
-            fit="contain"
-            class="absolute inset-0 size-full bg-transparent"
-          />
-        </div>
-      </div>
-    </TabsRoot>
-  </section>
+    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)"
+  />
 </template>
--- a/apps/website/src/templates/mcp/ToolsSection.vue
+++ b/apps/website/src/templates/mcp/ToolsSection.vue
@@ -7,21 +7,16 @@ import { t } from '../../i18n/translations'
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()

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

-const tools: {
-  n: 1 | 2 | 3 | 4 | 5 | 6
-  media: ToolMedia
-  altKey?: TranslationKey
-}[] = [
+const tools: { n: 1 | 2 | 3; media: ToolMedia; altKey?: TranslationKey }[] = [
  {
    n: 1,
    media: {
@@ -45,38 +40,9 @@ const tools: {
      src: 'https://media.comfy.org/website/mcp/run-real-workflows.mp4',
      autoplay: true,
      loop: true,
-      hideControls: true,
-      fit: 'contain'
+      hideControls: true
    },
    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 } from '../../config/routes'
+import { externalLinks, getRoutes } from '../../config/routes'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'

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

 /**
- * 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.
+ * 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.
 */
 export function mcpCtas(locale: Locale): {
  docs: McpCta
  installMcp: McpCta
+  runWorkflow: McpCta
 } {
  return {
    docs: {
@@ -26,6 +27,10 @@ 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,31 +171,6 @@ 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,8 +194,6 @@ export interface SoftwareAppInput {
  authorName?: string
  isFree?: boolean
  sameAs?: string[]
-  mainEntityOfPage?: string
-  isBasedOnId?: string
 }

 export function softwareApplicationNode(input: SoftwareAppInput): JsonLdNode {
@@ -221,8 +219,6 @@ 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',
@@ -261,10 +257,6 @@ 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,
@@ -275,16 +267,14 @@ export function comfyUiApplicationNode(siteUrl: string): JsonLdNode {
    applicationCategory: 'MultimediaApplication',
    operatingSystem: 'Windows, macOS, Linux',
    isFree: true,
-    sameAs: comfyUiSameAs,
-    mainEntityOfPage: `${siteUrl}/`,
-    isBasedOnId: comfyUiSourceCodeId(siteUrl)
+    sameAs: comfyUiSameAs
  })
 }

 export function comfyUiSourceCodeNode(siteUrl: string): JsonLdNode {
  return softwareSourceCodeNode({
    siteUrl,
-    id: comfyUiSourceCodeId(siteUrl),
+    id: `${siteUrl}/#sourcecode`,
    name: 'ComfyUI',
    codeRepository: externalLinks.github,
    programmingLanguage: 'Python',
--- a/apps/website/vercel.json
+++ b/apps/website/vercel.json
@@ -54,11 +54,6 @@
      "source": "/press",
      "destination": "/about",
      "permanent": true
-    },
-    {
-      "source": "/login",
-      "destination": "https://cloud.comfy.org/login",
-      "permanent": false
    }
  ]
 }
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -4,6 +4,7 @@ import { config as dotenvConfig } from 'dotenv'
 import MCR from 'monocart-coverage-reports'

 import { COVERAGE_OUTPUT_DIR } from '@e2e/coverageConfig'
+import { TOURS, TOUR_SEEN_SETTING } from '@/platform/onboarding/onboardingTours'
 import { NodeBadgeMode } from '@/types/nodeSource'
 import { ComfyActionbar } from '@e2e/fixtures/components/Actionbar'
 import { ComfyTemplates } from '@e2e/fixtures/components/Templates'
@@ -542,6 +543,8 @@ export const comfyPageFixture = base.extend<{
        'Comfy.userId': userId,
        // Set tutorial completed to true to avoid loading the tutorial workflow.
        'Comfy.TutorialCompleted': true,
+        // An auto-opened tour's blocker would break unrelated tests.
+        [TOUR_SEEN_SETTING]: Object.keys(TOURS),
        'Comfy.Queue.MaxHistoryItems': 64,
        'Comfy.SnapToGrid.GridSize': testComfySnapToGridGridSize,
        // Disable toast warning about version compatibility, as they may or
--- a/browser_tests/fixtures/components/Actionbar.ts
+++ b/browser_tests/fixtures/components/Actionbar.ts
@@ -8,13 +8,11 @@ export class ComfyActionbar {
  public readonly root: Locator
  public readonly queueButton: ComfyQueueButton
  public readonly propertiesButton: Locator
-  public readonly dragHandle: Locator

  constructor(public readonly page: Page) {
    this.root = page.locator('.actionbar-container')
    this.queueButton = new ComfyQueueButton(this)
    this.propertiesButton = this.root.getByLabel('Toggle properties panel')
-    this.dragHandle = this.root.locator('.drag-handle')
  }

  async isDocked() {
--- a/browser_tests/fixtures/components/FreeTierQuota.ts
+++ b/browser_tests/fixtures/components/FreeTierQuota.ts
@@ -1,21 +0,0 @@
-import type { Locator } from '@playwright/test'
-
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-export class FreeTierQuota {
-  readonly root: Locator
-
-  constructor(comfyPage: ComfyPage) {
-    this.root = comfyPage.page.getByTestId(TestIds.topbar.freeTierQuota)
-  }
-
-  async getMax() {
-    const text = await this.root.textContent()
-    return text?.match(/(\d+) \/ (\d+)/)?.[2]
-  }
-  async getAvailable() {
-    const text = await this.root.textContent()
-    return text?.match(/(\d+) \/ (\d+)/)?.[1]
-  }
-}
--- a/browser_tests/fixtures/components/Tour.ts
+++ b/browser_tests/fixtures/components/Tour.ts
@@ -0,0 +1,77 @@
+import type { Locator, Page } from '@playwright/test'
+
+import { TOUR_SEEN_SETTING } from '@/platform/onboarding/onboardingTours'
+
+export type CoachTour = 'appMode'
+
+/** Accessible name of each tour's in-app replay (help) button. */
+const TOUR_REPLAY_BUTTONS: Record<CoachTour, string> = {
+  appMode: 'Take a tour of App Mode'
+}
+
+/** Coach-mark overlay (src/platform/onboarding/TourOverlay.vue). */
+export class OnboardingCoachmarks {
+  public readonly landing: Locator
+  public readonly landingStartButton: Locator
+  public readonly landingSkipButton: Locator
+  /** The current spotlight step card (the dialog carrying a "Step N of M" label). */
+  public readonly card: Locator
+  public readonly cardNextButton: Locator
+  public readonly cardDoneButton: Locator
+
+  constructor(public readonly page: Page) {
+    this.landing = page.getByTestId('coach-landing')
+    this.landingStartButton = this.landing.getByRole('button', {
+      name: 'Start tutorial'
+    })
+    this.landingSkipButton = this.landing.getByRole('button', {
+      name: 'Skip',
+      exact: true
+    })
+    this.card = page.getByRole('dialog').filter({ hasText: /Step \d+ of \d+/ })
+    this.cardNextButton = this.card.getByRole('button', { name: 'Next' })
+    this.cardDoneButton = this.card.getByRole('button', { name: 'Done' })
+  }
+
+  /** The tour's in-app help button, which replays it past the seen-flag. */
+  replayButton(tour: CoachTour): Locator {
+    return this.page.getByRole('button', { name: TOUR_REPLAY_BUTTONS[tour] })
+  }
+
+  /** The spotlight card while it is showing the given step number. */
+  cardForStep(step: number): Locator {
+    return this.card.filter({ hasText: new RegExp(`Step ${step} of `) })
+  }
+
+  /**
+   * Clears the pre-seeded seen-flag (so dismissal assertions observe it being
+   * set again) and clicks the tour's replay button, which must be mounted.
+   */
+  async startTour(tour: CoachTour) {
+    await this.clearSeen()
+    await this.replayButton(tour).click()
+  }
+
+  private async clearSeen() {
+    await this.page.evaluate(
+      async (key) => window.app!.extensionManager.setting.set(key, []),
+      TOUR_SEEN_SETTING
+    )
+  }
+
+  /** An element a tour points at, by its `data-coach-id` anchor. */
+  coachAnchor(id: string): Locator {
+    return this.page.locator(`[data-coach-id="${id}"]`)
+  }
+
+  async seen(tour: CoachTour): Promise<boolean> {
+    const seen = await this.page.evaluate(
+      async (key) =>
+        (await window.app!.extensionManager.setting.get(key)) as
+          | string[]
+          | undefined,
+      TOUR_SEEN_SETTING
+    )
+    return !!seen?.includes(tour)
+  }
+}
--- a/browser_tests/fixtures/helpers/MaskEditorHelper.ts
+++ b/browser_tests/fixtures/helpers/MaskEditorHelper.ts
@@ -58,17 +58,6 @@ class MaskEditorHelper {
    return dialog
  }

-  async reopenDialog(): Promise<Locator> {
-    const imagePreview = this.page.locator('.image-preview').first()
-    await imagePreview.getByRole('region').hover()
-    await this.page.getByLabel('Edit or mask image').click()
-
-    const dialog = this.page.locator('.mask-editor-dialog')
-    await expect(dialog).toBeVisible()
-
-    return dialog
-  }
-
  async drawStrokeOnPointerZone(dialog: Locator) {
    const pointerZone = dialog.getByTestId('pointer-zone')
    await expect(pointerZone).toBeVisible()
--- a/browser_tests/fixtures/selectors.ts
+++ b/browser_tests/fixtures/selectors.ts
@@ -103,8 +103,7 @@ export const TestIds = {
    loginButtonPopoverLearnMore: 'login-button-popover-learn-more',
    workflowTabs: 'topbar-workflow-tabs',
    integratedTabBarActions: 'integrated-tab-bar-actions',
-    actionBarButtons: 'action-bar-buttons',
-    freeTierQuota: 'free-tier-quota'
+    actionBarButtons: 'action-bar-buttons'
  },
  nodeLibrary: {
    bookmarksSection: 'node-library-bookmarks-section'
--- a/browser_tests/fixtures/tourFixture.ts
+++ b/browser_tests/fixtures/tourFixture.ts
@@ -0,0 +1,11 @@
+import { test as base } from '@playwright/test'
+
+import { OnboardingCoachmarks } from '@e2e/fixtures/components/Tour'
+
+export const onboardingFixture = base.extend<{
+  onboarding: OnboardingCoachmarks
+}>({
+  onboarding: async ({ page }, use) => {
+    await use(new OnboardingCoachmarks(page))
+  }
+})
--- a/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts
+++ b/browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts
@@ -28,11 +28,11 @@ const APP_URL = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
 // matches it against the members self-row.
 const SELF_EMAIL = 'e2e@test.comfy.org'

-// billing_control_enabled routes personal workspaces to the unified pricing
-// table asserted here; without it they fall back to the legacy table.
+// consolidated_billing_enabled routes personal workspaces to the unified
+// pricing table asserted here; without it they fall back to the legacy table.
 const BOOT_FEATURES = {
  team_workspaces_enabled: true,
-  billing_control_enabled: true
+  consolidated_billing_enabled: true
 } satisfies RemoteConfig
 // Disable the experimental Asset API: with it on (cloud default) the unmocked
 // asset endpoints 403 and workflow restore throws uncaught, aborting the
--- a/browser_tests/tests/freeTierQuota.spec.ts
+++ b/browser_tests/tests/freeTierQuota.spec.ts
@@ -1,63 +0,0 @@
-import { expect, mergeTests } from '@playwright/test'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute'
-import { FreeTierQuota } from '@e2e/fixtures/components/FreeTierQuota'
-import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
-import { webSocketFixture } from '@e2e/fixtures/ws'
-
-const wstest = mergeTests(test, webSocketFixture)
-
-test.describe('Free Tier Quota', { tag: ['@cloud', '@vue-nodes'] }, () => {
-  test.beforeEach(async ({ page }) => {
-    const features = {
-      free_tier_job_allowance_enabled: true,
-      free_tier_balance: { allowance: 5, remaining: 3, used: 0 }
-    }
-    await page.route('**/api/features', (r) => r.fulfill(jsonRoute(features)))
-  })
-
-  wstest('Free Tier Quota', async ({ comfyPage, comfyMouse, getWebSocket }) => {
-    const execution = new ExecutionHelper(comfyPage, await getWebSocket())
-    const freeTierQuota = new FreeTierQuota(comfyPage)
-
-    await test.step('Populates initial state from config', async () => {
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe('3')
-      expect(await freeTierQuota.getMax()).toBe('5')
-    })
-
-    await test.step('available decrements on run', async () => {
-      await execution.run()
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe('2')
-    })
-
-    await test.step('connects to detached run button', async () => {
-      const handle = comfyPage.actionbar.dragHandle
-      await comfyMouse.dragElementBy(handle, { x: -100, y: 100 })
-      await expect.poll(() => comfyPage.actionbar.isDocked()).toBe(false)
-      expect(await freeTierQuota.getAvailable()).toBe('2')
-      await comfyMouse.dragElementBy(handle, { x: 100, y: -100 })
-      await expect.poll(() => comfyPage.actionbar.isDocked()).toBe(true)
-    })
-
-    await test.step('Detects workflows with Partner nodes', async () => {
-      await comfyPage.searchBoxV2.addNode('Node With Price Badge')
-      const node = await comfyPage.vueNodes.getFixtureByTitle('Price Badge')
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe(undefined)
-      await node.delete()
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe('2')
-    })
-
-    await test.step('Does not decrease past 0', async () => {
-      await execution.run()
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe('1')
-      await execution.run()
-      await expect.poll(() => freeTierQuota.getAvailable()).toBe(undefined)
-      await execution.run()
-      await execution.run()
-      await execution.run()
-      await comfyPage.nextFrame()
-      expect(await freeTierQuota.getAvailable()).toBe(undefined)
-    })
-  })
-})
--- a/browser_tests/tests/maskEditorLoadSave.spec.ts
+++ b/browser_tests/tests/maskEditorLoadSave.spec.ts
@@ -67,22 +67,6 @@ test.describe('Mask Editor load/save', { tag: '@vue-nodes' }, () => {
    await expect(dialog).toBeVisible()
  })

-  test('Reopening the editor after save restores the drawn mask', async ({
-    maskEditor
-  }) => {
-    const dialog = await maskEditor.openDialog()
-    await maskEditor.drawStrokeAndExpectPixels(dialog)
-    const savedMask = await maskEditor.getCanvasSnapshot(MASK_CANVAS_INDEX)
-
-    await dialog.getByRole('button', { name: 'Save' }).click()
-    await expect(dialog).toBeHidden()
-
-    await maskEditor.reopenDialog()
-    await expect
-      .poll(() => maskEditor.getCanvasSnapshot(MASK_CANVAS_INDEX))
-      .toBe(savedMask)
-  })
-
  test('Save failure keeps dialog open', async ({ comfyPage, maskEditor }) => {
    const dialog = await maskEditor.openDialog()
    await maskEditor.drawStrokeAndExpectPixels(dialog)
--- a/browser_tests/tests/tour.spec.ts
+++ b/browser_tests/tests/tour.spec.ts
@@ -0,0 +1,135 @@
+import { expect, mergeTests } from '@playwright/test'
+
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import { onboardingFixture } from '@e2e/fixtures/tourFixture'
+
+import {
+  COACH_IDS,
+  TOUR_SEEN_SETTING
+} from '@/platform/onboarding/onboardingTours'
+
+const test = mergeTests(comfyPageFixture, onboardingFixture)
+
+// Relies on the test server's default workflow (locally: pnpm dev:test).
+test.describe('Onboarding coachmarks', { tag: '@ui' }, () => {
+  test.describe('app-mode tour', () => {
+    // With no tour pre-seeded as seen, entering the app auto-opens it.
+    test.use({
+      initialSettings: { [TOUR_SEEN_SETTING]: [] }
+    })
+
+    test('auto-opens on the welcome landing, focuses Start, and Skip dismisses it', async ({
+      comfyPage,
+      onboarding
+    }) => {
+      await comfyPage.appMode.enterAppModeWithInputs([])
+      const coach = onboarding
+
+      await expect(coach.landing).toBeVisible()
+      await expect(coach.landing.getByRole('heading')).toHaveText(
+        'Welcome to Apps'
+      )
+      await expect(coach.landingStartButton).toBeFocused()
+
+      await coach.landingSkipButton.click()
+      await expect(coach.landing).toBeHidden()
+      await expect.poll(() => coach.seen('appMode')).toBe(true)
+    })
+
+    test('Escape dismisses the welcome landing and marks it seen', async ({
+      comfyPage,
+      onboarding
+    }) => {
+      await comfyPage.appMode.enterAppModeWithInputs([])
+      const coach = onboarding
+      await expect(coach.landing).toBeVisible()
+      await expect(coach.landingStartButton).toBeFocused()
+
+      await comfyPage.page.keyboard.press('Escape')
+      await expect(coach.landing).toBeHidden()
+      await expect.poll(() => coach.seen('appMode')).toBe(true)
+    })
+  })
+
+  test.describe('coach anchors', () => {
+    test('every registry id resolves to an element (drift guard)', async ({
+      comfyPage,
+      onboarding
+    }) => {
+      const coach = onboarding
+      await comfyPage.appMode.enterAppModeWithInputs([])
+      // The assets panel only mounts once the assets sidebar tab is open.
+      for (const id of Object.values(COACH_IDS).filter(
+        (id) => id !== COACH_IDS.assetsPanel
+      )) {
+        await expect(coach.coachAnchor(id)).toBeVisible()
+      }
+      await comfyPage.page.getByRole('button', { name: 'Media Assets' }).click()
+      await expect(coach.coachAnchor(COACH_IDS.assetsPanel)).toBeVisible()
+    })
+  })
+
+  test.describe('spotlight focus', () => {
+    test('focuses the primary action, traps Tab in the card, and re-focuses per step', async ({
+      comfyPage,
+      onboarding
+    }) => {
+      const coach = onboarding
+      await comfyPage.page.emulateMedia({ reducedMotion: 'reduce' })
+      await comfyPage.appMode.enterAppModeWithInputs([])
+
+      await coach.startTour('appMode')
+      await expect(coach.landing).toBeVisible()
+      await coach.landingStartButton.click()
+
+      const step1 = coach.cardForStep(1)
+      await expect(step1).toBeVisible()
+      // FocusScope's mount-auto-focus is suppressed so focus lands on the
+      // primary action rather than the first focusable (Skip).
+      await expect(coach.cardNextButton).toBeFocused()
+
+      // Tab more times than the card has controls; the looped trap must keep
+      // focus inside the card, never escaping to the app behind the overlay.
+      for (let i = 0; i < 4; i++) {
+        await comfyPage.page.keyboard.press('Tab')
+        await expect(step1.locator(':focus')).toBeVisible()
+      }
+      await comfyPage.page.keyboard.press('Shift+Tab')
+      await expect(step1.locator(':focus')).toBeVisible()
+
+      await coach.cardNextButton.click()
+      await expect(coach.cardForStep(2)).toBeVisible()
+      await expect(coach.cardNextButton).toBeFocused()
+    })
+  })
+
+  test.describe('spotlight placement', () => {
+    test('every spotlight card stays fully within the viewport and Done completes the tour', async ({
+      comfyPage,
+      onboarding
+    }) => {
+      const coach = onboarding
+      // Read settled placements, not a transient mid-animation frame.
+      await comfyPage.page.emulateMedia({ reducedMotion: 'reduce' })
+      await comfyPage.appMode.enterAppModeWithInputs([])
+
+      await coach.startTour('appMode')
+      await expect(coach.landing).toBeVisible()
+      await coach.landingStartButton.click()
+
+      for (const step of [1, 2, 3]) {
+        const card = coach.cardForStep(step)
+        await expect(card).toBeVisible()
+        await expect(card).toBeInViewport({ ratio: 1 })
+        await coach.cardNextButton.click()
+      }
+
+      // The final assets step auto-opens the assets panel — no target click.
+      await expect(coach.cardForStep(4)).toBeInViewport({ ratio: 1 })
+
+      await coach.cardDoneButton.click()
+      await expect(coach.card).toBeHidden()
+      await expect.poll(() => coach.seen('appMode')).toBe(true)
+    })
+  })
+})
--- a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
@@ -7,45 +7,6 @@ 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/codecov.yml
+++ b/codecov.yml
@@ -1,9 +1,3 @@
-coverage:
-  status:
-    patch:
-      default:
-        informational: true
-
 comment:
  layout: 'header, diff, flags, files'
  behavior: default
--- a/package.json
+++ b/package.json
@@ -29,8 +29,6 @@
    "dev:test": "cross-env VITE_USE_LEGACY_DEFAULT_GRAPH=true vite --config vite.config.mts",
    "dev": "vite --config vite.config.mts",
    "devtools:pycheck": "python3 -m compileall -q tools/devtools",
-    "fallow": "fallow",
-    "fallow:audit": "fallow audit",
    "format:check": "oxfmt --check",
    "format": "oxfmt --write",
    "json-schema": "tsx scripts/generate-json-schema.ts",
@@ -74,6 +72,7 @@
    "@comfyorg/shared-frontend-utils": "workspace:*",
    "@comfyorg/tailwind-utils": "workspace:*",
    "@customerio/cdp-analytics-browser": "catalog:",
+    "@floating-ui/vue": "catalog:",
    "@formkit/auto-animate": "catalog:",
    "@iconify/json": "catalog:",
    "@primeuix/forms": "catalog:",
@@ -174,7 +173,6 @@
    "eslint-plugin-testing-library": "catalog:",
    "eslint-plugin-unused-imports": "catalog:",
    "eslint-plugin-vue": "catalog:",
-    "fallow": "catalog:",
    "fast-check": "catalog:",
    "fs-extra": "^11.2.0",
    "globals": "catalog:",
--- a/packages/comfyui-desktop-bridge-types/comfyDesktopBridge.d.ts
+++ b/packages/comfyui-desktop-bridge-types/comfyDesktopBridge.d.ts
@@ -40,11 +40,6 @@ 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>
@@ -65,7 +60,6 @@ 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.3",
+  "version": "0.1.2",
  "description": "TypeScript definitions for the Comfy Desktop hosted frontend bridge",
  "homepage": "https://comfy.org",
  "license": "MIT",
--- a/packages/design-system/src/css/style.css
+++ b/packages/design-system/src/css/style.css
@@ -49,7 +49,7 @@
  --color-gold-500: #fdab34;
  --color-gold-600: #fd9903;

-  --color-credit: #ddbd31;
+  --color-credit: #fabc25;

  --color-coral-500: #f75951;
  --color-coral-600: #e04e48;
@@ -102,6 +102,10 @@
  --color-alpha-magenta-700-60: #6a246a99;
  --color-alpha-magenta-300-60: #ceaac999;

+  /* Onboarding coachmark overlay (always renders over a dark scrim) */
+  --color-coach-scrim: rgb(0 0 0 / 0.6);
+  --color-coach-ring: #fff;
+
  /* PrimeVue pulled colors */
  --color-muted: var(--p-text-muted-color);
  --color-highlight: var(--p-primary-color);
@@ -140,6 +144,26 @@
  --button-surface: var(--color-white);
  --button-surface-contrast: var(--color-black);

+  --subscription-button-gradient:
+    linear-gradient(
+      315deg,
+      rgb(105 230 255 / 0.15) 0%,
+      rgb(99 73 233 / 0.5) 100%
+    ),
+    radial-gradient(
+      70.71% 70.71% at 50% 50%,
+      rgb(62 99 222 / 0.15) 0.01%,
+      rgb(66 0 123 / 0.5) 100%
+    ),
+    linear-gradient(
+      92deg,
+      #d000ff 0.38%,
+      #b009fe 37.07%,
+      #3e1ffc 65.17%,
+      #009dff 103.86%
+    ),
+    linear-gradient(var(--color-button-surface, #2d2e32));
+
  /* Code styling colors for help menu*/
  --code-text-color: rgb(0 122 255 / 1);
  --code-bg-color: rgb(96 165 250 / 0.2);
--- 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/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -30,6 +30,9 @@ catalogs:
    '@eslint/js':
      specifier: ^10.0.1
      version: 10.0.1
+    '@floating-ui/vue':
+      specifier: ^1.1.11
+      version: 1.1.11
    '@formkit/auto-animate':
      specifier: ^0.9.0
      version: 0.9.0
@@ -240,9 +243,6 @@ catalogs:
    eslint-plugin-vue:
      specifier: ^10.9.1
      version: 10.9.1
-    fallow:
-      specifier: ^2.102.0
-      version: 2.102.0
    fast-check:
      specifier: ^4.5.3
      version: 4.5.3
@@ -471,6 +471,9 @@ importers:
      '@customerio/cdp-analytics-browser':
        specifier: 'catalog:'
        version: 0.5.3
+      '@floating-ui/vue':
+        specifier: 'catalog:'
+        version: 1.1.11(vue@3.5.34(typescript@5.9.3))
      '@formkit/auto-animate':
        specifier: 'catalog:'
        version: 0.9.0
@@ -766,9 +769,6 @@ importers:
      eslint-plugin-vue:
        specifier: 'catalog:'
        version: 10.9.1(@typescript-eslint/parser@8.60.0(eslint@10.4.0(jiti@2.6.1))(typescript@5.9.3))(eslint@10.4.0(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@10.4.0(jiti@2.6.1)))
-      fallow:
-        specifier: 'catalog:'
-        version: 2.102.0
      fast-check:
        specifier: 'catalog:'
        version: 4.5.3
@@ -1914,46 +1914,6 @@ packages:
      '@exodus/crypto':
        optional: true

-  '@fallow-cli/darwin-arm64@2.102.0':
-    resolution: {integrity: sha512-B8wzfzJgoX6h5Gv2xQ9ZidO5Jb8/PWdssAxYbWs1pb5oJHZ6S5PLwXuUdINmNSIaRGQwTk4DC9/tIMFHFvd9uw==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@fallow-cli/darwin-x64@2.102.0':
-    resolution: {integrity: sha512-aLbTWWzQnleKdi56obAPXMJm7YA3qAnkIX9T3eocRHiagYqp8nsf4cslM0rZKvu2WwK34NaBm8x886gl4cl+zg==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@fallow-cli/linux-arm64-gnu@2.102.0':
-    resolution: {integrity: sha512-8nYeOSLSewqcKH/KUcKZaCq5QII5VTRX62l60B6UM1iKe/0jcmlQ2mOtx4rkHpeq3LL5emvT/ph4NNgGmWKSBg==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@fallow-cli/linux-arm64-musl@2.102.0':
-    resolution: {integrity: sha512-2Zi33PXzZxD7HU5sPVwyElZGP7zyEdGo4hK0ewy6gMYgQ9BDfLnFhgaSSOzN1J4paIhYtBmVsLmqakyDKy22Jw==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@fallow-cli/linux-x64-gnu@2.102.0':
-    resolution: {integrity: sha512-7Hys4X6hKuR/lqUaGXwezRzDrwXwu9KfahUy85WTuiG1to+ZbzDCqdbZ04LtnI8kK8ufrPDcq+ZXdyt5ksOJHA==}
-    cpu: [x64]
-    os: [linux]
-
-  '@fallow-cli/linux-x64-musl@2.102.0':
-    resolution: {integrity: sha512-RuDY1jOEPgJOuHBgEpHVl6J7Xf2QLFklnNy6zO1nw8R1fLgWUAAKlFirn1Y93pb9bXzqpn5Gre3YlhgIZ3+LBA==}
-    cpu: [x64]
-    os: [linux]
-
-  '@fallow-cli/win32-arm64-msvc@2.102.0':
-    resolution: {integrity: sha512-wsvHjLzWFvsYmCqnQLm1doSEHb9Z038+sFp1RzMcffPUBC5tqS3vCr8J8nolcLlPk7o3QWHQMXAqb1xSJe+doA==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@fallow-cli/win32-x64-msvc@2.102.0':
-    resolution: {integrity: sha512-rH1hd0PD0mm6pCxh1pw5jubpJsvV6f5rjixMoD5AZLzWa6NPJBpPPuzruLGtH/9CYy8B0y7zPrGGTKRO2PCGzg==}
-    cpu: [x64]
-    os: [win32]
-
  '@firebase/analytics-compat@0.2.18':
    resolution: {integrity: sha512-Hw9mzsSMZaQu6wrTbi3kYYwGw9nBqOHr47pVLxfr5v8CalsdrG5gfs9XUlPOZjHRVISp3oQrh1j7d3E+ulHPjQ==}
    peerDependencies:
@@ -5728,11 +5688,6 @@ packages:
  extendable-media-recorder@9.2.27:
    resolution: {integrity: sha512-2X+Ixi1cxLek0Cj9x9atmhQ+apG+LwJpP2p3ypP8Pxau0poDnicrg7FTfPVQV5PW/3DHFm/eQ16vbgo5Yk3HGQ==}

-  fallow@2.102.0:
-    resolution: {integrity: sha512-bkOT58kPVCB12d2apQjIKBw/qSdsGRPQFrN5ff9Yl5WzXRqlDTbT/MVdMXld4sJD5JQW1ftw2bTxJWCINggh6g==}
-    engines: {node: '>=16'}
-    hasBin: true
-
  fast-check@4.5.3:
    resolution: {integrity: sha512-IE9csY7lnhxBnA8g/WI5eg/hygA6MGWJMSNfFRrBlXUciADEhS1EDB0SIsMSvzubzIlOBbVITSsypCsW717poA==}
    engines: {node: '>=12.17.0'}
@@ -10095,30 +10050,6 @@ snapshots:

  '@exodus/bytes@1.7.0': {}

-  '@fallow-cli/darwin-arm64@2.102.0':
-    optional: true
-
-  '@fallow-cli/darwin-x64@2.102.0':
-    optional: true
-
-  '@fallow-cli/linux-arm64-gnu@2.102.0':
-    optional: true
-
-  '@fallow-cli/linux-arm64-musl@2.102.0':
-    optional: true
-
-  '@fallow-cli/linux-x64-gnu@2.102.0':
-    optional: true
-
-  '@fallow-cli/linux-x64-musl@2.102.0':
-    optional: true
-
-  '@fallow-cli/win32-arm64-msvc@2.102.0':
-    optional: true
-
-  '@fallow-cli/win32-x64-msvc@2.102.0':
-    optional: true
-
  '@firebase/analytics-compat@0.2.18(@firebase/app-compat@0.2.53)(@firebase/app@0.11.4)':
    dependencies:
      '@firebase/analytics': 0.10.12(@firebase/app@0.11.4)
@@ -14170,19 +14101,6 @@ snapshots:
      subscribable-things: 2.1.53
      tslib: 2.8.1

-  fallow@2.102.0:
-    dependencies:
-      detect-libc: 2.1.2
-    optionalDependencies:
-      '@fallow-cli/darwin-arm64': 2.102.0
-      '@fallow-cli/darwin-x64': 2.102.0
-      '@fallow-cli/linux-arm64-gnu': 2.102.0
-      '@fallow-cli/linux-arm64-musl': 2.102.0
-      '@fallow-cli/linux-x64-gnu': 2.102.0
-      '@fallow-cli/linux-x64-musl': 2.102.0
-      '@fallow-cli/win32-arm64-msvc': 2.102.0
-      '@fallow-cli/win32-x64-msvc': 2.102.0
-
  fast-check@4.5.3:
    dependencies:
      pure-rand: 7.0.1
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -18,6 +18,7 @@ catalog:
  '@comfyorg/comfyui-electron-types': 0.6.2
  '@customerio/cdp-analytics-browser': ^0.5.3
  '@eslint/js': ^10.0.1
+  '@floating-ui/vue': ^1.1.11
  '@formkit/auto-animate': ^0.9.0
  '@iconify-json/lucide': ^1.1.178
  '@iconify/json': ^2.2.380
@@ -89,7 +90,6 @@ catalog:
  eslint-plugin-testing-library: ^7.16.1
  eslint-plugin-unused-imports: ^4.4.1
  eslint-plugin-vue: ^10.9.1
-  fallow: ^2.102.0
  fast-check: ^4.5.3
  firebase: ^11.6.0
  glob: ^13.0.6
--- a/public/assets/images/app-mode-landing.png
+++ b/public/assets/images/app-mode-landing.png
--- a/scripts/check-unused-i18n-keys.ts
+++ b/scripts/check-unused-i18n-keys.ts
@@ -15,6 +15,7 @@ const IGNORE_PATTERNS = [
  /^dataTypes\./, // Data types might be referenced dynamically
  /^contextMenu\./, // Context menu items might be dynamic
  /^color\./, // Color names might be used dynamically
+  /^onboardingCoachmarks\.[^.]+\.[^.]+\./, // Step keys derived as onboardingCoachmarks.<tour>.<step>.*
  // Auto-generated categories from collect-i18n-general.ts
  /^menuLabels\./, // Menu labels generated from command labels
  /^settingsCategories\./, // Settings categories generated from setting definitions
--- a/scripts/collect-i18n-node-defs.ts
+++ b/scripts/collect-i18n-node-defs.ts
@@ -3,9 +3,11 @@ import * as fs from 'fs'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'

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

 const localePath = './src/locales/en/main.json'
 const nodeDefsPath = './src/locales/en/nodeDefs.json'
@@ -15,6 +17,10 @@ interface WidgetInfo {
  label?: string
 }

+interface WidgetLabels {
+  [key: string]: Record<string, { name: string }>
+}
+
 test('collect-i18n-node-defs', async ({ comfyPage }) => {
  // Mock view route
  await comfyPage.page.route('**/view**', async (route) => {
@@ -41,6 +47,26 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
    }
  )

+  const allDataTypesLocale = Object.fromEntries(
+    nodeDefs
+      .flatMap((nodeDef) => {
+        const inputDataTypes = Object.values(nodeDef.inputs).map(
+          (inputSpec) => inputSpec.type
+        )
+        const outputDataTypes = nodeDef.outputs.map(
+          (outputSpec) => outputSpec.type
+        )
+        const allDataTypes = [...inputDataTypes, ...outputDataTypes].flatMap(
+          (type: string) => type.split(',')
+        )
+        return allDataTypes.map((dataType) => [
+          normalizeI18nKey(dataType),
+          escapeVueI18nMessageSyntax(dataType)
+        ])
+      })
+      .sort((a, b) => a[0].localeCompare(b[0]))
+  )
+
  async function extractWidgetLabels() {
    const nodeLabels: WidgetLabels = {}

@@ -69,10 +95,14 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
          [nodeDef.name, nodeDef.display_name, inputNames]
        )

+        // Format runtime widgets
        const runtimeWidgets = Object.fromEntries(
          Object.entries(widgetsMappings)
            .sort((a, b) => a[0].localeCompare(b[0]))
-            .map(([key, name]) => [key, { name }])
+            .map(([key, value]) => [
+              normalizeI18nKey(key),
+              { name: value ? escapeVueI18nMessageSyntax(value) : value }
+            ])
        )

        if (Object.keys(runtimeWidgets).length > 0) {
@@ -91,8 +121,97 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
  }

  const nodeDefLabels = await extractWidgetLabels()
-  const { dataTypes, nodeCategories, nodeDefinitions } =
-    serializeNodeDefLocales(nodeDefs, nodeDefLabels)
+
+  function extractInputs(nodeDef: ComfyNodeDefImpl) {
+    const inputs = Object.fromEntries(
+      Object.values(nodeDef.inputs).flatMap((input) => {
+        const name =
+          input.name === undefined
+            ? undefined
+            : escapeVueI18nMessageSyntax(input.name)
+        const tooltip = input.tooltip
+
+        if (name === undefined && tooltip === undefined) {
+          return []
+        }
+
+        return [
+          [
+            normalizeI18nKey(input.name),
+            {
+              name,
+              tooltip
+            }
+          ]
+        ]
+      })
+    )
+    return Object.keys(inputs).length > 0 ? inputs : undefined
+  }
+
+  function extractOutputs(nodeDef: ComfyNodeDefImpl) {
+    const outputs = Object.fromEntries(
+      nodeDef.outputs.flatMap((output, i) => {
+        // Ignore data types if they are already translated in allDataTypesLocale.
+        const name =
+          output.name === undefined || output.name in allDataTypesLocale
+            ? undefined
+            : escapeVueI18nMessageSyntax(output.name)
+        const tooltip = output.tooltip
+
+        if (name === undefined && tooltip === undefined) {
+          return []
+        }
+
+        return [
+          [
+            i.toString(),
+            {
+              name,
+              tooltip
+            }
+          ]
+        ]
+      })
+    )
+    return Object.keys(outputs).length > 0 ? outputs : undefined
+  }
+
+  const allNodeDefsLocale = Object.fromEntries(
+    nodeDefs
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map((nodeDef) => {
+        const inputs = {
+          ...extractInputs(nodeDef),
+          ...(nodeDefLabels[nodeDef.name] ?? {})
+        }
+
+        return [
+          normalizeI18nKey(nodeDef.name),
+          {
+            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)
+          }
+        ]
+      })
+  )
+
+  const allNodeCategoriesLocale = Object.fromEntries(
+    nodeDefs.flatMap((nodeDef) =>
+      nodeDef.category
+        .split('/')
+        .map((category) => [
+          normalizeI18nKey(category),
+          escapeVueI18nMessageSyntax(category)
+        ])
+    )
+  )

  const locale = JSON.parse(fs.readFileSync(localePath, 'utf-8'))
  fs.writeFileSync(
@@ -100,13 +219,13 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
    JSON.stringify(
      {
        ...locale,
-        dataTypes,
-        nodeCategories
+        dataTypes: allDataTypesLocale,
+        nodeCategories: allNodeCategoriesLocale
      },
      null,
      2
    )
  )

-  fs.writeFileSync(nodeDefsPath, JSON.stringify(nodeDefinitions, null, 2))
+  fs.writeFileSync(nodeDefsPath, JSON.stringify(allNodeDefsLocale, null, 2))
 })
--- a/scripts/nodeDefLocaleSerializer.test.ts
+++ b/scripts/nodeDefLocaleSerializer.test.ts
@@ -1,130 +0,0 @@
-import { createI18n } from 'vue-i18n'
-import { describe, expect, it } from 'vitest'
-
-import { serializeNodeDefLocales } from './nodeDefLocaleSerializer'
-
-function render(message: string): string {
-  const i18n = createI18n({
-    legacy: false,
-    locale: 'en',
-    messages: { en: { value: message } }
-  })
-  return i18n.global.t('value')
-}
-
-describe('serializeNodeDefLocales', () => {
-  it('escapes compiled fields and preserves raw tooltips', () => {
-    const syntax = '@ $ {value} | 50%{done}'
-    const inputName = `Input ${syntax}`
-    const outputName = `Output ${syntax}`
-    const dataType = `TYPE ${syntax}`
-    const category = `Category ${syntax}`
-    const nodeDef = {
-      name: 'Test.Node',
-      display_name: `Display ${syntax}`,
-      description: `Description ${syntax}`,
-      category,
-      inputs: {
-        input: {
-          name: inputName,
-          type: dataType,
-          tooltip: `Input tooltip ${syntax}`
-        }
-      },
-      outputs: [
-        {
-          name: outputName,
-          type: 'OTHER',
-          tooltip: `Output tooltip ${syntax}`
-        }
-      ]
-    }
-
-    const { dataTypes, nodeCategories, nodeDefinitions } =
-      serializeNodeDefLocales([nodeDef], {
-        'Test.Node': {
-          'Runtime.Widget': { name: `Widget ${syntax}` }
-        }
-      })
-    const serializedNode = nodeDefinitions.Test_Node
-    const serializedInput =
-      serializedNode.inputs['Input @ $ {value} | 50%{done}']
-    const serializedOutput = serializedNode.outputs['0']
-
-    expect(render(serializedNode.display_name)).toBe(nodeDef.display_name)
-    expect(render(serializedNode.description)).toBe(nodeDef.description)
-    expect(render(serializedInput.name)).toBe(inputName)
-    expect(render(serializedOutput.name)).toBe(outputName)
-    expect(render(serializedNode.inputs.Runtime_Widget.name)).toBe(
-      `Widget ${syntax}`
-    )
-    expect(render(dataTypes[dataType])).toBe(dataType)
-    expect(render(nodeCategories[category])).toBe(category)
-    expect(serializedInput.tooltip).toBe(nodeDef.inputs.input.tooltip)
-    expect(serializedOutput.tooltip).toBe(nodeDef.outputs[0].tooltip)
-  })
-
-  it('preserves locale shapes and ordering', () => {
-    const { dataTypes, nodeCategories, nodeDefinitions } =
-      serializeNodeDefLocales(
-        [
-          {
-            name: 'Z.Node',
-            description: '',
-            category: 'group/sub.group',
-            inputs: {
-              omitted: { type: 'Z.TYPE' },
-              tooltipOnly: { type: 'A_TYPE', tooltip: 'raw @ tooltip' }
-            },
-            outputs: [
-              { name: 'A_TYPE', type: 'A_TYPE' },
-              { name: 'Custom.Output', type: 'Z.TYPE' },
-              { tooltip: 'raw output @ tooltip', type: 'Z.TYPE' }
-            ]
-          },
-          {
-            name: 'A.Node',
-            category: 'group',
-            inputs: {},
-            outputs: []
-          }
-        ],
-        {
-          'Z.Node': {
-            'Runtime.Widget': { name: 'Runtime.Label' }
-          }
-        }
-      )
-
-    expect(dataTypes).toEqual({
-      A_TYPE: 'A_TYPE',
-      Z_TYPE: 'Z.TYPE'
-    })
-    expect(nodeCategories).toEqual({
-      group: 'group',
-      sub_group: 'sub.group'
-    })
-    expect(nodeDefinitions).toEqual({
-      A_Node: {
-        display_name: 'A.Node',
-        description: undefined,
-        inputs: undefined,
-        outputs: undefined
-      },
-      Z_Node: {
-        display_name: 'Z.Node',
-        description: undefined,
-        inputs: {
-          '': { name: undefined, tooltip: 'raw @ tooltip' },
-          Runtime_Widget: { name: 'Runtime.Label' }
-        },
-        outputs: {
-          1: { name: 'Custom.Output', tooltip: undefined },
-          2: { name: undefined, tooltip: 'raw output @ tooltip' }
-        }
-      }
-    })
-    expect(Object.keys(dataTypes)).toEqual(['A_TYPE', 'Z_TYPE'])
-    expect(Object.keys(nodeDefinitions)).toEqual(['A_Node', 'Z_Node'])
-  })
-})
--- a/scripts/nodeDefLocaleSerializer.ts
+++ b/scripts/nodeDefLocaleSerializer.ts
@@ -1,127 +0,0 @@
-import { normalizeI18nKey } from '@/utils/formatUtil'
-
-interface LocalizableInput {
-  type: string
-  name?: string
-  tooltip?: string
-}
-
-interface LocalizableOutput {
-  type: string
-  name?: string
-  tooltip?: string
-}
-
-interface LocalizableNodeDef {
-  category: string
-  inputs: Record<string, LocalizableInput>
-  name: string
-  outputs: LocalizableOutput[]
-  description?: string
-  display_name?: string
-}
-
-export type WidgetLabels = Record<
-  string,
-  Record<string, { name: string | undefined }>
->
-
-const VUE_I18N_SYNTAX_CHARS = /[@${}|%]/g
-
-function escapeMessage(text: string): string {
-  return text.replace(VUE_I18N_SYNTAX_CHARS, (char) => `{'${char}'}`)
-}
-
-export function serializeNodeDefLocales(
-  nodeDefs: readonly LocalizableNodeDef[],
-  widgetLabels: WidgetLabels = {}
-) {
-  const dataTypes = Object.fromEntries(
-    nodeDefs
-      .flatMap((nodeDef) => [
-        ...Object.values(nodeDef.inputs).map(({ type }) => type),
-        ...nodeDef.outputs.map(({ type }) => type)
-      ])
-      .flatMap((type) => type.split(','))
-      .map((dataType) => [normalizeI18nKey(dataType), escapeMessage(dataType)])
-      .sort((a, b) => a[0].localeCompare(b[0]))
-  )
-
-  function serializeInputs(nodeDef: LocalizableNodeDef) {
-    const inputs = Object.fromEntries(
-      Object.values(nodeDef.inputs).flatMap(({ name, tooltip }) => {
-        if (name === undefined && tooltip === undefined) return []
-
-        return [
-          [
-            normalizeI18nKey(name ?? ''),
-            {
-              name: name === undefined ? undefined : escapeMessage(name),
-              tooltip
-            }
-          ]
-        ]
-      })
-    )
-    return Object.keys(inputs).length > 0 ? inputs : undefined
-  }
-
-  function serializeOutputs(nodeDef: LocalizableNodeDef) {
-    const outputs = Object.fromEntries(
-      nodeDef.outputs.flatMap(({ name, tooltip }, index) => {
-        const serializedName =
-          name === undefined || name in dataTypes
-            ? undefined
-            : escapeMessage(name)
-        if (serializedName === undefined && tooltip === undefined) return []
-
-        return [[index.toString(), { name: serializedName, tooltip }]]
-      })
-    )
-    return Object.keys(outputs).length > 0 ? outputs : undefined
-  }
-
-  function serializeWidgetLabels(nodeName: string) {
-    return Object.fromEntries(
-      Object.entries(widgetLabels[nodeName] ?? {}).map(([name, label]) => [
-        normalizeI18nKey(name),
-        {
-          name: label.name === undefined ? undefined : escapeMessage(label.name)
-        }
-      ])
-    )
-  }
-
-  const nodeDefinitions = Object.fromEntries(
-    [...nodeDefs]
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .map((nodeDef) => {
-        const inputs = {
-          ...serializeInputs(nodeDef),
-          ...serializeWidgetLabels(nodeDef.name)
-        }
-
-        return [
-          normalizeI18nKey(nodeDef.name),
-          {
-            display_name: escapeMessage(nodeDef.display_name ?? nodeDef.name),
-            description: nodeDef.description
-              ? escapeMessage(nodeDef.description)
-              : undefined,
-            inputs: Object.keys(inputs).length > 0 ? inputs : undefined,
-            outputs: serializeOutputs(nodeDef)
-          }
-        ]
-      })
-  )
-
-  const nodeCategories = Object.fromEntries(
-    nodeDefs.flatMap(({ category }) =>
-      category
-        .split('/')
-        .map((part) => [normalizeI18nKey(part), escapeMessage(part)])
-    )
-  )
-
-  return { dataTypes, nodeCategories, nodeDefinitions }
-}
--- a/src/components/TopMenuSection.test.ts
+++ b/src/components/TopMenuSection.test.ts
@@ -629,7 +629,7 @@ describe('TopMenuSection', () => {
      await nextTick()

      expect(querySpy).toHaveBeenCalledTimes(1)
-      expect(actionbarContainer!.classList).not.toContain('w-0')
+      expect(actionbarContainer!.classList).toContain('px-2')
    } finally {
      unmount()
      vi.unstubAllGlobals()
--- a/src/components/TopMenuSection.vue
+++ b/src/components/TopMenuSection.vue
@@ -11,7 +11,7 @@
      </div>

      <div class="mx-1 flex flex-col items-end gap-1">
-        <div class="flex items-start gap-2">
+        <div class="flex items-center gap-2">
          <div
            v-if="managerState.shouldShowManagerButtons.value || isCloud"
            class="pointer-events-auto flex h-12 shrink-0 items-center rounded-lg border border-interface-stroke bg-comfy-menu-bg px-2 shadow-interface"
@@ -34,75 +34,61 @@
            </Button>
          </div>

-          <div
-            class="pointer-events-auto z-1 flex flex-col rounded-lg border border-interface-stroke bg-comfy-menu-bg px-2 py-1.75 shadow-interface"
-          >
+          <div ref="actionbarContainerRef" :class="actionbarContainerClass">
+            <ActionBarButtons />
+            <!-- Support for legacy topbar elements attached by custom scripts, hidden if no elements present -->
            <div
-              ref="actionbarContainerRef"
-              :class="
-                cn(
-                  'actionbar-container relative flex items-center gap-2',
-                  isActionbarContainerEmpty &&
-                    '-ml-2 w-0 min-w-0 border-transparent shadow-none has-[.border-dashed]:ml-0 has-[.border-dashed]:w-auto has-[.border-dashed]:min-w-auto has-[.border-dashed]:border-interface-stroke has-[.border-dashed]:pl-2 has-[.border-dashed]:shadow-interface'
-                )
-              "
-            >
-              <ActionBarButtons />
-              <!-- Support for legacy topbar elements attached by custom scripts, hidden if no elements present -->
-              <div
-                ref="legacyCommandsContainerRef"
-                data-testid="legacy-topbar-container"
-                class="[&:not(:has(*>*:not(:empty)))]:hidden"
-              ></div>
+              ref="legacyCommandsContainerRef"
+              data-testid="legacy-topbar-container"
+              class="[&:not(:has(*>*:not(:empty)))]:hidden"
+            ></div>

-              <ComfyActionbar
-                :top-menu-container="actionbarContainerRef"
-                :queue-overlay-expanded="isQueueOverlayExpanded"
-                @update:progress-target="updateProgressTarget"
-              />
-              <CurrentUserButton
-                v-if="isLoggedIn && !isIntegratedTabBar"
-                class="shrink-0"
-              />
-              <LoginButton v-else-if="isDesktop && !isIntegratedTabBar" />
+            <ComfyActionbar
+              :top-menu-container="actionbarContainerRef"
+              :queue-overlay-expanded="isQueueOverlayExpanded"
+              @update:progress-target="updateProgressTarget"
+            />
+            <CurrentUserButton
+              v-if="isLoggedIn && !isIntegratedTabBar"
+              class="shrink-0"
+            />
+            <LoginButton v-else-if="isDesktop && !isIntegratedTabBar" />
+            <Button
+              v-if="isCloud && flags.workflowSharingEnabled"
+              v-tooltip.bottom="shareTooltipConfig"
+              variant="secondary"
+              :aria-label="t('actionbar.shareTooltip')"
+              @click="() => openShareDialog().catch(toastErrorHandler)"
+              @pointerenter="prefetchShareDialog"
+            >
+              <i class="icon-[comfy--send] size-4" />
+              <span class="not-md:hidden">
+                {{ t('actionbar.share') }}
+              </span>
+            </Button>
+            <div v-if="!isRightSidePanelOpen" class="relative">
              <Button
-                v-if="isCloud && flags.workflowSharingEnabled"
-                v-tooltip.bottom="shareTooltipConfig"
+                v-tooltip.bottom="rightSidePanelTooltipConfig"
+                :class="
+                  cn(
+                    showErrorIndicatorOnPanelButton &&
+                      'outline-1 outline-destructive-background'
+                  )
+                "
                variant="secondary"
-                :aria-label="t('actionbar.shareTooltip')"
-                @click="() => openShareDialog().catch(toastErrorHandler)"
-                @pointerenter="prefetchShareDialog"
+                size="icon"
+                :aria-label="t('rightSidePanel.togglePanel')"
+                @click="openRightSidePanel"
              >
-                <i class="icon-[comfy--send] size-4" />
-                <span class="not-md:hidden">
-                  {{ t('actionbar.share') }}
-                </span>
+                <i class="icon-[lucide--panel-right] size-4" />
              </Button>
-              <div v-if="!isRightSidePanelOpen" class="relative">
-                <Button
-                  v-tooltip.bottom="rightSidePanelTooltipConfig"
-                  :class="
-                    cn(
-                      showErrorIndicatorOnPanelButton &&
-                        'outline-1 outline-destructive-background'
-                    )
-                  "
-                  variant="secondary"
-                  size="icon"
-                  :aria-label="t('rightSidePanel.togglePanel')"
-                  @click="openRightSidePanel"
-                >
-                  <i class="icon-[lucide--panel-right] size-4" />
-                </Button>
-                <StatusBadge
-                  v-if="showErrorIndicatorOnPanelButton"
-                  variant="dot"
-                  severity="danger"
-                  class="absolute -top-1 -right-1"
-                />
-              </div>
+              <StatusBadge
+                v-if="showErrorIndicatorOnPanelButton"
+                variant="dot"
+                severity="danger"
+                class="absolute -top-1 -right-1"
+              />
            </div>
-            <FreeTierQuota v-if="!isActionbarFloating" />
          </div>
        </div>
        <ErrorOverlay />
@@ -161,7 +147,6 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useQueueFeatureFlags } from '@/composables/queue/useQueueFeatureFlags'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
-import FreeTierQuota from '@/platform/cloud/subscription/components/FreeTierQuota.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { app } from '@/scripts/app'
@@ -224,6 +209,21 @@ const hasDockedButtons = computed(() => {
 const isActionbarContainerEmpty = computed(
  () => isActionbarFloating.value && !hasDockedButtons.value
 )
+const actionbarContainerClass = computed(() => {
+  const base =
+    'actionbar-container pointer-events-auto relative flex h-12 items-center gap-2 rounded-lg border bg-comfy-menu-bg shadow-interface'
+
+  if (isActionbarContainerEmpty.value) {
+    return cn(
+      base,
+      '-ml-2 w-0 min-w-0 border-transparent shadow-none',
+      'has-[.border-dashed]:ml-0 has-[.border-dashed]:w-auto has-[.border-dashed]:min-w-auto',
+      'has-[.border-dashed]:border-interface-stroke has-[.border-dashed]:pl-2 has-[.border-dashed]:shadow-interface'
+    )
+  }
+
+  return cn(base, 'px-2', 'border-interface-stroke')
+})
 const isIntegratedTabBar = computed(
  () => settingStore.get('Comfy.UI.TabBarLayout') !== 'Legacy'
 )
--- a/src/components/actionbar/ComfyActionbar.vue
+++ b/src/components/actionbar/ComfyActionbar.vue
@@ -11,6 +11,7 @@

    <Panel
      ref="panelRef"
+      data-testid="comfy-actionbar"
      class="pointer-events-auto"
      :style="style"
      :class="panelClass"
@@ -75,7 +76,6 @@
        </Button>
        <ContextMenu ref="queueContextMenu" :model="queueContextMenuItems" />
      </div>
-      <FreeTierQuota v-if="!isDocked" />
    </Panel>

    <Teleport v-if="inlineProgressTarget" :to="inlineProgressTarget">
@@ -110,7 +110,6 @@ import QueueInlineProgress from '@/components/queue/QueueInlineProgress.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useQueueFeatureFlags } from '@/composables/queue/useQueueFeatureFlags'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
-import FreeTierQuota from '@/platform/cloud/subscription/components/FreeTierQuota.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { useCommandStore } from '@/stores/commandStore'
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.test.ts
@@ -4,11 +4,11 @@ import { nextTick, ref } from 'vue'

 import CloudRunButtonWrapper from './CloudRunButtonWrapper.vue'

-const mockCanRunWorkflows = ref(true)
+const mockIsActiveSubscription = ref(true)

 vi.mock('@/composables/billing/useBillingContext', () => ({
  useBillingContext: () => ({
-    canRunWorkflows: mockCanRunWorkflows
+    isActiveSubscription: mockIsActiveSubscription
  })
 }))

@@ -32,7 +32,7 @@ function renderWrapper() {

 describe('CloudRunButtonWrapper', () => {
  beforeEach(() => {
-    mockCanRunWorkflows.value = true
+    mockIsActiveSubscription.value = true
  })

  it('renders the runnable queue button when the subscription is active', () => {
@@ -45,7 +45,7 @@ describe('CloudRunButtonWrapper', () => {
  })

  it('locks the run button when the subscription is inactive', () => {
-    mockCanRunWorkflows.value = false
+    mockIsActiveSubscription.value = false
    renderWrapper()

    expect(screen.getByTestId('subscribe-to-run-button')).toBeInTheDocument()
@@ -53,12 +53,12 @@ describe('CloudRunButtonWrapper', () => {
  })

  it('unlocks the run button once the subscription becomes active again', async () => {
-    mockCanRunWorkflows.value = false
+    mockIsActiveSubscription.value = false
    renderWrapper()

    expect(screen.getByTestId('subscribe-to-run-button')).toBeInTheDocument()

-    mockCanRunWorkflows.value = true
+    mockIsActiveSubscription.value = true
    await nextTick()

    expect(screen.getByTestId('queue-button')).toBeInTheDocument()
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
@@ -1,7 +1,7 @@
 <template>
  <component
    :is="currentButton"
-    :key="canRunWorkflows ? 'queue' : 'subscribe'"
+    :key="isActiveSubscription ? 'queue' : 'subscribe'"
  />
 </template>
 <script setup lang="ts">
@@ -11,9 +11,9 @@ import ComfyQueueButton from '@/components/actionbar/ComfyRunButton/ComfyQueueBu
 import { useBillingContext } from '@/composables/billing/useBillingContext'
 import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'

-const { canRunWorkflows } = useBillingContext()
+const { isActiveSubscription } = useBillingContext()

 const currentButton = computed(() =>
-  canRunWorkflows.value ? ComfyQueueButton : SubscribeToRunButton
+  isActiveSubscription.value ? ComfyQueueButton : SubscribeToRunButton
 )
 </script>
--- a/src/components/dialog/vRekaZIndex.ts
+++ b/src/components/dialog/vRekaZIndex.ts
@@ -1,6 +1,10 @@
 import { ZIndex } from '@primeuix/utils/zindex'
 import type { Directive } from 'vue'

+/** Shared PrimeVue/Reka modal stacking sequence; later registrations cover earlier ones. */
+export const MODAL_Z_KEY = 'modal'
+export const MODAL_Z_BASE = 1700
+
 // Both Reka and PrimeVue dialogs can appear at any depth in dialogStack, in
 // any order. PrimeVue auto-increments a per-key z-index counter so later
 // dialogs always cover earlier ones; Reka uses a static z-1700 class which
@@ -9,7 +13,7 @@ import type { Directive } from 'vue'
 // renderers share one stacking sequence: whichever dialog opens last wins.
 export const vRekaZIndex: Directive<HTMLElement> = {
  mounted(el) {
-    ZIndex.set('modal', el, 1700)
+    ZIndex.set(MODAL_Z_KEY, el, MODAL_Z_BASE)
  },
  beforeUnmount(el) {
    ZIndex.clear(el)
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -180,6 +180,7 @@ import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteracti
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import TransformPane from '@/renderer/core/layout/transform/TransformPane.vue'
 import MiniMap from '@/renderer/extensions/minimap/MiniMap.vue'
+import { useOnboardingTourController } from '@/renderer/extensions/onboardingTour/useOnboardingTourController'
 import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue'
 import { requestSlotLayoutSyncForAllNodes } from '@/renderer/extensions/vueNodes/composables/useSlotElementTracking'
 import { UnauthorizedError } from '@/scripts/api'
@@ -504,6 +505,9 @@ useEventListener(
 onMounted(async () => {
  comfyApp.vueAppReady = true
  workspaceStore.spinner = true
+  let templateFromUrl: Awaited<
+    ReturnType<typeof workflowPersistence.loadTemplateFromUrlIfPresent>
+  >
  try {
    // ChangeTracker needs to be initialized before setup, as it will overwrite
    // some listeners of litegraph canvas.
@@ -561,11 +565,38 @@ onMounted(async () => {
    // Restore saved workflow and workflow tabs state
    await workflowPersistence.initializeWorkflow()
    await workflowPersistence.restoreWorkflowTabsState()
-    await workflowPersistence.loadTemplateFromUrlIfPresent()
+    templateFromUrl = await workflowPersistence.loadTemplateFromUrlIfPresent()
  } finally {
    workspaceStore.spinner = false
  }
-  await workflowPersistence.loadSharedWorkflowFromUrlIfPresent()
+  const sharedFromUrl =
+    await workflowPersistence.loadSharedWorkflowFromUrlIfPresent()
+
+  // A ?template=/?share= URL loads a workflow directly (Getting Started is
+  // skipped). Start the onboarding tour on it; beginTour() self-gates and reads
+  // the now-loaded graph, so the loaders above must have finished first.
+  const startTourFromUrl = (
+    options?: Parameters<
+      ReturnType<typeof useOnboardingTourController>['beginTour']
+    >[0]
+  ) =>
+    useOnboardingTourController()
+      .beginTour(options)
+      .catch((error: unknown) => {
+        console.error('[onboardingTour] failed to start from URL', error)
+      })
+
+  if (templateFromUrl.loaded) {
+    void startTourFromUrl({
+      templateId: templateFromUrl.templateId,
+      entry: 'template_url'
+    })
+  } else if (
+    sharedFromUrl === 'loaded' ||
+    sharedFromUrl === 'loaded-without-assets'
+  ) {
+    void startTourFromUrl({ entry: 'share_url' })
+  }

  comfyApp.canvas.onSelectionChange = useChainCallback(
    comfyApp.canvas.onSelectionChange,
--- a/src/components/tab/TabList.vue
+++ b/src/components/tab/TabList.vue
@@ -1,14 +1,21 @@
 <template>
-  <div role="tablist" class="flex w-full items-center gap-2">
+  <div role="tablist" :class="cn('flex w-full items-center gap-2', className)">
    <slot />
  </div>
 </template>

 <script setup lang="ts" generic="T extends string = string">
+import type { HTMLAttributes } from 'vue'
 import { provide } from 'vue'

+import { cn } from '@comfyorg/tailwind-utils'
+
 import { TAB_LIST_INJECTION_KEY } from './tabKeys'

+const { class: className } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+
 const modelValue = defineModel<T>({ required: true })

 function select(value: string) {
--- a/src/components/topbar/CurrentUserPopoverLegacy.vue
+++ b/src/components/topbar/CurrentUserPopoverLegacy.vue
@@ -31,7 +31,7 @@

    <!-- Credits Section -->
    <div v-if="isActiveSubscription" class="flex items-center gap-2 px-4 py-2">
-      <i class="icon-[lucide--component] text-sm text-credit" />
+      <i class="icon-[lucide--component] text-sm text-amber-400" />
      <Skeleton v-if="isLoading" width="4rem" height="1.25rem" class="w-full" />
      <span v-else class="text-base font-semibold text-base-foreground">{{
        formattedBalance
@@ -48,7 +48,7 @@
      </Button>
      <Button
        v-if="isCloud && isFreeTier"
-        variant="subscribe"
+        variant="gradient"
        size="sm"
        data-testid="upgrade-to-add-credits-button"
        @click="handleUpgradeToAddCredits"
@@ -72,7 +72,7 @@
        :fluid="false"
        :label="$t('subscription.subscribeToComfyCloud')"
        size="sm"
-        button-variant="subscribe"
+        button-variant="gradient"
        @subscribed="handleSubscribed"
      />
    </div>
--- a/src/components/topbar/TopbarSubscribeButton.vue
+++ b/src/components/topbar/TopbarSubscribeButton.vue
@@ -2,7 +2,7 @@
  <Button
    v-if="isCloud && isFreeTier"
    class="mr-2 shrink-0 whitespace-nowrap"
-    variant="subscribe"
+    variant="gradient"
    size="sm"
    data-testid="topbar-subscribe-button"
    @click="handleClick"
--- a/src/components/ui/button/button.variants.ts
+++ b/src/components/ui/button/button.variants.ts
@@ -24,8 +24,8 @@ export const buttonVariants = cva({
      base: 'bg-base-background text-base-foreground hover:bg-secondary-background-hover',
      tertiary:
        'bg-tertiary-background text-base-foreground hover:bg-tertiary-background-hover',
-      subscribe:
-        'border-transparent bg-credit text-charcoal-800 hover:opacity-80'
+      gradient:
+        'border-transparent bg-(image:--subscription-button-gradient) text-white hover:opacity-90'
    },
    size: {
      sm: 'h-6 rounded-sm px-2 py-1 text-xs',
@@ -58,7 +58,7 @@ const variants = [
  'base',
  'tertiary',
  'overlay-white',
-  'subscribe'
+  'gradient'
 ] as const satisfies Array<ButtonVariants['variant']>
 const sizes = [
  'sm',
--- a/src/composables/billing/types.ts
+++ b/src/composables/billing/types.ts
@@ -112,13 +112,5 @@ export interface BillingContext extends BillingState, BillingActions {
   * (legacy) per-member tier plan, which keeps the old team pricing table.
   */
  isLegacyTeamPlan: ComputedRef<boolean>
-  /**
-   * True when the subscription is a team plan of either generation. Unlike
-   * `isLegacyTeamPlan` this does not require an active subscription: the spend
-   * gate folds billing_status into is_active, so a paused or payment-failed team
-   * plan reports is_active=false and must still read as a team plan.
-   */
-  isTeamPlan: ComputedRef<boolean>
  getMaxSeats: (tierKey: TierKey) => number
-  canRunWorkflows: ComputedRef<boolean>
 }
--- a/src/composables/billing/useBillingContext.test.ts
+++ b/src/composables/billing/useBillingContext.test.ts
@@ -19,7 +19,7 @@ const DEFAULT_BILLING_STATUS: BillingStatusResponse = {

 const {
  mockTeamWorkspacesEnabled,
-  mockBillingControlEnabled,
+  mockConsolidatedBillingEnabled,
  mockIsPersonal,
  mockPlans,
  mockPurchaseCredits,
@@ -27,7 +27,7 @@ const {
  mockBillingStatus
 } = vi.hoisted(() => ({
  mockTeamWorkspacesEnabled: { value: false },
-  mockBillingControlEnabled: { value: false },
+  mockConsolidatedBillingEnabled: { value: false },
  mockIsPersonal: { value: true },
  mockPlans: { value: [] as Plan[] },
  mockPurchaseCredits: vi.fn(),
@@ -59,11 +59,13 @@ vi.mock('@/composables/useFeatureFlags', async () => {
      teamWorkspacesEnabledRef.value = value
    }
  })
-  const billingControlEnabledRef = ref(mockBillingControlEnabled.value)
-  Object.defineProperty(mockBillingControlEnabled, 'value', {
-    get: () => billingControlEnabledRef.value,
+  const consolidatedBillingEnabledRef = ref(
+    mockConsolidatedBillingEnabled.value
+  )
+  Object.defineProperty(mockConsolidatedBillingEnabled, 'value', {
+    get: () => consolidatedBillingEnabledRef.value,
    set: (value: boolean) => {
-      billingControlEnabledRef.value = value
+      consolidatedBillingEnabledRef.value = value
    }
  })
  return {
@@ -72,8 +74,8 @@ vi.mock('@/composables/useFeatureFlags', async () => {
        get teamWorkspacesEnabled() {
          return mockTeamWorkspacesEnabled.value
        },
-        get billingControlEnabled() {
-          return mockBillingControlEnabled.value
+        get consolidatedBillingEnabled() {
+          return mockConsolidatedBillingEnabled.value
        }
      }
    })
@@ -163,7 +165,7 @@ describe('useBillingContext', () => {
    setActivePinia(createPinia())
    vi.clearAllMocks()
    mockTeamWorkspacesEnabled.value = false
-    mockBillingControlEnabled.value = false
+    mockConsolidatedBillingEnabled.value = false
    mockIsPersonal.value = true
    mockPlans.value = []
    mockBillingStatus.value = { ...DEFAULT_BILLING_STATUS }
@@ -175,27 +177,27 @@ describe('useBillingContext', () => {
    expect(type.value).toBe('legacy')
  })

-  it('keeps personal on legacy when billing control is disabled', () => {
+  it('keeps personal on legacy when consolidated billing is disabled', () => {
    mockTeamWorkspacesEnabled.value = true
-    mockBillingControlEnabled.value = false
+    mockConsolidatedBillingEnabled.value = false
    mockIsPersonal.value = true

    const { type } = useBillingContext()
    expect(type.value).toBe('legacy')
  })

-  it('selects workspace type for personal when billing control is enabled', () => {
+  it('selects workspace type for personal when consolidated billing is enabled', () => {
    mockTeamWorkspacesEnabled.value = true
-    mockBillingControlEnabled.value = true
+    mockConsolidatedBillingEnabled.value = true
    mockIsPersonal.value = true

    const { type } = useBillingContext()
    expect(type.value).toBe('workspace')
  })

-  it('selects workspace type for team regardless of billing control', () => {
+  it('selects workspace type for team regardless of consolidated billing', () => {
    mockTeamWorkspacesEnabled.value = true
-    mockBillingControlEnabled.value = false
+    mockConsolidatedBillingEnabled.value = false
    mockIsPersonal.value = false

    const { type } = useBillingContext()
@@ -296,7 +298,7 @@ describe('useBillingContext', () => {
    expect(workspaceApi.getBillingStatus).not.toHaveBeenCalled()

    // Authenticated remote config resolves the flag on for the same workspace
-    mockBillingControlEnabled.value = true
+    mockConsolidatedBillingEnabled.value = true
    mockTeamWorkspacesEnabled.value = true

    await vi.waitFor(() => {
@@ -305,16 +307,16 @@ describe('useBillingContext', () => {
    })
  })

-  it('moves a personal workspace to workspace billing when billing control flips on', async () => {
+  it('moves a personal workspace to workspace billing when consolidated billing flips on', async () => {
    mockTeamWorkspacesEnabled.value = true
-    mockBillingControlEnabled.value = false
+    mockConsolidatedBillingEnabled.value = false
    mockIsPersonal.value = true

    const { type } = useBillingContext()
    await nextTick()
    expect(type.value).toBe('legacy')

-    mockBillingControlEnabled.value = true
+    mockConsolidatedBillingEnabled.value = true

    await vi.waitFor(() => {
      expect(type.value).toBe('workspace')
@@ -323,9 +325,9 @@ describe('useBillingContext', () => {
  })

  describe('subscription mirror to workspace store', () => {
-    it('mirrors subscription for personal workspaces on the billing control flow', async () => {
+    it('mirrors subscription for personal workspaces on the consolidated billing flow', async () => {
      mockTeamWorkspacesEnabled.value = true
-      mockBillingControlEnabled.value = true
+      mockConsolidatedBillingEnabled.value = true
      mockIsPersonal.value = true

      const { initialize } = useBillingContext()
@@ -553,110 +555,4 @@ describe('useBillingContext', () => {
      expect(isLegacyTeamPlan.value).toBe(true)
    })
  })
-
-  describe('isTeamPlan', () => {
-    it('is false for a personal workspace', () => {
-      const { isTeamPlan } = useBillingContext()
-      expect(isTeamPlan.value).toBe(false)
-    })
-
-    // subscription_tier is omitted throughout: the backend sends 'TEAM' here, but
-    // the FE's SubscriptionTier resolves to the registry spec, which has no TEAM
-    // (tierPricing.ts imports comfyRegistryTypes for what is an ingest field).
-    // isTeamPlan reads the credit stop and the slug, never the tier — which is
-    // what keeps it working despite that divergence.
-    it('is true for a credit-slider team sub, which carries a credit stop', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        plan_slug: 'team_per_credit_monthly',
-        team_credit_stop: {
-          id: 'team_700',
-          credits_monthly: 700,
-          stop_usd: 332
-        }
-      }
-
-      const { initialize, isTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isTeamPlan.value).toBe(true)
-    })
-
-    it('is true for a legacy team sub, identified by slug rather than credit stop', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'STANDARD',
-        plan_slug: 'team-standard-annual'
-      }
-
-      const { initialize, isTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isTeamPlan.value).toBe(true)
-    })
-
-    // The banner states that need isTeamPlan most — paused and payment_failed —
-    // are exactly the ones the backend reports with is_active=false, because the
-    // spend gate folds billing_status into it. Coupling isTeamPlan to an active
-    // subscription would blank the banner precisely when it is needed.
-    it('stays true for a paused team plan, which the backend reports inactive', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: false,
-        has_funds: true,
-        billing_status: 'paused',
-        plan_slug: 'team_per_credit_monthly',
-        team_credit_stop: {
-          id: 'team_700',
-          credits_monthly: 700,
-          stop_usd: 332
-        }
-      }
-
-      const { initialize, isTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isTeamPlan.value).toBe(true)
-    })
-
-    it('stays true for a legacy team plan whose payment failed', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: false,
-        has_funds: true,
-        billing_status: 'payment_failed',
-        subscription_tier: 'STANDARD',
-        plan_slug: 'team-standard-annual'
-      }
-
-      const { initialize, isTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isTeamPlan.value).toBe(true)
-    })
-
-    it('is false for a team workspace on a personal-tier plan', async () => {
-      mockTeamWorkspacesEnabled.value = true
-      mockIsPersonal.value = false
-      mockBillingStatus.value = {
-        is_active: true,
-        has_funds: true,
-        subscription_tier: 'PRO',
-        plan_slug: 'pro-monthly'
-      }
-
-      const { initialize, isTeamPlan } = useBillingContext()
-      await initialize()
-
-      expect(isTeamPlan.value).toBe(false)
-    })
-  })
 })
--- a/src/composables/billing/useBillingContext.ts
+++ b/src/composables/billing/useBillingContext.ts
@@ -6,7 +6,6 @@ import {
  getTierFeatures
 } from '@/platform/cloud/subscription/constants/tierPricing'
 import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
-import { useFreeTierQuota } from '@/platform/cloud/subscription/composables/useFreeTierQuota'
 import type { SubscriptionDialogOptions } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import type {
  PreviewSubscribeOptions,
@@ -36,8 +35,8 @@ const LEGACY_TEAM_PLAN_SLUG_PREFIX = 'team-'
 *
 * - Team workspaces disabled (OSS/Desktop): legacy billing via /customers/*
 * - Team workspaces enabled: workspace billing via /api/billing/* for team
- *   workspaces, and for personal workspaces once billing control is enabled;
- *   personal workspaces otherwise stay on legacy billing
+ *   workspaces, and for personal workspaces once consolidated billing is
+ *   enabled; personal workspaces otherwise stay on legacy billing
 *
 * The context automatically initializes when the workspace changes and provides
 * a unified interface for subscription status, balance, and billing actions.
@@ -130,16 +129,6 @@ function useBillingContextInternal(): BillingContext {

  const isFreeTier = computed(() => subscription.value?.tier === 'FREE')

-  const freeTierQuota = useFreeTierQuota()
-
-  const canRunWorkflows = computed(
-    () =>
-      isActiveSubscription.value &&
-      (!isFreeTier.value ||
-        !freeTierQuota.quotaEnabled.value ||
-        freeTierQuota.freeTierExecutionPermitted.value)
-  )
-
  const isLegacyTeamPlan = computed(
    () =>
      type.value === 'workspace' &&
@@ -152,21 +141,6 @@ function useBillingContextInternal(): BillingContext {
        false)
  )

-  // Plan identity, independent of subscription health: the per-credit Team plan
-  // carries a credit stop, the retired seat-based ones a `team-` slug. Kept off
-  // isActiveSubscription on purpose — paused and payment_failed both force
-  // is_active=false, which is exactly when callers still need to know this is a
-  // team plan.
-  const isTeamPlan = computed(
-    () =>
-      type.value === 'workspace' &&
-      (currentTeamCreditStop.value !== null ||
-        (currentPlanSlug.value
-          ?.toLowerCase()
-          .startsWith(LEGACY_TEAM_PLAN_SLUG_PREFIX) ??
-          false))
-  )
-
  const billingStatus = computed(() =>
    toValue(activeContext.value.billingStatus)
  )
@@ -217,9 +191,9 @@ function useBillingContextInternal(): BillingContext {
    error.value = null
  }

-  // type flips when the team-workspaces or billing-control flag resolves from
-  // authenticated config, swapping the active backend. Reset then reinit on
-  // every workspace-id or type change.
+  // type flips when the team-workspaces or consolidated-billing flag resolves
+  // from authenticated config, swapping the active backend. Reset then reinit
+  // on every workspace-id or type change.
  watch(
    [() => store.activeWorkspace?.id, () => type.value],
    async ([newWorkspaceId]) => {
@@ -323,10 +297,8 @@ function useBillingContextInternal(): BillingContext {
    isLoading,
    error,
    isActiveSubscription,
-    canRunWorkflows,
    isFreeTier,
    isLegacyTeamPlan,
-    isTeamPlan,
    billingStatus,
    subscriptionStatus,
    tier,
--- a/src/composables/billing/useBillingRouting.test.ts
+++ b/src/composables/billing/useBillingRouting.test.ts
@@ -5,7 +5,7 @@ import { useBillingRouting } from './useBillingRouting'
 const { mockFlags, mockActiveWorkspace } = vi.hoisted(() => ({
  mockFlags: {
    teamWorkspacesEnabled: false,
-    billingControlEnabled: false
+    consolidatedBillingEnabled: false
  },
  mockActiveWorkspace: {
    value: null as { id: string; type: 'personal' | 'team' } | null
@@ -30,7 +30,7 @@ const team = { id: 'w-team', type: 'team' as const }
 describe('useBillingRouting', () => {
  beforeEach(() => {
    mockFlags.teamWorkspacesEnabled = false
-    mockFlags.billingControlEnabled = false
+    mockFlags.consolidatedBillingEnabled = false
    mockActiveWorkspace.value = personal
  })

@@ -44,9 +44,9 @@ describe('useBillingRouting', () => {
    expect(shouldUseWorkspaceBilling.value).toBe(false)
  })

-  it('keeps personal on legacy when billing control is disabled', () => {
+  it('keeps personal on legacy when consolidated billing is disabled', () => {
    mockFlags.teamWorkspacesEnabled = true
-    mockFlags.billingControlEnabled = false
+    mockFlags.consolidatedBillingEnabled = false
    mockActiveWorkspace.value = personal

    const { type } = useBillingRouting()
@@ -54,9 +54,9 @@ describe('useBillingRouting', () => {
    expect(type.value).toBe('legacy')
  })

-  it('moves personal to workspace billing when billing control is enabled', () => {
+  it('moves personal to workspace billing when consolidated billing is enabled', () => {
    mockFlags.teamWorkspacesEnabled = true
-    mockFlags.billingControlEnabled = true
+    mockFlags.consolidatedBillingEnabled = true
    mockActiveWorkspace.value = personal

    const { type, shouldUseWorkspaceBilling } = useBillingRouting()
@@ -65,9 +65,9 @@ describe('useBillingRouting', () => {
    expect(shouldUseWorkspaceBilling.value).toBe(true)
  })

-  it('uses workspace billing for team workspaces regardless of billing control', () => {
+  it('uses workspace billing for team workspaces regardless of consolidated billing', () => {
    mockFlags.teamWorkspacesEnabled = true
-    mockFlags.billingControlEnabled = false
+    mockFlags.consolidatedBillingEnabled = false
    mockActiveWorkspace.value = team

    const { type, shouldUseWorkspaceBilling } = useBillingRouting()
@@ -76,9 +76,9 @@ describe('useBillingRouting', () => {
    expect(shouldUseWorkspaceBilling.value).toBe(true)
  })

-  it('uses workspace billing for team workspaces with billing control enabled', () => {
+  it('uses workspace billing for team workspaces with consolidated billing enabled', () => {
    mockFlags.teamWorkspacesEnabled = true
-    mockFlags.billingControlEnabled = true
+    mockFlags.consolidatedBillingEnabled = true
    mockActiveWorkspace.value = team

    const { type, shouldUseWorkspaceBilling } = useBillingRouting()
@@ -89,7 +89,7 @@ describe('useBillingRouting', () => {

  it('defaults to legacy while the workspace has not loaded', () => {
    mockFlags.teamWorkspacesEnabled = true
-    mockFlags.billingControlEnabled = true
+    mockFlags.consolidatedBillingEnabled = true
    mockActiveWorkspace.value = null

    const { type } = useBillingRouting()
--- a/src/composables/billing/useBillingRouting.ts
+++ b/src/composables/billing/useBillingRouting.ts
@@ -8,7 +8,7 @@ import type { BillingType } from './types'
 /**
 * Selects the billing backend for the active workspace: legacy user-scoped
 * (`/customers/*`) or workspace-scoped (`/api/billing/*`). Personal workspaces
- * stay legacy until `billingControlEnabled`; team workspaces are always
+ * stay legacy until `consolidatedBillingEnabled`; team workspaces are always
 * workspace-scoped. The routing matrix is covered in useBillingRouting.test.ts.
 */
 export function useBillingRouting() {
@@ -23,7 +23,7 @@ export function useBillingRouting() {
    const workspaceType = workspaceStore.activeWorkspace?.type
    if (!workspaceType) return 'legacy'

-    if (workspaceType === 'personal' && !flags.billingControlEnabled) {
+    if (workspaceType === 'personal' && !flags.consolidatedBillingEnabled) {
      return 'legacy'
    }

--- a/src/composables/maskeditor/useMaskEditorLoader.test.ts
+++ b/src/composables/maskeditor/useMaskEditorLoader.test.ts
@@ -1,193 +0,0 @@
-import { fromAny } from '@total-typescript/shoehorn'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { api } from '@/scripts/api'
-import { useMaskEditorLoader } from './useMaskEditorLoader'
-
-// ---- Module Mocks ----
-
-const mockDataStore: Record<string, unknown> = {
-  inputData: null,
-  sourceNode: null,
-  setLoading: vi.fn()
-}
-
-vi.mock('@/stores/maskEditorDataStore', () => ({
-  useMaskEditorDataStore: vi.fn(() => mockDataStore)
-}))
-
-vi.mock('@/stores/nodeOutputStore', () => ({
-  useNodeOutputStore: vi.fn(() => ({
-    getNodeOutputs: vi.fn(() => undefined)
-  }))
-}))
-
-const distribution = vi.hoisted(() => ({ isCloud: false }))
-
-vi.mock('@/platform/distribution/types', () => ({
-  get isCloud() {
-    return distribution.isCloud
-  }
-}))
-
-vi.mock('@/scripts/api', () => ({
-  api: {
-    fetchApi: vi.fn(),
-    apiURL: vi.fn((route: string) => `http://localhost:8188/api${route}`)
-  }
-}))
-
-vi.mock('@/scripts/app', () => ({
-  app: {
-    getPreviewFormatParam: vi.fn(() => ''),
-    getRandParam: vi.fn(() => '')
-  }
-}))
-
-// Mock Image constructor so the loader's image fetches resolve without a
-// network. Records every requested URL; URLs matching failUrlPattern reject
-// like a 404 would (reset per test in beforeEach).
-const requestedUrls: string[] = []
-let failUrlPattern: RegExp | null = null
-
-class MockImage {
-  crossOrigin = ''
-  onload: ((ev: Event) => void) | null = null
-  onerror: ((ev: unknown) => void) | null = null
-  private _src = ''
-  get src() {
-    return this._src
-  }
-  set src(value: string) {
-    this._src = value
-    requestedUrls.push(value)
-    queueMicrotask(() => {
-      if (failUrlPattern?.test(value)) this.onerror?.(new Event('error'))
-      else this.onload?.(new Event('load'))
-    })
-  }
-}
-
-function createLoadImageNode(widgetValue: string): LGraphNode {
-  return fromAny<LGraphNode, unknown>({
-    id: 7,
-    type: 'LoadImage',
-    imgs: [{ src: 'http://localhost:8188/api/view?filename=whatever.png' }],
-    images: undefined,
-    widgets: [{ name: 'image', value: widgetValue }]
-  })
-}
-
-function subfolderOf(url: string): string | null {
-  return new URL(url).searchParams.get('subfolder')
-}
-
-function requestedLayerUrls(layerFilename: string): string[] {
-  return requestedUrls.filter((url) => url.includes(layerFilename))
-}
-
-describe('useMaskEditorLoader', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    requestedUrls.length = 0
-    failUrlPattern = null
-    distribution.isCloud = false
-    mockDataStore.inputData = null
-    mockDataStore.sourceNode = null
-    vi.stubGlobal('Image', MockImage)
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it('loads layer files from the input root for saves without a subfolder prefix', async () => {
-    const node = createLoadImageNode('clipspace-painted-masked-123.png [input]')
-
-    await useMaskEditorLoader().loadFromNode(node)
-
-    for (const layerFilename of [
-      'clipspace-mask-123.png',
-      'clipspace-paint-123.png'
-    ]) {
-      const layerUrls = requestedLayerUrls(layerFilename)
-      expect(layerUrls.length).toBeGreaterThan(0)
-      for (const url of layerUrls) {
-        expect(subfolderOf(url)).toBeNull()
-      }
-    }
-    expect(mockDataStore.inputData).toMatchObject({
-      sourceRef: { filename: 'clipspace-mask-123.png', type: 'input' },
-      nodeId: 7
-    })
-  })
-
-  it('loads layer files from the clipspace subfolder for legacy saves', async () => {
-    const node = createLoadImageNode(
-      'clipspace/clipspace-painted-masked-123.png [input]'
-    )
-
-    await useMaskEditorLoader().loadFromNode(node)
-
-    for (const layerFilename of [
-      'clipspace-mask-123.png',
-      'clipspace-paint-123.png'
-    ]) {
-      const layerUrls = requestedLayerUrls(layerFilename)
-      expect(layerUrls.length).toBeGreaterThan(0)
-      for (const url of layerUrls) {
-        expect(subfolderOf(url)).toBe('clipspace')
-      }
-    }
-  })
-
-  it('keeps the clipspace subfolder for cloud-resolved layer files', async () => {
-    distribution.isCloud = true
-    vi.mocked(api.fetchApi).mockResolvedValue({
-      ok: true,
-      json: () =>
-        Promise.resolve({
-          painted_masked: 'hash-painted-masked.png',
-          painted: 'hash-painted.png',
-          paint: 'hash-paint.png',
-          mask: 'hash-mask.png'
-        })
-    } as Response)
-    const node = createLoadImageNode('clipspace-painted-masked-123.png [input]')
-
-    await useMaskEditorLoader().loadFromNode(node)
-
-    for (const layerFilename of ['hash-painted-masked.png', 'hash-paint.png']) {
-      const layerUrls = requestedLayerUrls(layerFilename)
-      expect(layerUrls.length).toBeGreaterThan(0)
-      for (const url of layerUrls) {
-        expect(subfolderOf(url)).toBe('clipspace')
-      }
-    }
-  })
-
-  it('falls back to the node image when layer files are missing', async () => {
-    failUrlPattern = /clipspace-(mask|paint)-123\.png/
-    const node = createLoadImageNode('clipspace-painted-masked-123.png [input]')
-
-    await useMaskEditorLoader().loadFromNode(node)
-
-    expect(mockDataStore.inputData).toMatchObject({
-      sourceRef: { filename: 'clipspace-painted-masked-123.png' },
-      paintLayer: undefined,
-      nodeId: 7
-    })
-  })
-
-  it('still fails when the node image itself cannot be loaded', async () => {
-    failUrlPattern = /./
-    const node = createLoadImageNode('some-regular-image.png [input]')
-
-    await expect(useMaskEditorLoader().loadFromNode(node)).rejects.toThrow()
-    expect(mockDataStore.setLoading).toHaveBeenLastCalledWith(
-      false,
-      expect.any(String)
-    )
-  })
-})
--- a/src/composables/maskeditor/useMaskEditorLoader.ts
+++ b/src/composables/maskeditor/useMaskEditorLoader.ts
@@ -53,10 +53,10 @@ function imageLayerFilenamesIfApplicable(
  }
 }

-function toRef(filename: string, subfolder: string): ImageRef {
+function toRef(filename: string): ImageRef {
  return {
    filename,
-    subfolder,
+    subfolder: 'clipspace',
    type: 'input'
  }
 }
@@ -150,72 +150,34 @@ export function useMaskEditorLoader() {
        }
      }

-      // Pattern-matched layer files live next to the painted-masked image the
-      // widget points at: the input root for saves under the unified upload
-      // contract (#12318), or the clipspace subfolder for saves made before
-      // it. Cloud resolves the hash filenames from its mask-layers API
-      // server-side, so its refs keep the subfolder they always used.
-      const layerSubfolder = maskLayersFromApi
-        ? 'clipspace'
-        : (nodeImageRef.subfolder ?? '')
+      const baseImageUrl = imageLayerFilenames?.maskedImage
+        ? mkFileUrl({ ref: toRef(imageLayerFilenames.maskedImage) })
+        : nodeImageUrl

-      const layeredBaseUrl = imageLayerFilenames?.maskedImage
-        ? mkFileUrl({
-            ref: toRef(imageLayerFilenames.maskedImage, layerSubfolder)
-          })
-        : undefined
-      const baseImageUrl = layeredBaseUrl ?? nodeImageUrl
+      const sourceRef = imageLayerFilenames?.maskedImage
+        ? parseImageRef(baseImageUrl)
+        : nodeImageRef

      let paintLayerUrl: string | null = null
      if (maskLayersFromApi?.paint) {
-        paintLayerUrl = mkFileUrl({
-          ref: toRef(maskLayersFromApi.paint, layerSubfolder)
-        })
+        paintLayerUrl = mkFileUrl({ ref: toRef(maskLayersFromApi.paint) })
      } else if (imageLayerFilenames?.paint) {
-        paintLayerUrl = mkFileUrl({
-          ref: toRef(imageLayerFilenames.paint, layerSubfolder)
-        })
+        paintLayerUrl = mkFileUrl({ ref: toRef(imageLayerFilenames.paint) })
      }

-      const loadLayers = (baseUrl: string, paintUrl: string | null) =>
-        Promise.all([
-          loadImageLayer(baseUrl, 'rgb'),
-          loadImageLayer(baseUrl, 'a'),
-          paintUrl ? loadPaintLayer(paintUrl) : Promise.resolve(undefined)
-        ])
-
-      const loadInputData = async () => {
-        try {
-          const [baseLayer, maskLayer, paintLayer] = await loadLayers(
-            baseImageUrl,
-            paintLayerUrl
-          )
-          return {
-            baseLayer,
-            maskLayer,
-            paintLayer,
-            sourceRef: layeredBaseUrl
-              ? parseImageRef(baseImageUrl)
-              : nodeImageRef
-          }
-        } catch (error) {
-          if (!layeredBaseUrl) throw error
-          console.warn(
-            '[MaskEditorLoader] Failed to load editor layer files, falling back to the node image',
-            error
-          )
-          const [baseLayer, maskLayer] = await loadLayers(nodeImageUrl, null)
-          return {
-            baseLayer,
-            maskLayer,
-            paintLayer: undefined,
-            sourceRef: nodeImageRef
-          }
-        }
-      }
+      const [baseLayer, maskLayer, paintLayer] = await Promise.all([
+        loadImageLayer(baseImageUrl, 'rgb'),
+        loadImageLayer(baseImageUrl, 'a'),
+        paintLayerUrl
+          ? loadPaintLayer(paintLayerUrl)
+          : Promise.resolve(undefined)
+      ])

      dataStore.inputData = {
-        ...(await loadInputData()),
+        baseLayer,
+        maskLayer,
+        paintLayer,
+        sourceRef,
        nodeId: node.id
      }

--- a/src/composables/node/usePriceBadge.ts
+++ b/src/composables/node/usePriceBadge.ts
@@ -1,19 +1,12 @@
-import { createSharedComposable } from '@vueuse/core'
-import { computed, toValue } from 'vue'
-
 import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { LGraphBadge } from '@/lib/litegraph/src/litegraph'

-import { useVueNodeLifecycle } from '@/composables/graph/useVueNodeLifecycle'
 import { useNodePricing } from '@/composables/node/useNodePricing'
 import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces'
 import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput'
-import { trackNodePrice } from '@/renderer/extensions/vueNodes/composables/usePartitionedBadges'
-import { app } from '@/scripts/app'
-import { useWidgetValueStore } from '@/stores/widgetValueStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { adjustColor } from '@/utils/colorUtil'
-import { mapAllNodes } from '@/utils/graphTraversalUtil'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'

 type LinkedWidgetInput = INodeInputSlot & {
  _subgraphSlot?: SubgraphInput
@@ -157,20 +150,3 @@ export const usePriceBadge = () => {
    updateSubgraphCredits
  }
 }
-export const useCreditsBadgesInGraph = createSharedComposable(() => {
-  const { isCreditsBadge } = usePriceBadge()
-  const vueNodeLifecycle = useVueNodeLifecycle()
-  return computed(() => {
-    void vueNodeLifecycle.nodeManager.value?.vueNodeData.size
-    if (!app.graph) return []
-    return mapAllNodes(app.graph, (node) => {
-      if (node.isSubgraphNode()) return
-
-      const priceBadge = node.badges.find(isCreditsBadge)
-      if (!priceBadge) return
-
-      trackNodePrice(node)
-      return [node.title, toValue(priceBadge).text, node.id] as const
-    })
-  })
-})
--- a/src/composables/useDesktopLayout.ts
+++ b/src/composables/useDesktopLayout.ts
@@ -0,0 +1,6 @@
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+
+/** `md`+ viewport — the width the onboarding tours need to place their coach-marks. */
+export function useDesktopLayout() {
+  return useBreakpoints(breakpointsTailwind).greaterOrEqual('md')
+}
--- a/src/composables/useFeatureFlags.test.ts
+++ b/src/composables/useFeatureFlags.test.ts
@@ -7,7 +7,7 @@ import {
 } from '@/composables/useFeatureFlags'
 import * as distributionTypes from '@/platform/distribution/types'
 import {
-  cachedBillingControlEnabled,
+  cachedConsolidatedBillingEnabled,
  cachedTeamWorkspacesEnabled,
  remoteConfig,
  remoteConfigState
@@ -226,19 +226,19 @@ describe('useFeatureFlags', () => {
      expect(flags.teamWorkspacesEnabled).toBe(true)
    })

-    it('billingControlEnabled override bypasses isCloud and isAuthenticatedConfigLoaded guards', () => {
+    it('consolidatedBillingEnabled override bypasses isCloud and isAuthenticatedConfigLoaded guards', () => {
      vi.mocked(distributionTypes).isCloud = false
-      localStorage.setItem('ff:billing_control_enabled', 'true')
+      localStorage.setItem('ff:consolidated_billing_enabled', 'true')

      const { flags } = useFeatureFlags()
-      expect(flags.billingControlEnabled).toBe(true)
+      expect(flags.consolidatedBillingEnabled).toBe(true)
    })

-    it('billingControlEnabled is false off-cloud even without an override', () => {
+    it('consolidatedBillingEnabled is false off-cloud even without an override', () => {
      vi.mocked(distributionTypes).isCloud = false

      const { flags } = useFeatureFlags()
-      expect(flags.billingControlEnabled).toBe(false)
+      expect(flags.consolidatedBillingEnabled).toBe(false)
    })
  })

@@ -248,7 +248,7 @@ describe('useFeatureFlags', () => {
      remoteConfigState.value = 'unloaded'
      remoteConfig.value = {}
      cachedTeamWorkspacesEnabled.value = undefined
-      cachedBillingControlEnabled.value = undefined
+      cachedConsolidatedBillingEnabled.value = undefined
      localStorage.clear()
    })

@@ -257,36 +257,36 @@ describe('useFeatureFlags', () => {
      remoteConfigState.value = 'unloaded'
      remoteConfig.value = {}
      cachedTeamWorkspacesEnabled.value = undefined
-      cachedBillingControlEnabled.value = undefined
+      cachedConsolidatedBillingEnabled.value = undefined
      localStorage.clear()
    })

    it('returns the cached session value during the auth window', () => {
      cachedTeamWorkspacesEnabled.value = false
-      cachedBillingControlEnabled.value = true
+      cachedConsolidatedBillingEnabled.value = true

      const { flags } = useFeatureFlags()
      expect(flags.teamWorkspacesEnabled).toBe(false)
-      expect(flags.billingControlEnabled).toBe(true)
+      expect(flags.consolidatedBillingEnabled).toBe(true)
    })

    it('defaults to false during the auth window when nothing is cached', () => {
      const { flags } = useFeatureFlags()
      expect(flags.teamWorkspacesEnabled).toBe(false)
-      expect(flags.billingControlEnabled).toBe(false)
+      expect(flags.consolidatedBillingEnabled).toBe(false)
    })

    it('prefers authenticated remoteConfig over the server feature fallback', () => {
      remoteConfigState.value = 'authenticated'
      remoteConfig.value = {
        team_workspaces_enabled: true,
-        billing_control_enabled: true
+        consolidated_billing_enabled: true
      }
      vi.mocked(api.getServerFeature).mockReturnValue(false)

      const { flags } = useFeatureFlags()
      expect(flags.teamWorkspacesEnabled).toBe(true)
-      expect(flags.billingControlEnabled).toBe(true)
+      expect(flags.consolidatedBillingEnabled).toBe(true)
    })

    it('falls back to api.getServerFeature when authenticated config omits the flag', () => {
@@ -295,14 +295,15 @@ describe('useFeatureFlags', () => {
      vi.mocked(api.getServerFeature).mockImplementation(
        (path, defaultValue) => {
          if (path === ServerFeatureFlag.TEAM_WORKSPACES_ENABLED) return true
-          if (path === ServerFeatureFlag.BILLING_CONTROL_ENABLED) return true
+          if (path === ServerFeatureFlag.CONSOLIDATED_BILLING_ENABLED)
+            return true
          return defaultValue
        }
      )

      const { flags } = useFeatureFlags()
      expect(flags.teamWorkspacesEnabled).toBe(true)
-      expect(flags.billingControlEnabled).toBe(true)
+      expect(flags.consolidatedBillingEnabled).toBe(true)
    })
  })

--- a/src/composables/useFeatureFlags.ts
+++ b/src/composables/useFeatureFlags.ts
@@ -3,7 +3,7 @@ import type { Ref } from 'vue'

 import { isCloud, isNightly } from '@/platform/distribution/types'
 import {
-  cachedBillingControlEnabled,
+  cachedConsolidatedBillingEnabled,
  cachedTeamWorkspacesEnabled,
  isAuthenticatedConfigLoaded,
  remoteConfig
@@ -32,9 +32,9 @@ export enum ServerFeatureFlag {
  COMFYHUB_PROFILE_GATE_ENABLED = 'comfyhub_profile_gate_enabled',
  SHOW_SIGNIN_BUTTON = 'show_signin_button',
  UNIFIED_CLOUD_AUTH = 'unified_cloud_auth',
-  BILLING_CONTROL_ENABLED = 'billing_control_enabled',
-  FREE_TIER_JOB_ALLOWANCE_ENABLED = 'free_tier_job_allowance_enabled',
-  SIGNUP_TURNSTILE = 'signup_turnstile'
+  CONSOLIDATED_BILLING_ENABLED = 'consolidated_billing_enabled',
+  SIGNUP_TURNSTILE = 'signup_turnstile',
+  ONBOARDING_TOUR_ENABLED = 'onboarding_tour_enabled'
 }

 /**
@@ -192,25 +192,15 @@ export function useFeatureFlags() {
      )
    },
    /**
-     * Whether personal workspaces use the workspace-scoped billing flow. While
-     * false (default), personal workspaces stay on the legacy per-user billing
-     * flow; team workspaces are unaffected.
+     * Whether personal workspaces use the consolidated (workspace-scoped)
+     * billing flow. While false (default), personal workspaces stay on the
+     * legacy per-user billing flow; team workspaces are unaffected.
     */
-    get billingControlEnabled() {
+    get consolidatedBillingEnabled() {
      return resolveAuthGatedFlag(
-        ServerFeatureFlag.BILLING_CONTROL_ENABLED,
-        remoteConfig.value.billing_control_enabled,
-        cachedBillingControlEnabled
-      )
-    },
-    get freeTierJobAllowanceEnabled() {
-      const config = remoteConfig.value as typeof remoteConfig.value & {
-        free_tier_job_allowance_enabled?: boolean
-      }
-      return resolveFlag(
-        ServerFeatureFlag.FREE_TIER_JOB_ALLOWANCE_ENABLED,
-        config.free_tier_job_allowance_enabled,
-        false
+        ServerFeatureFlag.CONSOLIDATED_BILLING_ENABLED,
+        remoteConfig.value.consolidated_billing_enabled,
+        cachedConsolidatedBillingEnabled
      )
    },
    get signupTurnstileMode() {
@@ -219,6 +209,13 @@ export function useFeatureFlags() {
        remoteConfig.value.signup_turnstile,
        'off'
      )
+    },
+    get onboardingTourEnabled() {
+      return resolveFlag(
+        ServerFeatureFlag.ONBOARDING_TOUR_ENABLED,
+        remoteConfig.value.onboarding_tour_enabled,
+        false
+      )
    }
  })

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