fix: make upsert-comment-section conflict-tolerant across concurrent writers

Several workflows now share one PR comment via read-modify-write, which the
REST API can't do atomically. Re-read immediately before each write and verify
our section plus every previously-present section survived; on a detected
clobber, re-read and retry with backoff so concurrent writers converge instead
of dropping each other's sections.

Addresses review feedback:
https://github.com/Comfy-Org/ComfyUI_frontend/pull/12939#discussion_r3432470450

.coderabbit.yaml

@@ -63,14 +63,3 @@ reviews:
           Pass if none of these patterns are found in the diff.
 
           When warning, reference the specific ADR by number and link to `docs/adr/` for context. Frame findings as directional guidance since ADR 0003 and 0008 are in Proposed status.
-
-  path_instructions:
-    - path: '**/*.test.ts'
-      instructions: |
-        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, and `docs/guidance/vitest.md` as required review context for every changed Vitest test file.
-    - path: 'src/lib/litegraph/**/*.test.ts'
-      instructions: |
-        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, `docs/guidance/vitest.md`, and `docs/testing/litegraph-testing.md` as required review context for every changed litegraph Vitest test file.
-    - path: '{browser_tests,apps/website/e2e}/**/*.spec.ts'
-      instructions: |
-        Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, and `docs/guidance/playwright.md` as required review context for every changed Playwright test file.

.github/actions/comment-release-links/action.yaml

@@ -1,5 +1,5 @@
 name: Post Release Summary Comment
-description: Post or update a PR comment summarizing release links with diff, derived versions, and optional extras.
+description: Upsert a release-links section (diff, derived versions, optional extras) into the unified PR report comment.
 author: ComfyUI Frontend Team
 
 inputs:
@@ -49,7 +49,7 @@ runs:
           exit 1
         fi
 
-        MARKER='release-summary'
+        SECTION_NAME='release'
         MESSAGE='Publish jobs finished successfully:'
         LINKS_VALUE=''
 
@@ -60,7 +60,7 @@ runs:
               'npm types|https://www.npmjs.com/package/@comfyorg/comfyui-frontend-types/v/{{version}}')
             ;;
           apps/desktop-ui/package.json)
-            MARKER='desktop-release-summary'
+            SECTION_NAME='desktop-release'
             LINKS_VALUE='npm desktop UI|https://www.npmjs.com/package/@comfyorg/desktop-ui/v/{{version}}'
             ;;
         esac
@@ -71,7 +71,6 @@ runs:
         COMMENT_FILE=$(mktemp)
 
         {
-          echo "<!--$MARKER:$DIFF_PREFIX$NEW_VERSION-->"
           echo "$MESSAGE"
           echo ""
           echo "- $DIFF_LABEL: [\`$DIFF_PREFIX$PREV_VERSION...$DIFF_PREFIX$NEW_VERSION\`]($DIFF_URL)"
@@ -99,21 +98,14 @@ runs:
           echo "COMMENT_BODY_END_MARKER"
         } >> "$GITHUB_OUTPUT"
         echo "prev_version=$PREV_VERSION" >> "$GITHUB_OUTPUT"
-        echo "marker_search=<!--$MARKER:" >> "$GITHUB_OUTPUT"
+        echo "section_name=$SECTION_NAME" >> "$GITHUB_OUTPUT"
         echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
 
-    - name: Find existing comment
-      id: find
-      uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
+    - name: Upsert release section into unified report
+      uses: ./.github/actions/upsert-comment-section
       with:
-        issue-number: ${{ inputs.issue-number || github.event.pull_request.number }}
-        comment-author: github-actions[bot]
-        body-includes: ${{ steps.build.outputs.marker_search }}
-
-    - name: Post or update comment
-      uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
-      with:
-        issue-number: ${{ inputs.issue-number || github.event.pull_request.number }}
-        comment-id: ${{ steps.find.outputs.comment-id }}
-        body: ${{ steps.build.outputs.body }}
-        edit-mode: replace
+        pr-number: ${{ inputs.issue-number || github.event.pull_request.number }}
+        section-name: ${{ steps.build.outputs.section_name }}
+        section-content: ${{ steps.build.outputs.body }}
+        comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
+        token: ${{ github.token }}

.github/actions/upsert-comment-section/action.yaml

@@ -49,36 +49,75 @@ runs:
 
           // Escape special regex characters in delimiter strings
           const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-
-          const comments = await github.paginate(
-            github.rest.issues.listComments,
-            { ...context.repo, issue_number: prNumber }
-          )
-
-          const existing = comments.find(
-            (c) =>
-              c.user?.login === 'github-actions[bot]' &&
-              c.body?.includes(commentMarker)
-          )
-
-          if (!existing) {
-            return github.rest.issues.createComment({
-              ...context.repo,
-              issue_number: prNumber,
-              body: `${commentMarker}\n${sectionBlock}`
-            })
-          }
-
-          const body = existing.body ?? ''
           const sectionRegex = new RegExp(
             `${escapeRegex(sectionStart)}[\\s\\S]*?${escapeRegex(sectionEnd)}`
           )
-          const updated = sectionRegex.test(body)
-            ? body.replace(sectionRegex, sectionBlock)
-            : body.trimEnd() + '\n\n' + sectionBlock
 
-          return github.rest.issues.updateComment({
-            ...context.repo,
-            comment_id: existing.id,
-            body: updated
-          })
+          // Every section-start marker in a body, used to detect whether a
+          // concurrent writer's section was lost across our write.
+          const sectionStartsIn = (body) =>
+            body.match(/<!-- section:[a-z0-9-]+:start -->/g) ?? []
+
+          const findComment = async () => {
+            const comments = await github.paginate(
+              github.rest.issues.listComments,
+              { ...context.repo, issue_number: prNumber }
+            )
+            return comments.find(
+              (c) =>
+                c.user?.login === 'github-actions[bot]' &&
+                c.body?.includes(commentMarker)
+            )
+          }
+
+          // Several workflows share one comment via read-modify-write, which the
+          // REST API can't do atomically. Re-read immediately before each write
+          // and verify our section plus every previously-present section
+          // survived; on a detected clobber, re-read and retry so writers
+          // converge instead of silently dropping each other's sections.
+          const maxAttempts = 5
+          for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            const existing = await findComment()
+
+            if (!existing) {
+              try {
+                await github.rest.issues.createComment({
+                  ...context.repo,
+                  issue_number: prNumber,
+                  body: `${commentMarker}\n${sectionBlock}`
+                })
+                return
+              } catch (err) {
+                if (attempt === maxAttempts) throw err
+                continue // another writer likely created it first; retry updates
+              }
+            }
+
+            const body = existing.body ?? ''
+            const expectedSections = sectionStartsIn(body)
+            const updated = sectionRegex.test(body)
+              ? body.replace(sectionRegex, sectionBlock)
+              : body.trimEnd() + '\n\n' + sectionBlock
+
+            await github.rest.issues.updateComment({
+              ...context.repo,
+              comment_id: existing.id,
+              body: updated
+            })
+
+            const current = (await findComment())?.body ?? ''
+            const survived =
+              current.includes(sectionBlock) &&
+              expectedSections.every((s) => current.includes(s))
+            if (survived) return
+
+            if (attempt === maxAttempts) {
+              core.warning(
+                `upsert-comment-section: section "${sectionName}" may have been clobbered by a concurrent writer after ${maxAttempts} attempts`
+              )
+              return
+            }
+            await new Promise((resolve) =>
+              setTimeout(resolve, 250 * attempt + Math.floor(Math.random() * 250))
+            )
+          }

.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/ci-website-e2e.yaml

@@ -193,7 +193,7 @@ jobs:
         with:
           pr-number: ${{ github.event.pull_request.number }}
           section-name: e2e
-          comment-marker: '<!-- WEBSITE_CI_REPORT -->'
+          comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
           token: ${{ secrets.GITHUB_TOKEN }}
           section-content: |-
             ## 🌐 Website E2E
@@ -273,6 +273,6 @@ jobs:
         with:
           pr-number: ${{ github.event.pull_request.number }}
           section-name: e2e
-          comment-marker: '<!-- WEBSITE_CI_REPORT -->'
+          comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
           token: ${{ secrets.GITHUB_TOKEN }}
           section-content: ${{ steps.content.outputs.section-content }}

.github/workflows/cla.yml

@@ -5,8 +5,6 @@ on:
     types: [created]
   pull_request_target:
     types: [opened, synchronize, closed]
-  merge_group:
-    types: [checks_requested]
 
 permissions:
   actions: write
@@ -18,10 +16,6 @@ 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.

.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.

.github/workflows/pr-report.yaml

@@ -142,6 +142,7 @@ jobs:
               '<!-- COMFYUI_FRONTEND_PERF -->',
               '<!-- PLAYWRIGHT_TEST_STATUS -->',
               '<!-- STORYBOOK_BUILD_STATUS -->',
