feat: Tweeq-style drag scrubbing for ScrubableNumberInput

X-axis drags value, Y-axis adjusts sensitivity with an SVG dot-ruler
overlay showing the active precision. Pointer-lock hides the cursor
during scrub and returns it to the press position on release.

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

@@ -45,8 +45,12 @@ jobs:
           path: dist/
           retention-days: 1
 
+      # Build cloud distribution for @cloud tagged tests
+      # NX_SKIP_NX_CACHE=true is required because `nx build` was already run
+      # for the OSS distribution above. Without skipping cache, Nx returns
+      # the cached OSS build since env vars aren't part of the cache key.
       - name: Build cloud frontend
-        run: pnpm build:cloud
+        run: NX_SKIP_NX_CACHE=true pnpm build:cloud
 
       - name: Upload cloud frontend
         uses: actions/upload-artifact@v6

.github/workflows/release-draft-create.yaml

@@ -59,7 +59,7 @@ jobs:
           pnpm zipdist ./dist ./dist-desktop.zip
 
           # Default release artifact for core/PyPI.
-          pnpm build
+          NX_SKIP_NX_CACHE=true pnpm build
           pnpm zipdist
       - name: Upload dist artifact
         uses: actions/upload-artifact@v6

.gitignore

@@ -19,7 +19,6 @@ yarn.lock
 
 node_modules
 .pnpm-store
-.nx
 dist
 dist-ssr
 *.local
@@ -90,6 +89,10 @@ storybook-static
 # MCP Servers
 .playwright-mcp/*
 
+.nx/cache
+.nx/workspace-data
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md
 vite.config.*.timestamp*
 vitest.config.*.timestamp*
 

.nxignore

@@ -0,0 +1 @@
+.claude/worktrees

.oxlintrc.json

@@ -2,6 +2,7 @@
   "$schema": "./node_modules/oxlint/configuration_schema.json",
   "ignorePatterns": [
     ".i18nrc.cjs",
+    ".nx/*",
     "**/vite.config.*.timestamp*",
     "**/vitest.config.*.timestamp*",
     "components.d.ts",

AGENTS.md

