feat: accept bboxes input and add grid snapping to Create Bounding Boxes

.github/workflows/backport-auto-merge.yaml

@@ -1,197 +0,0 @@
----
-name: Backport Auto-Merge
-
-# Completes the merge of backport PRs once they are approved and their required
-# checks pass.
-#
-# Background: pr-backport.yaml opens each backport PR (labelled `backport`) and
-# calls `gh pr merge --auto`, which relies on the repo-level "Allow auto-merge"
-# setting. That setting is off, so `--auto` is a silent no-op and backport PRs
-# sit unmerged until a human clicks merge. This workflow performs the merge
-# directly (a plain `gh pr merge --squash`, which does not depend on that
-# setting) once GitHub itself reports the PR as ready to merge.
-#
-# Safety: branch protection on core/** and cloud/** is the hard gate — it
-# unconditionally requires an approval + the required status checks and cannot
-# be bypassed, and GitHub's merge API re-enforces it at merge time. This
-# workflow can only ever complete a merge that already satisfies those rules;
-# the eligibility check below only avoids pointless merge attempts.
-#
-# The merge uses PR_GH_TOKEN (not the default GITHUB_TOKEN) on purpose: a merge
-# performed by the default token does not emit events that trigger other
-# workflows, which would silently starve cloud-backport-tag.yaml (it runs on the
-# backport PR's `pull_request: closed` event to create the release tag).
-
-on:
-  # Fires when someone approves — if the required checks are already green, the
-  # PR merges immediately.
-  pull_request_review:
-    types: [submitted]
-  # Primary catch for the "approved first, checks went green later" case, plus a
-  # general backstop. A `check_suite`/`workflow_run` trigger would react faster to
-  # checks completing, but GitHub suppresses `check_suite` events for its own
-  # Actions suites (so it wouldn't fire for this repo's CI), and `workflow_run` is
-  # a secrets-bearing "dangerous" trigger we don't want on a public repo for a
-  # non-latency-critical task. Backports wait hours today, so a short sweep is a
-  # large improvement and needs neither.
-  schedule:
-    - cron: '*/15 * * * *'
-
-# Only constrains the default github.token (used for read-only PR lookups below).
-# It does NOT constrain PR_GH_TOKEN, whose authority is fixed by its own scopes.
-permissions:
-  contents: read # read-only; required for gh api / gh pr list to resolve candidates
-  pull-requests: read # read-only; required for gh pr view eligibility checks
-
-# Serialize runs that act on the same PR (review events keyed by PR number; all
-# scheduled sweeps share one key). Cross-key overlaps are still possible but
-# harmless: the merge loop treats an already-merged PR as success (idempotent).
-concurrency:
-  group: backport-auto-merge-${{ github.event.pull_request.number || 'sweep' }}
-  cancel-in-progress: false
-
-jobs:
-  merge:
-    name: Merge eligible backport PRs
-    # Skip review events that can't possibly make a PR mergeable — non-approval
-    # reviews, or reviews on non-backport PRs (most reviews in the repo) — before
-    # spending any API call. Schedule sweeps always proceed. The per-PR
-    # eligibility checks in the job still re-verify the label and decision from
-    # live state.
-    if: github.event_name != 'pull_request_review' || (github.event.review.state == 'approved' && contains(github.event.pull_request.labels.*.name, 'backport'))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read # read-only PR/commit lookups via the default token
-      pull-requests: read # read-only PR metadata via the default token
-    steps:
-      - name: Collect candidate backport PRs
-        id: candidates
-        env:
-          GH_TOKEN: ${{ github.token }}
-          GH_REPO: ${{ github.repository }}
-          EVENT_NAME: ${{ github.event_name }}
-          PR_FROM_REVIEW: ${{ github.event.pull_request.number }}
-        run: |
-          set -euo pipefail
-          numbers=""
-          case "$EVENT_NAME" in
-            pull_request_review)
-              numbers="$PR_FROM_REVIEW"
-              ;;
-            schedule)
-              # Sweep every open backport PR.
-              numbers=$(gh pr list --repo "$GH_REPO" --state open --label backport \
-                --limit 100 --json number --jq '.[].number')
-              ;;
-          esac
-          # De-duplicate and emit space-separated, digit-only tokens.
-          numbers=$(echo "$numbers" | tr ' ' '\n' | grep -E '^[0-9]+$' | sort -u | tr '\n' ' ' || true)
-          echo "numbers=${numbers}" >> "$GITHUB_OUTPUT"
-          echo "Candidate PRs: '${numbers:-<none>}'"
-
-      - name: Merge eligible backport PRs
-        if: steps.candidates.outputs.numbers != ''
-        env:
-          GH_REPO: ${{ github.repository }}
-          # Read with the default token; merge with PR_GH_TOKEN so the merge emits
-          # the events that downstream workflows (cloud-backport-tag.yaml) rely on.
-          READ_TOKEN: ${{ github.token }}
-          MERGE_TOKEN: ${{ secrets.PR_GH_TOKEN }}
-          CANDIDATES: ${{ steps.candidates.outputs.numbers }}
-        run: |
-          set -euo pipefail
-
-          is_merged() {
-            [ "$(GH_TOKEN="$READ_TOKEN" gh pr view "$1" --repo "$GH_REPO" --json merged --jq '.merged' 2>/dev/null || echo false)" = "true" ]
-          }
-
-          for pr in $CANDIDATES; do
-            echo "::group::PR #${pr}"
-
-            info=$(GH_TOKEN="$READ_TOKEN" gh pr view "$pr" --repo "$GH_REPO" \
-              --json number,state,isDraft,labels,baseRefName,reviewDecision,mergeStateStatus 2>/dev/null || echo '')
-            if [ -z "$info" ]; then
-              echo "Could not read PR #${pr} — skipping."; echo "::endgroup::"; continue
-            fi
-
-            state=$(echo "$info" | jq -r '.state')
-            is_draft=$(echo "$info" | jq -r '.isDraft')
-            is_backport=$(echo "$info" | jq -r '[.labels[].name] | any(. == "backport")')
-            base=$(echo "$info" | jq -r '.baseRefName')
-            review=$(echo "$info" | jq -r '.reviewDecision')
-            merge_state=$(echo "$info" | jq -r '.mergeStateStatus')
-
-            # Only ever act on open, non-draft, backport-labelled PRs targeting a
-            # protected release branch.
-            if [ "$state" != "OPEN" ] || [ "$is_draft" != "false" ] || [ "$is_backport" != "true" ]; then
-              echo "Not an actionable backport PR (state=$state draft=$is_draft backport=$is_backport) — skipping."
-              echo "::endgroup::"; continue
-            fi
-            case "$base" in
-              cloud/*|core/*) : ;;
-              *) echo "Base '$base' is not a release branch — skipping."; echo "::endgroup::"; continue ;;
-            esac
-
-            # Ready = approved AND GitHub says it's mergeable with required checks green.
-            #   CLEAN    = approved, all required checks green, mergeable, no conflict.
-            #   UNSTABLE = same, but a NON-required check is pending/failing — GitHub
-            #              still allows the merge, so we do too (matches what a human
-            #              clicking "Squash and merge" can do; required checks are the
-            #              only merge gate per the ruleset). Requiring CLEAN alone would
-            #              stick forever behind flaky/slow non-required checks.
-            # Any other state (BLOCKED/DIRTY/BEHIND/UNKNOWN/...) => not ready; re-checked
-            # by a later event or the next sweep.
-            if [ "$review" != "APPROVED" ] || { [ "$merge_state" != "CLEAN" ] && [ "$merge_state" != "UNSTABLE" ]; }; then
-              echo "Not yet ready (reviewDecision=$review mergeStateStatus=$merge_state) — will re-check later."
-              echo "::endgroup::"; continue
-            fi
-
-            echo "PR #${pr} is ready — attempting squash merge."
-            attempt=0
-            max=3
-            merged=false
-            while [ "$attempt" -lt "$max" ]; do
-              attempt=$((attempt + 1))
-              # A concurrent run (or a human) may have merged it already.
-              if is_merged "$pr"; then merged=true; break; fi
-              if out=$(GH_TOKEN="$MERGE_TOKEN" gh pr merge "$pr" --repo "$GH_REPO" --squash 2>&1); then
-                merged=true; break
-              fi
-              echo "Merge attempt ${attempt}/${max} failed: ${out}"
-              # No sleep after the final attempt.
-              [ "$attempt" -lt "$max" ] && sleep $((attempt * 15))
-            done
-
-            # Final reconciliation: a failed merge command may just mean a concurrent
-            # run won the race — don't post a false failure if the PR is in fact merged.
-            if [ "$merged" != "true" ] && is_merged "$pr"; then merged=true; fi
-
-            if [ "$merged" = "true" ]; then
-              echo "PR #${pr} merged."
-            else
-              echo "::warning::PR #${pr} looked ready but did not merge after ${max} attempts."
-              # Avoid spamming a persistently-stuck PR: only re-warn if the last
-              # warning (identified by its marker) is more than an hour old.
-              marker='<!-- backport-auto-merge:merge-failed -->'
-              # `gh api --paginate` emits one JSON array per page; `--jq` would run
-              # per page (missing the true latest across pages), so slurp all pages
-              # into one array first and filter with a separate jq pass.
-              last_warned=$(GH_TOKEN="$READ_TOKEN" gh api "repos/${GH_REPO}/issues/${pr}/comments" --paginate 2>/dev/null \
-                | jq -s "[.[][] | select(.body | contains(\"${marker}\"))] | sort_by(.created_at) | last | .created_at // empty") || last_warned=''
-              stale=true
-              if [ -n "$last_warned" ]; then
-                last_epoch=$(date -d "$last_warned" +%s 2>/dev/null || echo 0)
-                now_epoch=$(date -u +%s)
-                [ $((now_epoch - last_epoch)) -lt 3600 ] && stale=false
-              fi
-              if [ "$stale" = "true" ]; then
-                body=$(printf '%s\n\n%s' \
-                  "This backport PR is approved and its required checks are green, but automatic merge failed after ${max} attempts. Please merge manually or investigate (possible branch-protection mismatch)." \
-                  "$marker")
-                GH_TOKEN="$MERGE_TOKEN" gh pr comment "$pr" --repo "$GH_REPO" --body "$body" || true
-              else
-                echo "Already warned within the last hour — skipping duplicate comment."
-              fi
-            fi
-            echo "::endgroup::"
-          done

.github/workflows/cla.yml

@@ -6,7 +6,6 @@ on:
   pull_request_target:
     types: [opened, synchronize, closed]
   merge_group:
-    types: [checks_requested]
 
 permissions:
   actions: write
@@ -18,45 +17,13 @@ jobs:
   cla-assistant:
     runs-on: ubuntu-latest
     steps:
-      - name: CLA already verified before merge queue
-        if: github.event_name == 'merge_group'
-        run: echo "CLA is checked on the pull request before it enters merge queue."
-
-      # The CLA action normally requires every commit author in a PR to sign.
-      # We only want the PR author to sign, so we allowlist all other committers
-      # by computing them from the PR's commits and excluding the PR author.
-      - name: Build author-only allowlist
-        id: allowlist
-        if: >
-          github.event_name == 'pull_request_target' ||
-          (github.event_name == 'issue_comment' && github.event.issue.pull_request && (
-            github.event.comment.body == 'recheck' ||
-            github.event.comment.body == 'I have read and agree to the Contributor License Agreement'
-          ))
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
-          PR_AUTHOR: ${{ github.event.pull_request.user.login || github.event.issue.user.login }}
-          BASE_ALLOWLIST: action@github.com,actions-user,ampagent,claude,comfy-pr-bot,GitHub Action,github-actions,github-actions[bot],Glary Bot,Glary-Bot,*[bot]
-        run: |
-          others=$(gh api "repos/${{ github.repository }}/pulls/${PR_NUMBER}/commits" --paginate \
-            --jq '.[] | (.author.login // empty), (.committer.login // empty)' \
-            | sort -u | grep -vix "${PR_AUTHOR}" | paste -sd, -)
-          if [ -n "$others" ]; then
-            echo "allowlist=${BASE_ALLOWLIST},${others}" >> "$GITHUB_OUTPUT"
-          else
-            echo "allowlist=${BASE_ALLOWLIST}" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: CLA Assistant
         # Run on PR events, on "recheck" comment, or when someone posts the exact signing phrase.
         # IMPORTANT: this phrase must match `custom-pr-sign-comment` below.
         if: >
           github.event_name == 'pull_request_target' ||
-          (github.event_name == 'issue_comment' && github.event.issue.pull_request && (
-            github.event.comment.body == 'recheck' ||
-            github.event.comment.body == 'I have read and agree to the Contributor License Agreement'
-          ))
+          github.event.comment.body == 'recheck' ||
+          github.event.comment.body == 'I have read and agree to the Contributor License Agreement'
         uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -72,10 +39,9 @@ jobs:
           path-to-signatures: signatures/cla.json
           branch: main
 
-          # Only the PR author must sign: bots plus every non-author committer
-          # are allowlisted via the "Build author-only allowlist" step above.
+          # Allowlist bots so they don't need to sign (optional, comma-separated).
           # *[bot] is a catch-all for any GitHub App bot account.
-          allowlist: ${{ steps.allowlist.outputs.allowlist }}
+          allowlist: action@github.com,actions-user,ampagent,claude,comfy-pr-bot,GitHub Action,github-actions,Glary Bot,Glary-Bot,*[bot]
 
           # Custom PR comment messages
           custom-notsigned-prcomment: |

.github/workflows/pr-cursor-review.yaml

@@ -29,7 +29,7 @@ jobs:
     # SHA-pinned per zizmor `unpinned-uses: hash-pin`. Bump this SHA to pick up
     # upstream changes; keep `workflows_ref` matching so prompts/scripts load
     # from the same commit as the workflow definition.
-    uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@df507e6bae179c567ad3849370f99dae588985dc # github-workflows main (df507e6)
+    uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@047ca48febe3a6647608ed2e0c4331b491cb9d6a # github-workflows#9
     with:
       # Overriding diff_excludes replaces the reusable default wholesale, so
       # this restates the generated/vendored defaults and adds this repo's heavy
@@ -48,7 +48,7 @@ jobs:
         :!**/*-snapshots/**
         :!src/workbench/extensions/manager/types/generatedManagerTypes.ts
       # Load the prompts/scripts from the same ref as `uses:`.
-      workflows_ref: df507e6bae179c567ad3849370f99dae588985dc
+      workflows_ref: 047ca48febe3a6647608ed2e0c4331b491cb9d6a
     secrets:
       CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
       # Optional — enables start/complete Slack DMs to the triggerer.

apps/website/public/icons/ai-models/openai.svg

@@ -1,10 +0,0 @@
-<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1483_15836)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M196.373 184.704V136.491C196.373 132.437 197.909 129.387 201.451 127.36L298.368 71.552C311.573 63.936 327.296 60.3947 343.531 60.3947C404.416 60.3947 442.987 107.584 442.987 157.803C442.987 161.365 442.987 165.419 442.475 169.472L341.995 110.613C339.266 108.876 336.099 107.954 332.864 107.954C329.629 107.954 326.462 108.876 323.733 110.613L196.373 184.704ZM422.699 372.437V257.28C422.699 250.176 419.648 245.12 413.547 241.557L286.187 167.467L327.787 143.616C329.294 142.624 331.059 142.095 332.864 142.095C334.669 142.095 336.434 142.624 337.941 143.616L434.859 199.445C462.784 215.659 481.557 250.176 481.557 283.669C481.557 322.24 458.731 357.76 422.677 372.48L422.699 372.437ZM166.443 270.997L124.843 246.635C121.28 244.608 119.744 241.557 119.744 237.504V125.845C119.744 71.552 161.344 30.4427 217.685 30.4427C239.019 30.4427 258.795 37.5467 275.541 50.24L175.573 108.096C169.493 111.637 166.443 116.715 166.443 123.819V270.976V270.997ZM256 322.731L196.373 289.237V218.197L256 184.704L315.627 218.197V289.237L256 322.731ZM294.315 476.971C272.981 476.971 253.205 469.888 236.459 457.195L336.427 399.339C342.507 395.797 345.557 390.72 345.557 383.616V236.459L387.669 260.821C391.232 262.848 392.747 265.899 392.747 269.952V381.589C392.747 435.883 350.635 476.971 294.315 476.971ZM174.059 363.84L77.12 308.011C49.216 291.776 30.4427 257.28 30.4427 223.787C30.3769 204.756 35.9917 186.138 46.5684 170.317C57.1451 154.495 72.2025 142.19 89.8133 134.976V250.667C89.8133 257.771 92.864 262.848 98.944 266.411L225.813 339.989L184.213 363.84C182.707 364.835 180.941 365.365 179.136 365.365C177.331 365.365 175.565 364.835 174.059 363.84ZM168.469 447.04C111.125 447.04 69.0133 403.925 69.0133 350.635C69.0133 346.581 69.5253 342.528 70.016 338.475L169.984 396.288C176.085 399.851 182.165 399.851 188.245 396.288L315.605 322.731V370.944C315.605 374.997 314.112 378.048 310.549 380.075L213.632 435.883C200.427 443.499 184.704 447.04 168.469 447.04ZM294.315 507.413C323.553 507.416 351.895 497.319 374.547 478.831C397.198 460.343 412.768 434.598 418.624 405.952C475.456 391.232 512 337.92 512 283.648C512 248.128 496.789 213.632 469.376 188.757C471.915 178.091 473.429 167.445 473.429 156.8C473.429 84.2453 414.571 29.9307 346.581 29.9307C332.885 29.9307 319.701 31.9573 306.475 36.544C282.795 13.2354 250.933 0.118797 217.707 1.37049e-07C188.465 -0.00135846 160.121 10.0985 137.469 28.5908C114.817 47.0831 99.2486 72.8325 93.3973 101.483C36.544 116.203 0 169.493 0 223.787C0 259.328 15.2107 293.824 42.624 318.677C40.0853 329.344 38.5707 340.011 38.5707 350.656C38.5707 423.211 97.4293 477.504 165.419 477.504C179.115 477.504 192.299 475.477 205.525 470.912C229.208 494.23 261.08 507.347 294.315 507.456V507.413Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_1483_15836">
-<rect width="512" height="512" fill="white"/>
-</clipPath>
-</defs>
-</svg>

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

@@ -1,28 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-import { ChevronRight } from '@lucide/vue'
-
-import type { HTMLAttributes } from 'vue'
-
-const { hover = 'self', class: className } = defineProps<{
-  hover?: 'self' | 'group'
-  class?: HTMLAttributes['class']
-}>()
-</script>
-
-<template>
-  <div
-    :class="
-      cn(
-        'flex size-10 items-center justify-center rounded-2xl bg-white/20 text-white backdrop-blur-sm transition-colors',
-        hover === 'group'
-          ? 'group-hover:bg-primary-comfy-yellow group-hover:text-primary-comfy-ink'
-          : 'hover:bg-primary-comfy-yellow hover:text-primary-comfy-ink',
-        className
-      )
-    "
-    aria-hidden="true"
-  >
-    <ChevronRight class="size-5" :stroke-width="2" />
-  </div>
-</template>

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

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
 
-import Button from '../ui/button/Button.vue'
-
 const { title, description, cta, href, bg } = defineProps<{
   title: string
   description: string
@@ -30,9 +28,11 @@ const { title, description, cta, href, bg } = defineProps<{
       <p class="text-sm text-white/70">
         {{ description }}
       </p>
-      <Button as="span" variant="default" size="sm" class="mt-4">
+      <span
+        class="bg-primary-comfy-yellow text-primary-comfy-ink mt-4 inline-block rounded-xl px-4 py-2 text-xs font-bold tracking-wide"
+      >
         {{ cta }}
-      </Button>
+      </span>
     </div>
   </a>
 </template>

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

@@ -1,9 +1,7 @@
 <script setup lang="ts">
 import type { Locale } from '../../../i18n/translations'
 
-import { externalLinks } from '../../../config/routes'
 import { t } from '../../../i18n/translations'
-import CardArrow from '../../common/CardArrow.vue'
 import GlassCard from '../../common/GlassCard.vue'
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
@@ -29,7 +27,7 @@ const cards = [
 <template>
   <section class="max-w-9xl mx-auto px-4 pt-24 lg:px-20 lg:pt-40">
     <h2
-      class="text-3.5xl/tight mx-auto max-w-3xl text-center font-light text-primary-comfy-canvas lg:text-5xl/tight"
+      class="text-primary-comfy-canvas text-3.5xl/tight mx-auto max-w-3xl text-center font-light lg:text-5xl/tight"
     >
       {{ headingParts[0]
       }}<span class="text-white">{{
@@ -39,11 +37,10 @@ const cards = [
     </h2>
 
     <GlassCard class="mt-12 grid grid-cols-1 gap-6 lg:mt-20 lg:grid-cols-2">
-      <a
+      <div
         v-for="card in cards"
         :key="card.labelKey"
-        :href="externalLinks.cloud"
-        class="group rounded-4.5xl block overflow-hidden bg-primary-comfy-ink"
+        class="bg-primary-comfy-ink rounded-4.5xl overflow-hidden"
       >
         <img
           :src="card.image"
@@ -54,27 +51,23 @@ const cards = [
         />
 
         <div class="mt-8 p-6">
-          <div class="flex items-center justify-between gap-4">
-            <p
-              class="text-primary-comfy-yellow text-sm font-bold tracking-widest uppercase"
-            >
-              {{ t(card.labelKey, locale) }}
-            </p>
-
-            <CardArrow hover="group" class="shrink-0" />
-          </div>
+          <p
+            class="text-primary-comfy-yellow text-sm font-bold tracking-widest uppercase"
+          >
+            {{ t(card.labelKey, locale) }}
+          </p>
 
           <h3
-            class="mt-8 text-3xl/tight font-light whitespace-pre-line text-primary-comfy-canvas"
+            class="text-primary-comfy-canvas mt-8 text-3xl/tight font-light whitespace-pre-line"
           >
             {{ t(card.titleKey, locale) }}
           </h3>
 
-          <p class="mt-8 text-base/normal text-primary-comfy-canvas">
+          <p class="text-primary-comfy-canvas mt-8 text-base/normal">
             {{ t(card.descriptionKey, locale) }}
           </p>
         </div>
-      </a>
+      </div>
     </GlassCard>
   </section>
 </template>

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

@@ -17,18 +17,18 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
     >
       <div class="max-w-2xl">
         <h2
-          class="text-2xl/tight font-medium text-primary-comfy-ink lg:text-3xl/tight"
+          class="text-primary-comfy-ink text-2xl/tight font-medium lg:text-3xl/tight"
         >
           {{ t('cloud.pricing.title', locale) }}
         </h2>
 
-        <p class="mt-4 text-base text-primary-comfy-ink">
+        <p class="text-primary-comfy-ink mt-4 text-base">
           {{ t('cloud.pricing.description', locale) }}
         </p>
 
         <p
           v-if="SHOW_FREE_TIER"
-          class="mt-4 text-base font-bold text-primary-comfy-ink"
+          class="text-primary-comfy-ink mt-4 text-base font-bold"
         >
           {{ t('cloud.pricing.tagline', locale) }}
         </p>
@@ -36,7 +36,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 
       <a
         :href="getRoutes(locale).cloudPricing"
-        class="text-primary-comfy-yellow shrink-0 rounded-2xl bg-primary-comfy-ink px-6 py-3 text-center text-sm font-semibold transition-opacity hover:opacity-90"
+        class="bg-primary-comfy-ink text-primary-comfy-yellow shrink-0 rounded-2xl px-6 py-3 text-center text-sm font-semibold transition-opacity hover:opacity-90"
       >
         {{ t('cloud.pricing.cta', locale) }}
       </a>

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

@@ -6,7 +6,6 @@ import type { Locale } from '../../../i18n/translations'
 import { externalLinks } from '../../../config/routes'
 import { t } from '../../../i18n/translations'
 import BrandButton from '../../common/BrandButton.vue'
-import CardArrow from '../../common/CardArrow.vue'
 
 type ModelCard = {
   titleKey:
@@ -15,10 +14,11 @@ type ModelCard = {
     | 'cloud.aiModels.card.seedance20'
     | 'cloud.aiModels.card.qwenImageEdit'
     | 'cloud.aiModels.card.wan22TextToVideo'
-    | 'cloud.aiModels.card.gptImage2'
   imageSrc: string
   badgeIcon: string
   badgeClass: string
+  layoutClass: string
+  objectPosition?: string
 }
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
@@ -32,45 +32,48 @@ const modelCards: ModelCard[] = [
     imageSrc:
       'https://media.comfy.org/website/cloud/ai-models/seedance-20.webm',
     badgeIcon: '/icons/ai-models/bytedance.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
+    badgeClass: `${badgeBase} rounded-2xl`,
+    layoutClass: 'lg:col-span-6 lg:aspect-[16/7]'
   },
   {
     titleKey: 'cloud.aiModels.card.nanoBananaPro',
     imageSrc:
       'https://media.comfy.org/website/cloud/ai-models/nano-banana-pro.webp',
     badgeIcon: '/icons/ai-models/gemini.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
+    badgeClass: `${badgeBase} rounded-2xl`,
+    layoutClass: 'lg:col-span-6 lg:aspect-[16/7]',
+    objectPosition: 'center 20%'
   },
   {
     titleKey: 'cloud.aiModels.card.grokImagine',
     imageSrc: 'https://media.comfy.org/website/cloud/ai-models/grok-video.webm',
     badgeIcon: '/icons/ai-models/grok.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
+    badgeClass: `${badgeBase} rounded-2xl`,
+    layoutClass: 'lg:col-span-4 lg:aspect-[4/3]'
   },
   {
     titleKey: 'cloud.aiModels.card.qwenImageEdit',
     imageSrc:
       'https://media.comfy.org/website/cloud/ai-models/qwen-image-edit.webp',
     badgeIcon: '/icons/ai-models/qwen.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
+    badgeClass: `${badgeBase} rounded-2xl`,
+    layoutClass: 'lg:col-span-4 lg:aspect-[4/3]'
   },
   {
     titleKey: 'cloud.aiModels.card.wan22TextToVideo',
     imageSrc: 'https://media.comfy.org/website/cloud/ai-models/wan-22.webm',
     badgeIcon: '/icons/ai-models/wan.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
-  },
-  {
-    titleKey: 'cloud.aiModels.card.gptImage2',
-    imageSrc:
-      'https://media.comfy.org/website/cloud/ai-models/gpt-image-2.webm',
-    badgeIcon: '/icons/ai-models/openai.svg',
-    badgeClass: `${badgeBase} rounded-2xl`
+    badgeClass: `${badgeBase} rounded-2xl`,
+    layoutClass: 'lg:col-span-4 lg:aspect-[4/3]'
   }
 ]
 
-const cardClass =
-  'group relative h-72 cursor-pointer overflow-hidden rounded-3xl bg-black/40 lg:col-span-4 lg:aspect-square lg:h-auto'
+function getCardClass(layoutClass: string): string {
+  return cn(
+    layoutClass,
+    'group relative h-72 cursor-pointer overflow-hidden rounded-4xl bg-black/40 lg:h-auto'
+  )
+}
 </script>
 
 <template>
@@ -97,18 +100,23 @@ const cardClass =
       </p>
 
       <div class="mt-16 w-full lg:mt-24">
-        <div class="rounded-4xl bg-white/8 p-2 lg:p-1.5">
+        <div class="rounded-4xl border border-white/12 p-2 lg:p-1.5">
           <div class="grid grid-cols-1 gap-2 lg:grid-cols-12">
             <a
               v-for="card in modelCards"
               :key="card.titleKey"
               :href="externalLinks.workflows"
-              :class="cardClass"
+              :class="getCardClass(card.layoutClass)"
             >
               <video
                 v-if="card.imageSrc.endsWith('.webm')"
                 :src="card.imageSrc"
                 :aria-label="t(card.titleKey, locale)"
+                :style="
+                  card.objectPosition
+                    ? { objectPosition: card.objectPosition }
+                    : undefined
+                "
                 class="size-full object-cover transition-transform duration-300 group-hover:scale-105"
                 autoplay
                 loop
@@ -126,6 +134,11 @@ const cardClass =
                 v-else
                 :src="card.imageSrc"
                 :alt="t(card.titleKey, locale)"
+                :style="
+                  card.objectPosition
+                    ? { objectPosition: card.objectPosition }
+                    : undefined
+                "
                 class="size-full object-cover transition-transform duration-300 group-hover:scale-105"
                 loading="lazy"
                 decoding="async"
@@ -155,14 +168,10 @@ const cardClass =
               </div>
 
               <p
-                class="text-primary-warm-white absolute right-20 bottom-6 left-6 text-2xl/tight font-light whitespace-pre-line drop-shadow-[0_2px_8px_rgba(0,0,0,0.9)] lg:top-6 lg:right-auto lg:bottom-auto lg:text-3xl"
+                class="text-primary-warm-white absolute inset-x-6 bottom-6 text-2xl/tight font-light whitespace-pre-line drop-shadow-[0_2px_8px_rgba(0,0,0,0.9)] lg:top-6 lg:right-auto lg:bottom-auto lg:text-3xl"
               >
                 {{ t(card.titleKey, locale) }}
               </p>
-
-              <CardArrow
-                class="absolute right-5 bottom-5 lg:right-6 lg:bottom-6"
-              />
             </a>
           </div>
         </div>

apps/website/src/i18n/translations.ts

@@ -932,9 +932,9 @@ const translations = {
     'zh-CN': '所有模型。\n商业许可保证。'
   },
   'cloud.reason.2.description': {
-    en: 'Run open-source models like Wan 2.2, Flux, LTX and Qwen alongside partner models like Nano Banana, Seedance, Seedream, Grok, Kling, Hunyuan 3D, GPT Image 2 and more. Every model on Comfy Cloud is cleared for commercial use. No license ambiguity. All through one credit balance.',
+    en: 'Run open-source models like Wan 2.2, Flux, LTX and Qwen alongside partner models like Nano Banana, Seedance, Seedream, Grok, Kling, Hunyuan 3D and more. Every model on Comfy Cloud is cleared for commercial use. No license ambiguity. All through one credit balance.',
     'zh-CN':
-      '运行 Wan 2.2、Flux、LTX 和 Qwen 等开源模型，以及 Nano Banana、Seedance、Seedream、Grok、Kling、Hunyuan 3D、GPT Image 2 等合作伙伴模型。Comfy Cloud 上的每个模型都已获得商业使用许可。无许可证歧义。通过统一的积分余额使用。'
+      '运行 Wan 2.2、Flux、LTX 和 Qwen 等开源模型，以及 Nano Banana、Seedance、Seedream、Grok、Kling、Hunyuan 3D 等合作伙伴模型。Comfy Cloud 上的每个模型都已获得商业使用许可。无许可证歧义。通过统一的积分余额使用。'
   },
   'cloud.reason.2.badge.onlyOn': {
     en: 'ONLY ON',
@@ -996,10 +996,6 @@ const translations = {
     en: 'Wan 2.2',
     'zh-CN': 'Wan 2.2'
   },
-  'cloud.aiModels.card.gptImage2': {
-    en: 'GPT Image 2',
-    'zh-CN': 'GPT Image 2'
-  },
   'cloud.aiModels.ctaDesktop': {
     en: 'EXPLORE WORKFLOWS WITH THE LATEST MODELS',
     'zh-CN': '探索最新模型工作流'

apps/website/src/styles/global.css

@@ -248,7 +248,7 @@
 @utility ppformula-text-center {
   display: inline-block;
   position: relative;
-  top: 0.1em;
+  top: 0.19em;
 }
 
 /* Hide native play-button overlay iOS Safari shows when autoplay is blocked

browser_tests/tests/previewAsText.spec.ts

@@ -1,13 +1,7 @@
-import { mergeTests } from '@playwright/test'
-
 import {
   comfyPageFixture as test,
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
-import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
-import { webSocketFixture } from '@e2e/fixtures/ws'
-
-const wstest = mergeTests(test, webSocketFixture)
 
 test.describe('Preview as Text node', () => {
   test('does not include preview widget values in the API prompt', async ({
@@ -45,33 +39,4 @@ test.describe('Preview as Text node', () => {
     expect(previewEntry!.inputs).not.toHaveProperty('preview_text')
     expect(previewEntry!.inputs).not.toHaveProperty('previewMode')
   })
-
-  wstest(
-    'restoring workflow restores state',
-    { tag: '@vue-nodes' },
-    async ({ comfyPage, getWebSocket }) => {
-      const execution = new ExecutionHelper(comfyPage, await getWebSocket())
-
-      await comfyPage.menu.topbar.newWorkflowButton.click()
-      await comfyPage.searchBoxV2.addNode('Preview as Text')
-      const node = await comfyPage.vueNodes.getFixtureByTitle('Preview as Text')
-      const preview = node.root.locator('textarea')
-
-      await test.step('node previews execution result', async () => {
-        execution.executed('', '1', { text: 'massive fennec ears' })
-        await expect(preview).toHaveValue('massive fennec ears')
-      })
-
-      await test.step('swap to a different workflow and back', async () => {
-        await comfyPage.menu.topbar.getTab(0).click()
-        await expect(node.root).toBeHidden()
-        await comfyPage.menu.topbar.getTab(1).click()
-        await expect(node.root).toBeVisible()
-      })
-
-      await expect(preview, 'previous output is restored').toHaveValue(
-        'massive fennec ears'
-      )
-    }
-  )
 })

packages/ingest-types/src/index.ts

@@ -12,11 +12,6 @@ export type {
   AddAssetTagsErrors,
   AddAssetTagsResponse,
   AddAssetTagsResponses,
-  AdminDeleteHubWorkflowData,
-  AdminDeleteHubWorkflowError,
-  AdminDeleteHubWorkflowErrors,
-  AdminDeleteHubWorkflowResponse,
-  AdminDeleteHubWorkflowResponses,
   Asset,
   AssetCreated,
   AssetCreatedWritable,
@@ -47,11 +42,6 @@ export type {
   CancelJobErrors,
   CancelJobResponse,
   CancelJobResponses,
-  CancelJobsData,
-  CancelJobsError,
-  CancelJobsErrors,
-  CancelJobsResponse,
-  CancelJobsResponses,
   CancelSubscriptionData,
   CancelSubscriptionError,
   CancelSubscriptionErrors,
@@ -94,11 +84,6 @@ export type {
   CreateDeletionRequestErrors,
   CreateDeletionRequestResponse,
   CreateDeletionRequestResponses,
-  CreateDesktopLoginCodeData,
-  CreateDesktopLoginCodeError,
-  CreateDesktopLoginCodeErrors,
-  CreateDesktopLoginCodeResponse,
-  CreateDesktopLoginCodeResponses,
   CreateHubAssetUploadUrlData,
   CreateHubAssetUploadUrlError,
   CreateHubAssetUploadUrlErrors,
@@ -201,31 +186,12 @@ export type {
   DeleteWorkspaceResponses,
   DeletionRequest,
   DeletionStatus,
-  DesktopLoginCodeCreateRequest,
-  DesktopLoginCodeCreateResponse,
-  DesktopLoginCodeExchangeRequest,
-  DesktopLoginCodeExchangeResponse,
-  DesktopLoginCodeRedeemRequest,
-  DesktopLoginCodeRedeemResponse,
   DownloadExportData,
   DownloadExportError,
   DownloadExportErrors,
   DownloadExportResponse,
   DownloadExportResponses,
-  EnsureWorkspaceBillingLegacySnapshot,
-  EnsureWorkspaceBillingProvisionedData,
-  EnsureWorkspaceBillingProvisionedError,
-  EnsureWorkspaceBillingProvisionedErrors,
-  EnsureWorkspaceBillingProvisionedRequest,
-  EnsureWorkspaceBillingProvisionedResponse,
-  EnsureWorkspaceBillingProvisionedResponse2,
-  EnsureWorkspaceBillingProvisionedResponses,
   ErrorResponse,
-  ExchangeDesktopLoginCodeData,
-  ExchangeDesktopLoginCodeError,
-  ExchangeDesktopLoginCodeErrors,
-  ExchangeDesktopLoginCodeResponse,
-  ExchangeDesktopLoginCodeResponses,
   ExchangeTokenData,
   ExchangeTokenError,
   ExchangeTokenErrors,
@@ -264,11 +230,6 @@ export type {
   GetAssetByIdErrors,
   GetAssetByIdResponse,
   GetAssetByIdResponses,
-  GetAssetContentData,
-  GetAssetContentError,
-  GetAssetContentErrors,
-  GetAssetContentResponse,
-  GetAssetContentResponses,
   GetAssetSeedStatusData,
   GetAssetSeedStatusResponse,
   GetAssetSeedStatusResponses,
@@ -342,11 +303,6 @@ export type {
   GetHistoryData,
   GetHistoryError,
   GetHistoryErrors,
-  GetHistoryEventsData,
-  GetHistoryEventsError,
-  GetHistoryEventsErrors,
-  GetHistoryEventsResponse,
-  GetHistoryEventsResponses,
   GetHistoryForPromptData,
   GetHistoryForPromptError,
   GetHistoryForPromptErrors,
@@ -389,6 +345,8 @@ export type {
   GetJwksData,
   GetJwksResponse,
   GetJwksResponses,
+  GetLegacyAssetContentData,
+  GetLegacyAssetContentErrors,
   GetLegacyHistoryByIdData,
   GetLegacyHistoryByIdErrors,
   GetLegacyHistoryData,
@@ -598,7 +556,6 @@ export type {
   HistoryDetailEntry,
   HistoryDetailResponse,
   HistoryEntry,
-  HistoryEventRequest,
   HistoryManageRequest,
   HistoryResponse,
   HubAssetUploadUrlRequest,
@@ -632,8 +589,6 @@ export type {
   JobCancelResponse,
   JobDetailResponse,
   JobEntry,
-  JobsCancelRequest,
-  JobsCancelResponse,
   JobsListResponse,
   JobStatusResponse,
   JwkKey,
@@ -672,19 +627,7 @@ export type {
   ListJobsErrors,
   ListJobsResponse,
   ListJobsResponses,
-  ListLinkedFirebaseUidsData,
-  ListLinkedFirebaseUidsError,
-  ListLinkedFirebaseUidsErrors,
-  ListLinkedFirebaseUidsRequest,
-  ListLinkedFirebaseUidsResponse,
-  ListLinkedFirebaseUidsResponse2,
-  ListLinkedFirebaseUidsResponses,
   ListMembersResponse,
-  ListSecretProvidersData,
-  ListSecretProvidersError,
-  ListSecretProvidersErrors,
-  ListSecretProvidersResponse,
-  ListSecretProvidersResponses,
   ListSecretsData,
   ListSecretsError,
   ListSecretsErrors,
@@ -832,17 +775,6 @@ export type {
   QueueInfo,
   QueueManageRequest,
   QueueManageResponse,
-  RedeemDesktopLoginCodeData,
-  RedeemDesktopLoginCodeError,
-  RedeemDesktopLoginCodeErrors,
-  RedeemDesktopLoginCodeResponse,
-  RedeemDesktopLoginCodeResponses,
-  ReleaseDeletionHoldData,
-  ReleaseDeletionHoldError,
-  ReleaseDeletionHoldErrors,
-  ReleaseDeletionHoldResponse,
-  ReleaseDeletionHoldResponses,
-  ReleaseHoldResponse,
   RemoveAssetTagsData,
   RemoveAssetTagsError,
   RemoveAssetTagsErrors,
@@ -853,11 +785,6 @@ export type {
   RemoveWorkspaceMemberErrors,
   RemoveWorkspaceMemberResponse,
   RemoveWorkspaceMemberResponses,
-  ReportHistoryEventData,
-  ReportHistoryEventError,
-  ReportHistoryEventErrors,
-  ReportHistoryEventResponse,
-  ReportHistoryEventResponses,
   ReportPartnerUsageData,
   ReportPartnerUsageError,
   ReportPartnerUsageErrors,
@@ -881,8 +808,6 @@ export type {
   RevokeWorkspaceInviteResponse,
   RevokeWorkspaceInviteResponses,
   SecretListResponse,
-  SecretProvider,
-  SecretProvidersResponse,
   SecretResponse,
   SeedAssetsData,
   SeedAssetsResponse,
@@ -894,8 +819,6 @@ export type {
   SetReviewStatusResponse,
   SetReviewStatusResponse2,
   SetReviewStatusResponses,
-  ShortLinkRedirectData,
-  ShortLinkRedirectErrors,
   SubmitFeedbackData,
   SubmitFeedbackError,
   SubmitFeedbackErrors,
@@ -925,10 +848,6 @@ export type {
   TaskEntry,
   TaskResponse,
   TasksListResponse,
-  TeamCreditStop,
-  TeamCreditStopPrice,
-  TeamCreditStops,
-  TeamCreditStopSummary,
   UpdateAssetData,
   UpdateAssetError,
   UpdateAssetErrors,
@@ -946,7 +865,6 @@ export type {
   UpdateHubWorkflowRequest,
   UpdateHubWorkflowResponse,
   UpdateHubWorkflowResponses,
-  UpdateMemberRoleRequest,
   UpdateMultipleSettingsData,
   UpdateMultipleSettingsError,
   UpdateMultipleSettingsErrors,
@@ -977,11 +895,6 @@ export type {
   UpdateWorkspaceData,
   UpdateWorkspaceError,
   UpdateWorkspaceErrors,
-  UpdateWorkspaceMemberRoleData,
-  UpdateWorkspaceMemberRoleError,
-  UpdateWorkspaceMemberRoleErrors,
-  UpdateWorkspaceMemberRoleResponse,
-  UpdateWorkspaceMemberRoleResponses,
   UpdateWorkspaceRequest,
   UpdateWorkspaceResponse,
   UpdateWorkspaceResponses,

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

@@ -465,20 +465,6 @@ export const zCreateWorkflowRequest = z.object({
   forked_from_workflow_version_id: z.string().optional()
 })
 
-/**
- * Request body for forwarding a comfy-api audit/history event. Identify the target workspace by either user_id (cloud resolves the user's personal workspace via the converged identity, BE-1047) or an explicit workspace_id. At least one must be provided; workspace_id wins when both are set.
- */
-export const zHistoryEventRequest = z.object({
-  user_id: z.string().optional(),
-  workspace_id: z.string().optional(),
-  event_type: z.string().min(1),
-  event_id: z.string().min(1),
-  params: z.record(z.unknown()).optional(),
-  auth_method: z.enum(['api_key', 'bearer_token']).optional(),
-  customer_ref: z.string().optional(),
-  timestamp: z.string().datetime().optional()
-})
-
 /**
  * Response after recording partner usage data.
  */