+              '<!-- WEBSITE_CI_REPORT -->',
             ];
 
             const comments = await github.paginate(github.rest.issues.listComments, {

.github/workflows/pr-update-website-screenshots.yaml

@@ -179,7 +179,7 @@ jobs:
         with:
           pr-number: ${{ github.event.number || github.event.issue.number }}
           section-name: screenshot-update
-          comment-marker: '<!-- WEBSITE_CI_REPORT -->'
+          comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
           token: ${{ secrets.GITHUB_TOKEN }}
           section-content: |-
             ## 📸 Screenshot Update
@@ -240,6 +240,6 @@ jobs:
         with:
           pr-number: ${{ needs.update-screenshots.outputs.pr-number }}
           section-name: screenshot-update
-          comment-marker: '<!-- WEBSITE_CI_REPORT -->'
+          comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
           token: ${{ secrets.GITHUB_TOKEN }}
           section-content: ${{ steps.content.outputs.section-content }}

.github/workflows/pr-vercel-website-preview.yaml

@@ -58,7 +58,7 @@ jobs:
         with:
           pr-number: ${{ steps.pr-meta.outputs.number }}
           section-name: preview
-          comment-marker: '<!-- WEBSITE_CI_REPORT -->'
+          comment-marker: '<!-- COMFYUI_FRONTEND_PR_REPORT -->'
           token: ${{ secrets.GITHUB_TOKEN }}
           section-content: |-
             ## 🔗 Website Preview

.github/workflows/release-biweekly-comfyui.yaml

@@ -23,10 +23,6 @@ on:
         required: false
         default: 'Comfy-Org/ComfyUI'
         type: string
-      target_branch:
-        description: 'Optional: force a specific release branch, e.g. core/1.47 or core/2.0. Overrides the pin-derived target — use to skip a dead minor or do an out-of-cadence / major release.'
-        required: false
-        type: string
 
 jobs:
   check-release-week:
@@ -53,15 +49,12 @@ jobs:
           fi
 
       - name: Summary
-        env:
-          TARGET_BRANCH_OVERRIDE: ${{ inputs.target_branch }}
         run: |
           echo "## Release Check" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- Is release week: ${{ steps.check.outputs.is_release_week }}" >> $GITHUB_STEP_SUMMARY
           echo "- Manual trigger: ${{ github.event_name == 'workflow_dispatch' }}" >> $GITHUB_STEP_SUMMARY
           echo "- Release type: ${{ inputs.release_type || 'minor (scheduled)' }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Target branch override: ${TARGET_BRANCH_OVERRIDE:-(none — pin-derived)}" >> $GITHUB_STEP_SUMMARY
 
   resolve-version:
     needs: check-release-week
@@ -110,7 +103,6 @@ jobs:
         working-directory: frontend
         env:
           RELEASE_TYPE: ${{ inputs.release_type || 'minor' }}
-          TARGET_BRANCH: ${{ inputs.target_branch }}
         run: |
           set -euo pipefail
 

apps/website/e2e/cloud.spec.ts

@@ -40,7 +40,7 @@ test.describe('Cloud page @smoke', () => {
     }
   })
 
-  test('AIModelsSection heading and 6 model cards are visible', async ({
+  test('AIModelsSection heading and 5 model cards are visible', async ({
     page
   }) => {
     const heading = page.getByRole('heading', { name: /leading AI models/i })
@@ -49,7 +49,7 @@ test.describe('Cloud page @smoke', () => {
     const section = heading.locator('xpath=ancestor::section')
     const grid = section.locator('.grid')
     const modelCards = grid.locator('a[href="https://comfy.org/workflows"]')
-    await expect(modelCards).toHaveCount(6)
+    await expect(modelCards).toHaveCount(5)
   })
 
   test('AIModelsSection CTA links to workflows', async ({ page }) => {

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/HeaderMain/HeaderMain.vue

@@ -33,7 +33,7 @@ const ctaButtons = [
 
 <template>
   <nav
-    class="sticky top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
+    class="fixed inset-x-0 top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
     aria-label="Main navigation"
   >
     <a

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,14 +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 h-auto whitespace-normal"
+      <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/common/SiteFooter.vue

@@ -86,7 +86,6 @@ const companyColumn: { title: string; links: FooterLink[] } = {
     { label: t('footer.about', locale), href: routes.about },
     { label: t('nav.careers', locale), href: routes.careers },
     { label: t('footer.termsOfService', locale), href: routes.termsOfService },
-    { label: t('footer.enterpriseMsa', locale), href: routes.enterpriseMsa },
     { label: t('footer.privacyPolicy', locale), href: routes.privacyPolicy }
   ]
 }

apps/website/src/components/demos/DemoNavSection.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { Locale, TranslationKey } from '../../i18n/translations'
 
-import { localizeHref } from '../../config/routes'
 import { t } from '../../i18n/translations'
 
 const {
@@ -16,7 +15,8 @@ const {
   locale?: Locale
 }>()
 
-const nextHref = localizeHref(`/demos/${nextSlug}`, locale)
+const localePrefix = locale === 'en' ? '' : `/${locale}`
+const nextHref = `${localePrefix}/demos/${nextSlug}`
 </script>
 
 <template>

apps/website/src/components/legal/enterpriseMsaSections.test.ts

@@ -1,46 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { getRoutes } from '../../config/routes'
-import { hasKey, translationKeys } from '../../i18n/translations'
-
-const PREFIX = 'enterprise-msa'
-
-function deriveMsaSectionIds(): string[] {
-  const labelRegex = new RegExp(`^${PREFIX}\\.([0-9]+-[a-z-]+)\\.label$`)
-  const ids: string[] = []
-  for (const key of translationKeys) {
-    const match = key.match(labelRegex)
-    if (match && !ids.includes(match[1])) ids.push(match[1])
-  }
-  return ids
-}
-
-describe('enterprise MSA i18n', () => {
-  it('every derived section has a title and at least one block', () => {
-    const sectionIds = deriveMsaSectionIds()
-    expect(sectionIds.length).toBeGreaterThan(0)
-    for (const id of sectionIds) {
-      expect(hasKey(`${PREFIX}.${id}.title`)).toBe(true)
-      expect(hasKey(`${PREFIX}.${id}.block.0`)).toBe(true)
-    }
-  })
-
-  it('exposes the page-chrome keys the .astro file references', () => {
-    for (const suffix of [
-      'effective-date',
-      'page.title',
-      'page.description',
-      'page.heading',
-      'page.tocLabel',
-      'page.effectiveDateLabel',
-      'page.parties'
-    ]) {
-      expect(hasKey(`${PREFIX}.${suffix}`)).toBe(true)
-    }
-  })
-
-  it('serves the enterprise MSA at the canonical /enterprise-msa path regardless of locale', () => {
-    expect(getRoutes('en').enterpriseMsa).toBe('/enterprise-msa')
-    expect(getRoutes('zh-CN').enterpriseMsa).toBe('/enterprise-msa')
-  })
-})

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/components/ui/copyable-field/CopyableField.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
 import { Check, Copy } from '@lucide/vue'
 import { useClipboard } from '@vueuse/core'
 
-import { computed } from 'vue'
-
 // Interactive: the copy button is inert until its host island is hydrated.
 // Render under a `client:*` directive (e.g. `client:visible`) when the page
 // needs it to work.
@@ -14,8 +11,6 @@ const {
   copiedLabel = 'Copied'
 } = defineProps<{ value: string; copyLabel?: string; copiedLabel?: string }>()
 
-const multiline = computed(() => value.includes('\n'))
-
 const { copy, copied } = useClipboard({ copiedDuring: 2000 })
 
 function handleCopy() {
@@ -25,32 +20,15 @@ function handleCopy() {
 
 <template>
   <div
-    :class="
-      cn(
-        'bg-transparency-white-t4 border-primary-warm-gray flex gap-2 rounded-xl border px-4 py-3',
-        multiline ? 'items-start' : 'items-center'
-      )
-    "
+    class="bg-transparency-white-t4 border-primary-warm-gray flex items-center gap-2 rounded-xl border px-4 py-3"
   >
-    <span
-      :class="
-        cn(
-          'flex-1 font-mono text-xs text-primary-comfy-canvas',
-          multiline ? 'wrap-break-word whitespace-pre-line' : 'truncate'
-        )
-      "
-    >
+    <span class="flex-1 truncate font-mono text-xs text-primary-comfy-canvas">
       {{ value }}
     </span>
     <button
       type="button"
       :aria-label="copied ? copiedLabel : copyLabel"
-      :class="
-        cn(
-          'text-primary-warm-gray shrink-0 cursor-pointer transition-colors hover:text-primary-comfy-canvas',
-          multiline && 'mt-0.5'
-        )
-      "
+      class="text-primary-warm-gray shrink-0 cursor-pointer transition-colors hover:text-primary-comfy-canvas"
       @click="handleCopy"
     >
       <component :is="copied ? Check : Copy" class="size-4" />

apps/website/src/components/ui/icon-button/IconButton.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import type { PrimitiveProps } from 'reka-ui'
-import type { HTMLAttributes } from 'vue'
-import type { IconButtonVariants } from '.'
-import { Primitive } from 'reka-ui'
-import { cn } from '@comfyorg/tailwind-utils'
-import { iconButtonVariants } from '.'
-
-interface Props extends PrimitiveProps {
-  variant?: IconButtonVariants['variant']
-  size?: IconButtonVariants['size']
-  class?: HTMLAttributes['class']
-  disabled?: boolean
-}
-
-const {
-  as = 'button',
-  asChild,
-  variant,
-  size,
-  class: className,
-  disabled
-} = defineProps<Props>()
-</script>
-
-<template>
-  <Primitive
-    data-slot="icon-button"
-    :data-variant="variant"
-    :data-size="size"
-    :as
-    :as-child
-    :disabled
-    :class="cn(iconButtonVariants({ variant, size }), className)"
-  >
-    <slot />
-  </Primitive>
-</template>

apps/website/src/components/ui/icon-button/index.ts

@@ -1,28 +0,0 @@
-import type { VariantProps } from 'class-variance-authority'
-import { cva } from 'class-variance-authority'
-
-export const iconButtonVariants = cva(
-  [
-    'focus-visible:border-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 inline-flex shrink-0 cursor-pointer items-center justify-center rounded-2xl transition-all duration-200 outline-none focus-visible:ring-3 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0'
-  ],
-  {
-    variants: {
-      variant: {
-        ghost:
-          'text-primary-warm-white hover:text-primary-comfy-yellow bg-transparent',
-        outline:
-          'text-primary-comfy-yellow hover:bg-primary-comfy-yellow border-primary-comfy-yellow border-2 bg-primary-comfy-ink hover:text-primary-comfy-ink'
-      },
-      size: {
-        sm: 'size-8',
-        default: 'size-10',
-        lg: 'size-14'
-      }
-    },
-    defaultVariants: {
-      variant: 'ghost',
-      size: 'default'
-    }
-  }
-)
-export type IconButtonVariants = VariantProps<typeof iconButtonVariants>

apps/website/src/composables/useBannerDismissal.ts

@@ -1,75 +0,0 @@
-import { onMounted, ref } from 'vue'
-
-import { BANNER_DISMISS_ATTR, BANNER_STORAGE_KEY } from '../utils/banner'
-
-type ClosedBanners = Record<string, boolean>
-
-function readClosedBanners(): ClosedBanners {
-  try {
-    const raw = localStorage.getItem(BANNER_STORAGE_KEY)
-    return raw ? (JSON.parse(raw) as ClosedBanners) : {}
-  } catch {
-    return {}
-  }
-}
-
-function writeClosedBanners(value: ClosedBanners): void {
-  try {
-    localStorage.setItem(BANNER_STORAGE_KEY, JSON.stringify(value))
-  } catch {
-    // Storage unavailable (private mode / quota) — dismissal just won't persist.
-  }
-}
-
-/** The stable part of a version key (everything before `_v<hash>`). */
-function versionPrefix(version: string): string {
-  const idx = version.lastIndexOf('_v')
-  return idx === -1 ? version : version.slice(0, idx)
-}
-
-/**
- * Client-side dismissal persisted in localStorage, keyed by a content-aware
- * `version`. The banner renders visible in the static HTML (so non-dismissers
- * see no pop-in); an inline pre-hydration script hides an already-dismissed
- * banner before paint, and this composable then removes it from the DOM on mount.
- */
-export function useBannerDismissal(version: string) {
-  const isVisible = ref(true)
-
-  onMounted(() => {
-    const stored = readClosedBanners()
-    const prefix = versionPrefix(version)
-
-    // Prune stale versions of THIS banner+locale; keep other banners/locales
-    // and the current version.
-    const cleaned: ClosedBanners = Object.create(null) as ClosedBanners
-    let pruned = false
-    for (const key of Object.keys(stored)) {
-      if (versionPrefix(key) !== prefix || key === version) {
-        cleaned[key] = stored[key]
-      } else {
-        pruned = true
-      }
-    }
-    if (pruned) writeClosedBanners(cleaned)
-
-    isVisible.value = !cleaned[version]
-  })
-
-  function close(): void {
-    isVisible.value = false
-    const stored = readClosedBanners()
-    stored[version] = true
-    writeClosedBanners(stored)
-  }
-
-  // Call once the close transition has finished. Sets the pre-paint hide signal
-  // so the banner doesn't flash back in on a ClientRouter (view-transition)
-  // navigation — where the inline <head> script does not re-run but <html>
-  // persists. Deferred to after the animation so the leave transition can play.
-  function persistHidden(): void {
-    document.documentElement.setAttribute(BANNER_DISMISS_ATTR, '')
-  }
-
-  return { isVisible, close, persistHidden }
-}

apps/website/src/composables/useCurrentPath.test.ts

@@ -1,31 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { isHrefActive } from './useCurrentPath'
-
-describe('isHrefActive', () => {
-  it('matches the current page', () => {
-    expect(isHrefActive('/mcp', '/mcp')).toBe(true)
-  })
-
-  it('does not match other pages', () => {
-    expect(isHrefActive('/mcp', '/pricing')).toBe(false)
-  })
-
-  it('matches regardless of a trailing slash', () => {
-    expect(isHrefActive('/mcp', '/mcp/')).toBe(true)
-  })
-
-  it('ignores query and hash on the href', () => {
-    expect(isHrefActive('/mcp?ref=banner#setup', '/mcp')).toBe(true)
-  })
-
-  it('never matches an external href', () => {
-    expect(
-      isHrefActive('https://docs.comfy.org/agent-tools/cloud', '/mcp')
-    ).toBe(false)
-  })
-
-  it('never matches an empty href', () => {
-    expect(isHrefActive('', '/mcp')).toBe(false)
-  })
-})

apps/website/src/config/banner.ts

@@ -1,85 +0,0 @@
-import type { ButtonVariants } from '../components/ui/button'
-import type { Locale, TranslationKey } from '../i18n/translations'
-
-import { t } from '../i18n/translations'
-import { resolveRel } from '../utils/cta'
-import { localizeHref } from './routes'
-
-// The banner "CMS": a single typed config resolved through i18n at build time.
-// `isActive` is the master on/off switch (supersedes the old SHOW_ANNOUNCEMENT_BANNER).
-// NOTE: on this static site, `startsAt`/`endsAt` are evaluated at BUILD time — the
-// window gates on the last deploy, not the visitor's exact clock.
-
-interface BannerLinkConfig {
-  readonly href: string
-  readonly titleKey: TranslationKey
-  readonly target?: boolean
-  readonly buttonVariant?: NonNullable<ButtonVariants['variant']>
-}
-
-export interface BannerConfig {
-  readonly id: string
-  readonly isActive: boolean
-  readonly startsAt?: string
-  readonly endsAt?: string
-  /** Empty/undefined = all locales. */
-  readonly targetLocales?: readonly Locale[]
-  /** v1 only supports 'sitewide'. */
-  readonly targetSections?: readonly string[]
-  readonly titleKey: TranslationKey
-  readonly descriptionKey?: TranslationKey
-  readonly link?: BannerLinkConfig
-}
-
-interface BannerLinkData {
-  readonly href: string
-  readonly title: string
-  readonly target?: '_blank'
-  readonly rel?: string
-  readonly buttonVariant?: NonNullable<ButtonVariants['variant']>
-}
-
-export interface BannerData {
-  readonly id: string
-  readonly title: string
-  readonly description?: string
-  readonly link?: BannerLinkData
-}
-
-export const bannerConfig: BannerConfig = {
-  id: 'announcement',
-  isActive: true,
-  targetSections: ['sitewide'],
-  titleKey: 'launches.banner.text',
-  link: {
-    href: '/mcp',
-    titleKey: 'launches.banner.cta',
-    buttonVariant: 'underlineLink'
-  }
-}
-
-/** Resolve a config's i18n keys into display strings for the given locale. */
-export function getBannerData(
-  config: BannerConfig,
-  locale: Locale
-): BannerData {
-  const { link } = config
-  const target = link?.target ? '_blank' : undefined
-
-  return {
-    id: config.id,
-    title: t(config.titleKey, locale),
-    description: config.descriptionKey
-      ? t(config.descriptionKey, locale)
-      : undefined,
-    link: link
-      ? {
-          href: localizeHref(link.href, locale),
-          title: t(link.titleKey, locale),
-          target,
-          rel: resolveRel({ target: target ?? '_self' }),
-          buttonVariant: link.buttonVariant
-        }
-      : undefined
-  }
-}

apps/website/src/config/routes.test.ts

@@ -1,23 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { localizeHref } from './routes'
-
-describe('localizeHref', () => {
-  it('prefixes an internal path for a non-default locale', () => {
-    expect(localizeHref('/mcp', 'zh-CN')).toBe('/zh-CN/mcp')
-  })
-
-  it('leaves the default locale unprefixed', () => {
-    expect(localizeHref('/mcp', 'en')).toBe('/mcp')
-  })
-
-  it('passes external URLs through unchanged', () => {
-    expect(
-      localizeHref('https://docs.comfy.org/agent-tools/cloud', 'zh-CN')
-    ).toBe('https://docs.comfy.org/agent-tools/cloud')
-  })
-
-  it('never prefixes locale-invariant routes', () => {
-    expect(localizeHref('/terms-of-service', 'zh-CN')).toBe('/terms-of-service')
-  })
-})

apps/website/src/config/routes.ts

@@ -15,7 +15,6 @@ const baseRoutes = {
   demos: '/demos',
   learning: '/learning',
   termsOfService: '/terms-of-service',
-  enterpriseMsa: '/enterprise-msa',
   privacyPolicy: '/privacy-policy',
   affiliates: '/affiliates',
   affiliateTerms: '/affiliates/terms',
@@ -36,37 +35,19 @@ type Routes = typeof baseRoutes
 // block in src/i18n/translations.ts for the reasoning.
 //
 // termsOfService: legal-reviewed English-only document, same reasoning.
-//
-// enterpriseMsa: legal-reviewed English-only document (Comfy Enterprise
-// Customer Agreement template), same reasoning. See the comment header
-// in src/pages/enterprise-msa.astro.
 const LOCALE_INVARIANT_ROUTE_KEYS = new Set<keyof Routes>([
   'affiliates',
   'affiliateTerms',
-  'termsOfService',
-  'enterpriseMsa'
+  'termsOfService'
 ])
 
-const LOCALE_INVARIANT_PATHS = new Set<string>(
-  [...LOCALE_INVARIANT_ROUTE_KEYS].map((key) => baseRoutes[key])
-)
-
-/**
- * Prefix an internal path with the locale (`/mcp` → `/zh-CN/mcp`). External
- * URLs and locale-invariant routes pass through unchanged.
- */
-export function localizeHref(href: string, locale: Locale = 'en'): string {
-  if (locale === 'en' || !href.startsWith('/')) return href
-  if (LOCALE_INVARIANT_PATHS.has(href)) return href
-  return `/${locale}${href}`
-}
-
 export function getRoutes(locale: Locale = 'en'): Routes {
   if (locale === 'en') return baseRoutes
+  const prefix = `/${locale}`
   return Object.fromEntries(
-    Object.entries(baseRoutes).map(([key, path]) => [
-      key,
-      localizeHref(path, locale)
+    Object.entries(baseRoutes).map(([k, v]) => [
+      k,
+      LOCALE_INVARIANT_ROUTE_KEYS.has(k as keyof Routes) ? v : `${prefix}${v}`
     ])
   ) as unknown as Routes
 }
@@ -79,12 +60,13 @@ export const externalLinks = {
   cloudStatus: 'https://status.comfy.org',
   discord: 'https://discord.com/invite/comfyorg',
   docs: 'https://docs.comfy.org/',
-  docsApi: 'https://docs.comfy.org/development/cloud/overview#quick-start',
+  docsApi: 'https://docs.comfy.org/api-reference/cloud',
   docsMcp: 'https://docs.comfy.org/agent-tools/cloud',
   docsSubscription: 'https://docs.comfy.org/support/subscription/subscribing',
   github: 'https://github.com/Comfy-Org/ComfyUI',
   githubInstall: 'https://github.com/Comfy-Org/ComfyUI#installing',
   instagram: 'https://www.instagram.com/comfyui/',
+  mcpServer: 'https://cloud.comfy.org/mcp',
   mcpSkills: 'https://github.com/Comfy-Org/comfy-skills',
   platform: 'https://platform.comfy.org',
   platformUsage: 'https://platform.comfy.org/profile/usage',

apps/website/src/data/drops.ts

@@ -72,24 +72,6 @@ export const drops: readonly Drop[] = [
       href: { en: '/download', 'zh-CN': '/zh-CN/download' }
     }
   },
-  {
-    id: 'comfy-mcp',
-    badge: NEW_BADGE,
-    category: CLOUD,
-    media: imageFor('Drops_2x2card_MCP.jpg', {
-      en: 'Comfy MCP',
-      'zh-CN': 'Comfy MCP'
-    }),
-    title: { en: 'Comfy MCP', 'zh-CN': 'Comfy MCP' },
-    description: {
-      en: 'The full power of ComfyUI from anywhere — no setup, no GPU required.',
-      'zh-CN': '随时随地体验 ComfyUI 的全部能力 — 无需配置，无需 GPU。'
-    },
-    cta: {
-      label: EXPLORE,
-      href: { en: '/mcp', 'zh-CN': '/zh-CN/mcp' }
-    }
-  },
   {
     id: 'app-mode',
     badge: NEW_BADGE,
@@ -130,6 +112,24 @@ export const drops: readonly Drop[] = [
       href: { en: '/api', 'zh-CN': '/zh-CN/api' }
     }
   },
+  {
+    id: 'comfy-mcp',
+    badge: NEW_BADGE,
+    category: CLOUD,
+    media: imageFor('Drops_2x2card_MCP.jpg', {
+      en: 'Comfy MCP',
+      'zh-CN': 'Comfy MCP'
+    }),
+    title: { en: 'Comfy MCP', 'zh-CN': 'Comfy MCP' },
+    description: {
+      en: 'The full power of ComfyUI from anywhere — no setup, no GPU required.',
+      'zh-CN': '随时随地体验 ComfyUI 的全部能力 — 无需配置，无需 GPU。'
+    },
+    cta: {
+      label: EXPLORE,
+      href: { en: '/mcp', 'zh-CN': '/zh-CN/mcp' }
+    }
+  },
   {
     id: 'community-workflows',
     category: COMMUNITY,

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': '探索最新模型工作流'
@@ -1872,10 +1868,6 @@ const translations = {
     en: 'VIEW DOCS',
     'zh-CN': '查看文档'
   },
-  'mcp.hero.installMcp': {
-    en: 'INSTALL MCP',
-    'zh-CN': '安装 MCP'
-  },
   'mcp.hero.runWorkflow': {
     en: 'RUN A WORKFLOW',
     'zh-CN': '运行工作流'
@@ -1913,27 +1905,21 @@ const translations = {
   },
   'mcp.setup.step1.label': { en: 'STEP 1', 'zh-CN': '第 1 步' },
   'mcp.setup.step1.title': {
-    en: 'Ask your agent to install Comfy MCP',
-    'zh-CN': '让你的智能体安装 Comfy MCP'
-  },
-  'mcp.setup.step1.command': {
-    en: 'Help me install Comfy MCP.\nFollow the setup guide at {url}',
-    'zh-CN': '帮我安装 Comfy MCP。\n请按照 {url} 上的设置指南操作。'
+    en: 'Copy the MCP URL',
+    'zh-CN': '复制 MCP URL'
   },
   'mcp.setup.step1.description': {
-    en: 'Paste this into Claude, Cursor, Codex, or any MCP-compatible agent. It reads the docs and adds the connector for you.',
-    'zh-CN':
-      '将它粘贴到 Claude、Cursor、Codex 或任意兼容 MCP 的智能体中。它会读取文档并为你添加连接器。'
+    en: "Click the copy button below. You'll paste it into your client in the next step.",
+    'zh-CN': '点击下方的复制按钮，下一步将其粘贴到你的客户端中。'
   },
   'mcp.setup.step2.label': { en: 'STEP 2', 'zh-CN': '第 2 步' },
   'mcp.setup.step2.title': {
-    en: 'Or add it by hand',
-    'zh-CN': '或手动添加'
+    en: 'Add the connector',
+    'zh-CN': '添加连接器'
   },
   'mcp.setup.step2.description': {
-    en: 'Prefer manual setup? Add Comfy Cloud as a custom connector with the MCP URL. The docs cover every client.',
-    'zh-CN':
-      '想手动配置？用 MCP URL 将 Comfy Cloud 添加为自定义连接器。文档涵盖各类客户端。'
+    en: 'Name it Comfy Cloud and paste the URL. The docs below cover every client.',
+    'zh-CN': '将其命名为 Comfy Cloud 并粘贴 URL。下方文档涵盖各类客户端。'
   },
   'mcp.setup.step2.cta': {
     en: 'COMFY CLOUD MCP DOCS',
@@ -3496,429 +3482,6 @@ const translations = {
     'zh-CN': '生效日期'
   },
 
-  // ── Enterprise MSA ─────────────────────────────────────────────────
-  // English-only, by design. This is a legal-reviewed customer-facing
-  // template. Serving a translated variant would expose Comfy to
-  // liability from the translation diverging from the approved English
-  // source. See the matching header comment in
-  // src/pages/enterprise-msa.astro and the LOCALE_INVARIANT_ROUTE_KEYS
-  // entry in src/config/routes.ts.
-  'enterprise-msa.effective-date': {
-    en: 'May 22, 2026',
-    'zh-CN': 'May 22, 2026'
-  },
-  'enterprise-msa.1-definitions.label': {
-    en: 'DEFINITIONS',
-    'zh-CN': 'DEFINITIONS'
-  },
-  'enterprise-msa.1-definitions.title': {
-    en: '1. Definitions',
-    'zh-CN': '1. Definitions'
-  },
-  'enterprise-msa.1-definitions.block.0': {
-    en: '<strong>“Affiliates”</strong> means any entity that directly or indirectly controls, is controlled by, or is under common control with a party, where “control” means the ownership of more than fifty percent (50%) of the voting securities or other voting interests of such entity.',
-    'zh-CN':
-      '<strong>“Affiliates”</strong> means any entity that directly or indirectly controls, is controlled by, or is under common control with a party, where “control” means the ownership of more than fifty percent (50%) of the voting securities or other voting interests of such entity.'
-  },
-  'enterprise-msa.1-definitions.block.1': {
-    en: '<strong>“Applicable Laws”</strong> means all federal and state laws, treaties, rules, regulations, regulatory and supervisory guidance, directives, policies, orders or determinations of a regulatory authority applicable to the activities and obligations contemplated under this Agreement.',
-    'zh-CN':
-      '<strong>“Applicable Laws”</strong> means all federal and state laws, treaties, rules, regulations, regulatory and supervisory guidance, directives, policies, orders or determinations of a regulatory authority applicable to the activities and obligations contemplated under this Agreement.'
-  },
-  'enterprise-msa.1-definitions.block.2': {
-    en: '<strong>“Comfy API”</strong> means the application programming interface and related developer tools made available by Comfy that allows Customer to access and execute visual AI workflows programmatically as production endpoints from within Customer’s own applications or systems.',
-    'zh-CN':
-      '<strong>“Comfy API”</strong> means the application programming interface and related developer tools made available by Comfy that allows Customer to access and execute visual AI workflows programmatically as production endpoints from within Customer’s own applications or systems.'
-  },
-  'enterprise-msa.1-definitions.block.3': {
-    en: '<strong>“Comfy Branding”</strong> means the names, logos, and associated trademarks owned or in progress of being owned by Comfy.',
-    'zh-CN':
-      '<strong>“Comfy Branding”</strong> means the names, logos, and associated trademarks owned or in progress of being owned by Comfy.'
-  },
-  'enterprise-msa.1-definitions.block.4': {
-    en: '<strong>“Comfy Cloud”</strong> means the cloud-based hosting environment made available by Comfy that allows Customer to access and run visual AI workflows remotely through Comfy’s infrastructure, without requiring local installation or hardware.',
-    'zh-CN':
-      '<strong>“Comfy Cloud”</strong> means the cloud-based hosting environment made available by Comfy that allows Customer to access and run visual AI workflows remotely through Comfy’s infrastructure, without requiring local installation or hardware.'
-  },
-  'enterprise-msa.1-definitions.block.5': {
-    en: '<strong>“Comfy Enterprise”</strong> means the enterprise-grade product tier made available by Comfy that provides organizations with dedicated infrastructure, enhanced security, administrative controls, and related support services for deploying and managing visual AI workflows at scale.',
-    'zh-CN':
-      '<strong>“Comfy Enterprise”</strong> means the enterprise-grade product tier made available by Comfy that provides organizations with dedicated infrastructure, enhanced security, administrative controls, and related support services for deploying and managing visual AI workflows at scale.'
-  },
-  'enterprise-msa.1-definitions.block.6': {
-    en: '<strong>“Comfy OSS”</strong> means the open-source software, source code, libraries, tools, and related components made available by Comfy under one or more open source licenses, including the software repositories published by Comfy at <a href="https://github.com/Comfy-Org" class="text-white underline">https://github.com/Comfy-Org</a>, as updated, modified, or supplemented from time to time. For the avoidance of doubt, Comfy OSS does not include any proprietary software, infrastructure, or functionality made available by Comfy under this Agreement or in connection with any commercial product or offering.',
-    'zh-CN':
-      '<strong>“Comfy OSS”</strong> means the open-source software, source code, libraries, tools, and related components made available by Comfy under one or more open source licenses, including the software repositories published by Comfy at <a href="https://github.com/Comfy-Org" class="text-white underline">https://github.com/Comfy-Org</a>, as updated, modified, or supplemented from time to time. For the avoidance of doubt, Comfy OSS does not include any proprietary software, infrastructure, or functionality made available by Comfy under this Agreement or in connection with any commercial product or offering.'
-  },
-  'enterprise-msa.1-definitions.block.7': {
-    en: '<strong>“Comfy Products”</strong> means Comfy Cloud, Comfy API, Comfy Enterprise and other products, software, features, tools, and functionality made available by Comfy to Customer under this Agreement, excluding any Comfy OSS.',
-    'zh-CN':
-      '<strong>“Comfy Products”</strong> means Comfy Cloud, Comfy API, Comfy Enterprise and other products, software, features, tools, and functionality made available by Comfy to Customer under this Agreement, excluding any Comfy OSS.'
-  },
-  'enterprise-msa.1-definitions.block.8': {
-    en: '<strong>“Customer Data”</strong> means electronic data and information submitted or generated by Customer in connection with its use of the Comfy Products, including all Inputs and Outputs.',
-    'zh-CN':
-      '<strong>“Customer Data”</strong> means electronic data and information submitted or generated by Customer in connection with its use of the Comfy Products, including all Inputs and Outputs.'
-  },
-  'enterprise-msa.1-definitions.block.9': {
-    en: '<strong>“Open Source License”</strong> means the open source license(s) under which Comfy makes Comfy OSS available, as identified in the applicable source code repository.',
-    'zh-CN':
-      '<strong>“Open Source License”</strong> means the open source license(s) under which Comfy makes Comfy OSS available, as identified in the applicable source code repository.'
-  },
-  'enterprise-msa.1-definitions.block.10': {
-    en: '<strong>“Operational Metadata”</strong> means usage and diagnostic information generated by the Comfy Products and collected by Comfy to support, maintain, and optimize the performance and security of the Comfy Products, including information regarding software versions, system configuration, uptime, error logs, health metrics, and feature usage. Operational Metadata does not include Customer Data or Confidential Information.',
-    'zh-CN':
-      '<strong>“Operational Metadata”</strong> means usage and diagnostic information generated by the Comfy Products and collected by Comfy to support, maintain, and optimize the performance and security of the Comfy Products, including information regarding software versions, system configuration, uptime, error logs, health metrics, and feature usage. Operational Metadata does not include Customer Data or Confidential Information.'
-  },
-  'enterprise-msa.1-definitions.block.11': {
-    en: '<strong>“Order Form”</strong> means the online sign-up flow, order form or other ordering document entered into or otherwise agreed by Customer that references this Agreement. The initial Order Form is attached as Exhibit A.',
-    'zh-CN':
-      '<strong>“Order Form”</strong> means the online sign-up flow, order form or other ordering document entered into or otherwise agreed by Customer that references this Agreement. The initial Order Form is attached as Exhibit A.'
-  },
-  'enterprise-msa.1-definitions.block.12': {
-    en: '<strong>“User”</strong> means Customer’s or Customer’s Affiliates’ employees and contractors who are authorized by Customer to access and use the Comfy Products on Customer’s or Customer’s Affiliates’ behalf according to the terms of this Agreement.',
-    'zh-CN':
-      '<strong>“User”</strong> means Customer’s or Customer’s Affiliates’ employees and contractors who are authorized by Customer to access and use the Comfy Products on Customer’s or Customer’s Affiliates’ behalf according to the terms of this Agreement.'
-  },
-  'enterprise-msa.2-comfy-products.label': {
-    en: 'PRODUCTS',
-    'zh-CN': 'PRODUCTS'
-  },
-  'enterprise-msa.2-comfy-products.title': {
-    en: '2. Comfy Products',
-    'zh-CN': '2. Comfy Products'
-  },
-  'enterprise-msa.2-comfy-products.block.0': {
-    en: '<strong>Right to Access and Use Comfy Products.</strong> Subject to Customer’s compliance with all of the terms and conditions of this Agreement, Comfy grants Customer and Customer’s Users a non-exclusive, non-sublicensable, non-transferable right during the term of this Agreement to access and use the Comfy Products as set forth in the applicable Order Form for Customer’s internal business purposes.',
-    'zh-CN':
-      '<strong>Right to Access and Use Comfy Products.</strong> Subject to Customer’s compliance with all of the terms and conditions of this Agreement, Comfy grants Customer and Customer’s Users a non-exclusive, non-sublicensable, non-transferable right during the term of this Agreement to access and use the Comfy Products as set forth in the applicable Order Form for Customer’s internal business purposes.'
-  },
-  'enterprise-msa.2-comfy-products.block.1': {
-    en: '<strong>Customer Data.</strong> As between Comfy and Customer, Customer retains all right, title, and interest in and to any data, images, videos, prompts, models, workflows, nodes, parameters, or other materials submitted or uploaded by Customer to the Comfy Products (“Input”), as well as any images, videos, designs, or other visual content generated through Customer’s use of the Comfy Products as a result of processing Customer’s Input (“Output”). Customer acknowledges that due to the nature of artificial intelligence, Comfy may generate the same or similar Output for other customers, and Customer shall have no right, title, or interest in or to Output generated for any other customer.',
-    'zh-CN':
-      '<strong>Customer Data.</strong> As between Comfy and Customer, Customer retains all right, title, and interest in and to any data, images, videos, prompts, models, workflows, nodes, parameters, or other materials submitted or uploaded by Customer to the Comfy Products (“Input”), as well as any images, videos, designs, or other visual content generated through Customer’s use of the Comfy Products as a result of processing Customer’s Input (“Output”). Customer acknowledges that due to the nature of artificial intelligence, Comfy may generate the same or similar Output for other customers, and Customer shall have no right, title, or interest in or to Output generated for any other customer.'
-  },
-  'enterprise-msa.2-comfy-products.block.2': {
-    en: '<strong>No AI Training.</strong> Comfy will not use Input or Output to train generative AI or diffusion models. Comfy may, however, collect and use limited metadata derived from Customer’s use of the Comfy Products, such as prompt classifications, workflow structures, and node configurations, to improve the performance, functionality, and user experience of the Comfy Products.',
-    'zh-CN':
-      '<strong>No AI Training.</strong> Comfy will not use Input or Output to train generative AI or diffusion models. Comfy may, however, collect and use limited metadata derived from Customer’s use of the Comfy Products, such as prompt classifications, workflow structures, and node configurations, to improve the performance, functionality, and user experience of the Comfy Products.'
-  },
-  'enterprise-msa.2-comfy-products.block.3': {
-    en: '<strong>Comfy OSS.</strong> Customer may use Comfy OSS under the terms of the applicable Open Source License(s) governing each respective component, as identified in the corresponding source code repository, rather than under this Agreement. Nothing in this Agreement shall be construed to limit, supersede, or modify any rights or obligations arising under an applicable Open Source License. If Customer chooses to use the Comfy Products in conjunction with Comfy OSS, this Agreement applies solely to Customer’s use of the Comfy Products and not to the Comfy OSS itself.',
-    'zh-CN':
-      '<strong>Comfy OSS.</strong> Customer may use Comfy OSS under the terms of the applicable Open Source License(s) governing each respective component, as identified in the corresponding source code repository, rather than under this Agreement. Nothing in this Agreement shall be construed to limit, supersede, or modify any rights or obligations arising under an applicable Open Source License. If Customer chooses to use the Comfy Products in conjunction with Comfy OSS, this Agreement applies solely to Customer’s use of the Comfy Products and not to the Comfy OSS itself.'
-  },
-  'enterprise-msa.2-comfy-products.block.4': {
-    en: '<strong>Partner Nodes.</strong> Certain features of the Comfy Products allow Customer to access third-party AI model providers (“Partner Nodes”) through Comfy. When Customer uses a Partner Node, Comfy proxies Customer’s request to the applicable third-party provider, transmitting the information necessary to fulfill Customer’s request, including prompts, images, models, and parameters. Comfy does not transmit Customer’s identity or account information to third-party providers in connection with Partner Node requests. Customer’s use of Partner Nodes is subject to the terms and policies of the applicable third-party provider, and Comfy is not responsible for the data practices of such providers. Usage of Partner Nodes is metered and billed through Comfy.',
-    'zh-CN':
-      '<strong>Partner Nodes.</strong> Certain features of the Comfy Products allow Customer to access third-party AI model providers (“Partner Nodes”) through Comfy. When Customer uses a Partner Node, Comfy proxies Customer’s request to the applicable third-party provider, transmitting the information necessary to fulfill Customer’s request, including prompts, images, models, and parameters. Comfy does not transmit Customer’s identity or account information to third-party providers in connection with Partner Node requests. Customer’s use of Partner Nodes is subject to the terms and policies of the applicable third-party provider, and Comfy is not responsible for the data practices of such providers. Usage of Partner Nodes is metered and billed through Comfy.'
-  },
-  'enterprise-msa.2-comfy-products.block.5': {
-    en: '<strong>Modification of Comfy Products.</strong> Comfy may, at any time and in its sole discretion, modify, update, enhance, restrict, suspend, or discontinue the Comfy Products, in whole or in part, including by changing or removing features, functionality, endpoints, specifications, documentation, access methods, usage limits, or availability. Comfy has no obligation to maintain or support any particular version of the Comfy Products or to ensure backward compatibility. Any such modifications may be made with or without notice and may result in interruptions to or degradation of the Comfy Products. Comfy shall have no liability arising out of or related to any modification, suspension, or discontinuation of the Comfy Products, and Customer acknowledges that its use of the Comfy Products is at its own risk and that it should not rely on the continued availability of any aspect of the Comfy Products.',
-    'zh-CN':
-      '<strong>Modification of Comfy Products.</strong> Comfy may, at any time and in its sole discretion, modify, update, enhance, restrict, suspend, or discontinue the Comfy Products, in whole or in part, including by changing or removing features, functionality, endpoints, specifications, documentation, access methods, usage limits, or availability. Comfy has no obligation to maintain or support any particular version of the Comfy Products or to ensure backward compatibility. Any such modifications may be made with or without notice and may result in interruptions to or degradation of the Comfy Products. Comfy shall have no liability arising out of or related to any modification, suspension, or discontinuation of the Comfy Products, and Customer acknowledges that its use of the Comfy Products is at its own risk and that it should not rely on the continued availability of any aspect of the Comfy Products.'
-  },
-  'enterprise-msa.2-comfy-products.block.6': {
-    en: '<strong>Data Retention and Deletion.</strong> Comfy retains Customer Data for as long as Customer’s account remains active or as otherwise necessary to provide the Comfy Products, comply with applicable legal obligations, resolve disputes, and enforce this Agreement. Specific retention periods for different categories of Customer Data are set forth in Comfy’s retention documentation, available at <a href="https://docs.comfy.org/support/data-retention" class="text-white underline">docs.comfy.org/support/data-retention</a>, as updated from time to time. Customer may request deletion of Customer’s account and associated Customer Data by contacting Comfy at <a href="mailto:legal@comfy.org" class="text-white underline">legal@comfy.org</a>. Upon receipt of a verified deletion request, Comfy will use commercially reasonable efforts to delete or de-identify Customer’s personal information from its primary systems within a reasonable time. Customer acknowledges that: (i) deletion may not propagate immediately to all backup systems, third-party analytics providers, or observability systems, which retain data subject to their own retention policies; (ii) certain Customer Data may be retained as required by applicable law or for legitimate business purposes such as billing records; and (iii) aggregated or de-identified data derived from Customer’s use of the Comfy Products may be retained indefinitely.',
-    'zh-CN':
-      '<strong>Data Retention and Deletion.</strong> Comfy retains Customer Data for as long as Customer’s account remains active or as otherwise necessary to provide the Comfy Products, comply with applicable legal obligations, resolve disputes, and enforce this Agreement. Specific retention periods for different categories of Customer Data are set forth in Comfy’s retention documentation, available at <a href="https://docs.comfy.org/support/data-retention" class="text-white underline">docs.comfy.org/support/data-retention</a>, as updated from time to time. Customer may request deletion of Customer’s account and associated Customer Data by contacting Comfy at <a href="mailto:legal@comfy.org" class="text-white underline">legal@comfy.org</a>. Upon receipt of a verified deletion request, Comfy will use commercially reasonable efforts to delete or de-identify Customer’s personal information from its primary systems within a reasonable time. Customer acknowledges that: (i) deletion may not propagate immediately to all backup systems, third-party analytics providers, or observability systems, which retain data subject to their own retention policies; (ii) certain Customer Data may be retained as required by applicable law or for legitimate business purposes such as billing records; and (iii) aggregated or de-identified data derived from Customer’s use of the Comfy Products may be retained indefinitely.'
-  },
-  'enterprise-msa.3-customer-responsibilities.label': {
-    en: 'CUSTOMER',
-    'zh-CN': 'CUSTOMER'
-  },
-  'enterprise-msa.3-customer-responsibilities.title': {
-    en: '3. Customer Responsibilities',
-    'zh-CN': '3. Customer Responsibilities'
-  },
-  'enterprise-msa.3-customer-responsibilities.block.0': {
-    en: '<strong>Registration.</strong> To access and use the Comfy Products, Customer may be required to register one or more accounts by providing Comfy with the information specified in the applicable registration form, including Customer’s email address. Customer shall ensure that all registration information provided to Comfy is complete and accurate, and shall promptly update such information as necessary to keep it current. Customer shall be liable for all activities conducted through its account, including any unauthorized access or use resulting from Customer’s failure to implement reasonable access controls or to limit access to its systems and devices.',
-    'zh-CN':
-      '<strong>Registration.</strong> To access and use the Comfy Products, Customer may be required to register one or more accounts by providing Comfy with the information specified in the applicable registration form, including Customer’s email address. Customer shall ensure that all registration information provided to Comfy is complete and accurate, and shall promptly update such information as necessary to keep it current. Customer shall be liable for all activities conducted through its account, including any unauthorized access or use resulting from Customer’s failure to implement reasonable access controls or to limit access to its systems and devices.'
-  },
-  'enterprise-msa.3-customer-responsibilities.block.1': {
-    en: '<strong>General Technology Restrictions.</strong> Customer agrees that it will not, directly or indirectly: (i) sublicense the Comfy Products for use by a third party; (ii) reverse engineer or attempt to extract the source code or underlying methodology from the Comfy Products or any related software, except to the extent that this restriction is expressly prohibited by Applicable Laws; (iii) use or facilitate the use of the Comfy Products for any activities that are prohibited by Applicable Laws or otherwise; (iv) bypass or circumvent measures employed to prevent or limit access to the Comfy Products; (v) use the Comfy Products to create a product or service competitive with Comfy’s products or services; (vi) create derivative works of or otherwise create, attempt to create or derive, or knowingly assist any third party to create or derive, the source code underlying the Comfy Products; or (vii) otherwise use or interact with the Comfy Products for any purpose not expressly permitted under this Agreement.',
-    'zh-CN':
-      '<strong>General Technology Restrictions.</strong> Customer agrees that it will not, directly or indirectly: (i) sublicense the Comfy Products for use by a third party; (ii) reverse engineer or attempt to extract the source code or underlying methodology from the Comfy Products or any related software, except to the extent that this restriction is expressly prohibited by Applicable Laws; (iii) use or facilitate the use of the Comfy Products for any activities that are prohibited by Applicable Laws or otherwise; (iv) bypass or circumvent measures employed to prevent or limit access to the Comfy Products; (v) use the Comfy Products to create a product or service competitive with Comfy’s products or services; (vi) create derivative works of or otherwise create, attempt to create or derive, or knowingly assist any third party to create or derive, the source code underlying the Comfy Products; or (vii) otherwise use or interact with the Comfy Products for any purpose not expressly permitted under this Agreement.'
-  },
-  'enterprise-msa.3-customer-responsibilities.block.2': {
-    en: '<strong>Acceptable Use; Prohibited Customer Data.</strong> Customer is solely responsible for ensuring that all Input submitted to the Comfy Products complies with all Applicable Laws, and Customer agrees that it will not, and will not permit any third party to submit to Comfy or the Comfy Products or otherwise use the Comfy Products to create: (i) any data, designs, or other materials subject to U.S. export control laws and regulations; (ii) any viruses, malware, ransomware, Trojan horses, worms, spyware, or other malicious or harmful code or content that could damage, disrupt, interfere with, or compromise the Comfy Products, Comfy’s systems or infrastructure, or the data or systems of any other user or third party; (iii) any Customer Data that depicts, promotes, or facilitates illegal activity, including without limitation child sexual abuse material, non-consensual intimate imagery, or content that incites violence or hatred against any individual or group; (iv) any Customer Data that infringes or misappropriates the intellectual property rights, privacy rights, or publicity rights of any third party, including without limitation by submitting models, images, or other materials without the right to do so; (v) any content or information that is intentionally deceptive or misleading, including without limitation synthetic media designed to impersonate a real individual without their consent; or (vi) any Customer Data that could reasonably be expected to cause harm to any individual or group.',
-    'zh-CN':
-      '<strong>Acceptable Use; Prohibited Customer Data.</strong> Customer is solely responsible for ensuring that all Input submitted to the Comfy Products complies with all Applicable Laws, and Customer agrees that it will not, and will not permit any third party to submit to Comfy or the Comfy Products or otherwise use the Comfy Products to create: (i) any data, designs, or other materials subject to U.S. export control laws and regulations; (ii) any viruses, malware, ransomware, Trojan horses, worms, spyware, or other malicious or harmful code or content that could damage, disrupt, interfere with, or compromise the Comfy Products, Comfy’s systems or infrastructure, or the data or systems of any other user or third party; (iii) any Customer Data that depicts, promotes, or facilitates illegal activity, including without limitation child sexual abuse material, non-consensual intimate imagery, or content that incites violence or hatred against any individual or group; (iv) any Customer Data that infringes or misappropriates the intellectual property rights, privacy rights, or publicity rights of any third party, including without limitation by submitting models, images, or other materials without the right to do so; (v) any content or information that is intentionally deceptive or misleading, including without limitation synthetic media designed to impersonate a real individual without their consent; or (vi) any Customer Data that could reasonably be expected to cause harm to any individual or group.'
-  },
-  'enterprise-msa.4-payment.label': {
-    en: 'PAYMENT',
-    'zh-CN': 'PAYMENT'
-  },
-  'enterprise-msa.4-payment.title': {
-    en: '4. Payment',
-    'zh-CN': '4. Payment'
-  },
-  'enterprise-msa.4-payment.block.0': {
-    en: '<strong>Fees.</strong> Customer will pay Comfy the fees set forth in the applicable Order Form. Customer shall pay those amounts due and not disputed in good faith within seven (7) days of the date of receipt of the applicable invoice, unless a specific date for payment is set forth in such Order Form, in which case payment will be due on the date specified. Except as otherwise specified herein or in any applicable Order Form, (a) fees are quoted and payable in United States dollars and (b) payment obligations are non-cancelable and non-pro-ratable for partial months, and fees paid are non-refundable. Comfy reserves the right to change its fees upon each renewal term. Customer is responsible for all usage under Customer’s account, including usage by Customer’s Users and under Customer’s credentials and API keys.',
-    'zh-CN':
-      '<strong>Fees.</strong> Customer will pay Comfy the fees set forth in the applicable Order Form. Customer shall pay those amounts due and not disputed in good faith within seven (7) days of the date of receipt of the applicable invoice, unless a specific date for payment is set forth in such Order Form, in which case payment will be due on the date specified. Except as otherwise specified herein or in any applicable Order Form, (a) fees are quoted and payable in United States dollars and (b) payment obligations are non-cancelable and non-pro-ratable for partial months, and fees paid are non-refundable. Comfy reserves the right to change its fees upon each renewal term. Customer is responsible for all usage under Customer’s account, including usage by Customer’s Users and under Customer’s credentials and API keys.'
-  },
-  'enterprise-msa.4-payment.block.1': {
-    en: '<strong>Prepaid Credits.</strong> Customer may prepay for usage credits (“Credits”) which may be applied toward usage of the Comfy Products at the rates set forth on Comfy’s pricing page. Except for documented billing errors or similar service issues attributed to Comfy, all purchases of Credits are final and non-refundable, and Comfy will not issue refunds or credits for any unused, partially used, or remaining Credits under any circumstances, including upon termination or expiration of Customer’s account. Comfy reserves the right to modify the pricing or Credit redemption rates applicable to future Credit purchases upon reasonable notice, but any Credits purchased prior to such modification will be honored at the rates in effect at the time of purchase.',
-    'zh-CN':
-      '<strong>Prepaid Credits.</strong> Customer may prepay for usage credits (“Credits”) which may be applied toward usage of the Comfy Products at the rates set forth on Comfy’s pricing page. Except for documented billing errors or similar service issues attributed to Comfy, all purchases of Credits are final and non-refundable, and Comfy will not issue refunds or credits for any unused, partially used, or remaining Credits under any circumstances, including upon termination or expiration of Customer’s account. Comfy reserves the right to modify the pricing or Credit redemption rates applicable to future Credit purchases upon reasonable notice, but any Credits purchased prior to such modification will be honored at the rates in effect at the time of purchase.'
-  },
-  'enterprise-msa.4-payment.block.2': {
-    en: '<strong>Taxes.</strong> Fees are exclusive of all taxes, duties, levies, and similar governmental assessments (including sales, use, VAT/GST, and withholding taxes), and Customer is responsible for all such amounts other than taxes based on Comfy’s net income; if withholding is required by law, Customer will gross up payments so Comfy receives the invoiced amount, unless prohibited by law.',
-    'zh-CN':
-      '<strong>Taxes.</strong> Fees are exclusive of all taxes, duties, levies, and similar governmental assessments (including sales, use, VAT/GST, and withholding taxes), and Customer is responsible for all such amounts other than taxes based on Comfy’s net income; if withholding is required by law, Customer will gross up payments so Comfy receives the invoiced amount, unless prohibited by law.'
-  },
-  'enterprise-msa.4-payment.block.3': {
-    en: '<strong>Late Payments; Suspension.</strong> Overdue undisputed amounts may accrue interest at the lesser of 1.5% per month or the maximum rate permitted by law, plus reasonable collection costs. Comfy may suspend or limit access to the Comfy Products (including throttling, disabling API keys, or downgrading to the Free Tier) for non-payment of undisputed amounts after providing commercially reasonable notice and an opportunity to cure, unless Comfy reasonably determines immediate suspension is necessary to protect the Comfy Products or comply with Applicable Laws.',
-    'zh-CN':
-      '<strong>Late Payments; Suspension.</strong> Overdue undisputed amounts may accrue interest at the lesser of 1.5% per month or the maximum rate permitted by law, plus reasonable collection costs. Comfy may suspend or limit access to the Comfy Products (including throttling, disabling API keys, or downgrading to the Free Tier) for non-payment of undisputed amounts after providing commercially reasonable notice and an opportunity to cure, unless Comfy reasonably determines immediate suspension is necessary to protect the Comfy Products or comply with Applicable Laws.'
-  },
-  'enterprise-msa.5-term-termination.label': {
-    en: 'TERM',
-    'zh-CN': 'TERM'
-  },
-  'enterprise-msa.5-term-termination.title': {
-    en: '5. Term; Termination',
-    'zh-CN': '5. Term; Termination'
-  },
-  'enterprise-msa.5-term-termination.block.0': {
-    en: '<strong>Term.</strong> The term of this Agreement will commence on the Effective Date and continue until terminated as set forth below (“Term”). The initial term of each Order Form will begin on the Subscription Start Date of such Order Form and will continue for the subscription term set forth therein. Except as set forth in such Order Form, the Order Form will renew for successive renewal terms equal to the length of the Initial Subscription Term.',
-    'zh-CN':
-      '<strong>Term.</strong> The term of this Agreement will commence on the Effective Date and continue until terminated as set forth below (“Term”). The initial term of each Order Form will begin on the Subscription Start Date of such Order Form and will continue for the subscription term set forth therein. Except as set forth in such Order Form, the Order Form will renew for successive renewal terms equal to the length of the Initial Subscription Term.'
-  },
-  'enterprise-msa.5-term-termination.block.1': {
-    en: '<strong>Termination of Agreement.</strong> Each party may terminate this Agreement upon written notice to the other party if there are no Order Forms then in effect. Each party may also terminate this Agreement or the applicable Order Form upon written notice in the event (a) the other party commits any material breach of this Agreement or the applicable Order Form and fails to remedy such breach within thirty (30) days after written notice of such breach or (b) subject to applicable law, upon the other party’s liquidation, commencement of dissolution proceedings or assignment of substantially all its assets for the benefit of creditors, or if the other party becomes the subject of bankruptcy or similar proceeding that is not dismissed within sixty (60) days.',
-    'zh-CN':
-      '<strong>Termination of Agreement.</strong> Each party may terminate this Agreement upon written notice to the other party if there are no Order Forms then in effect. Each party may also terminate this Agreement or the applicable Order Form upon written notice in the event (a) the other party commits any material breach of this Agreement or the applicable Order Form and fails to remedy such breach within thirty (30) days after written notice of such breach or (b) subject to applicable law, upon the other party’s liquidation, commencement of dissolution proceedings or assignment of substantially all its assets for the benefit of creditors, or if the other party becomes the subject of bankruptcy or similar proceeding that is not dismissed within sixty (60) days.'
-  },
-  'enterprise-msa.5-term-termination.block.2': {
-    en: '<strong>Deletion of Customer Data Upon Termination.</strong> Upon expiration or termination of this Agreement, Comfy will delete Customer Data from its primary production systems within sixty (60) days. Notwithstanding the foregoing, Customer Data may persist in routine backup systems beyond such period solely to the extent necessary under Comfy’s standard backup retention schedule, provided that such data is not actively accessed or used by Comfy and remains subject to the confidentiality obligations of this Agreement.',
-    'zh-CN':
-      '<strong>Deletion of Customer Data Upon Termination.</strong> Upon expiration or termination of this Agreement, Comfy will delete Customer Data from its primary production systems within sixty (60) days. Notwithstanding the foregoing, Customer Data may persist in routine backup systems beyond such period solely to the extent necessary under Comfy’s standard backup retention schedule, provided that such data is not actively accessed or used by Comfy and remains subject to the confidentiality obligations of this Agreement.'
-  },
-  'enterprise-msa.5-term-termination.block.3': {
-    en: '<strong>Survival.</strong> Termination or expiration will not affect any rights or obligations, including the payment of amounts due, which have accrued under this Agreement up to the date of termination or expiration. Upon termination or expiration of this Agreement, the provisions that are intended by their nature to survive termination will survive and continue in full force and effect in accordance with their terms, including confidentiality obligations, proprietary rights, indemnification, limitations of liability, and disclaimers.',
-    'zh-CN':
-      '<strong>Survival.</strong> Termination or expiration will not affect any rights or obligations, including the payment of amounts due, which have accrued under this Agreement up to the date of termination or expiration. Upon termination or expiration of this Agreement, the provisions that are intended by their nature to survive termination will survive and continue in full force and effect in accordance with their terms, including confidentiality obligations, proprietary rights, indemnification, limitations of liability, and disclaimers.'
-  },
-  'enterprise-msa.6-confidentiality.label': {
-    en: 'CONFIDENTIALITY',
-    'zh-CN': 'CONFIDENTIALITY'
-  },
-  'enterprise-msa.6-confidentiality.title': {
-    en: '6. Confidentiality',
-    'zh-CN': '6. Confidentiality'
-  },
-  'enterprise-msa.6-confidentiality.block.0': {
-    en: '<strong>Definition of Confidential Information.</strong> “Confidential Information” means all non-public information disclosed by a party (“Disclosing Party”) to the other party (“Receiving Party”), whether oral or written, that is designated as confidential or that reasonably should be understood to be confidential given the nature of the information and circumstances of disclosure. Confidential Information of Customer includes Customer Data; Confidential Information of Comfy includes the Comfy Products; and each party’s Confidential Information includes the terms of this Agreement and any Order Forms (including pricing), as well as business, financial, marketing, technical, and product information. Confidential Information excludes information that the Receiving Party can demonstrate: (i) is or becomes publicly available without breach; (ii) was known prior to disclosure without breach; (iii) is received from a third party without breach; or (iv) was independently developed without use of or reference to the Disclosing Party’s Confidential Information.',
-    'zh-CN':
-      '<strong>Definition of Confidential Information.</strong> “Confidential Information” means all non-public information disclosed by a party (“Disclosing Party”) to the other party (“Receiving Party”), whether oral or written, that is designated as confidential or that reasonably should be understood to be confidential given the nature of the information and circumstances of disclosure. Confidential Information of Customer includes Customer Data; Confidential Information of Comfy includes the Comfy Products; and each party’s Confidential Information includes the terms of this Agreement and any Order Forms (including pricing), as well as business, financial, marketing, technical, and product information. Confidential Information excludes information that the Receiving Party can demonstrate: (i) is or becomes publicly available without breach; (ii) was known prior to disclosure without breach; (iii) is received from a third party without breach; or (iv) was independently developed without use of or reference to the Disclosing Party’s Confidential Information.'
-  },
-  'enterprise-msa.6-confidentiality.block.1': {
-    en: '<strong>Protection of Confidential Information.</strong> The Receiving Party will: (a) protect Confidential Information using at least reasonable care; (b) use it solely to perform under this Agreement; and (c) limit access to its and its Affiliates’ employees and contractors with a need to know and confidentiality obligations at least as protective as those herein. Neither party may disclose the terms of this Agreement or any Order Form except to its Affiliates, legal counsel, or accountants, and remains responsible for their compliance. Upon written request, the Receiving Party will promptly return or destroy Confidential Information, except for information retained in routine backups or as required by law or internal retention policies.',
-    'zh-CN':
-      '<strong>Protection of Confidential Information.</strong> The Receiving Party will: (a) protect Confidential Information using at least reasonable care; (b) use it solely to perform under this Agreement; and (c) limit access to its and its Affiliates’ employees and contractors with a need to know and confidentiality obligations at least as protective as those herein. Neither party may disclose the terms of this Agreement or any Order Form except to its Affiliates, legal counsel, or accountants, and remains responsible for their compliance. Upon written request, the Receiving Party will promptly return or destroy Confidential Information, except for information retained in routine backups or as required by law or internal retention policies.'
-  },
-  'enterprise-msa.6-confidentiality.block.2': {
-    en: '<strong>Compelled Disclosure.</strong> The Receiving Party may disclose Confidential Information if legally required, provided it gives prior notice (where permitted) and reasonable assistance, at the Disclosing Party’s expense, to seek protective treatment. Any disclosure will be limited to what is legally required, and the Receiving Party will request confidential treatment. These obligations survive while Confidential Information remains in the Receiving Party’s possession.',
-    'zh-CN':
-      '<strong>Compelled Disclosure.</strong> The Receiving Party may disclose Confidential Information if legally required, provided it gives prior notice (where permitted) and reasonable assistance, at the Disclosing Party’s expense, to seek protective treatment. Any disclosure will be limited to what is legally required, and the Receiving Party will request confidential treatment. These obligations survive while Confidential Information remains in the Receiving Party’s possession.'
-  },
-  'enterprise-msa.6-confidentiality.block.3': {
-    en: '<strong>Data Security.</strong> Comfy will implement and maintain commercially reasonable administrative, technical, and physical safeguards designed to protect Customer Data against unauthorized access, disclosure, alteration, or destruction. These measures will be no less protective than those Comfy uses to protect its own confidential information of a similar nature. In the event Comfy becomes aware of a confirmed security breach that results in unauthorized access to or disclosure of Customer Data, Comfy will notify Customer without undue delay and will provide reasonable cooperation to assist Customer in investigating and mitigating the effects of such breach. Customer acknowledges that no security measures are perfect or impenetrable, and Comfy does not guarantee that Customer Data will be free from unauthorized access or disclosure.',
-    'zh-CN':
-      '<strong>Data Security.</strong> Comfy will implement and maintain commercially reasonable administrative, technical, and physical safeguards designed to protect Customer Data against unauthorized access, disclosure, alteration, or destruction. These measures will be no less protective than those Comfy uses to protect its own confidential information of a similar nature. In the event Comfy becomes aware of a confirmed security breach that results in unauthorized access to or disclosure of Customer Data, Comfy will notify Customer without undue delay and will provide reasonable cooperation to assist Customer in investigating and mitigating the effects of such breach. Customer acknowledges that no security measures are perfect or impenetrable, and Comfy does not guarantee that Customer Data will be free from unauthorized access or disclosure.'
-  },
-  'enterprise-msa.7-proprietary-rights.label': {
-    en: 'IP',
-    'zh-CN': 'IP'
-  },
-  'enterprise-msa.7-proprietary-rights.title': {
-    en: '7. Proprietary Rights',
-    'zh-CN': '7. Proprietary Rights'
-  },
-  'enterprise-msa.7-proprietary-rights.block.0': {
-    en: '<strong>Reservation of Rights.</strong> Comfy and its licensors retain all right, title, and interest, including all intellectual property and proprietary rights, in and to the Comfy Products, Comfy Branding, and all software, code, algorithms, protocols, interfaces, tools, documentation, data structures, and other technology underlying or embodied in, or used to provide, the Comfy Products (collectively, “Comfy Materials”). Except for the limited rights expressly granted to Customer under this Agreement, no rights or licenses are granted, whether by implication, estoppel, or otherwise. Comfy expressly reserves all rights in and to the Comfy Materials not expressly granted hereunder.',
-    'zh-CN':
-      '<strong>Reservation of Rights.</strong> Comfy and its licensors retain all right, title, and interest, including all intellectual property and proprietary rights, in and to the Comfy Products, Comfy Branding, and all software, code, algorithms, protocols, interfaces, tools, documentation, data structures, and other technology underlying or embodied in, or used to provide, the Comfy Products (collectively, “Comfy Materials”). Except for the limited rights expressly granted to Customer under this Agreement, no rights or licenses are granted, whether by implication, estoppel, or otherwise. Comfy expressly reserves all rights in and to the Comfy Materials not expressly granted hereunder.'
-  },
-  'enterprise-msa.7-proprietary-rights.block.1': {
-    en: '<strong>Feedback.</strong> Customer may from time to time provide feedback (including suggestions, comments for enhancements, functionality or usability, etc.) (“Feedback”) to Comfy regarding Customer’s experience using, and needs and integration requirements for, the Comfy Products. Comfy shall have full discretion to determine whether or not to proceed with the development of any requested enhancements, new features or functionality, and Customer hereby grants Comfy the full, unencumbered, royalty-free right to incorporate and otherwise fully exploit Feedback in connection with Comfy’s products and services.',
-    'zh-CN':
-      '<strong>Feedback.</strong> Customer may from time to time provide feedback (including suggestions, comments for enhancements, functionality or usability, etc.) (“Feedback”) to Comfy regarding Customer’s experience using, and needs and integration requirements for, the Comfy Products. Comfy shall have full discretion to determine whether or not to proceed with the development of any requested enhancements, new features or functionality, and Customer hereby grants Comfy the full, unencumbered, royalty-free right to incorporate and otherwise fully exploit Feedback in connection with Comfy’s products and services.'
-  },
-  'enterprise-msa.7-proprietary-rights.block.2': {
-    en: '<strong>Operational Metadata.</strong> Customer agrees that Comfy may collect and use Operational Metadata to operate, maintain, improve, and support the Comfy Products, including for diagnostics, analytics, system performance, and reporting purposes. Comfy will only disclose Operational Metadata externally if such data is (a) aggregated or anonymized with data across other customers, and (b) does not disclose the identity of Customer or any Customer Confidential Information.',
-    'zh-CN':
-      '<strong>Operational Metadata.</strong> Customer agrees that Comfy may collect and use Operational Metadata to operate, maintain, improve, and support the Comfy Products, including for diagnostics, analytics, system performance, and reporting purposes. Comfy will only disclose Operational Metadata externally if such data is (a) aggregated or anonymized with data across other customers, and (b) does not disclose the identity of Customer or any Customer Confidential Information.'
-  },
-  'enterprise-msa.8-warranties-disclaimer.label': {
-    en: 'WARRANTIES',
-    'zh-CN': 'WARRANTIES'
-  },
-  'enterprise-msa.8-warranties-disclaimer.title': {
-    en: '8. Warranties; Disclaimer',
-    'zh-CN': '8. Warranties; Disclaimer'
-  },
-  'enterprise-msa.8-warranties-disclaimer.block.0': {
-    en: '<strong>Comfy.</strong> Comfy warrants that it will, consistent with prevailing industry standards, provide the Comfy Products in a professional and workmanlike manner and the Comfy Products will conform in all material respects with the Documentation. For material breach of the foregoing express warranty, Customer’s exclusive remedy shall be the re-performance of the deficient Comfy Products or, if Comfy cannot re-perform such deficient Comfy Products as warranted within thirty (30) days after receipt of written notice of the warranty breach, Customer shall be entitled to terminate the applicable Order Form and recover a pro-rata portion of the prepaid subscription fees corresponding to the terminated portion of the applicable subscription term.',
-    'zh-CN':
-      '<strong>Comfy.</strong> Comfy warrants that it will, consistent with prevailing industry standards, provide the Comfy Products in a professional and workmanlike manner and the Comfy Products will conform in all material respects with the Documentation. For material breach of the foregoing express warranty, Customer’s exclusive remedy shall be the re-performance of the deficient Comfy Products or, if Comfy cannot re-perform such deficient Comfy Products as warranted within thirty (30) days after receipt of written notice of the warranty breach, Customer shall be entitled to terminate the applicable Order Form and recover a pro-rata portion of the prepaid subscription fees corresponding to the terminated portion of the applicable subscription term.'
-  },
-  'enterprise-msa.8-warranties-disclaimer.block.1': {
-    en: '<strong>Customer.</strong> Customer represents and warrants that it owns or has obtained all necessary rights, licenses, and permissions to submit Customer Data to the Comfy Products, and that Customer Data does not include any content that Customer is legally prohibited from sharing or processing through the Comfy Products.',
-    'zh-CN':
-      '<strong>Customer.</strong> Customer represents and warrants that it owns or has obtained all necessary rights, licenses, and permissions to submit Customer Data to the Comfy Products, and that Customer Data does not include any content that Customer is legally prohibited from sharing or processing through the Comfy Products.'
-  },
-  'enterprise-msa.8-warranties-disclaimer.block.2': {
-    en: '<strong>Disclaimer.</strong> EXCEPT AS SET FORTH HEREIN, THE COMFY PRODUCTS AND OUTPUT ARE PROVIDED “AS IS” WITHOUT ANY WARRANTY OF ANY KIND. COMFY DISCLAIMS ANY AND ALL WARRANTIES, REPRESENTATIONS, AND CONDITIONS RELATING TO THE COMFY PRODUCTS (INCLUDING ANY OUTPUT), WHETHER EXPRESS, IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY REPRESENTATION, WARRANTY, OR CONDITION OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. CUSTOMER AGREES AND ACKNOWLEDGES THAT CUSTOMER’S USE OF ANY OUTPUT PROVIDED BY THE COMFY PRODUCTS IS AT CUSTOMER’S OWN RISK. Customer is solely responsible for (a) verifying the Output is appropriate for Customer’s use case, and (b) any decisions, actions, or omissions taken in reliance on the OUTPUT. IN NO EVENT WILL COMFY BE LIABLE FOR ANY DAMAGES OR LOSSES ARISING FROM OR RELATED TO CUSTOMER’S USE OF OR RELIANCE ON THE OUTPUT, INCLUDING ANY DECISIONS MADE OR ACTIONS TAKEN BASED ON THE OUTPUT.',
-    'zh-CN':
-      '<strong>Disclaimer.</strong> EXCEPT AS SET FORTH HEREIN, THE COMFY PRODUCTS AND OUTPUT ARE PROVIDED “AS IS” WITHOUT ANY WARRANTY OF ANY KIND. COMFY DISCLAIMS ANY AND ALL WARRANTIES, REPRESENTATIONS, AND CONDITIONS RELATING TO THE COMFY PRODUCTS (INCLUDING ANY OUTPUT), WHETHER EXPRESS, IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY REPRESENTATION, WARRANTY, OR CONDITION OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. CUSTOMER AGREES AND ACKNOWLEDGES THAT CUSTOMER’S USE OF ANY OUTPUT PROVIDED BY THE COMFY PRODUCTS IS AT CUSTOMER’S OWN RISK. Customer is solely responsible for (a) verifying the Output is appropriate for Customer’s use case, and (b) any decisions, actions, or omissions taken in reliance on the OUTPUT. IN NO EVENT WILL COMFY BE LIABLE FOR ANY DAMAGES OR LOSSES ARISING FROM OR RELATED TO CUSTOMER’S USE OF OR RELIANCE ON THE OUTPUT, INCLUDING ANY DECISIONS MADE OR ACTIONS TAKEN BASED ON THE OUTPUT.'
-  },
-  'enterprise-msa.9-limitation-of-liability.label': {
-    en: 'LIABILITY',
-    'zh-CN': 'LIABILITY'
-  },
-  'enterprise-msa.9-limitation-of-liability.title': {
-    en: '9. Limitation of Liability',
-    'zh-CN': '9. Limitation of Liability'
-  },
-  'enterprise-msa.9-limitation-of-liability.block.0': {
-    en: 'UNDER NO LEGAL THEORY, WHETHER IN TORT, CONTRACT, OR OTHERWISE, WILL EITHER PARTY BE LIABLE TO THE OTHER UNDER THIS AGREEMENT FOR (A) ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES OF ANY CHARACTER, INCLUDING DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOST SALES OR BUSINESS, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, LOST CONTENT OR DATA, EVEN IF A REPRESENTATIVE OF SUCH PARTY HAS BEEN ADVISED, KNEW OR SHOULD HAVE KNOWN OF THE POSSIBILITY OF SUCH DAMAGES, OR (B) EXCLUDING CUSTOMER’S PAYMENT OBLIGATIONS, ANY AGGREGATE DAMAGES, COSTS, OR LIABILITIES IN EXCESS OF THE AMOUNTS PAID BY CUSTOMER UNDER THE APPLICABLE ORDER FORM DURING THE TWELVE (12) MONTHS PRECEDING THE CLAIM.',
-    'zh-CN':
-      'UNDER NO LEGAL THEORY, WHETHER IN TORT, CONTRACT, OR OTHERWISE, WILL EITHER PARTY BE LIABLE TO THE OTHER UNDER THIS AGREEMENT FOR (A) ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES OF ANY CHARACTER, INCLUDING DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOST SALES OR BUSINESS, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, LOST CONTENT OR DATA, EVEN IF A REPRESENTATIVE OF SUCH PARTY HAS BEEN ADVISED, KNEW OR SHOULD HAVE KNOWN OF THE POSSIBILITY OF SUCH DAMAGES, OR (B) EXCLUDING CUSTOMER’S PAYMENT OBLIGATIONS, ANY AGGREGATE DAMAGES, COSTS, OR LIABILITIES IN EXCESS OF THE AMOUNTS PAID BY CUSTOMER UNDER THE APPLICABLE ORDER FORM DURING THE TWELVE (12) MONTHS PRECEDING THE CLAIM.'
-  },
-  'enterprise-msa.10-indemnification.label': {
-    en: 'INDEMNITY',
-    'zh-CN': 'INDEMNITY'
-  },
-  'enterprise-msa.10-indemnification.title': {
-    en: '10. Indemnification',
-    'zh-CN': '10. Indemnification'
-  },
-  'enterprise-msa.10-indemnification.block.0': {
-    en: '<strong>Indemnity by Comfy.</strong> Comfy will defend Customer against any claim, demand, suit, or proceeding (“Claim”) made or brought against Customer by a third party alleging that the Comfy Products as provided by Comfy infringes or misappropriates a U.S. patent, copyright or trade secret and will indemnify Customer for any damages finally awarded against Customer (or any settlement approved by Comfy) in connection with any such Claim; provided that (a) Customer will promptly notify Comfy of such Claim, (b) Comfy will have the sole and exclusive authority to defend and/or settle any such Claim (provided that Comfy may not settle any Claim without Customer’s prior written consent, which will not be unreasonably withheld, unless it unconditionally releases Customer of all related liability) and (c) Customer reasonably cooperates with Comfy in connection therewith. If the use of the Comfy Products by Customer has become, or in Comfy’s opinion is likely to become, the subject of any claim of infringement, Comfy may at its option and expense (i) procure for Customer the right to continue using and receiving the Comfy Products as set forth hereunder; (ii) replace or modify the Comfy Products to make it non-infringing (with comparable functionality); or (iii) if the options in clauses (i) or (ii) are not reasonably practicable, terminate the applicable Order Form and provide a pro rata refund of any prepaid subscription fees corresponding to the terminated portion of the applicable subscription term. Comfy will have no liability or obligation with respect to any Claim to the extent such Claim is caused by (A) prompts, inputs, or other instructions or materials submitted by Customer or its Users; (B) Customer’s use of any outputs, generated content, or models in a manner not authorized under this Agreement; (C) modification of any generated outputs by or on behalf of Customer; (D) Customer Data, including any third-party intellectual property, likenesses, or other proprietary material incorporated therein; or (E) Customer’s failure to obtain rights, consents, or clearances required for the submission or use of any content through the Comfy Products (clauses (A) through (E), “Excluded Claims”). This Section states Comfy’s sole and exclusive liability and obligation, and Customer’s exclusive remedy, for any claim of any nature related to infringement or misappropriation of intellectual property.',
-    'zh-CN':
-      '<strong>Indemnity by Comfy.</strong> Comfy will defend Customer against any claim, demand, suit, or proceeding (“Claim”) made or brought against Customer by a third party alleging that the Comfy Products as provided by Comfy infringes or misappropriates a U.S. patent, copyright or trade secret and will indemnify Customer for any damages finally awarded against Customer (or any settlement approved by Comfy) in connection with any such Claim; provided that (a) Customer will promptly notify Comfy of such Claim, (b) Comfy will have the sole and exclusive authority to defend and/or settle any such Claim (provided that Comfy may not settle any Claim without Customer’s prior written consent, which will not be unreasonably withheld, unless it unconditionally releases Customer of all related liability) and (c) Customer reasonably cooperates with Comfy in connection therewith. If the use of the Comfy Products by Customer has become, or in Comfy’s opinion is likely to become, the subject of any claim of infringement, Comfy may at its option and expense (i) procure for Customer the right to continue using and receiving the Comfy Products as set forth hereunder; (ii) replace or modify the Comfy Products to make it non-infringing (with comparable functionality); or (iii) if the options in clauses (i) or (ii) are not reasonably practicable, terminate the applicable Order Form and provide a pro rata refund of any prepaid subscription fees corresponding to the terminated portion of the applicable subscription term. Comfy will have no liability or obligation with respect to any Claim to the extent such Claim is caused by (A) prompts, inputs, or other instructions or materials submitted by Customer or its Users; (B) Customer’s use of any outputs, generated content, or models in a manner not authorized under this Agreement; (C) modification of any generated outputs by or on behalf of Customer; (D) Customer Data, including any third-party intellectual property, likenesses, or other proprietary material incorporated therein; or (E) Customer’s failure to obtain rights, consents, or clearances required for the submission or use of any content through the Comfy Products (clauses (A) through (E), “Excluded Claims”). This Section states Comfy’s sole and exclusive liability and obligation, and Customer’s exclusive remedy, for any claim of any nature related to infringement or misappropriation of intellectual property.'
-  },
-  'enterprise-msa.10-indemnification.block.1': {
-    en: '<strong>Indemnification by Customer.</strong> Customer will defend Comfy against any Claim made or brought against Comfy by a third party to the extent arising out of Customer’s breach of Section 3 or the Excluded Claims, and Customer will indemnify Comfy for any damages finally awarded against Comfy (or any settlement approved by Customer) in connection with any such Claim; provided that (a) Comfy will promptly notify Customer of such Claim, (b) Customer will have the sole and exclusive authority to defend and/or settle any such Claim (provided that Customer may not settle any Claim without Comfy’s prior written consent, which will not be unreasonably withheld, unless it unconditionally releases Comfy of all liability) and (c) Comfy reasonably cooperates with Customer in connection therewith.',
-    'zh-CN':
-      '<strong>Indemnification by Customer.</strong> Customer will defend Comfy against any Claim made or brought against Comfy by a third party to the extent arising out of Customer’s breach of Section 3 or the Excluded Claims, and Customer will indemnify Comfy for any damages finally awarded against Comfy (or any settlement approved by Customer) in connection with any such Claim; provided that (a) Comfy will promptly notify Customer of such Claim, (b) Customer will have the sole and exclusive authority to defend and/or settle any such Claim (provided that Customer may not settle any Claim without Comfy’s prior written consent, which will not be unreasonably withheld, unless it unconditionally releases Comfy of all liability) and (c) Comfy reasonably cooperates with Customer in connection therewith.'
-  },
-  'enterprise-msa.11-miscellaneous.label': {
-    en: 'MISCELLANEOUS',
-    'zh-CN': 'MISCELLANEOUS'
-  },
-  'enterprise-msa.11-miscellaneous.title': {
-    en: '11. Miscellaneous',
-    'zh-CN': '11. Miscellaneous'
-  },
-  'enterprise-msa.11-miscellaneous.block.0': {
-    en: '<strong>Governing Law.</strong> This Agreement will be governed by the laws of the State of California, exclusive of its rules governing choice of law and conflict of laws. The parties agree to the exclusive jurisdiction and venue of the state and federal courts located in San Francisco, CA and each party irrevocably submits to such jurisdiction and venue and waives any objection based on inconvenient forum. This Agreement will not be governed by the United Nations Convention on Contracts for the International Sale of Goods.',
-    'zh-CN':
-      '<strong>Governing Law.</strong> This Agreement will be governed by the laws of the State of California, exclusive of its rules governing choice of law and conflict of laws. The parties agree to the exclusive jurisdiction and venue of the state and federal courts located in San Francisco, CA and each party irrevocably submits to such jurisdiction and venue and waives any objection based on inconvenient forum. This Agreement will not be governed by the United Nations Convention on Contracts for the International Sale of Goods.'
-  },
-  'enterprise-msa.11-miscellaneous.block.1': {
-    en: '<strong>Export Compliance.</strong> Customer will comply with the export laws and regulations of the United States, the European Union and other applicable jurisdictions in using the Comfy Products.',
-    'zh-CN':
-      '<strong>Export Compliance.</strong> Customer will comply with the export laws and regulations of the United States, the European Union and other applicable jurisdictions in using the Comfy Products.'
-  },
-  'enterprise-msa.11-miscellaneous.block.2': {
-    en: '<strong>Publicity.</strong> Customer agrees that Comfy may refer to Customer’s name, logo, and trademarks in Comfy’s marketing materials and website; however, Comfy will not use Customer’s name or trademarks in any other publicity (e.g., press releases, customer references and case studies) without Customer’s prior written consent (which may be by email) not to be unreasonably withheld, conditioned, or delayed.',
-    'zh-CN':
-      '<strong>Publicity.</strong> Customer agrees that Comfy may refer to Customer’s name, logo, and trademarks in Comfy’s marketing materials and website; however, Comfy will not use Customer’s name or trademarks in any other publicity (e.g., press releases, customer references and case studies) without Customer’s prior written consent (which may be by email) not to be unreasonably withheld, conditioned, or delayed.'
-  },
-  'enterprise-msa.11-miscellaneous.block.3': {
-    en: '<strong>Third-Party Infrastructure.</strong> Customer acknowledges that the Comfy Products relies on third-party infrastructure, hardware, and services, including cloud computing providers and GPU infrastructure providers (collectively, “Third-Party Infrastructure”), and that the availability, performance, and security of the Comfy Products may be affected by the operation, maintenance, or failure of such Third-Party Infrastructure. Comfy will use commercially reasonable efforts to maintain Comfy Products availability but makes no representation or warranty regarding the performance or availability of any Third-Party Infrastructure, and Comfy shall have no liability to Customer for any interruption, degradation, loss of data, or other harm arising out of or related to any failure, outage, or limitation of Third-Party Infrastructure, whether or not within Comfy’s control.',
-    'zh-CN':
-      '<strong>Third-Party Infrastructure.</strong> Customer acknowledges that the Comfy Products relies on third-party infrastructure, hardware, and services, including cloud computing providers and GPU infrastructure providers (collectively, “Third-Party Infrastructure”), and that the availability, performance, and security of the Comfy Products may be affected by the operation, maintenance, or failure of such Third-Party Infrastructure. Comfy will use commercially reasonable efforts to maintain Comfy Products availability but makes no representation or warranty regarding the performance or availability of any Third-Party Infrastructure, and Comfy shall have no liability to Customer for any interruption, degradation, loss of data, or other harm arising out of or related to any failure, outage, or limitation of Third-Party Infrastructure, whether or not within Comfy’s control.'
-  },
-  'enterprise-msa.11-miscellaneous.block.4': {
-    en: '<strong>Assignment; Delegation.</strong> Neither party hereto may assign or otherwise transfer this Agreement, in whole or in part, without the other party’s prior written consent, except that Comfy may assign this Agreement without consent to a successor to all or substantially all of its assets or business related to this Agreement. Any attempted assignment, delegation, or transfer by either party in violation hereof will be null and void. Subject to the foregoing, this Agreement will be binding on the parties and their successors and assigns.',
-    'zh-CN':
-      '<strong>Assignment; Delegation.</strong> Neither party hereto may assign or otherwise transfer this Agreement, in whole or in part, without the other party’s prior written consent, except that Comfy may assign this Agreement without consent to a successor to all or substantially all of its assets or business related to this Agreement. Any attempted assignment, delegation, or transfer by either party in violation hereof will be null and void. Subject to the foregoing, this Agreement will be binding on the parties and their successors and assigns.'
-  },
-  'enterprise-msa.11-miscellaneous.block.5': {
-    en: '<strong>Amendment; Waiver.</strong> No amendment or modification to this Agreement, nor any waiver of any rights hereunder, will be effective unless assented to in writing by both parties. Any such waiver will be only to the specific provision and under the specific circumstances for which it was given and will not apply with respect to any repeated or continued violation of the same provision or any other provision. Failure or delay by either party to enforce any provision of this Agreement will not be deemed a waiver of future enforcement of that or any other provision.',
-    'zh-CN':
-      '<strong>Amendment; Waiver.</strong> No amendment or modification to this Agreement, nor any waiver of any rights hereunder, will be effective unless assented to in writing by both parties. Any such waiver will be only to the specific provision and under the specific circumstances for which it was given and will not apply with respect to any repeated or continued violation of the same provision or any other provision. Failure or delay by either party to enforce any provision of this Agreement will not be deemed a waiver of future enforcement of that or any other provision.'
-  },
-  'enterprise-msa.11-miscellaneous.block.6': {
-    en: '<strong>Relationship.</strong> Nothing contained herein will in any way constitute any association, partnership, agency, employment or joint venture between the parties hereto, or be construed to evidence the intention of the parties to establish any such relationship. Neither party will have the authority to obligate or bind the other in any manner, and nothing herein contained will give rise to, or is intended to give rise to any rights of any kind in favor of any third parties.',
-    'zh-CN':
-      '<strong>Relationship.</strong> Nothing contained herein will in any way constitute any association, partnership, agency, employment or joint venture between the parties hereto, or be construed to evidence the intention of the parties to establish any such relationship. Neither party will have the authority to obligate or bind the other in any manner, and nothing herein contained will give rise to, or is intended to give rise to any rights of any kind in favor of any third parties.'
-  },
-  'enterprise-msa.11-miscellaneous.block.7': {
-    en: '<strong>Unenforceability.</strong> If a court of competent jurisdiction determines that any provision of this Agreement is invalid, illegal, or otherwise unenforceable, such provision will be enforced as nearly as possible in accordance with the stated intention of the parties, while the remainder of this Agreement will remain in full force and effect and bind the parties according to its terms.',
-    'zh-CN':
-      '<strong>Unenforceability.</strong> If a court of competent jurisdiction determines that any provision of this Agreement is invalid, illegal, or otherwise unenforceable, such provision will be enforced as nearly as possible in accordance with the stated intention of the parties, while the remainder of this Agreement will remain in full force and effect and bind the parties according to its terms.'
-  },
-  'enterprise-msa.11-miscellaneous.block.8': {
-    en: '<strong>Notices.</strong> Any notice required or permitted to be given hereunder will be given in writing by personal delivery, certified mail, return receipt requested, or by overnight delivery. Notices to the parties must be sent to the respective address set forth in the signature blocks below, or such other address designated pursuant to this Section.',
-    'zh-CN':
-      '<strong>Notices.</strong> Any notice required or permitted to be given hereunder will be given in writing by personal delivery, certified mail, return receipt requested, or by overnight delivery. Notices to the parties must be sent to the respective address set forth in the signature blocks below, or such other address designated pursuant to this Section.'
-  },
-  'enterprise-msa.11-miscellaneous.block.9': {
-    en: '<strong>Force Majeure.</strong> Neither party will be deemed in breach hereunder for any cessation, interruption or delay in the performance of its obligations due to causes beyond its reasonable control, including earthquake, flood, or other natural disaster, act of God, labor controversy, civil disturbance, terrorism, war (whether or not officially declared), cyber attacks (e.g., denial of service attacks), or the inability to obtain sufficient supplies, transportation, or other essential commodity or service required in the conduct of its business, or any change in or the adoption of any law, regulation, judgment or decree for which the party could not reasonably prepare mitigation in advance.',
-    'zh-CN':
-      '<strong>Force Majeure.</strong> Neither party will be deemed in breach hereunder for any cessation, interruption or delay in the performance of its obligations due to causes beyond its reasonable control, including earthquake, flood, or other natural disaster, act of God, labor controversy, civil disturbance, terrorism, war (whether or not officially declared), cyber attacks (e.g., denial of service attacks), or the inability to obtain sufficient supplies, transportation, or other essential commodity or service required in the conduct of its business, or any change in or the adoption of any law, regulation, judgment or decree for which the party could not reasonably prepare mitigation in advance.'
-  },
-  'enterprise-msa.11-miscellaneous.block.10': {
-    en: '<strong>Entire Agreement.</strong> This Agreement comprises the entire agreement between Customer and Comfy with respect to its subject matter, and supersedes all prior and contemporaneous proposals, statements, sales materials or presentations and agreements (oral and written). No oral or written information or advice given by Comfy, its agents or employees will create a warranty or in any way increase the scope of the warranties in this Agreement.',
-    'zh-CN':
-      '<strong>Entire Agreement.</strong> This Agreement comprises the entire agreement between Customer and Comfy with respect to its subject matter, and supersedes all prior and contemporaneous proposals, statements, sales materials or presentations and agreements (oral and written). No oral or written information or advice given by Comfy, its agents or employees will create a warranty or in any way increase the scope of the warranties in this Agreement.'
-  },
-  'enterprise-msa.12-exhibit-a.label': {
-    en: 'EXHIBIT A',
-    'zh-CN': 'EXHIBIT A'
-  },
-  'enterprise-msa.12-exhibit-a.title': {
-    en: 'Exhibit A. Order Form',
-    'zh-CN': 'Exhibit A. Order Form'
-  },
-  'enterprise-msa.12-exhibit-a.block.0': {
-    en: 'The initial Order Form is attached as <strong>Exhibit A</strong> to the executed copy of this Agreement. Each Order Form is subject to the terms and conditions of this Agreement, and by executing an Order Form, Customer agrees to be bound by the terms and conditions of this Agreement.',
-    'zh-CN':
-      'The initial Order Form is attached as <strong>Exhibit A</strong> to the executed copy of this Agreement. Each Order Form is subject to the terms and conditions of this Agreement, and by executing an Order Form, Customer agrees to be bound by the terms and conditions of this Agreement.'
-  },
-  'enterprise-msa.12-exhibit-a.block.1': {
-    en: 'This document reproduces the current template of the Enterprise Customer Agreement for reference only. The executed Agreement between Comfy and Customer, together with any signed Order Forms, governs the relationship between the parties. To request an executable copy, please contact <a href="mailto:sales@comfy.org" class="text-white underline">sales@comfy.org</a>.',
-    'zh-CN':
-      'This document reproduces the current template of the Enterprise Customer Agreement for reference only. The executed Agreement between Comfy and Customer, together with any signed Order Forms, governs the relationship between the parties. To request an executable copy, please contact <a href="mailto:sales@comfy.org" class="text-white underline">sales@comfy.org</a>.'
-  },
-  'enterprise-msa.page.title': {
-    en: 'Enterprise MSA — Comfy',
-    'zh-CN': 'Enterprise MSA — Comfy'
-  },
-  'enterprise-msa.page.description': {
-    en: 'Comfy Enterprise Customer Agreement — the master services agreement that governs Comfy Enterprise deployments of Comfy Cloud, Comfy API, and related products.',
-    'zh-CN':
-      'Comfy Enterprise Customer Agreement — the master services agreement that governs Comfy Enterprise deployments of Comfy Cloud, Comfy API, and related products.'
-  },
-  'enterprise-msa.page.heading': {
-    en: 'Enterprise Customer Agreement',
-    'zh-CN': 'Enterprise Customer Agreement'
-  },
-  'enterprise-msa.page.tocLabel': {
-    en: 'On this page',
-    'zh-CN': 'On this page'
-  },
-  'enterprise-msa.page.effectiveDateLabel': {
-    en: 'Effective Date',
-    'zh-CN': 'Effective Date'
-  },
-  'enterprise-msa.page.parties': {
-    en: 'This Enterprise Customer Agreement (the “Agreement”) is entered into by and between Comfy Organization, Inc., a Delaware corporation (“Comfy”), and the entity identified on the applicable Order Form (“Customer”), and is effective as of the date set forth on the applicable Order Form (the “Effective Date”).',
-    'zh-CN':
-      'This Enterprise Customer Agreement (the “Agreement”) is entered into by and between Comfy Organization, Inc., a Delaware corporation (“Comfy”), and the entity identified on the applicable Order Form (“Customer”), and is effective as of the date set forth on the applicable Order Form (the “Effective Date”).'
-  },
-  'footer.enterpriseMsa': {
-    en: 'Enterprise MSA',
-    'zh-CN': 'Enterprise MSA'
-  },
-
   // Customers page
   'customers.hero.label': {
     en: 'CUSTOMER STORIES',
@@ -4416,12 +3979,12 @@ const translations = {
   // Launches page (/launches) — subscribe banner
   // zh-CN strings pending native review (see apps/website/.scratch/drops-page/PRD.md)
   'launches.banner.text': {
-    en: 'Now turn your agent into a creative technologist.',
-    'zh-CN': '现在，让你的智能体成为创意技术专家。'
+    en: 'Join the live stream. Get answers in real time.',
+    'zh-CN': '加入直播，实时获得解答。'
   },
   'launches.banner.cta': {
-    en: 'Start Comfy MCP',
-    'zh-CN': '启动 Comfy MCP'
+    en: 'Join livestream',
+    'zh-CN': '加入直播'
   },
 
   // Launches page (/launches) — closing CTA

apps/website/src/layouts/BaseLayout.astro

@@ -5,15 +5,6 @@ import '../styles/global.css'
 import type { Locale } from '../i18n/translations'
 import SiteFooter from '../components/common/SiteFooter.vue'
 import HeaderMain from '../components/common/HeaderMain/HeaderMain.vue'
-import AnnouncementBanner from '../templates/drops/AnnouncementBanner.vue'
-import { bannerConfig, getBannerData } from '../config/banner'
-import { isHrefActive } from '../composables/useCurrentPath'
-import {
-  BANNER_DISMISS_ATTR,
-  BANNER_STORAGE_KEY,
-  createBannerVersion,
-  evaluateBannerVisibility
-} from '../utils/banner'
 import { escapeJsonLd } from '../utils/escapeJsonLd'
 import { fetchGitHubStars, formatStarCount } from '../utils/github'
 
@@ -43,18 +34,6 @@ const locale: Locale = rawLocale === 'zh-CN' ? 'zh-CN' : 'en'
 const rawStars = await fetchGitHubStars('Comfy-Org', 'ComfyUI')
 const githubStars = rawStars ? formatStarCount(rawStars) : ''
 
-// Announcement banner — build-time visibility gate + content-hash version key.
-// A promo never advertises the page you are already on, so the banner is
-// suppressed when its CTA points at the current path.
-const bannerData = getBannerData(bannerConfig, locale)
-const bannerVisible =
-  evaluateBannerVisibility(bannerConfig, {
-    currentLocale: locale,
-    currentSection: 'sitewide',
-    now: new Date(),
-  }) && !isHrefActive(bannerData.link?.href ?? '', Astro.url.pathname)
-const bannerVersion = createBannerVersion(bannerData, locale)
-
 const gtmId = 'GTM-NP9JM6K7'
 const gtmEnabled = import.meta.env.PROD
 
@@ -145,25 +124,6 @@ const websiteJsonLd = {
 
     <ClientRouter />
     <slot name="head" />
-
-    <!-- Hide an already-dismissed announcement banner before first paint (no flash/shift). -->
-    {bannerVisible && (
-      <script
-        is:inline
-        define:vars={{
-          bannerVersion,
-          storageKey: BANNER_STORAGE_KEY,
-          dismissAttr: BANNER_DISMISS_ATTR
-        }}
-      >
-        try {
-          const dismissed = JSON.parse(localStorage.getItem(storageKey) || '{}')
-          if (dismissed[bannerVersion]) {
-            document.documentElement.setAttribute(dismissAttr, '')
-          }
-        } catch (e) {}
-      </script>
-    )}
   </head>
   <body class="bg-primary-comfy-ink text-white font-formula antialiased overflow-x-clip">
     {gtmEnabled && (
@@ -177,16 +137,8 @@ const websiteJsonLd = {
       </noscript>
     )}
 
-    {bannerVisible && (
-      <AnnouncementBanner
-        data={bannerData}
-        version={bannerVersion}
-        locale={locale}
-        client:load
-      />
-    )}
     <HeaderMain locale={locale} github-stars={githubStars} client:load />
-    <main>
+    <main class="mt-20 lg:mt-32">
       <slot />
     </main>
     <SiteFooter locale={locale} client:load />

apps/website/src/pages/enterprise-msa.astro

@@ -1,36 +0,0 @@
----
-// Enterprise Customer Agreement (Enterprise MSA) — English only, by design.
-// Legal-reviewed copy must not be served under a localized route until legal
-// explicitly approves a translation; rendering an unreviewed translation as
-// the active MSA exposes us to liability from the translation diverging from
-// the approved English source. See the matching comment in
-// src/i18n/translations.ts for the i18n block, and the entry in
-// LOCALE_INVARIANT_ROUTE_KEYS in src/config/routes.ts.
-import BaseLayout from '../layouts/BaseLayout.astro'
-import HeroSection from '../components/legal/HeroSection.vue'
-import LegalContentSection from '../components/legal/LegalContentSection.vue'
-import { t } from '../i18n/translations'
----
-
-<BaseLayout
-  title={t('enterprise-msa.page.title')}
-  description={t('enterprise-msa.page.description')}
->
-  <HeroSection title={t('enterprise-msa.page.heading')} />
-  <p class="text-primary-warm-gray mt-2 text-center text-sm">
-    {t('enterprise-msa.page.effectiveDateLabel')}: {
-      t('enterprise-msa.effective-date')
-    }
-  </p>
-  <p
-    class="text-primary-comfy-canvas mx-auto mt-8 max-w-3xl px-4 text-center text-sm/relaxed lg:px-0"
-  >
-    {t('enterprise-msa.page.parties')}
-  </p>
-  <LegalContentSection
-    prefix="enterprise-msa"
-    locale="en"
-    tocLabelKey="enterprise-msa.page.tocLabel"
-    client:load
-  />
-</BaseLayout>

apps/website/src/pages/launches.astro

@@ -3,6 +3,7 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 import CtaSection from '../templates/drops/CtaSection.vue'
 import DropsSection from '../templates/drops/DropsSection.vue'
 import HeroSection from '../templates/drops/HeroSection.vue'
+import SubscribeBanner from '../templates/drops/SubscribeBanner.vue'
 import { t } from '../i18n/translations'
 
 const locale = 'en' as const
@@ -12,6 +13,7 @@ const locale = 'en' as const
   title={t('launches.page.title', locale)}
   description={t('launches.page.description', locale)}
 >
+  <SubscribeBanner locale={locale} client:load />
   <HeroSection locale={locale} client:load />
   <DropsSection locale={locale} />
   <CtaSection locale={locale} />

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

@@ -3,6 +3,7 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
 import CtaSection from '../../templates/drops/CtaSection.vue'
 import DropsSection from '../../templates/drops/DropsSection.vue'
 import HeroSection from '../../templates/drops/HeroSection.vue'
+import SubscribeBanner from '../../templates/drops/SubscribeBanner.vue'
 import { t } from '../../i18n/translations'
 
 const locale = 'zh-CN' as const
@@ -12,6 +13,7 @@ const locale = 'zh-CN' as const
   title={t('launches.page.title', locale)}
   description={t('launches.page.description', locale)}
 >
+  <SubscribeBanner locale={locale} client:load />
   <HeroSection locale={locale} client:load />
   <DropsSection locale={locale} />
   <CtaSection locale={locale} />

apps/website/src/styles/global.css

@@ -70,7 +70,6 @@
   --color-secondary-mauve: #4d3762;
   --color-destructive: #f44336;
   --color-primary-comfy-plum: #49378b;
-  --color-secondary-deep-plum: #2b2040;
   --color-secondary-cool-gray: #3c3c3c;
   --color-illustration-forest: #20464c;
   --color-transparency-white-t4: rgb(255 255 255 / 0.04);
@@ -94,14 +93,6 @@
   initial-value: 0deg;
 }
 
-/* Pre-hydration hide for a dismissed announcement banner (set by an inline
-   script in BaseLayout head) — prevents any flash before Vue hydrates.
-   The [data-banner-dismissed] literal is BANNER_DISMISS_ATTR in utils/banner.ts;
-   keep them in sync. */
-[data-banner-dismissed] [data-slot='announcement-banner'] {
-  display: none;
-}
-
 @keyframes border-angle-spin {
   to {
     --border-angle: 360deg;
@@ -257,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

apps/website/src/templates/drops/AnnouncementBanner.vue

@@ -1,107 +0,0 @@
-<script setup lang="ts">
-import { ArrowRight, X } from '@lucide/vue'
-
-import type { BannerData } from '../../config/banner'
-import type { Locale } from '../../i18n/translations'
-
-import { t } from '../../i18n/translations'
-import Button from '@/components/ui/button/Button.vue'
-import IconButton from '@/components/ui/icon-button/IconButton.vue'
-import { useBannerDismissal } from '../../composables/useBannerDismissal'
-
-const {
-  data,
-  version,
-  locale = 'en'
-} = defineProps<{
-  data: BannerData
-  version: string
-  locale?: Locale
-}>()
-
-const { isVisible, close, persistHidden } = useBannerDismissal(version)
-</script>
-
-<template>
-  <Transition name="banner-collapse" @after-leave="persistHidden">
-    <div v-if="isVisible" class="banner-collapse grid">
-      <div class="min-h-0 overflow-hidden">
-        <div
-          data-slot="announcement-banner"
-          class="after:bg-transparency-white-t4 relative flex items-center gap-x-6 px-6 py-4 after:pointer-events-none after:absolute after:inset-x-0 after:bottom-0 after:h-px sm:px-3.5 sm:before:flex-1"
-          style="
-            background: linear-gradient(
-              90deg,
-              var(--color-primary-comfy-plum) 0%,
-              var(--color-secondary-deep-plum) 53.85%,
-              var(--color-secondary-mauve) 100%
-            );
-          "
-        >
-          <div class="flex flex-wrap items-center gap-x-8 gap-y-2">
-            <p
-              class="text-primary-warm-white ppformula-text-center text-sm md:text-base/6"
-            >
-              {{ data.title }}
-              <span v-if="data.description" class="text-primary-warm-white/80">
-                {{ data.description }}
-              </span>
-            </p>
-            <Button
-              v-if="data.link"
-              as="a"
-              :href="data.link.href"
-              :target="data.link.target"
-              :rel="data.link.rel"
-              :variant="data.link.buttonVariant ?? 'underlineLink'"
-              size="sm"
-            >
-              {{ data.link.title }}
-              <template #append>
-                <ArrowRight class="size-4" />
-              </template>
-            </Button>
-          </div>
-          <div class="flex flex-1 justify-end">
-            <IconButton
-              type="button"
-              :aria-label="t('nav.close', locale)"
-              @click="close"
-            >
-              <X class="size-5" aria-hidden="true" />
-            </IconButton>
-          </div>
-        </div>
-      </div>
-    </div>
-  </Transition>
-</template>
-
-<style scoped>
-/* Collapse the banner's height (grid 1fr → 0fr) so page content below slides
-   up smoothly, with a fade. Enter is defined for symmetry; in practice only the
-   leave (dismiss) runs, since the banner renders present in the static HTML. */
-.banner-collapse {
-  grid-template-rows: 1fr;
-}
-
-.banner-collapse-enter-active,
-.banner-collapse-leave-active {
-  transition:
-    grid-template-rows 300ms ease,
-    opacity 250ms ease;
-}
-
-.banner-collapse-enter-from,
-.banner-collapse-leave-to {
-  grid-template-rows: 0fr;
-  opacity: 0;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .banner-collapse-enter-active,
-  .banner-collapse-leave-active {
-    transition: none;
-  }
-}
-</style>

apps/website/src/templates/drops/SubscribeBanner.vue

@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { useTimeoutFn } from '@vueuse/core'
+import { onMounted, ref } from 'vue'
+
+import type { Locale } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+import Button from '@/components/ui/button/Button.vue'
+import { resolveRel } from '../../utils/cta'
+import { livestream } from './livestream'
+
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const signUpHref = `https://www.youtube.com/watch?v=${livestream.youtubeVideoId}`
+const signUpRel = resolveRel({ target: '_blank' })
+
+// Hide once the livestream window closes — both for visitors arriving after
+// the event and for visitors whose tab is open when it ends.
+const endMs = new Date(livestream.endDateTime).getTime()
+const visible = ref(true)
+
+// useTimeoutFn auto-clears on unmount. Arm it client-side only so SSR never
+// schedules a long-lived server timer.
+const { start } = useTimeoutFn(
+  () => {
+    visible.value = false
+  },
+  () => Math.max(0, endMs - Date.now()),
+  { immediate: false }
+)
+
+onMounted(() => {
+  if (endMs - Date.now() <= 0) {
+    visible.value = false
+  } else {
+    start()
+  }
+})
+</script>
+
+<template>
+  <div v-if="visible" class="px-4">
+    <div
+      class="bg-primary-comfy-plum max-w-8xl rounded-5xl text-primary-warm-white mx-auto flex w-full flex-col items-center justify-center gap-2 px-6 py-5 text-center text-sm sm:flex-row sm:gap-4"
+    >
+      <p class="ppformula-text-center">
+        {{ t('launches.banner.text', locale) }}
+      </p>
+      <Button
+        :href="signUpHref"
+        as="a"
+        variant="underlineLink"
+        size="sm"
+        target="_blank"
+        :rel="signUpRel"
+      >
+        {{ t('launches.banner.cta', locale) }}
+      </Button>
+    </div>
+  </div>
+</template>

apps/website/src/templates/mcp/HeroSection.vue

@@ -17,7 +17,7 @@ const ctas = mcpCtas(locale)
     badge-text="MCP"
     :title="t('mcp.hero.heading', locale)"
     :subtitle="t('mcp.hero.subtitle', locale)"
-    :primary-cta="ctas.installMcp"
+    :primary-cta="ctas.runWorkflow"
     :secondary-cta="ctas.docs"
   >
     <template #media>

apps/website/src/templates/mcp/SetupSection.vue

@@ -17,10 +17,7 @@ const cards: FeatureCard[] = [
     description: t('mcp.setup.step1.description', locale),
     action: {
       type: 'code',
-      value: t('mcp.setup.step1.command', locale).replace(
-        '{url}',
-        externalLinks.docsMcp
-      )
+      value: externalLinks.mcpServer
     }
   },
   {
@@ -56,8 +53,6 @@ const cards: FeatureCard[] = [
 
 <template>
   <FeatureGrid01
-    id="setup"
-    class="scroll-mt-24 lg:scroll-mt-36"
     :eyebrow="t('mcp.setup.label', locale)"
     :heading="t('mcp.setup.heading', locale)"
     :subtitle="t('mcp.setup.subtitle', locale)"

apps/website/src/templates/mcp/ctas.ts

@@ -9,25 +9,16 @@ export interface McpCta {
 }
 
 /**
- * Calls-to-action for the MCP page: view the docs, jump to the on-page setup
- * steps, or run a workflow in the cloud. The hero leads with install + docs;
- * the "how it works" section pairs run-a-workflow with docs.
+ * The two calls-to-action shared by the MCP hero and "how it works" sections:
+ * view the docs, or run a workflow in the cloud.
  */
-export function mcpCtas(locale: Locale): {
-  docs: McpCta
-  installMcp: McpCta
-  runWorkflow: McpCta
-} {
+export function mcpCtas(locale: Locale): { docs: McpCta; runWorkflow: McpCta } {
   return {
     docs: {
       label: t('mcp.hero.viewDocs', locale),
       href: externalLinks.docsMcp,
       target: '_blank'
     },
-    installMcp: {
-      label: t('mcp.hero.installMcp', locale),
-      href: '#setup'
-    },
     runWorkflow: {
       label: t('mcp.hero.runWorkflow', locale),
       href: getRoutes(locale).cloud

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

@@ -1,109 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { EvaluableBanner } from './banner'
-
-import { createBannerVersion, evaluateBannerVisibility } from './banner'
-
-const base: EvaluableBanner = {
-  isActive: true,
-  targetSections: ['sitewide']
-}
-
-const ctx = {
-  currentLocale: 'en',
-  currentSection: 'sitewide',
-  now: new Date('2026-07-06T00:00:00Z')
-}
-
-describe('evaluateBannerVisibility', () => {
-  it('shows an active, untargeted, sitewide banner', () => {
-    expect(evaluateBannerVisibility(base, ctx)).toBe(true)
-  })
-
-  it('hides when inactive', () => {
-    expect(evaluateBannerVisibility({ ...base, isActive: false }, ctx)).toBe(
-      false
-    )
-  })
-
-  it('hides before startsAt and shows within the window', () => {
-    expect(
-      evaluateBannerVisibility(
-        { ...base, startsAt: '2026-07-10T00:00:00Z' },
-        ctx
-      )
-    ).toBe(false)
-    expect(
-      evaluateBannerVisibility(
-        { ...base, startsAt: '2026-07-01T00:00:00Z' },
-        ctx
-      )
-    ).toBe(true)
-  })
-
-  it('hides after endsAt', () => {
-    expect(
-      evaluateBannerVisibility({ ...base, endsAt: '2026-07-01T00:00:00Z' }, ctx)
-    ).toBe(false)
-    expect(
-      evaluateBannerVisibility({ ...base, endsAt: '2026-07-10T00:00:00Z' }, ctx)
-    ).toBe(true)
-  })
-
-  it('treats an empty targetLocales as "all locales"', () => {
-    expect(evaluateBannerVisibility({ ...base, targetLocales: [] }, ctx)).toBe(
-      true
-    )
-  })
-
-  it('hides when targetLocales excludes the current locale', () => {
-    expect(
-      evaluateBannerVisibility({ ...base, targetLocales: ['zh-CN'] }, ctx)
-    ).toBe(false)
-    expect(
-      evaluateBannerVisibility({ ...base, targetLocales: ['en', 'zh-CN'] }, ctx)
-    ).toBe(true)
-  })
-
-  it('hides when targetSections does not include the current section', () => {
-    expect(
-      evaluateBannerVisibility({ ...base, targetSections: ['checkout'] }, ctx)
-    ).toBe(false)
-  })
-
-  it('hides when targetSections is absent (nothing to match)', () => {
-    expect(evaluateBannerVisibility({ isActive: true }, ctx)).toBe(false)
-  })
-})
-
-describe('createBannerVersion', () => {
-  const content = {
-    id: 'announcement',
-    title: 'Join the live stream',
-    link: { href: 'https://x', title: 'Join' }
-  }
-
-  it('is deterministic for identical content', () => {
-    expect(createBannerVersion(content, 'en')).toBe(
-      createBannerVersion(content, 'en')
-    )
-  })
-
-  it('encodes the banner id and locale in the key', () => {
-    expect(createBannerVersion(content, 'en')).toMatch(
-      /^announcement_en_v-?\d+$/
-    )
-  })
-
-  it('changes when the copy changes', () => {
-    expect(createBannerVersion(content, 'en')).not.toBe(
-      createBannerVersion({ ...content, title: 'New copy' }, 'en')
-    )
-  })
-
-  it('differs per locale so one locale edit does not re-show another', () => {
-    expect(createBannerVersion(content, 'en')).not.toBe(
-      createBannerVersion(content, 'zh-CN')
-    )
-  })
-})

apps/website/src/utils/banner.ts

@@ -1,87 +0,0 @@
-// Pure, framework-agnostic banner logic — no Vue/Astro/config imports so it stays
-// trivially unit-testable. Locale/section are plain strings on purpose.
-
-// Shared dismissal storage contract. The pre-hydration script in BaseLayout.astro,
-// the useBannerDismissal composable, and the CSS selector in global.css must all
-// agree on these literals — keep them here as the single source of truth.
-export const BANNER_STORAGE_KEY = 'closedBanners'
-export const BANNER_DISMISS_ATTR = 'data-banner-dismissed'
-
-export interface BannerVisibilityContext {
-  currentLocale: string
-  currentSection: string
-  now: Date
-}
-
-export interface EvaluableBanner {
-  isActive: boolean
-  startsAt?: string
-  endsAt?: string
-  targetLocales?: readonly string[]
-  targetSections?: readonly string[]
-}
-
-/**
- * Server/build-time visibility gate. Returns false on the FIRST failing check,
- * in order: active flag → start window → end window → locale targeting →
- * section targeting. An empty/absent `targetLocales` means "all locales".
- */
-export function evaluateBannerVisibility(
-  banner: EvaluableBanner,
-  ctx: BannerVisibilityContext
-): boolean {
-  if (!banner.isActive) return false
-  if (
-    banner.startsAt &&
-    ctx.now.getTime() < new Date(banner.startsAt).getTime()
-  )
-    return false
-  if (banner.endsAt && ctx.now.getTime() > new Date(banner.endsAt).getTime())
-    return false
-
-  const targetLocales = banner.targetLocales ?? []
-  if (targetLocales.length > 0 && !targetLocales.includes(ctx.currentLocale))
-    return false
-
-  const targetSections = banner.targetSections ?? []
-  if (!targetSections.includes(ctx.currentSection)) return false
-
-  return true
-}
-
-interface BannerLinkContent {
-  href: string
-  title: string
-  target?: string
-  rel?: string
-  buttonVariant?: string
-}
-
-export interface BannerVersionContent {
-  id: string
-  title: string
-  description?: string
-  link?: BannerLinkContent
-}
-
-/**
- * Content-aware version key. Editing the copy changes the hash, so a previously
- * dismissed banner re-appears. Keyed per-locale so a zh-CN edit doesn't re-show
- * the banner for en visitors. Format: `${content.id}_${locale}_v${hash}`.
- */
-export function createBannerVersion(
-  content: BannerVersionContent,
-  locale: string
-): string {
-  const contentString = JSON.stringify({
-    locale,
-    title: content.title,
-    description: content.description,
-    link: content.link
-  })
-  let hash = 0
-  for (const char of contentString) {
-    hash = Math.imul(hash, 31) + char.charCodeAt(0)
-  }
-  return `${content.id}_${locale}_v${hash}`
-}

browser_tests/assets/missing/missing_media_cloud_output_video_subfolder.json

@@ -1,37 +0,0 @@
-{
-  "last_node_id": 1,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "LoadVideo",
-      "pos": [50, 120],
-      "size": [400, 200],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "VIDEO",
-          "type": "VIDEO",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "LoadVideo"
-      },
-      "widgets_values": ["video/cloud-video-hash.mp4 [output]", "image"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
-  "version": 0.4
-}

browser_tests/fixtures/helpers/CloudWorkspaceMockHelper.ts

@@ -11,7 +11,6 @@ import {
   WORKSPACE_FEATURE_FLAG
 } from '@e2e/fixtures/data/cloudWorkspace'
 import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper'
-import { mockWorkspaceTokenMint } from '@e2e/fixtures/utils/workspaceMocks'
 
 interface RoleChangeRequest {
   url: string
@@ -93,7 +92,9 @@ export class CloudWorkspaceMockHelper {
     await page.route('**/api/auth/session', (r) =>
       r.fulfill(jsonRoute({ token: 'mock-workspace-token' }))
     )
-    await mockWorkspaceTokenMint(page, TEAM_WORKSPACE)
+    await page.route('**/api/auth/token', (r) =>
+      r.fulfill(jsonRoute({ token: 'mock-workspace-token' }))
+    )
     await page.route('**/releases**', (r) => r.fulfill(jsonRoute([])))
 
     await page.route('**/api/workspaces', (r) =>

browser_tests/fixtures/selectors.ts

@@ -110,8 +110,7 @@ export const TestIds = {
   },
   propertiesPanel: {
     root: 'properties-panel',
-    errorsTab: 'panel-tab-errors',
-    selectionContextStrip: 'selection-context-strip'
+    errorsTab: 'panel-tab-errors'
   },
   assets: {
     browserModal: 'asset-browser-modal',

browser_tests/fixtures/utils/workspaceMocks.ts

@@ -33,27 +33,6 @@ export function member(
   }
 }
 
-/**
- * Stub `POST /api/auth/token` with a valid workspace token for `ws`. Without
- * this the mint fails and auth cannot resolve the active workspace.
- */
-export async function mockWorkspaceTokenMint(
-  page: Page,
-  ws: Pick<WorkspaceWithRole, 'id' | 'name' | 'type' | 'role'>
-) {
-  await page.route('**/api/auth/token', (r) =>
-    r.fulfill(
-      jsonRoute({
-        token: 'mock-workspace-token',
-        expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
-        workspace: { id: ws.id, name: ws.name, type: ws.type },
-        role: ws.role,
-        permissions: []
-      })
-    )
-  )
-}
-
 /**
  * Stub the workspace resolution + members list so the cloud app boots into the
  * given workspace with the given roster (drives the original-owner gate).
@@ -67,7 +46,17 @@ export async function mockWorkspace(
     if (route.request().method() !== 'GET') return route.fallback()
     await route.fulfill(jsonRoute({ workspaces: [ws] }))
   })
-  await mockWorkspaceTokenMint(page, ws)
+  await page.route('**/api/auth/token', (r) =>
+    r.fulfill(
+      jsonRoute({
+        token: 'mock-workspace-token',
+        expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+        workspace: { id: ws.id, name: ws.name, type: ws.type },
+        role: ws.role,
+        permissions: []
+      })
+    )
+  )
   await page.route('**/api/workspace/members**', (r) =>
     r.fulfill(
       jsonRoute({

browser_tests/tests/billingFacadeConsumers.spec.ts

@@ -11,10 +11,6 @@ import type {
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { mockSystemStats } from '@e2e/fixtures/data/systemStats'
 import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper'
-import {
-  mockWorkspaceTokenMint,
-  workspace
-} from '@e2e/fixtures/utils/workspaceMocks'
 
 /**
  * Billing facade consumers — FE-933 (B3) regression.
@@ -85,7 +81,6 @@ async function mockCloudBoot(
   await page.route('**/api/auth/session', (r) =>
     r.fulfill(jsonRoute({ token: 'mock-workspace-token' }))
   )
-  await mockWorkspaceTokenMint(page, workspace('personal', 'owner'))
   await page.route('**/releases**', (r) => r.fulfill(jsonRoute([])))
 
   // Single personal workspace.

browser_tests/tests/cloudSecrets.spec.ts

@@ -1,279 +0,0 @@
-import { expect } from '@playwright/test'
-import type { Page, Route } from '@playwright/test'
-
-import type { RemoteConfig } from '@/platform/remoteConfig/types'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { bootCloud, mockCloudBoot } from '@e2e/fixtures/utils/cloudBootMocks'
-import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute'
-
-/**
- * End-to-end coverage for the user-secrets (API keys) surface in the cloud app:
- * add a provider key, see it listed, delete it — the full CRUD round-trip —
- * plus the entitlement contract that a non-entitled account never sees the
- * gated providers.
- *
- * Drives a raw `page` against fully-mocked endpoints (the `comfyPage` fixture
- * would reach the OSS devtools backend during setup); `mockCloudBoot` +
- * `bootCloud` boot the app signed-in, and this spec layers a stateful in-memory
- * `/secrets` backend on top so the flow is deterministic and never touches a
- * real server.
- */
-const APP_URL = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
-
-// `/api/features` is the remote-config source. Enabling user secrets is what
-// surfaces the Secrets settings panel for a signed-in user.
-const BOOT_FEATURES = {
-  user_secrets_enabled: true
-} satisfies RemoteConfig
-
-// TutorialCompleted suppresses the new-user template browser, whose modal
-// overlay (z-1700) would otherwise intercept clicks on the settings dialog.
-const BOOT_SETTINGS = { 'Comfy.TutorialCompleted': true }
-
-// The plaintext key a user types in. It must be sent on create but NEVER echoed
-// back by the API or rendered anywhere in the UI.
-const RUNWAY_KEY_VALUE = 'sk-runway-do-not-echo-0xDEADBEEF'
-
-interface SecretRecord {
-  id: string
-  name: string
-  provider?: string
-  created_at: string
-  updated_at: string
-  last_used_at?: string
-}
-
-interface CreateCapture {
-  name?: string
-  provider?: string
-  secret_value?: string
-}
-
-interface SecretsBackend {
-  /** Bodies received by POST /secrets, in order — for asserting what was sent. */
-  createRequests: CreateCapture[]
-  /** Current server-side store — for asserting delete actually removed a row. */
-  store: SecretRecord[]
-}
-
-/**
- * Stateful mock of the ingest `/secrets` surface. A single route handler
- * branches on path + method so registration order can never make a specific
- * path (`/secrets/providers`, `/secrets/:id`) lose to the collection glob.
- *
- * `providerIds` models entitlement: an entitled account sees runway/gemini,
- * a non-entitled account gets an empty list (the server omits them).
- */
-async function mockSecretsBackend(
-  page: Page,
-  providerIds: string[]
-): Promise<SecretsBackend> {
-  const backend: SecretsBackend = { createRequests: [], store: [] }
-  let idSeq = 0
-
-  const respondList = (route: Route) =>
-    route.fulfill(jsonRoute({ data: backend.store }))
-
-  await page.route('**/api/secrets**', async (route) => {
-    const request = route.request()
-    const { pathname } = new URL(request.url())
-    const method = request.method()
-
-    // The glob `**/api/secrets**` also matches the panel's own lazy-loaded
-    // source module (`/src/platform/secrets/api/secretsApi.ts`), whose path
-    // contains the `/api/secrets` substring. Fulfilling that dev-server module
-    // request with JSON breaks the dynamic import and the panel never mounts.
-    // Anchor to the start of the pathname so only genuine `/api/secrets…` API
-    // routes are handled; everything else falls through to the real Vite server.
-    if (!/^\/api\/secrets(\/|$)/.test(pathname)) {
-      return route.continue()
-    }
-
-    // GET /secrets/providers — the entitlement-gated provider allowlist.
-    if (pathname.endsWith('/secrets/providers')) {
-      return route.fulfill(
-        jsonRoute({ data: providerIds.map((id) => ({ id })) })
-      )
-    }
-
-    // /secrets/:id — item routes (only DELETE is exercised by this flow).
-    const itemMatch = pathname.match(/\/secrets\/([^/]+)$/)
-    if (itemMatch) {
-      const id = itemMatch[1]
-      if (method === 'DELETE') {
-        backend.store = backend.store.filter((s) => s.id !== id)
-        return route.fulfill({ status: 204, body: '' })
-      }
-      return respondList(route)
-    }
-
-    // /secrets — collection routes.
-    if (method === 'POST') {
-      const body = (request.postDataJSON() ?? {}) as CreateCapture
-      backend.createRequests.push(body)
-      idSeq += 1
-      const created: SecretRecord = {
-        id: `00000000-0000-4000-8000-${String(idSeq).padStart(12, '0')}`,
-        name: body.name ?? '',
-        provider: body.provider,
-        created_at: '2026-07-08T00:00:00Z',
-        updated_at: '2026-07-08T00:00:00Z'
-      }
-      backend.store.push(created)
-      // Response echoes metadata ONLY — the schema has no secret_value field.
-      return route.fulfill(jsonRoute(created))
-    }
-
-    // GET /secrets (list).
-    return respondList(route)
-  })
-
-  return backend
-}
-
-/**
- * Open the settings dialog and land on the Secrets panel, waiting for both the
- * provider allowlist and the secret list to resolve so subsequent assertions
- * are not racing the panel's on-mount fetches.
- */
-async function openSecretsPanel(page: Page) {
-  const settingsDialog = page.getByTestId('settings-dialog')
-
-  await page.evaluate(() => {
-    const app = window.app
-    if (!app) throw new Error('window.app is not available')
-    return app.extensionManager.command.execute('Comfy.ShowSettingsDialog')
-  })
-  await settingsDialog.waitFor({ state: 'visible' })
-
-  const providersResolved = page.waitForResponse((r) =>
-    r.url().includes('/api/secrets/providers')
-  )
-  const listResolved = page.waitForResponse(
-    (r) =>
-      /\/api\/secrets(\?|$)/.test(r.url()) && r.request().method() === 'GET'
-  )
-
-  await settingsDialog
-    .locator('nav')
-    .getByRole('button', { name: 'Secrets' })
-    .click()
-
-  await Promise.all([providersResolved, listResolved])
-  return settingsDialog
-}
-
-test.describe('Cloud user secrets (API keys)', { tag: '@cloud' }, () => {
-  test('an entitled account can add, list, and delete a provider key', async ({
-    page
-  }) => {
-    test.slow()
-
-    await mockCloudBoot(page, {
-      features: BOOT_FEATURES,
-      settings: BOOT_SETTINGS
-    })
-    await bootCloud(page)
-    const backend = await mockSecretsBackend(page, ['runway', 'gemini'])
-
-    await page.goto(APP_URL)
-    await page.waitForFunction(() => !!window.app?.extensionManager, null, {
-      timeout: 45_000
-    })
-
-    const settingsDialog = await openSecretsPanel(page)
-
-    // Empty state before anything is added.
-    await expect(settingsDialog.getByText(/No secrets stored/)).toBeVisible()
-
-    // --- ADD -------------------------------------------------------------
-    await settingsDialog.getByRole('button', { name: 'Add Secret' }).click()
-
-    const formDialog = page
-      .getByRole('dialog')
-      .filter({ hasText: 'Secret Value' })
-    await expect(formDialog).toBeVisible()
-
-    // Pick the entitled Runway provider from the server-driven dropdown.
-    await formDialog.locator('#secret-provider').click()
-    await page.getByRole('option', { name: 'Runway' }).click()
-
-    await formDialog.locator('#secret-name').fill('My Runway Key')
-    await formDialog.locator('input[type="password"]').fill(RUNWAY_KEY_VALUE)
-
-    await formDialog.getByRole('button', { name: 'Save', exact: true }).click()
-    await expect(formDialog).toBeHidden()
-
-    // --- LIST ------------------------------------------------------------
-    await expect(settingsDialog.getByText('My Runway Key')).toBeVisible()
-    await expect(settingsDialog.getByText(/No secrets stored/)).toBeHidden()
-
-    // The create request carried the plaintext value + provider...
-    expect(backend.createRequests).toHaveLength(1)
-    expect(backend.createRequests[0]).toMatchObject({
-      name: 'My Runway Key',
-      provider: 'runway',
-      secret_value: RUNWAY_KEY_VALUE
-    })
-    // ...but the value must never be echoed back into the list — the API
-    // response carries metadata only, so nothing should render it as text.
-    await expect(page.getByText(RUNWAY_KEY_VALUE)).toHaveCount(0)
-
-    // --- DELETE ----------------------------------------------------------
-    await settingsDialog
-      .getByRole('button', { name: 'Delete', exact: true })
-      .click()
-
-    const confirmDialog = page
-      .getByRole('dialog')
-      .filter({ hasText: 'Delete Secret' })
-    await confirmDialog
-      .getByRole('button', { name: 'Delete', exact: true })
-      .click()
-
-    await expect(settingsDialog.getByText('My Runway Key')).toBeHidden()
-    await expect(settingsDialog.getByText(/No secrets stored/)).toBeVisible()
-    expect(backend.store).toHaveLength(0)
-  })
-
-  test('a non-entitled account never sees the gated providers', async ({
-    page
-  }) => {
-    test.slow()
-
-    await mockCloudBoot(page, {
-      features: BOOT_FEATURES,
-      settings: BOOT_SETTINGS
-    })
-    await bootCloud(page)
-    // Non-entitled: the server omits runway/gemini from the allowlist.
-    await mockSecretsBackend(page, [])
-
-    await page.goto(APP_URL)
-    await page.waitForFunction(() => !!window.app?.extensionManager, null, {
-      timeout: 45_000
-    })
-
-    const settingsDialog = await openSecretsPanel(page)
-    await expect(settingsDialog.getByText(/No secrets stored/)).toBeVisible()
-
-    // The add form opens, but its provider dropdown is empty — the gated
-    // providers must not appear anywhere.
-    await settingsDialog.getByRole('button', { name: 'Add Secret' }).click()
-    const formDialog = page
-      .getByRole('dialog')
-      .filter({ hasText: 'Secret Value' })
-    await expect(formDialog).toBeVisible()
-
-    await formDialog.locator('#secret-provider').click()
-    // Anchor on the opened listbox so the absence assertions below can't pass
-    // vacuously against a dropdown that never opened.
-    const providerListbox = page.getByRole('listbox')
-    await expect(providerListbox).toBeVisible()
-    // An empty allowlist must yield an empty dropdown. Asserting zero options
-    // (not just runway/gemini absent) also rejects the fetch-failure fallback,
-    // where `availableProviders` is null and the default providers would show.
-    await expect(providerListbox.getByRole('option')).toHaveCount(0)
-  })
-})

browser_tests/tests/dialogs/creditsTile.spec.ts

@@ -7,10 +7,6 @@ import type { BillingStatusResponse } from '@/platform/workspace/api/workspaceAp
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { mockSystemStats } from '@e2e/fixtures/data/systemStats'
 import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper'
-import {
-  mockWorkspaceTokenMint,
-  workspace
-} from '@e2e/fixtures/utils/workspaceMocks'
 
 // Drives a raw `page` (not the `comfyPage` fixture) so the cloud app boots
 // against fully mocked endpoints; `comfyPage` would try to reach the OSS
@@ -101,7 +97,6 @@ async function mockCloudBoot(page: Page) {
   await page.route('**/api/auth/session', (r) =>
     r.fulfill(jsonRoute({ token: 'mock-workspace-token' }))
   )
-  await mockWorkspaceTokenMint(page, workspace('personal', 'owner'))
   await page.route('**/releases**', (r) => r.fulfill(jsonRoute([])))
 
   // Single personal workspace.

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,34 +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 () => {
-        const id = await comfyPage.vueNodes.getNodeIdByTitle('Preview as Text')
-        execution.executed('', id, { 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'
-      )
-    }
-  )
 })

browser_tests/tests/propertiesPanel/errorsTabMissingMediaRuntime.spec.ts

@@ -1,11 +1,6 @@
 import { expect, mergeTests } from '@playwright/test'
 import type { Page, Route } from '@playwright/test'
-import type {
-  Asset,
-  GetAllSettingsResponse,
-  GetSettingByIdResponse,
-  ListAssetsResponse
-} from '@comfyorg/ingest-types'
+import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
 
 import {
   assetRequestIncludesTag,
@@ -13,7 +8,6 @@ import {
 } from '@e2e/fixtures/assetApiFixture'
 import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { WorkspaceStore } from '@e2e/types/globals'
 import {
   routeObjectInfoFromSetupApi,
   setComboInputOptions
@@ -29,11 +23,10 @@ import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 const ossTest = mergeTests(comfyPageFixture, jobsRouteFixture)
 const outputHash =
   '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png'
-const outputVideoHash = 'cloud-video-hash.mp4'
 const plainVideoFileName = 'plain_video.mp4'
 const graphDropPosition = { x: 500, y: 300 }
-const missingMediaObservationMs = 1_000
-const missingMediaPollMs = 100
+const missingMediaUploadObservationMs = 1_000
+const missingMediaUploadPollMs = 100
 const emptyMediaLoaderNodes = [
   {
     nodeType: 'LoadImage',
@@ -67,18 +60,6 @@ const cloudOutputAsset: Asset & { hash?: string } = {
   last_access_time: '2026-05-01T00:00:00Z'
 }
 
-const cloudOutputVideoAsset: Asset & { hash?: string } = {
-  id: 'test-output-video-hash-001',
-  name: 'ComfyUI_00001_.mp4',
-  hash: outputVideoHash,
-  size: 4_194_304,
-  mime_type: 'video/mp4',
-  tags: ['output'],
-  created_at: '2026-05-01T00:00:00Z',
-  updated_at: '2026-05-01T00:00:00Z',
-  last_access_time: '2026-05-01T00:00:00Z'
-}
-
 const cloudUploadedVideoAsset: Asset & { hash?: string } = {
   id: 'test-uploaded-video-001',
   name: plainVideoFileName,
@@ -111,21 +92,10 @@ interface CloudUploadAssetState {
 
 async function routeCloudBootstrapApis(page: Page) {
   await page.route('**/api/settings**', async (route) => {
-    const completedSurveySetting: GetSettingByIdResponse = {
-      value: { usage: 'personal' }
-    }
-    const allSettings: GetAllSettingsResponse = {}
-    const body = route
-      .request()
-      .url()
-      .includes('/api/settings/onboarding_survey')
-      ? completedSurveySetting
-      : allSettings
-
     await route.fulfill({
       status: 200,
       contentType: 'application/json',
-      body: JSON.stringify(body)
+      body: JSON.stringify({})
     })
   })
   await page.route('**/api/userdata**', async (route) => {
@@ -151,10 +121,7 @@ async function routeCloudBootstrapApis(page: Page) {
   })
 }
 
-const cloudOutputTest = createCloudAssetsFixture([
-  cloudOutputAsset,
-  cloudOutputVideoAsset
-]).extend({
+const cloudOutputTest = createCloudAssetsFixture([cloudOutputAsset]).extend({
   page: async ({ page }, use) => {
     await routeCloudBootstrapApis(page)
     const unrouteObjectInfo = await routeObjectInfoFromSetupApi(page)
@@ -258,33 +225,6 @@ function getErrorOverlay(comfyPage: ComfyPage) {
   return comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
 }
 
-function isOutputAssetsRequest(url: string) {
-  return url.includes('/api/assets') && assetRequestIncludesTag(url, 'output')
-}
-
-async function waitForOutputAssetsResponse(comfyPage: ComfyPage) {
-  await comfyPage.page.waitForResponse(
-    (response) =>
-      response.status() === 200 && isOutputAssetsRequest(response.url())
-  )
-}
-
-async function getCachedMissingMediaWarningNames(
-  comfyPage: ComfyPage
-): Promise<string[] | null> {
-  return await comfyPage.page.evaluate(() => {
-    const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
-      .activeWorkflow
-    if (!workflow) return null
-
-    return (
-      workflow.pendingWarnings?.missingMediaCandidates?.map(
-        (candidate) => candidate.name
-      ) ?? []
-    )
-  })
-}
-
 async function expectNoErrorsTab(comfyPage: ComfyPage) {
   await expect(getErrorOverlay(comfyPage)).toBeHidden()
 
@@ -387,31 +327,25 @@ async function expectLoadVideoUploading(comfyPage: ComfyPage) {
     .toBe(true)
 }
 
-async function expectNoMissingMediaForObservationWindow(comfyPage: ComfyPage) {
+async function expectNoMissingMediaDuringUpload(comfyPage: ComfyPage) {
   await comfyPage.nextFrame()
   await comfyPage.nextFrame()
 
   let sawErrorOverlay = false
-  let sawCachedMissingMedia = false
   const startedAt = Date.now()
   await expect
     .poll(
       async () => {
-        const cachedMissingMedia =
-          await getCachedMissingMediaWarningNames(comfyPage)
-        sawCachedMissingMedia =
-          sawCachedMissingMedia || !!cachedMissingMedia?.length
         sawErrorOverlay =
           sawErrorOverlay || (await getErrorOverlay(comfyPage).isVisible())
         return (
           !sawErrorOverlay &&
-          !sawCachedMissingMedia &&
-          Date.now() - startedAt >= missingMediaObservationMs
+          Date.now() - startedAt >= missingMediaUploadObservationMs
         )
       },
       {
-        timeout: missingMediaObservationMs + missingMediaPollMs * 5,
-        intervals: [missingMediaPollMs]
+        timeout: missingMediaUploadObservationMs + missingMediaUploadPollMs * 5,
+        intervals: [missingMediaUploadPollMs]
       }
     )
     .toBe(true)
@@ -490,7 +424,7 @@ ossTest.describe(
         })
 
         await expectLoadVideoUploading(comfyPage)
-        await expectNoMissingMediaForObservationWindow(comfyPage)
+        await expectNoMissingMediaDuringUpload(comfyPage)
 
         await delayedUpload.finishUpload()
         await expect(getErrorOverlay(comfyPage)).toBeHidden()
@@ -548,30 +482,18 @@ cloudOutputTest.describe(
 
     cloudOutputTest(
       'resolves compact annotated output media from output assets',
-      async ({ comfyPage }) => {
-        const outputAssetsResponse = waitForOutputAssetsResponse(comfyPage)
-
+      async ({ cloudAssetRequests, comfyPage }) => {
         await comfyPage.workflow.loadWorkflow(
           'missing/missing_media_cloud_output_annotation'
         )
 
-        await outputAssetsResponse
-        await expectNoMissingMediaForObservationWindow(comfyPage)
-        await expectNoErrorsTab(comfyPage)
-      }
-    )
-
-    cloudOutputTest(
-      'resolves subfoldered output video media from flat output asset hashes',
-      async ({ comfyPage }) => {
-        const outputAssetsResponse = waitForOutputAssetsResponse(comfyPage)
-
-        await comfyPage.workflow.loadWorkflow(
-          'missing/missing_media_cloud_output_video_subfolder'
-        )
-
-        await outputAssetsResponse
-        await expectNoMissingMediaForObservationWindow(comfyPage)
+        await expect
+          .poll(() =>
+            cloudAssetRequests.some((url) =>
+              assetRequestIncludesTag(url, 'output')
+            )
+          )
+          .toBe(true)
         await expectNoErrorsTab(comfyPage)
       }
     )
@@ -607,7 +529,7 @@ cloudUploadRaceTest.describe(
         })
 
         await expectLoadVideoUploading(comfyPage)
-        await expectNoMissingMediaForObservationWindow(comfyPage)
+        await expectNoMissingMediaDuringUpload(comfyPage)
 
         markUploadedCloudAssetAvailable()
         await delayedUpload.finishUpload()

browser_tests/tests/propertiesPanel/errorsTabModeAware.spec.ts

@@ -286,7 +286,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
       await expect(missingModelGroup).toBeHidden()
     })
 
-    test('Selecting a node keeps all errors visible and shows selection context', async ({
+    test('Selecting a node filters errors tab to only that node', async ({
       comfyPage
     }) => {
       await loadWorkflowAndOpenErrorsTab(
@@ -301,25 +301,14 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
 
       const node1 = await comfyPage.nodeOps.getNodeRefById('1')
       await node1.click('title')
-
       await expect(
         getMissingModelLabel(missingModelGroup, FAKE_MODEL_NAME)
       ).toBeVisible()
-      await expectReferenceBadge(missingModelGroup, 2)
-      const strip = comfyPage.page.getByTestId(
-        TestIds.propertiesPanel.selectionContextStrip
-      )
-      await expect(strip).toBeVisible()
       await expect(
-        strip,
-        'The strip count is scoped to the selection, diverging from the global reference badge'
-      ).toContainText('1 error')
+        missingModelGroup.getByTestId(TestIds.dialogs.missingModelLocate)
+      ).toHaveCount(1)
 
       await comfyPage.canvas.click()
-      await expect(
-        strip,
-        'Deselecting swaps the always-visible strip back to the summary'
-      ).toContainText('2 nodes — 1 error')
       await expectReferenceBadge(missingModelGroup, 2)
     })
   })
@@ -392,7 +381,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
       await expect(missingMediaGroup).toBeHidden()
     })
 
-    test('Selecting a node keeps all media rows visible and shows selection context', async ({
+    test('Selecting a node filters errors tab to only that node', async ({
       comfyPage
     }) => {
       await comfyPage.workflow.loadWorkflow('missing/missing_media_multiple')
@@ -414,66 +403,13 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
 
       const node = await comfyPage.nodeOps.getNodeRefById('10')
       await node.click('title')
-
-      // Selection no longer filters the list — rows stay global and the
-      // selection is surfaced via the context strip instead.
-      const strip = comfyPage.page.getByTestId(
-        TestIds.propertiesPanel.selectionContextStrip
-      )
-      await expect(strip).toBeVisible()
-      await expect(strip).toContainText('1 error')
-      await expect(mediaRows).toHaveCount(2)
+      await expect(mediaRows).toHaveCount(1)
 
       await comfyPage.canvas.click({ position: { x: 400, y: 600 } })
-      // Deselecting swaps the always-visible strip back to the summary
-      await expect(strip).toContainText('2 nodes — 2 errors')
       await expect(mediaRows).toHaveCount(2)
     })
   })
 
-  test.describe('Selection emphasis', () => {
-    test('Selecting a node collapses unrelated groups and highlights its rows', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_nodes_and_media'
-      )
-
-      const missingNodeCard = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingNodeCard
-      )
-      const mediaRow = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingMediaRow
-      )
-      const strip = comfyPage.page.getByTestId(
-        TestIds.propertiesPanel.selectionContextStrip
-      )
-      await expect(missingNodeCard).toBeVisible()
-      await expect(mediaRow).toBeVisible()
-      await expect(strip).toContainText('2 nodes — 2 errors')
-
-      const mediaNode = await comfyPage.nodeOps.getNodeRefById('10')
-      // The node sits near the canvas top where overlays intercept clicks
-      await mediaNode.centerOnNode()
-      await mediaNode.click('title')
-
-      // The unrelated missing-node group auto-collapses while the matched
-      // media row stays visible and is marked as part of the selection
-      await expect(missingNodeCard).toBeHidden()
-      await expect(mediaRow).toBeVisible()
-      await expect(mediaRow).toHaveAttribute('aria-current', 'true')
-      await expect(strip).toContainText('1 error')
-
-      await comfyPage.canvas.click({ position: { x: 400, y: 600 } })
-      // Emphasis ends: the collapsed group re-expands and the strip
-      // returns to the workflow summary
-      await expect(missingNodeCard).toBeVisible()
-      await expect(mediaRow).not.toHaveAttribute('aria-current', 'true')
-      await expect(strip).toContainText('2 nodes — 2 errors')
-    })
-  })
-
   test.describe('Subgraph', () => {
     test.beforeEach(async ({ comfyPage }) => {
       await cleanupFakeModel(comfyPage)

browser_tests/tests/vueNodes/nodeStates/error.spec.ts

@@ -23,7 +23,6 @@ import { webSocketFixture } from '@e2e/fixtures/ws'
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 
 const ERROR_CLASS = /ring-destructive-background/
-const SLOT_ERROR_CLASS = /before:ring-error/
 const UNKNOWN_NODE_ID = '1'
 const INNER_EXECUTION_ID = '2:1'
 const KSAMPLER_MODEL_INPUT_NAME = 'model'
@@ -70,25 +69,6 @@ async function selectLoadImageNodeForPaste(
   }, localLoadImageId)
 }
 
-async function getInputSlotIndexByName(
-  comfyPage: ComfyPage,
-  nodeId: string,
-  inputName: string
-): Promise<number> {
-  return comfyPage.page.evaluate(
-    ({ inputName, nodeId }) => {
-      const graph = window.app!.canvas.graph ?? window.app!.graph
-      const node = graph.getNodeById(nodeId)
-      const index = node?.findInputSlot(inputName) ?? -1
-      if (index < 0) {
-        throw new Error(`Input slot "${inputName}" not found`)
-      }
-      return index
-    },
-    { inputName, nodeId: toNodeId(nodeId) }
-  )
-}
-
 async function setupLoadImageErrorScenario(comfyPage: ComfyPage) {
   await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
   const loadImageNode = (
@@ -159,10 +139,17 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
       async ({ comfyPage }) => {
         const ksamplerId = await comfyPage.vueNodes.getNodeIdByTitle('KSampler')
         const ksamplerNode = comfyPage.vueNodes.getNodeLocator(ksamplerId)
-        const modelInputIndex = await getInputSlotIndexByName(
-          comfyPage,
-          ksamplerId,
-          KSAMPLER_MODEL_INPUT_NAME
+        const modelInputIndex = await comfyPage.page.evaluate(
+          ({ nodeId, inputName }) => {
+            const node = window.app!.graph.getNodeById(nodeId)
+            const index =
+              node?.inputs?.findIndex((input) => input.name === inputName) ?? -1
+            if (index < 0) {
+              throw new Error(`Input slot "${inputName}" not found`)
+            }
+            return index
+          },
+          { nodeId: toNodeId(ksamplerId), inputName: KSAMPLER_MODEL_INPUT_NAME }
         )
         const modelInputSlotRow = comfyPage.vueNodes.getInputSlotRow(
           ksamplerId,
@@ -188,7 +175,7 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
 
         await expect(modelInputSlotRow).toBeVisible()
         await expect(modelInputSlotRow).toBeInViewport()
-        await expect(modelInputSlotHighlight).toHaveClass(SLOT_ERROR_CLASS)
+        await expect(modelInputSlotHighlight).toHaveClass(/before:ring-error/)
         await expect(
           comfyPage.vueNodes.getNodeInnerWrapper(ksamplerId)
         ).toHaveClass(ERROR_CLASS)
@@ -420,76 +407,5 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
 
       await expect(innerWrapper).toHaveClass(ERROR_CLASS)
     })
-
-    test('boundary-linked validation error surfaces on the subgraph host', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
-      const subgraphParentId =
-        await comfyPage.vueNodes.getNodeIdByTitle('New Subgraph')
-      const innerWrapper =
-        comfyPage.vueNodes.getNodeInnerWrapper(subgraphParentId)
-      const hostInputIndex = await getInputSlotIndexByName(
-        comfyPage,
-        subgraphParentId,
-        'positive'
-      )
-      const hostInputSlotHighlight =
-        comfyPage.vueNodes.getInputSlotConnectionDot(
-          subgraphParentId,
-          hostInputIndex
-        )
-      await expect(
-        innerWrapper,
-        'subgraph host must mount before injecting validation errors'
-      ).toBeVisible()
-      await expect(
-        innerWrapper,
-        'subgraph host should start without an error ring'
-      ).not.toHaveClass(ERROR_CLASS)
-
-      await test.step('surface the boundary-linked error on the host', async () => {
-        const exec = new ExecutionHelper(comfyPage)
-        await exec.mockValidationFailure({
-          [INNER_EXECUTION_ID]: buildKSamplerError(
-            'required_input_missing',
-            'positive',
-            'Required input is missing: positive'
-          )
-        })
-        await comfyPage.runButton.click()
-        await dismissErrorOverlay(comfyPage)
-
-        await expect(innerWrapper).toHaveClass(ERROR_CLASS)
-        await expect(hostInputSlotHighlight).toHaveClass(SLOT_ERROR_CLASS)
-      })
-
-      await test.step('confirm the interior node does not show the surfaced ring', async () => {
-        await comfyPage.vueNodes.enterSubgraph(subgraphParentId)
-        await comfyPage.nextFrame()
-        await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
-        const interiorKSamplerId =
-          await comfyPage.vueNodes.getNodeIdByTitle('KSampler')
-        const interiorPositiveInputIndex = await getInputSlotIndexByName(
-          comfyPage,
-          interiorKSamplerId,
-          'positive'
-        )
-        const interiorPositiveSlotHighlight =
-          comfyPage.vueNodes.getInputSlotConnectionDot(
-            interiorKSamplerId,
-            interiorPositiveInputIndex
-          )
-        const interiorInnerWrapper =
-          comfyPage.vueNodes.getNodeInnerWrapper(interiorKSamplerId)
-
-        await expect(interiorInnerWrapper).toBeVisible()
-        await expect(interiorInnerWrapper).not.toHaveClass(ERROR_CLASS)
-        await expect(interiorPositiveSlotHighlight).toBeVisible()
-        await expect(interiorPositiveSlotHighlight).not.toHaveClass(
-          SLOT_ERROR_CLASS
-        )
-      })
-    })
   })
 })

docs/adr/0011-derived-credential-lifecycle.md

@@ -1,120 +0,0 @@
-# 11. Derived Credential Lifecycle for Cloud Auth
-
-Date: 2026-07-09
-
-## Status
-
-Proposed
-
-<!-- [Proposed | Accepted | Rejected | Deprecated | Superseded by [ADR-NNNN](NNNN-title.md)] -->
-
-## Context
-
-Cloud authentication derives several short-lived credentials from a single
-source of truth — the Firebase identity (ID token):
-
-- the **workspace JWT** minted by exchanging the Firebase token (`workspaceAuthStore`),
-- the **session cookie** created by POSTing the Firebase token to `/auth/session`
-  (`useSessionCookie`),
-- and consumer state gated on those credentials, such as **subscription status**
-  (`useSubscription`).
-
-A recurring class of production bugs traces back to how these derived credentials
-are kept fresh rather than to any single code path:
-
-- **FE-613** — workspace token exchange is not reactive to Firebase auth state.
-  Its refresh relies on a `setTimeout` timer that browsers throttle in background
-  tabs, so a backgrounded session serves an expired workspace JWT and every cloud
-  call 401s until reload.
-- **Workspace/personal oscillation** (PR #13511) — when a valid workspace token is
-  momentarily absent, `getAuthHeader`/`getAuthToken` silently downgraded to the
-  personal Firebase token, so requests authenticated as the wrong identity.
-- **Run-button toggle loop** (Slack, related to FE-1072) — a Firebase token-refresh
-  burst on wake/network-swap fans out into concurrent, undeduped subscription
-  fetches racing an in-flight session-cookie rotation; some land pre-rotation and
-  return 401/empty, flapping `subscriptionStatus` and the run button.
-
-These are not independent defects. They are symptoms of one design shape: **each
-derived credential has its own ad-hoc refresh lifecycle, driven by timers or
-one-shot events rather than the source identity, with no coalescing of concurrent
-refreshes and with silent fallback to a different identity or a stale value on
-failure.** Any credential built this way can go stale, stampede, or downgrade.
-
-## Decision
-
-Treat every derived credential as a pure function of the Firebase identity, and
-require all of them to obey the same lifecycle invariants. New auth code must
-satisfy these; existing code migrates toward them incrementally.
-
-1. **Single source of truth.** The Firebase identity is authoritative. Workspace
-   JWT and session cookie are derivations of it, never independent state that can
-   drift from it.
-
-2. **Valid-on-read.** A caller asking for a credential gets a currently-valid one
-   or a definitive failure — never a known-expired one. Validity is checked at the
-   point of use (expiry-aware), not assumed because a background timer _should_
-   have refreshed. Timers may be an optimization, never the guarantee.
-
-3. **Single-flight.** Concurrent requests for the same credential share one
-   in-flight mint/refresh. A refresh burst collapses to a single network call.
-
-4. **Fail-closed, never downgrade.** If the correct-scope credential cannot be
-   obtained, fail the request. Never silently substitute a different identity or
-   scope (e.g. personal token for a workspace request).
-
-5. **Bounded reactive retry.** Invalidation is driven by the source identity
-   (`onIdTokenChanged`), not by polling or wall-clock timers alone. A `401` on a
-   derived credential triggers at most one re-mint and one retry, then surfaces
-   the error.
-
-6. **Explicit scope.** A credential names the identity/workspace it is for.
-   Coalesced results are verified against the requested scope before use.
-
-PR #13511 is the first increment: workspace-token recovery is now valid-on-read,
-single-flight, fail-closed, and reconciles a revoked workspace instead of
-downgrading; subscription-status and session-cookie creation are now
-single-flight so a refresh burst can no longer flap them. It intentionally does
-**not** yet add the `onIdTokenChanged` subscription FE-613 proposes — recovery is
-lazy (on read) rather than reactive (on refresh). Invariant 5 is the remaining
-gap and is tracked by FE-950 (Unified Cloud Auth) and FE-963 (reactive 401
-re-mint + single retry).
-
-Alternatives considered:
-
-- **Layer more defensive checks per call site.** Rejected: this is what produced
-  the current state — correctness that depends on every caller remembering to
-  guard is the defect, not the fix.
-- **A single reactive credential store subscribing to Firebase, replacing all
-  three ad-hoc lifecycles at once.** Deferred, not rejected: it is the target
-  end-state, but a big-bang rewrite of live auth is too risky. We migrate under
-  these invariants incrementally instead.
-
-## Consequences
-
-### Positive
-
-- Whole categories of failure become structurally hard rather than individually
-  patched: stale-on-wake (invariant 2), refresh stampede (3), wrong-identity
-  requests (4).
-- New auth code has a single checklist to satisfy, and reviewers a single rubric
-  to apply.
-- Establishes a shared vocabulary (valid-on-read, single-flight, fail-closed) for
-  reasoning about auth changes.
-
-### Negative
-
-- Fail-closed surfaces auth failures that silent downgrade previously masked; some
-  transient conditions now show errors instead of degrading quietly, so
-  transient-vs-permanent classification must be correct.
-- The invariants are not yet fully realized. Until invariant 5 lands, recovery is
-  lazy and a backgrounded tab still relies on the next read to heal, leaving a
-  visible gap against FE-613's reactive ideal.
-- Existing lifecycles remain non-uniform during migration, so the mental model is
-  "target vs. current" until the reactive credential store exists.
-
-## Notes
-
-- Related: [ADR-0003](0003-crdt-based-layout-system.md) is unrelated in domain but
-  shares the philosophy of designing invariants that make illegal states
-  unrepresentable rather than guarding against them per call site.
-- Tickets: FE-613, FE-950, FE-963, FE-1072. PR: #13511.

docs/adr/README.md

@@ -20,7 +20,6 @@ An Architecture Decision Record captures an important architectural decision mad
 | [0008](0008-entity-component-system.md)                     | Entity Component System                     | Proposed | 2026-03-23 |
 | [0009](0009-subgraph-promoted-widgets-use-linked-inputs.md) | Subgraph Promoted Widgets Use Linked Inputs | Proposed | 2026-05-05 |
 | [0010](0010-remove-nx-orchestration.md)                     | Remove Nx Orchestration                     | Accepted | 2026-05-19 |
-| [0011](0011-derived-credential-lifecycle.md)                | Derived Credential Lifecycle for Cloud Auth | Proposed | 2026-07-09 |
 
 ## Creating a New ADR
 

docs/testing/README.md

@@ -4,12 +4,11 @@ This guide provides an overview of testing approaches used in the ComfyUI Fronte
 
 ## Testing Documentation
 
-Documentation for unit tests is organized into four guides:
+Documentation for unit tests is organized into three guides:
 
 - [Component Testing](./component-testing.md) - How to test Vue components
 - [Unit Testing](./unit-testing.md) - How to test utility functions, composables, and other non-component code
 - [Store Testing](./store-testing.md) - How to test Pinia stores specifically
-- [LiteGraph Testing](./litegraph-testing.md) - How to test LiteGraph graph, node, link, and workflow behavior
 
 ## Testing Structure
 

docs/testing/litegraph-testing.md

@@ -1,9 +0,0 @@
-# LiteGraph Testing Guide
-
-This guide covers test patterns for LiteGraph graph, node, link, subgraph, and workflow behavior in ComfyUI Frontend.
-
-## Shared Factories
-
-Reuse shared factories in `src/utils/__tests__/litegraphTestUtils.ts` instead of hand-rolling LiteGraph node, canvas, graph, subgraph, or workflow builders.
-
-Use real LiteGraph instances or shared factories when they exercise behavior directly. Avoid mocking LiteGraph classes unless the test is intentionally checking a seam outside LiteGraph itself.

package.json

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

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"]
 }

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

@@ -3,7 +3,6 @@ import { describe, expect, it } from 'vitest'
 import {
   appendWorkflowJsonExt,
   ensureWorkflowSuffix,
-  escapeVueI18nMessageSyntax,
   formatLocalizedMediumDate,
   formatLocalizedNumber,
   getFilePathSeparatorVariants,
@@ -415,15 +414,15 @@ describe('formatUtil', () => {
   })
 
   describe('isPreviewableMediaType', () => {
-    it('returns true for image/video/audio/3D/text', () => {
+    it('returns true for image/video/audio/3D', () => {
       expect(isPreviewableMediaType('image')).toBe(true)
       expect(isPreviewableMediaType('video')).toBe(true)
       expect(isPreviewableMediaType('audio')).toBe(true)
       expect(isPreviewableMediaType('3D')).toBe(true)
-      expect(isPreviewableMediaType('text')).toBe(true)
     })
 
-    it('returns false for other', () => {
+    it('returns false for text/other', () => {
+      expect(isPreviewableMediaType('text')).toBe(false)
       expect(isPreviewableMediaType('other')).toBe(false)
     })
   })
@@ -478,49 +477,4 @@ describe('formatUtil', () => {
       expect(formatLocalizedMediumDate('not a date', 'en')).toBe('—')
     })
   })
-
-  describe('escapeVueI18nMessageSyntax', () => {
-    it('escapes a literal @ that would break linked-message compilation', () => {
-      expect(
-        escapeVueI18nMessageSyntax('clips (tagged @Audio1-3 in the prompt)')
-      ).toBe("clips (tagged {'@'}Audio1-3 in the prompt)")
-    })
-
-    it('escapes @ in an email address', () => {
-      expect(escapeVueI18nMessageSyntax('support@comfy.org')).toBe(
-        "support{'@'}comfy.org"
-      )
-    })
-
-    it('escapes interpolation braces', () => {
-      expect(escapeVueI18nMessageSyntax('size {w}x{h}')).toBe(
-        "size {'{'}w{'}'}x{'{'}h{'}'}"
-      )
-    })
-
-    it('escapes the plural pipe separator', () => {
-      expect(escapeVueI18nMessageSyntax('foreground | background')).toBe(
-        "foreground {'|'} background"
-      )
-    })
-
-    it('escapes the modulo percent so it cannot re-form %{', () => {
-      expect(escapeVueI18nMessageSyntax('50%{done}')).toBe(
-        "50{'%'}{'{'}done{'}'}"
-      )
-    })
-
-    it('escapes every occurrence in a single pass', () => {
-      expect(escapeVueI18nMessageSyntax('@a @b @c')).toBe(
-        "{'@'}a {'@'}b {'@'}c"
-      )
-    })
-
-    it('leaves strings without syntax characters unchanged', () => {
-      expect(escapeVueI18nMessageSyntax('no special chars here')).toBe(
-        'no special chars here'
-      )
-      expect(escapeVueI18nMessageSyntax('')).toBe('')
-    })
-  })
 })

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

@@ -178,40 +178,6 @@ export function normalizeI18nKey(key: string) {
   return typeof key === 'string' ? key.replace(/\./g, '_') : ''
 }
 
-/**
- * Characters that vue-i18n's message compiler treats as syntax in message text,
- * so plain text has to escape them to render verbatim through `t()`/`st()`:
- *
- * - `@` starts a linked-message reference (`@:key`); malformed usage throws
- *   `Invalid linked format`.
- * - `{` / `}` delimit interpolation (`{name}`, `{'literal'}`); an unbalanced
- *   brace throws `Unterminated/Unbalanced closing brace`.
- * - `|` separates plural branches, so `a | b` silently renders as one branch.
- * - `%` forms modulo interpolation when immediately followed by `{` (`%{name}`);
- *   it must be escaped too, otherwise escaping a following `{` re-forms `%{`.
- *
- * The set is a build-inlined `const enum` (`TokenChars`) in
- * `@intlify/message-compiler` and is not exported, so it is hardcoded here.
- *
- * @see https://vue-i18n.intlify.dev/guide/essentials/syntax (Special Characters, Literal interpolation)
- * @see https://vue-i18n.intlify.dev/guide/essentials/pluralization
- */
-const VUE_I18N_SYNTAX_CHARS = /[@{}|%]/g
-
-/**
- * Escapes vue-i18n message-syntax characters as literal interpolations (`{'x'}`)
- * so arbitrary text renders verbatim instead of being parsed as syntax. This is
- * the only escape vue-i18n supports; see {@link VUE_I18N_SYNTAX_CHARS}.
- *
- * Only apply to values read through the compiler (`t()`/`st()`). Values read raw
- * via `tm()`/`stRaw()` (e.g. node tooltips) must be left untouched, or the
- * literal `{'x'}` would surface to users. Apply exactly once to raw text: the
- * escape output itself contains `{`/`}`, so it is not idempotent.
- */
-export function escapeVueI18nMessageSyntax(text: string): string {
-  return text.replace(VUE_I18N_SYNTAX_CHARS, (char) => `{'${char}'}`)
-}
-
 /**
  * Takes a dynamic prompt in the format {opt1|opt2|{optA|optB}|} and randomly replaces groups. Supports C style comments.
  * @param input The dynamic prompt to process
@@ -711,7 +677,12 @@ export function getMediaTypeFromFilename(
 }
 
 export function isPreviewableMediaType(mediaType: MediaType): boolean {
-  return mediaType !== 'other'
+  return (
+    mediaType === 'image' ||
+    mediaType === 'video' ||
+    mediaType === 'audio' ||
+    mediaType === '3D'
+  )
 }
 
 export function formatTime(seconds: number): string {

public/assets/images/gemini.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-label="Google Gemini">
-  <path d="M12 1c.6 5.4 4.6 9.4 10 10-5.4.6-9.4 4.6-10 10-.6-5.4-4.6-9.4-10-10 5.4-.6 9.4-4.6 10-10z" fill="#4285F4"/>
-</svg>

public/assets/images/runway.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-label="Runway">
-  <rect width="24" height="24" rx="5" fill="#6E56CF"/>
-  <path d="M9.5 8.2v7.6l6.3-3.8z" fill="#ffffff"/>
-</svg>

scripts/cicd/resolve-comfyui-release.test.ts

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

scripts/cicd/resolve-comfyui-release.ts

@@ -81,72 +81,15 @@ function isValidSemver(version: string): boolean {
 }
 
 /**
- * Parse a target branch override of the form `core/<major>.<minor>`.
- * Returns the parsed major/minor and normalized branch, or null if malformed.
+ * Get the latest patch tag for a given minor version
  */
-function parseTargetBranchOverride(
-  branch: string
-): { major: number; minor: number; branch: string } | null {
-  const match = branch.match(/^core\/(\d+)\.(\d+)$/)
-  if (!match) {
-    return null
-  }
-  return {
-    major: Number(match[1]),
-    minor: Number(match[2]),
-    branch
-  }
-}
-
-/**
- * Compute the next release version for a target major.minor line.
- *
- * With no prior tag, the line starts at `.0`. With a prior tag, the patch is
- * bumped when there are pending commits, otherwise the tagged version stands.
- * Returns null if the tag is not valid semver.
- */
-function computeTargetVersion(
-  targetMajor: number,
-  targetMinor: number,
-  latestPatchTag: string | null,
-  hasPendingCommits: boolean
-): string | null {
-  if (!latestPatchTag) {
-    return `${targetMajor}.${targetMinor}.0`
-  }
-
-  const tagVersion = latestPatchTag.replace('v', '')
-  if (!isValidSemver(tagVersion)) {
-    return null
-  }
-
-  const existingPatch = Number(tagVersion.split('.')[2])
-  return hasPendingCommits
-    ? `${targetMajor}.${targetMinor}.${existingPatch + 1}`
-    : tagVersion
-}
-
-/**
- * Check whether a branch exists on origin in the given repo.
- */
-function branchExists(branch: string, repoPath: string): boolean {
-  return Boolean(exec(`git rev-parse --verify origin/${branch}`, repoPath))
-}
-
-/**
- * Get the latest patch tag for a given major.minor version
- */
-function getLatestPatchTag(
-  repoPath: string,
-  major: number,
-  minor: number
-): string | null {
+function getLatestPatchTag(repoPath: string, minor: number): string | null {
   // Fetch all tags
   exec('git fetch --tags', repoPath)
 
   // Use git's native version sorting to get the latest tag
   const latestTag = exec(
-    `git tag -l 'v${major}.${minor}.*' --sort=-version:refname | head -n 1`,
+    `git tag -l 'v1.${minor}.*' --sort=-version:refname | head -n 1`,
     repoPath
   )
 
@@ -158,7 +101,7 @@ function getLatestPatchTag(
   const validTagRegex = /^v\d+\.\d+\.\d+$/
   if (!validTagRegex.test(latestTag)) {
     console.error(
-      `Latest tag for version ${major}.${minor} is not valid semver: ${latestTag}`
+      `Latest tag for minor version ${minor} is not valid semver: ${latestTag}`
     )
     return null
   }
@@ -189,106 +132,85 @@ function resolveRelease(
     return null
   }
 
-  const [currentMajor, currentMinor] = currentVersion.split('.').map(Number)
+  const [major, currentMinor, patch] = currentVersion.split('.').map(Number)
 
   // Fetch all branches
   exec('git fetch origin', frontendRepoPath)
 
-  // Target major defaults to the current pin's major, but a TARGET_BRANCH
-  // override (below) can retarget both major and minor.
-  let targetMajor = currentMajor
+  // Determine target branch based on release type:
+  //   'patch' → target current minor (hotfix for production version)
+  //   'minor' → try next minor, fall back to current minor (bi-weekly cadence)
+  const releaseTypeInput =
+    process.env.RELEASE_TYPE?.trim().toLowerCase() || 'minor'
+  if (releaseTypeInput !== 'minor' && releaseTypeInput !== 'patch') {
+    console.error(
+      `Invalid RELEASE_TYPE: "${releaseTypeInput}". Expected "minor" or "patch"`
+    )
+    return null
+  }
+  const releaseType: 'minor' | 'patch' = releaseTypeInput
   let targetMinor: number
   let targetBranch: string
 
-  const targetBranchOverride = process.env.TARGET_BRANCH?.trim()
+  if (releaseType === 'patch') {
+    targetMinor = currentMinor
+    targetBranch = `core/1.${targetMinor}`
 
-  if (targetBranchOverride) {
-    // Manual override takes precedence over RELEASE_TYPE / pin-derived selection.
-    const parsed = parseTargetBranchOverride(targetBranchOverride)
-    if (!parsed) {
+    const branchExists = exec(
+      `git rev-parse --verify origin/${targetBranch}`,
+      frontendRepoPath
+    )
+
+    if (!branchExists) {
       console.error(
-        `Invalid TARGET_BRANCH: "${targetBranchOverride}". Expected format: core/<major>.<minor> (e.g. core/1.47 or core/2.0)`
-      )
-      return null
-    }
-
-    targetMajor = parsed.major
-    targetMinor = parsed.minor
-    targetBranch = parsed.branch
-
-    if (!branchExists(targetBranch, frontendRepoPath)) {
-      console.error(
-        `Manual override branch ${targetBranch} does not exist in frontend repo`
+        `Patch release requested but branch ${targetBranch} does not exist`
       )
       return null
     }
 
     console.error(
-      `Manual override: targeting ${targetBranch} (ignoring release_type)`
+      `Patch release: targeting current production branch ${targetBranch}`
     )
   } else {
-    // Determine target branch based on release type:
-    //   'patch' → target current minor (hotfix for production version)
-    //   'minor' → try next minor, fall back to current minor (bi-weekly cadence)
-    const releaseTypeInput =
-      process.env.RELEASE_TYPE?.trim().toLowerCase() || 'minor'
-    if (releaseTypeInput !== 'minor' && releaseTypeInput !== 'patch') {
-      console.error(
-        `Invalid RELEASE_TYPE: "${releaseTypeInput}". Expected "minor" or "patch"`
-      )
-      return null
-    }
-    const releaseType: 'minor' | 'patch' = releaseTypeInput
+    // Try next minor first, fall back to current minor if not available
+    targetMinor = currentMinor + 1
+    targetBranch = `core/1.${targetMinor}`
 
-    if (releaseType === 'patch') {
+    const nextMinorExists = exec(
+      `git rev-parse --verify origin/${targetBranch}`,
+      frontendRepoPath
+    )
+
+    if (!nextMinorExists) {
+      // Fall back to current minor for minor release
       targetMinor = currentMinor
-      targetBranch = `core/${targetMajor}.${targetMinor}`
+      targetBranch = `core/1.${targetMinor}`
 
-      if (!branchExists(targetBranch, frontendRepoPath)) {
+      const currentMinorExists = exec(
+        `git rev-parse --verify origin/${targetBranch}`,
+        frontendRepoPath
+      )
+
+      if (!currentMinorExists) {
         console.error(
-          `Patch release requested but branch ${targetBranch} does not exist`
+          `Neither core/1.${currentMinor + 1} nor core/1.${currentMinor} branches exist in frontend repo`
         )
         return null
       }
 
       console.error(
-        `Patch release: targeting current production branch ${targetBranch}`
+        `Next minor branch core/1.${currentMinor + 1} not found, falling back to core/1.${currentMinor} for minor release`
       )
-    } else {
-      // Try next minor first, fall back to current minor if not available
-      targetMinor = currentMinor + 1
-      targetBranch = `core/${targetMajor}.${targetMinor}`
-
-      if (!branchExists(targetBranch, frontendRepoPath)) {
-        // Fall back to current minor for minor release
-        targetMinor = currentMinor
-        targetBranch = `core/${targetMajor}.${targetMinor}`
-
-        if (!branchExists(targetBranch, frontendRepoPath)) {
-          console.error(
-            `Neither core/${targetMajor}.${currentMinor + 1} nor core/${targetMajor}.${currentMinor} branches exist in frontend repo`
-          )
-          return null
-        }
-
-        console.error(
-          `Next minor branch core/${targetMajor}.${currentMinor + 1} not found, falling back to core/${targetMajor}.${currentMinor} for minor release`
-        )
-      }
     }
   }
 
-  // Get latest patch tag for target major.minor
-  const latestPatchTag = getLatestPatchTag(
-    frontendRepoPath,
-    targetMajor,
-    targetMinor
-  )
+  // Get latest patch tag for target minor
+  const latestPatchTag = getLatestPatchTag(frontendRepoPath, targetMinor)
 
-  let needsRelease: boolean
-  let branchHeadSha: string | null
+  let needsRelease = false
+  let branchHeadSha: string | null = null
   let tagCommitSha: string | null = null
-  let targetVersion: string
+  let targetVersion = currentVersion
 
   if (latestPatchTag) {
     // Get commit SHA for the tag
@@ -309,23 +231,34 @@ function resolveRelease(
     const commitCount = parseInt(commitsBetween, 10)
     needsRelease = !isNaN(commitCount) && commitCount > 0
 
-    const nextVersion = computeTargetVersion(
-      targetMajor,
-      targetMinor,
-      latestPatchTag,
-      needsRelease
-    )
-    if (!nextVersion) {
+    // Parse existing patch number and increment if needed
+    const tagVersion = latestPatchTag.replace('v', '')
+
+    // Validate tag version format
+    if (!isValidSemver(tagVersion)) {
       console.error(
-        `Invalid tag version format: ${latestPatchTag}. Expected format: vX.Y.Z`
+        `Invalid tag version format: ${tagVersion}. Expected format: X.Y.Z`
       )
       return null
     }
-    targetVersion = nextVersion
+
+    const [, , existingPatch] = tagVersion.split('.').map(Number)
+
+    // Validate existingPatch is a valid number
+    if (!Number.isFinite(existingPatch) || existingPatch < 0) {
+      console.error(`Invalid patch number in tag: ${existingPatch}`)
+      return null
+    }
+
+    if (needsRelease) {
+      targetVersion = `1.${targetMinor}.${existingPatch + 1}`
+    } else {
+      targetVersion = tagVersion
+    }
   } else {
-    // No tags exist for this major.minor version, need to create the .0 patch
+    // No tags exist for this minor version, need to create v1.{targetMinor}.0
     needsRelease = true
-    targetVersion = `${targetMajor}.${targetMinor}.0`
+    targetVersion = `1.${targetMinor}.0`
     branchHeadSha = exec(
       `git rev-parse origin/${targetBranch}`,
       frontendRepoPath
@@ -348,41 +281,26 @@ function resolveRelease(
   }
 }
 
-/**
- * Main execution: parse args, resolve, and print the JSON result.
- */
-function main(): void {
-  const comfyuiRepoPath = process.argv[2]
-  const frontendRepoPath = process.argv[3] || process.cwd()
+// Main execution
+const comfyuiRepoPath = process.argv[2]
+const frontendRepoPath = process.argv[3] || process.cwd()
 
-  if (!comfyuiRepoPath) {
-    console.error(
-      'Usage: resolve-comfyui-release.ts <comfyui-repo-path> [frontend-repo-path]'
-    )
-    process.exit(1)
-  }
-
-  const releaseInfo = resolveRelease(comfyuiRepoPath, frontendRepoPath)
-
-  if (!releaseInfo) {
-    console.error('Failed to resolve release information')
-    process.exit(1)
-  }
-
-  // Output as JSON for GitHub Actions
-  // oxlint-disable-next-line no-console -- stdout is captured by the workflow
-  console.log(JSON.stringify(releaseInfo, null, 2))
+if (!comfyuiRepoPath) {
+  console.error(
+    'Usage: resolve-comfyui-release.ts <comfyui-repo-path> [frontend-repo-path]'
+  )
+  process.exit(1)
 }
 
-// Only run when invoked directly, not when imported by tests.
-if (process.argv[1] && import.meta.url === `file://${process.argv[1]}`) {
-  main()
+const releaseInfo = resolveRelease(comfyuiRepoPath, frontendRepoPath)
+
+if (!releaseInfo) {
+  console.error('Failed to resolve release information')
+  process.exit(1)
 }
 
-export {
-  computeTargetVersion,
-  isValidSemver,
-  parseRequirementsVersion,
-  parseTargetBranchOverride,
-  resolveRelease
-}
+// Output as JSON for GitHub Actions
+// oxlint-disable-next-line no-console -- stdout is captured by the workflow
+console.log(JSON.stringify(releaseInfo, null, 2))
+
+export { resolveRelease }

scripts/collect-i18n-node-defs.ts

@@ -3,10 +3,7 @@ import * as fs from 'fs'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 
 import { comfyPageFixture as test } from '../browser_tests/fixtures/ComfyPage'
-import {
-  escapeVueI18nMessageSyntax,
-  normalizeI18nKey
-} from '@/utils/formatUtil'
+import { normalizeI18nKey } from '../packages/shared-frontend-utils/src/formatUtil'
 import type { ComfyNodeDefImpl } from '../src/stores/nodeDefStore'
 
 const localePath = './src/locales/en/main.json'
@@ -47,6 +44,8 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
     }
   )
 
+  console.log(`Collected ${nodeDefs.length} node definitions`)
+
   const allDataTypesLocale = Object.fromEntries(
     nodeDefs
       .flatMap((nodeDef) => {
@@ -61,7 +60,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
         )
         return allDataTypes.map((dataType) => [
           normalizeI18nKey(dataType),
-          escapeVueI18nMessageSyntax(dataType)
+          dataType
         ])
       })
       .sort((a, b) => a[0].localeCompare(b[0]))
@@ -99,10 +98,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
         const runtimeWidgets = Object.fromEntries(
           Object.entries(widgetsMappings)
             .sort((a, b) => a[0].localeCompare(b[0]))
-            .map(([key, value]) => [
-              normalizeI18nKey(key),
-              { name: value ? escapeVueI18nMessageSyntax(value) : value }
-            ])
+            .map(([key, value]) => [normalizeI18nKey(key), { name: value }])
         )
 
         if (Object.keys(runtimeWidgets).length > 0) {
@@ -125,10 +121,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
   function extractInputs(nodeDef: ComfyNodeDefImpl) {
     const inputs = Object.fromEntries(
       Object.values(nodeDef.inputs).flatMap((input) => {
-        const name =
-          input.name === undefined
-            ? undefined
-            : escapeVueI18nMessageSyntax(input.name)
+        const name = input.name
         const tooltip = input.tooltip
 
         if (name === undefined && tooltip === undefined) {
@@ -153,10 +146,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
     const outputs = Object.fromEntries(
       nodeDef.outputs.flatMap((output, i) => {
         // Ignore data types if they are already translated in allDataTypesLocale.
-        const name =
-          output.name === undefined || output.name in allDataTypesLocale
-            ? undefined
-            : escapeVueI18nMessageSyntax(output.name)
+        const name = output.name in allDataTypesLocale ? undefined : output.name
         const tooltip = output.tooltip
 
         if (name === undefined && tooltip === undefined) {
@@ -189,12 +179,8 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
         return [
           normalizeI18nKey(nodeDef.name),
           {
-            display_name: escapeVueI18nMessageSyntax(
-              nodeDef.display_name ?? nodeDef.name
-            ),
-            description: nodeDef.description
-              ? escapeVueI18nMessageSyntax(nodeDef.description)
-              : undefined,
+            display_name: nodeDef.display_name ?? nodeDef.name,
+            description: nodeDef.description || undefined,
             inputs: Object.keys(inputs).length > 0 ? inputs : undefined,
             outputs: extractOutputs(nodeDef)
           }
@@ -206,10 +192,7 @@ test('collect-i18n-node-defs', async ({ comfyPage }) => {
     nodeDefs.flatMap((nodeDef) =>
       nodeDef.category
         .split('/')
-        .map((category) => [
-          normalizeI18nKey(category),
-          escapeVueI18nMessageSyntax(category)
-        ])
+        .map((category) => [normalizeI18nKey(category), category])
     )
   )
 

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,67 +4,37 @@
     data-testid="bounding-boxes"
     @pointerdown.stop
   >
-    <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
-          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
-          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 text-node-component-slot-text 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
+      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>
 
     <div
@@ -152,6 +122,16 @@
     <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>
 
@@ -167,9 +147,6 @@ 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: () => [] })
 
@@ -195,8 +172,7 @@ const {
   commitInlineEditor,
   setActiveType,
   clearAll,
-  syncState,
-  grid
+  syncState
 } = useBoundingBoxes(nodeId, {
   canvasEl,
   canvasContainer,

src/components/builder/AppModeWidgetList.vue

@@ -126,7 +126,7 @@ function nodeToNodeData(node: LGraphNode) {
 
   return {
     ...nodeData,
-    hasErrors: !!executionErrorStore.surfacedNodeErrors?.[node.id],
+    hasErrors: !!executionErrorStore.lastNodeErrors?.[node.id],
     dropIndicator,
     onDragDrop: node.onDragDrop,
     onDragOver: node.onDragOver

src/components/common/DropdownMenu.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ZIndex } from '@primeuix/utils/zindex'
 import type { MenuItem } from 'primevue/menuitem'
 import {
   DropdownMenuArrow,
@@ -11,10 +12,12 @@ import { computed, ref, toValue } from 'vue'
 
 import DropdownItem from '@/components/common/DropdownItem.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useModalLiftedZIndex } from '@/composables/useModalLiftedZIndex'
 import { cn } from '@comfyorg/tailwind-utils'
 import type { ButtonVariants } from '../ui/button/button.variants'
 
+// Shared base for @primeuix's auto-incrementing 'modal' z-index counter.
+const MODAL_BASE_Z_INDEX = 1700
+
 defineOptions({
   inheritAttrs: false
 })
@@ -43,8 +46,15 @@ const contentClass = computed(() =>
   )
 )
 
+// Body-portaled content keeps its static z-1700 unless a dialog that joined
+// @primeuix's auto-incrementing 'modal' counter is open above it; then lift
+// past that dialog so the menu isn't hidden behind it.
 const open = ref(false)
-const contentStyle = useModalLiftedZIndex(open)
+const contentStyle = computed(() => {
+  if (!open.value) return undefined
+  const topZIndex = ZIndex.getCurrent('modal')
+  return topZIndex >= MODAL_BASE_Z_INDEX ? { zIndex: topZIndex + 1 } : undefined
+})
 </script>
 
 <template>

src/components/dialog/GlobalDialog.test.ts

@@ -1,10 +1,10 @@
 import { createTestingPinia } from '@pinia/testing'
-import { cleanup, render, screen, waitFor } from '@testing-library/vue'
+import { cleanup, render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { setActivePinia } from 'pinia'
 import PrimeVue from 'primevue/config'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { defineComponent, h, nextTick } from 'vue'
+import { defineComponent, h } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
@@ -12,9 +12,6 @@ import {
   onRekaFocusOutside,
   onRekaPointerDownOutside
 } from '@/components/dialog/rekaPrimeVueBridge'
-import UiDialog from '@/components/ui/dialog/Dialog.vue'
-import UiDialogOverlay from '@/components/ui/dialog/DialogOverlay.vue'
-import UiDialogPortal from '@/components/ui/dialog/DialogPortal.vue'
 import { useDialogStore } from '@/stores/dialogStore'
 
 const i18n = createI18n({
@@ -32,14 +29,6 @@ const Body = defineComponent({
   setup: () => () => h('p', { 'data-testid': 'body' }, 'body content')
 })
 
-const ClosedNonModalDialog = defineComponent({
-  name: 'ClosedNonModalDialog',
-  setup: () => () =>
-    h(UiDialog, { open: false, modal: false }, () =>
-      h(UiDialogPortal, null, () => h(UiDialogOverlay))
-    )
-})
-
 function mountDialog() {
   return render(GlobalDialog, {
     global: { plugins: [PrimeVue, i18n] }
@@ -286,81 +275,6 @@ describe('GlobalDialog Reka parity with PrimeVue', () => {
   })
 })
 
-describe('GlobalDialog Reka overlay scrim', () => {
-  beforeEach(() => {
-    setActivePinia(createTestingPinia({ stubActions: false }))
-  })
-
-  afterEach(() => {
-    cleanup()
-  })
-
-  it('renders a backdrop scrim for modal Reka dialogs', async () => {
-    mountDialog()
-    const store = useDialogStore()
-
-    store.showDialog({
-      key: 'reka-modal-scrim',
-      title: 'Modal',
-      component: Body,
-      dialogComponentProps: { renderer: 'reka' }
-    })
-
-    await screen.findByRole('dialog')
-    expect(screen.queryAllByTestId('dialog-overlay')).toHaveLength(1)
-  })
-
-  it('shows a backdrop scrim while a non-modal Reka dialog is open', async () => {
-    // Reka's own DialogOverlay renders nothing when the root is non-modal,
-    // which silently dropped the scrim behind Settings/Manager (modal: false).
-    mountDialog()
-    const store = useDialogStore()
-
-    store.showDialog({
-      key: 'reka-non-modal-scrim',
-      title: 'Non-modal',
-      component: Body,
-      dialogComponentProps: { renderer: 'reka', modal: false }
-    })
-
-    await screen.findByRole('dialog')
-    expect(screen.queryAllByTestId('dialog-overlay')).toHaveLength(1)
-
-    store.closeDialog({ key: 'reka-non-modal-scrim' })
-    await waitFor(() =>
-      expect(screen.queryAllByTestId('dialog-overlay')).toHaveLength(0)
-    )
-  })
-
-  it('renders no scrim for a mounted but closed non-modal dialog', async () => {
-    // CustomizationDialog mounts its non-modal Dialog root with open=false;
-    // the scrim must stay gated on open, not just on mount.
-    render(ClosedNonModalDialog)
-    await nextTick()
-    expect(screen.queryAllByTestId('dialog-overlay')).toHaveLength(0)
-  })
-
-  it('dismisses the dialog on a scrim pointerdown', async () => {
-    mountDialog()
-    const store = useDialogStore()
-    const user = userEvent.setup()
-
-    store.showDialog({
-      key: 'reka-scrim-dismiss',
-      title: 'Non-modal',
-      component: Body,
-      dialogComponentProps: { renderer: 'reka', modal: false }
-    })
-
-    await screen.findByRole('dialog')
-    await user.click(screen.getByTestId('dialog-overlay'))
-
-    await waitFor(() =>
-      expect(store.isDialogOpen('reka-scrim-dismiss')).toBe(false)
-    )
-  })
-})
-
 describe('shouldPreventRekaDismiss', () => {
   function makeEvent(target: Element | null) {
     let prevented = false
@@ -449,12 +363,6 @@ describe('shouldPreventRekaDismiss', () => {
     expect(event.defaultPrevented).toBe(false)
   })
 
-  it('focus-outside never dismisses when dismissOnFocusOutside is false', () => {
-    const event = makeEvent(document.body)
-    onRekaFocusOutside(event, { dismissOnFocusOutside: false })
-    expect(event.defaultPrevented).toBe(true)
-  })
-
   it('focus-outside on a sibling Reka portal does not dismiss the parent', () => {
     const portal = document.createElement('div')
     portal.setAttribute('role', 'dialog')

src/components/dialog/GlobalDialog.vue

@@ -32,9 +32,7 @@
                 dialogStore.activeKey === item.key
               )
           "
-          @focus-outside="
-            (e) => onRekaFocusOutside(e, item.dialogComponentProps)
-          "
+          @focus-outside="onRekaFocusOutside"
           @mousedown="() => dialogStore.riseDialog({ key: item.key })"
         >
           <template v-if="item.dialogComponentProps.headless">

src/components/dialog/content/signin/SignUpForm.test.ts

@@ -7,7 +7,7 @@ import Password from 'primevue/password'
 import PrimeVue from 'primevue/config'
 import ProgressSpinner from 'primevue/progressspinner'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, defineComponent, h, nextTick, ref } from 'vue'
+import { defineComponent, h, nextTick, ref } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import enMessages from '@/locales/en/main.json' with { type: 'json' }
@@ -38,45 +38,29 @@ vi.mock('@/stores/authStore', () => ({
 }))
 
 const mockTurnstileEnabled = ref(false)
-const mockTurnstileToken = ref('')
-const mockTurnstileUnavailable = ref(false)
+const mockTurnstileEnforced = ref(false)
 const mockReset = vi.fn()
 let emitTurnstileToken: ((token: string) => void) | undefined
-let emitTurnstileUnavailable: ((unavailable: boolean) => void) | undefined
 
-// The reset-on-toggle behavior lives in useTurnstileGate itself (see
-// useTurnstile.test.ts); this fake just wires token/unavailable through to
-// `waiting` the same way so SignUpForm's submit gating can be exercised.
 vi.mock('@/composables/auth/useTurnstile', () => ({
   useTurnstile: () => ({
-    enabled: mockTurnstileEnabled
-  }),
-  useTurnstileGate: () => ({
-    token: mockTurnstileToken,
-    unavailable: mockTurnstileUnavailable,
-    waiting: computed(
-      () =>
-        mockTurnstileEnabled.value &&
-        !mockTurnstileToken.value &&
-        !mockTurnstileUnavailable.value
-    )
+    enabled: mockTurnstileEnabled,
+    enforced: mockTurnstileEnforced
   })
 }))
 
 // Stub the real widget (which loads the external Turnstile script) with one that
-// exposes a spyable reset() and lets a test drive the v-model token/unavailable
-// the way a solved challenge (or a broken/slow widget) would.
+// exposes a spyable reset() and lets a test drive the v-model token the way a
+// solved challenge would.
 vi.mock('./TurnstileWidget.vue', async () => {
   const { defineComponent: defineMock } = await import('vue')
   return {
     default: defineMock({
       name: 'TurnstileWidget',
-      emits: ['update:token', 'update:unavailable'],
+      emits: ['update:token'],
       setup(_, { expose, emit }) {
         expose({ reset: mockReset })
         emitTurnstileToken = (token: string) => emit('update:token', token)
-        emitTurnstileUnavailable = (unavailable: boolean) =>
-          emit('update:unavailable', unavailable)
         return () => null
       }
     })
@@ -108,11 +92,9 @@ describe('SignUpForm', () => {
   beforeEach(() => {
     mockLoadingRef.value = false
     mockTurnstileEnabled.value = false
-    mockTurnstileToken.value = ''
-    mockTurnstileUnavailable.value = false
+    mockTurnstileEnforced.value = false
     mockReset.mockClear()
     emitTurnstileToken = undefined
-    emitTurnstileUnavailable = undefined
   })
 
   afterEach(() => {
@@ -229,22 +211,43 @@ describe('SignUpForm', () => {
     })
   })
 
-  // Regression coverage for the shadow-mode race: previously submit was only
-  // gated in 'enforce' mode, so most real signups in 'shadow' mode raced
-  // ahead of the async Cloudflare challenge and reached the backend with an
-  // empty token. Gating now depends only on whether the widget is enabled
-  // (shadow or enforce both render it), so both modes behave identically here.
-  describe('Turnstile submit gating', () => {
-    it('disables the submit button until a token is present', async () => {
+  describe('Turnstile token hygiene', () => {
+    it('clears the stale token when Turnstile becomes disabled', async () => {
       mockTurnstileEnabled.value = true
+      mockTurnstileEnforced.value = true
+      const { user } = renderComponent()
+      await fillValidSignup(user)
+
+      emitTurnstileToken!('stale-token')
+      await nextTick()
+      expect(
+        screen.getByRole('button', { name: signUpButton })
+      ).not.toBeDisabled()
+
+      mockTurnstileEnabled.value = false
+      await nextTick()
+
+      // re-enable: the stale token must have been cleared so submit is blocked again
+      mockTurnstileEnabled.value = true
+      await nextTick()
+
+      expect(screen.getByRole('button', { name: signUpButton })).toBeDisabled()
+    })
+  })
+
+  describe('Turnstile submit gating', () => {
+    it('disables the submit button in enforce mode until a token is present', async () => {
+      mockTurnstileEnabled.value = true
+      mockTurnstileEnforced.value = true
       renderComponent()
       await nextTick()
 
       expect(screen.getByRole('button', { name: signUpButton })).toBeDisabled()
     })
 
-    it('does not emit submit while the token is empty', async () => {
+    it('does not emit submit in enforce mode while the token is empty', async () => {
       mockTurnstileEnabled.value = true
+      mockTurnstileEnforced.value = true
       const onSubmit = vi.fn()
       const { user } = renderComponent({ onSubmit })
       await fillValidSignup(user)
@@ -254,8 +257,9 @@ describe('SignUpForm', () => {
       expect(onSubmit).not.toHaveBeenCalled()
     })
 
-    it('emits submit with the token once the challenge is solved', async () => {
+    it('emits submit with the token in enforce mode once the challenge is solved', async () => {
       mockTurnstileEnabled.value = true
+      mockTurnstileEnforced.value = true
       const onSubmit = vi.fn()
       const { user } = renderComponent({ onSubmit })
       await fillValidSignup(user)
@@ -267,14 +271,13 @@ describe('SignUpForm', () => {
       expect(onSubmit).toHaveBeenCalledWith(expectedValues, 'token-xyz')
     })
 
-    it('emits submit without a token once the widget reports itself unavailable (broken/slow load fallback)', async () => {
+    it('emits submit without a token in shadow mode (never blocks)', async () => {
       mockTurnstileEnabled.value = true
+      mockTurnstileEnforced.value = false
       const onSubmit = vi.fn()
       const { user } = renderComponent({ onSubmit })
       await fillValidSignup(user)
 
-      emitTurnstileUnavailable!(true)
-      await nextTick()
       await user.click(screen.getByRole('button', { name: signUpButton }))
 
       expect(onSubmit).toHaveBeenCalledWith(expectedValues, undefined)

src/components/dialog/content/signin/SignUpForm.vue

@@ -33,11 +33,10 @@
       v-if="turnstileEnabled"
       ref="turnstileWidget"
       v-model:token="turnstileToken"
-      v-model:unavailable="turnstileUnavailable"
     />
 
     <small
-      v-show="waitingForTurnstile"
+      v-show="submitBlockedByTurnstile"
       id="comfy-org-sign-up-turnstile-hint"
       role="status"
       aria-live="polite"
@@ -52,9 +51,11 @@
       v-else
       type="submit"
       class="mt-4 h-10 font-medium"
-      :disabled="!$form.valid || waitingForTurnstile"
+      :disabled="!$form.valid || submitBlockedByTurnstile"
       :aria-describedby="
-        waitingForTurnstile ? 'comfy-org-sign-up-turnstile-hint' : undefined
+        submitBlockedByTurnstile
+          ? 'comfy-org-sign-up-turnstile-hint'
+          : undefined
       "
     >
       {{ t('auth.signup.signUpButton') }}
@@ -69,11 +70,11 @@ import { zodResolver } from '@primevue/forms/resolvers/zod'
 import { useThrottleFn } from '@vueuse/core'
 import InputText from 'primevue/inputtext'
 import ProgressSpinner from 'primevue/progressspinner'
-import { computed, useTemplateRef } from 'vue'
+import { computed, ref, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
-import { useTurnstile, useTurnstileGate } from '@/composables/auth/useTurnstile'
+import { useTurnstile } from '@/composables/auth/useTurnstile'
 import { signUpSchema } from '@/schemas/signInSchema'
 import type { SignUpData } from '@/schemas/signInSchema'
 import { useAuthStore } from '@/stores/authStore'
@@ -85,21 +86,25 @@ const { t } = useI18n()
 const authStore = useAuthStore()
 const loading = computed(() => authStore.loading)
 
-const { enabled: turnstileEnabled } = useTurnstile()
-const {
-  token: turnstileToken,
-  unavailable: turnstileUnavailable,
-  waiting: waitingForTurnstile
-} = useTurnstileGate(turnstileEnabled)
+const { enabled: turnstileEnabled, enforced: turnstileEnforced } =
+  useTurnstile()
+const turnstileToken = ref('')
 const turnstileWidget =
   useTemplateRef<InstanceType<typeof TurnstileWidget>>('turnstileWidget')
+const submitBlockedByTurnstile = computed(
+  () => turnstileEnforced.value && !turnstileToken.value
+)
+
+watch(turnstileEnabled, (on) => {
+  if (!on) turnstileToken.value = ''
+})
 
 const emit = defineEmits<{
   submit: [values: SignUpData, turnstileToken?: string]
 }>()
 
 const onSubmit = useThrottleFn((event: FormSubmitEvent) => {
-  if (event.valid && !waitingForTurnstile.value) {
+  if (event.valid && !submitBlockedByTurnstile.value) {
     emit(
       'submit',
       event.values as SignUpData,

src/components/dialog/content/signin/TurnstileWidget.test.ts

@@ -261,138 +261,4 @@ describe('TurnstileWidget', () => {
 
     expect(api.remove).toHaveBeenCalledWith('widget-id')
   })
-
-  // A widget that never resolves (broken script, ad-blocker, CDN outage, or a
-  // hung challenge) must eventually tell the parent it cannot be relied on,
-  // so submission can fall back instead of blocking a legitimate signup
-  // forever.
-  describe('unavailable fallback', () => {
-    it('reports unavailable when the Turnstile script fails to load', async () => {
-      mockLoadTurnstile.mockRejectedValue(new Error('script failed'))
-
-      const { emitted } = renderWidget()
-      await flush()
-
-      expect(emitted()['update:unavailable']?.at(-1)).toEqual([true])
-    })
-
-    it('reports unavailable on a challenge error', async () => {
-      const { api, options } = fakeTurnstile()
-      mockLoadTurnstile.mockResolvedValue(api)
-
-      const { emitted } = renderWidget()
-      await flush()
-
-      options()!['error-callback']!()
-      await flush()
-
-      expect(emitted()['update:unavailable']?.at(-1)).toEqual([true])
-    })
-
-    it('clears the unavailable fallback once a token is solved', async () => {
-      const { api, options } = fakeTurnstile()
-      mockLoadTurnstile.mockResolvedValue(api)
-
-      const { emitted } = renderWidget()
-      await flush()
-
-      options()!['error-callback']!()
-      await flush()
-      expect(emitted()['update:unavailable']?.at(-1)).toEqual([true])
-
-      options()!.callback!('token-abc')
-      await flush()
-
-      expect(emitted()['update:unavailable']?.at(-1)).toEqual([false])
-    })
-
-    it('falls back once the widget fails to resolve within the load timeout', async () => {
-      vi.useFakeTimers()
-      try {
-        const { api, options } = fakeTurnstile()
-        mockLoadTurnstile.mockResolvedValue(api)
-
-        const { emitted } = renderWidget()
-        // Let the onMounted hook's `await loadTurnstile()` microtask settle
-        // and render() run, without yet advancing to the timeout itself.
-        await vi.advanceTimersByTimeAsync(0)
-        expect(options()).toBeDefined()
-        expect(emitted()['update:unavailable']).toBeUndefined()
-
-        await vi.advanceTimersByTimeAsync(9_000)
-
-        expect(emitted()['update:unavailable']?.at(-1)).toEqual([true])
-      } finally {
-        vi.useRealTimers()
-      }
-    })
-
-    it('does not fall back once a token arrives before the load timeout', async () => {
-      vi.useFakeTimers()
-      try {
-        const { api, options } = fakeTurnstile()
-        mockLoadTurnstile.mockResolvedValue(api)
-
-        const { emitted } = renderWidget()
-        await vi.advanceTimersByTimeAsync(0)
-
-        options()!.callback!('token-abc')
-        await vi.advanceTimersByTimeAsync(9_000)
-
-        expect(emitted()['update:unavailable']).toBeUndefined()
-      } finally {
-        vi.useRealTimers()
-      }
-    })
-
-    it('resets the widget to fetch a fresh challenge on token expiry', async () => {
-      const { api, options } = fakeTurnstile()
-      mockLoadTurnstile.mockResolvedValue(api)
-      window.turnstile = api as unknown as NonNullable<Window['turnstile']>
-
-      renderWidget()
-      await flush()
-
-      options()!.callback!('token-abc')
-      options()!['expired-callback']!()
-      await flush()
-
-      expect(api.reset).toHaveBeenCalledWith('widget-id')
-    })
-
-    it('falls back if a post-solve expiry is not followed by a fresh token within the load timeout', async () => {
-      vi.useFakeTimers()
-      try {
-        const { api, options } = fakeTurnstile()
-        mockLoadTurnstile.mockResolvedValue(api)
-        window.turnstile = api as unknown as NonNullable<Window['turnstile']>
-
-        const { emitted } = renderWidget()
-        await vi.advanceTimersByTimeAsync(0)
-
-        // Establish a solved, available widget: an initial error marks it
-        // unavailable, then solving a challenge clears that (the same
-        // transition the existing "clears the unavailable fallback" test
-        // verifies), so the expiry below is the only thing driving fallback.
-        options()!['error-callback']!()
-        options()!.callback!('token-abc')
-        expect(emitted()['update:unavailable']?.at(-1)).toEqual([false])
-
-        // The token later expires (e.g. tab backgrounded past its ~300s
-        // lifetime) without the widget itself erroring.
-        options()!['expired-callback']!()
-        await vi.advanceTimersByTimeAsync(0)
-
-        // A fresh challenge was requested, but nothing solves it before the
-        // re-armed load timeout elapses, so submission must eventually be
-        // unblocked rather than staying stuck forever.
-        expect(emitted()['update:unavailable']?.at(-1)).toEqual([false])
-        await vi.advanceTimersByTimeAsync(9_000)
-
-        expect(emitted()['update:unavailable']?.at(-1)).toEqual([true])
-      } finally {
-        vi.useRealTimers()
-      }
-    })
-  })
 })

src/components/dialog/content/signin/TurnstileWidget.vue

@@ -12,7 +12,6 @@
 </template>
 
 <script setup lang="ts">
-import { useTimeoutFn } from '@vueuse/core'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -21,14 +20,6 @@ import { getTurnstileSiteKey } from '@/config/turnstile'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 
 const token = defineModel<string>('token', { default: '' })
-/**
- * Set true whenever the widget cannot be relied on to ever produce a token:
- * the Cloudflare script failed to load, the rendered challenge errored out,
- * or it simply hasn't resolved within `TURNSTILE_LOAD_TIMEOUT_MS`. The parent
- * uses this to stop waiting on a token so a broken/slow widget (network
- * issue, ad-blocker, CDN outage) can never permanently block signup.
- */
-const unavailable = defineModel<boolean>('unavailable', { default: false })
 
 const { t } = useI18n()
 const colorPaletteStore = useColorPaletteStore()
@@ -37,16 +28,6 @@ const containerRef = ref<HTMLDivElement>()
 const errorMessage = ref('')
 let widgetId: string | undefined
 
-/** How long to wait for the widget to resolve before falling back. */
-const TURNSTILE_LOAD_TIMEOUT_MS = 9_000
-const { start: armTimeout, stop: clearLoadTimeout } = useTimeoutFn(
-  () => {
-    unavailable.value = true
-  },
-  TURNSTILE_LOAD_TIMEOUT_MS,
-  { immediate: false }
-)
-
 const clearToken = () => {
   token.value = ''
 }
@@ -65,18 +46,12 @@ const reset = () => {
   errorMessage.value = ''
   if (widgetId && window.turnstile) {
     window.turnstile.reset(widgetId)
-    // A widget that renders can request a fresh challenge, so give it
-    // another chance before falling back again.
-    unavailable.value = false
-    armTimeout()
   }
 }
 
 defineExpose({ reset })
 
 onMounted(async () => {
-  armTimeout()
-
   try {
     const turnstile = await loadTurnstile()
     if (!containerRef.value) return
@@ -89,37 +64,23 @@ onMounted(async () => {
       sitekey: getTurnstileSiteKey(),
       theme,
       callback: (newToken: string) => {
-        clearLoadTimeout()
         errorMessage.value = ''
-        unavailable.value = false
         token.value = newToken
       },
       'expired-callback': () => {
         clearToken()
         errorMessage.value = t('auth.turnstile.expired')
-        if (widgetId && window.turnstile) {
-          window.turnstile.reset(widgetId)
-          // A solved token can expire on its own (e.g. the tab was
-          // backgrounded past the token's ~300s lifetime) without the widget
-          // ever erroring, so proactively request a fresh challenge and
-          // re-arm the load timeout in case it doesn't resolve in time.
-          armTimeout()
-        }
       },
       'error-callback': () => {
         clearToken()
-        clearLoadTimeout()
         console.warn('Turnstile challenge failed')
         errorMessage.value = t('auth.turnstile.failed')
-        unavailable.value = true
         if (widgetId && window.turnstile) window.turnstile.reset(widgetId)
       }
     })
   } catch (error) {
-    clearLoadTimeout()
     console.warn('Turnstile failed to load', error)
     errorMessage.value = t('auth.turnstile.failed')
-    unavailable.value = true
   }
 })
 

src/components/dialog/rekaPrimeVueBridge.ts

@@ -53,22 +53,7 @@ export function onRekaPointerDownOutside(
 // nested Reka or PrimeVue dialog teleported to body). Without this guard a
 // non-modal Reka dialog would dismiss itself the moment a nested dialog
 // receives focus.
-//
-// A container dialog (e.g. Settings) that hosts nested confirm/edit dialogs can
-// also lose focus to an ordinary app element — not just a portal — when a
-// nested dialog closes and the element it focused was removed (deleting the
-// selected row). That programmatic focus shift is not a dismiss intent, so such
-// a dialog opts out of focus-outside dismissal entirely via
-// `dismissOnFocusOutside: false`; it still dismisses on escape or an outside
-// pointer.
-export function onRekaFocusOutside(
-  event: OutsideEvent,
-  options: { dismissOnFocusOutside?: boolean } = {}
-) {
-  if (options.dismissOnFocusOutside === false) {
-    event.preventDefault()
-    return
-  }
+export function onRekaFocusOutside(event: OutsideEvent) {
   if (isInsideOverlay(event.detail.originalEvent.target)) {
     event.preventDefault()
   }

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', { name: '+' }))
+    await userEvent.click(screen.getByRole('button'))
     expect(lastEmit(emitted)).toEqual(['#ff0000', '#ffffff'])
   })
 
@@ -44,14 +44,18 @@ describe('PaletteSwatchRow', () => {
 
   it('hides the add button once the max is reached', () => {
     renderRow(['#a', '#b'], 2)
-    expect(screen.queryByRole('button', { name: '+' })).toBeNull()
+    expect(screen.queryByRole('button')).toBeNull()
   })
 
-  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('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('starts a drag on pointer down without emitting', async () => {