@@ -35,7 +35,7 @@ See @docs/guidance/\*.md for file-type-specific conventions (auto-loaded by glob
 
 ## Monorepo Architecture
 
-The project uses **pnpm workspaces** for monorepo organization and native tool CLIs for task execution
+The project uses **Nx** for build orchestration and task management
 
 ## Package Manager
 
@@ -237,6 +237,7 @@ See @docs/testing/\*.md for detailed patterns.
 - ComfyUI: <https://docs.comfy.org>
 - Electron: <https://www.electronjs.org/docs/latest/>
 - Wiki: <https://deepwiki.com/Comfy-Org/ComfyUI_frontend/1-overview>
+- Nx: <https://nx.dev/docs/reference/nx-commands>
 - [Practical Test Pyramid](https://martinfowler.com/articles/practical-test-pyramid.html)
 
 ## Architecture Decision Records

TROUBLESHOOTING.md

@@ -7,7 +7,7 @@ This guide helps you resolve common issues when developing ComfyUI Frontend.
 ```mermaid
 flowchart TD
     A[Having Issues?] --> B{What's the problem?}
-    B -->|Dev server stuck| C[pnpm dev hangs]
+    B -->|Dev server stuck| C[nx serve hangs]
     B -->|Build errors| D[Check build issues]
     B -->|Lint errors| Q[Check linting issues]
     B -->|Dependency issues| E[Package problems]
@@ -23,7 +23,7 @@ flowchart TD
     G -->|No| H[Run: pnpm i]
     G -->|Still stuck| I[Run: pnpm clean]
     I --> J{Still stuck?}
-    J -->|Yes| K[Nuclear option:<br/>pnpm clean:all<br/>&& pnpm i]
+    J -->|Yes| K[Nuclear option:<br/>pnpm dlx rimraf node_modules<br/>&& pnpm i]
     J -->|No| L[Fixed!]
     H --> L
 
@@ -41,11 +41,11 @@ flowchart TD
 
 ### Development Server Issues
 
-#### Q: `pnpm dev` gets stuck and won't start
+#### Q: `pnpm dev` or `nx serve` gets stuck and won't start
 
 **Symptoms:**
 
-- Command hangs during Vite startup
+- Command hangs on "nx serve"
 - Dev server doesn't respond
 - Terminal appears frozen
 
@@ -65,7 +65,7 @@ flowchart TD
 
 3. **Last resort - Full node_modules reset:**
    ```bash
-   pnpm clean:all && pnpm i
+   pnpm dlx rimraf node_modules && pnpm i
    ```
 
 **Why this happens:**
@@ -73,7 +73,7 @@ flowchart TD
 - Corrupted dependency cache
 - Outdated lock files after branch switching
 - Incomplete previous installations
-- stale local build cache
+- NX cache corruption
 
 ---
 

apps/desktop-ui/package.json

@@ -3,11 +3,8 @@
   "version": "0.0.6",
   "type": "module",
   "scripts": {
-    "dev": "pnpm -w exec vite --config apps/desktop-ui/vite.config.mts",
-    "build": "pnpm -w exec vite build --config apps/desktop-ui/vite.config.mts",
-    "preview": "pnpm -w exec vite preview --config apps/desktop-ui/vite.config.mts",
-    "lint": "eslint src --cache",
-    "typecheck": "vue-tsc --noEmit -p tsconfig.json",
+    "lint": "nx run @comfyorg/desktop-ui:lint",
+    "typecheck": "nx run @comfyorg/desktop-ui:typecheck",
     "test:unit": "vitest run --config vitest.config.mts",
     "storybook": "storybook dev -p 6007",
     "build-storybook": "storybook build -o dist/storybook"
@@ -36,5 +33,88 @@
     "vite-plugin-html": "catalog:",
     "vite-plugin-vue-devtools": "catalog:",
     "vue-tsc": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:desktop",
+      "type:app"
+    ],
+    "targets": {
+      "dev": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "vite --config vite.config.mts"
+        }
+      },
+      "serve": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "vite --config vite.config.mts"
+        }
+      },
+      "build": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "dependsOn": [
+          "^build"
+        ],
+        "options": {
+          "command": "vite build --config apps/desktop-ui/vite.config.mts"
+        },
+        "outputs": [
+          "{projectRoot}/dist"
+        ]
+      },
+      "preview": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "dependsOn": [
+          "build"
+        ],
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "vite preview --config vite.config.mts"
+        }
+      },
+      "storybook": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "storybook dev -p 6007"
+        }
+      },
+      "build-storybook": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "storybook build -o dist/storybook"
+        },
+        "outputs": [
+          "{projectRoot}/dist/storybook"
+        ]
+      },
+      "lint": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "eslint src --cache"
+        }
+      },
+      "typecheck": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/desktop-ui",
+          "command": "vue-tsc --noEmit -p tsconfig.json"
+        }
+      }
+    }
   }
 }

apps/website/package.json

@@ -45,5 +45,88 @@
     "tsx": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:website",
+      "type:app"
+    ],
+    "targets": {
+      "dev": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "astro dev"
+        }
+      },
+      "serve": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "astro dev"
+        }
+      },
+      "build": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "dependsOn": [
+          "^build"
+        ],
+        "options": {
+          "cwd": "apps/website",
+          "command": "astro build"
+        },
+        "outputs": [
+          "{projectRoot}/dist"
+        ]
+      },
+      "preview": {
+        "executor": "nx:run-commands",
+        "continuous": true,
+        "dependsOn": [
+          "build"
+        ],
+        "options": {
+          "cwd": "apps/website",
+          "command": "astro preview"
+        }
+      },
+      "typecheck": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "astro check"
+        }
+      },
+      "test:unit": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "vitest run"
+        }
+      },
+      "test:coverage": {
+        "executor": "nx:run-commands",
+        "cache": true,
+        "options": {
+          "cwd": "apps/website",
+          "command": "vitest run --coverage"
+        }
+      },
+      "test:e2e": {
+        "executor": "nx:run-commands",
+        "dependsOn": [
+          "build"
+        ],
+        "options": {
+          "cwd": "apps/website",
+          "command": "playwright test"
+        }
+      }
+    }
   }
 }

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

@@ -10,7 +10,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-24 lg:px-20 lg:py-32">
+  <section class="px-6 py-24 lg:px-20 lg:py-32">
     <GlassCard
       class="mx-auto mt-20 flex flex-col gap-12 lg:flex-row lg:items-stretch lg:gap-8"
     >

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

@@ -74,7 +74,7 @@ useHeroAnimation({
     </div>
 
     <!-- Video -->
-    <div ref="videoRef" class="max-w-9xl mx-auto px-4 pb-20 lg:px-20 lg:pb-40">
+    <div ref="videoRef" class="px-4 pb-20 lg:px-20 lg:pb-40">
       <VideoPlayer
         src="https://media.comfy.org/website/about/co-founders.webm"
         poster="https://media.comfy.org/website/about/co-founders-poster.webp"

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

@@ -33,7 +33,7 @@ const values: {
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-24 lg:px-20 lg:py-32">
+  <section class="px-6 py-24 lg:px-20 lg:py-32">
     <div class="mx-auto max-w-5xl text-center">
       <SectionLabel>
         {{ t('about.values.label', locale) }}

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

@@ -16,7 +16,7 @@ const investors = [
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-24 lg:px-20 lg:py-32">
+  <section class="px-6 py-24 lg:px-20 lg:py-32">
     <div class="mx-auto text-center">
       <span
         class="text-primary-comfy-yellow text-xs font-semibold tracking-widest uppercase"

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

@@ -14,7 +14,7 @@ const reasons: TranslationKey[] = [
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-24 lg:px-20 lg:py-32">
+  <section class="px-6 py-24 lg:px-20 lg:py-32">
     <WireNodeLayout :reasons right-card-padding="p-6" :locale="locale">
       <template #right-card>
         <img

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

@@ -41,7 +41,7 @@ function toggle(index: number) {
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-24 md:px-20 md:py-40">
+  <section class="px-4 py-24 md:px-20 md:py-40">
     <div class="flex flex-col gap-6 md:flex-row md:gap-16">
       <!-- Left heading -->
       <div

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

@@ -46,9 +46,7 @@ const cards = excludeProduct
 </script>
 
 <template>
-  <section
-    class="bg-primary-comfy-ink max-w-9xl mx-auto px-0 py-20 lg:px-20 lg:py-24"
-  >
+  <section class="bg-primary-comfy-ink px-0 py-20 lg:px-20 lg:py-24">
     <!-- Header -->
     <div class="flex flex-col items-center px-4 text-center">
       <SectionLabel v-if="labelKey">

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

@@ -45,11 +45,11 @@ const progressPercent = computed(() => `${progress.value * 100}%`)
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:px-16 lg:py-24">
+  <section class="px-6 py-16 lg:px-16 lg:py-24">
     <!-- Scrollable track -->
     <div
       ref="trackRef"
-      class="flex snap-x snap-mandatory scrollbar-none gap-12 overflow-x-auto lg:gap-20"
+      class="scrollbar-none flex snap-x snap-mandatory gap-12 overflow-x-auto lg:gap-20"
     >
       <div
         v-for="(fb, i) in feedbacks"

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

@@ -72,7 +72,7 @@ function handleLogoLoad() {
     </div>
 
     <!-- Video -->
-    <div ref="videoRef" class="max-w-9xl mx-auto px-4 pb-20 lg:px-20 lg:pb-40">
+    <div ref="videoRef" class="px-4 pb-20 lg:px-20 lg:pb-40">
       <VideoPlayer
         src="https://media.comfy.org/website/customers/blackmath/video.webm"
         poster="https://media.comfy.org/website/customers/blackmath/poster.webp"

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

@@ -10,7 +10,7 @@ const prefix = locale === 'zh-CN' ? '/zh-CN' : ''
 
 <template>
   <section
-    class="max-w-9xl mx-auto grid grid-cols-1 gap-6 px-6 py-16 lg:grid-cols-2 lg:px-16 lg:py-24"
+    class="grid grid-cols-1 gap-6 px-6 py-16 lg:grid-cols-2 lg:px-16 lg:py-24"
   >
     <a
       v-for="story in customerStories"

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

@@ -7,7 +7,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:px-20 lg:py-40">
+  <section class="px-6 py-16 lg:px-20 lg:py-40">
     <VideoPlayer
       src="https://media.comfy.org/website/customers/silverside/video.webm"
       poster="https://media.comfy.org/website/customers/silverside/poster.webp"

apps/website/src/components/gallery/ContactSection.vue

@@ -7,7 +7,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 
 <template>
   <section
-    class="max-w-9xl mx-auto flex flex-col items-center px-4 pt-16 pb-24 text-center lg:px-20 lg:pt-20 lg:pb-40"
+    class="flex flex-col items-center px-4 pt-16 pb-24 text-center lg:px-20 lg:pt-20 lg:pb-40"
   >
     <span
       class="text-primary-comfy-yellow text-sm font-bold tracking-widest uppercase"

apps/website/src/components/gallery/GallerySection.vue

@@ -223,10 +223,7 @@ while (idx < items.length) {
 </script>
 
 <template>
-  <section
-    data-testid="gallery-grid"
-    class="max-w-9xl mx-auto px-4 pb-20 lg:px-20"
-  >
+  <section data-testid="gallery-grid" class="px-4 pb-20 lg:px-20">
     <!-- Desktop grid -->
     <div
       class="rounded-5xl bg-transparency-white-t4 hidden flex-col gap-2 p-2 lg:flex"

apps/website/src/components/gallery/HeroSection.vue

@@ -8,9 +8,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>
 
 <template>
-  <section
-    class="max-w-9xl mx-auto flex flex-col items-center px-6 pt-36 pb-16 text-center"
-  >
+  <section class="flex flex-col items-center px-6 pt-36 pb-16 text-center">
     <SectionLabel>
       {{ t('gallery.label', locale) }}
     </SectionLabel>

apps/website/src/components/home/BuildWhatSection.vue

@@ -15,7 +15,7 @@ const row2 = [
 
 <template>
   <section
-    class="bg-primary-comfy-ink max-w-9xl mx-auto flex flex-col items-center px-4 py-24 lg:px-6 lg:py-32"
+    class="bg-primary-comfy-ink flex flex-col items-center px-4 py-24 lg:px-6 lg:py-32"
   >
     <!-- Node rows -->
     <div

apps/website/src/components/home/CaseStudySpotlightSection.vue

@@ -12,9 +12,7 @@ const routes = getRoutes(locale)
 </script>
 
 <template>
-  <section
-    class="bg-primary-comfy-ink max-w-9xl mx-auto px-4 py-20 lg:px-20 lg:py-24"
-  >
+  <section class="bg-primary-comfy-ink px-4 py-20 lg:px-20 lg:py-24">
     <GlassCard
       class="flex flex-col gap-12 lg:flex-row lg:items-stretch lg:gap-8"
     >

apps/website/src/components/home/GetStartedSection.vue

@@ -36,9 +36,7 @@ const steps = [
 </script>
 
 <template>
-  <section
-    class="bg-primary-comfy-ink max-w-9xl mx-auto px-4 py-20 lg:px-20 lg:py-24"
-  >
+  <section class="bg-primary-comfy-ink px-4 py-20 lg:px-20 lg:py-24">
     <div class="flex flex-col gap-12 lg:flex-row lg:gap-8">
       <!-- Left heading -->
       <div

apps/website/src/components/home/HeroSection.vue

@@ -15,7 +15,7 @@ const { loaded: logoLoaded } = useHeroLogo(logoContainer)
 
 <template>
   <section
-    class="max-w-9xl relative mx-auto flex min-h-auto flex-col lg:flex-row lg:items-center"
+    class="relative flex min-h-auto flex-col lg:flex-row lg:items-center"
   >
     <div
       ref="logoContainer"

apps/website/src/components/home/ProductShowcaseSection.vue

@@ -55,10 +55,7 @@ watch(activeIndex, (current, previous) => {
 </script>
 
 <template>
-  <section
-    ref="sectionRef"
-    class="max-w-9xl mx-auto px-4 py-20 lg:px-20 lg:py-24"
-  >
+  <section ref="sectionRef" class="px-4 py-20 lg:px-20 lg:py-24">
     <!-- Section header -->
     <div class="flex flex-col items-center text-center">
       <NodeBadge :segments="badgeSegments" segment-class="" />

apps/website/src/components/models/ModelCreationsSection.vue

@@ -1,136 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-
-import type { Locale } from '../../i18n/translations'
-import type { GalleryItem } from '../gallery/GallerySection.vue'
-
-import { t } from '../../i18n/translations'
-import BrandButton from '../common/BrandButton.vue'
-import GalleryCard from '../gallery/GalleryCard.vue'
-import GalleryDetailModal from '../gallery/GalleryDetailModal.vue'
-
-const { locale = 'en' } = defineProps<{ locale?: Locale }>()
-
-const modelName = 'Grok'
-const ctaHref = 'https://comfy.org/workflows/model/grok'
-
-const items: GalleryItem[] = [
-  {
-    video: 'https://media.comfy.org/videos/compressed_512/eye.webm',
-    title: 'Until Our Eye Interlink harajuku',
-    userAlias: 'ShaneF Motion Design',
-    teamAlias: 'ThinkDiffusion',
-    tool: 'Grok Imagine',
-    href: 'https://www.thinkdiffusion.com/studio#success-stories-anta'
-  },
-  {
-    image: 'https://media.comfy.org/website/gallery/gallery.webp',
-    title: 'Amber Astronaut',
-    userAlias: 'Yogo',
-    teamAlias: '',
-    tool: 'Grok Imagine',
-    href: 'https://de.linkedin.com/in/milan-kastenmueller-18778a174'
-  },
-  {
-    video: 'https://media.comfy.org/videos/compressed_512/cigarette.webm',
-    title: 'Autopoiesis',
-    userAlias: 'Yogo',
-    teamAlias: 'Visual Frisson',
-    tool: 'Grok Imagine',
-    href: 'https://www.instagram.com/visualfrisson/?hl=en'
-  },
-  {
-    video: 'https://media.comfy.org/videos/compressed_512/kyrie.webm',
-    title: 'Origins',
-    userAlias: 'ShaneF Motion Design',
-    teamAlias: 'ThinkDiffusion',
-    tool: 'Grok Imagine',
-    href: 'https://vimeo.com/1021360563'
-  },
-  {
-    image: 'https://media.comfy.org/website/gallery/desert.webp',
-    title: 'Desert Landing',
-    userAlias: 'Yogo',
-    teamAlias: '',
-    tool: 'Grok Imagine',
-    href: 'https://de.linkedin.com/in/milan-kastenmueller-18778a174'
-  }
-]
-
-const modalOpen = ref(false)
-const modalIndex = ref(0)
-
-function openDetail(index: number) {
-  modalIndex.value = index
-  modalOpen.value = true
-}
-
-const title = t('models.list.creations.title', locale).replace(
-  '{name}',
-  modelName
-)
-const ctaLabel = t('models.list.creations.cta', locale)
-</script>
-
-<template>
-  <section
-    data-testid="model-creations"
-    class="flex flex-col items-center px-4 pt-12 pb-20 lg:px-20"
-  >
-    <h2
-      class="text-primary-comfy-canvas max-w-4xl text-center text-3xl font-light tracking-tight lg:text-5xl"
-    >
-      {{ title }}
-    </h2>
-    <BrandButton
-      :href="ctaHref"
-      variant="solid"
-      size="lg"
-      class="mt-16 px-8 py-4 uppercase"
-    >
-      {{ ctaLabel }}
-    </BrandButton>
-
-    <div class="mt-20 hidden w-full flex-col gap-2 lg:flex">
-      <div class="grid grid-cols-2 gap-2">
-        <GalleryCard
-          v-for="(item, i) in items.slice(0, 2)"
-          :key="i"
-          :item
-          :locale
-          @click="openDetail(i)"
-        />
-      </div>
-      <div v-if="items.length > 2" class="grid grid-cols-3 gap-2">
-        <GalleryCard
-          v-for="(item, i) in items.slice(2, 5)"
-          :key="i + 2"
-          :item
-          :locale
-          @click="openDetail(i + 2)"
-        />
-      </div>
-    </div>
-
-    <div
-      class="rounded-5xl bg-transparency-white-t4 mt-12 flex w-full flex-col gap-6 p-2 lg:hidden"
-    >
-      <GalleryCard
-        v-for="(item, i) in items"
-        :key="i"
-        :item
-        :locale
-        mobile
-        @click="openDetail(i)"
-      />
-    </div>
-
-    <GalleryDetailModal
-      v-if="modalOpen"
-      :items
-      :initial-index="modalIndex"
-      :locale
-      @close="modalOpen = false"
-    />
-  </section>
-</template>

apps/website/src/components/models/ModelsHeroSection.vue

@@ -1,50 +0,0 @@
-<script setup lang="ts">
-import type { Locale } from '../../i18n/translations'
-
-import { t } from '../../i18n/translations'
-import BrandButton from '../common/BrandButton.vue'
-
-const {
-  locale = 'en',
-  modelName,
-  ctaHref,
-  mediaSrc,
-  mediaAlt = ''
-} = defineProps<{
-  locale?: Locale
-  modelName: string
-  ctaHref: string
-  mediaSrc: string
-  mediaAlt?: string
-}>()
-</script>
-
-<template>
-  <section class="flex flex-col items-center px-6 pt-36 pb-16 text-center">
-    <h1
-      class="text-primary-comfy-canvas max-w-4xl text-4xl font-light tracking-tight lg:text-6xl"
-    >
-      {{ modelName }} in <span class="text-primary-comfy-yellow">ComfyUI</span>
-    </h1>
-    <p
-      class="text-primary-comfy-canvas mt-6 max-w-2xl text-sm text-pretty lg:text-base"
-    >
-      {{ t('hero.subtitle', locale) }}
-    </p>
-    <BrandButton
-      :href="ctaHref"
-      variant="solid"
-      size="lg"
-      class="mt-10 px-8 py-4 uppercase"
-    >
-      {{ t('models.list.heroCta', locale).replace('{name}', modelName) }}
-    </BrandButton>
-    <div class="mt-16 w-full max-w-5xl">
-      <img
-        :src="mediaSrc"
-        :alt="mediaAlt"
-        class="rounded-4.5xl size-full object-cover"
-      />
-    </div>
-  </section>
-</template>

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

@@ -121,7 +121,7 @@ const activePlanIndex = ref(0)
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-16 lg:px-20 lg:py-14">
+  <section class="px-4 py-16 lg:px-20 lg:py-14">
     <!-- Header -->
     <div class="mx-auto mb-8 max-w-3xl text-center lg:mb-10">
       <h1
@@ -135,7 +135,7 @@ const activePlanIndex = ref(0)
     </div>
 
     <!-- Mobile plan tabs -->
-    <div class="mb-6 flex scrollbar-none gap-2 overflow-x-auto lg:hidden">
+    <div class="scrollbar-none mb-6 flex gap-2 overflow-x-auto lg:hidden">
       <button
         v-for="(plan, index) in plans"
         :key="plan.id"

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

@@ -60,7 +60,7 @@ const features: IncludedFeature[] = [
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-16 lg:px-20 lg:py-24">
+  <section class="px-4 py-16 lg:px-20 lg:py-24">
     <div class="mx-auto w-full lg:grid lg:grid-cols-[280px_1fr] lg:gap-x-16">
       <!-- Heading -->
       <div

apps/website/src/components/product/cloud/AudienceSection.vue

@@ -25,7 +25,7 @@ const cards = [
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 pt-24 lg:px-20 lg:pt-40">
+  <section class="px-4 pt-24 lg:px-20 lg:pt-40">
     <h2
       class="text-primary-comfy-canvas text-3.5xl/tight mx-auto max-w-3xl text-center font-light lg:text-5xl/tight"
     >

apps/website/src/components/product/cloud/PricingSection.vue

@@ -10,7 +10,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 
 <template>
   <section
-    class="bg-transparency-white-t4 rounded-5xl max-w-9xl mx-auto mt-4 mb-24 p-2 px-4 lg:mt-8 lg:mb-40 lg:px-20"
+    class="bg-transparency-white-t4 rounded-5xl mx-4 mt-4 mb-24 p-2 lg:mx-20 lg:mt-8 lg:mb-40"
   >
     <div
       class="bg-primary-comfy-yellow flex flex-col gap-24 rounded-4xl p-8 lg:flex-row lg:items-end lg:justify-between"

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

@@ -442,7 +442,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-24 lg:px-20">
+  <section class="px-4 py-24 lg:px-20">
     <GlassCard
       class="flex flex-col gap-8 lg:flex-row lg:items-stretch lg:gap-16"
     >

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

@@ -10,7 +10,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-24 lg:px-20 lg:py-40">
+  <section class="px-4 py-24 lg:px-20 lg:py-40">
     <div
       class="bg-transparency-white-t4 rounded-5xl flex flex-col-reverse items-stretch gap-10 p-2 lg:flex-row lg:gap-8"
     >

apps/website/src/components/product/shared/AIModelsSection.vue

@@ -77,9 +77,7 @@ function getCardClass(layoutClass: string): string {
 </script>
 
 <template>
-  <section
-    class="bg-primary-comfy-ink max-w-9xl mx-auto px-4 py-24 lg:px-20 lg:py-40"
-  >
+  <section class="bg-primary-comfy-ink px-4 py-24 lg:px-20 lg:py-40">
     <div class="mx-auto flex w-full max-w-7xl flex-col items-center">
       <p
         class="text-primary-comfy-yellow text-center text-sm font-bold tracking-widest uppercase"

apps/website/src/components/product/shared/CardGridSection.vue

@@ -11,7 +11,7 @@ defineProps<{
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-24 lg:px-20">
+  <section class="px-4 py-24 lg:px-20">
     <SectionHeader>
       {{ heading }}
       <template v-if="subtitle" #subtitle>

apps/website/src/components/product/shared/FeatureShowcaseSection.vue

@@ -22,7 +22,7 @@ defineProps<{
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-4 py-24 lg:px-20">
+  <section class="px-4 py-24 lg:px-20">
     <SectionHeader>
       {{ heading }}
       <template #subtitle>

apps/website/src/components/product/shared/ReasonSection.vue

@@ -29,7 +29,7 @@ const {
 
 <template>
   <section
-    class="max-w-9xl mx-auto flex flex-col gap-4 px-4 py-24 lg:flex-row lg:gap-16 lg:px-20 lg:py-40"
+    class="flex flex-col gap-4 px-4 py-24 lg:flex-row lg:gap-16 lg:px-20 lg:py-40"
   >
     <!-- Left heading -->
     <div

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

@@ -1,5 +1,5 @@
 {
-  "fetchedAt": "2026-05-22T00:07:48.353Z",
+  "fetchedAt": "2026-05-12T16:10:34.114Z",
   "departments": [
     {
       "name": "DESIGN",
@@ -36,14 +36,14 @@
           "id": "6a6d865eeb3c10a8",
           "title": "Senior Software Engineer, Frontend",
           "department": "Engineering",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/c3e0584d-5490-491f-aae4-b5922ef63fd2"
         },
         {
           "id": "1b4f7f1da9616e14",
           "title": "Senior Software Engineer, Backend Generalist",
           "department": "Engineering",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/732f8b39-076d-4847-afe3-f54d4451607e"
         },
         {
@@ -71,14 +71,14 @@
           "id": "91604c4182a1bc3c",
           "title": "Software Engineer, Core ComfyUI Contributor",
           "department": "Engineering",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/7d4062d6-d500-445a-9a5f-014971af259f"
         },
         {
           "id": "a1dbc0576ab14034",
           "title": "Software Engineer, ComfyUI Desktop",
           "department": "Engineering",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/ad2f76cb-a787-47d8-81c5-7e7f917747c0"
         },
         {
@@ -105,21 +105,21 @@
           "id": "23dd98cab77ff459",
           "title": "Freelance Motion Designer",
           "department": "Marketing",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/a7ccc2b4-4d9d-4e04-b39c-28a711995b5b"
         },
         {
           "id": "a998b9fc973ff3c0",
           "title": "Creative Artist",
           "department": "Marketing",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/19ba10aa-4961-45e8-8473-66a8a7a8079d"
         },
         {
           "id": "3e730938026d6e70",
           "title": "Graphic Designer",
           "department": "Marketing",
-          "location": "Remote",
+          "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/49fa0b07-3fa1-4a3a-b2c6-d2cc684ad63f"
         },
         {
@@ -135,20 +135,6 @@
           "department": "Marketing",
           "location": "San Francisco",
           "jobUrl": "https://jobs.ashbyhq.com/comfy-org/89d3ff75-2055-4e92-9c69-81feff55627c"
-        },
-        {
-          "id": "e11f8b9e58dbea81",
-          "title": "Creative Producer",
-          "department": "Marketing",
-          "location": "Remote",
-          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/7be2d690-7a2b-4ebf-b1c4-6907b273d3d9"
-        },
-        {
-          "id": "6eac654593208ec3",
-          "title": "Forward Deployed Creative Technologist",
-          "department": "Marketing",
-          "location": "San Francisco",
-          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/af49c05f-dcd8-4c3d-a464-43eb3b1c6efc"
         }
       ]
     },

apps/website/src/i18n/translations.ts

@@ -4194,76 +4194,6 @@ const translations = {
     'zh-CN': '支持的模型'
   },
 
-  // Models list page (/models)
-  'models.list.label': { en: 'MODELS', 'zh-CN': '模型' },
-  'models.list.heroCta': {
-    en: 'Try {name} Now',
-    'zh-CN': '立即试用 {name}'
-  },
-  'models.list.creations.title': {
-    en: '{name} Image and Video Creations',
-    'zh-CN': '{name} 图像与视频创作'
-  },
-  'models.list.creations.cta': {
-    en: 'Explore Workflows',
-    'zh-CN': '探索工作流'
-  },
-  'models.list.heroTitle.before': {
-    en: 'Run the world’s leading AI models in',
-    'zh-CN': '在以下平台运行世界领先的 AI 模型'
-  },
-  'models.list.heroSubtitle': {
-    en: 'From open-source diffusion checkpoints to partner APIs — every major model, with community workflow templates ready to run.',
-    'zh-CN':
-      '从开源扩散模型到合作伙伴 API，涵盖每一个主流模型，并附带可直接运行的社区工作流模板。'
-  },
-  'models.list.card.workflows': {
-    en: '{count} workflows',
-    'zh-CN': '{count} 个工作流'
-  },
-  'models.list.contact.label': {
-    en: 'COMFY HUB',
-    'zh-CN': 'COMFY HUB'
-  },
-  'models.showcase.label': { en: 'AI MODELS', 'zh-CN': 'AI 模型' },
-  'models.showcase.heading': {
-    en: 'Run the world’s\nleading AI models',
-    'zh-CN': '运行全球领先的\nAI 模型'
-  },
-  'models.showcase.subtitle': {
-    en: 'New models are added as they launch.',
-    'zh-CN': '新模型发布后会第一时间上线。'
-  },
-  'models.showcase.cta': {
-    en: 'EXPLORE WORKFLOWS',
-    'zh-CN': '探索工作流'
-  },
-  'models.showcase.card.grokImagine': {
-    en: 'Grok Imagine',
-    'zh-CN': 'Grok Imagine'
-  },
-  'models.showcase.card.nanoBananaPro': {
-    en: 'Nano Banana Pro',
-    'zh-CN': 'Nano Banana Pro'
-  },
-  'models.showcase.card.ltx23': {
-    en: 'LTX 2.3',
-    'zh-CN': 'LTX 2.3'
-  },
-  'models.showcase.card.qwenAdvancedEdit': {
-    en: 'Advanced image\nediting with Qwen',
-    'zh-CN': '使用 Qwen 进行\n高级图像编辑'
-  },
-  'models.showcase.card.wan22TextToVideo': {
-    en: 'Wan 2.2\ntext to video',
-    '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 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 Hub</a> 查看最新工作流。'
-  },
-
   // Payment status pages
   'payment.success.label': {
     en: 'PAYMENT',

apps/website/src/layouts/BaseLayout.astro

@@ -72,9 +72,6 @@ const websiteJsonLd = {
     <title>{title}</title>
 
     <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
-    <link rel="icon" href="/favicon.png" type="image/png" />
-    <link rel="icon" href="/favicon.ico" sizes="any" />
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
     <link rel="canonical" href={canonicalURL.href} />
     <link rel="preconnect" href="https://www.googletagmanager.com" />
     <link rel="dns-prefetch" href="https://www.googletagmanager.com" />

apps/website/src/pages/models.astro

@@ -1,22 +0,0 @@
----
-import BaseLayout from '../layouts/BaseLayout.astro'
-import ModelsHeroSection from '../components/models/ModelsHeroSection.vue'
-import ModelCreationsSection from '../components/models/ModelCreationsSection.vue'
-import AIModelsSection from '../components/product/shared/AIModelsSection.vue'
-import ProductShowcaseSection from '../components/home/ProductShowcaseSection.vue' 
----
-
-<BaseLayout
-  title="Models — Comfy"
-  description="Run the world's leading AI models in ComfyUI. Browse every supported model with community workflow templates ready to run."
->
-  <ModelsHeroSection
-    modelName="Grok Imagine"
-    ctaHref="/p/supported-models/grok-image"
-    mediaSrc="https://media.comfy.org/website/gallery/gallery.webp"
-    mediaAlt="Grok Imagine output created with ComfyUI"
-  />
-  <ModelCreationsSection client:load />
-  <AIModelsSection client:load />
-  <ProductShowcaseSection client:load />
-</BaseLayout>

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

@@ -1,23 +0,0 @@
----
-import BaseLayout from '../../layouts/BaseLayout.astro'
-import ModelsHeroSection from '../../components/models/ModelsHeroSection.vue'
-import ModelCreationsSection from '../../components/models/ModelCreationsSection.vue'
-import AIModelsSection from '../../components/product/shared/AIModelsSection.vue'
-import ProductShowcaseSection from '../../components/home/ProductShowcaseSection.vue'
----
-
-<BaseLayout
-  title="模型 — Comfy"
-  description="在 ComfyUI 中运行世界领先的 AI 模型。浏览所有支持的模型及社区工作流模板。"
->
-  <ModelsHeroSection
-    locale="zh-CN"
-    modelName="Grok Imagine"
-    ctaHref="/zh-CN/p/supported-models/grok-image"
-    mediaSrc="https://media.comfy.org/website/gallery/gallery.webp"
-    mediaAlt="Grok Imagine output created with ComfyUI"
-  />
-  <ModelCreationsSection client:load locale="zh-CN" />
-  <AIModelsSection client:load locale="zh-CN" />
-  <ProductShowcaseSection client:load locale="zh-CN" />
-</BaseLayout>

apps/website/src/utils/cloudNodes.registry.test.ts

@@ -2,8 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 
 import {
   DEFAULT_REGISTRY_BASE_URL,
-  fetchRegistryPacks,
-  fetchRegistryPacksWithNodes
+  fetchRegistryPacks
 } from './cloudNodes.registry'
 
 function jsonResponse(
@@ -143,315 +142,3 @@ describe('fetchRegistryPacks', () => {
     expect(result.size).toBe(0)
   })
 })
-
-describe('fetchRegistryPacksWithNodes', () => {
-  it('fetches pack metadata and comfy nodes for each pack', async () => {
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      // Pack metadata request
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'comfyui-impact-pack',
-              name: 'ComfyUI Impact Pack',
-              repository: 'https://github.com/ltdrdata/ComfyUI-Impact-Pack',
-              latest_version: { version: '8.0.0', createdAt: '2026-01-01' }
-            }
-          ]
-        })
-      }
-
-      // Comfy nodes request
-      if (url.pathname.includes('/comfy-nodes')) {
-        return jsonResponse({
-          comfy_nodes: [
-            { comfy_node_name: 'FaceDetailer', category: 'detailer' },
-            { comfy_node_name: 'DetailerForEach', category: 'detailer' }
-          ],
-          totalNumberOfPages: 1
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['comfyui-impact-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    expect(result.size).toBe(1)
-    const packData = result.get('comfyui-impact-pack')
-    expect(packData).not.toBeNull()
-    expect(packData?.pack.name).toBe('ComfyUI Impact Pack')
-    expect(packData?.nodes).toHaveLength(2)
-    expect(packData?.nodes[0]?.comfy_node_name).toBe('FaceDetailer')
-  })
-
-  it('handles pagination for comfy nodes', async () => {
-    let comfyNodesCallCount = 0
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'big-pack',
-              name: 'Big Pack',
-              latest_version: { version: '1.0.0' }
-            }
-          ]
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        comfyNodesCallCount++
-        const page = Number(url.searchParams.get('page') ?? '1')
-
-        if (page === 1) {
-          return jsonResponse({
-            comfy_nodes: [
-              { comfy_node_name: 'Node1', category: 'cat1' },
-              { comfy_node_name: 'Node2', category: 'cat1' }
-            ],
-            totalNumberOfPages: 2
-          })
-        } else {
-          return jsonResponse({
-            comfy_nodes: [{ comfy_node_name: 'Node3', category: 'cat2' }],
-            totalNumberOfPages: 2
-          })
-        }
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['big-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    expect(comfyNodesCallCount).toBe(2)
-    const packData = result.get('big-pack')
-    expect(packData?.nodes).toHaveLength(3)
-  })
-
-  it('returns null for packs without latest_version', async () => {
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'no-version-pack',
-              name: 'No Version Pack',
-              latest_version: null
-            }
-          ]
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['no-version-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    expect(result.get('no-version-pack')).toBeNull()
-  })
-
-  it('returns empty nodes array when comfy-nodes request fails', async () => {
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'failing-pack',
-              name: 'Failing Pack',
-              latest_version: { version: '1.0.0' }
-            }
-          ]
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        return new Response('Server error', { status: 500 })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['failing-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    const packData = result.get('failing-pack')
-    expect(packData).not.toBeNull()
-    expect(packData?.pack.name).toBe('Failing Pack')
-    expect(packData?.nodes).toHaveLength(0)
-  })
-
-  it('handles null comfy_nodes in response', async () => {
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'null-nodes-pack',
-              name: 'Null Nodes Pack',
-              latest_version: { version: '1.0.0' }
-            }
-          ]
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        return jsonResponse({
-          comfy_nodes: null,
-          totalNumberOfPages: 1
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['null-nodes-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    const packData = result.get('null-nodes-pack')
-    expect(packData?.nodes).toHaveLength(0)
-  })
-
-  it('fetches nodes for multiple packs in parallel', async () => {
-    const packIds = ['pack-a', 'pack-b', 'pack-c']
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        const requestedIds = url.searchParams.getAll('node_id')
-        return jsonResponse({
-          nodes: requestedIds.map((id) => ({
-            id,
-            name: id.toUpperCase(),
-            latest_version: { version: '1.0.0' }
-          }))
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        const packId = url.pathname.split('/nodes/')[1]?.split('/')[0]
-        return jsonResponse({
-          comfy_nodes: [
-            { comfy_node_name: `${packId}-node`, category: 'test' }
-          ],
-          totalNumberOfPages: 1
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(packIds, {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    expect(result.size).toBe(3)
-    for (const packId of packIds) {
-      const packData = result.get(packId)
-      expect(packData).not.toBeNull()
-      expect(packData?.nodes[0]?.comfy_node_name).toBe(`${packId}-node`)
-    }
-  })
-
-  it('retries comfy-nodes fetch once on failure', async () => {
-    let comfyNodesAttempts = 0
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'retry-pack',
-              name: 'Retry Pack',
-              latest_version: { version: '1.0.0' }
-            }
-          ]
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        comfyNodesAttempts++
-        if (comfyNodesAttempts === 1) {
-          return new Response('Server error', { status: 500 })
-        }
-        return jsonResponse({
-          comfy_nodes: [{ comfy_node_name: 'RetryNode', category: 'test' }],
-          totalNumberOfPages: 1
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['retry-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    expect(comfyNodesAttempts).toBe(2)
-    const packData = result.get('retry-pack')
-    expect(packData?.nodes).toHaveLength(1)
-    expect(packData?.nodes[0]?.comfy_node_name).toBe('RetryNode')
-  })
-
-  it('normalizes null boolean fields in comfy nodes', async () => {
-    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
-      const url = new URL(String(input))
-
-      if (url.pathname === '/nodes') {
-        return jsonResponse({
-          nodes: [
-            {
-              id: 'bool-pack',
-              name: 'Bool Pack',
-              latest_version: { version: '1.0.0' }
-            }
-          ]
-        })
-      }
-
-      if (url.pathname.includes('/comfy-nodes')) {
-        return jsonResponse({
-          comfy_nodes: [
-            {
-              comfy_node_name: 'TestNode',
-              category: 'test',
-              deprecated: null,
-              experimental: null
-            }
-          ],
-          totalNumberOfPages: 1
-        })
-      }
-
-      return new Response('Not found', { status: 404 })
-    })
-
-    const result = await fetchRegistryPacksWithNodes(['bool-pack'], {
-      fetchImpl: fetchImpl as typeof fetch
-    })
-
-    const packData = result.get('bool-pack')
-    expect(packData?.nodes[0]?.deprecated).toBeUndefined()
-    expect(packData?.nodes[0]?.experimental).toBeUndefined()
-  })
-})

apps/website/src/utils/cloudNodes.registry.ts

@@ -5,10 +5,8 @@ import type { components } from '@comfyorg/registry-types'
 export const DEFAULT_REGISTRY_BASE_URL = 'https://api.comfy.org'
 const DEFAULT_TIMEOUT_MS = 5_000
 const BATCH_SIZE = 50
-const COMFY_NODES_PAGE_SIZE = 500
 
 export type RegistryPack = components['schemas']['Node']
-export type RegistryComfyNode = components['schemas']['ComfyNode']
 
 function nullToUndefined<T>(value: T | null | undefined): T | undefined {
   return value ?? undefined
@@ -60,29 +58,6 @@ const RegistryListResponseSchema = z
   })
   .passthrough()
 
-const RegistryComfyNodeSchema = z
-  .object({
-    comfy_node_name: optionalString,
-    category: optionalString,
-    description: optionalString,
-    deprecated: z
-      .boolean()
-      .nullish()
-      .transform((v) => v ?? undefined),
-    experimental: z
-      .boolean()
-      .nullish()
-      .transform((v) => v ?? undefined)
-  })
-  .passthrough()
-
-const RegistryComfyNodesResponseSchema = z
-  .object({
-    comfy_nodes: z.array(RegistryComfyNodeSchema).nullish(),
-    totalNumberOfPages: z.number().nullish()
-  })
-  .passthrough()
-
 interface FetchRegistryOptions {
   baseUrl?: string
   timeoutMs?: number
@@ -147,142 +122,6 @@ export async function fetchRegistryPacks(
   return resolved
 }
 
-export interface RegistryPackWithNodes {
-  pack: RegistryPack
-  nodes: RegistryComfyNode[]
-}
-
-export async function fetchRegistryPacksWithNodes(
-  packIds: readonly string[],
-  options: FetchRegistryOptions = {}
-): Promise<Map<string, RegistryPackWithNodes | null>> {
-  const packs = await fetchRegistryPacks(packIds, options)
-
-  const baseUrl = options.baseUrl ?? DEFAULT_REGISTRY_BASE_URL
-  const timeoutMs = clampTimeoutMs(options.timeoutMs)
-  const fetchImpl = options.fetchImpl ?? fetch
-
-  const entries = await Promise.all(
-    [...packs.entries()].map(
-      async ([packId, pack]): Promise<
-        [string, RegistryPackWithNodes | null]
-      > => {
-        if (!pack?.latest_version?.version) {
-          return [packId, null]
-        }
-
-        const nodes = await fetchComfyNodesForPack(
-          fetchImpl,
-          baseUrl,
-          packId,
-          pack.latest_version.version,
-          timeoutMs
-        )
-
-        return [packId, { pack, nodes }]
-      }
-    )
-  )
-
-  return new Map(entries)
-}
-
-async function fetchComfyNodesForPack(
-  fetchImpl: typeof fetch,
-  baseUrl: string,
-  packId: string,
-  version: string,
-  timeoutMs: number
-): Promise<RegistryComfyNode[]> {
-  const allNodes: RegistryComfyNode[] = []
-  let page = 1
-  let totalPages = 1
-
-  while (page <= totalPages) {
-    const result = await fetchComfyNodesPageWithRetry(
-      fetchImpl,
-      baseUrl,
-      packId,
-      version,
-      page,
-      timeoutMs
-    )
-
-    if (!result) break
-
-    allNodes.push(...result.nodes)
-    totalPages = result.totalPages
-    page++
-  }
-
-  return allNodes
-}
-
-async function fetchComfyNodesPageWithRetry(
-  fetchImpl: typeof fetch,
-  baseUrl: string,
-  packId: string,
-  version: string,
-  page: number,
-  timeoutMs: number
-): Promise<{ nodes: RegistryComfyNode[]; totalPages: number } | null> {
-  const firstAttempt = await fetchComfyNodesPage(
-    fetchImpl,
-    baseUrl,
-    packId,
-    version,
-    page,
-    timeoutMs
-  )
-  if (firstAttempt) return firstAttempt
-
-  // Retry once on failure
-  return fetchComfyNodesPage(
-    fetchImpl,
-    baseUrl,
-    packId,
-    version,
-    page,
-    timeoutMs
-  )
-}
-
-async function fetchComfyNodesPage(
-  fetchImpl: typeof fetch,
-  baseUrl: string,
-  packId: string,
-  version: string,
-  page: number,
-  timeoutMs: number
-): Promise<{ nodes: RegistryComfyNode[]; totalPages: number } | null> {
-  const controller = new AbortController()
-  const timer = setTimeout(() => controller.abort(), timeoutMs)
-
-  try {
-    const url = `${baseUrl}/nodes/${encodeURIComponent(packId)}/versions/${encodeURIComponent(version)}/comfy-nodes?limit=${COMFY_NODES_PAGE_SIZE}&page=${page}`
-    const res = await fetchImpl(url, {
-      method: 'GET',
-      headers: { Accept: 'application/json' },
-      signal: controller.signal
-    })
-
-    if (!res.ok) return null
-
-    const rawBody: unknown = await res.json()
-    const parsed = RegistryComfyNodesResponseSchema.safeParse(rawBody)
-    if (!parsed.success) return null
-
-    return {
-      nodes: (parsed.data.comfy_nodes ?? []) as RegistryComfyNode[],
-      totalPages: parsed.data.totalNumberOfPages ?? 1
-    }
-  } catch {
-    return null
-  } finally {
-    clearTimeout(timer)
-  }
-}
-
 async function fetchBatchWithRetry(
   fetchImpl: typeof fetch,
   baseUrl: string,

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

@@ -8,16 +8,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { NodesSnapshot } from '../data/cloudNodes'
 import type * as ObjectInfoParser from '@comfyorg/object-info-parser'
 
-import type { RegistryPackWithNodes } from './cloudNodes.registry'
-
-const fetchRegistryPacksWithNodesMock = vi.hoisted(() =>
-  vi.fn(async () => new Map<string, RegistryPackWithNodes | null>())
-)
+const fetchRegistryPacksMock = vi.hoisted(() => vi.fn(async () => new Map()))
 const sanitizeCallSpy = vi.hoisted(() => vi.fn())
 
 vi.mock('./cloudNodes.registry', () => ({
   DEFAULT_REGISTRY_BASE_URL: 'https://api.comfy.org',
-  fetchRegistryPacksWithNodes: fetchRegistryPacksWithNodesMock
+  fetchRegistryPacks: fetchRegistryPacksMock
 }))
 
 vi.mock('@comfyorg/object-info-parser', async (importOriginal) => {
@@ -94,8 +90,8 @@ describe('fetchCloudNodesForBuild', () => {
 
   beforeEach(() => {
     resetCloudNodesFetcherForTests()
-    fetchRegistryPacksWithNodesMock.mockReset()
-    fetchRegistryPacksWithNodesMock.mockResolvedValue(new Map())
+    fetchRegistryPacksMock.mockReset()
+    fetchRegistryPacksMock.mockResolvedValue(new Map())
     sanitizeCallSpy.mockReset()
     delete process.env.WEBSITE_CLOUD_API_KEY
   })
@@ -106,21 +102,14 @@ describe('fetchCloudNodesForBuild', () => {
   })
 
   it('returns fresh when API succeeds', async () => {
-    fetchRegistryPacksWithNodesMock.mockResolvedValue(
-      new Map<string, RegistryPackWithNodes | null>([
+    fetchRegistryPacksMock.mockResolvedValue(
+      new Map([
         [
           'comfyui-impact-pack',
           {
-            pack: {
-              id: 'comfyui-impact-pack',
-              name: 'ComfyUI Impact Pack',
-              repository: 'https://github.com/ltdrdata/ComfyUI-Impact-Pack',
-              latest_version: { version: '1.0.0' }
-            },
-            nodes: [
-              { comfy_node_name: 'FaceDetailer', category: 'detailer' },
-              { comfy_node_name: 'DetailerForEach', category: 'detailer' }
-            ]
+            id: 'comfyui-impact-pack',
+            name: 'ComfyUI Impact Pack',
+            repository: 'https://github.com/ltdrdata/ComfyUI-Impact-Pack'
           }
         ]
       ])
@@ -140,10 +129,6 @@ describe('fetchCloudNodesForBuild', () => {
     expect(outcome.snapshot.packs[0]?.repoUrl).toBe(
       'https://github.com/ltdrdata/ComfyUI-Impact-Pack'
     )
-    // Nodes should come from registry, not object_info
-    expect(outcome.snapshot.packs[0]?.nodes).toHaveLength(2)
-    expect(outcome.snapshot.packs[0]?.nodes[0]?.name).toBe('DetailerForEach')
-    expect(outcome.snapshot.packs[0]?.nodes[1]?.name).toBe('FaceDetailer')
   })
 
   it('drops invalid nodes individually and keeps valid nodes', async () => {
@@ -312,7 +297,7 @@ describe('fetchCloudNodesForBuild', () => {
   })
 
   it('returns fresh even when registry enrichment fails', async () => {
-    fetchRegistryPacksWithNodesMock.mockResolvedValue(new Map())
+    fetchRegistryPacksMock.mockResolvedValue(new Map())
     const fetchImpl = vi.fn(async () => response({ ImpactNode: validNode() }))
     const outcome = await fetchCloudNodesForBuild({
       apiKey: KEY,
@@ -320,8 +305,5 @@ describe('fetchCloudNodesForBuild', () => {
       fetchImpl: fetchImpl as typeof fetch
     })
     expect(outcome.status).toBe('fresh')
-    // Falls back to object_info nodes when registry fails
-    if (outcome.status !== 'fresh') return
-    expect(outcome.snapshot.packs[0]?.nodes[0]?.name).toBe('ImpactNode')
   })
 })

apps/website/src/utils/cloudNodes.ts

@@ -6,15 +6,12 @@ import {
   validateComfyNodeDef
 } from '@comfyorg/object-info-parser'
 
-import type {
-  RegistryComfyNode,
-  RegistryPackWithNodes
-} from './cloudNodes.registry'
+import type { RegistryPack } from './cloudNodes.registry'
 import type { NodesSnapshot, Pack, PackNode } from '../data/cloudNodes'
 
 import bundledSnapshot from '../data/cloud-nodes.snapshot.json' with { type: 'json' }
 import { isNodesSnapshot } from '../data/cloudNodes'
-import { fetchRegistryPacksWithNodes } from './cloudNodes.registry'
+import { fetchRegistryPacks } from './cloudNodes.registry'
 import { CloudNodesEnvelopeSchema } from './cloudNodes.schema'
 
 const DEFAULT_BASE_URL = 'https://cloud.comfy.org'
@@ -238,28 +235,26 @@ async function parseCloudNodes(
   const sanitizedDefs = sanitizeUserContent(
     validDefs as Record<string, NonNullable<(typeof validDefs)[string]>>
   )
-
-  // Use object_info to determine which packs are cloud-supported
   const grouped = groupNodesByPack(sanitizedDefs)
-  const packIds = grouped.map((pack) => pack.id)
 
-  // Fetch full pack metadata and node list from registry
-  let registryMap = new Map<string, RegistryPackWithNodes | null>()
+  let registryMap = new Map<string, RegistryPack | null>()
   try {
-    registryMap = await fetchRegistryPacksWithNodes(packIds, {
-      fetchImpl: options.fetchImpl
-    })
+    registryMap = await fetchRegistryPacks(
+      grouped.map((pack) => pack.id),
+      { fetchImpl: options.fetchImpl }
+    )
   } catch {
     registryMap = new Map()
   }
 
-  const packs = grouped
-    .map((pack) => {
-      const registryData = registryMap.get(pack.id)
-      // Use registry nodes if available, otherwise fall back to object_info nodes
-      return toDomainPack(pack.id, pack.displayName, pack.nodes, registryData)
-    })
-    .filter((pack) => pack.nodes.length > 0)
+  const packs = grouped.map((pack) =>
+    toDomainPack(
+      pack.id,
+      pack.displayName,
+      pack.nodes,
+      registryMap.get(pack.id)
+    )
+  )
 
   return { kind: 'ok', packs, droppedNodes }
 }
@@ -279,7 +274,7 @@ function safeExternalUrl(value: string | undefined): string | undefined {
 function toDomainPack(
   packId: string,
   fallbackDisplayName: string,
-  objectInfoNodes: Array<{
+  nodes: Array<{
     className: string
     def: {
       display_name: string
@@ -289,18 +284,8 @@ function toDomainPack(
       experimental?: boolean
     }
   }>,
-  registryData: RegistryPackWithNodes | null | undefined
+  registryPack: RegistryPack | null | undefined
 ): Pack {
-  const registryPack = registryData?.pack
-
-  // Prefer registry nodes if available, fall back to object_info nodes
-  const nodes =
-    registryData?.nodes && registryData.nodes.length > 0
-      ? registryData.nodes
-          .map((node) => toDomainNodeFromRegistry(node))
-          .filter((n): n is PackNode => n !== null)
-      : objectInfoNodes.map((node) => toDomainNode(node.className, node.def))
-
   return {
     id: packId,
     registryId: registryPack?.id,
@@ -323,20 +308,9 @@ function toDomainPack(
       registryPack?.latest_version?.createdAt ?? registryPack?.created_at,
     supportedOs: registryPack?.supported_os,
     supportedAccelerators: registryPack?.supported_accelerators,
-    nodes: nodes.sort((a, b) => a.displayName.localeCompare(b.displayName))
-  }
-}
-
-function toDomainNodeFromRegistry(node: RegistryComfyNode): PackNode | null {
-  if (!node.comfy_node_name) return null
-
-  return {
-    name: node.comfy_node_name,
-    displayName: node.comfy_node_name,
-    category: node.category || '',
-    description: node.description || undefined,
-    deprecated: node.deprecated,
-    experimental: node.experimental
+    nodes: nodes
+      .map((node) => toDomainNode(node.className, node.def))
+      .sort((a, b) => a.displayName.localeCompare(b.displayName))
   }
 }
 

browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts

@@ -1,10 +1,8 @@
-import { expect } from '@playwright/test'
 import type { Locator } from '@playwright/test'
 
 import type { RootCategoryId } from '@/components/searchbox/v2/rootCategories'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import type { Position } from '@e2e/fixtures/types'
 
 const { searchBoxV2 } = TestIds
 
@@ -86,12 +84,11 @@ export class ComfyNodeSearchBoxV2 {
     await this.input.waitFor({ state: 'visible' })
   }
 
-  async openByDoubleClickCanvas(position?: Position) {
-    const { x, y } = position ?? { x: 200, y: 200 }
+  async openByDoubleClickCanvas(): Promise<void> {
     // Use page.mouse.dblclick (not canvas.dblclick) so the z-999 Vue overlay
     // does not intercept; coords target a viewport spot that is on the canvas
     // and clear of both the side toolbar and any default-graph nodes.
-    await this.comfyPage.page.mouse.dblclick(x, y, { delay: 5 })
+    await this.comfyPage.page.mouse.dblclick(200, 200, { delay: 5 })
   }
 
   async ensureV2Search(): Promise<void> {
@@ -112,14 +109,4 @@ export class ComfyNodeSearchBoxV2 {
       'search box'
     )
   }
-
-  async addNode(query: string, options: { position?: Position } = {}) {
-    const position = options.position ?? { x: 200, y: 200 }
-    await this.openByDoubleClickCanvas(position)
-    await this.input.fill(query)
-    await expect(this.results.first()).toContainText(query)
-    await this.comfyPage.page.keyboard.press('Enter')
-    await expect(this.dialog).toBeHidden()
-    await this.comfyPage.page.mouse.click(position.x, position.y)
-  }
 }

browser_tests/fixtures/helpers/WorkflowHelper.ts

@@ -62,39 +62,12 @@ export class WorkflowHelper {
 
   async waitForDraftPersisted() {
     await this.comfyPage.page.waitForFunction(() =>
-      Object.keys(localStorage).some((key) =>
-        key.startsWith('Comfy.Workflow.Draft.v2:')
+      Object.keys(localStorage).some((k) =>
+        k.startsWith('Comfy.Workflow.Draft.v2:')
       )
     )
   }
 
-  /** Waits for V2 draft index recency, not payload content freshness. */
-  async waitForDraftIndexUpdatedSince(updatedSince: number) {
-    await this.comfyPage.page.waitForFunction((indexUpdatedSince) => {
-      for (let i = 0; i < window.localStorage.length; i++) {
-        const key = window.localStorage.key(i)
-        if (!key?.startsWith('Comfy.Workflow.DraftIndex.v2:')) continue
-
-        const json = window.localStorage.getItem(key)
-        if (!json) continue
-
-        try {
-          const index = JSON.parse(json)
-          if (
-            typeof index.updatedAt === 'number' &&
-            index.updatedAt >= indexUpdatedSince
-          ) {
-            return true
-          }
-        } catch {
-          // Ignore malformed storage while waiting for persistence.
-        }
-      }
-
-      return false
-    }, updatedSince)
-  }
-
   /**
    * Reloads the current page and waits for the app to initialize.
    * Unlike ComfyPage.setup(), this preserves localStorage (drafts) and

browser_tests/tests/appMode.spec.ts

@@ -5,7 +5,12 @@ import {
 import { TestIds } from '@e2e/fixtures/selectors'
 
 test.describe('App mode usage', () => {
-  test('Drag and Drop @vue-nodes', async ({ comfyPage, comfyFiles }) => {
+  test('Drag and Drop', async ({ comfyPage, comfyFiles }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
     const { centerPanel } = comfyPage.appMode
     await comfyPage.appMode.enterAppModeWithInputs([['3', 'seed']])
     await expect(centerPanel, 'Enter app mode').toBeVisible()
@@ -19,7 +24,8 @@ test.describe('App mode usage', () => {
     //prep a load image
     await test.step('Add a load image node', async () => {
       await comfyPage.workflow.loadWorkflow('default')
-      await comfyPage.searchBoxV2.addNode('Load Image')
+      await comfyPage.page.mouse.dblclick(200, 200, { delay: 5 })
+      await comfyPage.searchBox.fillAndSelectFirstNode('Load Image')
       const loadImage = await comfyPage.vueNodes.getNodeLocator('10')
       await expect(loadImage).toBeVisible()
     })

browser_tests/tests/appModeBuilder.spec.ts

@@ -75,28 +75,33 @@ test.describe('App mode builder selection', () => {
   })
 
   test('Marks canvas readOnly', async ({ comfyPage }) => {
-    await comfyPage.searchBoxV2.openByDoubleClickCanvas()
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
     await expect(
-      comfyPage.searchBoxV2.input,
+      comfyPage.searchBox.input,
       'Canvas is initially editable'
-    ).toBeVisible()
+    ).toHaveCount(1)
     await comfyPage.page.keyboard.press('Escape')
 
     await comfyPage.appMode.enterBuilder()
     await comfyPage.appMode.steps.goToInputs()
 
-    await comfyPage.searchBoxV2.openByDoubleClickCanvas()
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
     await expect(
-      comfyPage.searchBoxV2.input,
+      comfyPage.searchBox.input,
       'Entering builder makes the canvas readonly'
-    ).toBeHidden()
+    ).toHaveCount(0)
 
     await comfyPage.page.keyboard.press('Space')
-    await comfyPage.searchBoxV2.openByDoubleClickCanvas()
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
     await expect(
-      comfyPage.searchBoxV2.input,
+      comfyPage.searchBox.input,
       'Canvas remains readonly after pressing space'
-    ).toBeHidden()
+    ).toHaveCount(0)
 
     const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
     // oxlint-disable-next-line playwright/no-force-option -- Node container has conditional pointer-events:none that blocks actionability
@@ -107,10 +112,10 @@ test.describe('App mode builder selection', () => {
     ).toBeHidden()
 
     await comfyPage.page.keyboard.press('Escape')
-    await comfyPage.searchBoxV2.openByDoubleClickCanvas()
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
     await expect(
-      comfyPage.searchBoxV2.input,
+      comfyPage.searchBox.input,
       'Canvas is no longer readonly after exiting'
-    ).toBeVisible()
+    ).toHaveCount(1)
   })
 })

browser_tests/tests/linearMode.spec.ts

@@ -1,5 +1,4 @@
 import {
-  ComfyPage,
   comfyPageFixture as test,
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
@@ -44,45 +43,4 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
     await expect(comfyPage.page.getByTestId('linear-widgets')).toBeVisible()
     await expect(comfyPage.canvas).toBeHidden()
   })
-
-  test('Spinner persists until workflow loaded', async ({
-    page,
-    request
-  }, testInfo) => {
-    const comfyPage = new ComfyPage(page, request)
-    const { parallelIndex } = testInfo
-    const username = `playwright-test-${parallelIndex}`
-    const userId = await comfyPage.setupUser(username)
-    comfyPage.userIds[parallelIndex] = userId
-
-    await page.goto(`${comfyPage.url}/api/users`)
-    await page.evaluate((id) => {
-      localStorage.clear()
-      sessionStorage.clear()
-      localStorage.setItem('Comfy.userId', id)
-    }, comfyPage.id)
-
-    const splash = page.locator('#splash-loader')
-
-    let notifyWorkflowRequested!: () => void
-    const workflowRequested = new Promise<void>(
-      (r) => (notifyWorkflowRequested = r)
-    )
-    let unblockRequest!: () => void
-    const requestUnblocked = new Promise<void>((r) => (unblockRequest = r))
-
-    await page.route('**/templates/default.json', async (route) => {
-      notifyWorkflowRequested()
-      await requestUnblocked
-      return route.continue()
-    })
-
-    await comfyPage.goto({ url: `${comfyPage.url}/?template=default` })
-    await workflowRequested
-
-    await comfyPage.nextFrame()
-    await expect(splash).toBeVisible()
-    unblockRequest()
-    await expect(splash).toBeHidden()
-  })
 })

browser_tests/tests/priceBadge.spec.ts

@@ -5,6 +5,7 @@ import {
 
 test('Price badge displays on subgraphs @vue-nodes', async ({ comfyPage }) => {
   const apiNodeName = 'Node With Price Badge'
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
 
   const priceBadge = comfyPage.page.locator('.lg-node-header i + span')
   const apiNode = comfyPage.vueNodes.getNodeByTitle(apiNodeName)
@@ -12,7 +13,9 @@ test('Price badge displays on subgraphs @vue-nodes', async ({ comfyPage }) => {
   await comfyPage.menu.topbar.newWorkflowButton.click()
   await comfyPage.nextFrame()
 
-  await comfyPage.searchBoxV2.addNode(apiNodeName)
+  await comfyPage.page.mouse.dblclick(500, 500, { delay: 5 })
+  await comfyPage.searchBox.fillAndSelectFirstNode(apiNodeName)
+  await expect(comfyPage.searchBox.input).toBeHidden()
   await expect(apiNode, 'Add partner node').toBeVisible()
   await expect(apiNode.locator(priceBadge), 'Has price badge').toBeVisible()
 

browser_tests/tests/sidebar/nodeLibraryV2.spec.ts

@@ -129,26 +129,4 @@ test.describe('Node library sidebar V2', () => {
     await expect(tab.nodePreview, 'Preview displays on hover').toBeVisible()
     await expect(tab.nodePreview).toContainText('Inverts the image')
   })
-
-  test('Click-to-place from sidebar selects the newly added node', async ({
-    comfyPage
-  }) => {
-    const tab = comfyPage.menu.nodeLibraryTabV2
-    await comfyPage.nodeOps.clearGraph()
-    await tab.expandFolder('sampling')
-
-    const canvasBox = (await comfyPage.canvas.boundingBox())!
-    const target = {
-      x: canvasBox.width / 2,
-      y: canvasBox.height / 2
-    }
-
-    await tab.getNode('KSampler (Advanced)').click()
-    await comfyPage.canvas.click({ position: target })
-
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
-    await expect
-      .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-      .toBe(1)
-  })
 })

browser_tests/tests/subgraph/subgraphOperations.spec.ts

@@ -5,6 +5,10 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
   })
 
   test.describe('Subgraph Clipboard Operations', () => {
@@ -54,7 +58,8 @@ test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
       const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
-      await comfyPage.searchBoxV2.addNode('Note')
+      await comfyPage.canvasOps.doubleClick()
+      await comfyPage.searchBox.fillAndSelectFirstNode('Note')
       await comfyPage.nextFrame()
 
       const initialCount = await comfyPage.subgraph.getNodeCount()

browser_tests/tests/subgraph/subgraphPromotion.spec.ts

@@ -745,19 +745,20 @@ test('Link already promoted widget @vue-nodes', async ({ comfyPage }) => {
 })
 
 test('Can promote multiple previews @vue-nodes', async ({ comfyPage }) => {
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
   await comfyPage.menu.topbar.newWorkflowButton.click()
   await comfyPage.nextFrame()
 
   await test.step('Add and rename a Load Image node', async () => {
-    const position = { x: 300, y: 300 }
-    await comfyPage.searchBoxV2.addNode('Load Image', { position })
+    await comfyPage.page.mouse.dblclick(300, 300, { delay: 5 })
+    await comfyPage.searchBox.fillAndSelectFirstNode('Load Image')
     const loadImage = await comfyPage.vueNodes.getFixtureByTitle('Load Image')
     await loadImage.setTitle('Character Reference')
   })
 
   await test.step('Add a second Load Image node', async () => {
-    const position = { x: 600, y: 300 }
-    await comfyPage.searchBoxV2.addNode('Load Image', { position })
+    await comfyPage.page.mouse.dblclick(600, 300, { delay: 5 })
+    await comfyPage.searchBox.fillAndSelectFirstNode('Load Image')
   })
 
   await test.step('Convert both nodes to subgraph', async () => {

browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts

@@ -1082,10 +1082,17 @@ test.describe(
       comfyPage,
       comfyMouse
     }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.NodeSearchBoxImpl',
+        'v1 (legacy)'
+      )
+
       // Setup workflow with a KSampler node
       await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
       await comfyPage.nodeOps.waitForGraphNodes(0)
-      await comfyPage.searchBoxV2.addNode('KSampler')
+      await comfyPage.command.executeCommand('Workspace.SearchBox.Toggle')
+      await comfyPage.nextFrame()
+      await comfyPage.searchBox.fillAndSelectFirstNode('KSampler')
       await comfyPage.nodeOps.waitForGraphNodes(1)
 
       // Convert the KSampler node to a subgraph

browser_tests/tests/vueNodes/slots.spec.ts

@@ -19,19 +19,3 @@ test('Can display a slot mismatched from widget type', async ({
   await expect(width.locator('path[fill*="INT"]')).toBeVisible()
   await expect(width.locator('path[fill*="FLOAT"]')).toBeVisible()
 })
-
-test('MatchType updates output color @vue-nodes', async ({ comfyPage }) => {
-  await comfyPage.menu.topbar.newWorkflowButton.click()
-  await comfyPage.nextFrame()
-
-  await comfyPage.searchBoxV2.addNode('Load Image')
-  const loadImage = await comfyPage.vueNodes.getFixtureByTitle('Load Image')
-  await comfyPage.searchBoxV2.addNode('Switch', {
-    position: { x: 600, y: 200 }
-  })
-  const switchNode = await comfyPage.vueNodes.getFixtureByTitle('switch')
-
-  await loadImage.getSlot('MASK').dragTo(switchNode.getSlot('on_false'))
-  const slotEl = switchNode.getSlot('output').locator('.slot-dot')
-  await expect.poll(() => slotEl.getAttribute('style')).toContain('MASK')
-})

browser_tests/tests/vueNodes/videoPreview.spec.ts

@@ -9,6 +9,8 @@ const file1 = 'workflow.mp4' as const
 const file2 = 'workflow.webm' as const
 
 test('@vue-nodes Load Video', async ({ comfyPage, comfyFiles }) => {
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
+
   const loadVideoNode = comfyPage.vueNodes.getNodeByTitle('Load Video')
   const loadVideo = new VideoPreview(loadVideoNode)
 
@@ -16,7 +18,9 @@ test('@vue-nodes Load Video', async ({ comfyPage, comfyFiles }) => {
     await comfyPage.menu.topbar.newWorkflowButton.click()
     await comfyPage.nextFrame()
 
-    await comfyPage.searchBoxV2.addNode('Load Video')
+    await comfyPage.page.mouse.dblclick(500, 300, { delay: 5 })
+    await comfyPage.searchBox.fillAndSelectFirstNode('Load Video')
+
     await expect(loadVideoNode).toHaveCount(1)
     await expect(loadVideoNode).toBeVisible()
   })

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

@@ -5,6 +5,8 @@ import {
 } from '@e2e/fixtures/ComfyPage'
 
 test('@vue-nodes Audio Widget', async ({ comfyPage, comfyFiles }) => {
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
+
   const loadAudioNode = comfyPage.vueNodes.getNodeByTitle('Load Audio')
   const audioPreview = new AudioPreview(loadAudioNode)
 
@@ -12,7 +14,9 @@ test('@vue-nodes Audio Widget', async ({ comfyPage, comfyFiles }) => {
     await comfyPage.menu.topbar.newWorkflowButton.click()
     await comfyPage.nextFrame()
 
-    await comfyPage.searchBoxV2.addNode('Load Audio')
+    //await comfyPage.canvasOps.doubleClick()
+    await comfyPage.page.mouse.dblclick(500, 500, { delay: 5 })
+    await comfyPage.searchBox.fillAndSelectFirstNode('Load Audio')
     await expect(loadAudioNode).toBeVisible()
   })
 

browser_tests/tests/workflowPersistence.spec.ts

@@ -4,103 +4,6 @@ import { expect } from '@playwright/test'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { fitToViewInstant } from '@e2e/fixtures/utils/fitToView'
-
-const generateUniqueFilename = () =>
-  `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
-
-const waitForWorkflowTabState = async (comfyPage: ComfyPage, minPaths = 2) => {
-  await comfyPage.page.waitForFunction((expectedMinPaths) => {
-    let hasActivePath = false
-    let hasOpenPaths = false
-
-    for (let i = 0; i < window.sessionStorage.length; i++) {
-      const key = window.sessionStorage.key(i)
-      if (key?.startsWith('Comfy.Workflow.ActivePath:')) {
-        hasActivePath = true
-      }
-      if (!key?.startsWith('Comfy.Workflow.OpenPaths:')) {
-        continue
-      }
-
-      const raw = window.sessionStorage.getItem(key)
-      if (!raw) continue
-
-      try {
-        const state = JSON.parse(raw) as { paths?: unknown[] }
-        hasOpenPaths =
-          Array.isArray(state.paths) && state.paths.length >= expectedMinPaths
-        if (hasActivePath && hasOpenPaths) return true
-      } catch {
-        return false
-      }
-    }
-
-    return hasActivePath && hasOpenPaths
-  }, minPaths)
-}
-
-type NodeRef = NonNullable<
-  Awaited<ReturnType<ComfyPage['nodeOps']['getFirstNodeRef']>>
->
-
-const getRequiredFirstNodeRef = async (
-  comfyPage: ComfyPage,
-  message: string
-): Promise<NodeRef> => {
-  const node = await comfyPage.nodeOps.getFirstNodeRef()
-  expect(node, message).toBeDefined()
-  if (!node) throw new Error(message)
-  return node
-}
-
-const makeActivePathStale = async (
-  comfyPage: ComfyPage,
-  staleWorkflowName: string,
-  activeWorkflowName: string
-) => {
-  // Intentionally desync ActivePath from OpenPaths to exercise stale pointer recovery.
-  await comfyPage.page.evaluate(
-    ([staleName, activeName]) => {
-      const findStorageKey = (prefix: string) => {
-        for (let i = 0; i < window.sessionStorage.length; i++) {
-          const key = window.sessionStorage.key(i)
-          if (key?.startsWith(prefix)) return key
-        }
-        throw new Error(`Missing ${prefix} persistence key`)
-      }
-
-      const activePathKey = findStorageKey('Comfy.Workflow.ActivePath:')
-      const openPathsKey = findStorageKey('Comfy.Workflow.OpenPaths:')
-      const activePointer = JSON.parse(
-        window.sessionStorage.getItem(activePathKey)!
-      ) as { path: string }
-      const openPointer = JSON.parse(
-        window.sessionStorage.getItem(openPathsKey)!
-      ) as { paths: string[]; activeIndex: number }
-      const pathForName = (name: string) => {
-        const path = openPointer.paths.find((candidate) =>
-          candidate.endsWith(`${name}.json`)
-        )
-        if (!path) throw new Error(`Missing stored path for ${name}`)
-        return path
-      }
-
-      const stalePath = pathForName(staleName)
-      const activePath = pathForName(activeName)
-      activePointer.path = stalePath
-      openPointer.paths = [stalePath, activePath]
-      openPointer.activeIndex = 1
-
-      window.sessionStorage.setItem(
-        activePathKey,
-        JSON.stringify(activePointer)
-      )
-      window.sessionStorage.setItem(openPathsKey, JSON.stringify(openPointer))
-    },
-    [staleWorkflowName, activeWorkflowName]
-  )
-}
 
 async function getNodeOutputImageCount(
   comfyPage: ComfyPage,
@@ -200,11 +103,9 @@ test.describe('Workflow Persistence', () => {
 
     await comfyPage.menu.topbar.saveWorkflow('outputs-test')
 
-    const firstNode = await getRequiredFirstNodeRef(
-      comfyPage,
-      'First node should be available after loading the default workflow'
-    )
-    const nodeId = String(firstNode.id)
+    const firstNode = await comfyPage.nodeOps.getFirstNodeRef()
+    expect(firstNode).toBeTruthy()
+    const nodeId = String(firstNode!.id)
 
     // Simulate node outputs as if execution completed
     await comfyPage.page.evaluate((id) => {
@@ -481,59 +382,6 @@ test.describe('Workflow Persistence', () => {
     await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(nodeCountB)
   })
 
-  test('Restores saved workflow drafts from inactive restored tabs', async ({
-    comfyPage
-  }) => {
-    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.settings.setSetting('Comfy.Workflow.Persist', true)
-    await comfyPage.settings.setSetting(
-      'Comfy.Workflow.WorkflowTabsPosition',
-      'Topbar'
-    )
-
-    const workflowA = generateUniqueFilename()
-    const workflowB = generateUniqueFilename()
-
-    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
-    await fitToViewInstant(comfyPage)
-    await comfyPage.menu.topbar.saveWorkflow(workflowA)
-
-    const firstNode = await getRequiredFirstNodeRef(
-      comfyPage,
-      'First node should be available after loading single_ksampler'
-    )
-    await firstNode.centerOnNode()
-    const draftSaveStartedAt = Date.now()
-    await firstNode.toggleCollapse()
-    expect(await firstNode.isCollapsed()).toBe(true)
-    await comfyPage.workflow.waitForDraftIndexUpdatedSince(draftSaveStartedAt)
-
-    await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
-    await comfyPage.menu.topbar.saveWorkflow(workflowB)
-    await waitForWorkflowTabState(comfyPage)
-    await makeActivePathStale(comfyPage, workflowA, workflowB)
-
-    await comfyPage.workflow.reloadAndWaitForApp()
-    await expect
-      .poll(() => comfyPage.menu.topbar.getActiveTabName())
-      .toBe(workflowB)
-
-    const tabs = await comfyPage.menu.topbar.getTabNames()
-    expect(tabs).toEqual(expect.arrayContaining([workflowA, workflowB]))
-    expect(tabs.indexOf(workflowA)).toBeLessThan(tabs.indexOf(workflowB))
-
-    await comfyPage.menu.topbar.getWorkflowTab(workflowA).click()
-    await comfyPage.workflow.waitForWorkflowIdle()
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
-
-    const restoredNode = await getRequiredFirstNodeRef(
-      comfyPage,
-      'Restored node should be available after switching back to workflow A'
-    )
-    expect(await restoredNode.isCollapsed()).toBe(true)
-    await expect(comfyPage.toast.toastErrors).toHaveCount(0)
-  })
-
   test('Closing an inactive tab with save preserves its own content', async ({
     comfyPage
   }) => {

docs/adr/0002-monorepo-conversion.md

@@ -4,7 +4,7 @@ Date: 2025-08-25
 
 ## Status
 
-Accepted (Nx tooling choice superseded by [ADR-0010](0010-remove-nx-orchestration.md))
+Proposed
 
 <!-- [Proposed | Accepted | Rejected | Deprecated | Superseded by [ADR-NNNN](NNNN-title.md)] -->
 
@@ -31,8 +31,6 @@ For more information on Monorepos, check out [monorepo.tools](https://monorepo.t
 For monorepo management, I'd probably go with [Nx](https://nx.dev/), but I could be conviced otherwise.
 There's a [whole list here](https://monorepo.tools/#tools-review) if you're interested.
 
-> **Update:** The Nx tooling choice has since been reversed. See [ADR-0010: Remove Nx Orchestration](0010-remove-nx-orchestration.md) for the migration to direct pnpm workspace scripts and native tool CLIs.
-
 ## Consequences
 
 ### Positive

docs/adr/0010-remove-nx-orchestration.md

@@ -1,92 +0,0 @@
-# 10. Remove Nx Orchestration
-
-Date: 2026-05-19
-
-## Status
-
-Accepted
-
-<!-- [Proposed | Accepted | Rejected | Deprecated | Superseded by [ADR-NNNN](NNNN-title.md)] -->
-
-## Context
-
-[ADR-0002](0002-monorepo-conversion.md) adopted [Nx](https://nx.dev/) as a tooling option for managing the
-ComfyUI Frontend monorepo on top of pnpm workspaces. Nx was introduced as task
-orchestration to coordinate builds, tests, lints, and types across the apps and
-packages workspaces.
-
-In practice, Nx provided little value beyond what pnpm workspaces and the
-underlying native tool CLIs (Vite, Vitest, Playwright, ESLint, oxlint, oxfmt,
-TypeScript) already offer:
-
-- pnpm's `--filter` and `--recursive` flags already provide topological,
-  parallel, and selective execution across workspaces.
-- Each underlying tool already has fast, well-supported caching (Vite, Vitest,
-  ESLint, oxlint, TS incremental builds, etc.).
-- Nx added an extra configuration surface (`nx.json`, `.nxignore`, per-package
-  `nx` blocks), an extra cache layer, an extra `node_modules/.cache/nx`
-  artifact, and an extra CI dimension to debug.
-- Contributors and AI agents had to learn the Nx mental model in addition to
-  pnpm and the individual tool CLIs.
-- The Nx daemon and remote-cache features were not in use, so the runtime
-  benefit was limited to local task graph caching, which is largely redundant
-  with the per-tool caches.
-
-The cost (configuration, mental overhead, surprise behavior, occasional
-cache-related failures) exceeded the benefit.
-
-## Decision
-
-Remove Nx from the repository and run monorepo tasks using:
-
-- pnpm workspace scripts (`pnpm -r run <script>`,
-  `pnpm --filter <pkg> run <script>`).
-- Each tool's native CLI (Vite, Vitest, Playwright, ESLint, oxlint, oxfmt,
-  `vue-tsc`, etc.) invoked directly from the relevant workspace.
-
-Concretely, this change:
-
-- Deletes `nx.json` and `.nxignore`.
-- Removes `nx` entries from root and per-package `package.json` files (the
-  `nx` block on each `package.json`, the dev dependency, and Nx-specific
-  scripts).
-- Removes `nx`-related entries from `pnpm-workspace.yaml`'s `allowBuilds`.
-- Rewrites the affected CI workflows (`.github/workflows/ci-tests-e2e.yaml`,
-  `.github/workflows/release-draft-create.yaml`) to call pnpm/native CLIs
-  directly.
-- Updates `AGENTS.md`, `TROUBLESHOOTING.md`, and
-  [ADR-0002](0002-monorepo-conversion.md) to reflect the new tooling story.
-- Cleans up Nx-specific lint/format/ignore rules in `.oxlintrc.json`,
-  `eslint.config.ts`, `vite.config.mts`, and `.gitignore`.
-
-## Consequences
-
-### Positive
-
-- Fewer moving parts: no `nx.json`, no `.nx/` cache, no Nx daemon, no
-  Nx-specific scripts to maintain.
-- Easier onboarding for contributors and AI agents: pnpm + each tool's CLI is
-  the only required knowledge.
-- CI logs and failures are easier to read because tasks run directly under the
-  tool that owns them, instead of being wrapped by Nx.
-- Faster, more predictable cache invalidation behavior — each tool owns its
-  own cache and we no longer hit Nx-cache edge cases.
-- Smaller dependency tree (~2k fewer lines in `pnpm-lock.yaml`).
-
-### Negative
-
-- We lose Nx's unified task graph and project graph commands; coordination
-  across workspaces now relies on pnpm filters and explicit script wiring.
-- We lose Nx's remote/distributed caching as a future option without
-  re-adopting Nx (or a comparable tool like Turborepo).
-- Contributors who already knew Nx workflows need to relearn the equivalent
-  pnpm invocations.
-
-## Notes
-
-- The migration is purely a tooling change; no application behavior, public
-  API, or build output changes.
-- If we later need more sophisticated task orchestration (e.g. distributed
-  remote cache, fine-grained affected-graph queries), revisit this decision and
-  evaluate Nx, Turborepo, or Moon at that time, with concrete CI/perf data to
-  justify the additional complexity.

docs/adr/README.md

@@ -8,18 +8,16 @@ An Architecture Decision Record captures an important architectural decision mad
 
 ## ADR Index
 
-| ADR                                                         | Title                                       | Status   | Date       |
-| ----------------------------------------------------------- | ------------------------------------------- | -------- | ---------- |
-| [0001](0001-merge-litegraph-into-frontend.md)               | Merge LiteGraph.js into ComfyUI Frontend    | Accepted | 2025-08-05 |
-| [0002](0002-monorepo-conversion.md)                         | Restructure as a Monorepo                   | Accepted | 2025-08-25 |
-| [0003](0003-crdt-based-layout-system.md)                    | Centralized Layout Management with CRDT     | Proposed | 2025-08-27 |
-| [0004](0004-fork-primevue-ui-library.md)                    | Fork PrimeVue UI Library                    | Rejected | 2025-08-27 |
-| [0005](0005-remove-importmap-for-vue-extensions.md)         | Remove Import Map for Vue Extensions        | Accepted | 2025-12-13 |
-| [0006](0006-primitive-node-copy-paste-lifecycle.md)         | PrimitiveNode Copy/Paste Lifecycle          | Proposed | 2026-02-22 |
-| [0007](0007-node-execution-output-passthrough-schema.md)    | NodeExecutionOutput Passthrough Schema      | Accepted | 2026-03-11 |
-| [0008](0008-entity-component-system.md)                     | Entity Component System                     | Proposed | 2026-03-23 |
-| [0009](0009-subgraph-promoted-widgets-use-linked-inputs.md) | Subgraph Promoted Widgets Use Linked Inputs | Proposed | 2026-05-05 |
-| [0010](0010-remove-nx-orchestration.md)                     | Remove Nx Orchestration                     | Accepted | 2026-05-19 |
+| ADR                                                      | Title                                    | Status   | Date       |
+| -------------------------------------------------------- | ---------------------------------------- | -------- | ---------- |
+| [0001](0001-merge-litegraph-into-frontend.md)            | Merge LiteGraph.js into ComfyUI Frontend | Accepted | 2025-08-05 |
+| [0002](0002-monorepo-conversion.md)                      | Restructure as a Monorepo                | Accepted | 2025-08-25 |
+| [0003](0003-crdt-based-layout-system.md)                 | Centralized Layout Management with CRDT  | Proposed | 2025-08-27 |
+| [0004](0004-fork-primevue-ui-library.md)                 | Fork PrimeVue UI Library                 | Rejected | 2025-08-27 |
+| [0005](0005-remove-importmap-for-vue-extensions.md)      | Remove Import Map for Vue Extensions     | Accepted | 2025-12-13 |
+| [0006](0006-primitive-node-copy-paste-lifecycle.md)      | PrimitiveNode Copy/Paste Lifecycle       | Proposed | 2026-02-22 |
+| [0007](0007-node-execution-output-passthrough-schema.md) | NodeExecutionOutput Passthrough Schema   | Accepted | 2026-03-11 |
+| [0008](0008-entity-component-system.md)                  | Entity Component System                  | Proposed | 2026-03-23 |
 
 ## Creating a New ADR
 

eslint.config.ts

@@ -76,6 +76,7 @@ export default defineConfig([
   {
     ignores: [
       '.i18nrc.cjs',
+      '.nx/*',
       '**/vite.config.*.timestamp*',
       '**/vitest.config.*.timestamp*',
       'components.d.ts',

nx.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
+  "plugins": [
+    {
+      "plugin": "@nx/eslint/plugin",
+      "options": {
+        "targetName": "lint"
+      }
+    },
+    {
+      "plugin": "@nx/storybook/plugin",
+      "options": {
+        "serveStorybookTargetName": "storybook",
+        "buildStorybookTargetName": "build-storybook",
+        "testStorybookTargetName": "test-storybook",
+        "staticStorybookTargetName": "static-storybook"
+      }
+    },
+    {
+      "plugin": "@nx/vite/plugin",
+      "options": {
+        "buildTargetName": "build",
+        "testTargetName": "test",
+        "serveTargetName": "serve",
+        "devTargetName": "dev",
+        "previewTargetName": "preview",
+        "serveStaticTargetName": "serve-static",
+        "typecheckTargetName": "typecheck",
+        "buildDepsTargetName": "build-deps",
+        "watchDepsTargetName": "watch-deps"
+      }
+    },
+    {
+      "plugin": "@nx/playwright/plugin",
+      "options": {
+        "targetName": "e2e"
+      }
+    }
+  ],
+  "analytics": false
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.45.13",
+  "version": "1.45.12",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",
@@ -8,22 +8,20 @@
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "type": "module",
   "scripts": {
-    "build:cloud": "cross-env DISTRIBUTION=cloud NODE_OPTIONS='--max-old-space-size=8192' vite build --config vite.config.mts",
-    "build:desktop": "pnpm --filter @comfyorg/desktop-ui run build",
+    "build:cloud": "cross-env DISTRIBUTION=cloud NODE_OPTIONS='--max-old-space-size=8192' nx build",
+    "build:desktop": "nx build @comfyorg/desktop-ui",
     "build-storybook": "storybook build",
-    "build:types": "cross-env NODE_OPTIONS='--max-old-space-size=8192' vite build --config vite.types.config.mts && node scripts/prepare-types.js",
+    "build:types": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nx build --config vite.types.config.mts && node scripts/prepare-types.js",
     "build:analyze": "cross-env ANALYZE_BUNDLE=true pnpm build",
-    "build": "cross-env NODE_OPTIONS='--max-old-space-size=8192' pnpm typecheck && vite build --config vite.config.mts",
-    "clean": "pnpm dlx rimraf dist dist-ssr coverage playwright-report blob-report test-results node_modules/.vite apps/desktop-ui/dist apps/website/dist",
-    "clean:all": "pnpm clean && pnpm dlx rimraf node_modules",
+    "build": "cross-env NODE_OPTIONS='--max-old-space-size=8192' pnpm typecheck && nx build",
     "size:collect": "node scripts/size-collect.js",
     "size:report": "node scripts/size-report.js",
     "collect-i18n": "pnpm exec playwright test --config=playwright.i18n.config.ts",
-    "dev:cloud": "cross-env DEV_SERVER_COMFYUI_URL='https://testcloud.comfy.org/' vite --config vite.config.mts",
-    "dev:desktop": "pnpm --filter @comfyorg/desktop-ui run dev",
-    "dev:electron": "cross-env DISTRIBUTION=desktop vite --config vite.electron.config.mts",
-    "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true vite --config vite.config.mts",
-    "dev": "vite --config vite.config.mts",
+    "dev:cloud": "cross-env DEV_SERVER_COMFYUI_URL='https://testcloud.comfy.org/' nx serve",
+    "dev:desktop": "nx dev @comfyorg/desktop-ui",
+    "dev:electron": "cross-env DISTRIBUTION=desktop nx serve --config vite.electron.config.mts",
+    "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true nx serve",
+    "dev": "nx serve",
     "devtools:pycheck": "python3 -m compileall -q tools/devtools",
     "format:check": "oxfmt --check",
     "format": "oxfmt --write",
@@ -36,25 +34,26 @@
     "lint:unstaged:fix": "git diff --name-only HEAD | grep -E '\\.(js|ts|vue|mts)$' | xargs -r eslint --cache --fix",
     "lint:unstaged": "git diff --name-only HEAD | grep -E '\\.(js|ts|vue|mts)$' | xargs -r eslint --cache",
     "lint": "pnpm stylelint && oxlint src browser_tests --type-aware && eslint src --cache",
-    "lint:desktop": "pnpm --filter @comfyorg/desktop-ui run lint",
+    "lint:desktop": "nx run @comfyorg/desktop-ui:lint",
     "locale": "lobe-i18n locale",
     "oxlint": "oxlint src browser_tests --type-aware",
     "prepare": "pnpm exec husky || true && git config blame.ignoreRevsFile .git-blame-ignore-revs || true",
-    "preview": "vite preview --config vite.config.mts",
-    "storybook": "storybook dev -p 6006",
-    "storybook:desktop": "pnpm --filter @comfyorg/desktop-ui run storybook",
+    "preview": "nx preview",
+    "storybook": "nx storybook",
+    "storybook:desktop": "nx run @comfyorg/desktop-ui:storybook",
     "stylelint:fix": "stylelint --cache --fix '{apps,packages,src}/**/*.{css,vue}'",
     "stylelint": "stylelint --cache '{apps,packages,src}/**/*.{css,vue}'",
-    "test:browser": "pnpm exec playwright test",
+    "test:browser": "pnpm exec nx e2e",
     "test:browser:coverage": "cross-env COLLECT_COVERAGE=true pnpm test:browser",
     "test:browser:local": "cross-env PLAYWRIGHT_LOCAL=1 PLAYWRIGHT_TEST_URL=http://localhost:5173 pnpm test:browser",
     "test:coverage": "vitest run --coverage",
-    "test:unit": "vitest run",
+    "test:unit": "nx run test",
     "typecheck": "vue-tsc --noEmit",
     "typecheck:browser": "vue-tsc --project browser_tests/tsconfig.json",
-    "typecheck:desktop": "pnpm --filter @comfyorg/desktop-ui run typecheck",
-    "typecheck:website": "pnpm --filter @comfyorg/website run typecheck",
-    "zipdist": "node scripts/zipdist.js"
+    "typecheck:desktop": "nx run @comfyorg/desktop-ui:typecheck",
+    "typecheck:website": "nx run @comfyorg/website:typecheck",
+    "zipdist": "node scripts/zipdist.js",
+    "clean": "nx reset"
   },
   "dependencies": {
     "@alloc/quick-lru": "catalog:",
@@ -114,7 +113,7 @@
     "primevue": "catalog:",
     "reka-ui": "catalog:",
     "semver": "^7.7.2",
-    "three": "catalog:",
+    "three": "^0.170.0",
     "tiptap-markdown": "^0.8.10",
     "typegpu": "catalog:",
     "vee-validate": "catalog:",
@@ -132,6 +131,10 @@
     "@eslint/js": "catalog:",
     "@intlify/eslint-plugin-vue-i18n": "catalog:",
     "@lobehub/i18n-cli": "catalog:",
+    "@nx/eslint": "catalog:",
+    "@nx/playwright": "catalog:",
+    "@nx/storybook": "catalog:",
+    "@nx/vite": "catalog:",
     "@pinia/testing": "catalog:",
     "@playwright/test": "catalog:",
     "@sentry/vite-plugin": "catalog:",
@@ -177,6 +180,7 @@
     "markdown-table": "catalog:",
     "mixpanel-browser": "catalog:",
     "monocart-coverage-reports": "catalog:",
+    "nx": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "oxlint-tsgolint": "catalog:",

packages/design-system/package.json

@@ -19,5 +19,11 @@
   "devDependencies": {
     "tailwindcss": "catalog:",
     "typescript": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:design"
+    ]
   }
 }

packages/ingest-types/package.json

@@ -15,5 +15,11 @@
   },
   "devDependencies": {
     "@hey-api/openapi-ts": "0.93.0"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:types"
+    ]
   }
 }

packages/object-info-parser/package.json

@@ -20,5 +20,11 @@
   "devDependencies": {
     "typescript": "catalog:",
     "vitest": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:util"
+    ]
   }
 }

packages/registry-types/package.json

@@ -5,5 +5,11 @@
   "type": "module",
   "exports": {
     ".": "./src/comfyRegistryTypes.ts"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:types"
+    ]
   }
 }

packages/tailwind-utils/package.json

@@ -17,5 +17,11 @@
   },
   "devDependencies": {
     "typescript": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:util"
+    ]
   }
 }

pnpm-workspace.yaml

@@ -21,6 +21,10 @@ catalog:
   '@iconify/utils': ^3.1.0
   '@intlify/eslint-plugin-vue-i18n': ^4.1.1
   '@lobehub/i18n-cli': ^1.26.1
+  '@nx/eslint': 22.6.1
+  '@nx/playwright': 22.6.1
+  '@nx/storybook': 22.6.1
+  '@nx/vite': 22.6.1
   '@pinia/testing': ^1.0.3
   '@playwright/test': ^1.58.1
   '@primeuix/forms': 0.0.2
@@ -32,7 +36,7 @@ catalog:
   '@primevue/themes': ^4.2.5
   '@sentry/vite-plugin': ^4.6.0
   '@sentry/vue': ^10.32.1
-  '@sparkjsdev/spark': ^2.1.0
+  '@sparkjsdev/spark': ^0.1.10
   '@storybook/addon-docs': ^10.2.10
   '@storybook/addon-mcp': 0.1.6
   '@storybook/vue3': ^10.2.10
@@ -55,7 +59,7 @@ catalog:
   '@types/jsdom': ^21.1.7
   '@types/node': ^24.1.0
   '@types/semver': ^7.7.0
-  '@types/three': ^0.184.1
+  '@types/three': ^0.170.0
   '@vee-validate/zod': ^4.15.1
   '@vercel/analytics': ^2.0.1
   '@vitejs/plugin-vue': ^6.0.0
@@ -98,6 +102,7 @@ catalog:
   markdown-table: ^3.0.4
   mixpanel-browser: ^2.71.0
   monocart-coverage-reports: ^2.12.9
+  nx: 22.6.1
   oxfmt: ^0.44.0
   oxlint: ^1.59.0
   oxlint-tsgolint: ^0.20.0
@@ -113,7 +118,7 @@ catalog:
   storybook: ^10.2.10
   stylelint: ^16.26.1
   tailwindcss: ^4.3.0
-  three: ^0.184.0
+  three: ^0.170.0
   tailwindcss-primeui: ^0.6.1
   tsx: ^4.15.6
   tw-animate-css: ^1.3.8
@@ -150,6 +155,7 @@ allowBuilds:
   '@tailwindcss/oxide': true
   core-js: false
   esbuild: true
+  nx: true
   oxc-resolver: true
   protobufjs: false
   sharp: false

src/components/common/ScrubableNumberInput.vue

@@ -1,52 +1,55 @@
 <template>
   <div
     ref="container"
-    class="flex h-7 rounded-lg bg-component-node-widget-background text-xs text-component-node-foreground"
+    class="relative flex h-7 rounded-lg bg-component-node-widget-background text-xs text-component-node-foreground"
   >
     <slot name="background" />
     <Button
       v-if="!hideButtons"
       :aria-label="t('g.decrement')"
       data-testid="decrement"
-      class="aspect-8/7 h-full rounded-r-none hover:bg-base-foreground/20 disabled:opacity-30"
+      :class="
+        cn(
+          'aspect-8/7 h-full rounded-r-none hover:bg-base-foreground/20 disabled:opacity-30',
+          dragging && 'opacity-0!'
+        )
+      "
       variant="muted-textonly"
       :disabled="!canDecrement"
       tabindex="-1"
-      @click="modelValue = clamp(modelValue - step)"
+      @click="scrub.setValue(clamp(modelValue - step))"
     >
       <i class="pi pi-minus" />
     </Button>
-    <div class="relative my-0.25 min-w-[4ch] flex-1 py-1.5">
+    <div class="relative my-px min-w-[4ch] flex-1 py-1.5">
       <input
         ref="inputField"
         v-bind="inputAttrs"
         :value="displayValue ?? modelValue"
         :disabled
-        :class="
-          cn(
-            'absolute inset-0 truncate border-0 bg-transparent p-1 text-sm focus:outline-0'
-          )
-        "
+        class="absolute inset-0 truncate border-0 bg-transparent p-1 text-sm focus:outline-0"
         inputmode="decimal"
         autocomplete="off"
         autocorrect="off"
         spellcheck="false"
         @blur="handleBlur"
         @keyup.enter="handleBlur"
-        @keydown.up.prevent="updateValueBy(step)"
-        @keydown.down.prevent="updateValueBy(-step)"
-        @keydown.page-up.prevent="updateValueBy(10 * step)"
-        @keydown.page-down.prevent="updateValueBy(-10 * step)"
+        @keydown.up.prevent="scrub.setValue(clamp(modelValue + step))"
+        @keydown.down.prevent="scrub.setValue(clamp(modelValue - step))"
+        @keydown.page-up.prevent="scrub.setValue(clamp(modelValue + 10 * step))"
+        @keydown.page-down.prevent="
+          scrub.setValue(clamp(modelValue - 10 * step))
+        "
       />
       <div
         ref="swipeElement"
         :class="
           cn(
-            'absolute inset-0 z-10 cursor-ew-resize touch-pan-y',
+            'absolute inset-0 z-10 touch-pan-y',
+            dragging ? 'cursor-grabbing' : 'cursor-ew-resize',
             textEdit && 'pointer-events-none hidden'
           )
         "
-        @pointerup="handlePointerUp"
       />
     </div>
     <slot />
@@ -54,25 +57,73 @@
       v-if="!hideButtons"
       :aria-label="t('g.increment')"
       data-testid="increment"
-      class="aspect-8/7 h-full rounded-l-none hover:bg-base-foreground/20 disabled:opacity-30"
+      :class="
+        cn(
+          'aspect-8/7 h-full rounded-l-none hover:bg-base-foreground/20 disabled:opacity-30',
+          dragging && 'opacity-0!'
+        )
+      "
       variant="muted-textonly"
       :disabled="!canIncrement"
       tabindex="-1"
-      @click="modelValue = clamp(modelValue + step)"
+      @click="scrub.setValue(clamp(modelValue + step))"
     >
       <i class="pi pi-plus" />
     </Button>
+    <BallRuler
+      v-if="dragging"
+      :state="scrub.state"
+      :width="containerWidth"
+      :min
+      :max
+      :has-bar="barVisible"
+    />
+    <div
+      v-if="dragging"
+      class="pointer-events-none absolute inset-0 text-component-node-foreground"
+      aria-hidden="true"
+    >
+      <i
+        class="absolute top-0 left-1/2 icon-[lucide--chevron-up] size-3 -translate-x-1/2 opacity-25"
+      />
+      <i
+        class="absolute bottom-0 left-1/2 icon-[lucide--chevron-down] size-3 -translate-x-1/2 opacity-25"
+      />
+      <i
+        class="absolute top-1/2 left-0 icon-[lucide--chevron-left] size-3 -translate-y-1/2 opacity-25"
+      />
+      <i
+        class="absolute top-1/2 right-0 icon-[lucide--chevron-right] size-3 -translate-y-1/2 opacity-25"
+      />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { onClickOutside, usePointerSwipe, whenever } from '@vueuse/core'
-import { computed, ref, useTemplateRef } from 'vue'
+import { onClickOutside, useElementSize } from '@vueuse/core'
+import { clamp as _clamp } from 'es-toolkit'
+import { computed, ref, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { cn } from '@comfyorg/tailwind-utils'
 
+import BallRuler from './scrubableNumberInput/BallRuler.vue'
+import { useDragGesture } from './scrubableNumberInput/useDragGesture'
+import { useScrubValue } from './scrubableNumberInput/useScrubValue'
+
+// ---- Tunable sensitivity envelope -------------------------------------------
+// They translate the Y-axis sensitivity range into
+// concrete drag-distance promises so the bounds feel meaningful:
+//   - DRAG_PX_FOR_FULL_RANGE: at *max* sensitivity, dragging this many screen
+//     pixels traverses the entire [min, max] range. Smaller = faster, easier
+//     to overshoot. Larger = more conservative, harder to overshoot.
+//   - DRAG_PX_PER_STEP_AT_FLOOR: at *min* sensitivity, dragging this many
+//     screen pixels advances by exactly one `step`. Larger = finer control
+//     when dialing slow. Smaller = floor isn't as fine.
+const DRAG_PX_FOR_FULL_RANGE = 250
+const DRAG_PX_PER_STEP_AT_FLOOR = 25
+
 const {
   min = -Number.MAX_VALUE,
   max = Number.MAX_VALUE,
@@ -97,17 +148,90 @@ const modelValue = defineModel<number>({ default: 0 })
 
 const container = useTemplateRef<HTMLDivElement>('container')
 const inputField = useTemplateRef<HTMLInputElement>('inputField')
-const swipeElement = useTemplateRef('swipeElement')
+const swipeElement = useTemplateRef<HTMLDivElement>('swipeElement')
 const textEdit = ref(false)
 
+// useElementSize is backed by ResizeObserver.contentRect, which reports in
+// logical CSS pixels and ignores ancestor transforms (canvas zoom). That's
+// exactly the unit the SVG and the bar fill's `width: %` both render in, so
+// no zoom compensation is needed anywhere.
+const { width: containerWidth } = useElementSize(container)
+
+const hasFiniteRange = computed(
+  () => Number.isFinite(min) && Number.isFinite(max) && max > min
+)
+const barVisible = computed(
+  () => hasFiniteRange.value && containerWidth.value > 0
+)
+
+function clamp(value: number): number {
+  return _clamp(value, min, max)
+}
+function quantize(value: number): number {
+  return step > 0 ? Math.round(value / step) * step : value
+}
+function validate(value: number): number {
+  return clamp(quantize(value))
+}
+
+const stepSize = computed(() => (step > 0 ? step : 1))
+
+const scrub = useScrubValue({
+  initial: modelValue.value,
+  // Step-based sensitivity: at speedMult=1, one step per screen pixel of
+  // drag. Intentionally independent of canvas zoom and input-field width —
+  // pointer-lock hides the cursor, so there's no "drag full bar = full range"
+  // affordance to preserve.
+  baseSpeed: stepSize,
+  // Floor: at minimum sensitivity, advancing one step takes
+  // DRAG_PX_PER_STEP_AT_FLOOR pixels. Derived: step * speedMult = step / px
+  // ⇒ speedMult = 1 / px.
+  minSpeed: 1 / DRAG_PX_PER_STEP_AT_FLOOR,
+  // Ceiling: at maximum sensitivity, traversing the entire range takes
+  // DRAG_PX_FOR_FULL_RANGE pixels. Derived: step * speedMult * px = range
+  // ⇒ speedMult = range / (step * px). Falls back to a generous constant
+  // when the range is unbounded (no calibration target).
+  maxSpeed: computed(() =>
+    hasFiniteRange.value
+      ? (max - min) / (stepSize.value * DRAG_PX_FOR_FULL_RANGE)
+      : 1000
+  ),
+  validate: (v) => (hasFiniteRange.value ? validate(v) : v),
+  onChange: (v) => {
+    modelValue.value = v
+  }
+})
+
+watch(modelValue, (v) => {
+  if (v !== scrub.state.value) scrub.setValue(v)
+})
+
+const { dragging } = useDragGesture(swipeElement, {
+  disabled: computed(() => disabled || textEdit.value),
+  lockPointer: true,
+  // A plain click should focus the input — not hide the cursor. So pointer
+  // lock and onDragStart only fire once the user has *committed* to a scrub:
+  // either by crossing the movement threshold, or by holding still past the
+  // long-press delay (matches Tweeq's default).
+  dragDelaySeconds: 0.5,
+  // Drag always modifies from the *current* value — no jump-to-click. The
+  // gesture deltas via interpretGesture are inherently relative.
+  onDragStart: () => scrub.reset(),
+  onDrag: (dx, dy) => scrub.apply(dx, dy),
+  onDragEnd: () => {
+    if (step > 0) scrub.setValue(validate(scrub.state.value))
+  },
+  onClick: () => {
+    textEdit.value = true
+    inputField.value?.focus()
+    inputField.value?.select()
+  }
+})
+
 onClickOutside(container, () => {
   if (textEdit.value) textEdit.value = false
 })
 
-function clamp(value: number): number {
-  return Math.min(max, Math.max(min, value))
-}
-
 const canDecrement = computed(() => modelValue.value > min && !disabled)
 const canIncrement = computed(() => modelValue.value < max && !disabled)
 
@@ -120,34 +244,10 @@ function handleBlur(e: Event) {
       ? undefined
       : Number(raw)
   if (parsed != null && !isNaN(parsed)) {
-    modelValue.value = clamp(parsed)
+    scrub.setValue(clamp(parsed))
   } else {
     target.value = displayValue ?? String(modelValue.value)
   }
   textEdit.value = false
 }
-
-let dragDelta = 0
-function handlePointerUp() {
-  if (isSwiping.value) return
-
-  textEdit.value = true
-  inputField.value?.focus()
-  inputField.value?.select()
-}
-
-const { distanceX, isSwiping } = usePointerSwipe(swipeElement, {
-  onSwipeEnd: () => (dragDelta = 0)
-})
-
-whenever(distanceX, () => {
-  if (disabled) return
-  const delta = ((distanceX.value - dragDelta) / 10) | 0
-  dragDelta += delta * 10
-  modelValue.value = clamp(modelValue.value - delta * step)
-})
-
-function updateValueBy(delta: number) {
-  modelValue.value = Math.min(max, Math.max(min, modelValue.value + delta))
-}
 </script>

src/components/common/scrubableNumberInput/BallRuler.vue

@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import type { ScrubState } from './useScrubValue'
+
+const {
+  state,
+  width,
+  min,
+  max,
+  hasBar = false
+} = defineProps<{
+  state: Readonly<ScrubState>
+  /** Container width in *logical* CSS pixels (post-zoom dimensions divided by zoom). */
+  width: number
+  min: number
+  max: number
+  /** Anchor mode: bar mode pins a ball to the handle; free mode pins to center at value=0. */
+  hasBar?: boolean
+}>()
+
+function mod(a: number, n: number): number {
+  return ((a % n) + n) % n
+}
+
+function smoothstep(a: number, b: number, x: number): number {
+  const t = Math.max(0, Math.min(1, (x - a) / (b - a)))
+  return t * t * (3 - 2 * t)
+}
+
+const dashOffset = computed(() =>
+  hasBar
+    ? ((state.value - min) / (max - min)) * width
+    : width / 2 - state.value / state.speedMult
+)
+
+const layers = computed(() =>
+  Array.from({ length: 3 }, (_, i) => {
+    const precision = mod(-Math.log10(state.speedMult) + i, 3)
+    return {
+      precision,
+      gap: Math.pow(10, precision),
+      opacity: Math.pow(smoothstep(1, 2, precision), 0.5)
+    }
+  }).filter((layer) => layer.opacity >= 0.01)
+)
+</script>
+
+<template>
+  <svg
+    class="pointer-events-none absolute inset-0 size-full overflow-hidden rounded-lg"
+    aria-hidden="true"
+  >
+    <line
+      v-for="layer in layers"
+      :key="layer.precision"
+      :x1="0"
+      :x2="width"
+      y1="50%"
+      y2="50%"
+      fill="none"
+      stroke-linecap="round"
+      :stroke="`color-mix(in srgb, var(--p-primary-color), var(--p-text-muted-color) ${state.weight * 100}%)`"
+      :stroke-width="4 - state.weight"
+      :stroke-dasharray="`0 ${layer.gap}`"
+      :stroke-dashoffset="-dashOffset"
+      :opacity="layer.opacity"
+    />
+  </svg>
+</template>

src/components/common/scrubableNumberInput/interpretGesture.test.ts

@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest'
+
+import type { GestureState } from './interpretGesture'
+import { interpretGesture } from './interpretGesture'
+
+function baseState(overrides: Partial<GestureState> = {}): GestureState {
+  return {
+    dirAvg: [1, 0],
+    speedMult: 1,
+    baseSpeed: 1,
+    ...overrides
+  }
+}
+
+describe('interpretGesture', () => {
+  it('pure horizontal drag → all delta becomes value change, sensitivity unchanged', () => {
+    const r = interpretGesture(baseState(), 10, 0)
+    expect(r.weight).toBe(1)
+    expect(r.valueDelta).toBe(10)
+    expect(r.speedMultNext).toBe(1)
+  })
+
+  it('pure vertical drag → no value change, sensitivity scales by 0.98^dy', () => {
+    const r = interpretGesture(baseState({ dirAvg: [0, 1] }), 0, 10)
+    expect(r.weight).toBe(0)
+    expect(r.valueDelta).toBe(0)
+    expect(r.speedMultNext).toBeCloseTo(Math.pow(0.98, 10), 10)
+  })
+
+  it('zero delta is a no-op for value and sensitivity', () => {
+    const r = interpretGesture(baseState(), 0, 0)
+    expect(r.valueDelta).toBe(0)
+    expect(r.speedMultNext).toBe(1)
+  })
+
+  it('respects modifierSpeed', () => {
+    const r = interpretGesture(baseState({ modifierSpeed: 10 }), 5, 0)
+    expect(r.valueDelta).toBe(50)
+  })
+
+  it('clamps speedMult to [minSpeed, maxSpeed]', () => {
+    const veryFast = interpretGesture(
+      baseState({ dirAvg: [0, 1], speedMult: 0.5, minSpeed: 0.1, maxSpeed: 1 }),
+      0,
+      -1000
+    )
+    expect(veryFast.speedMultNext).toBe(1)
+
+    const verySlow = interpretGesture(
+      baseState({ dirAvg: [0, 1], speedMult: 0.5, minSpeed: 0.1, maxSpeed: 1 }),
+      0,
+      1000
+    )
+    expect(verySlow.speedMultNext).toBe(0.1)
+  })
+
+  it('diagonal drag blends value and sensitivity proportionally', () => {
+    // Slightly-vertical-leaning dirAvg with small deltas → normalized x
+    // component lands in the smoothstep transition zone (0.4..0.6).
+    const r = interpretGesture(baseState({ dirAvg: [0.5, 0.866] }), 1, 2)
+    expect(r.weight).toBeGreaterThan(0)
+    expect(r.weight).toBeLessThan(1)
+    expect(r.valueDelta).toBeGreaterThan(0)
+    expect(r.valueDelta).toBeLessThan(1)
+    expect(r.speedMultNext).toBeLessThan(1)
+  })
+
+  it('dirAvgNext is normalized (unit length)', () => {
+    const r = interpretGesture(baseState(), 7, 13)
+    expect(Math.hypot(...r.dirAvgNext)).toBeCloseTo(1, 10)
+  })
+
+  it('is deterministic — same inputs produce same outputs', () => {
+    const a = interpretGesture(baseState({ speedMult: 0.3 }), 4, -2)
+    const b = interpretGesture(baseState({ speedMult: 0.3 }), 4, -2)
+    expect(a).toEqual(b)
+  })
+})

src/components/common/scrubableNumberInput/interpretGesture.ts

@@ -0,0 +1,75 @@
+/**
+ * Pure algorithmic core of the Tweeq-style drag scrub. No Vue, no DOM.
+ *
+ * Given a smoothed direction average and the current sensitivity multiplier,
+ * decides how much of an incoming pointer delta becomes a value change
+ * (X-axis intent) vs. a sensitivity change (Y-axis intent), with a smooth
+ * crossfade between the two so diagonal motion never feels jerky.
+ */
+
+export interface GestureState {
+  /** EMA of |delta|, normalized to unit length. */
+  dirAvg: [number, number]
+  /** Current sensitivity multiplier. */
+  speedMult: number
+  /** Value-units per pixel at speedMult = 1. */
+  baseSpeed: number
+  /** Lower clamp on speedMult. Default 1e-4. */
+  minSpeed?: number
+  /** Upper clamp on speedMult. Default 1 (bounded) or 1000 (unbounded). */
+  maxSpeed?: number
+  /** Extra multiplier from external sources (modifier keys). Default 1. */
+  modifierSpeed?: number
+}
+
+interface GestureUpdate {
+  dirAvgNext: [number, number]
+  /** How "horizontal" the gesture is, ∈ [0, 1]. */
+  weight: number
+  /** Amount to add to the value this tick. */
+  valueDelta: number
+  /** New sensitivity multiplier (already clamped). */
+  speedMultNext: number
+}
+
+export function interpretGesture(
+  state: GestureState,
+  dx: number,
+  dy: number
+): GestureUpdate {
+  const absX = Math.abs(dx)
+  const absY = Math.abs(dy)
+  const dirAvgNext = normalize([
+    state.dirAvg[0] * 0.9 + absX * 0.1,
+    state.dirAvg[1] * 0.9 + absY * 0.1
+  ])
+
+  const weight = smoothstep(0.4, 0.6, Math.abs(dirAvgNext[0]))
+
+  const modifierSpeed = state.modifierSpeed ?? 1
+  const valueDelta =
+    dx * state.baseSpeed * state.speedMult * modifierSpeed * weight
+
+  const speedMultRaw = state.speedMult * Math.pow(0.98, dy)
+  const speedMultNext = clamp(
+    speedMultRaw * (1 - weight) + state.speedMult * weight,
+    state.minSpeed ?? 1e-4,
+    state.maxSpeed ?? 1
+  )
+
+  return { dirAvgNext, weight, valueDelta, speedMultNext }
+}
+
+function smoothstep(a: number, b: number, x: number): number {
+  const t = Math.max(0, Math.min(1, (x - a) / (b - a)))
+  return t * t * (3 - 2 * t)
+}
+
+function normalize([x, y]: readonly [number, number]): [number, number] {
+  const m = Math.hypot(x, y) || 1
+  return [x / m, y / m]
+}
+
+function clamp(v: number, a: number, b: number): number {
+  return Math.min(b, Math.max(a, v))
+}

src/components/common/scrubableNumberInput/useDragGesture.ts

@@ -0,0 +1,141 @@
+import { useEventListener, usePointerLock } from '@vueuse/core'
+import type { MaybeRef } from 'vue'
+import { readonly, ref, unref } from 'vue'
+
+type DragPointerType = 'mouse' | 'pen' | 'touch'
+
+interface DragGestureOptions {
+  /** Engage pointerLock for the duration of the drag. */
+  lockPointer?: MaybeRef<boolean>
+  disabled?: MaybeRef<boolean>
+  /** Hold-to-drag delay in seconds. Set to 0 for instant drag. Default 0. */
+  dragDelaySeconds?: number
+  /** Pointer types accepted. Default mouse + pen + touch. */
+  pointerType?: DragPointerType[]
+  onDragStart?: (event: PointerEvent) => void
+  /** dx/dy are in physical pixels with browser-zoom compensated out. */
+  onDrag?: (dx: number, dy: number, event: PointerEvent) => void
+  onDragEnd?: (event: PointerEvent) => void
+  /** Fires when the pointer is released without ever crossing the drag threshold. */
+  onClick?: (event: PointerEvent) => void
+}
+
+/**
+ * DOM-only pointer wrangling. Hides ~100 lines of finicky pointer-event
+ * choreography behind a 4-callback interface:
+ *   - pointer capture so the drag survives leaving the element
+ *   - optional pointer lock (for unbounded scrubbing)
+ *   - drag-vs-click discrimination (timer + distance threshold)
+ *   - pointercancel / pointerleave fallbacks so onDragEnd always fires
+ *   - primary-button / pointer-type filtering
+ *   - browser zoom compensation (event.movementX scaled by 1/zoom)
+ *
+ * Consumers receive dx/dy and don't need to know any of the above exists.
+ */
+export function useDragGesture(
+  target: MaybeRef<HTMLElement | null | undefined>,
+  options: DragGestureOptions = {}
+): { dragging: Readonly<ReturnType<typeof ref<boolean>>> } {
+  const dragging = ref(false)
+  const allowedTypes = options.pointerType ?? ['mouse', 'pen', 'touch']
+  const dragDelay = options.dragDelaySeconds ?? 0
+
+  const { lock, unlock } = usePointerLock(target)
+
+  let pointerId: number | null = null
+  let pointerDownAt: [number, number] | null = null
+  let dragDelayTimer: ReturnType<typeof setTimeout> | undefined
+  let pointerLocked = false
+
+  function teardown() {
+    if (dragDelayTimer !== undefined) {
+      clearTimeout(dragDelayTimer)
+      dragDelayTimer = undefined
+    }
+    pointerDownAt = null
+    pointerId = null
+  }
+
+  function fireStart(event: PointerEvent) {
+    dragging.value = true
+    if (unref(options.lockPointer) && !pointerLocked) {
+      pointerLocked = true
+      void lock(event).catch(() => {
+        pointerLocked = false
+      })
+    }
+    options.onDragStart?.(event)
+  }
+
+  function onPointerDown(event: PointerEvent) {
+    if (unref(options.disabled)) return
+    if (event.button !== 0 || !event.isPrimary) return
+    if (!allowedTypes.includes(event.pointerType as DragPointerType)) return
+
+    pointerId = event.pointerId
+    pointerDownAt = [event.clientX, event.clientY]
+    const el = unref(target)
+    el?.setPointerCapture(pointerId)
+
+    // Drag commitment is decided later — either by the movement-distance
+    // threshold in onPointerMove, or by this long-press timer expiring while
+    // the pointer is still down. Until then it's just a potential click.
+    if (dragDelay === 0) return
+    dragDelayTimer = setTimeout(() => fireStart(event), dragDelay * 1000)
+  }
+
+  function onPointerMove(event: PointerEvent) {
+    if (pointerId !== event.pointerId || pointerDownAt === null) return
+
+    if (!dragging.value) {
+      // Lock engages inside fireStart, not yet — so clientX/Y is still valid
+      // for the drag-vs-click distance threshold.
+      const minDist = event.pointerType === 'mouse' ? 1 : 5
+      const moved = Math.hypot(
+        event.clientX - pointerDownAt[0],
+        event.clientY - pointerDownAt[1]
+      )
+      if (moved < minDist) return
+      if (dragDelayTimer !== undefined) {
+        clearTimeout(dragDelayTimer)
+        dragDelayTimer = undefined
+      }
+      fireStart(event)
+    }
+
+    // Compensate for browser zoom (Cmd +/-). event.movementX/Y report in
+    // device-pixel-like units that don't honor the browser zoom level; the
+    // ratio outerWidth/innerWidth backs that out.
+    const browserZoom = window.outerWidth / window.innerWidth || 1
+    const dx = (event.movementX || 0) / browserZoom
+    const dy = (event.movementY || 0) / browserZoom
+    options.onDrag?.(dx, dy, event)
+  }
+
+  function onPointerUp(event: PointerEvent) {
+    if (pointerId !== event.pointerId) return
+    const el = unref(target)
+    el?.releasePointerCapture(event.pointerId)
+
+    const wasDragging = dragging.value
+    if (pointerLocked) {
+      void unlock()
+      pointerLocked = false
+    }
+    if (wasDragging) {
+      options.onDragEnd?.(event)
+    } else {
+      options.onClick?.(event)
+    }
+    dragging.value = false
+    teardown()
+  }
+
+  useEventListener(target, 'pointerdown', onPointerDown)
+  useEventListener(target, 'pointermove', onPointerMove)
+  useEventListener(target, 'pointerup', onPointerUp)
+  useEventListener(target, 'pointercancel', onPointerUp)
+  useEventListener(target, 'pointerleave', onPointerUp)
+
+  return { dragging: readonly(dragging) }
+}

src/components/common/scrubableNumberInput/useScrubValue.ts

@@ -0,0 +1,119 @@
+import type { MaybeRef } from 'vue'
+import { computed, reactive, readonly, unref, watch } from 'vue'
+
+import type { GestureState } from './interpretGesture'
+import { interpretGesture } from './interpretGesture'
+
+interface ScrubOptions {
+  /** Initial value. Pulled once during setup; later sync via setValue(). */
+  initial: number
+  /** Value-units per pixel at speedMult = 1. Reactive. */
+  baseSpeed: MaybeRef<number>
+  /** Min sensitivity multiplier. */
+  minSpeed?: MaybeRef<number>
+  /** Max sensitivity multiplier. */
+  maxSpeed?: MaybeRef<number>
+  /** External multiplier (e.g. modifier keys). */
+  modifierSpeed?: MaybeRef<number>
+  /** Optional post-mutation validator (clamp/quantize/snap composition). */
+  validate?: (value: number) => number
+  /** Notified whenever value changes from inside (apply / setValue). */
+  onChange?: (value: number) => void
+}
+
+export interface ScrubState {
+  readonly value: number
+  readonly speedMult: number
+  /** Horizontality weight from the latest apply(). Useful for visuals. */
+  readonly weight: number
+}
+
+interface ScrubInstance {
+  state: Readonly<ScrubState>
+  /** Feed one pointer-tick into the scrub algorithm. */
+  apply(dx: number, dy: number): void
+  /** Reset gesture-internal state (speedMult, direction, weight). Does NOT touch value. */
+  reset(): void
+  /** Replace the current value (e.g. external model update, jump-to-click). */
+  setValue(value: number): void
+}
+
+/**
+ * Owns all mutable scrub state for a single input. Hides direction EMA,
+ * accumulator, and validator chain from callers — apply/reset/setValue are
+ * the only mutators.
+ *
+ * The raw accumulator (`internal.raw`) is intentionally NOT quantized. Tiny
+ * per-frame deltas under one step would otherwise be rounded to zero and
+ * the value would never move. By accumulating raw and quantizing only on
+ * the way out, sub-step motion accrues until it crosses a step boundary.
+ */
+export function useScrubValue(opts: ScrubOptions): ScrubInstance {
+  const internal = reactive({
+    raw: opts.initial,
+    speedMult: 1,
+    weight: 1,
+    dirAvg: [1, 0] as [number, number]
+  })
+
+  const validated = computed(() =>
+    opts.validate ? opts.validate(internal.raw) : internal.raw
+  )
+
+  let lastEmitted = validated.value
+  watch(validated, (v) => {
+    if (v === lastEmitted) return
+    lastEmitted = v
+    opts.onChange?.(v)
+  })
+
+  function apply(dx: number, dy: number) {
+    const gestureState: GestureState = {
+      dirAvg: internal.dirAvg,
+      speedMult: internal.speedMult,
+      baseSpeed: unref(opts.baseSpeed),
+      minSpeed: unref(opts.minSpeed),
+      maxSpeed: unref(opts.maxSpeed),
+      modifierSpeed: unref(opts.modifierSpeed)
+    }
+    const { dirAvgNext, weight, valueDelta, speedMultNext } = interpretGesture(
+      gestureState,
+      dx,
+      dy
+    )
+    internal.dirAvg = dirAvgNext
+    internal.weight = weight
+    internal.speedMult = speedMultNext
+    internal.raw += valueDelta
+  }
+
+  /**
+   * Reset transient gesture state — direction EMA and weight — that carries
+   * no meaning between drags. Intentionally does NOT touch `speedMult`: the
+   * Y-axis sensitivity the user dialed in during one drag persists into the
+   * next, so a slip-up release doesn't force them to re-calibrate.
+   */
+  function reset() {
+    internal.weight = 1
+    internal.dirAvg = [1, 0]
+  }
+
+  /**
+   * Replace the raw accumulator. Use to snap to a clean value after a drag
+   * (orchestrator calls setValue(state.value) at drag end to discard any
+   * sub-step residual), or to sync with an external model change.
+   */
+  function setValue(value: number) {
+    internal.raw = value
+  }
+
+  const state = readonly(
+    reactive({
+      value: validated,
+      speedMult: computed(() => internal.speedMult),
+      weight: computed(() => internal.weight)
+    })
+  ) as Readonly<ScrubState>
+
+  return { state, apply, reset, setValue }
+}

src/components/custom/widget/WorkflowTemplateSelectorDialog.vue

@@ -744,6 +744,10 @@ const sortOptions = computed(() => [
     value: 'popular'
   },
   { name: t('templateWorkflows.sort.newest', 'Newest'), value: 'newest' },
+  {
+    name: t('templateWorkflows.sort.vramLowToHigh', 'VRAM Usage (Low to High)'),
+    value: 'vram-low-to-high'
+  },
   {
     name: t(
       'templateWorkflows.sort.modelSizeLowToHigh',

src/components/graph/GraphCanvas.vue

@@ -541,26 +541,32 @@ onMounted(async () => {
     }
 
     vueNodeLifecycle.setupEmptyGraphListener()
-
-    // Load color palette
-    colorPaletteStore.customPalettes = settingStore.get(
-      'Comfy.CustomColorPalettes'
-    )
-
-    // Restore saved workflow and workflow tabs state
-    await workflowPersistence.initializeWorkflow()
-    await workflowPersistence.restoreWorkflowTabsState()
-    await workflowPersistence.loadTemplateFromUrlIfPresent()
   } finally {
     workspaceStore.spinner = false
   }
-  await workflowPersistence.loadSharedWorkflowFromUrlIfPresent()
 
   comfyApp.canvas.onSelectionChange = useChainCallback(
     comfyApp.canvas.onSelectionChange,
     () => canvasStore.updateSelectedItems()
   )
 
+  // Load color palette
+  colorPaletteStore.customPalettes = settingStore.get(
+    'Comfy.CustomColorPalettes'
+  )
+
+  // Restore saved workflow and workflow tabs state
+  await workflowPersistence.initializeWorkflow()
+  await workflowPersistence.restoreWorkflowTabsState()
+
+  const sharedWorkflowLoadStatus =
+    await workflowPersistence.loadSharedWorkflowFromUrlIfPresent()
+
+  // Load template from URL if present
+  if (sharedWorkflowLoadStatus === 'not-present') {
+    await workflowPersistence.loadTemplateFromUrlIfPresent()
+  }
+
   // Accept workspace invite from URL if present (e.g., ?invite=TOKEN)
   // WorkspaceAuthGate ensures flag state is resolved before GraphCanvas mounts
   if (inviteUrlLoader && flags.teamWorkspacesEnabled) {

src/components/load3d/Load3D.vue

@@ -4,6 +4,8 @@
     @mouseenter="handleMouseEnter"
     @mouseleave="handleMouseLeave"
     @pointerdown.stop
+    @pointermove.stop
+    @pointerup.stop
   >
     <Load3DScene
       v-if="node"