@@ -554,11 +540,11 @@ export const zPaymentPortalRequest = z.object({
 })
 
 /**
- * Response after accepting a resubscribe request.
+ * Response after successfully resubscribing to a billing plan.
  */
 export const zResubscribeResponse = z.object({
   billing_op_id: z.string(),
-  status: z.enum(['active', 'pending']),
+  status: z.enum(['active']),
   message: z.string().optional()
 })
 
@@ -599,8 +585,6 @@ export const zSubscribeResponse = z.object({
  */
 export const zSubscribeRequest = z.object({
   plan_slug: z.string(),
-  team_credit_stop_id: z.string().optional(),
-  billing_cycle: z.enum(['monthly', 'yearly']).optional(),
   idempotency_key: z.string().optional(),
   return_url: z.string().optional(),
   cancel_url: z.string().optional()
@@ -642,8 +626,7 @@ export const zSubscriptionTier = z.enum([
   'STANDARD',
   'CREATOR',
   'PRO',
-  'FOUNDERS_EDITION',
-  'TEAM'
+  'FOUNDERS_EDITION'
 ])
 
 /**
@@ -731,57 +714,6 @@ export const zPreviewSubscribeRequest = z.object({
   plan_slug: z.string()
 })
 
-/**
- * Pre/post-discount price for a team credit stop, in cents.
- */
-export const zTeamCreditStopPrice = z.object({
-  list_price_cents: z.coerce
-    .bigint()
-    .min(BigInt('-9223372036854775808'), {
-      message: 'Invalid value: Expected int64 to be >= -9223372036854775808'
-    })
-    .max(BigInt('9223372036854775807'), {
-      message: 'Invalid value: Expected int64 to be <= 9223372036854775807'
-    }),
-  price_cents: z.coerce
-    .bigint()
-    .min(BigInt('-9223372036854775808'), {
-      message: 'Invalid value: Expected int64 to be >= -9223372036854775808'
-    })
-    .max(BigInt('9223372036854775807'), {
-      message: 'Invalid value: Expected int64 to be <= 9223372036854775807'
-    })
-})
-
-/**
- * A selectable preset on the team pricing slider. Echoed on subscribe via
- * team_credit_stop_id; the backend owns the resolved amounts. credits is a
- * RAW monthly credit count (not cents). Save% is derived by the FE as
- * (list_price_cents - price_cents) / list_price_cents.
- *
- */
-export const zTeamCreditStop = z.object({
-  id: z.string(),
-  credits: z.coerce
-    .bigint()
-    .min(BigInt('-9223372036854775808'), {
-      message: 'Invalid value: Expected int64 to be >= -9223372036854775808'
-    })
-    .max(BigInt('9223372036854775807'), {
-      message: 'Invalid value: Expected int64 to be <= 9223372036854775807'
-    }),
-  monthly: zTeamCreditStopPrice,
-  yearly: zTeamCreditStopPrice
-})
-
-/**
- * Credit-stop ladder for the pricing slider (BE-1254). Returned by GET /api/billing/plans for every workspace regardless of the caller's token or workspace type (the personal/team distinction was removed); omitted only when the catalog defines no stops.
- */
-export const zTeamCreditStops = z.object({
-  default_stop_index: z.number().int(),
-  stops: z.array(zTeamCreditStop)
-})
-
 /**
  * Reason why a plan is unavailable
  */
@@ -841,50 +773,7 @@ export const zPlan = z.object({
  */
 export const zBillingPlansResponse = z.object({
   current_plan_slug: z.string().optional(),
-  plans: z.array(zPlan),
-  team_credit_stops: zTeamCreditStops.optional()
-})
-
-/**
- * The team credit stop a workspace is currently subscribed to: the
- * per-workspace slider choice recorded at subscribe time
- * (workspace_subscriptions.team_credit_stop_id). Amounts are owned by the
- * catalog, not the subscription row. Returned on GET /api/billing/status
- * for per-credit Team plans (BE-1254).
- *
- */
-export const zTeamCreditStopSummary = z.object({
-  id: z.string(),
-  credits_monthly: z.coerce
-    .bigint()
-    .min(BigInt('-9223372036854775808'), {
-      message: 'Invalid value: Expected int64 to be >= -9223372036854775808'
-    })
-    .max(BigInt('9223372036854775807'), {
-      message: 'Invalid value: Expected int64 to be <= 9223372036854775807'
-    }),
-  stop_usd: z.coerce
-    .bigint()
-    .min(BigInt('-9223372036854775808'), {
-      message: 'Invalid value: Expected int64 to be >= -9223372036854775808'
-    })
-    .max(BigInt('9223372036854775807'), {
-      message: 'Invalid value: Expected int64 to be <= 9223372036854775807'
-    })
-})
-
-/**
- * A provider the user may configure a secret for. The shape is deliberately minimal (identifier only) and reserved for future per-provider fields such as sub-keys.
- */
-export const zSecretProvider = z.object({
-  id: z.string()
-})
-
-/**
- * The providers available to the authenticated user in the current workspace.
- */
-export const zSecretProvidersResponse = z.object({
-  data: z.array(zSecretProvider)
+  plans: z.array(zPlan)
 })
 
 /**
@@ -924,7 +813,7 @@ export const zCreateSecretRequest = z.object({
 })
 
 /**
- * A single history event. The cloud history-events store is the single source of truth for both billing events (charges, credits, adjustments) and user-facing usage events.
+ * A single billing event such as a charge, credit, or adjustment.
  */
 export const zBillingEvent = z.object({
   event_type: z.string(),
@@ -979,8 +868,7 @@ export const zBillingStatusResponse = z.object({
   billing_status: zBillingStatus.optional(),
   has_funds: z.boolean(),
   cancel_at: z.string().datetime().optional(),
-  renewal_date: z.string().datetime().optional(),
-  team_credit_stop: zTeamCreditStopSummary.nullable()
+  renewal_date: z.string().datetime().optional()
 })
 
 /**
@@ -1042,7 +930,6 @@ export const zOAuthConsentChallenge = z.object({
   csrf_token: z.string(),
   client_display_name: z.string(),
   resource_display_name: z.string(),
-  redirect_uri: z.string().url(),
   scopes: z.array(z.string()),
   workspaces: z.array(zOAuthConsentChallengeWorkspace)
 })
@@ -1169,66 +1056,6 @@ export const zSyncApiKeyRequest = z.object({
   customer_id: z.string().min(1)
 })
 
-/**
- * The personal workspace's provisioned billing identity.
- */
-export const zEnsureWorkspaceBillingProvisionedResponse = z.object({
-  workspace_id: z.string(),
-  stripe_customer_id: z.string(),
-  metronome_customer_id: z.string(),
-  metronome_contract_id: z.string()
-})
-
-/**
- * The caller's already-resolved legacy (comfy-api) customer identity. When
- * present and carrying provider IDs, provisioning ATTACHES this identity to
- * the personal workspace (sharing the existing balance and subscription)
- * instead of minting a net-new empty customer. Omit (or send with no
- * provider IDs) for a free user with nothing to attach — provisioning then
- * creates net-new. This closes the create-new-before-attach gap: a caller
- * that already knows the legacy identity hands it over so the very first
- * provisioning is an attach.
- *
- */
-export const zEnsureWorkspaceBillingLegacySnapshot = z.object({
-  stripe_customer_id: z.string().optional(),
-  metronome_customer_id: z.string().optional(),
-  metronome_contract_id: z.string().optional(),
-  has_funds: z.boolean().optional(),
-  subscription_tier: z.string().optional(),
-  legacy_stripe_subscription_id: z.string().optional(),
-  legacy_comfy_user_id: z.string().optional()
-})
-
-/**
- * Request body for ensuring a user's personal workspace carries a fully
- * provisioned billing identity. Sent by comfy-api's CreateCustomer (BE-1047)
- * with the already canonical-resolved user identity.
- *
- */
-export const zEnsureWorkspaceBillingProvisionedRequest = z.object({
-  user_id: z.string().min(1),
-  email: z.string().email().min(1),
-  snapshot: zEnsureWorkspaceBillingLegacySnapshot.optional()
-})
-
-/**
- * Firebase UIDs linked to the canonical comfy_user_id. Empty list when
- * no mappings exist (not an error — callers can treat empty as "unknown
- * canonical").
- *
- */
-export const zListLinkedFirebaseUidsResponse = z.object({
-  firebase_uids: z.array(z.string())
-})
-
-/**
- * Request body for reverse-looking-up Firebase UIDs linked to a canonical comfy_user_id.
- */
-export const zListLinkedFirebaseUidsRequest = z.object({
-  comfy_user_id: z.string().min(1)
-})
-
 /**
  * Response confirming the validity and scope of a workspace API key.
  */
@@ -1345,8 +1172,7 @@ export const zMember = z.object({
   name: z.string(),
   email: z.string().email(),
   role: z.enum(['owner', 'member']),
-  joined_at: z.string().datetime(),
-  is_original_owner: z.boolean()
+  joined_at: z.string().datetime()
 })
 
 /**
@@ -1357,13 +1183,6 @@ export const zListMembersResponse = z.object({
   pagination: zPaginationInfo
 })
 
-/**
- * Request body for changing a workspace member's role.
- */
-export const zUpdateMemberRoleRequest = z.object({
-  role: z.enum(['owner', 'member'])
-})
-
 /**
  * Request body for updating an existing workspace's settings.
  */
@@ -1408,60 +1227,6 @@ export const zWorkspace = z.object({
   created_at: z.string().datetime()
 })
 
-/**
- * Exchange poll result. Pending until the code is redeemed in the browser.
- */
-export const zDesktopLoginCodeExchangeResponse = z.object({
-  status: z.enum(['pending', 'complete']),
-  custom_token: z.string().optional()
-})
-
-/**
- * Request to exchange a redeemed login code for a custom token.
- */
-export const zDesktopLoginCodeExchangeRequest = z.object({
-  code: z.string(),
-  code_verifier: z.string().min(43).max(128)
-})
-
-/**
- * Result of redeeming a desktop login code.
- */
-export const zDesktopLoginCodeRedeemResponse = z.object({
-  status: z.enum(['redeemed'])
-})
-
-/**
- * Request to claim a desktop login code for the authenticated user.
- */
-export const zDesktopLoginCodeRedeemRequest = z.object({
-  code: z.string()
-})
-
-/**
- * A freshly minted desktop login code and its polling parameters.
- */
-export const zDesktopLoginCodeCreateResponse = z.object({
-  code: z.string(),
-  expires_in: z.number().int(),
-  poll_interval: z.number().int()
-})
-
-/**
- * Request to mint a desktop login code.
- */
-export const zDesktopLoginCodeCreateRequest = z.object({
-  installation_id: z
-    .string()
-    .min(8)
-    .max(128)
-    .regex(/^[A-Za-z0-9._-]+$/)
-    .optional(),
-  platform: z.string().min(1).max(32),
-  app_version: z.string().min(1).max(64),
-  code_challenge: z.string().min(43).max(128)
-})
-
 /**
  * Abbreviated workspace metadata used in list responses.
  */
@@ -1529,15 +1294,6 @@ export const zTasksListResponse = z.object({
   pagination: zPaginationInfo
 })
 
-/**
- * Result of authorizing a legal-hold release on a user's deletion.
- */
-export const zReleaseHoldResponse = z.object({
-  firebase_id: z.string(),
-  released: z.boolean(),
-  message: z.string()
-})
-
 /**
  * Current status of a user data deletion request.
  */
@@ -1607,20 +1363,6 @@ export const zJobDetailResponse = z.object({
   execution_meta: z.record(z.unknown()).optional()
 })
 
-/**
- * Response for POST /api/jobs/cancel.
- */
-export const zJobsCancelResponse = z.object({
-  cancelled: z.array(z.string())
-})
-
-/**
- * Request to cancel multiple jobs by ID.
- */
-export const zJobsCancelRequest = z.object({
-  job_ids: z.array(z.string().uuid()).min(1).max(100)
-})
-
 /**
  * Response for POST /api/jobs/{job_id}/cancel. Returned on both fresh cancels and idempotent no-ops.
  */
@@ -1787,7 +1529,6 @@ export const zAsset = z.object({
   user_metadata: z.record(z.unknown()).optional(),
   metadata: z.record(z.unknown()).readonly().optional(),
   preview_url: z.string().url().optional(),
-  short_url: z.string().nullish(),
   preview_id: z.string().uuid().nullish(),
   job_id: z.string().uuid().nullish(),
   created_at: z.string().datetime(),
@@ -1883,7 +1624,6 @@ export const zSystemStatsResponse = z.object({
     python_version: z.string(),
     embedded_python: z.boolean(),
     comfyui_version: z.string(),
-    deploy_environment: z.string().optional(),
     comfyui_frontend_version: z.string().optional(),
     workflow_templates_version: z.string().optional(),
     cloud_version: z.string().optional(),
@@ -2222,7 +1962,6 @@ export const zAssetWritable = z.object({
   tags: z.array(z.string()).optional(),
   user_metadata: z.record(z.unknown()).optional(),
   preview_url: z.string().url().optional(),
-  short_url: z.string().nullish(),
   preview_id: z.string().uuid().nullish(),
   job_id: z.string().uuid().nullish(),
   created_at: z.string().datetime(),
@@ -2441,11 +2180,7 @@ export const zGetJobDetailData = z.object({
   path: z.object({
     job_id: z.string().uuid()
   }),
-  query: z
-    .object({
-      short_link: z.enum(['ephemeral_tool_chain', 'default']).optional()
-    })
-    .optional()
+  query: z.never().optional()
 })
 
 /**
@@ -2466,17 +2201,6 @@ export const zCancelJobData = z.object({
  */
 export const zCancelJobResponse = zJobCancelResponse
 
-export const zCancelJobsData = z.object({
-  body: zJobsCancelRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Success - cancel requests dispatched (or jobs were already terminal)
- */
-export const zCancelJobsResponse = zJobsCancelResponse
-
 export const zViewFileData = z.object({
   body: z.never().optional(),
   path: z.never().optional(),
@@ -2856,17 +2580,6 @@ export const zCreateSecretData = z.object({
  */
 export const zCreateSecretResponse = zSecretResponse
 
-export const zListSecretProvidersData = z.object({
-  body: z.never().optional(),
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Success
- */
-export const zListSecretProvidersResponse = zSecretProvidersResponse
-
 export const zDeleteSecretData = z.object({
   body: z.never().optional(),
   path: z.object({
@@ -3168,40 +2881,6 @@ export const zExchangeTokenData = z.object({
  */
 export const zExchangeTokenResponse2 = zExchangeTokenResponse
 
-export const zCreateDesktopLoginCodeData = z.object({
-  body: zDesktopLoginCodeCreateRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Login code created
- */
-export const zCreateDesktopLoginCodeResponse = zDesktopLoginCodeCreateResponse
-
-export const zRedeemDesktopLoginCodeData = z.object({
-  body: zDesktopLoginCodeRedeemRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Code redeemed (or already redeemed by the same user)
- */
-export const zRedeemDesktopLoginCodeResponse = zDesktopLoginCodeRedeemResponse
-
-export const zExchangeDesktopLoginCodeData = z.object({
-  body: zDesktopLoginCodeExchangeRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Pending (not yet redeemed) or complete with a custom token
- */
-export const zExchangeDesktopLoginCodeResponse =
-  zDesktopLoginCodeExchangeResponse
-
 export const zGetJwksData = z.object({
   body: z.never().optional(),
   path: z.never().optional(),
@@ -3471,19 +3150,6 @@ export const zRemoveWorkspaceMemberData = z.object({
  */
 export const zRemoveWorkspaceMemberResponse = z.void()
 
-export const zUpdateWorkspaceMemberRoleData = z.object({
-  body: zUpdateMemberRoleRequest,
-  path: z.object({
-    userId: z.string()
-  }),
-  query: z.never().optional()
-})
-
-/**
- * Member role updated
- */
-export const zUpdateWorkspaceMemberRoleResponse = zMember
-
 export const zListWorkspaceApiKeysData = z.object({
   body: z.never().optional(),
   path: z.never().optional(),
@@ -3570,19 +3236,6 @@ export const zSetReviewStatusData = z.object({
  */
 export const zSetReviewStatusResponse2 = zSetReviewStatusResponse
 
-export const zAdminDeleteHubWorkflowData = z.object({
-  body: z.never().optional(),
-  path: z.object({
-    share_id: z.string()
-  }),
-  query: z.never().optional()
-})
-
-/**
- * Successfully deleted
- */
-export const zAdminDeleteHubWorkflowResponse = z.void()
-
 export const zUpdateHubWorkflowData = z.object({
   body: zUpdateHubWorkflowRequest,
   path: z.object({
@@ -3624,19 +3277,6 @@ export const zCreateDeletionRequestResponse = z.object({
   user_found_in_cloud: z.boolean()
 })
 
-export const zReleaseDeletionHoldData = z.object({
-  body: z.object({
-    firebase_id: z.string()
-  }),
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Release authorized; the deletion workflow will proceed
- */
-export const zReleaseDeletionHoldResponse = zReleaseHoldResponse
-
 export const zReportPartnerUsageData = z.object({
   body: zPartnerUsageRequest,
   path: z.never().optional(),
@@ -3648,38 +3288,6 @@ export const zReportPartnerUsageData = z.object({
  */
 export const zReportPartnerUsageResponse = zPartnerUsageResponse
 
-export const zGetHistoryEventsData = z.object({
-  body: z.never().optional(),
-  path: z.never().optional(),
-  query: z
-    .object({
-      workspace_id: z.string().optional(),
-      user_id: z.string().optional(),
-      event_type: z.string().optional(),
-      start_date: z.string().datetime().optional(),
-      end_date: z.string().datetime().optional(),
-      page: z.number().int().optional(),
-      limit: z.number().int().optional()
-    })
-    .optional()
-})
-
-/**
- * Paginated cloud history events for the workspace
- */
-export const zGetHistoryEventsResponse = zBillingEventsResponse
-
-export const zReportHistoryEventData = z.object({
-  body: zHistoryEventRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * History event recorded successfully
- */
-export const zReportHistoryEventResponse = zPartnerUsageResponse
-
 export const zUpdateSubscriptionCacheData = z.object({
   body: z.object({
     user_id: z.string(),
@@ -3697,29 +3305,6 @@ export const zUpdateSubscriptionCacheResponse = z.object({
   status: z.string().optional()
 })
 
-export const zListLinkedFirebaseUidsData = z.object({
-  body: zListLinkedFirebaseUidsRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * Linked Firebase UIDs (possibly empty list)
- */
-export const zListLinkedFirebaseUidsResponse2 = zListLinkedFirebaseUidsResponse
-
-export const zEnsureWorkspaceBillingProvisionedData = z.object({
-  body: zEnsureWorkspaceBillingProvisionedRequest,
-  path: z.never().optional(),
-  query: z.never().optional()
-})
-
-/**
- * The workspace's provisioned billing identity
- */
-export const zEnsureWorkspaceBillingProvisionedResponse2 =
-  zEnsureWorkspaceBillingProvisionedResponse
-
 export const zInsertDynamicConfigData = z.object({
   body: z.record(z.unknown()),
   path: z.never().optional(),
@@ -4425,14 +4010,6 @@ export const zGetModelPreviewData = z.object({
   query: z.never().optional()
 })
 
-export const zShortLinkRedirectData = z.object({
-  body: z.never().optional(),
-  path: z.object({
-    id: z.string()
-  }),
-  query: z.never().optional()
-})
-
 export const zGetLegacyPromptByIdData = z.object({
   body: z.never().optional(),
   path: z.object({
@@ -4493,23 +4070,14 @@ export const zGetLegacyUserdataV2Data = z.object({
   query: z.never().optional()
 })
 
-export const zGetAssetContentData = z.object({
+export const zGetLegacyAssetContentData = z.object({
   body: z.never().optional(),
   path: z.object({
     id: z.string()
   }),
-  query: z
-    .object({
-      disposition: z.enum(['inline', 'attachment']).optional()
-    })
-    .optional()
+  query: z.never().optional()
 })
 
-/**
- * Asset content stream (local runtime streams the bytes directly)
- */
-export const zGetAssetContentResponse = z.string()
-
 export const zGetLegacyViewMetadataData = z.object({
   body: z.never().optional(),
   path: z.object({

packages/ingest-types/tsconfig.json

@@ -4,5 +4,5 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "*.config.ts"]
 }

packages/object-info-parser/tsconfig.json

@@ -4,5 +4,5 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "vitest.config.ts"]
 }

src/components/LiteGraphCanvasSplitterOverlay.vue

@@ -35,10 +35,10 @@
           :class="
             sidebarLocation === 'left'
               ? cn(
-                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg focus-visible:outline-hidden',
+                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg',
                   sidebarPanelVisible && 'min-w-78'
                 )
-              : 'pointer-events-auto bg-comfy-menu-bg focus-visible:outline-hidden'
+              : 'pointer-events-auto bg-comfy-menu-bg'
           "
           :min-size="
             sidebarLocation === 'left' ? SIDEBAR_MIN_SIZE : BUILDER_MIN_SIZE
@@ -82,7 +82,7 @@
             </SplitterPanel>
             <SplitterPanel
               v-show="bottomPanelVisible && !focusMode"
-              class="bottom-panel pointer-events-auto max-w-full overflow-x-auto rounded-lg border border-(--p-panel-border-color) bg-comfy-menu-bg focus-visible:outline-hidden"
+              class="bottom-panel pointer-events-auto max-w-full overflow-x-auto rounded-lg border border-(--p-panel-border-color) bg-comfy-menu-bg"
             >
               <slot name="bottom-panel" />
             </SplitterPanel>
@@ -95,10 +95,10 @@
           :class="
             sidebarLocation === 'right'
               ? cn(
-                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg focus-visible:outline-hidden',
+                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg',
                   sidebarPanelVisible && 'min-w-78'
                 )
-              : 'pointer-events-auto bg-comfy-menu-bg focus-visible:outline-hidden'
+              : 'pointer-events-auto bg-comfy-menu-bg'
           "
           :min-size="
             sidebarLocation === 'right' ? SIDEBAR_MIN_SIZE : BUILDER_MIN_SIZE

src/components/boundingBoxes/WidgetBoundingBoxes.vue

@@ -4,37 +4,72 @@
     data-testid="bounding-boxes"
     @pointerdown.stop
   >
-    <div
-      ref="canvasContainer"
-      class="relative w-full shrink-0 overflow-hidden rounded-sm border border-component-node-border bg-node-component-surface"
-      :style="canvasStyle"
-    >
-      <canvas
-        ref="canvasEl"
-        tabindex="0"
-        class="absolute inset-0 size-full rounded-sm outline-none"
-        :style="{ cursor: canvasCursor }"
-        @pointerdown="onPointerDown"
-        @pointermove="onCanvasPointerMove"
-        @pointerup="onDocPointerUp"
-        @pointercancel="onDocPointerUp"
-        @pointerleave="onPointerLeave"
-        @lostpointercapture="onDocPointerUp"
-        @dblclick="onDoubleClick"
-        @keydown="onCanvasKeyDown"
-        @focus="focused = true"
-        @blur="focused = false"
-      />
-      <textarea
-        v-if="inlineEditor"
-        ref="inlineEditorEl"
-        v-model="inlineEditor.value"
-        class="absolute box-border resize-none rounded-sm border-2 bg-black/90 p-1 font-mono text-xs text-white outline-none"
-        :style="inlineEditor.style"
-        data-capture-wheel="true"
-        @keydown.stop="onInlineKeyDown"
-        @blur="commitInlineEditor"
-      />
+    <div class="flex flex-col">
+      <div
+        class="flex h-9 items-center gap-1 rounded-t-sm border border-b-0 border-component-node-border bg-component-node-widget-background px-2"
+      >
+        <Button
+          v-tooltip.bottom="{ value: $t('boundingBoxes.grid'), showDelay: 300 }"
+          variant="textonly"
+          size="unset"
+          :aria-pressed="grid"
+          :class="
+            cn(
+              actionBtnClass,
+              grid && 'bg-component-node-widget-background-selected'
+            )
+          "
+          @click="grid = !grid"
+        >
+          <i class="icon-[lucide--grid-3x3] size-4" />
+          <span>{{ $t('boundingBoxes.grid') }}</span>
+        </Button>
+        <Button
+          v-tooltip.bottom="{
+            value: $t('boundingBoxes.clearAll'),
+            showDelay: 300
+          }"
+          variant="textonly"
+          size="unset"
+          :class="cn(actionBtnClass, 'ml-auto')"
+          @click="clearAll"
+        >
+          <i class="icon-[lucide--undo-2] size-4" />
+          <span>{{ $t('boundingBoxes.clearAll') }}</span>
+        </Button>
+      </div>
+      <div
+        ref="canvasContainer"
+        class="relative w-full shrink-0 overflow-hidden rounded-b-sm border border-t-0 border-component-node-border bg-base-background"
+        :style="canvasStyle"
+      >
+        <canvas
+          ref="canvasEl"
+          tabindex="0"
+          class="absolute inset-0 size-full rounded-sm outline-none"
+          :style="{ cursor: canvasCursor }"
+          @pointerdown="onPointerDown"
+          @pointermove="onCanvasPointerMove"
+          @pointerup="onDocPointerUp"
+          @pointercancel="onDocPointerUp"
+          @pointerleave="onPointerLeave"
+          @lostpointercapture="onDocPointerUp"
+          @dblclick="onDoubleClick"
+          @keydown="onCanvasKeyDown"
+          @focus="focused = true"
+          @blur="focused = false"
+        />
+        <textarea
+          v-if="inlineEditor"
+          ref="inlineEditorEl"
+          v-model="inlineEditor.value"
+          class="absolute box-border resize-none rounded-sm border-2 bg-black/90 p-1 font-mono text-xs text-white outline-none"
+          :style="inlineEditor.style"
+          data-capture-wheel="true"
+          @keydown.stop="onInlineKeyDown"
+          @blur="commitInlineEditor"
+        />
+      </div>
     </div>
 
     <div
@@ -122,16 +157,6 @@
     <div v-else-if="hasRegions" class="text-node-text-muted px-1 text-xs">
       {{ $t('boundingBoxes.clickRegionToEdit') }}
     </div>
-
-    <Button
-      variant="secondary"
-      size="md"
-      class="gap-2 rounded-lg border border-component-node-border bg-component-node-background text-xs text-muted-foreground hover:text-base-foreground"
-      @click="clearAll"
-    >
-      <i class="icon-[lucide--undo-2]" />
-      {{ $t('boundingBoxes.clearAll') }}
-    </Button>
   </div>
 </template>
 
@@ -147,6 +172,9 @@ import { useBoundingBoxes } from '@/composables/boundingBoxes/useBoundingBoxes'
 import type { BoundingBox } from '@/types/boundingBoxes'
 import type { NodeId } from '@/types/nodeId'
 
+const actionBtnClass =
+  'flex shrink-0 items-center gap-1.5 rounded-md border-0 bg-transparent px-2 py-1 text-sm text-base-foreground outline-none transition-colors hover:bg-component-node-widget-background-hovered'
+
 const { nodeId } = defineProps<{ nodeId: NodeId }>()
 const modelValue = defineModel<BoundingBox[]>({ default: () => [] })
 
@@ -172,7 +200,8 @@ const {
   commitInlineEditor,
   setActiveType,
   clearAll,
-  syncState
+  syncState,
+  grid
 } = useBoundingBoxes(nodeId, {
   canvasEl,
   canvasContainer,

src/components/palette/PaletteSwatchRow.test.ts

@@ -32,7 +32,7 @@ describe('PaletteSwatchRow', () => {
 
   it('appends a color when the add button is clicked', async () => {
     const { emitted } = renderRow(['#ff0000'])
-    await userEvent.click(screen.getByRole('button'))
+    await userEvent.click(screen.getByRole('button', { name: '+' }))
     expect(lastEmit(emitted)).toEqual(['#ff0000', '#ffffff'])
   })
 
@@ -44,18 +44,14 @@ describe('PaletteSwatchRow', () => {
 
   it('hides the add button once the max is reached', () => {
     renderRow(['#a', '#b'], 2)
-    expect(screen.queryByRole('button')).toBeNull()
+    expect(screen.queryByRole('button', { name: '+' })).toBeNull()
   })
 
-  it('writes a picked color back through the hidden color input', async () => {
-    const { container, emitted } = renderRow(['#ff0000', '#00ff00'])
-    await fireEvent.click(container.querySelector('[data-index="1"]')!)
-    const input = container.querySelector(
-      'input[type="color"]'
-    ) as HTMLInputElement
-    input.value = '#0000ff'
-    await fireEvent.input(input)
-    expect(lastEmit(emitted)).toEqual(['#ff0000', '#0000ff'])
+  it('opens the color picker when a swatch is clicked', async () => {
+    const { container } = renderRow(['#ff0000'])
+    const swatch = container.querySelector('[data-index="0"]')!
+    await userEvent.click(swatch)
+    expect(swatch.getAttribute('data-state')).toBe('open')
   })
 
   it('starts a drag on pointer down without emitting', async () => {

src/components/palette/PaletteSwatchRow.vue

@@ -1,17 +1,24 @@
 <template>
   <div ref="container" class="flex flex-wrap items-center gap-1">
-    <div
+    <ColorPicker
       v-for="(hex, i) in modelValue"
-      :key="`${i}-${hex}`"
-      :data-index="i"
-      :data-hex="hex"
-      class="relative size-5 cursor-pointer rounded-sm border border-component-node-border"
-      :style="{ background: hex }"
-      :title="t('palette.swatchTitle')"
-      @click="openPicker(i, $event)"
-      @contextmenu.prevent.stop="remove(i)"
-      @pointerdown="onPointerDown(i, $event)"
-    />
+      :key="i"
+      :model-value="hex"
+      @update:model-value="(value) => updateAt(i, value)"
+    >
+      <template #trigger>
+        <button
+          type="button"
+          :data-index="i"
+          :data-hex="hex"
+          class="relative size-5 cursor-pointer rounded-sm border border-component-node-border p-0"
+          :style="{ background: hex }"
+          :title="t('palette.swatchTitle')"
+          @contextmenu.prevent.stop="remove(i)"
+          @pointerdown="onPointerDown(i, $event)"
+        />
+      </template>
+    </ColorPicker>
     <button
       v-if="modelValue.length < max"
       type="button"
@@ -21,12 +28,6 @@
     >
       +
     </button>
-    <input
-      ref="picker"
-      type="color"
-      class="pointer-events-none absolute size-0 opacity-0"
-      @input="onPickerInput"
-    />
   </div>
 </template>
 
@@ -34,6 +35,7 @@
 import { useTemplateRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import ColorPicker from '@/components/ui/color-picker/ColorPicker.vue'
 import { usePaletteSwatchRow } from '@/composables/palette/usePaletteSwatchRow'
 
 const { max = 5 } = defineProps<{ max?: number }>()
@@ -41,8 +43,9 @@ const modelValue = defineModel<string[]>({ required: true })
 const { t } = useI18n()
 
 const container = useTemplateRef<HTMLDivElement>('container')
-const picker = useTemplateRef<HTMLInputElement>('picker')
 
-const { openPicker, onPickerInput, remove, addColor, onPointerDown } =
-  usePaletteSwatchRow({ modelValue, container, picker })
+const { updateAt, remove, addColor, onPointerDown } = usePaletteSwatchRow({
+  modelValue,
+  container
+})
 </script>

src/components/ui/color-picker/ColorPicker.vue

@@ -65,49 +65,51 @@ const isOpen = ref(false)
 <template>
   <PopoverRoot v-model:open="isOpen">
     <PopoverTrigger as-child>
-      <button
-        type="button"
-        :disabled="$props.disabled"
-        :class="
-          cn(
-            'flex h-8 w-full items-center overflow-clip rounded-lg border border-transparent bg-component-node-widget-background pr-2 outline-none hover:bg-component-node-widget-background-hovered disabled:cursor-not-allowed disabled:opacity-50',
-            isOpen && 'border-node-stroke',
-            $props.class
-          )
-        "
-      >
-        <div class="flex size-8 shrink-0 items-center justify-center">
-          <div class="relative size-4 overflow-hidden rounded-sm">
-            <div
-              class="absolute inset-0"
-              :style="{
-                backgroundImage:
-                  'repeating-conic-gradient(#808080 0% 25%, transparent 0% 50%)',
-                backgroundSize: '4px 4px'
-              }"
-            />
-            <div
-              class="absolute inset-0"
-              :style="{ backgroundColor: previewColor }"
-            />
-          </div>
-        </div>
-        <div
-          class="flex flex-1 items-center justify-between pl-1 text-xs text-component-node-foreground"
+      <slot name="trigger">
+        <button
+          type="button"
+          :disabled="$props.disabled"
+          :class="
+            cn(
+              'flex h-8 w-full items-center overflow-clip rounded-lg border border-transparent bg-component-node-widget-background pr-2 outline-none hover:bg-component-node-widget-background-hovered disabled:cursor-not-allowed disabled:opacity-50',
+              isOpen && 'border-node-stroke',
+              $props.class
+            )
+          "
         >
-          <template v-if="displayMode === 'hex'">
-            <span>{{ displayHex }}</span>
-          </template>
-          <template v-else>
-            <div class="flex gap-2">
-              <span>{{ baseRgb.r }}</span>
-              <span>{{ baseRgb.g }}</span>
-              <span>{{ baseRgb.b }}</span>
+          <div class="flex size-8 shrink-0 items-center justify-center">
+            <div class="relative size-4 overflow-hidden rounded-sm">
+              <div
+                class="absolute inset-0"
+                :style="{
+                  backgroundImage:
+                    'repeating-conic-gradient(#808080 0% 25%, transparent 0% 50%)',
+                  backgroundSize: '4px 4px'
+                }"
+              />
+              <div
+                class="absolute inset-0"
+                :style="{ backgroundColor: previewColor }"
+              />
             </div>
-          </template>
-          <span>{{ hsva.a }}%</span>
-        </div>
-      </button>
+          </div>
+          <div
+            class="flex flex-1 items-center justify-between pl-1 text-xs text-component-node-foreground"
+          >
+            <template v-if="displayMode === 'hex'">
+              <span>{{ displayHex }}</span>
+            </template>
+            <template v-else>
+              <div class="flex gap-2">
+                <span>{{ baseRgb.r }}</span>
+                <span>{{ baseRgb.g }}</span>
+                <span>{{ baseRgb.b }}</span>
+              </div>
+            </template>
+            <span>{{ hsva.a }}%</span>
+          </div>
+        </button>
+      </slot>
     </PopoverTrigger>
     <PopoverPortal>
       <PopoverContent

src/composables/boundingBoxes/useBoundingBoxes.test.ts

@@ -8,14 +8,32 @@ import { useBoundingBoxes } from './useBoundingBoxes'
 import type { BoundingBox } from '@/types/boundingBoxes'
 import { toNodeId } from '@/types/nodeId'
 
-const { appState } = vi.hoisted(() => ({
-  appState: { node: null as unknown }
+const { appState, outputState } = vi.hoisted(() => ({
+  appState: { node: null as unknown },
+  outputState: {
+    outputs: undefined as unknown,
+    nodeOutputs: null as { value: Record<string, unknown> } | null
+  }
 }))
 
 vi.mock('@/scripts/app', () => ({
   app: { canvas: { graph: { getNodeById: () => appState.node } } }
 }))
 
+vi.mock('@/stores/nodeOutputStore', async () => {
+  const { ref } = await import('vue')
+  const nodeOutputs = ref<Record<string, unknown>>({})
+  outputState.nodeOutputs = nodeOutputs
+  return {
+    useNodeOutputStore: () => ({
+      nodeOutputs,
+      nodePreviewImages: ref({}),
+      getNodeImageUrls: () => undefined,
+      getNodeOutputs: () => outputState.outputs
+    })
+  }
+})
+
 const ctx = {
   measureText: (s: string) => ({ width: s.length * 7 }),
   setTransform: () => {},
@@ -27,6 +45,9 @@ const ctx = {
   save: () => {},
   restore: () => {},
   beginPath: () => {},
+  moveTo: () => {},
+  arc: () => {},
+  fill: () => {},
   rect: () => {},
   clip: () => {},
   font: '',
@@ -128,9 +149,23 @@ const box = (over: Partial<BoundingBox> = {}): BoundingBox => ({
   ...over
 })
 
+function makeConnectedNode() {
+  return {
+    widgets: [
+      { name: 'width', value: 512 },
+      { name: 'height', value: 512 }
+    ],
+    findInputSlot: (name: string) => (name === 'bboxes' ? 1 : -1),
+    getInputNode: () => null,
+    isInputConnected: () => true
+  }
+}
+
 beforeEach(() => {
   setActivePinia(createPinia())
   appState.node = makeNode()
+  outputState.outputs = undefined
+  if (outputState.nodeOutputs) outputState.nodeOutputs.value = {}
   vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
     void Promise.resolve().then(() => cb(0))
     return 1
@@ -239,6 +274,77 @@ describe('useBoundingBoxes inline editor', () => {
   })
 })
 
+describe('useBoundingBoxes incoming bboxes input', () => {
+  it('overrides the canvas when the bboxes input is connected', () => {
+    appState.node = makeConnectedNode()
+    outputState.outputs = {
+      input_bboxes: [box({ x: 0, y: 0, width: 100, height: 100 })]
+    }
+    const c = setup([])
+    expect(c.modelValue.value).toHaveLength(1)
+    expect(c.modelValue.value[0].width).toBe(100)
+  })
+
+  it('replaces existing drawn boxes with the incoming ones', () => {
+    appState.node = makeConnectedNode()
+    outputState.outputs = { input_bboxes: [box({ x: 0, width: 100 })] }
+    const c = setup([box({ x: 200, width: 300 }), box({ x: 400, width: 50 })])
+    expect(c.modelValue.value).toHaveLength(1)
+    expect(c.modelValue.value[0].width).toBe(100)
+  })
+
+  it('ignores incoming output when the input is not connected', () => {
+    outputState.outputs = { input_bboxes: [box({ x: 0, width: 100 })] }
+    const c = setup([])
+    expect(c.modelValue.value).toHaveLength(0)
+  })
+
+  it('applies incoming boxes when outputs stream in after mount', async () => {
+    appState.node = makeConnectedNode()
+    const c = setup([])
+    expect(c.modelValue.value).toHaveLength(0)
+
+    outputState.outputs = { input_bboxes: [box({ x: 0, width: 100 })] }
+    outputState.nodeOutputs!.value = { updated: true }
+    await flush()
+
+    expect(c.modelValue.value).toHaveLength(1)
+    expect(c.modelValue.value[0].width).toBe(100)
+  })
+})
+
+describe('useBoundingBoxes grid snapping', () => {
+  it('snaps a drawn box to the grid when grid is enabled (default)', async () => {
+    const c = setup()
+    c.onPointerDown(pe(10, 10))
+    c.onCanvasPointerMove(pe(60, 60))
+    c.onDocPointerUp(pe(60, 60))
+    await flush()
+    expect(c.modelValue.value).toHaveLength(1)
+    expect(c.modelValue.value[0].x).toBe(64)
+    expect(c.modelValue.value[0].width).toBe(256)
+  })
+
+  it('does not snap when grid is disabled', async () => {
+    const c = setup()
+    c.grid.value = false
+    c.onPointerDown(pe(10, 10))
+    c.onCanvasPointerMove(pe(55, 55))
+    c.onDocPointerUp(pe(55, 55))
+    await flush()
+    expect(c.modelValue.value[0].width).toBe(230)
+  })
+
+  it('keeps the anchored edge fixed when resizing a single edge', async () => {
+    const c = setup([box({ x: 51, y: 51, width: 256, height: 256 })])
+    c.onPointerDown(pe(60, 30))
+    c.onCanvasPointerMove(pe(80, 30))
+    c.onDocPointerUp(pe(80, 30))
+    await flush()
+    expect(c.modelValue.value[0].x).toBe(51)
+  })
+})
+
 describe('useBoundingBoxes hover cursor', () => {
   it('switches to a pointer cursor over a tag', async () => {
     const c = setup([box({ x: 10, y: 10, width: 256, height: 256 })])

src/composables/boundingBoxes/useBoundingBoxes.ts

@@ -15,6 +15,7 @@ import type {
   Region
 } from '@/composables/boundingBoxes/boundingBoxesUtil'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import type { NodeOutputWith } from '@/schemas/apiSchema'
 import { app } from '@/scripts/app'
 import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import type { BoundingBox } from '@/types/boundingBoxes'
@@ -25,6 +26,10 @@ const HANDLE_PX = 8
 const DIMENSION_STEP = 16
 const BG_DIM = 0.75
 const MAX_ELEMENT_COLORS = 5
+const GRID_PX = 32
+const MAX_GRID_CELLS = 64
+const DOT_COLOR = 'rgba(255,255,255,0.18)'
+const DOT_RADIUS = 1
 
 interface InlineEditorState {
   value: string
@@ -57,6 +62,7 @@ export function useBoundingBoxes(
   const hoverTagIndex = ref<number | null>(null)
   const bgImage = ref<HTMLImageElement | null>(null)
   const inlineEditor = ref<InlineEditorState | null>(null)
+  const grid = ref(true)
 
   const { width: containerWidth } = useElementSize(canvasContainer)
 
@@ -96,6 +102,88 @@ export function useBoundingBoxes(
     return Math.max(0, Math.min(1, n))
   }
 
+  function gridSpec() {
+    const stepX = Math.max(
+      GRID_PX,
+      Math.ceil(widthValue.value / MAX_GRID_CELLS)
+    )
+    const stepY = Math.max(
+      GRID_PX,
+      Math.ceil(heightValue.value / MAX_GRID_CELLS)
+    )
+    return {
+      fx: stepX / (widthValue.value || 1),
+      fy: stepY / (heightValue.value || 1)
+    }
+  }
+
+  function snapFraction(value: number, step: number) {
+    return step > 0 ? clampToCanvas(Math.round(value / step) * step) : value
+  }
+
+  function snapRegion(region: Region, mode: HitMode): Region {
+    if (!grid.value) return region
+    const { fx, fy } = gridSpec()
+    if (mode === 'move') {
+      return {
+        ...region,
+        x: Math.min(snapFraction(region.x, fx), 1 - region.w),
+        y: Math.min(snapFraction(region.y, fy), 1 - region.h)
+      }
+    }
+    const snapLeft =
+      mode === 'draw' ||
+      mode === 'resize-l' ||
+      mode === 'resize-tl' ||
+      mode === 'resize-bl'
+    const snapRight =
+      mode === 'draw' ||
+      mode === 'resize-r' ||
+      mode === 'resize-tr' ||
+      mode === 'resize-br'
+    const snapTop =
+      mode === 'draw' ||
+      mode === 'resize-t' ||
+      mode === 'resize-tl' ||
+      mode === 'resize-tr'
+    const snapBottom =
+      mode === 'draw' ||
+      mode === 'resize-b' ||
+      mode === 'resize-bl' ||
+      mode === 'resize-br'
+    const x1 = snapLeft ? snapFraction(region.x, fx) : region.x
+    const y1 = snapTop ? snapFraction(region.y, fy) : region.y
+    const x2 = snapRight
+      ? snapFraction(region.x + region.w, fx)
+      : region.x + region.w
+    const y2 = snapBottom
+      ? snapFraction(region.y + region.h, fy)
+      : region.y + region.h
+    return {
+      ...region,
+      x: x1,
+      y: y1,
+      w: Math.max(0, x2 - x1),
+      h: Math.max(0, y2 - y1)
+    }
+  }
+
+  function drawDots(ctx: CanvasRenderingContext2D, W: number, H: number) {
+    const { fx, fy } = gridSpec()
+    if (fx <= 0 || fy <= 0) return
+    ctx.save()
+    ctx.fillStyle = DOT_COLOR
+    ctx.beginPath()
+    for (let gx = 0; gx <= 1.0001; gx += fx) {
+      for (let gy = 0; gy <= 1.0001; gy += fy) {
+        ctx.moveTo(gx * W + DOT_RADIUS, gy * H)
+        ctx.arc(gx * W, gy * H, DOT_RADIUS, 0, Math.PI * 2)
+      }
+    }
+    ctx.fill()
+    ctx.restore()
+  }
+
   function logicalSize() {
     const el = canvasEl.value
     return { w: el?.clientWidth || 1, h: el?.clientHeight || 1 }
@@ -146,6 +234,8 @@ export function useBoundingBoxes(
       ctx.fillRect(0, 0, W, H)
     }
 
+    if (grid.value) drawDots(ctx, W, H)
+
     const showActive = focused.value || isNodeSelected.value
     const aIdx = showActive ? activeIndex.value : -1
     const order = state.value.regions
@@ -366,7 +456,7 @@ export function useBoundingBoxes(
     const dx = mN.x - dragStartNorm.value.x
     const dy = mN.y - dragStartNorm.value.y
     const nb = applyDrag(dragMode.value, boxAtStart.value, dx, dy)
-    state.value.regions[activeIndex.value] = nb
+    state.value.regions[activeIndex.value] = snapRegion(nb, dragMode.value)
     requestDraw()
   }
 
@@ -530,6 +620,23 @@ export function useBoundingBoxes(
   watch(isNodeSelected, () => requestDraw())
   watch([widthValue, heightValue], () => syncState())
 
+  watch(
+    litegraphNode,
+    (node) => {
+      const props = node?.properties as { bboxGrid?: unknown } | undefined
+      if (props && typeof props.bboxGrid === 'boolean')
+        grid.value = props.bboxGrid
+    },
+    { immediate: true }
+  )
+  watch(grid, (enabled) => {
+    const props = litegraphNode.value?.properties as
+      | Record<string, unknown>
+      | undefined
+    if (props) props.bboxGrid = enabled
+    requestDraw()
+  })
+
   const nodeOutputStore = useNodeOutputStore()
   function applyImageDimensions(naturalWidth: number, naturalHeight: number) {
     const node = litegraphNode.value
@@ -580,10 +687,44 @@ export function useBoundingBoxes(
     }
     img.src = url
   }
-  watch(() => nodeOutputStore.nodeOutputs, updateBgImage, { deep: true })
+  let lastIncoming = ''
+  function applyIncomingBoxes() {
+    const node = litegraphNode.value
+    if (!node) return
+    const slot = node.findInputSlot('bboxes')
+    if (slot < 0 || !node.isInputConnected(slot)) {
+      lastIncoming = ''
+      return
+    }
+    const outputs = nodeOutputStore.getNodeOutputs(node) as
+      | NodeOutputWith<{ input_bboxes?: BoundingBox[] }>
+      | undefined
+    const incoming = outputs?.input_bboxes
+    if (!incoming?.length) return
+    const key = JSON.stringify(incoming)
+    if (key === lastIncoming) return
+    lastIncoming = key
+    state.value.regions = fromBoundingBoxes(
+      incoming,
+      widthValue.value,
+      heightValue.value
+    )
+    activeIndex.value = state.value.regions.length ? 0 : -1
+    syncState()
+  }
+
+  watch(
+    () => nodeOutputStore.nodeOutputs,
+    () => {
+      updateBgImage()
+      applyIncomingBoxes()
+    },
+    { deep: true }
+  )
   watch(() => nodeOutputStore.nodePreviewImages, updateBgImage, { deep: true })
 
   updateBgImage()
+  applyIncomingBoxes()
   void nextTick(() => requestDraw())
 
   onBeforeUnmount(() => {
@@ -608,6 +749,7 @@ export function useBoundingBoxes(
     commitInlineEditor,
     setActiveType,
     clearAll,
-    syncState
+    syncState,
+    grid
   }
 }

src/composables/palette/usePaletteSwatchRow.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it } from 'vitest'
 import type { EffectScope } from 'vue'
 import { effectScope, ref, shallowRef } from 'vue'
 
@@ -13,17 +13,12 @@ afterEach(() => {
 function setup(initial: string[]) {
   const modelValue = ref(initial)
   const container = shallowRef(document.createElement('div'))
-  const picker = shallowRef(document.createElement('input'))
   const scope = effectScope()
   scopes.push(scope)
-  const api = scope.run(() =>
-    usePaletteSwatchRow({ modelValue, container, picker })
-  )!
-  return { modelValue, container, picker, ...api }
+  const api = scope.run(() => usePaletteSwatchRow({ modelValue, container }))!
+  return { modelValue, container, ...api }
 }
 
-const mouseEvent = () => ({ stopPropagation: vi.fn() }) as unknown as MouseEvent
-
 describe('usePaletteSwatchRow', () => {
   it('appends a default color', () => {
     const { modelValue, addColor } = setup(['#000000'])
@@ -37,31 +32,17 @@ describe('usePaletteSwatchRow', () => {
     expect(modelValue.value).toEqual(['#a', '#c'])
   })
 
-  it('seeds the picker input with the clicked color before opening it', () => {
-    const { picker, openPicker } = setup(['#112233'])
-    const click = vi.spyOn(picker.value!, 'click')
-    openPicker(0, mouseEvent())
-    expect(picker.value!.value).toBe('#112233')
-    expect(click).toHaveBeenCalled()
-  })
-
-  it('falls back to white when the slot is empty', () => {
-    const { picker, openPicker } = setup([''])
-    openPicker(0, mouseEvent())
-    expect(picker.value!.value).toBe('#ffffff')
-  })
-
-  it('writes the picked color back to the open slot', () => {
-    const { modelValue, openPicker, onPickerInput } = setup(['#a', '#b'])
-    openPicker(1, mouseEvent())
-    onPickerInput({ target: { value: '#123456' } } as unknown as Event)
+  it('updates the color at an index', () => {
+    const { modelValue, updateAt } = setup(['#a', '#b'])
+    updateAt(1, '#123456')
     expect(modelValue.value).toEqual(['#a', '#123456'])
   })
 
-  it('ignores picker input when no slot is open', () => {
-    const { modelValue, onPickerInput } = setup(['#a'])
-    onPickerInput({ target: { value: '#123456' } } as unknown as Event)
-    expect(modelValue.value).toEqual(['#a'])
+  it('ignores an update that does not change the color', () => {
+    const { modelValue, updateAt } = setup(['#a'])
+    const before = modelValue.value
+    updateAt(0, '#a')
+    expect(modelValue.value).toBe(before)
   })
 
   it('reorders via drag when the pointer crosses another swatch', () => {

src/composables/palette/usePaletteSwatchRow.ts

@@ -5,30 +5,16 @@ import { ref } from 'vue'
 interface UsePaletteSwatchRowOptions {
   modelValue: Ref<string[]>
   container: Readonly<ShallowRef<HTMLDivElement | null>>
-  picker: Readonly<ShallowRef<HTMLInputElement | null>>
 }
 
 export function usePaletteSwatchRow({
   modelValue,
-  container,
-  picker
+  container
 }: UsePaletteSwatchRowOptions) {
-  const pickerIndex = ref<number | null>(null)
-
-  function openPicker(i: number, e: MouseEvent) {
-    e.stopPropagation()
-    pickerIndex.value = i
-    const el = picker.value
-    if (!el) return
-    el.value = modelValue.value[i] || '#ffffff'
-    el.click()
-  }
-
-  function onPickerInput(e: Event) {
-    const v = (e.target as HTMLInputElement).value
-    if (pickerIndex.value === null) return
+  function updateAt(i: number, value: string) {
+    if (modelValue.value[i] === value) return
     const next = modelValue.value.slice()
-    next[pickerIndex.value] = v
+    next[i] = value
     modelValue.value = next
   }
 
@@ -105,8 +91,7 @@ export function usePaletteSwatchRow({
   })
 
   return {
-    openPicker,
-    onPickerInput,
+    updateAt,
     remove,
     addColor,
     onPointerDown

src/extensions/core/previewAny.ts

@@ -3,16 +3,12 @@ Preview Any - original implement from
 https://github.com/rgthree/rgthree-comfy/blob/main/py/display_any.py
 upstream requested in https://github.com/Kosinkadink/rfcs/blob/main/rfcs/0000-corenodes.md#preview-nodes
  */
-import { whenever } from '@vueuse/core'
-
-import { useChainCallback } from '@/composables/functional/useChainCallback'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import { app } from '@/scripts/app'
 import { type DOMWidget } from '@/scripts/domWidget'
 import { ComfyWidgets } from '@/scripts/widgets'
 import { useExtensionService } from '@/services/extensionService'
-import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 
 useExtensionService().registerExtension({
   name: 'Comfy.PreviewAny',
@@ -79,25 +75,6 @@ useExtensionService().registerExtension({
         showAsPlaintextWidget.widget.options.serialize = false
       }
 
-      const applyValue = (node: LGraphNode, text: string | string[]) => {
-        const previewWidgets =
-          node.widgets?.filter((w) => w.name.startsWith('preview_')) ?? []
-
-        const value = Array.isArray(text) ? (text?.join('\n\n') ?? '') : text
-        for (const previewWidget of previewWidgets) previewWidget.value = value
-      }
-
-      nodeType.prototype.onGraphConfigured = useChainCallback(
-        nodeType.prototype.onGraphConfigured,
-        function (this: LGraphNode) {
-          const outputStore = useNodeOutputStore()
-          whenever(
-            () => outputStore.nodeOutputs[this.id],
-            (output) => applyValue(this, output.text ?? ''),
-            { once: true }
-          )
-        }
-      )
       const onExecuted = nodeType.prototype.onExecuted
 
       nodeType.prototype.onExecuted = function (message) {
@@ -105,7 +82,15 @@ useExtensionService().registerExtension({
           ? void 0
           : onExecuted.apply(this, [message])
 
-        applyValue(this, message.text ?? '')
+        const previewWidgets =
+          this.widgets?.filter((w) => w.name.startsWith('preview_')) ?? []
+
+        for (const previewWidget of previewWidgets) {
+          const text = message.text ?? ''
+          previewWidget.value = Array.isArray(text)
+            ? (text?.join('\n\n') ?? '')
+            : text
+        }
       }
     }
   }

src/locales/en/main.json

@@ -2171,7 +2171,8 @@
     "descLabel": "description",
     "textPlaceholder": "text to render (verbatim)",
     "descPlaceholder": "description of this region",
-    "colors": "color_palette"
+    "colors": "color_palette",
+    "grid": "Grid"
   },
   "palette": {
     "addColor": "Add a color",

src/platform/navigation/preservedQueryManager.test.ts

@@ -30,90 +30,6 @@ describe('preservedQueryManager', () => {
     expect(sessionStorage.getItem('Comfy.PreservedQuery.template')).toBeTruthy()
   })
 
-  it('merges newly captured keys into the payload when merge is set', () => {
-    capturePreservedQuery(
-      NAMESPACE,
-      { template: 'flux' },
-      ['template', 'source', 'mode'],
-      { merge: true }
-    )
-
-    capturePreservedQuery(
-      NAMESPACE,
-      { source: 'custom' },
-      ['template', 'source', 'mode'],
-      { merge: true }
-    )
-
-    const merged = mergePreservedQueryIntoQuery(NAMESPACE)
-    expect(merged).toEqual({ template: 'flux', source: 'custom' })
-  })
-
-  it('replaces the whole payload on capture by default', () => {
-    capturePreservedQuery(NAMESPACE, { template: 'flux', source: 'custom' }, [
-      'template',
-      'source',
-      'mode'
-    ])
-
-    capturePreservedQuery(NAMESPACE, { template: 'sdxl' }, [
-      'template',
-      'source',
-      'mode'
-    ])
-
-    expect(mergePreservedQueryIntoQuery(NAMESPACE)).toEqual({
-      template: 'sdxl'
-    })
-  })
-
-  it('leaves the payload untouched when a default capture has no valid values', () => {
-    capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
-
-    capturePreservedQuery(NAMESPACE, { template: '' }, ['template'])
-
-    expect(getPreservedQueryParam(NAMESPACE, 'template')).toBe('flux')
-  })
-
-  it('captures the first non-empty string element of an array-valued param', () => {
-    capturePreservedQuery(NAMESPACE, { template: ['', 'flux', 'sdxl'] }, [
-      'template'
-    ])
-
-    expect(getPreservedQueryParam(NAMESPACE, 'template')).toBe('flux')
-  })
-
-  it('does not stash empty, null, or all-junk array values', () => {
-    capturePreservedQuery(
-      NAMESPACE,
-      { template: '', source: null, mode: ['', null] },
-      ['template', 'source', 'mode']
-    )
-
-    expect(getPreservedQueryParam(NAMESPACE, 'template')).toBeUndefined()
-    expect(getPreservedQueryParam(NAMESPACE, 'source')).toBeUndefined()
-    expect(getPreservedQueryParam(NAMESPACE, 'mode')).toBeUndefined()
-    expect(mergePreservedQueryIntoQuery(NAMESPACE)).toBeUndefined()
-  })
-
-  it('removes a preserved key on empty value when merge is set', () => {
-    capturePreservedQuery(
-      NAMESPACE,
-      { template: 'flux', source: 'custom' },
-      ['template', 'source'],
-      { merge: true }
-    )
-
-    capturePreservedQuery(NAMESPACE, { template: '' }, ['template', 'source'], {
-      merge: true
-    })
-
-    expect(getPreservedQueryParam(NAMESPACE, 'template')).toBeUndefined()
-    expect(mergePreservedQueryIntoQuery(NAMESPACE)).toEqual({
-      source: 'custom'
-    })
-  })
-
   it('reads a preserved query param by key', () => {
     capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
 
@@ -162,16 +78,6 @@ describe('preservedQueryManager', () => {
     expect(merged).toBeUndefined()
   })
 
-  it('overwrites an array-valued live query key with the stashed string', () => {
-    capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
-
-    const merged = mergePreservedQueryIntoQuery(NAMESPACE, {
-      template: ['existing', 'other']
-    })
-
-    expect(merged).toEqual({ template: 'flux' })
-  })
-
   it('clears cached payload', () => {
     capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
 

src/platform/navigation/preservedQueryManager.ts

@@ -4,12 +4,7 @@ const STORAGE_PREFIX = 'Comfy.PreservedQuery.'
 const preservedQueries = new Map<string, Record<string, string>>()
 
 const readQueryParam = (value: unknown): string | undefined => {
-  if (typeof value === 'string') return value
-  if (!Array.isArray(value)) return undefined
-  return value.find(
-    (entry: unknown): entry is string =>
-      typeof entry === 'string' && entry !== ''
-  )
+  return typeof value === 'string' ? value : undefined
 }
 
 const getStorageKey = (namespace: string) => `${STORAGE_PREFIX}${namespace}`
@@ -70,65 +65,25 @@ export const hydratePreservedQuery = (namespace: string) => {
   }
 }
 
-/**
- * By default each capture replaces the namespace stash with the values present
- * in the given query. With `merge`, values are merged into the existing stash
- * and a key supplied with an empty value clears its stashed entry — for
- * namespaces where the stash, not the URL, is the surviving carrier.
- */
 export const capturePreservedQuery = (
   namespace: string,
   query: LocationQuery,
-  keys: string[],
-  { merge = false }: { merge?: boolean } = {}
+  keys: string[]
 ) => {
-  if (!merge) {
-    const payload: Record<string, string> = {}
-    keys.forEach((key) => {
-      const value = readQueryParam(query[key])
-      if (value) {
-        payload[key] = value
-      }
-    })
-    if (Object.keys(payload).length === 0) {
-      return
-    }
-    preservedQueries.set(namespace, payload)
-    writeToStorage(namespace, payload)
-    return
-  }
-
-  hydratePreservedQuery(namespace)
-  const payload: Record<string, string> = {
-    ...(preservedQueries.get(namespace) ?? {})
-  }
-  let changed = false
+  const payload: Record<string, string> = {}
 
   keys.forEach((key) => {
-    if (!Object.hasOwn(query, key)) return
-
     const value = readQueryParam(query[key])
     if (value) {
       payload[key] = value
-      changed = true
-      return
-    }
-
-    if (key in payload) {
-      delete payload[key]
-      changed = true
     }
   })
 
-  if (!changed) {
+  if (Object.keys(payload).length === 0) {
     return
   }
 
-  if (Object.keys(payload).length === 0) {
-    preservedQueries.delete(namespace)
-  } else {
-    preservedQueries.set(namespace, payload)
-  }
+  preservedQueries.set(namespace, payload)
   writeToStorage(namespace, payload)
 }
 

src/platform/navigation/preservedQueryTracker.test.ts

@@ -1,196 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Router, RouterHistory } from 'vue-router'
-import { createMemoryHistory, createRouter } from 'vue-router'
-
-import {
-  clearPreservedQuery,
-  getPreservedQueryParam
-} from '@/platform/navigation/preservedQueryManager'
-import { installPreservedQueryTracker } from '@/platform/navigation/preservedQueryTracker'
-
-const STRIPPED_NAMESPACE = 'test_strip'
-const SECOND_STRIPPED_NAMESPACE = 'test_strip_b'
-const PLAIN_NAMESPACE = 'test_plain'
-
-const strippedDefinition = {
-  namespace: STRIPPED_NAMESPACE,
-  keys: ['one_time_code'],
-  stripAfterCapture: true
-}
-
-const plainDefinition = {
-  namespace: PLAIN_NAMESPACE,
-  keys: ['plain_code', 'plain_source']
-}
-
-function createTestRouter(
-  history: RouterHistory = createMemoryHistory()
-): Router {
-  return createRouter({
-    history,
-    routes: [{ path: '/:pathMatch(.*)*', component: { template: '<div />' } }]
-  })
-}
-
-describe('installPreservedQueryTracker', () => {
-  beforeEach(() => {
-    sessionStorage.clear()
-    clearPreservedQuery(STRIPPED_NAMESPACE)
-    clearPreservedQuery(SECOND_STRIPPED_NAMESPACE)
-    clearPreservedQuery(PLAIN_NAMESPACE)
-  })
-
-  it('strips marked keys from the URL while preserving other query and hash', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/?one_time_code=otc_abc123&keep=a+b#frag')
-
-    expect(router.currentRoute.value.fullPath).toBe('/?keep=a+b#frag')
-    expect(getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')).toBe(
-      'otc_abc123'
-    )
-  })
-
-  it('keeps params of non-strip namespaces in the URL and still captures them', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [plainDefinition])
-
-    await router.push('/?plain_code=alpha&plain_source=beta')
-
-    expect(router.currentRoute.value.fullPath).toBe(
-      '/?plain_code=alpha&plain_source=beta'
-    )
-    expect(getPreservedQueryParam(PLAIN_NAMESPACE, 'plain_code')).toBe('alpha')
-    expect(getPreservedQueryParam(PLAIN_NAMESPACE, 'plain_source')).toBe('beta')
-  })
-
-  it('replaces a non-strip namespace stash on later captures', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [plainDefinition])
-
-    await router.push('/?plain_code=alpha&plain_source=beta')
-    await router.push('/?plain_code=gamma')
-
-    expect(getPreservedQueryParam(PLAIN_NAMESPACE, 'plain_code')).toBe('gamma')
-    expect(
-      getPreservedQueryParam(PLAIN_NAMESPACE, 'plain_source')
-    ).toBeUndefined()
-  })
-
-  it('navigates exactly once when no strip-marked keys are present', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-    let completedNavigations = 0
-    router.afterEach(() => {
-      completedNavigations++
-    })
-
-    await router.push('/?keep=1')
-
-    expect(router.currentRoute.value.fullPath).toBe('/?keep=1')
-    expect(completedNavigations).toBe(1)
-  })
-
-  it('scrubs empty and null values from the URL without stashing them', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/?one_time_code=')
-    expect(router.currentRoute.value.fullPath).toBe('/')
-    expect(
-      getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')
-    ).toBeUndefined()
-
-    await router.push('/?one_time_code')
-    expect(router.currentRoute.value.fullPath).toBe('/')
-    expect(
-      getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')
-    ).toBeUndefined()
-  })
-
-  it('clears a stale stripped value when the URL supplies an empty value', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/?one_time_code=otc_abc123')
-    expect(getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')).toBe(
-      'otc_abc123'
-    )
-
-    await router.push('/?one_time_code=')
-
-    expect(router.currentRoute.value.fullPath).toBe('/')
-    expect(
-      getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')
-    ).toBeUndefined()
-  })
-
-  it('stashes the first value of a repeated param and cleans the URL', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/?one_time_code=otc_A&one_time_code=otc_B')
-
-    expect(router.currentRoute.value.fullPath).toBe('/')
-    expect(getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')).toBe(
-      'otc_A'
-    )
-  })
-
-  it('strips keys of multiple marked namespaces in a single redirect', async () => {
-    const router = createTestRouter()
-    let navigationAttempts = 0
-    router.beforeEach((_to, _from, next) => {
-      navigationAttempts++
-      next()
-    })
-    installPreservedQueryTracker(router, [
-      strippedDefinition,
-      {
-        namespace: SECOND_STRIPPED_NAMESPACE,
-        keys: ['second_code'],
-        stripAfterCapture: true
-      }
-    ])
-
-    await router.push('/?one_time_code=otc_x&second_code=sc_y&keep=1')
-
-    expect(router.currentRoute.value.fullPath).toBe('/?keep=1')
-    expect(navigationAttempts).toBe(2)
-    expect(getPreservedQueryParam(STRIPPED_NAMESPACE, 'one_time_code')).toBe(
-      'otc_x'
-    )
-    expect(
-      getPreservedQueryParam(SECOND_STRIPPED_NAMESPACE, 'second_code')
-    ).toBe('sc_y')
-  })
-
-  it('keeps the prior history entry reachable after the strip redirect', async () => {
-    const router = createTestRouter()
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/start')
-    await router.push('/?one_time_code=otc_abc123')
-    expect(router.currentRoute.value.fullPath).toBe('/')
-
-    router.go(-1)
-    await vi.waitFor(() =>
-      expect(router.currentRoute.value.fullPath).toBe('/start')
-    )
-  })
-
-  it('keeps replace navigation from adding a back target', async () => {
-    const history = createMemoryHistory()
-    const router = createTestRouter(history)
-    installPreservedQueryTracker(router, [strippedDefinition])
-
-    await router.push('/start')
-    await router.replace('/?one_time_code=otc_abc123')
-    expect(router.currentRoute.value.fullPath).toBe('/')
-
-    router.go(-1)
-
-    expect(history.location).toBe('/')
-  })
-})

src/platform/navigation/preservedQueryTracker.ts

@@ -5,48 +5,25 @@ import {
   hydratePreservedQuery
 } from '@/platform/navigation/preservedQueryManager'
 
-interface PreservedQueryDefinition {
-  namespace: string
-  keys: string[]
-  /**
-   * When set, keys present in the query are removed from the client-side URL
-   * before navigation completes. Later guards, afterEach hooks, and views must
-   * read a strip-marked key from the preserved-query stash instead of
-   * route.query or fullPath. Because the stash is the only carrier after
-   * stripping, captures for the namespace merge into the existing stash and an
-   * explicitly empty value clears the stashed key; non-strip namespaces keep
-   * replace-on-capture semantics.
-   */
-  stripAfterCapture?: boolean
-}
-
 export const installPreservedQueryTracker = (
   router: Router,
-  definitions: PreservedQueryDefinition[]
+  definitions: Array<{ namespace: string; keys: string[] }>
 ) => {
+  const trackedDefinitions = definitions.map((definition) => ({
+    ...definition
+  }))
+
   router.beforeEach((to, _from, next) => {
     const queryKeys = new Set(Object.keys(to.query))
-    const keysToStrip = new Set<string>()
 
-    definitions.forEach(({ namespace, keys, stripAfterCapture }) => {
+    trackedDefinitions.forEach(({ namespace, keys }) => {
       hydratePreservedQuery(namespace)
-      const presentKeys = keys.filter((key) => queryKeys.has(key))
-      if (presentKeys.length === 0) return
-      capturePreservedQuery(namespace, to.query, keys, {
-        merge: stripAfterCapture
-      })
-      if (stripAfterCapture) {
-        presentKeys.forEach((key) => keysToStrip.add(key))
+      const shouldCapture = keys.some((key) => queryKeys.has(key))
+      if (shouldCapture) {
+        capturePreservedQuery(namespace, to.query, keys)
       }
     })
 
-    if (keysToStrip.size === 0) {
-      next()
-      return
-    }
-
-    const cleanedQuery = { ...to.query }
-    keysToStrip.forEach((key) => delete cleanedQuery[key])
-    next({ path: to.path, query: cleanedQuery, hash: to.hash })
+    next()
   })
 }

src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts

@@ -530,6 +530,8 @@ export function useSlotLinkInteraction({
 
     raf.flush()
 
+    raf.flush()
+
     if (!state.source) {
       cleanupInteraction()
       app.canvas?.setDirty(true, true)
@@ -577,18 +579,24 @@ export function useSlotLinkInteraction({
     const graph = app.canvas?.graph ?? null
     const context = { adapter, graph, session: dragContext }
 
+    const attemptSnapped = () => tryConnectToCandidate(snappedCandidate)
+
     const domSlotCandidate = resolveSlotTargetCandidate(target, context)
+    const attemptDomSlot = () => tryConnectToCandidate(domSlotCandidate)
+
     const nodeSurfaceSlotCandidate = resolveNodeSurfaceSlotCandidate(
       target,
       context
     )
+    const attemptNodeSurface = () =>
+      tryConnectToCandidate(nodeSurfaceSlotCandidate)
+    const attemptReroute = () => tryConnectViaRerouteAtPointer()
 
-    return (
-      tryConnectToCandidate(snappedCandidate) ||
-      tryConnectToCandidate(domSlotCandidate) ||
-      tryConnectToCandidate(nodeSurfaceSlotCandidate) ||
-      tryConnectViaRerouteAtPointer()
-    )
+    if (attemptSnapped()) return true
+    if (attemptDomSlot()) return true
+    if (attemptNodeSurface()) return true
+    if (attemptReroute()) return true
+    return false
   }
 
   const onPointerDown = (event: PointerEvent) => {