diff --git a/.claude/skills/add-model-page/SKILL.md b/.claude/skills/add-model-page/SKILL.md
new file mode 100644
index 0000000000..0b7fe4b81e
--- /dev/null
+++ b/.claude/skills/add-model-page/SKILL.md
@@ -0,0 +1,173 @@
+---
+name: add-model-page
+description: 'add, update, or remove a model page entry on the comfy org website. creates a PR to Comfy-Org/ComfyUI_frontend apps/website folder with the change and posts a Vercel preview link back to Slack.'
+---
+
+# add-model-page
+
+add, update, or remove model pages in the ComfyUI website.
+
+## Trigger phrases
+
+- `Add a model page for <model-name>`
+- `Update the model page for <model-name>`
+- `Remove <model-name> from model pages`
+
+## Phase 1 — Parse the request
+
+Extract:
+
+- **action**: `add` | `update` | `remove`
+- **model-name**: raw string (e.g. `flux1-schnell`, `flux1_dev.safetensors`)
+
+Normalize to a slug: lowercase, replace `_` and `.` with `-`, strip file extensions.
+Example: `flux1_dev.safetensors` → `flux1-dev`
+
+## Architecture overview
+
+Models come from two sources merged at build time:
+
+| File                                            | Purpose                                                                                                                           |
+| ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `apps/website/src/config/generated-models.json` | Auto-generated from workflow_templates (slug, name, directory, huggingFaceUrl, workflowCount, displayName, thumbnailUrl, docsUrl) |
+| `apps/website/src/config/model-metadata.ts`     | Hand-curated overrides (docsUrl, blogUrl, featured) — only add entries that need overrides                                        |
+| `apps/website/src/config/models.ts`             | Merges the two above; exports typed `Model[]`                                                                                     |
+
+To regenerate the JSON from workflow_templates:
+
+```bash
+pnpm tsx apps/website/scripts/generate-models.ts
+```
+
+This writes `apps/website/src/config/generated-models.json` directly.
+Thumbnails are populated from local `.webp` files in `workflow_templates/templates/` — no network access needed.
+
+---
+
+## Phase 2 — Gather model data (ADD / UPDATE)
+
+Run the generator to get fresh data, then find the model:
+
+```bash
+pnpm tsx apps/website/scripts/generate-models.ts
+jq '.[] | select(.slug | contains("MODEL_SLUG"))' \
+  apps/website/src/config/generated-models.json
+```
+
+The JSON fields are:
+
+- `slug` — URL slug
+- `name` — exact filename or display name for partner nodes
+- `huggingFaceUrl` — download URL (empty for partner nodes)
+- `directory` — `diffusion_models` | `loras` | … | `partner_nodes`
+- `workflowCount` — integer
+- `displayName` — human-readable name
+
+If no match and it is a known API/partner model, add it to `API_PROVIDER_MAP` in
+`generate-models.ts` and re-run. Otherwise tell the user.
+
+---
+
+## Phase 3 — Check for existing entry
+
+```bash
+jq --arg slug "${SLUG}" '.[] | select(.slug == $slug)' \
+  apps/website/src/config/generated-models.json
+```
+
+- Match found + action is `add` → switch to UPDATE flow automatically
+- No match + action is `update` → stop and tell the user
+
+---
+
+## Phase 4A — ADD: new partner/API model not in workflow_templates
+
+For partner nodes (no local file), add an entry to `API_PROVIDER_MAP` in
+`apps/website/scripts/generate-models.ts`:
+
+```typescript
+mymodel: { name: 'My Model', slug: 'my-model' },
+```
+
+Then re-run `pnpm tsx apps/website/scripts/generate-models.ts` — it will appear
+in `generated-models.json` automatically.
+
+If you also want a `docsUrl`, `blogUrl`, or a link to the hub model page, add an entry to `model-metadata.ts`:
+
+```typescript
+'my-model': {
+  docsUrl: 'https://docs.comfy.org/tutorials/...',
+  blogUrl: 'https://blog.comfy.org/...',
+  hubSlug: 'my-model',   // slug at comfy.org/workflows/model/{hubSlug} — only set if the page exists (returns 200)
+  featured: true
+}
+```
+
+No changes to `models.ts` or `translations.ts` are needed.
+
+---
+
+## Phase 4B — UPDATE: edit existing entry
+
+Only `model-metadata.ts` needs editing for most updates (docsUrl, blogUrl,
+featured). For `displayName` or `directory` changes, edit the entry directly in
+`generated-models.json` (until the next generator run would overwrite it — then
+fix the source in `generate-models.ts`).
+
+---
+
+## Phase 4C — REMOVE: delete entry
+
+Remove the entry from `generated-models.json` (or mark it with `canonicalSlug`
+pointing to the replacement). No translation file changes needed.
+
+---
+
+## Phase 5 — Verify TypeScript
+
+```bash
+pnpm typecheck 2>&1 | grep -E "error|warning" | head -20
+```
+
+Fix any type errors before proceeding. Common issues:
+
+- `ModelDirectory` type not matching a new `directory` value — add it to the union
+- JSON import shape mismatch — `generated-models.json` must match `OutputModel`
+
+---
+
+## Phase 6 — Create PR
+
+```bash
+BRANCH="add-model-page-MODEL-SLUG"   # or update- / remove-
+git checkout -b $BRANCH
+git add apps/website/src/config/generated-models.json \
+        apps/website/scripts/generate-models.ts \
+        apps/website/src/config/model-metadata.ts
+git commit -m "feat(models): add model page for MODEL-SLUG"
+git push -u origin $BRANCH
+gh pr create \
+  --title "Add model page: MODEL-SLUG" \
+  --body "$(cat <<'EOF'
+Adds a new model page entry for MODEL-SLUG.
+
+## Changes
+- `generated-models.json`: regenerated with new entry (workflowCount N, directory DIRECTORY)
+- `model-metadata.ts`: editorial overrides (docsUrl, featured) if needed
+EOF
+)"
+```
+
+For UPDATE use branch `update-model-page-MODEL-SLUG`.
+For REMOVE use `remove-model-page-MODEL-SLUG`.
+
+---
+
+## Error states
+
+| Situation                       | Response                                                         |
+| ------------------------------- | ---------------------------------------------------------------- |
+| Model not in workflow templates | Ask user to verify spelling or add it manually as a partner node |
+| Slug already exists (add)       | Switch to update flow automatically                              |
+| Slug not found (update/remove)  | Stop and ask user to confirm                                     |
+| Typecheck fails                 | Fix the error before pushing                                     |
diff --git a/.claude/skills/backport-management/SKILL.md b/.claude/skills/backport-management/SKILL.md
index 138eb98a84..de77272667 100644
--- a/.claude/skills/backport-management/SKILL.md
+++ b/.claude/skills/backport-management/SKILL.md
@@ -9,13 +9,18 @@ Cherry-pick backport management for Comfy-Org/ComfyUI_frontend stable release br
 
 ## Quick Start
 
-1. **Discover** — Collect candidates from Slack bot + git log gap (`reference/discovery.md`)
-2. **Analyze** — Categorize MUST/SHOULD/SKIP, check deps (`reference/analysis.md`)
-3. **Human Review** — Present candidates in batches for interactive approval (see Interactive Approval Flow)
-4. **Plan** — Order by dependency (leaf fixes first), group into waves per branch
-5. **Execute** — Label-driven automation → worktree fallback for conflicts (`reference/execution.md`)
-6. **Verify** — After each wave, verify branch integrity before proceeding
-7. **Log & Report** — Generate session report (`reference/logging.md`)
+1. **Discover** — Collect candidates from Slack bot + git log gap, then **reconcile both lists** (`reference/discovery.md`)
+2. **Pre-filter by path** — Auto-skip PRs whose changed files are entirely under `apps/website/`, `browser_tests/`, `.github/`, `packages/design-system/`, `packages/{cloud,registry}-types/`, `.claude/`, `docs/`. Don't read PR bodies for these — they don't ship to core ComfyUI users (`reference/analysis.md`)
+3. **Verify target file existence** — For each surviving candidate, run `git cat-file -e origin/$TARGET:$path` for primary changed files. If they don't exist on the target, auto-mark SKIP with reason `feature-not-on-branch`
+4. **Tiered triage** — Bucket into **Tier 1 (core editor must-haves)**, **Tier 2 (cloud-distribution only)**, **Tier 3 (skip)** before reviewing individually (`reference/analysis.md`)
+5. **Analyze** — Categorize remaining MUST/SHOULD, check deps (`reference/analysis.md`)
+6. **Human Review** — Present candidates in batches for interactive approval, with tier context attached (see Interactive Approval Flow)
+7. **Plan** — Order by dependency (leaf fixes first), group into waves per branch
+8. **Test-then-resolve dry-run** — Classify clean vs conflict before committing time (`reference/execution.md`)
+9. **Execute** — Label-driven automation for clean PRs → worktree fallback for conflicts (`reference/execution.md`)
+10. **Public-API conflict review** — If conflict resolution touches a public LiteGraph callback, extension API, or `node.*` method, consult oracle for compat-regression review BEFORE pushing (`reference/execution.md`)
+11. **Verify** — Per-PR validation (typecheck + targeted tests + lint on changed files) AND per-wave verification (full typecheck + test:unit on branch HEAD)
+12. **Log & Report** — Generate session report + author accountability report + Slack status update (`reference/logging.md`)
 
 ## System Context
 
@@ -107,6 +112,35 @@ Husky hooks fail in worktrees (can't find lint-staged config). Always use `git p
 
 In the 2026-04-06 session: core/1.42 got 18/26 auto-PRs, cloud/1.42 got only 1/25. The cloud branch has more divergence. **Always plan for manual fallback** — don't assume automation will handle most PRs.
 
+### Cherry-Picked Tests Can Reference Files Added By Earlier Unbackported PRs
+
+A common conflict: PR A on main modifies a test file that was _added_ on main by an earlier PR B (not backported to the target). The cherry-pick of A reports "modify/delete" on B's test file because the file doesn't exist on the target. Adding the new file would smuggle in B's test scaffolding without B's runtime changes.
+
+**Detection:** Conflict says `deleted in HEAD and modified in <PR>`. Verify with:
+
+```bash
+git log --diff-filter=A --oneline origin/main -- path/to/test.ts
+```
+
+If the introducing commit is **not** on the target branch, the test file isn't a real prerequisite for the runtime fix.
+
+**Fix:** `git rm` the test file (drop it from the backport). Document in the commit body which PR introduced it on main and why dropping it is safe. The runtime fix itself usually doesn't depend on these tests — coverage exists at the integration layer.
+
+### Backport-Only Compatibility Shims
+
+When a PR's _mechanism_ relies on changes upstream that aren't on the older branch, a literal cherry-pick can recreate the original bug for any consumer still using the old contract. This is most dangerous for **public LiteGraph callbacks, extension APIs, and `node.*` methods** that custom-node packages depend on.
+
+**Real example (#11541, core/1.43 backport):** The PR removed `LGraphNode.vue`'s legacy `handled === true` sync-return check from `handleDrop`, replacing it with `await node.onDragDrop(event, true)`. Safe on `main` because all in-repo `onDragDrop` handlers had migrated to participate in the new `claimEvent` flag. On `core/1.43`, `onDragDrop` is a public callback — custom-node packages with synchronous `onDragDrop` returning `true` would no longer have their event claimed, recreating the duplicate-node-creation bug the PR was fixing.
+
+**Detection:** The PR's diff modifies a file that is part of a public extension API surface. Look for:
+
+- `node.onXxx` callback assignments
+- Methods on `LGraphNode`, `LGraphCanvas`, `LGraph`, `Subgraph`
+- Public exports from `src/lib/litegraph/`
+- Type changes affecting `litegraph-augmentation.d.ts`
+
+**Fix:** Add a backport-only compatibility shim that preserves the old contract while keeping the new fix. Document it explicitly in the commit body under a `## Backport-only compatibility fix` heading. Consult oracle for review before pushing — a bad shim is worse than no fix.
+
 ## Conflict Triage
 
 **Always categorize before deciding to skip. High conflict count ≠ hard conflicts.**
@@ -147,6 +181,26 @@ Skip these without discussion:
 - **Features not on target branch** — e.g., Painter, GLSLShader, appModeStore on core/1.40
 - **Cloud-only PRs on core/\* branches** — Team workspaces, cloud queue, cloud-only login. (Note: app mode and Firebase auth are NOT cloud-only — see Branch Scope Rules)
 
+### Path Pre-Filter (run BEFORE reading PR bodies)
+
+For 50+ candidate PRs, classify by changed paths first to skip the unproductive ones without spending time on triage. Run `git show --stat $SHA` (or `gh pr view --json files`) and bucket:
+
+| Path prefix                                    | Bucket                 | Reason                                           |
+| ---------------------------------------------- | ---------------------- | ------------------------------------------------ |
+| `apps/website/`                                | SKIP                   | Marketing/platform site, not core ComfyUI bundle |
+| `apps/desktop-ui/`                             | SKIP for `core/*`      | Desktop app, separate release cadence            |
+| `browser_tests/` only (no `src/`)              | SKIP                   | Test-only                                        |
+| `.github/workflows/` only                      | SKIP                   | CI/release infra                                 |
+| `packages/design-system/` only                 | SKIP                   | Design tokens, not core                          |
+| `packages/{cloud,registry,ingest}-types/` only | SKIP                   | Generated types                                  |
+| `.claude/`, `.agents/`, `docs/`                | SKIP                   | Agent / documentation                            |
+| `*.stories.ts` only                            | SKIP                   | Storybook only                                   |
+| `src/` (core editor)                           | KEEP — analyze further | Runtime/editor code that requires full triage    |
+
+A PR touches multiple paths? Keep it if **any** changed file is under `src/` (or other core paths) and run normal analysis. Auto-skip is conservative — only skip when _all_ paths match the SKIP buckets.
+
+This filter alone removes ~30-50% of candidates in a typical session, leaving only the PRs that need real triage.
+
 ## Wave Verification
 
 After merging each wave of PRs to a target branch, verify branch integrity before proceeding:
diff --git a/.claude/skills/backport-management/reference/analysis.md b/.claude/skills/backport-management/reference/analysis.md
index dd6a41b394..705448b51f 100644
--- a/.claude/skills/backport-management/reference/analysis.md
+++ b/.claude/skills/backport-management/reference/analysis.md
@@ -39,6 +39,89 @@ Check before backporting — these don't exist on older branches:
 - **App builder** — check per branch
 - **appModeStore.ts** — not on core/1.40
 
+### Verify Target File Existence (Run Before Cherry-Pick)
+
+Before cherry-picking any PR, confirm the files it modifies actually exist on the target branch. If they don't, the PR's runtime fix is for a feature that hasn't been added yet — skip cleanly without attempting cherry-pick:
+
+```bash
+# For each file the PR changes
+for f in $(gh pr view $PR --json files --jq '.files[].path' | grep -v "^browser_tests/\|\.test\." ); do
+  if ! git cat-file -e origin/$TARGET:$f 2>/dev/null; then
+    echo "MISSING on $TARGET: $f"
+  fi
+done
+```
+
+If the _primary_ changed files (the runtime ones, not tests) are missing, mark the PR `SKIP / feature-not-on-branch`. This is faster than letting cherry-pick fail with modify/delete conflicts and gives a clean signal.
+
+This check is the first thing that runs after the path pre-filter and BEFORE you spend time reading PR descriptions.
+
+## Tiered Triage (Recommended for 30+ Candidates)
+
+Before the interactive Y/N approval flow, bucket all surviving candidates into three tiers. This surfaces release-engineering decisions that a flat MUST/SHOULD list obscures:
+
+### Tier 1 — Core Editor Must-Haves
+
+User-facing bugs, crashes, data corruption, or security issues in code paths that exist on the target branch. These are the strongest backport candidates.
+
+Indicators:
+
+- `fix:` prefix and the bug is reproducible on the target branch
+- Crash guards, runtime null checks, race-condition fixes
+- Data-loss bugs (state not persisted, duplicates, drops)
+- Security hardening (CSRF, XSS, auth)
+- Vue Nodes 2.0 regression cluster (if the target ships Vue Nodes 2.0)
+- Subgraph correctness fixes
+- Public-API extension callback fixes
+
+Recommend `Y` to user.
+
+### Tier 2 — Cloud-Distribution Only
+
+Bugs that only manifest on cloud-hosted distributions (Secrets panel, subscription flows, cloud signup, workspace tracking, etc.). Whether to backport depends on whether cloud ships from the target `core/*` branch in your release matrix.
+
+Indicators:
+
+- Files under `src/platform/secrets/`, `src/platform/subscription/`, signup flows
+- PR description mentions cloud staging issues
+- Fix gated behind cloud feature flags
+
+Default: ask the cloud release rotation owner. If unsure, defer.
+
+### Tier 3 — Skip
+
+Path pre-filter caught most of these. The rest are PRs where the diff _touches_ `src/` but the practical impact is non-user-facing or scoped to features the target doesn't ship.
+
+Indicators:
+
+- All changes in test files even if the PR touched `src/` test files
+- Storybook stories only
+- Lint config / lint rule additions
+- Documentation comments
+- Internal refactors with no behavior change
+
+### Presentation Format
+
+When showing tier results to the user, format as:
+
+```text
+Tier 1 (N PRs) — strong backport candidates
+- #11541 fix: stop duplicate node creation when dropping image on Vue nodes
+  Why: Vue Nodes 2.0 regression — async onDragDrop bypassed handled-check, drops bubble to document, spawns extra LoadImage nodes
+- #10849 fix: store promoted widget values per SubgraphNode instance
+  Why: Multiple instances overwriting each other's promoted widget values — data loss
+
+Tier 2 (N PRs) — cloud-distribution release rotation should decide
+- #11636 fix: enable Chrome password autofill on signup form
+- ...
+
+Tier 3 (N PRs) — skip recommended
+- #11586 fix: website polish (apps/website/ only)
+- ...
+```
+
+Then run interactive Y/N over Tier 1 and Tier 2; Tier 3 gets confirmed-skip without per-PR review.
+
 ## Dep Refresh PRs
 
 Always SKIP on stable branches. Risk of transitive dependency regressions outweighs audit cleanup benefit. If a specific CVE fix is needed, cherry-pick that individual fix instead.
diff --git a/.claude/skills/backport-management/reference/discovery.md b/.claude/skills/backport-management/reference/discovery.md
index ac826ce764..ab28e0815f 100644
--- a/.claude/skills/backport-management/reference/discovery.md
+++ b/.claude/skills/backport-management/reference/discovery.md
@@ -1,5 +1,11 @@
 # Discovery — Candidate Collection
 
+**Run all sources, then reconcile.** No single source is authoritative:
+
+- Slack bot may flag PRs that have already been backported (false positive)
+- Git gap may include PRs that don't need backport (test-only, design-system, website)
+- Bot can also miss PRs that landed without the right labels
+
 ## Source 1: Slack Backport-Checker Bot
 
 Use `slackdump` skill to export `#frontend-releases` channel (C09K9TPU2G7):
@@ -36,7 +42,43 @@ gh pr view $PR --json mergeCommit,title --jq '"Title: \(.title)\nMerge: \(.merge
 gh pr view $PR --json files --jq '.files[].path'
 ```
 
+## Source 4: Already-Backported PRs (cross-reference)
+
+When the target branch already has some cherry-picks on it (e.g., partway through a release window), extract the originals to avoid re-backporting:
+
+```bash
+# Get all original PR numbers already backported to TARGET since the last release tag
+git log --format="%H%n%B" $LAST_TAG..origin/$TARGET \
+  | grep -oiE "(backport of|cherry.picked) #?[0-9]+" \
+  | grep -oE "[0-9]+" \
+  | sort -un > /tmp/already-backported.txt
+```
+
+Subtract this list from your candidates.
+
+## Reconciliation Workflow
+
+```bash
+# 1. Slack bot list (parse from export)
+# /tmp/bot-flagged.txt — one PR# per line, sorted
+
+# 2. Git gap fix/perf only
+MB=$(git merge-base origin/main origin/$TARGET)
+git log --format="%h|%s" $MB..origin/main \
+  | grep -iE "^[a-f0-9]+\|(fix|perf)" \
+  | grep -oE "#[0-9]+\)" | grep -oE "[0-9]+" \
+  | sort -un > /tmp/gap-fixes.txt
+
+# 3. Already backported (Source 4 above)
+
+# 4. Candidates = (gap-fixes ∪ bot-flagged) − already-backported
+sort -u /tmp/gap-fixes.txt /tmp/bot-flagged.txt > /tmp/union.txt
+comm -23 /tmp/union.txt /tmp/already-backported.txt > /tmp/candidates.txt
+```
+
+The result is the input to the path pre-filter (`SKILL.md` Quick Start step 2).
+
 ## Output: candidate_list.md
 
 Table per target branch:
-| PR# | Title | Category | Flagged by Bot? | Decision |
+| PR# | Title | Source (bot/gap/both) | Path bucket | Tier | Decision |
diff --git a/.claude/skills/backport-management/reference/execution.md b/.claude/skills/backport-management/reference/execution.md
index 2bc6f9f78a..0195091e71 100644
--- a/.claude/skills/backport-management/reference/execution.md
+++ b/.claude/skills/backport-management/reference/execution.md
@@ -6,6 +6,43 @@
 2. Medium gap next (quick win)
 3. Largest gap last (main effort)
 
+## Step 0: Test-Then-Resolve Pre-Pass (Recommended)
+
+Before triggering label-driven automation, run a dry-run cherry-pick loop to classify candidates. This is much faster than discovering conflicts after-the-fact across automation, manual cherry-picks, and CI failures.
+
+```bash
+git fetch origin TARGET_BRANCH
+git worktree add /tmp/dryrun-TARGET origin/TARGET_BRANCH
+cd /tmp/dryrun-TARGET
+
+CLEAN=()
+CONFLICT=()
+for pr in "${CANDIDATES[@]}"; do
+  SHA=$(gh pr view $pr --json mergeCommit --jq '.mergeCommit.oid')
+  git checkout -b dryrun-$pr origin/TARGET_BRANCH 2>/dev/null
+  if git cherry-pick -m 1 $SHA 2>/dev/null; then
+    CLEAN+=($pr)
+  else
+    CONFLICT+=($pr)
+    git cherry-pick --abort
+  fi
+  git checkout --detach HEAD 2>/dev/null
+  git branch -D dryrun-$pr 2>/dev/null
+done
+
+echo "CLEAN (${#CLEAN[@]}): ${CLEAN[*]}"
+echo "CONFLICT (${#CONFLICT[@]}): ${CONFLICT[*]}"
+
+cd -
+git worktree remove /tmp/dryrun-TARGET --force
+```
+
+Use the result to:
+
+- Send CLEAN PRs through label-driven automation (Step 1) — they'll typically self-merge
+- Reserve manual worktree time (Step 3) for CONFLICT PRs only
+- Surface PRs likely to need backport-only compat shims (CONFLICT files in `src/lib/litegraph/` or `src/scripts/app.ts`)
+
 ## Step 1: Label-Driven Automation (Batch)
 
 ```bash
@@ -88,6 +125,39 @@ for PR in ${CONFLICT_PRS[@]}; do
   git add .
   GIT_EDITOR=true git cherry-pick --continue
 
+  # ── Public-API conflict review (REQUIRED for extension-API surfaces) ──
+  # If the conflict resolution touched any of these surfaces, consult oracle
+  # BEFORE pushing. A bad shim is worse than no fix:
+  #   - node.onXxx callback assignments (onDragDrop, onConnectionsChange, onRemoved, onConfigure, etc.)
+  #   - Methods on LGraphNode, LGraphCanvas, LGraph, Subgraph
+  #   - Public exports from src/lib/litegraph/
+  #   - Type changes in litegraph-augmentation.d.ts
+  # If a public callback's signature/contract changed: add a backport-only
+  # compatibility shim that preserves the OLD contract while keeping the
+  # new fix. Document it in the commit body under
+  # "## Backport-only compatibility fix". See SKILL.md gotcha section.
+  # ───────────────────────────────────────────────────────────────────────
+
+  # Per-PR validation BEFORE push (catches issues earlier than wave verification).
+  # Guard each targeted command against empty file lists — running `pnpm test:unit -- run`
+  # with no arg matchers would run the full suite, and `pnpm exec eslint` with no args errors.
+  pnpm typecheck
+
+  mapfile -t TEST_FILES < <(git diff --name-only HEAD~1 | grep -E '\.test\.ts$' || true)
+  if [ ${#TEST_FILES[@]} -gt 0 ]; then
+    pnpm test:unit -- run "${TEST_FILES[@]}"
+  else
+    echo "No changed test files — skipping targeted unit tests"
+  fi
+
+  mapfile -t CODE_FILES < <(git diff --name-only HEAD~1 | grep -E '\.(ts|vue)$' || true)
+  if [ ${#CODE_FILES[@]} -gt 0 ]; then
+    pnpm exec eslint "${CODE_FILES[@]}"
+    pnpm exec oxfmt --check "${CODE_FILES[@]}"
+  else
+    echo "No changed ts/vue files — skipping targeted lint/format"
+  fi
+
   git push origin backport-$PR-to-TARGET --no-verify
   NEW_PR=$(gh pr create --base TARGET_BRANCH --head backport-$PR-to-TARGET \
     --title "[backport TARGET] TITLE (#$PR)" \
@@ -243,6 +313,9 @@ gh pr checks $PR --watch --fail-fast && gh pr merge $PR --squash --admin
 16. **Use `--no-verify` in worktrees** — husky hooks fail in `/tmp/` worktrees. Always push/commit with `--no-verify`.
 17. **Automation success varies by branch** — core/1.42 got 18/26 auto-PRs (69%), cloud/1.42 got 1/25 (4%). Cloud branches diverge more. Plan for manual fallback.
 18. **Test-then-resolve pattern** — for branches with low automation success, run a dry-run loop to classify clean vs conflict PRs before processing. This is much faster than resolving conflicts serially.
+19. **Public-API conflict resolutions need oracle review** — when a conflict touches `node.onXxx` callbacks, `LGraphNode`/`LGraphCanvas`/`LGraph`/`Subgraph` methods, or types in `litegraph-augmentation.d.ts`, consult oracle BEFORE pushing. Custom-node packages depend on these contracts. A literal cherry-pick of a refactor-style fix can silently break extensions still using the old contract — sometimes recreating the very bug the PR was fixing. Document any backport-only compatibility shim explicitly in the commit body.
+20. **Cherry-picked tests can require unbackported test scaffolding** — when a PR modifies a test file that was _added_ on main by an earlier unbackported PR, the cherry-pick reports modify/delete on that file. Drop it from the backport (`git rm`) and document which PR introduced it. Don't smuggle in test infrastructure without its runtime prerequisites.
+21. **Per-PR validation catches issues earlier than wave verification** — for high-stakes branches, run `pnpm typecheck && pnpm exec eslint <changed files> && pnpm exec oxfmt --check` per PR before pushing. Wave verification still matters (it catches cross-PR interactions), but per-PR makes attribution trivial when something fails.
 
 ## CI Failure Triage
 
@@ -268,3 +341,40 @@ Common failure categories:
 | Type error                  | Interface changed on main but not branch | May need manual adaptation                |
 
 **Never assume a failure is safe to skip.** Present all failures to the user with analysis.
+
+## PR Body Template (Manual Cherry-Picks)
+
+Manual cherry-pick PRs need detail beyond the automation's terse default. Use this template — reviewers will look here before re-deriving conflict-resolution logic from the diff.
+
+```markdown
+Manual backport of #ORIG to `TARGET` for inclusion in `vX.Y.Z`.
+
+Cherry-picked from upstream merge commit `SHORT_SHA`.
+
+## Why
+
+[1-2 sentences from the original PR's "Summary" — what bug, what fix mechanism]
+
+## Conflict resolution
+
+- **`path/to/file`** — [what conflicted on this branch] → [resolution chosen + why]
+- **`path/to/dropped-test.test.ts`** — added on main by unrelated PR #XXXX (not backported). Dropped from this backport; runtime fix intact.
+- [...]
+
+## Backport-only compatibility fix (if applicable)
+
+[If you added a shim that wasn't in the upstream PR, document it here — what extension surface, what contract, what the shim preserves, why the upstream version would have regressed it]
+
+## Validation
+
+- `pnpm typecheck` ✅
+- `pnpm test:unit -- run <targeted suites>` ✅ (N/N passing)
+- `pnpm exec eslint <changed files>` ✅ (0 errors)
+- `pnpm exec oxfmt --check` ✅ (clean)
+
+[If manual e2e was skipped, explain why — e.g., requires live backend, headless not feasible. State that source is byte-identical to upstream + how long it's been baking on main.]
+
+Original PR: #ORIG / Original commit: `FULL_SHA`
+```
+
+The conflict-resolution section is non-negotiable — every conflict you resolved by hand needs a one-liner. This makes archaeology trivial six months later when someone asks "why does this look slightly different from main?"
diff --git a/.claude/skills/writing-playwright-tests/SKILL.md b/.claude/skills/writing-playwright-tests/SKILL.md
index 84a39210a0..efc20dff85 100644
--- a/.claude/skills/writing-playwright-tests/SKILL.md
+++ b/.claude/skills/writing-playwright-tests/SKILL.md
@@ -114,7 +114,7 @@ await expect(async () => {
 ## CI Debugging
 
 1. Download artifacts from failed CI run
-2. Extract and view trace: `npx playwright show-trace trace.zip`
+2. Extract and view trace: `pnpm dlx playwright show-trace trace.zip`
 3. CI deploys HTML report to Cloudflare Pages (link in PR comment)
 4. Reproduce CI: `CI=true pnpm test:browser`
 5. Local runs: `pnpm test:browser:local`
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
index 20af82bec6..35c5d31183 100644
--- a/.coderabbit.yaml
+++ b/.coderabbit.yaml
@@ -19,15 +19,26 @@ reviews:
       - name: End-to-end regression coverage for fixes
         mode: error
         instructions: |
-          Use only PR metadata already available in the review context: the PR title, commit subjects in this PR, the files changed in this PR relative to the PR base (equivalent to `base...head`), and the PR description.
-          Do not rely on shell commands. Do not inspect reverse diffs, files changed only on the base branch, or files outside this PR. If the changed-file list or commit subjects are unavailable, mark the check inconclusive instead of guessing.
+          Use only PR metadata already available in the review context:
+            - the PR title
+            - commit subjects in this PR
+            - The files changed in this PR relative to the PR base (equivalent to `base...head`)
+            - the PR description.
+          Do not rely on shell commands.
+          Do not inspect reverse diffs, files changed only on the base branch, or files outside this PR.
+          If the changed-file list or commit subjects are unavailable, mark the check inconclusive instead of guessing.
 
-          Pass if at least one of the following is true:
-          1. Neither the PR title nor any commit subject in the PR uses bug-fix language such as `fix`, `fixed`, `fixes`, `fixing`, `bugfix`, or `hotfix`.
-          2. The PR changes at least one file under `browser_tests/`.
-          3. The PR description includes a concrete, non-placeholder explanation of why an end-to-end regression test was not added.
+          Fail if all of the following are true:
+          1. The PR title and/or any commit subject in the PR uses bug-fix language such as `fix`, `fixed`, `fixes`, `fixing`, `bugfix`, or `hotfix`.
+          2. The PR changes files under `src/` or `packages/` related to the main frontend application but the PR does not change at least one file under `browser_tests/`.
+          3. The PR description lacks a concrete explanation of why an end-to-end regression test was not added.
+
+          Do not fail if the changes are exclusively in `apps/website`, just documentation changes, or changes related to CI processes.
+          The goal is to make sure that fixes include End-to-End regression tests. Do not insist on tests when the PR is not fixing a bug.
+
+          Pass otherwise.
+          When failing, mention which bug-fix signal you found and ask the author to either add or update a Playwright regression test under `browser_tests/` or add a concrete explanation in the PR description of why an end-to-end regression test is not practical.
 
-          Fail otherwise. When failing, mention which bug-fix signal you found and ask the author to either add or update a Playwright regression test under `browser_tests/` or add a concrete explanation in the PR description of why an end-to-end regression test is not practical.
       - name: ADR compliance for entity/litegraph changes
         mode: warning
         instructions: |
diff --git a/.github/workflows/ci-perf-report.yaml b/.github/workflows/ci-perf-report.yaml
index bd6c286f37..94dad8b916 100644
--- a/.github/workflows/ci-perf-report.yaml
+++ b/.github/workflows/ci-perf-report.yaml
@@ -54,10 +54,14 @@ jobs:
       - name: Start ComfyUI server
         uses: ./.github/actions/start-comfyui-server
 
+      # PRs run each test once to keep wall time bounded; main runs 3× so the
+      # baseline saved to perf-data has enough samples to median over noise.
       - name: Run performance tests
         id: perf
         continue-on-error: true
-        run: pnpm exec playwright test --project=performance --workers=1 --repeat-each=3
+        env:
+          PERF_REPEAT: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && '3' || '2' }}
+        run: pnpm exec playwright test --project=performance --workers=1 --repeat-each=$PERF_REPEAT
 
       - name: Upload perf metrics
         if: always()
diff --git a/.github/workflows/ci-tests-e2e-coverage.yaml b/.github/workflows/ci-tests-e2e-coverage.yaml
index 2944bf0c82..bf05c37a4b 100644
--- a/.github/workflows/ci-tests-e2e-coverage.yaml
+++ b/.github/workflows/ci-tests-e2e-coverage.yaml
@@ -20,6 +20,8 @@ jobs:
       github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    outputs:
+      has-coverage: ${{ steps.coverage-shards.outputs.has-coverage }}
 
     steps:
       - name: Checkout repository
@@ -37,31 +39,33 @@ jobs:
           path: temp/coverage-shards
           if_no_artifact_found: warn
 
+      - name: Detect shard coverage data
+        id: coverage-shards
+        run: |
+          if [ -d temp/coverage-shards ] && find temp/coverage-shards -name 'coverage.lcov' -type f | grep -q .; then
+            echo "has-coverage=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has-coverage=false" >> "$GITHUB_OUTPUT"
+            echo "No E2E coverage shard artifacts found; treating this run as skipped." >> "$GITHUB_STEP_SUMMARY"
+          fi
+
       - name: Install lcov
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         run: sudo apt-get install -y -qq lcov
 
       - name: Merge shard coverage into single LCOV
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         run: |
           mkdir -p coverage/playwright
           LCOV_FILES=$(find temp/coverage-shards -name 'coverage.lcov' -type f)
-          if [ -z "$LCOV_FILES" ]; then
-            echo "No coverage.lcov files found"
-            touch coverage/playwright/coverage.lcov
-            exit 0
-          fi
           ADD_ARGS=""
           for f in $LCOV_FILES; do ADD_ARGS="$ADD_ARGS -a $f"; done
           lcov $ADD_ARGS -o coverage/playwright/coverage.lcov
           wc -l coverage/playwright/coverage.lcov
 
       - name: Validate merged coverage
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         run: |
-          SHARD_COUNT=$(find temp/coverage-shards -name 'coverage.lcov' -type f | wc -l | tr -d ' ')
-          if [ "$SHARD_COUNT" -eq 0 ]; then
-            echo "::notice::No shard coverage files; upstream E2E was likely skipped."
-            exit 0
-          fi
-
           MERGED_SF=$(grep -c '^SF:' coverage/playwright/coverage.lcov || echo 0)
           MERGED_LH=$(awk -F: '/^LH:/{s+=$2}END{print s+0}' coverage/playwright/coverage.lcov)
           MERGED_LF=$(awk -F: '/^LF:/{s+=$2}END{print s+0}' coverage/playwright/coverage.lcov)
@@ -82,7 +86,7 @@ jobs:
           done
 
       - name: Upload merged coverage data
-        if: always()
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         uses: actions/upload-artifact@v6
         with:
           name: e2e-coverage
@@ -91,7 +95,7 @@ jobs:
           if-no-files-found: warn
 
       - name: Upload E2E coverage to Codecov
-        if: always()
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
         with:
           files: coverage/playwright/coverage.lcov
@@ -100,6 +104,7 @@ jobs:
           fail_ci_if_error: false
 
       - name: Generate HTML coverage report
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         run: |
           if [ ! -s coverage/playwright/coverage.lcov ]; then
             echo "No coverage data; generating placeholder report."
@@ -114,6 +119,7 @@ jobs:
             --precision 1
 
       - name: Upload HTML report artifact
+        if: steps.coverage-shards.outputs.has-coverage == 'true'
         uses: actions/upload-artifact@v6
         with:
           name: e2e-coverage-html
@@ -122,7 +128,9 @@ jobs:
 
   deploy:
     needs: merge
-    if: github.event.workflow_run.head_branch == 'main'
+    if: >
+      github.event.workflow_run.head_branch == 'main' &&
+      needs.merge.outputs.has-coverage == 'true'
     runs-on: ubuntu-latest
     permissions:
       pages: write
diff --git a/.github/workflows/ci-vercel-website-preview.yaml b/.github/workflows/ci-vercel-website-preview.yaml
index 3588cfc2bf..99e2016b47 100644
--- a/.github/workflows/ci-vercel-website-preview.yaml
+++ b/.github/workflows/ci-vercel-website-preview.yaml
@@ -4,6 +4,9 @@ name: 'CI: Vercel Website Preview'
 on:
   pull_request:
     types: [opened, synchronize, reopened]
+    branches-ignore:
+      - 'core/**'
+      - 'cloud/**'
     paths:
       - 'apps/website/**'
       - 'packages/design-system/**'
diff --git a/.github/workflows/model-page-discovery.yaml b/.github/workflows/model-page-discovery.yaml
new file mode 100644
index 0000000000..457c7546aa
--- /dev/null
+++ b/.github/workflows/model-page-discovery.yaml
@@ -0,0 +1,123 @@
+name: Model Page Discovery
+
+on:
+  schedule:
+    - cron: '0 9 * * 1'
+  workflow_dispatch:
+
+jobs:
+  discover:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+
+    steps:
+      - name: Fetch model labels from hub API
+        id: hub
+        shell: bash
+        run: |
+          set -euo pipefail
+          curl -fsSL 'https://comfy.org/api/hub/labels?type=model' -o hub-labels.json
+          echo "Fetched $(jq '.labels | length' hub-labels.json) model labels from hub"
+
+      - name: Checkout ComfyUI_frontend
+        uses: actions/checkout@v6
+        with:
+          sparse-checkout: apps/website/src/config/generated-models.json
+
+      - name: Compare against existing models
+        id: compare
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          HUB_SLUGS=$(jq -r '[.labels[].name]' hub-labels.json)
+
+          EXISTING_SLUGS=$(node -e "
+            const fs = require('fs');
+            const models = JSON.parse(
+              fs.readFileSync(
+                'apps/website/src/config/generated-models.json',
+                'utf8'
+              )
+            );
+            console.log(JSON.stringify(models.map(m => m.slug)));
+          " 2>/dev/null || echo '[]')
+
+          ADDED_SLUGS=$(node -e "
+            const hub = $HUB_SLUGS;
+            const existing = new Set($EXISTING_SLUGS);
+            console.log(JSON.stringify(hub.filter(s => !existing.has(s))));
+          ")
+
+          COUNT=$(node -e "console.log($ADDED_SLUGS.length)")
+          echo "new_count=$COUNT" >> \$GITHUB_OUTPUT
+          echo "new_slugs=$ADDED_SLUGS" >> \$GITHUB_OUTPUT
+
+          if [ "\$COUNT" -eq 0 ]; then
+            echo "No new models found."
+          else
+            echo "Found \$COUNT new model(s)"
+          fi
+
+      - name: Check for existing open discovery issue
+        id: existing_issue
+        if: steps.compare.outputs.new_count != '0'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          COUNT=$(gh issue list \
+            --repo "$GITHUB_REPOSITORY" \
+            --state open \
+            --search 'in:title "New models detected"' \
+            --json number \
+            --jq 'length')
+          echo "open_count=$COUNT" >> $GITHUB_OUTPUT
+
+      - name: Open GitHub issue for new models
+        if: |
+          steps.compare.outputs.new_count != '0' &&
+          steps.existing_issue.outputs.open_count == '0'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NEW_SLUGS: ${{ steps.compare.outputs.new_slugs }}
+          NEW_COUNT: ${{ steps.compare.outputs.new_count }}
+        shell: bash
+        run: |
+          SLUG_LIST=$(node -e "
+            const slugs = $NEW_SLUGS;
+            console.log(slugs.map(s => '- \`' + s + '\`').join('\n'));
+          ")
+
+          gh issue create \
+            --repo "$GITHUB_REPOSITORY" \
+            --title "New models detected — add to model pages" \
+            --body "## $NEW_COUNT new model(s) found in hub
+
+          The weekly model discovery scan found model labels on the hub not yet in
+          \`apps/website/src/config/generated-models.json\`.
+
+          ### New slugs ($NEW_COUNT)
+
+          $SLUG_LIST
+
+          ### Next steps
+
+          1. Review which of these warrant an SEO model page
+          2. For local models: run \`SKIP_THUMBNAILS=1 pnpm generate:models\` and commit the result
+          3. For partner/API models: add to \`API_PROVIDER_MAP\` in \`generate-models.ts\`, regenerate, commit
+
+          ---
+          *Generated by the [model-page-discovery workflow](https://github.com/$GITHUB_REPOSITORY/actions/workflows/model-page-discovery.yaml)*"
+
+      - name: Skip — open issue already exists
+        if: |
+          steps.compare.outputs.new_count != '0' &&
+          steps.existing_issue.outputs.open_count != '0'
+        run: echo "An open discovery issue already exists — skipping creation."
+
+      - name: No new models found
+        if: steps.compare.outputs.new_count == '0'
+        run: echo "No new models found — nothing to do."
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 19700f80c2..66142ab5ca 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -85,6 +85,15 @@
     "typescript/no-unused-vars": "off",
     "unicorn/no-empty-file": "off",
     "vitest/require-mock-type-parameters": "off",
+    "vitest/consistent-each-for": [
+      "error",
+      {
+        "test": "for",
+        "it": "for",
+        "describe": "for",
+        "suite": "for"
+      }
+    ],
     "unicorn/no-new-array": "off",
     "unicorn/no-single-promise-in-promise-methods": "off",
     "unicorn/no-useless-fallback-in-spread": "off",
diff --git a/apps/desktop-ui/src/i18n.ts b/apps/desktop-ui/src/i18n.ts
index 52db23e091..fa3367286d 100644
--- a/apps/desktop-ui/src/i18n.ts
+++ b/apps/desktop-ui/src/i18n.ts
@@ -9,6 +9,7 @@ import en from '@frontend-locales/en/main.json' with { type: 'json' }
 import enNodes from '@frontend-locales/en/nodeDefs.json' with { type: 'json' }
 
 import enSettings from '@frontend-locales/en/settings.json' with { type: 'json' }
+import { getDefaultLocale } from '@frontend-locales/localeConfig'
 import { createI18n } from 'vue-i18n'
 
 function buildLocale<
@@ -167,7 +168,7 @@ const messages: Record<string, LocaleMessages> = {
 export const i18n = createI18n({
   // Must set `false`, as Vue I18n Legacy API is for Vue 2
   legacy: false,
-  locale: navigator.language.split('-')[0] || 'en',
+  locale: getDefaultLocale(),
   fallbackLocale: 'en',
   messages,
   // Ignore warnings for locale options as each option is in its own language.
diff --git a/apps/website/README.md b/apps/website/README.md
index 047940ed02..94468614c4 100644
--- a/apps/website/README.md
+++ b/apps/website/README.md
@@ -113,6 +113,12 @@ git commit apps/website/src/data/ashby-roles.snapshot.json
 The script exits non-zero on any non-fresh outcome so stale/empty
 snapshots can't be accidentally committed.
 
+## Cloud nodes integration
+
+`/cloud/supported-nodes` (and `/zh-CN/`) lists custom-node packs preinstalled on Comfy Cloud, joined with public metadata from the [ComfyUI Custom Node Registry](https://registry.comfy.org) ([`api.comfy.org`](https://api.comfy.org)). See [`src/pages/cloud/supported-nodes/AGENTS.md`](src/pages/cloud/supported-nodes/AGENTS.md) for the build pipeline, source-file map, and key invariants.
+
+Build-time env var: `WEBSITE_CLOUD_API_KEY` (Cloud `/api/object_info` auth; the build falls back to the committed snapshot when unset). Must also be set in the Vercel project environment.
+
 ## HubSpot contact form
 
 The contact page uses HubSpot's hosted form embed for the interest form:
@@ -146,3 +152,4 @@ renders the documented embed container.
 - `pnpm test:unit` — Vitest unit tests
 - `pnpm test:e2e` — Playwright E2E tests (requires `pnpm build` first)
 - `pnpm ashby:refresh-snapshot` — refresh the committed careers snapshot
+- `pnpm cloud-nodes:refresh-snapshot` — refresh the committed cloud nodes snapshot
diff --git a/apps/website/astro.config.ts b/apps/website/astro.config.ts
index e57aef5cd6..6c542b3a6b 100644
--- a/apps/website/astro.config.ts
+++ b/apps/website/astro.config.ts
@@ -3,6 +3,23 @@ import sitemap from '@astrojs/sitemap'
 import vue from '@astrojs/vue'
 import tailwindcss from '@tailwindcss/vite'
 
+const LOCALES = ['en', 'zh-CN'] as const
+const DEFAULT_LOCALE = 'en'
+const PAYMENT_STATUSES = ['success', 'failed'] as const
+const LOCALE_PREFIXES = LOCALES.map((locale) =>
+  locale === DEFAULT_LOCALE ? '' : `/${locale}`
+)
+const SITEMAP_EXCLUDED_PATHNAMES = new Set(
+  LOCALE_PREFIXES.flatMap((prefix) =>
+    PAYMENT_STATUSES.map((status) => `${prefix}/payment/${status}`)
+  )
+)
+
+function isExcludedFromSitemap(page: string): boolean {
+  const pathname = new URL(page).pathname.replace(/\/$/, '')
+  return SITEMAP_EXCLUDED_PATHNAMES.has(pathname)
+}
+
 export default defineConfig({
   site: 'https://comfy.org',
   output: 'static',
@@ -17,7 +34,12 @@ export default defineConfig({
     assets: '_website'
   },
   devToolbar: { enabled: !process.env.NO_TOOLBAR },
-  integrations: [vue(), sitemap()],
+  integrations: [
+    vue(),
+    sitemap({
+      filter: (page) => !isExcludedFromSitemap(page)
+    })
+  ],
   vite: {
     plugins: [tailwindcss()],
     server: {
@@ -27,8 +49,8 @@ export default defineConfig({
     }
   },
   i18n: {
-    locales: ['en', 'zh-CN'],
-    defaultLocale: 'en',
+    locales: [...LOCALES],
+    defaultLocale: DEFAULT_LOCALE,
     routing: {
       prefixDefaultLocale: false
     }
diff --git a/apps/website/e2e/careers.spec.ts b/apps/website/e2e/careers.spec.ts
index 6f97c99f86..22263c1bfc 100644
--- a/apps/website/e2e/careers.spec.ts
+++ b/apps/website/e2e/careers.spec.ts
@@ -23,26 +23,50 @@ test.describe('Careers page @smoke', () => {
     expect(await roles.count()).toBeGreaterThan(0)
   })
 
-  test('each role links to jobs.ashbyhq.com', async ({ page }) => {
+  test('clicking a department button scrolls to and activates that section', async ({
+    page
+  }) => {
+    const rolesSection = page.getByTestId('careers-roles')
+    await rolesSection.scrollIntoViewIfNeeded()
+    await expect(rolesSection).toBeVisible()
+
+    const allCount = await page.getByTestId('careers-role-link').count()
+
+    const engineeringButton = page.getByRole('button', {
+      name: 'ENGINEERING',
+      exact: true
+    })
+
+    // RolesSection is hydrated via `client:visible`. Once the button responds
+    // to a click by flipping aria-pressed, Vue is hydrated and the rest of
+    // the locator logic is in effect.
+    await expect(async () => {
+      await engineeringButton.click()
+      await expect(engineeringButton).toHaveAttribute('aria-pressed', 'true', {
+        timeout: 1_000
+      })
+    }).toPass({ timeout: 10_000 })
+
+    const engineeringSection = page.locator('#careers-dept-engineering')
+    await expect(engineeringSection).toBeInViewport()
+
+    expect(await page.getByTestId('careers-role-link').count()).toBe(allCount)
+  })
+})
+
+test.describe('Careers page role links', () => {
+  test('each role links to the Ashby job description page, not the application form', async ({
+    page
+  }) => {
+    await page.goto('/careers')
     const roles = page.getByTestId('careers-role-link')
     const count = await roles.count()
     for (let i = 0; i < count; i++) {
       const href = await roles.nth(i).getAttribute('href')
       expect(href).toMatch(/^https:\/\/jobs\.ashbyhq\.com\//)
+      expect(href).not.toMatch(/\/application\/?$/)
     }
   })
-
-  test('ENGINEERING category filter narrows the role list', async ({
-    page
-  }) => {
-    const allCount = await page.getByTestId('careers-role-link').count()
-    await page.getByRole('button', { name: 'ENGINEERING', exact: true }).click()
-    const engineeringLocator = page.getByTestId('careers-role-link')
-    await expect(engineeringLocator.first()).toBeVisible()
-    const engineeringCount = await engineeringLocator.count()
-    expect(engineeringCount).toBeLessThanOrEqual(allCount)
-    expect(engineeringCount).toBeGreaterThan(0)
-  })
 })
 
 test.describe('Careers page (zh-CN) @smoke', () => {
diff --git a/apps/website/e2e/cloud-nodes.spec.ts b/apps/website/e2e/cloud-nodes.spec.ts
new file mode 100644
index 0000000000..9f99bf453b
--- /dev/null
+++ b/apps/website/e2e/cloud-nodes.spec.ts
@@ -0,0 +1,169 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+test.describe('Cloud nodes page @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/cloud/supported-nodes')
+  })
+
+  test('has correct title', async ({ page }) => {
+    await expect(page).toHaveTitle(
+      'Custom-node packs on Comfy Cloud — supported by default'
+    )
+  })
+
+  test('renders at least one pack card', async ({ page }) => {
+    const cards = page.getByTestId('cloud-node-pack-card')
+    await expect(cards.first()).toBeVisible()
+    expect(await cards.count()).toBeGreaterThan(0)
+  })
+
+  test('search input filters cards down', async ({ page }) => {
+    const cards = page.getByTestId('cloud-node-pack-card')
+    const initialCount = await cards.count()
+
+    await page.getByTestId('cloud-nodes-search').fill('impact')
+    const filteredCards = page.getByTestId('cloud-node-pack-card')
+    await expect(filteredCards.first()).toBeVisible()
+    const filteredCount = await filteredCards.count()
+
+    expect(filteredCount).toBeGreaterThan(0)
+    expect(filteredCount).toBeLessThanOrEqual(initialCount)
+  })
+
+  test('renders banner image or fallback element', async ({ page }) => {
+    const banners = page.getByTestId('cloud-node-pack-banner')
+    await expect(banners.first()).toBeVisible()
+  })
+
+  test('opens pack detail page from first card', async ({ page }) => {
+    const firstCard = page.getByTestId('cloud-node-pack-card').first()
+    await expect(firstCard).toBeVisible()
+
+    await firstCard.locator('a').first().click()
+
+    await expect(page).toHaveURL(/\/cloud\/supported-nodes\/[a-z0-9-]+$/)
+    await expect(page.getByTestId('cloud-node-pack-detail')).toBeVisible()
+  })
+
+  test('direct pack detail route renders node entries', async ({ page }) => {
+    await page.goto('/cloud/supported-nodes/comfyui-impact-pack')
+    await expect(page.getByTestId('cloud-node-pack-detail')).toBeVisible()
+    await expect(
+      page.getByTestId('cloud-node-pack-detail-node').first()
+    ).toBeVisible()
+  })
+
+  test('search with no matches shows empty state', async ({ page }) => {
+    await page
+      .getByTestId('cloud-nodes-search')
+      .fill('zzzz-this-pack-does-not-exist')
+    await expect(page.getByTestId('cloud-node-pack-card')).toHaveCount(0)
+    await expect(page.getByText('No matching packs')).toBeVisible()
+  })
+
+  test('clearing search restores the full list', async ({ page }) => {
+    const cards = page.getByTestId('cloud-node-pack-card')
+    const initialCount = await cards.count()
+
+    await page.getByTestId('cloud-nodes-search').fill('impact')
+    await expect(cards.first()).toBeVisible()
+
+    await page.getByTestId('cloud-nodes-search').fill('')
+    await expect(cards).toHaveCount(initialCount)
+  })
+
+  test('search matches against node display names, not just pack names', async ({
+    page
+  }) => {
+    await page.getByTestId('cloud-nodes-search').fill('FaceDetailer')
+    await expect(page.getByTestId('cloud-node-pack-card')).toHaveCount(1)
+    await expect(
+      page.getByTestId('cloud-node-pack-card-link').first()
+    ).toContainText('Impact Pack')
+  })
+
+  test('switching sort to A → Z reorders cards alphabetically', async ({
+    page
+  }) => {
+    await page.locator('#cloud-nodes-sort').selectOption('az')
+    const firstName = await page
+      .getByTestId('cloud-node-pack-card-link')
+      .first()
+      .textContent()
+    expect(firstName?.trim().toLowerCase().charAt(0)).toMatch(/^[a-c]/)
+  })
+
+  test('list grid carries a localized aria-label', async ({ page }) => {
+    await expect(
+      page.getByRole('list', {
+        name: 'Custom-node packs supported on Comfy Cloud'
+      })
+    ).toBeVisible()
+  })
+
+  test('clicking the back link returns to the index from a detail page', async ({
+    page
+  }) => {
+    await page.goto('/cloud/supported-nodes/comfyui-impact-pack')
+    await page.getByRole('link', { name: 'Back to all packs' }).click()
+    await expect(page).toHaveURL(/\/cloud\/supported-nodes\/?$/)
+    await expect(page.getByTestId('cloud-node-pack-card').first()).toBeVisible()
+  })
+
+  test('detail page renders publisher and external repo link', async ({
+    page
+  }) => {
+    await page.goto('/cloud/supported-nodes/comfyui-impact-pack')
+    const repoLink = page.getByRole('link', {
+      name: /github\.com\/ltdrdata\/ComfyUI-Impact-Pack/
+    })
+    await expect(repoLink).toBeVisible()
+    await expect(repoLink).toHaveAttribute('rel', /noopener/)
+  })
+
+  test('unknown pack slug 404s', async ({ page }) => {
+    const response = await page.goto(
+      '/cloud/supported-nodes/this-pack-does-not-exist'
+    )
+    expect(response?.status()).toBe(404)
+  })
+
+  test('JSON-LD ItemList is emitted on the index page', async ({ page }) => {
+    const jsonLd = page.locator('script[type="application/ld+json"]')
+    const ldBlocks = await jsonLd.allTextContents()
+    expect(ldBlocks.some((b) => b.includes('"@type":"ItemList"'))).toBeTruthy()
+  })
+
+  test('JSON-LD payload escapes <-sequences', async ({ page }) => {
+    const ldBlocks = await page
+      .locator('script[type="application/ld+json"]')
+      .allTextContents()
+    for (const block of ldBlocks) {
+      expect(block).not.toContain('</script')
+    }
+  })
+})
+
+test.describe('Cloud nodes page (zh-CN) @smoke', () => {
+  test('renders localized title and packs', async ({ page }) => {
+    await page.goto('/zh-CN/cloud/supported-nodes')
+    await expect(page).toHaveTitle('Comfy Cloud 自定义节点包合集——开箱即用')
+    await expect(page.getByTestId('cloud-node-pack-card').first()).toBeVisible()
+    await expect(
+      page.getByTestId('cloud-node-pack-banner').first()
+    ).toBeVisible()
+  })
+
+  test('opens pack detail page from first card', async ({ page }) => {
+    await page.goto('/zh-CN/cloud/supported-nodes')
+    const firstCard = page.getByTestId('cloud-node-pack-card').first()
+    await expect(firstCard).toBeVisible()
+
+    await firstCard.locator('a').first().click()
+
+    await expect(page).toHaveURL(/\/zh-CN\/cloud\/supported-nodes\/[a-z0-9-]+$/)
+    await expect(page.getByTestId('cloud-node-pack-detail')).toBeVisible()
+  })
+})
diff --git a/apps/website/e2e/content-section.spec.ts b/apps/website/e2e/content-section.spec.ts
new file mode 100644
index 0000000000..6d1a6d9265
--- /dev/null
+++ b/apps/website/e2e/content-section.spec.ts
@@ -0,0 +1,61 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+const M4_PRO_14_INCH_VIEWPORT = { width: 2016, height: 1310 }
+const LAST_SECTION_HASH = '#contact'
+
+test.describe(
+  'ContentSection scroll-spy @smoke',
+  {
+    annotation: [
+      {
+        type: 'issue',
+        description:
+          'https://linear.app/comfyorg/issue/FE-604/bug-bottom-badge-not-activating-on-scroll-at-high-resolution-3024x1964'
+      },
+      {
+        type: 'environment',
+        description:
+          '14" MacBook M4 Pro logical viewport reported in FE-604; /privacy-policy reproduces because of its short trailing sections'
+      }
+    ]
+  },
+  () => {
+    test.use({ viewport: M4_PRO_14_INCH_VIEWPORT })
+
+    test('activates the last badge when user scrolls to the bottom', async ({
+      page
+    }) => {
+      await page.goto('/privacy-policy')
+
+      const sidebarNav = page.getByRole('navigation', {
+        name: 'Category filter'
+      })
+      const badges = sidebarNav.getByRole('button')
+      const lastBadge = badges.last()
+
+      await expect(badges.first()).toHaveAttribute('aria-pressed', 'true')
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'false')
+
+      await page.evaluate(() =>
+        window.scrollTo(0, document.documentElement.scrollHeight)
+      )
+
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'true')
+    })
+
+    test('activates the last badge when page mounts already at the bottom via trailing hash', async ({
+      page
+    }) => {
+      await page.goto(`/privacy-policy${LAST_SECTION_HASH}`)
+
+      const sidebarNav = page.getByRole('navigation', {
+        name: 'Category filter'
+      })
+      const lastBadge = sidebarNav.getByRole('button').last()
+
+      await expect(lastBadge).toHaveAttribute('aria-pressed', 'true')
+    })
+  }
+)
diff --git a/apps/website/e2e/customers.spec.ts b/apps/website/e2e/customers.spec.ts
new file mode 100644
index 0000000000..5d073473da
--- /dev/null
+++ b/apps/website/e2e/customers.spec.ts
@@ -0,0 +1,33 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+test.describe('Customers @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/customers')
+  })
+
+  test('hero image declares intrinsic dimensions so layout reserves space before load', async ({
+    page
+  }) => {
+    const heroImage = page.locator('img[alt="Comfy 3D logo"]')
+    await expect(heroImage).toBeVisible()
+    await expect(heroImage).toHaveAttribute('width', /^\d+$/)
+    await expect(heroImage).toHaveAttribute('height', /^\d+$/)
+
+    // Regression guard: an unloaded <img> without intrinsic dimensions
+    // collapses to ~0px, then jumps to its natural size on load and pushes
+    // the video below it. Reserved space must persist before bytes arrive.
+    const heightWhileUnloaded = await page.evaluate(() => {
+      const img = document.querySelector<HTMLImageElement>(
+        'img[alt="Comfy 3D logo"]'
+      )
+      if (!img) return null
+      img.removeAttribute('src')
+      return img.getBoundingClientRect().height
+    })
+
+    expect(heightWhileUnloaded).not.toBeNull()
+    expect(heightWhileUnloaded!).toBeGreaterThan(100)
+  })
+})
diff --git a/apps/website/e2e/demos.spec.ts b/apps/website/e2e/demos.spec.ts
new file mode 100644
index 0000000000..bbf333e3e6
--- /dev/null
+++ b/apps/website/e2e/demos.spec.ts
@@ -0,0 +1,79 @@
+import { expect, test } from '@playwright/test'
+
+import { demos, getNextDemo } from '../src/config/demos'
+import { t } from '../src/i18n/translations'
+
+const escapeRegExp = (value: string): string =>
+  value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+
+test.describe('Demo pages @smoke', () => {
+  for (const demo of demos) {
+    const nextDemo = getNextDemo(demo.slug)
+
+    test(`/demos/${demo.slug} renders hero, embed, transcript, and next-demo nav`, async ({
+      page
+    }) => {
+      await page.goto(`/demos/${demo.slug}`)
+
+      const heading = page.getByRole('heading', { level: 1 })
+      await expect(heading).toBeVisible()
+      await expect(heading).toContainText(t(demo.title, 'en'))
+
+      const ogImage = page.locator('head meta[property="og:image"]')
+      await expect(ogImage).toHaveAttribute(
+        'content',
+        new RegExp(`${escapeRegExp(demo.slug)}-og\\.png`)
+      )
+
+      const iframe = page.locator(
+        `iframe[title*="${t('demos.embed.label', 'en')}"]`
+      )
+      await expect(iframe).toBeAttached()
+      await expect(iframe).toHaveAttribute(
+        'src',
+        new RegExp(escapeRegExp(demo.arcadeId))
+      )
+
+      await expect(
+        page.getByRole('button', { name: /demo transcript/i })
+      ).toBeVisible()
+
+      await expect(
+        page.getByText(t(nextDemo.title, 'en')).first()
+      ).toBeVisible()
+      const nextThumb = page.locator(`img[src="${nextDemo.thumbnail}"]`).first()
+      await expect(nextThumb).toBeAttached()
+      await expect(nextThumb).toBeVisible()
+      const naturalWidth = await nextThumb.evaluate(
+        (img) => (img as HTMLImageElement).naturalWidth
+      )
+      expect(naturalWidth).toBeGreaterThan(1)
+    })
+
+    test(`/zh-CN/demos/${demo.slug} renders localized content`, async ({
+      page
+    }) => {
+      await page.goto(`/zh-CN/demos/${demo.slug}`)
+
+      await expect(page).toHaveURL(/\/zh-CN\/demos\//)
+
+      const heading = page.getByRole('heading', { level: 1 })
+      await expect(heading).toContainText(t(demo.title, 'zh-CN'))
+      await expect(heading).toContainText(/[\u4E00-\u9FFF]/)
+
+      await expect(
+        page.getByText(t(nextDemo.title, 'zh-CN')).first()
+      ).toBeVisible()
+    })
+  }
+
+  test('demo library page renders', async ({ page }) => {
+    await page.goto('/demos')
+    await expect(page.getByText('Coming Soon')).toBeVisible()
+  })
+
+  test('non-existent demo returns 404', async ({ page }) => {
+    const response = await page.goto('/demos/nonexistent')
+    expect(response?.status()).toBe(404)
+  })
+})
diff --git a/apps/website/e2e/download.spec.ts b/apps/website/e2e/download.spec.ts
index 1afa483d1f..1e837ac950 100644
--- a/apps/website/e2e/download.spec.ts
+++ b/apps/website/e2e/download.spec.ts
@@ -46,7 +46,7 @@ test.describe('Download page @smoke', () => {
     await expect(githubBtn).toBeVisible()
     await expect(githubBtn).toHaveAttribute(
       'href',
-      'https://github.com/Comfy-Org/ComfyUI'
+      'https://github.com/Comfy-Org/ComfyUI#installing'
     )
 
     await context.close()
diff --git a/apps/website/e2e/payment.spec.ts b/apps/website/e2e/payment.spec.ts
new file mode 100644
index 0000000000..2a2e8f535c
--- /dev/null
+++ b/apps/website/e2e/payment.spec.ts
@@ -0,0 +1,115 @@
+import type { Page } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+import { externalLinks } from '../src/config/routes'
+import { test } from './fixtures/blockExternalMedia'
+
+const CLOUD_URL = externalLinks.cloud
+const PLATFORM_USAGE_URL = externalLinks.platformUsage
+const SUPPORT_URL = externalLinks.support
+const DOCS_SUBSCRIPTION_URL = externalLinks.docsSubscription
+
+async function expectNoIndex(page: Page) {
+  await expect(page.locator('meta[name="robots"]')).toHaveAttribute(
+    'content',
+    'noindex, nofollow'
+  )
+}
+
+test.describe('Payment success page @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/payment/success')
+  })
+
+  test('has correct title and is noindex', async ({ page }) => {
+    await expect(page).toHaveTitle('Payment Successful — Comfy')
+    await expectNoIndex(page)
+  })
+
+  test('shows success heading and subtitle', async ({ page }) => {
+    await expect(
+      page.getByRole('heading', { name: /Payment successful/i, level: 1 })
+    ).toBeVisible()
+    await expect(page.getByText(/Thanks for your purchase/i)).toBeVisible()
+  })
+
+  test('primary CTA links to Comfy Cloud', async ({ page }) => {
+    const cta = page.getByRole('link', { name: /CONTINUE TO COMFY CLOUD/i })
+    await expect(cta).toBeVisible()
+    await expect(cta).toHaveAttribute('href', CLOUD_URL)
+  })
+
+  test('secondary CTA links to platform usage & payments page', async ({
+    page
+  }) => {
+    const cta = page.getByRole('link', { name: /VIEW USAGE & PAYMENTS/i })
+    await expect(cta).toBeVisible()
+    await expect(cta).toHaveAttribute('href', PLATFORM_USAGE_URL)
+  })
+})
+
+test.describe('Payment failed page @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/payment/failed')
+  })
+
+  test('has correct title and is noindex', async ({ page }) => {
+    await expect(page).toHaveTitle('Payment Failed — Comfy')
+    await expectNoIndex(page)
+  })
+
+  test('shows failure heading and subtitle', async ({ page }) => {
+    await expect(
+      page.getByRole('heading', {
+        name: /Unable to complete payment/i,
+        level: 1
+      })
+    ).toBeVisible()
+    await expect(page.getByText(/payment didn't go through/i)).toBeVisible()
+  })
+
+  test('primary CTA links to support help center', async ({ page }) => {
+    const cta = page.getByRole('link', { name: /CONTACT SUPPORT/i })
+    await expect(cta).toBeVisible()
+    await expect(cta).toHaveAttribute('href', SUPPORT_URL)
+  })
+
+  test('secondary CTA links to subscription docs', async ({ page }) => {
+    const cta = page.getByRole('link', { name: /READ SUBSCRIPTION DOCS/i })
+    await expect(cta).toBeVisible()
+    await expect(cta).toHaveAttribute('href', DOCS_SUBSCRIPTION_URL)
+  })
+})
+
+test.describe('Payment pages zh-CN @smoke', () => {
+  test('zh-CN success page renders and links correctly', async ({ page }) => {
+    await page.goto('/zh-CN/payment/success')
+    await expect(page).toHaveTitle('支付成功 — Comfy')
+    await expectNoIndex(page)
+    await expect(
+      page.getByRole('heading', { name: '支付成功', level: 1 })
+    ).toBeVisible()
+    await expect(
+      page.getByRole('link', { name: '前往 COMFY CLOUD' })
+    ).toHaveAttribute('href', CLOUD_URL)
+    await expect(
+      page.getByRole('link', { name: '查看用量与支付' })
+    ).toHaveAttribute('href', PLATFORM_USAGE_URL)
+  })
+
+  test('zh-CN failed page renders and links correctly', async ({ page }) => {
+    await page.goto('/zh-CN/payment/failed')
+    await expect(page).toHaveTitle('支付失败 — Comfy')
+    await expectNoIndex(page)
+    await expect(
+      page.getByRole('heading', { name: '无法完成支付', level: 1 })
+    ).toBeVisible()
+    await expect(page.getByRole('link', { name: '联系支持' })).toHaveAttribute(
+      'href',
+      SUPPORT_URL
+    )
+    await expect(
+      page.getByRole('link', { name: '查看订阅文档' })
+    ).toHaveAttribute('href', DOCS_SUBSCRIPTION_URL)
+  })
+})
diff --git a/apps/website/e2e/pricing.spec.ts b/apps/website/e2e/pricing.spec.ts
new file mode 100644
index 0000000000..05520f0e5b
--- /dev/null
+++ b/apps/website/e2e/pricing.spec.ts
@@ -0,0 +1,56 @@
+import { expect } from '@playwright/test'
+
+import { test } from './fixtures/blockExternalMedia'
+
+test.describe('Pricing page @smoke', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/cloud/pricing')
+  })
+
+  test('shows the three paid tiers and Enterprise', async ({ page }) => {
+    const pricingGrid = page
+      .locator('section', {
+        has: page.getByRole('heading', { name: /Pricing/i })
+      })
+      .locator('.lg\\:grid')
+
+    for (const label of ['STANDARD', 'CREATOR', 'PRO']) {
+      await expect(
+        pricingGrid.locator('span', { hasText: new RegExp(`^${label}$`) })
+      ).toBeVisible()
+    }
+
+    await expect(
+      page.getByRole('heading', { name: /Looking for Enterprise Solutions/i })
+    ).toBeVisible()
+  })
+
+  test('does not show the Free tier when SHOW_FREE_TIER is disabled', async ({
+    page
+  }) => {
+    const pricingGrid = page
+      .locator('section', {
+        has: page.getByRole('heading', { name: /Pricing/i })
+      })
+      .locator('.lg\\:grid')
+
+    await expect(
+      pricingGrid.locator('span', { hasText: /^FREE$/ })
+    ).toHaveCount(0)
+    await expect(page.getByRole('link', { name: /^START FREE$/ })).toHaveCount(
+      0
+    )
+    await expect(page.getByText(/Everything in Free, plus:/i)).toHaveCount(0)
+  })
+})
+
+test.describe('Cloud pricing teaser @smoke', () => {
+  test('does not show the "Start free" tagline when SHOW_FREE_TIER is disabled', async ({
+    page
+  }) => {
+    await page.goto('/cloud')
+    await expect(
+      page.getByText(/Start free\.\s*Upgrade when you're ready\./i)
+    ).toHaveCount(0)
+  })
+})
diff --git a/apps/website/e2e/responsive.spec.ts b/apps/website/e2e/responsive.spec.ts
index c77e8e4ec7..6488170457 100644
--- a/apps/website/e2e/responsive.spec.ts
+++ b/apps/website/e2e/responsive.spec.ts
@@ -1,3 +1,4 @@
+import type { Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 
 import { test } from './fixtures/blockExternalMedia'
@@ -47,4 +48,105 @@ test.describe('Mobile layout @mobile', () => {
     const mobileContainer = page.getByTestId('social-proof-mobile')
     await expect(mobileContainer).toBeVisible()
   })
+
+  test.describe('SocialProofBar seamless marquee', () => {
+    test.use({ contextOptions: { reducedMotion: 'no-preference' } })
+
+    test('mobile forward marquee loops seamlessly', async ({ page }) => {
+      const geometry = await measureMarqueeLoopGeometry(
+        page,
+        '[data-testid="social-proof-mobile"] .animate-marquee'
+      )
+      expectSeamlessForwardLoop(geometry)
+    })
+
+    test('mobile reverse marquee loops seamlessly', async ({ page }) => {
+      const geometry = await measureMarqueeLoopGeometry(
+        page,
+        '[data-testid="social-proof-mobile"] .animate-marquee-reverse'
+      )
+      expectSeamlessReverseLoop(geometry)
+    })
+  })
 })
+
+test.describe('Desktop SocialProofBar @smoke', () => {
+  test.use({ contextOptions: { reducedMotion: 'no-preference' } })
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/')
+  })
+
+  test('desktop marquee loops seamlessly', async ({ page }) => {
+    const geometry = await measureMarqueeLoopGeometry(
+      page,
+      '[data-testid="social-proof-desktop"] .animate-marquee'
+    )
+    expectSeamlessForwardLoop(geometry)
+  })
+})
+
+type MarqueeGeometry = {
+  copyWidths: number[]
+  startPositions: number[]
+  endPositions: number[]
+}
+
+async function measureMarqueeLoopGeometry(
+  page: Page,
+  selector: string
+): Promise<MarqueeGeometry> {
+  await page.locator(selector).first().waitFor()
+  return page.evaluate((sel) => {
+    const tracks = Array.from(
+      document.querySelectorAll<HTMLElement>(sel)
+    ).slice(0, 2)
+    const firstAnimation = tracks[0]?.getAnimations()[0]
+    if (!firstAnimation) {
+      throw new Error(`No CSS animation found on ${sel}`)
+    }
+    const duration = firstAnimation.effect?.getTiming().duration
+    if (typeof duration !== 'number' || duration <= 1) {
+      throw new Error(
+        `Animation on ${sel} has unusable duration: ${String(duration)}`
+      )
+    }
+    const setAllTimes = (time: number) => {
+      for (const track of tracks) {
+        for (const anim of track.getAnimations()) {
+          anim.currentTime = time
+        }
+      }
+      void document.body.offsetWidth
+    }
+    const readX = () => tracks.map((track) => track.getBoundingClientRect().x)
+    setAllTimes(0)
+    const startPositions = readX()
+    const copyWidths = tracks.map(
+      (track) => track.getBoundingClientRect().width
+    )
+    setAllTimes(duration - 0.1)
+    const endPositions = readX()
+    return { copyWidths, startPositions, endPositions }
+  }, selector)
+}
+
+function expectTwoMatchingCopies(geometry: MarqueeGeometry) {
+  const { copyWidths } = geometry
+  expect(copyWidths.length, 'expected two duplicate marquee tracks').toBe(2)
+  expect(copyWidths[0]).toBeGreaterThan(0)
+  expect(copyWidths[1]).toBeCloseTo(copyWidths[0], 0)
+}
+
+function expectSeamlessForwardLoop(geometry: MarqueeGeometry) {
+  expectTwoMatchingCopies(geometry)
+  // Copy 2 ends the cycle exactly where copy 1 started, so the restart
+  // (when copy 1 jumps back to its start position) is visually indistinguishable.
+  expect(geometry.endPositions[1]).toBeCloseTo(geometry.startPositions[0], 0)
+}
+
+function expectSeamlessReverseLoop(geometry: MarqueeGeometry) {
+  expectTwoMatchingCopies(geometry)
+  // Reverse marquee: copy 1 ends the cycle where copy 2 started.
+  expect(geometry.endPositions[0]).toBeCloseTo(geometry.startPositions[1], 0)
+}
diff --git a/apps/website/e2e/visual-responsive.spec.ts b/apps/website/e2e/visual-responsive.spec.ts
index 1954901d85..060e75cfd8 100644
--- a/apps/website/e2e/visual-responsive.spec.ts
+++ b/apps/website/e2e/visual-responsive.spec.ts
@@ -26,8 +26,8 @@ async function assertNoOverflow(page: Page) {
 }
 
 async function navigateAndSettle(page: Page, url: string) {
-  await page.goto(url)
-  await page.waitForLoadState('networkidle')
+  await page.goto(url, { waitUntil: 'domcontentloaded' })
+  await page.waitForLoadState('load')
 }
 
 test.describe('Home', { tag: '@visual' }, () => {
@@ -126,6 +126,7 @@ test.describe('Overflow guards', { tag: '@visual' }, () => {
   const pages = [
     '/',
     '/cloud',
+    '/cloud/enterprise',
     '/cloud/pricing',
     '/contact',
     '/download',
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png
index bda1554132..bdfa934d5f 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-1-sm-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png
index 9f1ffb3b50..33bbea1737 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-2-md-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png
index 636ff5954f..5ce1c80434 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-3-lg-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png
index 68e1cf8bcd..695a4684aa 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-get-started-4-xl-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png
index 1a0b83ef45..780cc7b555 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-3-lg-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png
index 35f66b2859..0290e4e062 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/home-product-cards-4-xl-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-1-sm-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-1-sm-visual-linux.png
index 20d8be7838..13f924097d 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-1-sm-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-1-sm-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-2-md-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-2-md-visual-linux.png
index 718fb32ef7..70b26c7ca3 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-2-md-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-2-md-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png
index 4017ab1aba..d5129a7fb1 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-3-lg-visual-linux.png differ
diff --git a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png
index fff724b671..d6f83d0fa2 100644
Binary files a/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png and b/apps/website/e2e/visual-responsive.spec.ts-snapshots/pricing-tiers-4-xl-visual-linux.png differ
diff --git a/apps/website/package.json b/apps/website/package.json
index 5a4aa57c3b..8a34eca2cc 100644
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -15,11 +15,15 @@
     "test:e2e:local": "cross-env PLAYWRIGHT_LOCAL=1 playwright test",
     "test:visual": "playwright test --project visual",
     "test:visual:update": "playwright test --project visual --update-snapshots",
-    "ashby:refresh-snapshot": "tsx ./scripts/refresh-ashby-snapshot.ts"
+    "ashby:refresh-snapshot": "tsx ./scripts/refresh-ashby-snapshot.ts",
+    "cloud-nodes:refresh-snapshot": "tsx ./scripts/refresh-cloud-nodes-snapshot.ts",
+    "generate:models": "tsx ./scripts/generate-models.ts"
   },
   "dependencies": {
     "@astrojs/sitemap": "catalog:",
     "@comfyorg/design-system": "workspace:*",
+    "@comfyorg/object-info-parser": "workspace:*",
+    "@comfyorg/shared-frontend-utils": "workspace:*",
     "@comfyorg/tailwind-utils": "workspace:*",
     "@vercel/analytics": "catalog:",
     "@vueuse/core": "catalog:",
@@ -27,6 +31,7 @@
     "gsap": "catalog:",
     "lenis": "catalog:",
     "posthog-js": "catalog:",
+    "three": "catalog:",
     "vue": "catalog:",
     "zod": "catalog:"
   },
diff --git a/apps/website/playwright.config.ts b/apps/website/playwright.config.ts
index af51992ee8..b6100286bc 100644
--- a/apps/website/playwright.config.ts
+++ b/apps/website/playwright.config.ts
@@ -28,7 +28,7 @@ export default defineConfig({
     ? [['html'], ['json', { outputFile: 'results.json' }]]
     : 'html',
   expect: {
-    toHaveScreenshot: { maxDiffPixels: 50 }
+    toHaveScreenshot: { maxDiffPixels: 100 }
   },
   ...maybeLocalOptions,
   webServer: {
diff --git a/apps/website/public/assets/images/fallback-gradient-avatar.svg b/apps/website/public/assets/images/fallback-gradient-avatar.svg
new file mode 100644
index 0000000000..90b860f619
--- /dev/null
+++ b/apps/website/public/assets/images/fallback-gradient-avatar.svg
@@ -0,0 +1,13 @@
+<svg width="87" height="87" viewBox="0 0 87 87" fill="none" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect x="0.271484" y="0.547852" width="86" height="86" rx="16" fill="#1C64F2" />
+  <rect x="0.271484" y="0.547852" width="86" height="86" rx="16" fill="url(#pattern0_457_15608)" />
+  <defs>
+    <pattern id="pattern0_457_15608" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_457_15608"
+        transform="matrix(0.000983706 0 0 0.000755211 -0.472672 0)" />
+    </pattern>
+    <image id="image0_457_15608" width="2000" height="2000"
+      xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAQEBAQEBAQFBQQGBgYGBgkIBwcICQ0KCgoKCg0UDQ8NDQ8NFBIWEhESFhIgGRcXGSAlHx4fJS0pKS05NjlLS2QBBAQEBAQEBAUFBAYGBgYGCQgHBwgJDQoKCgoKDRQNDw0NDw0UEhYSERIWEiAZFxcZICUfHh8lLSkpLTk2OUtLZP/CABEIB9AH0AMBIgACEQEDEQH/xAAaAAEBAQEBAQEAAAAAAAAAAAAAAQIDBgQF/9oACAEBAAAAAP2AAAAAAAAAAAM2yAiAkEQRAkEQQhBAggIIAQAAAFgUAqgKKKUUotC0KoVRb0AAAAAAAAAABm3ICQEhLIEhEEQEghBBAQgEsCAAAAFAoFUClClFoWyjUpaCqL1AAAAAAAAAADNQEIIgiBIEgZEIQgIgRACCAAEoAAAUKCqBbKKUWhVFUVRVHYAAAAAAAAAAyqAlyEQRBEIgSBIQghAhAQQABAAAFAAUUCqFsoqi0LQqiqKp2AAAAAAAAAAZVARASBIRCIIgiCIIQRAQgAICAAABQoAWyhRRaCqKpbKWhVFV2AAAAAAAAAAyqAiAyIgiEQiBIIhCAiBEAIIAAQLKAAUUAqgtBaFUWhVLQqjUvYAAAAAAAAAGVQEQRBEIhECQSCIIghASAQQAQAAAAoAooFULQpRVGgqloVRqdwAAAAAAAAAZqAiCISyCQSEQiCIQgZCEBBABAQAAAFBQFFBaC0KUqiqWi0Kpb2AAAAAAAAADNQCQRCIIhIJBEIhCBIIgIICBAACFAAAUUCqBbKKoqjUpaLRaFUvcAAAAAAAAAZqASCIRCIRCIRCIQhCCIEICBAAQAAAoAFFBShaFoWhVLRaLQtH0AAAAAAAAAJKgEgZEQSEQkIhEEQRBIEICCAEBAAAAUUAUUKoLQtCqWi0Wi0ND6AAAAAAAAAJKgEgZCQiIhEIhEIgiEQIQEQBBAACAUAApQFUC0KUqi0Wi0Wi0VX0AAAAAAAAAkqASEQlyJCIREQiIQhCQIQIQCEAAIAAFAAVQFKFUVRaLQtKpaLRV+gAAAAAAAAJLcgSEQiEQkIhERCIJAkCIEQEIAECAAABQUBVApRSiqWhVKpoWi0V9IAAAAAAAAktyBIRCIJEQiIhEIhEEgiCEBEAIIAAAAAFCgVQUoqilKpVKpoWiqX6QAAAAAAABlrIEhEIgkRCQiIhEEgkEQRARAEQAAQABQAClAUopRaFUqlUqrRVKp9QAAAAAAABlqQEhEIhIJEQkIiIRCIQgiCEBBABBAAAAoUAVQKUVQtFoqlUqmhVND6gAAAAAAADNQEhEIhISCREJEISEQhCEEQEIAQgAAAAAUoBShSiqKpVLRVKq0VVp9QAAAAAAAElQIhEIhISEhIREQiEgiEQQgQgEIAAIACgAClAqgqhVKotLRVLS0aFX6gAAAAAAASVAiEQiIiIiEhIiEQkEgSCECICEACCAAAKFAClAtBaFoVSqaFU0Kq0V9YAAAAAAASVAiEQiIiIiIiIiEREEgkEQIgIgAiAAAAACigKsoWgqiqVSqaFU0Kqqa+oAAAAAAAMtZCIRCQiIiQSJCIiEhEIgiCEEEAhAAlAgoEoAKsoKULQtCqWiqaFVVNCqv1gAAAAAABnWQiEgkIiIkJCREJCISEQRBECIBCAAggAAUKACqBSilFUqlUqmhVVS00PsAAAAAAAJKgiEQkEiQkJEREREQiEgiCIEgEQCVCAAAAAUqUCqClFoWhaLSqtFVVVVp9gAAAAAACSoDJEJBIkJERISIiIJCQRCEEgEQBCAASgAAAFUAtBVCqLRaLSqqmhaWlX7AAAAAAAGagMhkkGSREREiISIhIRCIRBCBEAhAAIBAFApKAVQFoLQqiqVS0qqqqWmhp9gAAAAAAGWshEGSQSJERIiIhJEIiIRBIIgRAggEqCAAAAFKAFUFUKoqi0VS0tKqqqqqvtAAAAAABJYEQZIhJEREiIiRCQkJCIRBECQIIAhAAAAAAFUAqgWhaFotFUtLS0tLS0v2gAAAAABJUEQkIiIkSEiIkJEhIRCQiCIEgIgEQAAIABQlAFKlC0FUVRaKpVVS00LS0tPuAAAAAADNQRCIiJCRIiJCQkSEhIRCQRBEEIBEAEAgAAFFABSgWyi0LRVKpVWlpaVVVVfcAAAAAAGdZEQiIiIkSIiRESIiQkIhEIgkCICEAIIAAAAApQBVlC0KoqlUqlpVVVVaWmj7gAAAAACSwJCIiIiRIiRDKIkJCQkIhEIgSBCAEIAAAAAAFKAqgtBaKo0VRoWlpaWlq19wAAAAABmoIhIiIiRIiREiIkREhERCIJBEBEAhAAIBAFAoAC0AtlFoWhaNC0WlpaaKqqt+4AAAAAAiCIMkhIkSIkSIZJEhISEgkIgiBEAiAECAAAACqAFUBaFoVRaNC0tGiqtLS0v3gAAAAASakIhISEiRIkREiRESIiIZEgkEQRAIgBBAAAAAAVUoFoFoLQtFVVKq0tKq1aVV+8AAAAADNQMkRISJEiJEiJEiIkJCQkEgkCICIAhAAAIFAAApQC0C0LQtFpVLS0tLVVVWn6AAAAAAEQRERISJEiJIiREiQkREQkJBIEgJAEQACAEAAUoAKUBaC0LZS0WlotLS1VWlqq/QAAAAACTUhEJERIkSIkiIkSJERISEhEJAkCIBEACBAAAAoCgFKAtBaGpS0aFpaVVVVaKq1+gAAAAAGahEJCRIkSIkiJEiJEiIiIhIJBIEQIQAhAAAAAABVAVQKoWhaLSqWlpaWmi00Vf0AAAAABCCQiJEiRIiSJEiRESJCQkJBIJBECIAhAAAQAKAAUFApQWhaFotGhoWlqqtNFVp+gAAAAASWCIiJCSJEkSJDKRIiJERERCQSCIEQCCAAgBAWUAUAKKCyqFoWhaNCqtGiqtLVVor9EAAAAAzUIhIkJEiSJIZSJEiRESEhISEQRBEBCABAEAAABQoALQFoWg1KVS0tLS0tNFpotNfoAAAAAJLAySIiRIkSSGUiRIkSEiQkEhIEgiAiACAgACCgAChQFloKoVQ1KaFo0LTQ0Wlq0tX9EAAAABmwRERkZSJEkhlIkSJEiIkJEQiEQRARAEIAAAgFAAFI0ApQNAtDQtFpaVVVaaLTRVfpAAAAAQhEJEiRIkSSJEiRIkSJERISCQiCIEQBEAAggAAFKACpaAaAtC0Wi0WlpaWmi00Wqr9IAAAADOsiQkSEkiRJEkSRGUSIkSEhIiEQSAiAiABARUAACoCgoC0FloLQtFotGhaaFq00Wqq1+kAAAACEIiQkSJJEiSRIkiSJERIkJCQSCQIgGQAglQAAAAAKpKLFoDQLQtFoqrVKqrTRaWrVX9IAAAAGdZDJIkMpEjKSRJEkSJEhIkJCQiEgSASAEQAAAAAAAFFFTQC0LQtFo0LS0tNFpatNFv6QAAAAM6yREiQkkSSJGUiSRIkSJCRISCQSCQEgCEAAEBAFBQSgVGgKUC0LQ0FVaNFpVWqq0taLf0gAAAAhCQkSJGUiSRJIkkSJEiQyiEiIJBICQCIABCKIUCFQFUABVBZaC0LRaGhVWlpaqrVVatV+mAAAAEsgykSJEiSRlIkkkSJEiRIZJCQiCQGQIgAQgAAAAUIqgFiilKC0LRaLRoWmi0tVVq1aX9MAAAAJZERIkSSJGUjKRlJIkZJEiQkJCQRBIBEAIlEAAAAAAKpKKloDQLQtFoqrS0tLVVatLWi/pgAAABEGUSIykZSSMpGUkiRIyZJEhIJCQJASADIsAAAAAAACrFCllDQLRVFVaNC00Wmi1VWrV/TAAAACISJEiRlJIykZZSJJEjJkySEiIJBICQBEqBKCCAAApQlAqNIoLQs0C0LSqWlpVWmi0tWrVq/pgBQgFgRERIkZSMpJEkkiSRJIkSSEiQkIgkEIBEABCFABAqAKoACqAaCy0VSqLRqVaWqq0tWrS1o/UDQAAMglyiJEjKSRlIzIkkkSSJGSRkkJCIRBIAyAEIqWAAAACoVSUBVlKlos0C0WjQtLS0tVVppVWtH6wRAAABISJDKSRlJIkkkZSSJJEiRIkJCIkCQCQARKIAAAAAAFUBUtAWizQsqmhaLTQ0VVq0tWrVr9UAKAEiwiJDKRJJIkkkZSSSJGUkhlIiJEQkEgGQBIWASgAAAAABaAKsoWizUpaLRaWlpaaLTRatVWn6wAAAMhEMpGTKSSRlJJIkkkZSJEkhIkMiQZBEAZAABAEAFCgAKi0CxaBaDQqi0tGhotLVVatVVrT9aAUAAQiIkSMpGUkjLKSSRJJIkkSJEhIkJCQJAGVQAghQAABBSiUAWpQWgWiqGhVLS0qtFVatVWi1p+sAAABIREiRlJIkkkZZZSSJJGUiSIyZJCQiEIElQBEKBAAAKBCqAKjQBaBaFpVFpaNDRaaLVVotWrf1gAAAIiQkZSJJGUkjMjKSSRJIkZSJDJkiEhEDIARAAAAAAFEUoBYtAWgaFmhVLRaVVpotVWi1aq2/rBUAAAyREiSRlIyyykkkZSSJJJEiRIkMkhIJBLICIAAAAAAAKRVABpKWWhVlLSzQtLS0tLVVotWrVW39eAAUIBESJEkiSSSRlJJJIkkkSMpEiRIiJEgiCQElIAABAKAAAKhaAFoWWgtDQqlo0KrRaaLVppVWr+wFAAEgkJEjKRlJJJIkkkkZSSMpEjJlESIhkhCQIIABAIAFAoABULQLFoFsqy0qhoWlpVWmjRaqtFq1r9cAABWRESJEkkSSSRllJJIykkZSJIjKIyMmQkIQJAECKAAAQCqACotAsWgWg0KpVGi0tKrRaaNGi1av7IAAAZIhlIykSZSSSJJJJJGUjKRkkZMoiQZIgkCQCRQEAABQQUoAVFoLFoGgWlmhaNC00NFpo0WrVq1f2QAABEJDKRlIykkkkZSSSJJJEkiRJEkRDJIRBkMgQEAAAABQhVACxaAWyrLZVlVVGhaWlpotWlq1atVb+yAAABlIiMpGUkkkjKSSRlJJIkkSGWSRIZIhkSCWQSpAAAAAAFIpQCxaCxoLLQaKpVLS0tLTRatWrVqrf2gAAIEhJEZSMpJGZEkkkjKSSRIkZSJEhkkMiIiBkCQAAAAAAKQtAKloLGgNAqmg0NDQ0VWi1atNKq2/tFgFEsqQiJEiSRJIyyykkkkSSSJGUjKREZJEgySCQSAyABABQAAAqKoCpaCy0WWiqVSqVVpaaNFq0tWrVr9wAACIGUhlJIkkZZSSSMpJJEkiSRIyZGUiIZGREJWSFyAi5BrNCVQAAVC0BrNoC0WWhVNC0tLS00WrVVo0aNH7gAABIMmURllJIykkkZSSSJJEjKRIyZMkhkiEgyEgRAkUAIBqBQACotAWNANAalVRaNDQ0Wlq1VaNGi1a/cBQAgSEiRIykkZSSMpJJGUkiSRJIkSIjKIiGRkZCQGQAQigCBRQAKhoBZaA1Ks0KpVKqqaGiq0aNFtVa0fuhCgFkIiREkZSJJJGUkkjKSRlIkkSREiRIZIjNjNiEMgyAJAAFBBRQAWFoKloWWg0FU0VSqtNFq00aLVq1a/doAAhCQkiJJIkjLKSRlJIkkkSSJEkRlESIhlEGSIQhkAZAAAVZDUKAFRaCxaBoWaBoqjQ0Wlqq0aLVq1atfvAAAMiREiSRGWUkjKSRlJIkkSRJEiRkkMmSIkJBIGQMhIAAACoC0AVFoLGgstFUNBoaGhotNGi1atWrVr94ABUDIySJGUiSSRlIykkiSMpJESSIySJESXKISIhkJCCCQAAABbI1loAVKoLLQNSrNSqU0NDQ0WmjRatWrVq1+8AoE1kSEiJIkZSJMpGUkiSRJIkkRJEiRIkMjJISDIZJAZDIAAAAtZaigFS0A0FlpZoGhoqlpoqtFq1atWrVr98UAEQSEiRJEkSSJJJEkjKRlIkkSJERlEiJEuURIMoQkCQQEAAABUDQBUaBZaBqVVDRVGi00Wmi1atWrVq16AAAEgkJIjKRJIkkSSMpIkiSRIkZRGURIZJDIyZGQySAyAZAAAAVFUAsWgstFlpZqUqmhotLTRatWq0ppategAAAiEiRIkSJJIkiSRlIykSRGUiRIkSIhlIZGUIkEgZJAEgAAAC3LWbQFi0LGgWhVVRoaGi00WrVqraaWrXoBYUEBIJEiRIkkSSJEkiSRIykSJIjKJESJDIykJCRIJAySAJAAAAFuWooCxoFloNSqoaGhoaLTRatVbVppateiAAEQiIiRIkiSJGUjKRJEkSSJDKRIkRIjJISQjIkGTIZGQGQAAABYNAKloWWizQqhoaGhotNFq1VtWrVq16IAAIQkREiSIkkSRJEkiRlIkSJEiRIkSEiRIiJEgyJEiWQyAyAAAALcmgFi0LLQtDQaGhaaLTRatVatq1ateiAAAkEiQkSJEkiRJIkSRJEiRIkSJIiRIkJISQkREiIZSyEQGQAAABbnWdALLQstBoKpoqlpoqtFW1VtWrVq16JQBZARCRESJEiSRIkSRJEiRIyZRIiRIkSJCRIkJCRkSMksgzYMgEUAALGs6AsWgaFmhVGhaWmiqtVbVq1atWtHowUAiCISIiRIkSJEkSRIkiJIkSRIiSEiRIiMkiRIRJEuTIkJAZAkLQABYWgWWhZaFpVKo0qlpotWrVq1atWtHpAABBCIZJEiRIkSJEiRIkSRGUSIkSJEiRISSEkhISJCRIMhkJASC0AA1k0BYtBaKpVKo0NKpotWrVq1atWrXpApKQCIREhIkJEiRIkSJEkSJESRIkSEkSJEhJISSEhIyiJEsiXISAMloACprOgLLQNA0Gg0NDRaaNFq1atWrWi2+kAAEEISEiIkSIkRIkSJEiRJESIkiRISRJEhJIiSJCRISMiQZCQJUhoABblaCxoLLSzQaDQ0qlpo0WrVq1atWtL6UAARAkIiIkREiRESREiSIkRJEiJEkJIkSJISSJEiREkRGRISWEgSmS0ACxaBZaLLQ0GiqNFpaqtFq1atqtKtW+lAFgEQRBlEJERIiJIiRIiSGUiQySJIiRIkkSEkiSJESMjKRLkkCQIWRaACpqUFloVQtKU0NDRatLVq1a0aVWlW+lAosgCQRCQkJCRIiREiRESREkRISSJEiJIkkSJGUSRISSGUiWRLkSBkqLQAWGgWWgalVSlNDQ0qrTRo0aNGjS1avplAAhAZEQkJCIkREiJEiJESRIkRIkSRIiSJJEiSRJEZJGURkZDIkDJUWgAsWgstFmhVKU0NFqqtNFq1o0WtLVrXpgAAQgiCQiEhIiJEREiREkRIkiIiSSJIiSSMmSSSJIkSMoiQkGRIJCo0ACxaCy0WWlmilNDRaaLTRo0aNLVq1avpwAsAIQRCQSCREREiIkSJDKGUSSEkSSJIkiSSJEkiSRISSGUhIMiQSFRoAFi0LLQWlmiqNDQ0aLVVo0aNLVq1bXqABYCAQgiEQiIiIkJEiJERIiSRGUSRJIkiRlJIySZSMmSSQykJBkSCQqNABYaBVCqGg0NDQ0aLVqq0tWrVrRbb6gAAEICEEQiERERERIkREkRISSJJEiSSRIkkZkSJJEkkRIyZSEgyJBIaytAFRoFloNBoNDQ0Wmi1aaWrVq1otq2+oAAAEICEEQkEiISIiREiJIiRJIkkSJJImTLKSRkyykkSJGSSQkGRIMixoALFoWWiqWaDQ0NKpo0WrVq1a0qtGlvqBVIAgAggRBCQiIiGURISJIkiRJIkkSRJJJEkTMiRJJIykSMkkhIMiQZLDQAsNBY0KoaDQ0NKpo0WrVq1o0aWrWnqRQAASWAIQQhEJCIkRIhJEkSREkZSSRIkkkkSZSSMpJEmUiRlEkJBkZEhrK0AWNANCqGg0NFpatNGi1o0aNLVq1p6oAAAAIICIIhEJCJESJEiJIkkSJJJJEjMkTKSRmRkzIkkZRJIkhIksMiRUaAFlUKos0Gg0NDRotNGi1o0aWrWi216oLGoAlEsAAhAiERERCSIkRIkiSSRIkkkkSSSSSJMpMpEmUkkiJJEkJEgkEjWVoBYaCy0s0Gg0NDRotNGjRo0tWtFq216sFAAAAIEBEEREREhJESRIkSSSJImUkkkSZiZSSSSMpMpJIkSSJISJBIJKjQAstCzQstGhVqqpotWrTS1atWrWlq16wAACpZQAgCEIhEREhIkiRJEiSSSJIkykykkkkkTMZkZSSMyRIkiSQkMiQZaytANZaCy0LRopTRaaNKq1atWtKrS1a0vqxYUlCgAAAQghERISIiSJEkSSJJJJEkkkkiSTMZiSSTLJmSSRlEyiSGRkZCWRoAsqiy0NBoWjRoaNGi1ataNGlq1a0vqygUAFFAAgIIiEJEiRESSJIkkSSSSRJJJJlJJJJJJJJlIzJJIyiZJJJcpcjIGWgCxaKULRopVpotNGjRo0aNLVq1pavrAoApQCgogECEhEiIiSIjKSJJIykkkkkTMkkZTMkkZkkkkZkkkZSMmWURIJAZWgFlopQtGiqWrVVatNGjRpataNGlq+tAFFAVQoACAhERESJESRIkkkSSRJJJJJJJJMpJMxmJmSSSMySSRJGTLJIkEglzaAWNAaC0aGhVaLVq1VtWrVrRpatWr60UCgWhSgUBAIhESIiJIjKRJJEkkkiZjMiSZkkkkkkmUmWZJGZJJGTLKSQkMjIM2gFjQVQtGhoaGjRatWrVq1patWrbVvrQKBSiqKoBSAIhERGSREkSSJGYkkkkkkkkkkkkzGWZJMpMsySMySSMpJIkhkSGQABZaFULRoaGi00aLVq1a0tWrVq21b64AKoVSqKoAAIiIREkRIjKMspGYkkkkkkkzEyzJMpJMyZSSZkkZkkkZSSSJJcpBIAAWNBVC0aGhpVNFrRo0aNLVq1pa0W+uCotCqVSqUoAAhEhEiJIkRJImYkSZSZkSTMkkkkmZJJJmSSSTMkjMkkkiSRlkkSDIAAVRVC1ZoaGjRatLWjS1atWtLWlq168BQpVVVLSlAAQhIiEkRJIkSSJJJEzJJJJJJMyMySTMZkyzJJJmSRmSTKRJkyySGRkABUtFUNFVVGjRatWrVq1a0tWtGjS169QC0WlVaWlKABCESIiJIkSSIzIkykkkkmYkmZJJJmSZjLMmZJJMySMySZSSMpJDJkSAALLRVDRVUq00aLaq1a0aWrWjRpatewAUpaVVqqtKoAEIiEiRESSJJEkZiZiSSZZkkkkmZJJMyZZZmZJJJmSSTKTKSSSJIkSDIACy0VSzRVLTQ0aNGjRo0tWtGlq1baewAqi0tWqtqqVQAghISJEiREkkiSJmJmSMsyTMZZkmZJJmTLMkzJJJMySSZZkZSSMskhIZAAstFUotVVNKpo0tNLVq1batWtGlq+vKULS1atWrVpVABERCIiSJEiSRMxJJJJJJJJMySSZkmWZJmZTMmZJJmTLKTMkkiTKSQykEgALLRVKpVNDRotWrVq1attWtGjS1avsQBaWrVrS1atKoAhEREJESSJIkkTMSSSSSSZkkmZJJmSTLMmZJmTMkkzJllMyTKSSSJkkMjIALLRVKo0NFW0tWrVq1pataNLVq21b7ABaVVrS21batKoAREQkhEiSJJEkkTMSSZTMkkkzJJmSTMmWZMyTMkzJMyTLLMkmUkkjLJkZJAAstFUqjQ0qmjRa0aLbVrS1ataNLVvsAWi1VttW22rVqqAIQiRESJEiSSJJJJJJGZJJMpmTMkyzJmSTMmZJmTMkkzMyRnKZjKTKSSXKQSACy0VSqNFVatNFtppataWrVrRpatq+xLClW1bba1VttWlUBCEQkiJIiRJJGUkkkkkkkmZJMySZkmZMySZkzllnMmUzMySSZZkkkkiZJDIyALLRVKqqWmlVatWrVrS1ataWrbVW17EoLVq222221pbaVQCRCEhJESRJEkkiSSSZjLMkkzJJMyZkzJMyTMmcsyZkyzJmTKZkmUkkjLMuUgkALLRVKqqWmjRatWrWjS1bataNLVq17ICqaW22222222rVUCEJEEkJJEkRJJJJImYzJJJJmTMkmZMyTMmZJmTOWZMyZkzJllmSZjKTMSRIZGQCy0VSqaGho0aNGi21attWtGlrSrVvsRRS222223TVtrS1SgREQkQkhJIkkSSSSSMySZZZkmZJmTMmWZMzMkzJnLMzMySZkzJJlmSSSRlkykDICy0VRoaGiraaNLVq1pataNLVtq1avsgUW2tW226ttttttKUQhESESEkSSJJEkkkkkkmZJJmTMkmZMyZZmZmSZzJmSZmZJmZkkmZJllJkzJEMhkCy0NFmhoaNFq1atWtGlrS1attWtFteyUC1bbq23VturbbVqiwQSERkkiJEkiSRlJlmRmSZkkmZMsyZmZJmTMzMs5mZJmZmWZM5ZZkmZIzJEyZSAkCy0LVUaVTRotWtGlq1batW2rVtW1b7ICqttt1bdW6tummlVQQRCIiMkkiJJIkkkkkkkkzJJlmZkmZMzMkzMzMmZMzMmZmTLMzMySZkkkkkZkiGQZCy0NFVVNDRo0tNLVrS1attWtGlrRb7IUU01bbq3V1bdW221SiEIRCREiSREjMiZSSSZZjMkzJJmTMzJmZkzJmZkzMzMmZMzMmZMySZkmWUmUmTIyGQstKpVLTSltWrVq1battWrWlq2rVtezAppbpq6urdXVt1batAEhEQhkkkRJEkkkkTKZkkkzJmSTMmZlnMzJmZkzJmZmcszMzJMzMmWcsySMyMyRDMpkNZtLNC1aNGi1atWtLVtq1a0tW1bVq17MoLbbbq6urq6urbdLaoEISERERIkiSRJJJJJJJlmSTMmZJmTMyzmZmZMyZzJmZmZMzMyzMzMkmZMspMpMmUgZCy0NDQ0qmlpo0aWrbVrS1attWratq+zAWtNW6t1q6utW6tttVSWIQiIiQkRJIkkkSZTMZkkzJJMzMkzJmZZzMzMmZmZkzmZkzMzMmZMzLMkzJGZGZIjIZFS0qjQ0VWjRpataNLWlq1battWrVq+zAq223V1dautXV1dW1aoQEhEREhIkSSJmJJJJJJJMySZmZJmZkzMyZmZmTOZmTMzMzMzMyTMzllnMmWUmUmTKQZGooqqqqaLaq1a0tWrbVq21a0tWraq+0EVVurdXV1rV1daurbbVAQghEiIkiJEkkkSSTLMTMmZJMyZkzJmZmZM5kzMzMzJnMzlnMzMyZmZJMyZkjMjMkRkZLZNBoqlpotaNGjS1o0ttWtLVq21atW+yKKtturq61q61rVutNVbQhAiCJERJESRJJJGZJJMpmSZkkzJmZkzMzMzJnMzMzMzMzOZJnMzJmZkyzmTKSTKTJlIAihoqmlU0tNLVrS1a0taNLWlq1atW+zKC23V1da1rV1rV1dW21SxBEEQSJESRIkjMTKSTMkkkmZMyZmZMzMmZmZmZmZmZnMmczMzMzOWZmZkmZMyRmRmRIyAzoVSqaNFq1atW2rWlrRpa0tW2rVq17SUDTVurrWtXd1rWrq6tWgCIRBEJIkSRIykkkkkkkzJJMzMkzMyZmZM5kzM5mZnMzJnMzlnMzMzMzJlnLOWUmYmZcpAM6FUaVTRo0aNLVq21pataWrbVq1ate0AaW261rWru61rWrrVtq0hAIiIJCRJEkiRJJMxJMyTMkmZMyZmZMzOZMyZzmZkznMmZnMzJnMzMyZzJMyZkjMjMiRkCUVVUtNGjRpatW2tGltq1ba0tWrVq+zAq26urrWta1rWta1dW20VBCBERCRESJJIkkkkkkkzJlmSZmZMyYkmZnMmczMzmZmcyZzMzMzM5kzMzLOWcspMyMmTIlBVVVqqaWrVtq1a0taWtLVtW1atWr7MC1q261rWta1rWta1q26WgIhECIkEiRJEkkSTMZkkkzJJmTMzJmZyzmTOZM5zMzMznMmczOZM5mZMzMzJmTMkkykySJAA0LTRotaNLVq21bataWrbWlW1atW+yUKat1da1reta1rWtat1aWACIRBEiEiRJJJEkkkmUzJmSTMmZmTMzmTOZM5mczMzM5zJnOZmZmczMmZmZZyzmSSRmSXIyAs0NKpo0aWrVtq1pbatW2rbVq1atW+0ALbda1rWtb1rWta1q6tpSEAIiQJEhIkkiSSSMySSZZmZJmTMzJmZzJnMzmTOczMzmZzMzOcyZzMyZmcyTMmZJJmRkkGQLNDRatNLVq21a0taWrbVtq2ratWrXtAC3Vuta1vWtb1rWtauraWAQgEiIJEhJEkZkSZTMkkkzJmTMzMyZmZmZmczMzmZzMzOczMzMSZzM5ZzMzLOWcsySMyS5GQKqqaNFrRpatW2tLWlq21batWrVq17QA01dXd3rW9b1rWtXWrVIAEQERIJEiRIzEkkkkyzJJmTMmZmZkzmZmZmZzmTOc5kznMzM5mGc5mZMzOZJmTMkkzIyZGQLSqaNGjS1bataWrbVtrS1bVtWrVp7QAt1dXWt63rW9b1rWrdNAQgBICRIRJERJJJJJJJJmSTMmcszMzlnMzmZmczMzmYmZmYkznOZM5mcs5mZmTMmZGcpMmRksVRpVNGlq21ataaWrbVtq21atWrWi+zANNXWta1vW9b1rd3datABCARAiSCSQykkSZiZkkzJJmZkzJnMzMzOZM5mczOZnMznMzmZzMzOczMmczMmcs5ZZkZkZEVm2UaWmi1pataWrbWlq21ba0q2rVq1XswFXV1rWt63ret61u61bWiCARAGQiSEjJIkykzEkzJmSTMzMyTOZmZmc5mZnMzmZzmZzM5zMzOZnMzmZmcszMmZJJmJlICSqLTRo0aWrbVtq21pattW2rVtWqtW+yAWtXWta3ret71reta1bVAIgEgIgkSEkiRJJJJJlmTMkmZmZkzmZmZnMzM5mc5mc5mZiZmc5mZnOZmZmczLOZMssySSMggotWmjS1pataW2rWltq21baaWrVq17IA01da1re9b3rW93W7paAAiBEBIJEhllEkkZkkymZmSTOZmTMzmTOczMzmZzM5zmZmJnMzmYkznMzJnOZJmTMyzIyyZCVKNFrRa0tW2rWltrS1battWrbVWq0eyC1K1da1re9b3u73rWrq0AAEQRASCSQkkSRmSSSZZkzJJnMzJnMzM5mczOZnOZnMznOZnMznMwznOZMzOZlnMmZJMxJDIJSqaNGlrRpa0ttW2rbVtq21ataLVp7K0A1da1re9b3re9a3dW0AWACQJAkEiRIykSZZkkyzJmTMzJmZzMzMznMzM5zM5zMTMznOZnMxMzOZmZmcyZyzJmSRlkSALS00taNLWlrS21battW2ratq1aqr7MANW71re9b3vW9a3daoAAAEgkCQSSEmTMTLMkmWZM5ZmZmTOczMzmZzM5zM5zM5zmZzmZzmYmZnOWczEkzJmZZZZSGQC0taNLVrS1bbataW2rbVtq1atWrTXsgEW6ut63re973retauqAACwBIJAkJGSSRmJlMySTMzJMzOZM5mczOZnOZmYmZjMzmZznOZmYmZnOZMTMyzmTMkmWSRkBaNGjS1battaW2rbVtrS1batWrVVb7IBKt1rW971ve963rWrqgAAABIJBIJJEkkSSTMkmZMzMkzmZmZmZzM5zM5zM5mJnOZnOc5mc5zJiZzJnMzMyZkyzJlLlCFUWrVrS1ba0ttW2rbWltq1atqrWhb7IALda1vW973vet61rVoAAAAEhIGRJIkkSSZZkkzJmZkzM5kznMzM5zmZzM5znOZnMxM5zM5zM5zMzOZmZmZMzLLMkuREsqmjRbattW2tLbVtrS21bVtWrVq00eyABrWta3ve973retbtoAAAABkSCQkZMspJMsyTMmZmTMzM5kznMzmYmZnOczEznMxmZzMTOZnOZmZzmZZzJmSTLKQRYoaNLWlq21pbattaWtLbVq21atVVV7IAGrret73vet73rd1bYAAAAAkJAySJGWUkmZJmSZkzMzMzmZmczOczOZnOc5znMznOZiZmJnOZnOZM5mZmZmZJJJEgJQtWrWltq21pa00ttW2rbVq1atWlp7IAGrretb6b3ve9b1dqAAAAACQkGRlkyymUyzmSTMzMyZzmTOc5kxM5zMTOZjMxM5zMTOZiZmc5mczMzMyZmZGWRkANGjS1pbatttW22rbVtq21atWrS0vsQAXV3re973vfTW9a1QAAAAFgSEgkMsmWYmWZMyTMzMzMzM5mZnOZnOczOc5zMTEznOczOc5zM5zMzOczLOZMyZSMmQCqtWtLWltrTS1pbataW2rVtWqtVVexABbret73ve973reroAAAAAAZJBIZZMyJlmTMkzMzMmczOZmZzmZznOZnOczExmZznOZnEzmZznMmc5kzmTMmUiRkA0NGlrS21bbatttW2tLVtq1atWlpp7AADWtb10103ve971q6AAAAAACQZJDLKSRmSTMkzMzMzJnOZmZznMznOZiZznOc5mc5znMznEzM5zM5mcyZmcsyMpBkKU0taWtLbWltrS21pbatW2rVqqtKvsABK1rWt73vpve971rVAAAAAABISEhllJJIzlmZkmczMzMzOczOczOc5zMTEznOc5mJiZznOZnOZmYmZmTMzJMxJBmpVFq21pa00ttaW2tLbVtq1atWrVVVewAA1db3rpvfTe971toAAAAABYGSQkMspMpJMyZkmczOZM5mZnOc5mc5zMTEznOc5znOczOc5mc5zmTOcyZzJlmTJIGdSi000taaWtLbWltrS21batWrVpoaHsAALd63ve+nTe971u2wAAAAAADJISGWUmUmWZmTMzM5YmZnMznOZnOc5mJjMznOc5znOZiYmZnOZnOcyTEmWWWSQAVVrS221pbbattaWtNLVtq1aqqqqewAAt1vXTe+m99N71u2wAAAAAABkkJDMiTLLMzJmSZzMzOczMznOczEznOc5zMZzmZznOc5znMznMzmZzMzMzJJJIyAFq1pa00ttaW22rbWltq1bVWtFVVL68ABrWt73030303rpdUAAAAAAAJEhIkkkkZkyzmTMzM5mczOZnOczOcTOc5zmYznMziYmc5zmZznMznMyxJM5MshkC0ttW22rbbWmltrS21batWrVpoaFvrgAGrre99Om+m99N3YAAAAAAAEiQkSSMySSZmZMzOZmZmJmZznOZiZznOc5znOc5znOZnExM5zmZmc5kzlnMjLIhCqWtLWlttrS21ppbattW2rVqqtKpp64ABda103vp030301rYAAAAAABYMkhkkykymZMyZkzmZmc5mc5mc5mM5zM5xM5znOc5znOc5zmZznMzmYkmZmTLKIM2VSratttaW22tLbbVtrS1otWtFVVKvrgADWt730306b6b3vQAAAAAAAsGSQyZZSZkkzJmZmczMzMTOZnOc5znOZjOc5znMxMZzM5znOc5mZnOZmZmZJJDJLKFVba0ttttaW22rbbWlq1atWlpaVXrgADV3vfTpvp06b3rYAAAAAAAWDIyZMySSSTMmczMzM5mczOczGZnOc5znOc5znOc5znOc5zmZznOZnOZlnOWWUkIAWrVttrS22221bbattaWrVq0tLRVeuAALrW+m+nTp0303rVAAAAAAACwZMkiTKTKTMzMyZmc5mc5mczExM5znOc5znOcTOc5xM5znOZjMmJnOWcySSSEgC1VttaW22tNLbWlttq1atqrVVVKp64AAa1vpvp06dOm+mtUAAAAAAAAMpDJJlJlmTOZmTOZnMmJiZznOZiYzMZznMxnMxnOczExM5zmZznMzMsyMyEIUpa00ttaaW22tLbbWlq1atWlqqVR64AAa1ve+nTrvp03vVAAAAAAAACRIZMyMySZmZmTOZnMznOczOc5mM5zMZznOc5znOc5znOc5mMzOczMzmTMkhkQFLVtrTS221ppbbattW2rVq00NC0HrgABdb3vp06denTe7oAAAAAAAAEhkykykyzJmZzJnMzmZznMznOc5znOc5znOc5xmYznMxMTOc5zM5mc5ZkyZkABaaW2222tNLbWltrS1bVq1VpVKovrQAA1ve+nTp16dN9NUAAAAAAAADJkkSZZkkmZnMmc5mczOc5znOZnOcZmM5mM5znOc5znOc5znOZmZzmZkmZGSQBVLbbWmltttrS221batWrWiqqlUNesAAC73vp06denTpvdAAAAAAAAAZSGTMkmWZMzOWJmZzmZznOc5zMZzmYznOc5xmZxnOZjOZnOczOc5kzJJlIhAqlrS22221pbbbattW2rVq0tVSqGp60AALre+nTp16dd73oAAAAAAAAWEiRIkymZJM5mZmZzMSYmJnOc5znOc5zjMxnOc5znOc5znOc5zM5mZnMkmTJBKUtW22tNNLbbWlttq2ratWlpoVQqeuAABre99enXp16b3oAAAAAAAAAykMmZJMsyZmcyZznMznOczOcTOc4znOc5ziZznGc5mM5mc5zmYmZmTMiSIAFq1pbpbbba0tttW2rVtWqtLRVFTXrAABLddN9OvTr16dN2gAAAAAAAAGUhlJlMyTMzMzMznOZnOc5mM5zMZznOcTOJjOc5xM5ziZznOZnMzJmSTJkAVVq2221ppbbba0taWrVrRVVSqGstesAAA3rp069OvXp03qgAAAAAAAAEjJIzIzlmTMzmZmJnMxMTOc5znOcTGc5znOMzOM5zMZzmYzMzOczLMkSIgKq1a000tttttaW2rbVq1aqqpVDUmnrAAALvfTr169enXeqAAAAAAAAAMpDKTKZkmZmZzM5mJmYzmZzjMxnOc5ziZxnOc4mJnExM5zmZzmZkzGUghKpVtW22222tNLbbVq21atLS0qhUtesAAAb306devXr06boAAAAAAAAAkSJGZJMszMzmZmc5mc5znOc5znOc5zjOc5ziYmM4mc5xM5zmZzMzMkkiQAKrS21ppppbbbattW1bVpaaFUKlp6wAABre+vXr169d9KAAAAAAAABYZSGUmZJMs5mZmZxM5mJiZznOc5xmYziYznOc5ziYzMZmMzOcyZkmYkSAKpba00ttttttW2tLVq1atLRoFTQesAAAXXTp169evXrvQAAAAAAAAAMpEjMkmZMzMzM5zMTOc5zmYznOc4mM5zMYznOc5znOcTOc5zmZmZMpJBEKotW222222tLbbVtq1atVVU0C3LQesAAANb6devXt169NAAAAAAAAAAkkMpMsyZZzmZmc5zmZznOc5znOcZznOJnGc5znGc5znOczGZnMzJlmRIQFFq221q1ppbba0tq2rVqqqlUNZWh6wAAAu99evbr269NgAAAAAAAAAZSJGZJmSZzMzMziZzMTEzjOZjOJnGc5znGc5xMTGc5mMzOczLOWUiQAWltrTTS22221battWrS0tKoak0B6wAABLrfXr17duvXdAAAAAAAAABJIZTMZzJM5mZnOZiZznMxnEznOM5zjMxnOMzGc5znGZnOc5mZmSMxEQFotaW222222tLbVq21VWlpVCpaB6wAAAXe+vbt27delAAAAAAAAAAyZZSZZkmZmZzM5zmYmM5mMzGc5znGc5zjOc5xMTGc4mc5mcyZkmYiIBSqtttttaaW22tLVq2qtLSqFS0B6wAAANdOnXt37dumgAAAAAAAAAMpDLMkmZMzOZnMxMTOc5znOc5xnOc5xmYzjOc5xM4mMzEzmTMmZJEQAWltttrTS2221batWrVpaNAqWgHrAAAAuunbt279uuwAAAAAAAAAJGTKTMmZJnMzM5znMzjOZjOc5znGc5ziYznExnOc5ziYmc5mZlllISApVq1pbbbbba0ttWrVqqqmgVLQB6wAAAGt9e3ft369NQAAAAAAAAAGUiRmSZmZM5zMzExM5znOc5xMZznOcZznGc5zjOc5ziZxJmZmZJIkICi1attttttaW2rbVq1VVSqKmgAesAAACXfTt379u/TQAAAAAAAAAEjJlmSTMmczOZnOc5mcZzmYznExnOcZznOMzGc4mM5znMzmTMyykSACqtW2222tLbbVtq1aqqpVFuWgAesAAABNdOvbv9HbtsAAAAAAAAAWGTLKTLOWZnMzmZznEznOc5ziYzjMxnExnOM5znOcZmJnOZmTMkkREBVLVttrTS221pattWlqqVQ1loAD1gAAADXXt3+jv26UAAAAAAAAACSRIzlmTMzM5zM5zmZxnOc5znOM5ziYznExnOM4mc5znMzmTOWUkQgKVVtrTS2221batq1VpaVQ1laAB6wAAAA6du/f6O/XQAAAAAAAAAEjJlmSZmWczOczExM5ziZxnOcTGc5xmYxnOc4zMZznMznMmWZJEgAqrVq222221batW1VpaVQ1JoAA9YAAAAXr37/T377AAAAAAAAAAZMspMyZkzmZmc5zmYznOc5xmYznExjMxnGc5zjOc5mc5zJnLLKQkClLVq22221pbatWrVpoVQ1JaAAesAAAAG+3f6fo+jpQAAAAAAAAAJJEjOWcyTOZiZmJiZxnOc5znGc5zjOc4znExnExM5znOZMsySJBBRVWrbbbbVttq1atVVpVCpaAAPWAAAAC9O30/T9HfQAAAAAAAAAEjJlmSZmZmZzmZznOc5znOM5znGc5zjOc4znExnOc5znMzMyZZSGQCqaLbbWmltq21atWlpVCpaAAHrAAAAA11+j6fq79QAAAAAAAAAGTLKZkzMs5zmZznOZjOc5znExnGc5xnOc4znOM5znOczOZJmSRIQBS1attaaW2rbVq1VWlUKloAAPWAAAAA32+n6/p70AAAAAAAAADKRlJmTMmc5mczExM4mJjOcTGMzGcTGc4znOcZmc5zM5kkkkMgBVWrbWlttq1patVVpVCpaAAB6wAAAADr9H1fX9HQAAAAAAAAACRlIzlnLOZnMznOc5znOJjOc5zjOcTGcZxnOc5znGZmZzJmSRIhApVVbattttW2rVqqqrQVLQAAHrAAAAAL2+n7Pq70AAAAAAAAADLJlmTMmZnMxM5zmYznOc5xnOM5znGc5xnGc5znOczOczMkkkSCChatWrbbWltq1aqqq0FS0AAA9YAAAABN9/s+z6ukAAAAAAAAABkyyzJMzMzmZzmYmJjOZjOMzGcZznGc4mM5zjOczOcyZkyykRAFUtWrbbWlrS1aqqq0FS0AAAesAAAAAN/V9n2/QAAAAAAAAABlIymYxJM5znMznOc5xMZzjMxnExnGZjOM5xM5znOZmZkkkSEAotLbVtrS21atVS1aCpaAAAHrAAAAAB1+z7vs2AAAAAAAAACSRJJmTMmc5zM5znOZjOc4znOM5zjOcTGc4znOc5zmZmZJJJEQAVVq1batttWrVUtWgqWgAAA9YAAAAAH0fb+h9IAAAAAAAAAGWUjOWcyZzmZzMTGZjOc4mM4mM5xnExnOM5znMznMzJmRlIQApVWrbVttq1aqqqqFS0AAAD1gAAAAAX6v0Pv6AAAAAAAAAAyyZZkzlnMznMziYmcTGc5xnOM5zjOcZznOcZmJnMzMySSREACqq2rVttq1aqmiqGpLQAAAHrAAAAAAa+z9P7KAAAAAAAAAGTLLMmZMzMxmZznEziYzMYznOM5xMZxnOc4mJnMzMyTLKQhAqlVataWtLVqqtKoVNAAAAD1gAAAAAJ0/Q/U7gAAAAAAAABlIyzJMzMzMZkxnOc5ziYzjOc4zMYznGZjOc5zM5zJmSRkkCKFVVq2rbVq1VWlUNZWgAAAD1gAAAAAE7fqfp6AAAAAAAAAEkjKZkzMzMznOc5zMZziYznExiYznGc5xnOc5mc5kzJJIkQgKUtWrVtq1atLSqGstAAAAA9YAAAAAAn0fs/cAAAAAAAAAJGUkmZmZmZnMxMZmJjOcZznOMTGc5xnOJnGZnOZMyZZSJBAoqqq1batWrS0qi3OgAAAAHrAAAAAACfX+59AAAAAAAAAAzIkkyzmTOc5zM4mJnGc5zjOcZzjOcZznOc5znOZMyZkkSIQBVLVW1atWrS0qipaAAAAA9YAAAAAAJ+h+5sAAAAAAAAAyykZyzmZmZiZziYmM5mMZznGc4znOcZznOc5mZnMkkkiQQFFUtWrVtVaWlUVLQAAAAD1gAAAAAAP1f2KAAAAAAAAAyyZZyzmZmc5mc5znOcZznGc5xMYznOcZznOczOZmTLLKQiAKUtVVq20tVSqKloAAAAA9YAAAAAAC/tfpgAAAAAAAAMsmWcs5kzmYmc5ziZxmYzjOJjOcZznGZiYmZnMmZJJEQQFC0tWrVpaqlUVLQAAAAA9YAAAAAAB0/b+8AAAAAAAADJllnKYkmMzOc5znOcTGc5xnOM5xnOc4zM5zMzMzJJIkRAClLS1atVVVVCpoAAAAAD1gAAAAAAD6P2ftAAAAAAAABlIyzJnLOc5mczGc5ziYznGc5xnOcZznOc5zM5kzJmRIkEAoWlpatWlpVCxoAAAAAB6wAAAAAAA+z9X7KAAAAAAAAJJGUzMyZmMzMxnOc5xMZznGc4znOM5znOZnOZmZkkkSIQApSqtVVpaVRUtAAAAAAPWAAAAAAAF+39P69AAAAAAAAEkjKZkzMzEzmYznOc4mM5xnOcZzjOc5zmZzmZmZJJJEggChVVVpaqlUVLQAAAAAB6wAAAAAAAa+79D69gAAAAAAAJJGUzJmZmJnMxnOc5zjOcTGc4znExnOZnOZnMkyykkIgAVSqqqqqWhUtAAAAAAD1gAAAAAAAnX7fu+rpQAAAAAAASSMpmTMzMTMxMZznExnOcZzjOc5xmZznOcyZkzJIkSCAFFUtKq0qhY0AAAAAAB6wAAAAAAAJ2+z7Pq66AAAAAAACSRlmSZmZiZmJiYznGc5xnOcZznOMzOc5zMyZkkkiREABVFpVLRaKloAAAAAAD1gAAAAAAAHb6/r+nrvUAAAAAAASSMpmTMzMTOczExnGc5xnOJjOc5znOc5zMzMmWUkiQQAUVRaVSqKloAAAAAAB6wAAAAAAAB3+n6vo7dNAAAAAAAJJGWZJmZmJnOc5znOM5xnOM5znOc5znOczOZJmSSRISAAUoqlpVCpoAAAAAAAPWAAAAAAAAL2+j6fo69d0AAAAAAEkjKZkzMzEznOc4znOcZznGc5znOc5znOZmTMkkkkMhABQqiqVRUtAAAAAAAB6wAAAAAAAAvbv9Hft06atgAAAAACSRlMyZzMzGZnGc5zjOc5xnOc5xM5znOZM5kyzIkiIgAClFUVRUtAAAAAAAA9YAAAAAAAANde3fv169NaoAAAAACSRlMyZmc5znOc5znGc4znOcZznOczOczMzJmSSRIkEAlChVFULGgAAAAAAAD1gAAAAAAAAmuvbt269em9W0AAAAAJJGWZMzOZnOc4znOc4znOcTGc5znMznMzMsyZSSJEQAAKUUoqWgAAAAAAAD1gAAAAAAAATXTt17denTe7q0AAAAAkkZkzJmZznOc5znOM5ziYznOc5znMznMzJMySSJERCAFFBShUtAAAAAAAAD1gAAAAAAAAF6dO3Tr13vetXSgAAAAykkkzmTOc5znOc5znOM5znOcZzM5zM5mZmSTKSRISASgAooVLQAAAAAAAAPWAAAAAAAAALvp16dem+mtbultAAALBIyzJMzMznOc5znOc5zjOc5znOc5mczOZMyZkkkSIhCABQUCpaAAAAAAAAA9YAAAAAAAAAXXTp06dN73vV1baooAAREkmZMzOZnOc5znOc5znOc5znOc5zMzOZMyZSSSJCIEABQDUloAAAAAAAAA9YAAAAAAAAAG976dN76a3rV1baVQWAESMsyZmZnMznOc5znOc5znOc5mc5zMzMzJMySMpDIiAAAKsloAAAAAAAAAPWAAAAAAAAAA1ve99N71vWrq22qoKAiJJJMzMzM5mc5znOc5znOZiZzmZzmTMmZMsspEhEEEAKFgoAAAAAAAAAD1gAAAAAAAAAF3re973retXVttq0UAiJJJJmZmZnOczOc5znMznOc5zMzMzMyZkkkkSIgkAEACgAAAAAAAAAA9YAAAAAAAAAAutb1vW961q6t00qqCiIkkkkzmTOczOczOc5zmZzmZzmTOZMySZZSSJCQQgAAAAAAAAAAAAAPWAAAAAAAAAADWtb1rW9a1q26q1aUAkSSSTMzM5mZnOc5mczOczMzmZmZMySZSSJEhECEAAAAAAAAAAAAAPWAAAAAAAAAABdXeta1rWrq6tW1VCoiRJJmTMzMzOczMznOZmZzJnMmZMsyMyJEiIQgIBAEoAAAAAAAAAA9YAAAAAAAAAABq61rWtXWrdWraqlgRJGZJmSZzMzMznMzM5kzmTMmZMssspEiQkEQAgIAAAAAAAAAAAPWAAAAAAAAAAALdaurrV1dNVpVUpEJJJJmTMmZmZzJnMzMzMzJlmTLLKRJISEQRABIAAAAAAAAAAAD1gAAAAAAAAAAEq6t1datt1baq0WCJEkmZJmZkzmTMzMzMkzlmSSSSSRIkJBECQAlyAAAAAAAAAAAPWAAAAAAAAAAAA1bdW3Vttq1VAiJJJJJMyZzJmTMmZMyZZkykZZSJEgyIgRAJcgAAAAAAAAAAD1gAAAAAAAAAAAlW223TVq2rVASJEkkkzJmSTMmZmSZZZkykZSMoiQSCQEgJcgAAAAAAAAAAD1gAAAAAAAAAAABWlumltq0oEJGUkkkzJJmTLMmWZJMsmWUiRISEgMgyCXIAAAAAAAAAAA9YAAAAAAAAAAAAC222rVtUAiJIkkkymZJJmSSSTKTKRkykJCQZCQMglyAAAAAAAAAAAPWAAAAAAAAAAAAALVtWrVKIREiSSSSSSSSTLLLLLJlJESIiIiBkM2CWQAAAAAAAAAAA9YAAAAAAAAAAAAAKtWqpQQSIkSSSSSSSSSSMssmUiRISEhEIgyCXIAAAAAAAAAAA9YAAAAAAAAAAAAABVWlCwIRJEkiSSSRlllJIyZSJCRESCQZJcglyAAAAAAAAAAAPWAAAAAAAAAAAAAACqUoQhESJEkkjKSRlIyyiSIiQkMiQZIgRcgAAAAAAAAAAD/8QAGwEAAwEBAQEBAAAAAAAAAAAAAAIDAQQFBgf/2gAIAQIQAAAA/agAAAAAAAAAMwzFzFXFVVVVVVVVxVVcXFxcxcwzMwwMAA0003d3d1t1tZtZmbWZmZmZm1u8AAAAAAAAAMwzFxcVVxFVVVVVVVVVcVcXFzMXBTMMDAA0NN03d3W1tbW1mZmbWdm1mdm30QAAAAAAAADMFFxcVVVUVVVFVVVVVVXFXFzMXMzDMMDAA0NN3d3d3W1tZtZmZmZmZmZnZm9IAAAAAAAAAUUVcVVVVVFVUVVVFVVVVxVxcxczMzDDAwANNN03d3W3W1m1mZmZmZ2ZmZnZvUAAAAAAAAAUUVcVVVFVUVFVFVUVVVVXFXFzFzMzMMMDANA03RjW3dbWbWZmZmZ2ZmdmZnb1gAAAAAAAAUzFVcVUVUVFRVRUVUVVVVVcXFxczMzMMMDADTTTd3d3W3WbWZmZmZ2ZnZnZmdvYAAAAAAAAFMxVXEVVRUVEVFRUVUVVVVVcVcxczMzMMMDANDTdN3dbdbW1mZmZmZ2Z2dnZnZvaAAAAAAAAUzFVcRVRUVEVEVEVFRVVFxVVcXFzFMzMMMAADTTd3d3dbW1mZmZmZ2Z2dnZ2dm9wAAAAAAAMzMXExFVEVEVERFRFRUVUxFXFXFxczMzMwwwAA0N03d3W3WbWZmZmZnZ2dnZ3Z2b3gAAAAAADMzFxVRUVEVERERFRFRUVUVVVcVcXMzMzMMMAAA003d3d1tbWZmZmZnZ2dnZ3dnZ/fAAAAAAAFFxVVFVEREREREVERFRVRVVVVcXFzMzMwzDAAA003d0bd1m1mZmZmdmdndnd2d2f6EAAAAAABRcVVVEVERERERERERFRUVVVVVcXFzMzMwwwMANDTd01ht1tZmZmZmdnZ3Z3dnd3b6MAAAAAAMzFVVVFREmiIiIk0RFREVFVUVVxVzFzMzMwwwAANDdN3dbd1tZmZmZnZndnd3Z3d3b6UAAAAAAzMxVRUVESaIk0RJoiIioiKqKqquKuYuZmZhhgYAaGmm7u7rbrNrMzMzszuzuzu7u7u/0wAAAAAAuYqqioiJNEmiTSaIiIiIqKiqqquKuYuZmGYYYAAG6abu7utra2szMzOzs7s7u7u7u7/UAAAAAAKLioqIiJNJok0mk0RERERFRVVVVVzFzFzMMwMADNDTdN3d3W1tZtfWdmdndnd3d3d3d/qgAAAAAzFxVRUSaTSaTSc0miTREREVFVMTFVcXMzFMwzAwANA3Td3d1t1m1mZmZnZ2d3d3d3d3d/rAAAAAAXMVFRESaTmk5pOaTSaIiIiKioqquLirmZmZhhhgABppum7ututra+szszOzu7u7u7u70f60AAAAAUVVRUSaTmk5znNJzSaTRERFRUVVVcVcxczDMwwMAA0NN3Rht1tbWZmZmdnZ3d2o7u7vR3+vAAAAAzFxURZpNJznOc5zmk5pNERERFRVVVXFxczMzMwwwAADTTd3d3dbdZm1nZmdmd2d3eju9Hd6fYAAAAALiqqIiTnOc5znOc5zSc0miIioqKqqq4uLmZmYZgYAAGhum7u7ra2trMzM7M7O7O9Hd3ejvR/sgAAAAzFVURJpOc5zlOc5ySc5pNERERUVVVVXFzMzMzMDDAADTQ3d0bd1tbWZmZmdnZ3Z3o7vR3o70+zAAAAMzFVESc5pKc5ynOU5znNJpNERURVVMVcXFzMwzDMAAADQ3dN3dbdbWZmZmZ2d2d3d3ejvR6O/2oAAAAoqKiTSU5zlOcpynOc5znNERERUVUxVXFzMzMwzAwDDQ0NNN3d3dbW1mZmZmdnZ3d3d6O9Ho9H+2AAAAzFxESaTlOU5ylOU5ynOc0mk0RFRVTExcXFzDMzAwwAANNN03d3d3W1m12ZmZ2d3Z3eju9Ho9Hp9sBgAAGKqIk5ynKcpTlKcpynOc0miIiKipiYq5i5mZhhmAAAAbppu7u7utuszMzMzs7O7u7u9Hej0elPtg3AAAFVESc5ynKUpSnKU5TnOc5pNERUVUxVXFzMzMwwwMAANDTTd3d3d1t1mZmZnZndnd3d6O9KPR6U+4AAAMMVFmk5TlKUpSlKcpTlOc5pNERFRUxVXFzMzMwzAwAAA0003d3d3W3WbWZmdmdnd3d3d6PR6UelPugAADMVUSc5ylKUpSlKUpSnKc5pNJoqIqqqri5mKZmGGAAAAaaabu7u7ra2trMzszs7O7u70d6UelHpT7sAAAXFREnKcpSlGUoylKU5TnOc5oiIqKqquLmYpmYYYAYGgGmhum7u7rbrNrMzMzs7O7u7vR3o9KUelPuwAAMFVJznOUoylGUZSlKUpTnOaTRERUVVXFzMUzMMMAMA0A0003dN1t1tbW1mZ2Z2d3d3d3o9KPSj0p92GgBhiok5ynGUoyjGUZSlKU5Tmk0RERVRcXFzFMzDAwAAADTQ3dN3d3dbWbWZmZ2dnd2o7u9HpR6Uo9PvgADDFVJzlOMpRjGUYyjKUpynOc0miKiqqri5mZmGYGAAAAaaG6boxutus2szMzM7O7tR3d6O9KUelKP9+GABgiJOcpRlGMYxjKMoynKcpzSaIqKiri5i5mGYYGAAABpobpum7u7ra2szazszs7uz0d3o9KPSj0pT70NADMRJzlKUYxjGMYxlGUpSnOc5oiKiqq4uZmZmGGAYAAGhpppum6Nu7raza+szszu7tR3d6PR6UpSlKffmaBhipOcpSjGMYxhGMoxlKU5Tmk0RUVVVcXMzDMwDAAADQDTTdN3d3d3W1m1mZmd2d3d3ejvR6Uer0q/34YAGIk5ylGMYRjCMYxjKMpynOaTRUVFxVzMzMMMwAwAA0NDQ3TdGG3d1tZtZmZ2dnd3d3o9HpSj0pSlPvw0DMVElOMowjGEIxhGMZSlKc5zRERUXFXMzMzDAwwAANADTQ03Rhhht1m1mZ2Z2dnd6O70ej0pSlKPT9BwAwEScpSjCMIwhCMYRlGUpymk0RFRVxczMzMBQAMAzQ0DQNN03RhhtbdbWfXZnZ3dqO9HelHpSj0q9P0AADMSc5SjCMIQhGEIxjGUpSnNJoiqi4uZmZhmAYYAAGgaAaG6aMMNutus2uzMzs7u9Hd6PR6PStKPV/0HAAxZpKUYwhHnhCEIwjGUZSnOaIiKmLi5mYZgZgAAAAAaaBppujDbu6zazMzM7s7tR3d6UelHpV6vV/0AAMxZzlGMYQhzwhCEIxjGUpTmk0VFVcXMMzAzAAAw3NDANDdzdN03d3d1tbWZmdmd2d3ejvSj0er1etHp+gABmTSUowjzwhzw54QjCMZRnKaTRFRcXMzBQwwAAw3AAwA3QYDd03d3W3X1tdmdmd3d3o70o9HpSlXrR/0AAMVJSlCEIc8OfnhCEIxjGU5JNERVXFFMwDDAAAwAMAAbDTdDdN1ht1mbWZmd2d2o70d6UelHpWj1pT78DASc4xhCHPDn5+eHPCMIxlKc5oiKq4uYZgAYGAABgBgAbpmm6G7ujbrNra+uzO7O9GpR3pR6Uo9aUq9PvwDMScowjzw5+fn5+fnhCEYxlKc0RFVcXMMMAAMMAADDRQAGDDd001jdbW19Zmdndnd3pR3pSj0pV6VpSn3xgCpKUYQ5+fn5+bn54c8IwjKU5zRFVVzMDAwAAMMAAMAwAA3cN3Td3RtbWZtdnZnd3d6Uej0pR6vStKUp98bhiJKMYc/Pz83Pzc/PzwhCMZSnNEVMXBQAMMAADDAADAwAA3c0bN3WG3WbX1nZ2d3d6PR3q9KUpSlKVpT7wAxJyjCHPzc/Nz83Pz8/PCMYynOaKq4pmAABhgABgYABgGAAbuaMaNu6zazMzO7O7vR3pR6UelKVpSlK0+8AFSUoQ5+fm5ubn5ubn54QjGUpzRFXFAzAAAMMAAMMAAzTMAAYzd03dbW1mZmZ3Z3d6PR6UelKUpSlaUpT7sNxUlGEObn5ubm5efm5+eEIxlOc1RczAAMwAAwMAAwwADNFAAGzTd3d1tZtfXdnZ3d6Ud6UpSj1pSlK0pT7sMESMYc/Nzc3NzcvPzc/PCEZSnNFVTDAADMAAMMAAwwAMAwADdzd3Rt1m1n13Z2o1HelHer0pSlK0pWlKfdBgk4whzc/LzcvNy83Pz88ISjOaIuYBgYABmAAGGAAZgAGBgADZu6a27rMzM7s7u1Ho9KPSlKUpV60pStPucDEnCPPzc3Ly83Ly83PzQhGMpoi4oABhgAGYABhgAGYABgYADGaxutuszMzuzu7vR3pSlKUpSlK0pStKfcAKkYw5ubm5eXl5eXm5ueEIykiKooAABmAAKAAZgAGYABm5gBu5u7u7rMzPrs7u70ej0pSj1pSlK0pStKfbAZKUefm5uXl5OXl5ebm54RjKaKuBhgAAGYAGYABhgAZgAAKAGm7ujazMz67Uaju9HpSlHq9aUpWlK0pT7YMWcYc/Ny8vJy8nLy83PzwhKc0xQAMMAADMABQAMMADMADDVAA3WNbWZmZ2d3d3o9KPSlaUpSlaUrSlKfaALKMObm5eTk5OXk5ebn54RnJUzAAAMwAAwwAzAAwwAMwADDAA3d3W1mZnZnd3o70pSj0rSlKUrStKUrT7PASUYcvNycnJycnLy83NCEpImGAYAAYYABmAGYAGYAGGABm5gANutuszMztR3d6PR6vStKUpStK0pStKfYgJKHPzcvJx8nJx8vLzc0IymmYAYBgAGGAAZgAoAYYAZgAYaoANu7r6zM7O7vR3pSlHrSlKUrStKVpSlfsDBIw5ubk5OPk4+Tk5ebnhKSKoAAYYAAZgAGYAKAGYAGYAGBgA27uvrM7M70d6PSlHrSlKUrStKVpStKfXBiS5+bl5OTj4+Pj5eXm54xmuGYAABgYAGYAGYAZgBmABmABmqBu6M2szOzu7vR6UpSlKUpWlK0rSlaUpT64zEjDl5ePj4+Pj4+Tl5+eMkUAwMAAMMADMAM3MAzADMABQAwDBg1m1mdnZ6O9HpSlKUpStKVpWlaUrSlPqwxIQ5eTj4+Lj4uTk5eeEZpgAAZgABhgAZgAZgCgBmAGYAAYGhrNrOzO7vR6PSlKUpWlK0rSlaVpSlafVGYkOfl5OLj4uLi4+Xl54SRAAAAwwADMADMABQBQAzADMADAxg1m1nZ2ejvSj0pSlaUpWlaVpWlK0pSn1AZOPPycfHw8XFxcfLy88ZLgYAAAGYAGGAGYACgCgGGAZgAGZpo2trszu70elHpStKUrSla0rSlaUrSlPptwlHm5OPi4eLh4uPl5YRnhgBgAABmABmAGGAGYGYAZgBmABgGjbrszu1HelKUpSlK0pWlaVpWlaUrSlPpAxIcvJx8PDw8PFx8vNCKAAYBgAAYYAZgAZgAoGYBhgAoAYGg2szO7O9KPSlKUrSlaVpWlaVpWlKVen0YYkOXj4+Hg4eHi4+TmjJQAADAwAAzADMADMAzAFAMwAzAAMN3dZmd3d6UelKUrStKVpWtK0rStKVo9PogycOXj4uHg4OHh4+TniigAAAYGAAYYAZgAoBmAKAZgBmAGbm7rNru1HelHpWlKVpWlaVrStK0rSlKUp74E4cvHxcHn8HBxcXLzyTAAAAAwwAAUAwwDMAwwMwDDAMwAw03WZnZ3o9KUpSlaVpWlaVrStK0rSlKUp7oE4cvHw8Hn+fwcPHy881AwAAAAwwADMAwwDMAFAUAzADMAAN1mdnd6PSlKVpStK1pWtK1pWlaUq9KU9sBIcvFw+f5/n+fw8fLCeAAGAAABhgACgCgGYBmBmAGYBmAGaNrMzu70o9K0pWlaVrStaVrStaUpV6Uf2gFhy8XB5/ned5/Dx8sFMAAAwAADDAAzAMwAUAUDMAzAMMAzTWZnZ6PSlKUrSla1pWtK1rStK0pWlHo/sALDl4uDz/N87z+Dj5Y4ABgAGAAAZgAZgGYAKBmAKBhgGYAG62u7PR6UpStK1pWtK1rStaVrSlaUo9H9YDI8vDwed5vm+dwcfNLAAAMADAAAzAAFAzAMwDMDMAzAMwAN1mZ3ej1pSlaVrSta0rWtaVrStKUpR6P6gGS5eLz/ADfM83zuDi55AAAAYAGAAGYAYYBmAKAKAoGYBmABrMzO70pSlaUrWtaVrWta0rStK0pSlHo/pAEuXi8/zfL83zfP4+ZAAAAAwAwAAzAAzAFAzAMwMwDMAzABtZnd3pStKVrSta1rWla1rStaVpSj0ej+gAT5uLz/ADPL8zzPP4+ZQAAAADAMAAMwAFAzAMwBQFAzAMwDdZmd3pSlK0rWla1rWta1rStaVpSlHo7v3gCc/F5/meV5fmedxQUAAAAAMAMAAzADMAzAFAzAUAUDMA1tZ3ej0rStK1rWta1rWta0rStKUpSju79oBnPx+d5nleV5fncXPgAAAAABgGAAZgBmBmAZgZgZgGYBmA2szu9KUpWtK1rWta1tWtaVrStKUo9Hd36wDJcfneZ5Pk+V5vFDAAAAAAAwDAAMwAUDMAUBQFAzAMw3WZnelKUpWta1rWta1rWta1rSlaPSju7t1ABPk8/y/J8jyfM4YAAAAAAAGAYAGGAZgCgZgZgZgCgYG7rs9HpStK1rWtq1rWta1rWtK0pSj0d3dugAF5eDy/I8fyPM4IAAAAAAABgGABmACgZgZgChmAZgC7us7UelKVrWta1rata1tWla1pWlKPR3d2a4AZDg8vyPG8fy+CGAAAAAAABgGABmAZgZgCgZgKBmAZozO70pStK1rW1a1tWtq1pWtaUq9KPRnZ2qABLi8vyPF8byfPhgAAAAAAAGBgAYYAoGYGYGYGYGYBm6zO9HrSta1rW1a2rW1a1rStaUpSju7uzNQABOTzfH8XxPI82GAAAAAAAAGBgAZgGYGYAoZgZgYYBus7u9aVpWtq1tW1a2rWta1pWlKUejs7s2uABnP53keJ4fjeXzAAAAAAAAAYGAGGAKBmBmBmAoGYBrM70pSla1ratq2rW1a1rWtaVpSj0d2dmbWAAJcPk+H4Xh+Vy4AAAAAAAAGBgAZgAoZgZgZgKBmBus7UpSla1rW1bWrW1bVrWtaVpSj0d3Z21t0AAXk8rxPB8HyOLAAAAAAAAAMDADDAFDMAUMwMwMwG1nelKVrWta2tW1bWrWta1rWlKPR6M7MzboAAEPN8X5/wCf8XgUAAAAAAAAAwMAMwDMDMBQFDMDMN1nd6UrStq1tatq2tW1a1rWlaUo9HdnZtbQAABeHxvn/nfB81AAAAAAAAADAwAzAMwMwMwMwzAMNZnd60rS1a2tW1q2tWtq1rStKUo7u7M+6wygAAc/k+B83895EgAAAAAAAAAwMAMwBQzAzAzAUDN1melKVpatbWra1q2tWta1rWlKUejs7M2sMKAAAvn+F81814fMAAAAAAAAAGBgBmAZgKGYAoKADM70rSta2ra1q2tatq1rWtaUpSju7OzaxuigAAHP43zfy3z3AAAAAAAAAABhgBhgZgZgKGYGYA2u9KUrW1a2ta1bWtW1a1rWlaPSjuzPrbu6CgAAC+f878r8v5KgAAAAAAAABgYAZgChmBmAoZgazPSlK1rW1q2ta1q2tWta1rSlKO7uzM27ugKAAAEfE+V+R+fkAAAAAAAAABhgGGAZhmBmBmGYazO9KUrW1bWta1bWtW1a1rWlKUo7s7M27ugCgAABnD8z8d8pxAAAAAAAAAAYYAZgGYGYZgZgLus70pSta2tatrWta1q1tWtK0pR6OzszbowAKAAAAni/H/FeJgAAAAAAAAAYGAGYGYGYChmADNR6UrWtrVta1rWtatq1rWlKvR3dnZt0YABQAAADn+Y+E+SgAAAAAAAAABhgBmBmBmAoZgDM70rStbVta1rWta1bVtStaUpR3dnbW0YAAUAAAAPN+J+A8gAAAAAAAAADDADMAUMwFAU3Wd6UrS1bWra1rWta1bVrWlaUejuzPraMAACgAAAAvgfnPxkwAAAAAAAAAwMAzAMwzAzDA1nd60rWtrWta1rWtW1bVrStKUd3Zn1tGAAAUAAAACXx35f44AAAAAAAAAYGAZgGYZgZgAzu9K1rW1q2ta1rWtW1qVrStHo7s+s2jAAACgAAAAHL+bfnEwAAAAAAAAAwwDDAzDMDMDdd3pWlq2ra1rWta1q2rWta0o9HdnbW0YAAAFAAAAADzPx35YAAAAAAAAAMMAMwMwFDMNZnpSla1tW1rWta1rVtalqVpR6O7OzbowAAACgAAAAAfPfiHCAAAAAAAAAYYAZgZgZhhrM70pWtq2ta1rWtatq2rWlaUo7u7M27ugAAACgAAAAAHw/44gAAAAAAAAGGAGYGYCgbru9KVrW1q2ta1rWtW1a1rSlKUd2Zm3d0AAAAFAAAAAAM/LvzTAAAAAAAAAwwDDAzAUG13elK1ra1bWta1rVtata0rSlHd2Zm3d0AAAABQAAAAAAn+PfD4AAAAAAAAYGAZgZgZu670etaWra1bWta1q2ratK0q9Hozs2sboAAAAAoAAAAAAHH+P8Ax6gAAAAAAAYGAZgChus7vStK2ratrWtatrVtWtK0q9Hd2ZtYYAAAAABQAAAAAADyvyr5GIAAAAAAAYGAZgGGszvSlK1rW1q2ta1bVtWta0pSlHdnbW3dAAAAAAFAAAAAAADxPzn5DiwAAAAAADAwDMA3WZ6PSta1ratq2tatq2rWtK0o9HdmZt3dAAAAAABQAAAAAAAzw/hvkvJkAAAAAAGBgGZo2uz0pSla1ratq2tW1bVrWlaUpR3Z2bWN0AAAAAABQAAAAAAAF8X5H5fxOJMAAAAADAwA3dZ3elKUrWtbVratq2rWta0rSj0d2fWbd0AAAAAAAFAAAAAAAAF8n5r5vxPN5ZqAAAABgAbrM7PR6VpWta1rW1a2rWtaVrSj0d3fWbd3QAAAAAAAFAAAAAAAABfN8LwfF8vi5opmAAAAG7uszO7vSlK0rWta1rWtqWpWlaUo9Hdn1m0YAAAAAAAAFAAAAAAAAAXj8fxvI8zg5OaU0XDA003dbWdnd3pSlK0rWla1rWtaVpWlKPR3Z21t3dAAAAAAAAAUAAAAAAAAAzm87yvL83g5OWEURVwDRt1mZ2d6PSlKUrStK1pWtK0pSlHo7s7NrbugAAAAAAAAAoAAAAAAAAAEeLz/ADuDh4+bnjKaqpmm62szs70ej0pSlaVpStKUpSlHd3dmZtY3QAAAAAAAAAFAAAAAAAAAAE5+Li4uPk5ueMZoq4ButrM7O9HelKPV6UpSlKPR3d3Zmbd03QAAAAAAAAABQAAAAAAAAAAyfNycvJzc/PGU0RcM01tZmd3d3ej0elHo70d3Z2Zm3dNzdAAAAAAAAAAFAAAAAAAAAAAFlDm5+eEJSmiLmBo2trszu7u7u7vRnd2Z9Zt3d0zN0AAAAAAAAAAUAAAAAAAAAAABJxjGMZTREXMA3d1mZnZ2dndnZ2ZmZt3d3N0zN0AAAAAAAAAAUAAAAAAAAAAAAFnOcpzmipmZgbu7rNrM7MzMzMza27obuG4YwAAAAAAAAAAKAAAAAAAAAAAAAYizREVVzMwNN3W3WbWbW1tbdNDQ3DcMYAAAAAAAAAAP/8QAHAEAAwEBAQEBAQAAAAAAAAAAAAIDAQQFBggH/9oACAEDEAAAAPiwAAAAAAAAAN1hmZmZ3Z3dnd3d2d2dnZnZtZm3W3dN00ADMMzBcXFxVVFVUVFRERURFREVfJAAAAAAAAADd3WZmZ3Z3d3d3d3d3Z3Z2Zn1mZt3dY3dDQDDDMzFzFXFVFVUVEVEREVERERF8cAAAAAAAAA3WGZmdnd3d3o7u7u7u7s7OzMzM2tu62m6BuAYZmZmLirioqqioqIiIiIiIiIieKAAAAAAAAAwwzOzO7u70d3o7vR3d3Z3Z2ZmZm1t3d3dNAAwwUXMXFVVVVRUVEREREmiIiIieEAAAAAAAAG7uszsz0d3o70d6PR3ejuzu7OzMzM2tu7u7oaAYGZmZi4qqqqqKqIiIiIk0RJoiTX58AAAAAAAA3d1mdnd3ej0ej0o9Ho7u7u7uzszMzNrbu7umhoYYZmZmLiqqqqoqIiIs0RJok0mk0T50AAAAAAADdYZnZ3ej0ej0pR6Uej0d3d3d2dmZmZt1t3dN0ADDMMxcXFVVVVRERURJoiTmiTSaTT5oAAAAAAAN3dZnZ3o9HpSj0pSlHpR6O7u7u7OzMzNra27pugABmGZi5iqqqqoioiIiTRJpOaTSc0n8wAAAAAAAGtrM7O9HpSj1elXpSlKPSju7u7uzszMza262m6aABmGZmLi4qqqKqIiIiJNEnNJzmk5pP5UAAAAAAA1tZnZ3pR6UpStKUpSlKUelHd6O7OzszMza27u7poABhmZmYq4qqqKioiJNESc0nNJznOc0+SAAAAAAA3W1nd3o9aUpSlaUpWlKUo9KO9Hd2d2ZmZm1t3d000AwwzMzFxVxFVUVERESaTSc0nOc5znOfyAAAAAAAbuszu70etKUrStKVpWlKUpR6PR3d3Z2ZmZtbd3d000DAwzMxcXFVVVFREREmiTmk5znOc5znP40AAAAAAG3XZ3pR60pWlaVpWtKVpSlKUeju7u7OzMzNutu7ppoAYYZmLmKuKiqqIizREmk5zSSSnOc5zn8UAAAAAAa2s7u9KUrStK1rWlaVrSlKUpR6O7u7s7Mza2tu7u6GgBhmZguKuKqqioiIs0Sc0nOSTnOU5znL4gAAAAADdZmd6UpStK1pWta1rStaUrSj0o7u7u7OzM2tutum6aAGGGZmYuKqqqoqKk0RJpOc5znOc5TnKc/hQAAAAA3dZ3alKVpWta1rWta1rStK0pSj0ejuzuzM+s2627ummgGBmGLmYqriKqoiKk0Sc5pOcpznOU5TnL4MAAAAANbXd3pWla1rWta2rWta0rWlKUpR3o7s7szMza27u6boaBhmGZmLirioqoqIiIk0nOc5znKc5TlOU/gAAAAADW1nd60rStbVratbVrWta1pStKPR6O7s7OzM2tu7u7poABhmZmYuLiKqqiKiJNEnOc0lOcpzlKcpy/nwAAAAG7rO9KUrWta2ratq2rW1a0rStKUo9Hd3Z2Z9Ztbd3d00NwAwzMzMXFXEVVREVJok5pOc5TnKcpylOUv54AAAABrMzvWla1ratrVtatq2rWtaVpWj0eju7s7MzNrbu7um6AAZhmZmYuKqqqoqIiJNJpOc5TnKcpylOUp/zkAAAAN1mej1rWtbWtW1rWtW1a2rStK0pR6O7u7M7aza27u7poG4BmGZmLmYqqiqqIiIiTmk5znKcpylOUpSn/ADcAAAAG1no9a1rW1rWta1rWtW1a1rWlKUpR3d3Z2Zm1tbd3TTQADDDMzFxVxVVUVEVEmk5pOc5TlOU5SlKU5fzUAAAA3Wd6UrW1bWta9rWvW1rVtWtaVpSj0d3dnZmZtbd3d000ADDMMzMxcVVXEVEVESaTmkklOcpTlKUpylL+ZgAAADNtHpW1bWta9r2te1rWtWtqVpWlKPR3d2Z21m3W3d00NADAzBczMxVxUXERFRJok5znOcpzlKUpylKUv5iAAABus9HratrWva97Xva17Wrata1pWj0o7u7M7M2tu7u7ppoAYGGZmYuYuKqoqoiok0mkknOcpTlKcpRnKMv5gAAABuu9K1ta1r3te973te1rWrataVpSj0d3Z2Zm1tbd03TQAAwwzMzMXFXFVFRURESaTnOc5ynKcpSlGUpS/lwYAAG6z0pW1rXte9+i973va9rWrWta0pSjvRndmZm3W3d03TQADDMMzMzFxVVcRURURJpNJznKc5SlOUpRlKUv5UAAAG69KVta173vfove/Re172tatq0rSr0d3dnZmbW3d3d0NAAMDDMzMXMXFVVVURFmiTSc5znKU5SlKUpSlGX8oMAADdalK1ta979F+jov0Xv0Xte1rVtWtKUpR3dnZmbW3d3dNNAAAzDMMxcxcVcRVVFREmiTnOc5ynKUpSlKUZSj/JQAADdetK2va/Rfo6Ojov0dF73ve1rVtWlaUo7u7OzNrbu7u6GmgGBhhmZmZi4uKqqiqiIiTSc5znKcpylKUZSlGUf5GYAADM9a2te9+jo6Ojp6Oi/R0Xve17WrWtaUpR3d2dtbW3d3TdDQAwMwzDFzMxcVVVVRURESaTnOc5TlKUpSlKMoyl/HzAADWata2v0X6Ojo6ejo6ejo6L9F7Xta1q1pV6Ud3Z2bWbd3d0NAAAMMMzMzMXMVVVVVEVESaTSc5ynKcpSlKMpRlGX8bAAA13rW179HR0dPR09HT0dPR0dF73te1bVrSlKO7uzsza27pppoABhgYYLmZi4uYiqqoioiTSc5pKcpylKUpRlGUoy/jAAYGs9K2vfo6Ojo6enp6eno6ejo6L3ve1q2rStKO7u7MzNutummgaGAGYZhhmLmKq5iKqoiKk0mk5znKcpTjKUpRlGUZfxUAwDXetrX6Ojo6enp6enp6enp6Ojove97WrWtaUo7u7Oza2tu6aaAAGBhhmZmC4uKq4qoqoiIiTnNJTnKU5RnGUZRlGUf4ngAAz0ra9+no6enp6unq6enp6Ono6L3ve1bVpWlHo7OzPra27u6aaAYBhhhmZmZmYqqq4qKqIiTSaTnKc5SnKM4yjKMZRl/DwwA1nra9+jp6enp6urp6unq6Onp6Oi972tataVo9HZ2dm1m3d3TdA0wAwwzDMzFzMxVVVVUVEREmk5znKcpTjKUoylGMox/hgAAPWtr9HT09PV09XV1dXV09PT0dN+i9rWtWlaUd3dnZm1t3WGNDQADDAzMwUXMXMVVRVVFmiIk5znOUpylKUpRjKMoxl/CTAw3aVrfo6Onq6evq6urq6urp6uno6Oi972rWtaUo7uzs2s27rDAwaAGABmGZmZi5i4qqqoqKiTRJznOcpylKUZSjKMoxjL+DYAZrVra/T09PV1dfV19XV19PV09PTfove1rVrSlHd2dmbWbd3d0YN0AAMwDMMxcxcxcVFVUVERJpOc5ynKU4ylKMoyjGMZfwPAwNetr9HT09XV19fV19fV19XT1dHT0Xve1q1pV6O7OzNra26wNum6BumGBmAZmZi4uLiqqKioiTSaSSU5TlKUpRlGMoxjGX5/DAGpW3R0dPV19fV2dfX19XX1dXT09HRe9rWrSr0d3Zn1m3W3d3dN03QGADMMwMzMxcVVxVRUVESaTmkpzlKUpSlGUYyjGMZfnzAAelr36urq6+vr7Ovr7Orr6urp6ejove1bUrR3d3ZtZt1t3d3d03TdN0AAzDMMzMXFXFVUVFSaJNJzkkpTlKMpRlGMoxjGP55DA2lL36enr6uzr7Ozs6+zq6+rq6enove1rVpSju7MzNutu7u627ugxu7oAAZhmGZmKuJiqioiIk0mkpzlKcpRlKMoxjKMYS/OxgDPa/R09XX19nZ2dnZ2dfX19XV09HRe9rVrSjuzs2trDMbu7rbu7pu7owBpgKZhmYq4i4qKiIiTmk5ynKU5SjKUYxlGMYxj+cwM1qW6Onp6+vs7O3s7ezs6+vr6urp6Oi17VrSju7M2627u6zbu7u626bu7owA2YGZmCiqqquIiok0mk5zlOcZylGUZRjKMYwlH84GAPW/R09XZ2dnZ29vb2dnZ19fV09PRe9rUrR3dm1t3dbd3W1t3d1t3WBhhgBhQUzBcVVVVVERESc5pKcpxnGUpRjKMYxjGMfzaYG0rfp6uvs7O3t7e3t7ezs6+vp6ujova1aUo7Mzaww2627ra27ututu7pu7uhuigopmKqqmIiok0mkklOUpTjKUYyjGMYxjGP5qDBqW6Onr6+3t7e3u7e7s7evs6urp6L3tWtHd2bd3W3d1t1tbdZt3d1m3dN3d3Q3RTMzBcVVRVRERJpOSSlOUpSjKUYxjGMYxjH80YZrVv0dXX2dvb3d3d3dvb29fX19PT0XtWtKOza27u62tu62trbrNutututpu7u6G7mGYouKqqmIk0Sc0kkpTlKM4xlGMowlCMYx/MuAPXo6ers7e3u7u/u7u3u7Ozr6uno6L1rV3ZmN1tbd3WbdbW1tbWbd3WbWN3d1gGMwXMzFVUVUREnOaSSUpxlKUZRjKEZQjGMY/mIM17dHV19nb393f393d3dvb19fV09F7Vq7s27rbu62tu6za2trNrazbra27u7rDAMKZii4iqioiJOc0lOUpyjKUZRjGMYxjGMY/mAw2lunq7O3t7+/v7+/v7u3s6+vq6Oi1qUdm3d3dbdbdZt1m1tbX1tZtbdZt1jdYYBswXMxVVExJok5znOcpSlKMoyjGMYxjGMYR/Lxhtb9PX29vf39/od/f393b2dnV09F7Vd33d1t3dbW1t191tZm1mbW19bdZtbRht0N1RRcxFVEWaJOc5ynOM4ylGMoxjGMYRjGMfy2YNXo6uvt7+/v9Hv9D0O7u7uzr6ujotWlNbd3d1t1t1m1tZtZm1m1mbWZm3WbW0bd3Q0zMXMVFRUmk0nOU5ylKUZRjGUYwjGMYxhH8tYDW6Ort7e/wBD0PQ9H0PQ7+7t7Orq6L1q7butu7utrbrazazM2szNrMzazM2tra2jbrAALmKqKipNEnOU5ylKUZRlGMYxjGMIxjGP5XMHt09fb3eh6Ho+j6Poeh393b2dXTe1aMxu7ututus26zM2szNrMzNrtrMza2vu7usMAC5iqqIqTSc5zlOUpSjKMZRjGEYxjCMYx/K2A9+ns7fQ7/S9H0vQ9H0O/u7evq6L1o+7u7u7us262szbrtrMzNrs2s7azM2s2tu7rboBi4uIiKk5pOcpTlKUoxlGMYxjCMYwjGMfyoYU6Ont7vQ9D0vS9L0fR9Hu7u3r6b2qzbpu626262trNrM2u2sz6zPrM7az6zazaw26wBmLioiKk5pKc5SlKUZRjGUIxjGEYxjCMfyngVv19vf6Ho+n6Xpel6Po9/b2dfRertprG6wzbra2s2szMzMzMzMz6zOza7a2vrbusMBmLioiIiTnOU5SlKUYyjGMYwjGEYxhGMfyiZtejr7u/wBH0vT9P0/S9L0O/t7OnotRt03d3W3d1m1tZm1mZmZ9ZnZmfWZ2Zn3WZ9Y3W3QzFxURESc5znKUpSjKMYxjGEYxhGMIxjH8oYbXp6+/0PR9T0/T9T0vS9Dv7evpvR903d3d1t3W1m1tdm1nbWdmZ2ZnZmZmZ21mbWG3WAVcVEREnOcpylKUZRjGMYxhGMIxhGMYx/J+Y1uns7/Q9P1PU9T0/T9L0O/s6umtN03d3d3dbW3W121mZm12ZnZmdmZ2ZnZmZmZtbd1t3NVcVERJznOcpSlGUYxjGMYwjCMYRjGMY/k7DbdPb3+l6fq+p6vqen6Xod3Z1Xq2mm7u7rbu6za2szMzMzOzMzszszszOzM7NrPrbu6y7i4qIiTnOU5SlKMYxjGMYwjGEYRjCMYx/J2G26u30fS9T1fV9X1fT9L0O7r6bPpu7um7ututrazazMzM7MzszOzOzs7M7MztrMzbusALiok0nOcpylGUYyhGMYwjGEYRhGMYxj+TcGt1d3o+n6nret63q+n6XodvXerGm6a27u7ra2trM2s7MzMzs7OzO7M7M7szPrMzbrboC4s0RJTnKUpSjKMYwjGMIRhGEYxhGMZfkwNt193pen63rev63ren6XodnVd9NNN3Rt3dbW1tZmZmZmZ2Z3ZnZ3ZndmZ2Z2ZmZt3d0FVUSaTlOUpSjGUYRjGMIRhGEYRjGMYx/JpjW6+/0fV9b1/Y9f1fU9Lv7Omu6abu6bu62626+trMzM7MzszuzO7O7Ozs7M7MzM26wxmKqTSc5ylKMoyjGEYwjCMIwhGMIxjGMfydhtuzv9P1fW9n2PX9b1PS7+u9DTTTd3d3d1tbdZmZmZmdmZ2Z3Z3Z3Z3ZndmdmZmbd3TMxESc5zlKMoyjCMYwjCMIRhGEYRjGMZfk0xrdfoen63sex7Psev6npd3VZtDTTTdbd3dbW1tfWZnZmdmd2d2d2d2d2Z3ZnZmZmGNzFVJpKcpSlGMoRjGEYQjCEYRhGEYxjKP5OM23Z6Hqev7Hs+17Pr+p6Xb010NNDdN3W3d3WZtZmZmfXZ2d2dnd2d3Z3Z3ZnZmZm3dDFWc0lOUpRjGUIwjCMIRhCMIRjCMYyjL8nBtez0PV9f2va9r2fY9T0e3obTTQ3TTd3W3dbWZtZ21313Zndnd2ozuzu7O7M7Mz6wxmKqTnKcoyjGMYxhCMIQjCEIwjCMYxlGX5Qw2vX6Pq+x7Xue37Xr+r6PXfQ00003Td3W3W1mbWZn13ZnZ3dnd3dnd3Z3dmdmZ23dDEVJzlKUoxjGMIwhGEIRhCEYRhGMYylH8pYFev0fV9n2/c9z2/Y9X0OuugAabum6bus262szMzPruzUZqM7u1HajO7s7s7Mzs2gLiTSU5RlGMYwjCEIwhCEIwhGEYxjGUpflINfr9H1fa9z3fd9v2fU9DqoGgAG7um7u7ra2szMzM7OzO7tRnd3d3d3dndmozMzMGYqJOUpSjGMIxhCEIwhCEIQjCMYxjGUpflUB+n0fW9r3fe973PZ9Xv6WANNADd3RjdbW1mZmZnZndnd3Z3d3d6M7u1GZ3ZmfQzFSc5yjKMYwhGEIQhCEIQjCEYwjGUZSn+VwN6fR9b2/d9/wB/3fa9Xu6NAANNAN3d3d3WbWZmZnZndnd2oz0Z6O7u7s7uzszPoCqk5ylGMoRhGEIQhCEIQhCEYRjGMoylP8tAHR6Hre37/wBB9B73ter3XAAADdANbRht19ZmZmd2d2d3d3d3d3oz0Z3dnZnbdFxESUpRjGMIwhDnhCEIQhCEYRhGMoylOX5dALd/re57/wBD9D7/ALfq91QAAADdA3WN1t19Zmdmdnd2d3d3o7u7u7u7uzuzNu4KiTlKUYxhCEIQhCHPCEIQhGEYxjGUpyn+XwCnd63t/QfRfR/Qe363bQAAAANNAbd3W3X1mdmd2d2ejPR3d6O7u7u7s7szMCqiTlKUYRhCEIc8IQ54QhCEIwjGMoylKc/zEAN2er7n0P0f0f0Xuet2uAAAAAboGtu62szMzszs7u7u7u9HejUd3d3dndm0zFSc5SjGMIQhzwhzwhDnhCEIRjCMoylKc5/mQAOr1Pc+h+k+l+j971u1gAAAAA0NNbd1tZ9ZnZ3dnd3d6O9Go70d3d3Z3ZtMxEnOUowjCHPCHPDnhDnhCEIQjGMYylKU5z/M4AX9L2/ovpfpvpff9fsYAAAAAA3Q1t3WZmZnZndnoz0eju70d6O7u7uzuwYqJOcZRhCEIc8OeHPDnhCEIQhGMYxlKcppP80gBTv9v6H6b6j6f6D2ezQAAAAAAYDW1t1mZmozO7u70ajvR3o9HejO7u7MZiok5SjGEIc8OeHPzw54c8IQhGEYxjKUpznNPzWAG9vsfRfT/U/UfR+12aAAAAAAAwGtrazMzO7O7PR3d6O9Ho70d6NRndtDESc5SjCPPDnhzw5+fnhzwhCEIRjGMozlOc0T82gAdPrfQfUfV/VfS+326AAAAAAAMAzbrazszuzu7u9Ho70ejvR3o7uzs2Cok5SlCMOeHPzw5+eHPzw54QhCMYxjKUpzmiJ+bwAKel7/ANR9Z9b9P73doAAAAAAAboM2trOzNRndqO9Hej0d6PR3o7u7NpipOcpRjCHPDn5+fn54c/PCEOeMIwlGMpynOaon5xAA3u9z6f636/6v6D0NAAAAAAAA3TW1tZnZndnd6O9Ho70ej0d6O7u+7mIk5ylCMIc/Pz88OaHPz88IQhCEYxlKUpzmiov5yAAOj2Ppfr/sfrvo/SYAAAAAAADdBtbWZnZnd3d6PR3o9HpR6O9Hd20xVnOcZRhDn5+fn54c3PDn54QhCEYxjKUpzmiKmfnMAAb0/o/rvs/svp/VcAAAAAAAA3QZm1mdmd3d3o70ej0elHo70d3bcxUnOUowhCHNDm5+fn5+eHPCEIRhGUZSnOaIirn50AADr97637X7X632aAAAAAAAABums2szszu7u9Hej0elHo9Ho7u7GYiTlKMYw54c3Pz8/Pz8/PzwhCEIxjKM5TnNURRfzqAAD+x9T9t9z9l79gAAAAAAAA3QZm1mdnd2o70ej0o9HpR6PR3bTFSc5SjGEOfn5+fn5ufn5+eEOeMIRjKUZznNEVMzPzsAAB2/Sfa/efcfTdQAAAAAAAAG6azazOzu7Ud6PR6UelKO9Ho7sZizSUoxjDnhz83Pz8/Nzw5+eEIRhGUZylOaKi4uZ+dwAAKe19j99999f6AAAAAAAAAAwMzazs7u7u9Ho9KPV6PSjvRtMVElOMYwhDn5+fm5+fn5+fnhCEIxjGUpzmiIuLmH53AAAO36r73+ifcezoAAAAAAAAG6azazuzu7u9HpR6PV6Uej0fdzFnOcoxhCEOfn5+bn5+aHPzwhCMYxlKc5zVEzFwPzuAAAP7f3P9H/AKH9LQAAAAAAAAAYH1mZ2d3ejUo9Hq9KPR6Ud9wRZzlKMIQhzw5+bn5ufnhzwhCEYxlKU5oiKuLgH53AAADq+t/o/wDTfteoAAAAAAAAA3Rm1mdnd3o70elKUej1elGYFRJzjKMIQhz8/Pz83Pz8/PCEIRjGUpTnNEVczMA/O4AAAb7H3/8AU/6R64AAAAAAAAAMazNruz0ajvSlHpR6vSj0bRVRJSjKEYc8Ofn5+fn5ueHPCEIRlGUpzmiouZmAH53AAAAr9X/Uf6z9a4AAAAAAAAAwPrMzu1Hd6UelHpSlKO7sYqJOUoxjCHPDn5+fn5+fn54QhCMZSlOU1RFzMwAPzuAAAAd39B/sf9M7AAAAAAAAADdGZtajO7vR6PSlKPV6UdgVUnKUowjDnhzw5+fn5+fnhzwjGMZSnJERFzMwAD87gAAAB739b/tX04AAAAAAAAAMazMzuz0arUpSj1elHo2mIs5TjGMYQhzw54c0Ofn54QhGMoynOaIi5mYAAfncAAAAH+z/ALt/V7gAAAAAAAADGszMzu7vR6UelKPV6Ppiok5SjGMIQhzw54c/Pzw54RhGUZynNERczMAAD87gAAAAdH9S/Q/1IAAAAAAAABuj6zO7PR3o9Hq9KUo+gqJOcoxjCMIQ54c8OeHPCEIRlGcpzREXMzAAAPzuAAAAAeh/e/7v0AAAAAAAAAbozMzO7u9KPR6vSlH3cxEnOUoxhGEIQhzwhzwhCEIyjOU5oiLmZgAAB+dwAAAAA9/9S/0YAAAAAAAADdNdtd2ejvR6vSlKPuioiTlKMYxhCEeeEIQhCEIRjKU5IiIuZmAAAB+dwAAAAAPt/wBdeyAAAAAAAAAxr6zUZ6O9HpSlHdtzFSc5SlGMYRhCEIRhCEIRjGUpTmqIuZmAAAAfncAAAAAA/r36nqAAAAAAAAG7rMzO7u70pSlHdgVUScpSjGMYRhGEIwhGEYRlGU5zRFVRQAAAA/O4AAAAABv6J/v+gAAAAAAADGszM7tR3pSj0fQxEScpSlGMYwjCMYRhGMYxjKUpoiJmLgAAAAH53AAAAAAC/wCo/wCv6AAAAAAAAxrMzO7Ud6vR20FVJpKUpRjGMYxhGMYxjGMoylOc0RcXMAAAAAPzuAAAAAAB6n6h/qNAAAAAAAA3R2ZndqO9HdtMVUnOcpSjKMYxjGMYyjGUZSlKc5qirmYAAAAAH53AAAAAAAPov0f/AE/qAAAAAAAN0dtd3Z6O76GKiJOU4zjKMZRjGUYylGUpSnKc0RFFzAAAAAAPzuAAAAAAAH1v91/qHrMAAAAAAG6O2u7s9GYMxFSc5TlKUoyjKMpRlKUpSnKc5zRFVcwAAAAAAPzuAAAAAAADfXf2D+l/S9OgAAAAAbo7a7uzNpmKiIkpynKUpRlKUpSlKU5TnOc5oiKouAAAAAAAfncAAAAAAAB/q/6b/RPrfWvoAAAABujtrs27hiqiJOc5TlKUpTlKUpynKc5zSaIiIuZmAAAAAAAH53AAAAAAAAKfSfffefW+/wCj0NoAAABuj7u6GLioiJOc5zlKcpylOcpznOc0SaIqKmLmAAAAAAAAfncAAAAAAAAH977H7P6v6H1+/pq+6AABoAYLiqqIiTnOc5zlOc5TnNJzREmioqoq5mYAAAAAAAAfncAAAAAAAABvW+n+r+m+g9n0+7pvVm3QMMwzMXFVURERJzSc5znNJzmiTREVFVUxcXMMAAAAAAAAD87gAAAAAAAAG9/vfR/Q+97Hq9/Z03rRt0MzMzFXEVURUmiJNJzRJoiIiKiqqri5mYZgAAAAAAAAB+dwAAAAAAAAAOn1vb9z2vY9P0O3r6LVdt0wzMxVVVVEVERERERURUVVVVxczDDcwAAAAAAAAAD87gAAAAAAAAAFO/1PX9b1PS9Dt6+i9aO2mmGYuLiqiqiqiqiqqquLmZmGZpoAAAAAAAAAAB+dwAAAAAAAAAA3o7/R9L0fQ7uzr6L1q7M2gGZmYuLiririrmZmZmBgaawwAAAAAAAAAAH53AAAAAAAAAAAH6ezu7u3s6+rotWtGdm3QDDDMzMzMMwwADTd1tbWAAAAAAAAAAA/O4AAAAAAAAAAAFOjp6+rq6em9q1o7szNpugAAYBoabu626zMzawAAAAAAAAAAH53AAAAAAAAAAAAB7X6Oi97VrWlHdnbW3d3dN03d3d3W1mZmZ2Zm1gAAAAAAAAAAPzuAAAAAAAAAAAAANSta1tWlaUd3dmdtZtbW1m1mZmZnd2d2dm1tAAAAAAAAAAA/8QAHhABAQADAQACAwAAAAAAAAAAAQACEXADEIDA0OD/2gAIAQEAAT8B/v8A/wD2eUffUjvJEd4IjvBER3c+CO8ERHdyIju5ERHdyIju5ER3giI7uRER3ciI7uRER3ciI7uQwxHdyGGO8DDDHdyGxYe8DYtix3gbFsXvOLYsPeBscrF7yNhlYvecWwyjvOOV55d6wz1YZb71552LvvXl6W995HV5enesXV5596wy1YZ96wyscu9YZWOVvvA2OVjlD3gbHKMoe8DY5RlD3gYYYbfdxhhht93GGGG33cYYYbdvuwwww27fdtww27du33bcNu3b7vu3bt27dvu27du3bt923bt27dvvO7dv8BY//8QAHREAAwEBAQEBAQEAAAAAAAAAAAERAmADEgQwwP/aAAgBAgEBAgL/AHZr71jH3TGMY+4YxjGPuGMYxj7hjGMY+4YxjGPt2MYxjH27GMYxj7djGMYx9uxjGMY+3YxjGMfbsYxjGPt2MYxjH27GMYxj7djGMYx9uxjGMY+3YxjGMfbsYxjGPt2MYxjH27GMYxj7hjGMY+4YxjGPuGMYxj7hjGaNDH3DGaNDH3DGaNGh9yzRo0PuWaNGh9yzRpaND7lmlpaH3LNLS0n3WlpbWu6ZpbW0+60tra13el6Z2u6a3n0y+70vTO13fpn1w+7a9ceme70vfza7v0x7+fee3l6Y7z9X533v6/zd41+n8/ebz7+HeemPXxa7v0x6eTz3e8ennrE7reN+esPM7nWdY1h4eZ3DzrGsPDz8yds08vLy8vPzJO0aeXl5eXn5+ZJJJJ/ec7Gnl5efn5+fmSSSSSSSSSSSSc7Gnn5+fn5kkkkkkkkkkkkk56ST5kkkkkkkkkkkknQySSSSSSSSSSSSTpJJJJJJJJJJJJOokkkkkkkkknWySSSSSTg//8QAHREAAgMAAgMAAAAAAAAAAAAAAREAEmACEEKg0P/aAAgBAgEDPwL6O8+lvH0t5YSp3txKct7cMRb3y471iVLG9HISp3thFFvH0t4/ZA//xAAgEQADAQADAQADAQEAAAAAAAAAARECAxJgBAVAUDDA/9oACAEDAQECAv8Amhl7tCEL3KEIQhe3QhCEIQvaoQhCEIQvaIQhCEIQvaoQhCEIQvaIQhCEIQhC9mhCEIQhCF7NCEIQhCEIXs0IQhCEIQheyQhCEIQhCEL2SEIQhCEIQheyQhCEIQhCF7NCEIQhCEIXs0IQhCEIQheyQhCEIQhCEL2SEIQhCEIQheyQhCEIQhCF7NCEIQhCEIXskIQhCEIQhC9khCEIQhCEIXskIQhCEIQhezQhCEIQhCF7NCEIQhCEIXs0IQhGTIhCF7NCEIyZMiEIXs0IRkyZMiEIXs0IRkyZMmRCF7NCEZMmTJkQvaIQjJkyZMiF7VCMmTJkyIXtUIyZMmTIhe1QjJkyZMiF7VCMmTJkyIXtUIyZMmTJkXtUIyZMmTJkXtkZMmDBkyL2yMmTBgyZF7ZGTJgwYMi9ujJgwYMi9ujJgwYMi9ujJh4MGDPuMmHh4eDPuEZeHh4Mi9xl4fG+N4F7hGHxvjeGvcIy+N8b43n3OXh8euN491h8euLXG17nL49cWuLWfdY1xa4dYfuUceuHfFr3WXw74N4fuuPfz8nDr3fDyfNy5fusv5ubg5Pd438f0Zfu+Hl+P6PefJ9PBy+8/Hfan7z8Z9/vM6+D7vecXJ8f2J+74Ob5vqzr3fBzfP8ATjk/n3xfDzcP0cfMtfyLbbbbb4ZHFy8XPx82eRa/hW222222+IT4+Tj5sc2eVb7X9y222222223xON45ccueXPItrVv6lttttttttttvi87xyY5M8meRbW+3a22/4W2222222222222+MWs7zyZ5M8i5Ftb79u3btbbbbbbbbbbbbbbbbbfHJrWd52tra2t9+/bt27du3btbbbbbbbbbbbbbb5CrS0tra2trffv37du3bt27du3btbbbbbbbbbbb5OrS0tra2t9+/bt27du3bt27du1tttttttttvlqtLS0tdu3bt27du3bt27du3a22222222+at7du3bt27du3bt27du1tttttttt87be3bt27du3btbbbbbbbbb6K22222222222/2//EACARAAIDAAICAwEAAAAAAAAAAAECABFgAxASMRNDoND/2gAIAQMBAz8C/oct76xu668hvPEz1LG8KGBxvTxMIOVAd78TBW9QMLG9+tzvSpBEHIoVt6eNrEDgXL3h4zLAgbeFT0DvK6uXuqlb2vyi/wD/xAAiEQEBAQEAAgIDAQADAAAAAAAAARFgEFAgMCExQGFBcbD/2gAIAQIBAT8h/wDbBvd3t74viqvcVfF83taqqqr5q9jVVVVVVeyviqqqqqqr2VVVVVVVXsqqqqqqqqr2FVVVVVVVVXsKqqqqqqvZVVVVVVVVVevqqqqqqqqqr19VVVVVVVVVV66qqqqqqqqr19VVVVVVVVVV62qqqqqqqqqq9dVVVVVVVVVVetqqqqqqqqqqq9bVVVVVVVVVVeuqqqqqqqqqqvW1VVVVVVVVVVetqqqqqqqqqqvXVVVVVVVVVVXrqqqqqqqqqq9dVVVVVVVVVVevqqqqqqqqqr11VVVVVVVVVevqqqqqqqqqr19VVVVVVVVXr6qqqqqqqqq9fVVVVVVVVV7Gqqqqqqqq9hVVV8KqqqqvYVVVfgKqqq9fVVV+QKqr2FVV+YFVV7Cqq/MCqq9jVX5gVVXsaq/MCqvZVfoAVV7Kr9ACqvZVfoAVezq/QAqr2VX6AFXs6v0AKvZ1foAVezq/QAq9nV+gRe1v0GL2t+g5e1v0Hr2t+g9e1v0Hryc9Hfm9e2vzevbXwlPw97hKUd0qhKEcrTzPRQlCOVJ6WpQhHjeQiemqUJQleNniIiemhHilHHoieoqfNTxieYiIieJ6SPgVPHRERPT34ESvExERPM8RPTRxkiIiIievHjiYiIiess4nCIiIiInrdn7vBOXhYiIiInmes3fvZ3gp4iJ5kRPhPWWa1fuRl4KIkREiJE9jgfvbOAnjEiRESJEieyjL9/4aPfRPEiRIkSJEie0hRelz3uJGMSJEiRIkSeMT2c6/hSks91jEjEiRIkSJEjEnt4Vn+UWrL7fGMYkSJEiRIkSJEjPOe1/4r/v2uMYxIkSJEiRIkYkYkYz28LSr3j+PZ4xjGJEiRIkSJEiRIxnjPcVcqlLIss9djGMYxjEiRIkSJEjEjGMZ7qdvw3X8K+rYxjGMYxiRjGJEjGMYxjGe7jP6fv8Awv6hjGMYxjGMSMSJEiRjGMYxjPezP8WK1PSYxjGMYxjGJEiRIxjEjGMYxjPe2a0f4edv97GMYxjGMYxjGJGMYkYxjGMYxnv7Nb/HYpn9OMYxjGMYxjGMSJGJGMYxjGMYxjOBs35QTS+LP4sYxjGMYxjGMYxjGMYxjGMYxjGMZwmfP/Sl8zGMYxjGMYxjGMYxjGMYxjGMYxjGMYxjGMYxjGMYzjG1aX6nAxjGMYxjGMYxjPDGMYxjGMYxjGMYxjGM4m/EgUpS/wBTwAABjGMYxjGMYxjGMYzi8XySlKUv9X+AABjGMYxjGMYxjGM46xSta0rf6P8AAADGMYxjGMYxjGM5HFila1v8/wD4ADGMYxjGMYxjGcrixSl/mfQADGMYxjGMYxjGM5fGM/kAAAYxjGMYxjGMZz2MZ9wADGMYxjGMYxjGe2//xAAhEQEBAQACAgMBAQEBAAAAAAAAAREQYCAwMUBQIWFBcf/aAAgBAwEBPyH9TOM5xjGM4xnGM4xjGcZxjOMYxjGMZ6M6pnGMYxjGcYxjGMZxjGMZxjGMYxjGMYxjGMZ451DGMYxjGMYxnOMYxjGMZ556M4zwzxzo+MZzjGcYxjGMZxjGMYxnGMYxjGenGMZ5ZznTM4zjOMYxjGMYxjGMYxjGMYznGeGM8M6lnGMYxjGMYzjGMYzjGMYxjGMYxjGMZzjGMYzwzjOc6TnGcYxjGMYxjGMYxjGMZxjGMYxjOMYxjGM8M5xnTM4xjOMYxjOMYxjGMYxnGMZxjGM8MYxjGM4z1Z0rGMYxjGcYxjGMYxnGMYxjGMYxjPdnGdKzwznGMYxjGMYxjGMYxjGMYxnhjGMYxjGMZzjOn4xjGMYxjGMYxjGMYxjGMZxjGM8MYxnGMYxnGdNxnGMYxjGMYxjGMYxjGMYxjGMZxjGM88ZxnUc5xjGMYxjGMYxjGMYxjGMZxjPHGM6zjGMYxjGMYxjGMYxjGMYxjGc4xnOcZ1nGMYxjGMYxjGMYxjGM4xnGMZznlnGcYxjOo5xjGMYxjGMYxjGMYxjGMYxjPDGM61jGJGMYxjGMYxjGMYxjGMYxjGMYzxzjOqTnGJGJGMYxjGMYxjGMYxjGMZxjPbnToicyJGJGJGMYkYxjGMYxjGMYzjGeedVnEREiRIkSJGJEjGMYxjGMYxjGMYxnGM9WdRiIkRIkSJGJEiRIkYxjGMYxjGMYzjGMYzrE4iIkRIkSJEiRIkSJGMYxjGMYxjGMYzjPDGdWiIiJESJEiRIkSJGMYxjGMYxjGMYxjOc6zERERIkSJEiRIkSJEjGMYxjGMYxjGc4zol+tEREREiRIkSJEiRIkYxjGMYxjGMYzjOc6zEREREiRIkSJEiRIkSJEjGMYxjGMYxjOh3m/ViIiIiIiJEiRIkSJEiRIkYxjGMYzjOM8M/fvF+vERERERIiRIkSJEiRIkSMYxjGMYxjGcZ0SrxfpxERERERIkRIkSJEiRIkYxjGMYzjOc6FfCrxV+jERERERERESJEiREiRiRjGcZxnSrxV+jOIiIiIiIiIkSJEiJEiRIzjGdMvF5v0YiIiIiIiIiRESIkRE6bfC81VVffERERERERERERESJE6hfCqvF98RERERERERERERETjOm3xqrxfbEREREREREREREiIiInTrzVXmr7oiIiIiIiIiIiIiIiJ1G+F90RERERERERERERERE6dV8LxeKvtiIiIiIiIiIiIiIiInTr43i8Xi+uIiIiIiIiIiIiIiIiJ0++FXwq+uIiIiIiIiIiIiIiIiJ0+8VVXmqvriIiIiIiIiIiIiIiInS74VeKq+FVfVERERERERERERERERE6feKqr4VV9URERERERERERERERE6heKqqvN4vqiIiIiIiIiIiIiIiJ0y+FXiqqrzVX0xERERERERERERERE6bfG81VVeLxfTERERERERERERERETpt8avNVV4qr6IiIiIicIiIiIiIiInTL51eLzV5q+iIiIieIRERERERE6ffC8Xi8VVVeL6IiIieYERERERETqF5qrzVVVXi+cRERPSARERERE6VfO81VVeKqqqr5xERPUAIiIiInVLzVVeKqqq+cRE9QAiIiIidPq81V4qqqqqqqr5xET1ACIiIiJ1Oqqqqqqqqqq+URE9gAIiIidRvjVVVVVVVVV8oiJ6wAiIiInUb4VVVVVVVVVV8oiewAEREROqVV4qqqqvFVVXyiJ7AARERE6heavFVVVVVVXiqvlE9oAERETqVVVVVVVVVVVVVXyie0ACIidSq8VVVVVVVVVVVV8YiewAERETqdVVVVVVVVVVVVXxiJ7A4RETqtVVVVVVVVVVVV8YieweERE6lVXiqqqqqqqqqqqvjE9oeEROoXwqrxVVVVVVVVVVV8YntHwiJ1GqqqqrxVVVVVVVVVXxiewfEROp3iqqqqqqqqqqqqqvjE9h+IidTq8VVVVVVVVVVVVVfGe0/iJ1GrzVVVVVVVVVVVVV4vjPafxE6neKqqqqqqqqqqqqvF8Z7D/ROm3wvNVVVVVVVVVVVVVVVfGew/kTqN4qqqqqqqqqqqqqqqr5T2H+idRqrxVVVVVVVVVVVVVVV8Z7DmROn1VVVVVVVVVVVVVVVVfRPYYydPqqqqqqqqqqqqqqqqvFVfKexh06jVVVVVVVVVVVVVVVX0z2MEnTqqqqqqqqqqqqqqqqqqr6J62CidOqqqqqqqqqqqqqqqqqr9Rgp068VVVVVVVVVVVVVVVVX1z1YKdOqqqqqqqqqqqqqqqqq+yepJTp1VVVVVVVVVVVVVVVVX2T1LKdOqqqqqqqqqqqqqqqqqr656l1Om1VVVVVVVVVVVVVVVVfoNefE6bVVVVVVVVVVVVVVVVVX3tL8uTptVVVVVVVVVVVVVVVV9840tXUUqqqqqqqqqqqqqqqqv0JxpalfHT5eKqqqqqqqqqqqqqqq/RpS1K6g6qqqqqqqqqqqqqqq/Si1q+FfCundVVVVVVVVVVVVVVVV+na1fC/hXwvjOl1VVVVVVVVVVVVVVV+pSnwL+F/CuE6VVVVVVVVVVVVVVqqq/ViuD4uKuE6VVVVVVVVWqqqqqqqq/Wvi+J8S/hfS1VVVVVaq1VVVqqqqq/Xl5r4HwK6SqqqqtVatVVq1VWqqqqqv2L4PhfC+LpOqqqtVatWrVq1aq1VVVXi/ZrmfjfAvpNWrVq1atWrVq1atWrVq1VVV+4fG+J8aukVVq1atWrVq1atWrVq1Vqqq837MucPxPgfA+HR7VWrVq1atWrVq1atWrVq1VX72D4HxvgV/Oia1Vq1atWrVq1atWrVq1atWqtVfv4PjfC2k/Tn0Na1atWrVq1atWrVq1atWrVq1V/BrK+N8TaRPj9CfQ1rWrVq1atWrVq1atWrVq1atWrVVfwc6+P+tcaT9eenWtWrVq1atWrVq1atWrVq1atWrVq/h5WPh/rFP15561rWrVq1atWrVq1atWrVq1atWrV/Flys7P60z+sD9zWta1atWrVq1atWrVq1atWrVq1at/HrbOz+pQ/v7eta1q1atWrVq1atWrVq1atWrVq1b+TaD4mozv7Ota1rVq1atWrVq1atWrVq1atWrVv5c3/UnN/X1rWta1atWrVq1atWrVq1atWrVq1q1v5cCt/iEL+rrWtata1atWrVq1atWrVq1atWrVq1v51ar+kxTZf0ta1rWtatWrVq1atWrVq1atWrVq1atWt/OlsuxpJ/5ql39DWta1rWtWrVq1atWrVq1atWrVq1ata3jfzqNZYsB/Uu/m61rWta1rVq1a1atWrVq1atWrVq1ata1v6M/RAqQjZ+XrWta1rWtWta1atWrVq1atWrVq1rWt/Ukf6nJaify/ka1rWta1rWtWtWtatatWrVrWtWrWta39WK/rST+ovyl38XWta1rWtbw1q1rWta1rWta1rWta39aXFLn9fF/UMf1P8FrWta1rfYADWta1rWta1rWt/YrSmP6+L+tM/qFQv3da1rW+8AA1rWta1rWta1rf2tCs/wCvi/r4v6/2bp9g1rWtb9MAADWta1rWta1v7suMXxf1/u/2f6cjOLffrWtb9cAAANa1rWta1rWt/elxk/0f6v8Ad/pzkYTxxrWta1rfugAAABrWta1rWtb0HcZcf+z/AEf6P9uUhGfjD8//AMABrWta1rWtb0THnf8AXx9YQjPw8H//AIAGta1rWtb0iY9B3pCEJ+D4D/8AADWta1rWtb0qecQCEIz7/wAD/wAANa1rWta3psqeMFjGMZ9zwH/ANa1rWta3qMqMYQhGEYz7MB/wDWta1rW9V1CMYQhOCfWD/gDWta1reta3knHPp/8AwDWta1rWt/T/AP/EACIQAAIDAQACAgMBAQAAAAAAAAERABAgMEBQMUEhUWCBcP/aAAgBAQABPxD+EXH5nx7Z7/2nT6/7PxPxHTjjjjjjjjjjpxz8V/s/23xcc+fWfH8ivUfHjPg+Lv8AEcccfluOOfi3wcf9yo9uLT8748dx8fxHH4Djy44+7jjn+0+D834/mFH2+dfPpPjwnHHxefxPxbjjjjjjjjjjjpz8T8ZfJz8cXPn0Px/IfEfD49t8R6dfiPg8finHH5Ljjr8c3Hxf9d8R7+Z8eD85+fPce3HyccfZxx6ccfZxxz8cXHwf9X8R7+dPXz7Bx8PxHHxefxPxhxxxxxxxxxx4/wBy+Tj4vv8AP9D8R7+d/HrHwfBx8/xTjj8px1+Obj4Pyvn+T+I+vz7L8R7/ABHHp244+zpxx0446ccfV1+OLj4Pfz/RKPr8+5enhx8Hn/Y6dunHHHHHHHTpz8ZfFx8X/XKPwvn0rz+I9vwXf4jjjj8px6e3xfifP8uo/H+fVvi+P4p+C444444/AfN+B86+fP8Aj3ah/gX4Dp93Tpxxxxxxxx5/3L5P3vx7lfw7j3+Orpx+U46/EXJ+A/C+f7D59M+D5uOfns4444444/AfN+X88vnw/n+6eXb8R6dPm6dLD8R9nr58n4/i/j0j8F6/HJ8Hpx+Q448vz/n+a+Ovxj598+jj9K8Pxnp+J88fn3fxv518Y+fXPb8x6dOOOOOOOOOfjg/XfP8AIKPXzr4x8+zfgvg9vxnT6uPi/D+c/Pl/Ps1Dr518Y+fWPq/CdP0bj8R9fnzPn3Q385c+MfPoX4D8R5fdYc/2f7P9n+x7/wB6vzn/ADnxx+fVPo/BfR06fhOOnHl/2/xpz44/P8I+Tjp+gccd/wCx7fpHx+ffDwPn2b8p9v8AbVqK1F4Lj9H88R1+cfPtBH3+fRvL9A+qp08Pl/s/Mc/yOOf7j/eTw9P+r+ePz/Dvh/tuOOPznHzfF+g+fF+PW/Gvnj8+ifrHT9O447fF+l+cfPgfPrBz+fVPD8F+A/CduOOOf5P8jjjt+C8PT/pBv49S/QPi+Spx2/Gc/McfV8X/AM2fZ+kcfrvnA/gPjXz4Hx4L8R+ifrX7n59sNfOfj+edPH+2sqv9w46fZ/wXz6kQ5f8ABvb8JW6dLyFbjj6P2j918Y+f5Z+Y+St833fkDAyL+fZD+MfguOLwXHHpxx+CqfJ+i+eHz3+fUiPPz/Kvq6eFFFFxUUUVuOOO1xVPi/6V5+P5lx2vMUVOPmo/YD2w5fP8q4/UqnHxXqB3frDBHn5/l32WHHHHHHHHTjjjjjyuap8V/QGvjr8/zTjjjtRUuaipW4447XFc37NweqGvj+JfB9HHa838RW4+Lt+sHuTx+fcPznHS9OqcfN7Xqxsep+PQvT9q46XRRW444444444444447UXJ0qcfpx/AmDw3758X0VOOOOOPCiiiiiiiiiiiy44446XJU+C9iOQ9T8/xT4OPm4446WHH4TjtRW446XBU/dj1Bgh/lHHyccdK31cduPq7VOOOlp2/Vjwvn+we3ycceHt4VKLoou6txxacVP3Y9SfRP0b2+Lj6KK3HHHHHHHxcccccceFb4KnHwVP2wg7OOPwXgwQ4+fSPz33cfJW4447UVfjD5fi1Fhxx2uKp+qHkj0R6nzD4j5PT4OPbpU447WH5Djn4pW44+LtxxaUfrhselPH4v4s+SfRvbj5OOOlP9p+mVOOOlpxU6WV4Y8EcPvQsemHin1r09vk46VPkotOOPLjj2uqp8lH4h9CLGxf15xg/hnt8XHb06WHHb8Vx4XJU4+T7D0Q5Cx4f+djPqzPq/rR8U8H5T7vq46eFtxxxx246eVl0+ztbccXM8xoeQIKHqTZ5HZ6Hznp8HHzccdq35yw47XBcXFa8EeeLHdxxxxxxxxxxxxxxxxx7OP3/AAb4Pk446Vv06t4W1Tpbfp/vQ5CxhRRRRRRRRRdxgz64nJ2fXvb5O1T5ri444+S8F2v4H6sWLHmDBn1o2ex8M9D4b4uPosOn4Cv/AGnHlc1b84wejEFDk444/FE+rOz6w+K+Djt7WHTyor/E/E/G/wAT8T8UootuPqrfBU+K8QcB2EFDf68w6PE5+9nZ4nzPnq7fF834jjr8UtPouj4nuPAHg/V/VjyzBZwbOfr3Xx4D4P0TpWqfdbfhHwhBy+9fVixBQ4f54g2c/dnByaNHsex85+yWHyXN6O3yHQcPviIKFjP45qKKKKKKLgYb+rN/Xln0Ri6OlT8Jxx6ccfiuLD8R7cPE+KOYoWJ93+sKKKKLo48jBhs8D4R8Q9DxWFwVPo6dfmvx3/EVuOPu4sPw35QwJ+rHMUJ98f1hxx5/zxP3Zs2aNHJr78o5PhLS8B8FFFFPxX4n4n4n4jn4n4n4n4n4iiii0qcfZeYMnJ8ET9bHT6v68/6s6NHxD0PhHiuK5PCr8W4/DdOlFlU+q8M2cuHqfDG/rQsWPJNizw+9nzD4Zx85O1wU/EcfnuOlF4Pz4Q4jIwcjAwNjkNCChBX14Ci5/uz1NffU+WuBteCrfp3FFap+c8mCHiPAFjYsQULFixFFFFFFFhxxx0446XT69UbPE4+OCwsrS9a6XmHoMGDgegn64ixYsWMOPH+UqWlS8j94PgHJo2rNfdnxzk0vBccccccccccccfjq1ycXgCnkxw4GDkYGxgWIKGPvX3f6oecaNmzow6Plqzo2ey5GKLx/xFFTjj8NYfmHI8UchYn37b90fAOfqv3w+r/fAxbXRYVHS6KKKKKKKKLkoo4/BXQ8TZwYMmCHA4HuIKE+9Gzf6v8AXBRRY/E/F/iLkdHzDn66nByYrUPgnZ6Onbjpxz8T8RRRbVPs4ui8EQ4HE+CKGzf1f6v63/lfmfngrU+PQnw/3wPFWsGLgrMU/dnuovAdOfiKLSp+QPAMGhg5GBgbGzx+r+r+rXhDoc/ujf7o+abOlZ5KG1wUWFFpRRecsqn6gZEN/UHT7x+sfrxfrzjZv92fF+qWTk6NHa5qzxPhHyllU/KOhkwchg8BgWOv1Bw+vCXE4Pc+cdKzZ0cLisrByoocnzVhdzw+eB6GDgYMDYwfCHRRWoooouB9cdHRtdj4K5nzXt+KeIwKEOBDZgv6gwOH64/WxYyLUUXifXv1RitcFZ4KLuooooovKWF5p0YOQwIbGBf31FiChB6Uw+sWlo0trx16lX8+KaHA8hgeAdfWBQgoe1PdeSdrwFFFwXrX4Q7jQn3Zg4HgMG/1gUIKEFDiOCipRRWun3r93+/TmG1RwfEXReEfLeVyPE7OjBDgQ7PAdRBQsYHBRW4+L/gzhUtqlStRbVr2Xzg8RD3FCHAoWIbMFmDIr76iChYgoQUL+sLwfj3CtWqUWj4K2srsoovWjRoaHYwbPEUNCChBQgz9X9eOvUqzxXhKlSpYWFtY+dKvnCi9geA2difeBgYGByEGRBQwOH1lX+K/EcccfH79Wui4q1yWlhWvAXiOPwvnoLGjwGDBDZgwIbGBf3sQZEFDj9a/OFF4JweS8RdlFwXVaWFyUVLkvEOH4PzgcDyGhDgYMGBDQg2NjYoYGfrzV6ZWrWVFa0rXFYVLS9a/DPAWOhgx9QZENjAhschgcPq/q/1f6oYVLH4n4n49WtLStdFaipWtLCpYVLCtb+bWVa8BeGeZ2IfBEOxDY4Chx+tfrX3hx1+Yooop+IvAPlq1lYWlatWrXFRUrWFSwqXJYWV0XFeMNijwEPIYEOxgdfq/rj+r/VCx7VWtK1atRUotKlFSwqVqKlawqXVUvFPJeD88zQyKGhgwYHQWN/rp9ZE+6F/W1Fa9EsLirVq1xW1lRWtKlawqVql4C7Lb8MQ2PGENmCfezwF/fkCxBQw7UVLzltdVaipYVq1lUqWlaipWqVriqWlFS5rwvnxDsV9aN/dmDBgn3QyfQCxBQyuy8taWFaipRWrVq1atYWVFlWoqVrKtUsr25sbNDmYMGDgcffM9/uhr66rz1hWsLC5K1atWqUVrCpZVqLqsrKtfwQh4jgYMGxf3s8xYgoa/XJdF4ytRWorVrataWFapYVqlStWqUVKlatUsrStUvGXiGxocRj6z9QcDgYFixP1wGxn6v9ZU/E/Ffmls81zXFRWuC0orVq1FapWooorWVStWrVKl4apaXU+iNDwBDs4GRQ0LFixf1f1kZXmLwVai2sK1aitUsLCpWqVrKpWrVLCtWqVrK5nqR0HMQ0dmhk8xDs4+7OByFivqxr7oWPULKysLCtWorVrCpbVLKtZVKLiqXRekPgjX1QycihgQ8hBsWLFi/rj90LG1FPxP8ysfPjrCiiitRYWFatRWsLSyuCpWsrCyorVq10XqxxHA6GBDkaHIeCNfW1F4CtdVpRRYWFhRWtK1hRZVKK1apUqVq1SwrWFxVr045mjsw5+tjAh4HqNDgLEFDI9WtLCiwsK1Fa4q1a4KlSpWtKLS5q1wXkKxD4A0dChkYEOxgeKMCh4H+cF5K4LCi6LKi4rKpWrWFStYWFawsL05waHIcTQ0LFDAybGBodBYg5CxpRReYooouCiysKLCtWosqK1StZVK1awqXBReiPhiHqeH1oULFDAwIbFnf3oYFDj90L+r+vOVKKKKLktLKwoqWVSiyoqWlSpUrW1hUqWFhRWua6nB4HQo0Oh0KGhYoYGBDY2KHAc/uhr65LH4i9CoosqLCitYWFatZVqlawqWVSwsKK1FhdF2+LPhnuMjQyKGBDYwLGx4IsX9X+qGlSiii9EooosrKyrVKLiosLKtUqVLapYVKlyXBcjk8D1PMWOYoWKGBPuxgdRY4Cxf1f6oWMOvz5SpRbVqKLSitRRRZWVFFhZVqltUqVKlaiwsq1SwqWF6AjiOR2IZ+tDIwMDY8IcxYv69CooooqVKKK1tZUVqK1FSwqVrKysK1hUqWFSwqVrS0vQHgOR4HIocRgcvvQn60M/WRYv6v9UNKKl5ipRRRRcFFhbUVqKlpWsqlSwsLCysrSpYVLqeJ2e45fVHRyKHAwWYNix5X1f63+I5+aUUXcRaXNclFhRWooosLCyqVrKpUtLChEVLC7rxjk0fK+q+tHIocDBBoWeQ8H6yLHo14ai6KlhWoqXRUqWlhRaVLCpWsHufHPhjJn1gUPAHiixf1kWOqiipdBhaUXgrKitRUorVK1FapWsK1tWrWFSpZVKlapejXjjJn1odBDY7jA5Cxz/FulFP89SouCyqUVqlatUrVKlaipUqVKllaVrCyfGPoBDQycihgWIIbGBY8ocBpReMuKi7qlhRaWFS4LKtYWFhRaVLapcjs0eR0bNHie5oZORQwIbGBsZGBY8MX9eYLWFld1FapWtLCpWsrCtaVK1hUqVqlS5qjxOjg0aNngsnsaGTkaGBgeAMjmLHhOfjwBpRZXRRRZWVSiyrUWFS5KLgqUWlapZXI8zk9zs9jsz62LGBZgselHFRRReMrWFF1UUVKLCiwqWVhaVrCwqWFSiwrVLgcHRo8Tk5OPmjzPX6r7yeRgswbFjzxf16BWtrqosKKlhRYVLKtUsLKpdTFSpcSNHBo0eR0cH0Z1+sjYwPPHi/PiKLSi6KKKlFhUsrKiwrVLCysKKlhWsHwDzOzR4HufDOfrqPUDqui4q1awuiyoqUVq1hWqW1hUqWFxVK1k9TzMNHRhycfNHyPvJ1+uAwPSjooqfmLCi4qLKiwqUVqlhZVrCpUtKERUoqWTa4LseBo7PE+P8AVfeTP1o2IbGBYsesXgjS2srkoqUWVhUorVK1FSpbWFtUuBo2rXnHR5HxfvJyYMDA2Og8UWPBHAYGFhUrVqLgosqLKpYVLisKlStZWFyVrxDZ8U2bPjfeToYFmCx6IeGouypZVLKtRRcFFaysqlhUrWVSpcFS5Lxjo4NGzZ2dHkfGFihZg2LHmDmNqOOvz4YpYVKlhRRZUWVFtRaVqlayqVKlhcVpZUOVyOTDkw2cGHsfF+8DI4jAsesFKLwBlUrVLKtUoqVfilwUWlSwrVK1tZWFSipUsEdTg6NnwzDo2ey19aFDoNj3IoULFCxYHBYUUVKLksKLSpcFawqVLSwRxOj2NGHR4niaVHB8L6odhgWPTjsoop+PAFrKpWsKlFhRRZ/G1FlUsLCtYVKlSi2crwDZsw2bNmGjDRho0YaOjg+H9UOws4Fj1/4jjjpdRYsaVK1pbVKK1xVK1FlUqWFlbUVKLCipeIYdmzZ5mjRo4PA8xj60MDBsWLHhjyVFbj5jYiyNKKLaii0qUXJRUrW1S0qW1wUNrR2tnBweJo8T4xochse2fAcRgULFqlStRYV/5SpRRbUVLCwqVrosKlao0cHqbOzgw2bNmGjDk0YcGjg9xDQweosaHslsbEHNWrUUVKKLapRYNrkqVqK1hUsKlF1PI4ODDZhow2cHwjzPI6MHAbFCCx5o5jKr8U6exgchF4Ki1/kVrCtUsK1SpUrVLiqUOVZs2YdngbMOzDo2bNGHBo4PUUeYwMHQ9d8YUUU/EWRQgwOA0rWlFFtRZVKLCpcVhWosKllWsrR5GHBho0cGzgw0Yepo4OzxM/WBoYFj0IsZHZU8DIsUNChBYtUrUVq1ai0otrS5LCtUrOFSipcjZhwcHBweBh0YbNGGjDg0cGz0HgixYsev/wA2NixBQyKVq1zUUVqLK2orVLgqWlS2rOT3NGzgw4PA2Yep0bOD1+uAg2LHgDkPUiChBBBBBxWFFFFwUVKLK2rVKlatUuKpZWj0NGHiYcmGjgw2cGjDRhwaODZ5DsP4F0M/qDgIMjiooosKKLatRYUWllcVSwqXBaOTzMODDg4MODg2Yeh8D7h0egsaHlDzBoQQQUIIIIIKGR1UUVqKLStc1a5LSycrR4HkdGzDg4MNGHBow0YaNHyBzFix7d6FihBYgyOS4qlFhbVKLxVlbMI8NaODgw5MNmGHRh6nB8YUIPQjyfnmKGRkQQUIIOCwoootqlFa0rXFUoqWFhUupweJow2YaODDg0cHBhow4NGGjDR8A+ALHEe8EFCxBBQggyO6i2qVqLKtbVLmotHidGjxNmjDgww2YaNmHZh6nBwcHZ6Cx4AyPWixQgggoQQQQQbEXVRRbVrKtclFwXgLgYbMOjZo6ODDkw0YcGjDRho0eJo0dmDA8cZHIeiGBBBBBBBQggggggg7KLkouKyqVrCpYXA5XEw7NGzRsw0YbMNGzDDDRhh2YbNmHB5mjocRY0P4AQUIIIIIIKAoUPBUWFlRbW1S5rieRwYcGzRo0YYbMMMOTDDgw5MNGGGzzODwWBQ5ix448j48EWIIIIKEEEEEEEFCCxYtRRRdFlRaVLktriuB0cmHR0cmGHJhwYYcGHRhow0dHkYbPiD3QwIIKFChBBBBBkdVF3UXBYVLguC7nCho0YbMOjRhs0YcmHJhsw9DRweBho8RxHVei+OwyIIIIIIIIILHjKLS4LwFxVLsbMMOzRo0aNEZNHRo0YYYbOTRhow0bPljwhkewEEEEEEEFDAgggseGosrgsqlhUrVrJ8A4OTo2bMMMOjDkww5ODsw0eB84eMPTCxBQoQQUIIIIIIIIKHP/Oa9WtHJsw2aODDDDow8DDRwcGHB5nieQ0LHox5wwIIIIIIIKFiCCCCDA8dc1lUsLwzow4NmjRo0dmHRow2aNHiaNGGjDRs+F97FjI8YeN838dRgWIIIIIIIIIIMCfXmLawuSpUuSydnBhyYcmGjZsww8DRswww0aMOjDR4Hp8QdBkeMPSCxBgQQQQQUIMifrzl6g2cHBhwYYYcmjR0aMMOjRwcniaODlZOhYseMOQ9KMCCCCCCChBB6VYXJUu5ybNniaODyNGGzk2dHBhsw0YaNmjwMPEWP4cQWIKEEEEFCChB/BmzRh0YcHRhyaMMNHRoww0cGjRowww6MNHgcm/qj6AZFD04wKEEEEEEEEEFCCxX16FYXmmzwMNmGGGjRo0dGjDDDDRs0YYdHJ4mjRtaOxYsZHsvnqMCxBBBBBBBQggggg9KvRmGz4Roww0aMOTRo0cGjgw2YaMNngYfDHnjxfjwRBBBBBBBBBBBQggg/iDgw2YcGGHBoww7NGjDDDDDZwYYcGGGHRhow2dHqLGR4Y2Mj0gwLEEEEFCh6VcVleEdGHgYbMMMOzRhho0YeBoww6OTzNHxh6cdfnwBQsQQQQQQQQQUIIPVrguR0bNmzDZ0dGjRo8zRhhwcGjg0aMNmzhQ4MOTwGR/BDAgggggggggggggg9OvHPgHBho2YaOzRwaMNmjsww4NHBhow0bMNLSh9788PnwRBBBBBBBBBBQ9uvHMODg0dGjRwe5hh2cnBhwcq1n5z82LFD+GEEEEEEEEEEEEEEFfqvr2a4HRs4NGHJhwYYaOzRsw0YaMMMMNGjg0cGjR0dnn9cx449WMiCCCCCCCCCDP17RdzDR2dGjo0aNGjDRow9DDDRo0YbMNmjR8YeAKGx7MQQQQQQQQQQe6OTg0eZhwdGGGjg2cnRo4MMMOjRhwaMOjDSi4/HMfw4gggggggggggsfwJpZMNnBwaNHRo2YYYYaNGGjDDDZo5MMMOD0ODr4gwLHEeOPC+MfHhihQgggggggggggoe8PMw0cGHBo4MMNmGjDg8DwNGjDDg0aMNnSiwfMHvhBBBBBBBBBBBQ9ufGODDZo0eZ4GzRow0YYaMNmjDZhyaNn+C+cfOfnwxBBBBBBBBBBBBB784ODDRhyaNGjkw2YYYYYYYYYYYaMNGGGGGjR2YYYbNHmuo92fBFCCCCCCCCCCCCCCfr3Z7HZhhhyaNGjs0cmzZ4mGGHJybMMOD5A9f8ReKIIIIIIIIIIIIPcHZ6mGjDDg0eJo2eZo2aNGjDDow0bOFhUcHqPX/OfnxhBBBAYIIIIIIJ+vbHmcHJ2YYeBhho0YYYYYYYYYYaMMMMMMNGGjDRhs0YYbNmjZh2eI/jBYggggggggggofxhhhoww5MMMPE2aNmjDRhhhho0dmjs9T/AnyRBBBBBBBBBB79WcmlRh4mjg0aNmGGjDkww+AaMODDRyYbP8L8eOLEEEEEEEEEEEH8GeRhhhow6MNGjRow0YYYYYYYYYbNGzg0aMOTDR0rVH33zn52/CEEEEEEEEEEEHujfxo4MNGjDk4NGjs0aMNGjZhhhoww2YYYYaNHB6H1K8352fCFiCCCCCCCCCCh7Q6PA8zgww8DDDZhhycmzDDDDRhhs4NHBs5XvPjid/HhihBBAYIIIIIIIIIPfHZho2YcHRowww0YYYaMMMMMMNGHZs0dmjDxNn+D+IvNEEEEEEEEEEEHujo4PIw4NGjRo5NmjRowww0bMMNGHBs0cmGjk/wBCKEEEEEBgggggg9udHkYaNmHBhhycGGGGjRs0bNGGGGGGGjDDRo0YaNGGjyPiD0fzj5z86EfkiAwQQGCAwQQQe++LODwOTowww0aMMMMMNGGGGzRowwwww0YYYYYYYehs/wAF87PkChBBBBAYIIIPfngbNHJwaNGjRybMMMNmzDkw2YYYaMOTZ9QPUfHliCCAwQoIDBB/BnBybOzRyaMMNmjDRowwwww2dngYcn+oFCCAwQGCCCCD3po8zs8DRhoww2aNmjDRhhhhhhhs5NmHBybP8B8RekEEBggNgggofwJwaMNHBhwaNGjDDZhhhhhhhho2aNGGGGjk2YYYeh918+pFAwQQQrBBB700dGHZh0YdnBhowwww0aNmGGGGGjRow0aMODte7+c/OhH54ggggMKFQQQfwZwaMOjD1MMMNGGGGjDDRhhwYbMNGGjDg2e69t86UfogYIDChQqCD3xo2bMNGzZhhwaNGGGGjRho0YaNGGGGGGzkwww6NmHB/hz6IQQQGFAYVBB/DHgYcmGGGGzRhhhhhhhhs0YaMMNmjk0cni+i9z8elBgMBhQoVAYJ9e/MNHRho5NGjRybNGGjDDDRs0YYYaNmjZow8zteCvSfG/j0ooGAwoUKFBB740bNmGjZyYdnJhhhowwwww4NGGjDDZwaMODxPuviL1wgMKFChQoD/CGjZ0dGjRow0aNmjDRhhhhhhhoww0bNmGHR958+1BgMKFChQGD3xo2dGHBswwwww4MNGjDDDRhowwwwww4MMMMMMMOjDR6KKl6359qIIDChQoUBgPvjk2YaMNHJo0dmGjDDDDDZowww0aNGGjDDDDRs+++c/PswYDChQoUB/hDR0cnmbNGGGGzRhhhhhsw0YYYdGz/AfPtQYUKFChQe+NGzg2bMNHBo0YYbNGGzDDDDDDRhhs0YYbMNGGGz7/50o/XiAwoUOFB745ODZo0dGjP3DDDDRhhhowwwwww2YYYYYaPA9l7X50I/YgwocOFC/hjDRho7MMMNmGGGGGGzDRhhwaMMMNHRow0eqi9j87fswYUOHDg98aNmjo5ODDRow0aMMMNGGjDDDZow0bMMMODDyXtPnb9qV0cL3xycGzDZo6NmjDDDDDDRswwwwwwwwww0YbMMNnqvWfHR+2BhXRwe9OTRo0YbMMMPM2aMMMNmGGGGGGGGGGGGGGHJho+2+Oj9wDiop9fwhhs0aMOTRo2aMNGGGGzDDDDDDkwww5Pjr0Xx0fuixEPemvuzRhow8TDDDRow0aMNmGGGfqzDDRhh4GHwFa9i/djEh+9NGzwOTRhhhowwwz9www4NGGjRho8jD/CP3oONB7w5ODxOTRow0aMNGGGGGGGGjDDg4MMPgrK9F8Z+dKP34Kt3fwJo5ODDDg2aMNGGGzDDDDRhho0YcmjZydL0C7/O3/AouwX/AAZhs2YYYcGjDRsww2bMMMM/UMMMMMNGjDDZh9z86X8Iqh494eBs3+4aOjZow0YaNGGGGGGjDRhhhhhhsw+5+dv+FTPjhse7NmjZow0YYcGjk0YaMMMNGGGGGGGzDDDRybOD4C9F8/xyjG+7OTRwaMMOjRs0YYYYYYYYYYYYYYaMODk9F/emIQIj3Ro2cnmYYaMNGGjDDDRoww0aPE2ei9L84+N/H8WPxDggGBH3x4HBoww0aNmzDRhhhhhhhh4mHB7KlF6P438fxoJBc+AGAA96eBybMMM/cMMMNmGGGGGGGGGGHiffv+PMQIjEDAWH7w4PE0YYYbNGjDRow2YYYbNGjDg+CqXp1H/InOBIEBfvzRhs2aMMMMNmGjDRhhhhhhhhhhsww5Pol4XzpR/yZSjBAX7Y8DZ0aMMMNGjDRhhhhhho0YYYYYYYYYbOj0WF53zr4/lfiJj4C/anZhow2YaMNGGGjDDDRowwwww2YYYYYYcmHyl5/wAfy4KNuAPtDRyYaMODDDDRo0YYaNmGGGGjDDDDDDDkw+GooovRv+ZVeN9maNmjDRhwYYYaNGjDDg0YYYbNGGjkww+WvNf82vBIL9iaNmjDRhwYYbNGjDDDDRhhhwaMPA+OqXk/Ovj+dGckH2B4GjDgww2YYYYYaMNGGGHRh2YaPb/PDXifH8+Dn9EP1x2YaMODDDgwww0YYYYYdGHgYfFWFF5ij/oQc2ogGn6s8DRhwYYYYYYYYYYbMMOjxMMNHkvR/O3/AEYOTUQDH6s5NGGjDgwwwwww2aMMMMNmHkYfGU/zCpeT8f0wOSQQIBjr8enNGzRhow4NmHJhhhhho5PA4Psn/UA5BRAgGAx+nNHJhow8jDRhh0YYYYYYcnBs+AtqLxviP+qBgsAgQIEAxxx+kNHJhhoww6NGGGjZhhowwwwww5MPhryPxwf9aDAYKAgQIBgMBjjj9EdHZhhhhhowww2YbMMMMMMMMOTo+B/nmv8ArwYDBAgQIECBAMcBjj0/KNGnR7HRhhhhyYYYcGHylheH8f2QMBgMECBAgQIBjjjjjjj4OPr+MvgYbNGGGzDDDDDD0MMODZ6ra6rC4v8AtBAYDBAgQIECAYDAY444448vwnHb4mHgYcHqYcHwlP8AOP8Alqvx0VP+4BgMBgMBggQIBgMccccccccccdOOOOnyfE2YdGGGjDDDDRhhhhhh0YbPqlh0v7kGAwGAwGAwGAwGAwGAxxxxxxxx06eHp248ujyfgGGGHJs+Souar/J+I6/Fr+8cBgMBgMBgMBgMBjjjjjjjjjjjjjjjjjj5uPDpwnoYYYYYeJhsw2fQ/wCYVKKKL/gLgMBgMBgMBgMBgMBgMcBjjjjjjjjjjjjjjjjpx0448OnT4k8zRhycHyl/xYGOAwGAwGAxwGOOOAxxxxxxxxxxxx044446ccccdOnxNnBoww5MODDZs91hRWqVKl/w904444DAYDAY4DHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH1fhHx1FS4u/8AP+GuOAxwGAwGAxxxwGOOOOOOOOOOOOOOOOOOnHHTjjjjj0cGOHBhwcGz5iii4q3H/wAKdOOOOOOOAxxxxxxxxxxxxxxxxxxxxxxxxxxxx044+B0cGGz4J89f8MduOAwGOOAxxxwGOOOOOOOOOOOOOOOOOOOOOOOOOOOOnyNnB9GtL/i7w4DHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHTjjhMej4x9Aqej/AMOdunHHTjjjjjjjjjjjjjjjjjjjjjjjjpx06dP0Z8g7Ox/wl26ccccccccccccccccccccccccccccccdO3RyT1NHB5La8c7H/C3h06cccccccccccccccccccccccccdunT2aPsTgUf+KPDtxxxxxx04446ccccccccdvL9i+n7sY/eD/xB5duOOOOOOOOOOO3HHHHTw7ftRDzH/GHlx28OOOO3Tj4O37EYGPvJsf8aenHhxx6cceHHbt+wGBk6MH8R//EACIRAQEBAAICAgMBAQEAAAAAAAEAERAgMEBQYSExQWBRcf/aAAgBAgEBPxD4Xemy2y222222222222yy22y2y2222222222222222222222222222222222222222www22222wwww2wwwxDyfC7yvC28LLLLLLLLLbLLbLLbLbbbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbDbbbDDDDDDDDDDDEMMPA8D7z4F4WWWWWW2WWWWWWWWW2WWW22W22222222222222222222222222222222222G22222GGGG22222G3gYYeSHgY+G2WW22WWWWWWWWW2WWWWWWW2222W222222222222222222222222222222222222GG22GGGGGGGGGGGGGGGHk4PhWWWWWWW2WWWWWWWWWWWWWWWW222222222222222222222222222222222222222G2GG2G2G2222G2GGGGGHg4GGH4PbZZZZZZZZZZZZZZZZZZZZZZZZbZbbbZbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbYYYYYYYYYYYYYYYeBhhiGGH3XqsvCyyyyyyyyyyyyyyyyyyyyyyy222222y2222222222222222222222222222222222w22wwwwwwwwwwwwww8DEQwx7i9VllllllllllllllllllllllttltlttttlttttttttttttttttttttttttttttttttthtthhhhhhhhhhhhhhhhhhhhiGIfZeN6rLLLLLLLLLLLLLLLLLLLLLLbbLLLLLbLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbbbbbbbbDDDDDDDDDDDDDDDHsPDy8LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLbLbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbbbDDDDDDDDDDDDDDDDDDDEMMQxD7jwyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy22222222222222222222222222222222222w22w22222w2wwwwwwwwwwwwwwwxDDHtMszLLLLLLLLLLLLLLLLLLLLLLLLLLbLbLLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbbbbbDDDDDDDDDDDDDDDDDDDDEMMRD7TMyyyyyyyyyyyyyyyyyyyyyyyyyyyyy22y22222222222222222222222222222222222w2ww22ww2wwwwwwwwwwwwwwwxDEMR6rw8rMyyyyyyyyyyyyyyyyyyyyyyyyyyyyy2y2y2yy22222222222222222222222222222222ww22wwwwwwwwwwwwwwwwwwwxDEMQ+s8rwssssssssssssssssssssssssssssssssttttstttttttttttttttttttttttttttttttsMNsMMNtsMMMMMMMMMMMMMMMMQxDEPsMyyyyyyyyyyyyyyyyyyyyyyyyyyy2yyy22y2222222222222222222222222222222222222www222wxDDDDDDDDDDDEMQxDEMR6byzLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLbLbbbbbbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbbDDDDDDDDDDDDEMMMMMQxDEMR6jwzLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDDDDDDDDDDDDDDEMQwwxDEMMRHrLMssssssssssssssssssssssssssssssssstttttttttttttttttttttttttttttttvG2228bbbbbbDbbbDDEMMMMQwwwwxDEREMei8szLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbDbbbxttsMMMMMMQ8EMMQwxDDERERHpMzMyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy2y2y222222222222222228bxttttvG2228bxtsNttsMMMMMMMQwwwwwxDEQxERERHoPLMyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy22222y22222222222222222229Nt43jbbeN4223geB4GGGGGGGIhiIYhiIiIiPO8MzMsssssssssssssssssssssssssssssstttstttttttttttttttttttttttttttvO2228bDbbxtvIww8DDDEMMRDERERDERERHnZ4Zllllllllllllllllllllllllllllllltlttttttttttttttttttttttttttt4223jbeN43jedt6jwMMMRDEQxEQxERERER5nhmZlllllllllllllllllllllllllllllltltltttltttttttttttttttt52223nbeNt43jeN53qPAxDDEQxDDEREREREREW28b5GZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZbbbbbbZbbbbbbbbbbbbbbbbbeNttttt53neN43jed6jEMMMREMQxEQxERERERHTLLLLLLLLOjMyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy22222222222222228bbbxvfbbedt43jeN43qdCOCIhiIiIiIhiIiIiLen54yyyyzoyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy22y22222222222222229Ntt7bbztvG8bxvA9SIeDgiIhiIhiIiIiIiIiPI8rMsssssssssssssssssssssssssssssssssttttttttttttttttvG+Pbedt43jeN7HUiIiGIiIiIiIiIiIiPMzMzLLLLLLLLLLLLLLLLLLLLLLLLLLLLbbbbbbbbbbbbbbbxtvTbbbbbbbed67zvG8b4CIiIjgiGIiIiIiIiIiI5yyzrvRmZlllllllllllLLLLLLLLLLLLLLLLLLLbbbLbbbbbbbbbbbb122223ttvO875TgjgiIiIiGIiIiIiIiI6ZZZZZZyzMzLLLLLLLLLKWWWWWWWWWWWWWWWWWWW2W2WW22W223jedtt6bbbbxvXbem8bHG+AjqcERERERDERERERERHieGZmWWWWUspZSlLLLLLLLLLLLLLLLLLLLLLLLbbbbxvG28bbb13ne229N53yERHBERERERERERERERER1/F+L8X46MyyyyyyyylLKWWUssssssssssssssssssttttsttttvG87b6e87ycHY7EcEREREREREREREREdcs6szLLLLLKUpSlKWWUpZZZZZZZZZZZZZZZbbbbbeN43jbedt8u29N53yjHUiIiIiIiIiIiIiIiI8LwzMssspSlKUpSlLLLLLLLLLLLLLLLLLLLbLbxvbeu2+hvbfCckRERERERERERERERERERb4WZmWUspSlKUpSlKWWWWWWWWWWWWWWWWW23jbeVt6b223xb23nfGR1OCIiIiIiIiIiIiIiI8DyzMsspSlKUpSlKWWWWWWWWWWWWWWWW22XjZZbem+fbfJviOhEREcEcEREREREREREREdt6MzLLKUpSlKUpSlKWWWWWWWWWWWWWWWW2223pvj2223n835676RwR0IiI4IiIiIiIiIiIiIiyyyyyzlmZllKUpSlKUpSlKWWWWWWWWWWWWWW2W23jeN8G+Pbbbe2+U5OhHQiIiIiIiIiIiIiIiOdtttt4ZmZZSlKUpSlKUssssssssssssststtsvfem+pvnODoREREcEREREREREREREREWWWWdGZlllKUpSlKUpSlKWWWWWWWWWWWWWXjfFviYfBtvTem+I5I7EREREREREREREREREc71ZmWUpSlKUpSlKUpSyyyyyyyyyyy2y9N7vkbed775Tg5ODkjkiOCIiIiIiIiIiIiI8DMy8FKUpSlKUpSlKUsssssssssvwz03yEdCIiIiIiIiIiIiIiIiIiI7szLLKUpSlKUpSlKUssssssssss2/CnoHQjgiIiIiIiIiIiIiIiIiIiyzj8X44ZmWUpSlKUpSlKUpSllllllllltt+JTk5OpyRwdSIiIiIiIiIiIiIiIiO7M8ilKUpSlKUpSlLLLLLLLLL8akcHhI6nJERERERERERERERERHdmXgpSlKUpSlKUpSllllllllnh+K3h8R1OCOSOCIiIiIiIiIiIiIjszPIpSlKUpylKUpSlllllll+POHscnQiIiIiOCIiIiIiIiIiIiIjjbbeGZ5FKU5zlOUpSlKWWWWWWWZ+TPAREcEREREREREREREREREREc5ZwzMuCnOU5znKUpSlLLLLLPR+QeXuRERERERwREREREREREREREdmeC4Kc5znOcpSlKUssssvyh0OCOSI6kRERERERERERERERERFnVngpSnOc5znKUpSllllmeHtnxzwdCI6nBERERERERERERERERER1ZnkU5znOc5ylKUpZZZmfjn1iIiIiIiIiIiIiIiIiIiLOjMy4Kc5znOc5SlKWWWWX5F8DwcfzwkREREREREREREREREREdWegc5znOc5ylKUsss8PXPk2I4I7HBERERERERERERERERERHVmeRznOc5znKUpSyyz4s+ROh2OCIiIiIiIiIiIiIiIiIiOrPBcXOc5znOcpSllmfLnxD3On95OhEREREREREREREREREREdWehc5znOc5ylKZZn/AnYiIiIiIiIiIiIiIiIiIiOrPI5znOc5znKUssz8+eEiIiIiIiIiIiIiIiCIiIi23l6m5znOc5ylKWWfmc7nH/OxERERERERERERBEREREREdGepuc5znOcpSyzPOfAvtHBF/zsREREREREREREREQRERBERbyzPX3Oc5znKUsz3yz5N7l/zqRwRERERERERERERBEREREdGez1Oc5znKUzPiz5gv8AnQiOCIiIiIiIiIiIgiIIiIiI6M9TcpSnOc5SmfLlntPqvYv+RyREREREREREQREERBERBBEREdHucpSlOc5Sz6OfGnJ3IiIiIiIiIiIgiIiIIIiIIgiI4zh7mKUpTnKUs+nnxjFnQ4IiIiIiIiIiIiIiCIIIIIIgggggjo+AwpSnOUp8OeTPizsREREREREREREEREEQRBBEQQQQQRHRnwMFKc+Cn18+KbeM4IiIiIiIiIiIgiIiIgiCCIggggggjnZnuwpSnPgvs56T7GRHJERERERERERERBEEEEEEEEEEEEQRHV7oKUpz4M/4Q6kRERERERBBEQREEEQQQQQRBBBBEdXshcFKcuD0z2M8b7xwckREREREREEEQQQQQQQQQQQQQQQREdXxZx8GbePxZ0z58iIiIiIiIiCCIIgggggiCCIIIIIIIIg6vizj7GWX5tvx8W+mREREREREREREEEEQQQQQQQQQQQQQQREdXybyfBnG9M+BfZIiIiIiIiIIiCIIIIIIIIIIIIIIggiCDq+BeuVT48+JfROhEREREQQRBBEEEEEEEEEEEEEEEEQQRBB1fZX1nT9+i/BnBEREREREERBBBBBBBBBBBBBBBBBBBBBBBHV5R0/939+ms6Z7L7REREREREQQQQQQQQQQQQQQQQQQQQQQQRBEeBEe9r6v7+BfOcHJERERBEEEEEEEEEEEEEEEEEEEEEQQQQRB2YwjDs1+FfWfERwERERERBEEEEEEEEEEEEEEEEEEEEEEQQQRHZjCMIdVfW/foPwBERERERBBBBBBBBBBBBBBBBBBBBBBBBEEERB2YwjCHUX1s+LepwREREQQQQQQQQQQQQQQQQQQQQQQQQQQREEQdxCMIQ6N+UfROCCIiCCIIIIIIIIIIIIIIIIIIIIIIIIIIIIII8AhGEY9G+2+i9HwPlIiIiIIIggghBBBBBBBBBBBBBBBBBBBBBBBBBEd2MYRjDnfZfO++REQQQQQQQQQQQQQQQQQQQQQQQQQQQQQREERHgMYRjGPF+RfTIiIiCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCIjxCHJH9xhxfd/fkfQfEcBERBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBwR4mHB+7gH7hwfefbfERERBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBEEEREeI81+y/ZGM+8fCHBERBBBBBBBBBBCCCEEEEEEEEEEEEEEEEEQREcnhTmv237oRn5J8D4SIiCCCCCCCCCCCEEEEEEEEEEEEEEEEEEEEEEHnPH+2/ffshft7x5XzvhIiIIIIIIIIIIQggggggggggggggggggggiOh5Bwftv237/gK8fvs9X2CIIIIIIIIIQQhCEEEEEEEEEEEEEEEEEEERHB6B+2/Zftv2Q+BfZe5EQQQQQQQQQQQhCCCCCCCCCCCCCCCCCCCCCCIj0Bpx/sv3X7Y4+++V9YIIgggggghBBCEIQhBCCCCCCCCCCCCCCCCI9Pcv3X7791ks/4AgggggggggggghCEIQQQQQQQQQQQQQQQQQcHU840tBv337bFYY++8PsvQiIIIIIIIIIQhCEEEIIQgggggggggggggg4OQ4PR3L9t+78WKxx+AO75Ho9iIgggggggghCEIQhBBBBBBBBBBBBBBBBBBBByeom2o37/AMWG2a/Af3yPpBBBBBBBBBBBCEIQhBBBBBBBBBBBBBBBBBBB7Oxbj+L9n4s1kx994fE+iEEEEEEEEEIQhCEIQggggggggggggggggiD2wDbn4WW258Ae4EEEEEEEEEIQhCEIQQQggggggggggggg4D3E2MN/zSp8B/fbCCCCCCCEEIQgg4BCCCCEEEEEEEEEEEEEEHBB7YDIQ/iQfwnY994fYCCCCCCCCCEOAQ4BwCCCCCCCCCCCCCCCDgOA94kLcQSv+Pf/AJfyfE+UIIIIIIIIQRyAQ6ACCCCCCCCCCCCCCCCCD4FyZKbIyj8V/exf3qEEEEEEEEIQeAAAEEEEEEEEEEEEEEEEHIfA/hb8ww98R6mQQQQQQQQRwCHgAAARBBBBBBBBBBBBwHwzefllhMN97++d6ZwEEEEEEEQ4B4AAAcAIIIIIIIIIIIIIIOc+F/EYwtYjj8Q+EIIIIIIhCHjAAABAgiBBBBBBBBBBBBwcHwiCImjYL98EiKJ7jPpBBBBBEIQ8IAADgHAIQIIIIIIIIIIIIOmfDHHol+QYkRxPcZ8+QQQQQRCEIeMAAAEIEQIIIIIIIIIIIOmfEGkPGKRRPaeHzBBBBEIQhCEPAAADgEIQgQQQQQQQQQQWfHfghsyCNontfyfHkEEEEQhCEIQhwCEOQEIQhCEIEEEEEEEEEHyLxJk4jj+JE9f+X8nxZZBBEIQhCEIQ4B1ABCEIQhCBBBBBBBBBBxnyCCZEP4vysZP4nPW/l/J8GQWQRCEIQhCFKdaiQhwCEIQhCBBBBBBZBB0z5ABjCH8X75iv4mP5ISeq9sssiEIQhCFKUpSnFKQ4BCEIQhCECCCCCCCDjPlQEOvxfu/F+78SH8kP5KSvReHjLLLIhCEIQpSlKUpzU4pSlIQhCEIQgQQQQQWQcZxnyoCN38RO/i/b+L6L6piSVKsfNllnIQhCFKUpSlKUpSlKUpSlIQhCEIEEEEEEFlnzaGF/kTv4v3/i+m+u+m+rhaxc+WAAQpSlKUpSlKUpSlKUpSlKUpCEIQhAgggggg4zjPmkGBvpvovqvqvovrvon6z9Jj44PlKUpSlKUpClKUpSlKUpSlKQhCEIEEEEEEFnOfPE2v8AL6r6b6b67676L6J+s1j4X4QhCEIQhCEIQpSlKUpSlKUhCEIQIIIIILP8Ihjvpvovqvqvqvovpn6z9Zr9OT/x18pSEIQhCEIQhClKUpSlKUhCEIQIIIIIOM5P8EnL/VfXfXfRfTfTP1n6z9Z8QflKQpCEIQhSlKUpSlKQhCECCCCyzjOTg/wjrop9F9HC/Wax+kx8AeUhSEIQhClKUpSlKQhCECCCyyyyzqcH+GepFYxjH6TXwv44CEIQpSlKUpSEIQhCBBBZZznDycfz/EMa1jGta143waBwEKUpSlKUhCEJlkFlllnT+dX/ABqTGtYxj5gA84zmEIcBMssssss8H95fhP/EACIRAQEBAQABBQADAQEAAAAAAAEAERAgMDFAQWEhUHFgUf/aAAgBAwEBPxD+lDgQQQQQQQQQQQQRAiBBEIQhAiECITPEM4zpnogGWWWWWWcZZZZJJJJJJJJJJJJJJJJJJJJJJJxJP6APAIOBBBBBBBBBBBBBBBECIQhCEIEQhwIQmeQM+EAADLLLJmSWWWSSSSSSSSSSSSSSSSSSScT54eAQcCCCCCCCCCCCCCCCCIQhCEIQhCECyIcDyAyyyyyzjLLLLLLOM4yyzjLLJJiSSWSSSSSSSSSSSSSSSSSSf0YQQQQQQQQQQQQQRCECCIQgRCEIQhAiEIQhwz0AGWWWWWWWeIZZZZZMySYlkkkkkkkkkkkkkkkkkkkkkkknzDxCCCCCCCCCCCCCCCCCCIEQIgRCEIQhCEPUAAyzpllnTLLOMsssssssskskskkkkkkkkkkkkkkkkkkkkkk/oAggggggggggggggiBEIQhCEIQgRCEITIh64AAyzzAyyzjOMkmZJJJJJJJJJJJJJJJJJJJJJJJJJJ88IIIIIIIIIIIIIIIgRAiEIQhCEIQhCEIQhwyPQAM9ABllnGWdMsssskkkkkkkkkkkkkkkkkkkkkkkkkkk+cEEEEEEEEEEEEEEQIhCBEIQhAiEIQhCEIQODhniGWWegAzjLLLLLLLLJiWSSSSSSSSSSSSSSSSSSSSSSSSSSSfKOhBBBBBBBBBBBBBBBEIQhCEIEQhCEIQhAiEIQ9AAyyyyyyyyyyyyzjOMsssssskkkkkkkkkkkkkkkkkkkkkkkkkkk+SHCCCCCCCCCCCCCIEEEQIIhCEIQhCEIQhCEIQhCHRllnqAAyzpllllllllkkkkkkkkkkkkkkkkkkkkkkkkkkkknxyDoQWQQQQQQQQQQQQRCEIQhCEIQhCEIQhCEOBCZ4hllniGeQM4yyyyyyyyyyySSSSSSSSSSSSSSSSSSSSSSSSSSST5JEEQQQQQQQQQRCBEIQhCEIQhCEIQhCEIQhCEOGeIZZZZZZ0zjLLLLLLLLLLLJLLJJJJJJJJJJJJJJJJJJJJJJJJJJJJPlBBBBBBBBBBBBECCIQhCEIQhCEIQhCEIQhCEyOGQWWeAyyyyyyyyyyyyyyyyyyyyyySSSSSSSSSSSSSSSSSSSSSSSSSSSST4xwgggggggggggggiEIQhCEIQhCEIQhCEIQhCEJlnQmWcZxllllllllllllllllllkkkklkkkkkkkkkkkkkkkkkkkkkkkkkkknxCDhBEEEEEEEEEEEEEQhCEIQhCEIQhCEIQhAiEyIcMgiZZZZZxnGeIZZZZZZZZZZZJZJZZJJJJJJJJJJJJJJJJJJJJJJJJJJJJ8YggggggggggggggiBEIQhCEIQhCEIQhCEIQhDgQLLOhMsssssssssssssssssssssssskkkskkkkkkkkkkkkkkkkkkkkkkkkkn4hEQRBBBBBBBBBBEIcBCEIQhCEIQhCEIQhCEIcCEITLLLOM4yyyyyyyyyyyyyyyyyyyyyyyySSSSSSSSSSSSSSSSSSSSSSSSSSST4RBwgggggggggghBBEOA4CEIQhCEIQhCEIQhCEIEQmQQWQWWWWWWWcZZZZZZZZZZZZZZZZZJJJZJZJJJJJJJJJJJJJJJJJJJJJJJJMnwyIIgggggghCEEHQOA4CEOAhCEIQhCEIQhAiECCCCyzjILLLLLLLLLLLLLLLLLLLLLLLJLLJJLLJJJJJJJJJJJJJJJJJJJJJJJJJJPhHCIIIIIIQQhDzAAOgIQhCEIQhCEIQhCECIQLLLLLLLLOMsssssssssssssssssskskskskkkkkkkkkkkkkkkkkkkkkkkkkkkmfghwggggggghCHAeIAeQACEIQhCEIQhCECIQhCZZZZZZZZZZZZZZZZZZZZZZZZZZJZZZZJZJZJJJJJJJJJJJJJJJJJJJJMkkySSSSfCIIIIIIQQhDgPTAAACEIQhCEIQhCEIQImWWcEyyyyyyyyyyyyyyyyyyyyyyyyyyySyyySSSSSSSSSSSSSSSSSSSSSSSSSSSSSSfXIIiIIIIIQhCHAeiAABCEIQhCEIQhCEIQgQRAsssgssssssssssssssssssss5llklllllnEkkkkkkkkkkkkkkkkmSSSSZJJkmSfgkRBBBCEIQh6gAAAEIQhCEIQhCEIEEQgQQWWWWWWWWWWWWWWWWWWWWWWWWWWWcySyyySTiSSSSSSSSSSSSSSSSSSSSSSSTJJJ646RBBBCEIQhD0wAAAhCEIQhCEIQhAiBBECyyyyCyyyyyyyyyzmcyyyyyzmWWWWWWWWSSSSWSSSSSSSSSSSSSSSSSSSSSTJJMzPrHCIiCEIQhCHrAAAABCEIQhCEIQhAggggssssssssssssssssssssssss5llllllknMskkkkmSSSSSSSSSZJJJJJJJkk4SYTJ5bbbbbbbwiIghCEIQhCEIeoAAABCEIQhCBECIEFkTLLILLLLLLLLLLLLLLLLLLLLLLLOZzJLLLLLJLJJJJJkkkkkkkkmSZJmSZk4eGZk9U4REEIQhCEIQ4D0wAAAhCEIQhCEIQIgWQQWQWWWWWWWWWWcyyyzmWWWcyyyyyyyyyySSSTqSSSSSSSSSTJJMySTJMkzMOHhttt9EekRwIQhCEIQ6A9EAACEIQhCECIEEQIILILILLLLLLLLLLLOZzOZZZZZ3LOZZJZZxOJJJJxJJJkmSSSSZJkkkmZhMz0em22222222229IiEIQhCEIQhCEPEAHQOAhCBECIEEEEEEEEEFllllllllllllllllnMssss5llllnMsk5lkySScZJJJmSSZmZmSZkmZnh6M922222223hEcHQQhCEIQhCHiADxACBEIEEEEEEEEEEEFllllllllllllllllllllllllnMs5lnM4lnE4kyScZJkmSZmZmZmZmeHhnhnu22222229I6DgQhCEIwhDgIcBwEIQQQQQQQQQQQQQQQQQWWWWWWWWWWeplnMsss5nMs8Ms6ySSTJMkzMzMzJM8Mzwz5g222222223hEeICEIQjCEIQhCEIdAQQQQQQQQQQQQQQQWWWWWWdyyyyyyyyyyyzwyzuWWWWcyzucSTrMkzJMzMzMzMzMzwzPgHjbbbbbfEiI6DgQjGMYxjCEIQhCEIQRAgggggggggggggsssssssssss5nhnMsssss7nc5lnXwSZkmZmSZmZkmZmZmeGZnwDxtttttttvSPEBCMYxjGMYxhCHAQhCEIIIIIIIIIIIIIIIOZZ3OZZZZ6OWdzuczwz0GZkmZkmZmZmZmZmeGfAM9Ntt7viRHgDCMYxjGMYRhCEIQhCEIIIIIIIIIILLILLIOZzOZ4ZZZZZZZ4Z3O5zPDOPkyTxmZmZmZmSZmZmZnhmeGfDbbbbeEeQDyYxjGMYxhCEIQhCEEEEEEEEEEEEEEHSDmczueOWeWWWczuczzTr1mZmZmZmZmZmZ6Mzw8PRtttt5vN4R5BMYxjGMYxjCEIQhCEIIIIIIIIIIIPI9DLLPRyzwzmeqzMz1mZmZmZmZmeGZnh4eHjbbbbbbbYY8gGMYxjGMYxjGEIQhCEIIIIIIIgggjwI9TLLLLLPPO5zOZ5MzPHjMzMzMzMzMzMzwzPRmem2222222xHmOYxjGMYxjCEIQhCEIQQQQQQRERER5HM+BnwWeMzMzMzMzMzMzMzPD4gzfbpttttttsMR5jmMYxjGMYxjCEIQhCCCCCIIiPE8D0TxO5Z4Z6z1njMzMzMzMzM8Mz0fAMzfbpttttttsMPoDzGMYxjGMYxhCEIQhBBBERHDh4HTwPg5556TMzJMzMzMzMzMzMzw+IMz4DbbbbbbYY8hnkxjGMYxjGEYQhCEIIIIiIiIj0ju9O73PRzuegzPgzPWZmZmZmZmZnh8gM8PG22222wwx6B8xjGMYxjGMIQhCEEERERHwN9A+I+TM8Z4zMzMzMzwzPR8gM+A222222GH0T8xjGMYxjGMIQhwEQREREeB4D47wt4c3u/EeMzxnrMkzPGZmZmeGZnhnyA8PG22222wx6J+YxjGMYxjCEIQhEREcIiPHfAeb5b5b8F9NmZmZmZmZmZ4ZmejPiD4DbbbbYYZei/iMYxjGMYwhCHBERER0t5vBt5vgPN8Nt4fJZmZmZ48ZmZmZnhmZmejwz0Z6bbbbbDDLyeeBCEYxjGMYwhCERERERzbbebbbzbeb0YfHfgHpPizxmZmZmZmZmeGZ4eHh8gPG2222ww+i+CEIRjGMYwhCHBEREWw8222223u8G3u8Hw3hb6x5vgzM9ZmZmZmZmZmeGfAM+YDxtttsMMvROBCEIRjGMYQhwRERFttttttttsNtvd5vN8B+S+DMzMzxmZmZnhmZmeGfID6ADbbbYYZeg4EIQhCMYxhDoRERbDbbbbbbbbzeDbb3eD4j8Z8Hj4szMzMzMzMzMzM8M+IPmBttttsMvQYCEIQjGMYx6EREQ2222222222w93gw2+A229H5D4vWZmZmZmZmejPgH1QANttthhl6HAQhCEYxjHwBERbbbbbbbbbbbbbDbb3YYebbwe7wenoHovg8ZmZmZmZmZmZmZmfggABtttsMvNgciEIQhGMfCERDzbbbbbbbbbYbbbeDbb0YejwfEfWPQevGZmZmZmZmZmeGZn1wADbbbYZeiymEIQjGMfAEQ22222222222222w2222ww83gw+A+I+ocPF4+TM8ZmZmZmZnhmfgAADbbbYZejjmMIQjGPhCI5tttttttttttttttsNtttsPB4MPdht8B9A8D0nrMzxmZmZmZmZnwD4BeAfIG222wy9DOYxhCEYx8ARbbbbbbbbbbbbbbDbzbbYfAYebbbw6PgPiPT1XrxnjMzMzMzwz0fRAF0fAbbbbDLxn68mMYxhCMY9CIbbbbbbbbbbYbbbYbbbebbDD3YbejDHR8B8TxO75M8Z4zxmZmZmZn1AAKUuFwum222wyn5nmMYQhHwhHNttttthtttttthttttht5tsMPgPgMPgPgPgRHieb1mZnjMzMzMz0fEF5AXClKXTbbYZcvr9fDmMYQj44RbbbbbbbbbbbbbbbDDD4DDDwYfAYejD4D4EdOEcPQes8ZmZmZmZmZ9AApS4UvIClbbbDLz3+l9IRjCEY9iLbbbbbbbbbbbbbbbbbYYYYbbYebbD4D4DD4DERw9M8HrPGZmZmZmZmZ9EAXRSlKUpSttthlPxv6Q9r6QjGEI+ELbbbbbebbbbbbzbYYebbbDb0YeDDDbEMPRh4R4D04R4noM9ZmZmZmZ8A9F5AXClKUpS4222GU/E/pfS+kIxhDwxFttvNttttttthttththh6MMMPBhh4MPRh6PgPgPmcPE8GZmZmZmZ4ZnhcPRSlLhSlKUpSlK222GU/Jg9oQjGEPCEPNt7vNttt5ttttvBth5tsMPNhh6MPR8BiOD4ER6B4bxmZmZmZmZn0ACl6KUpSlKUpSlK3oy87B7QhH2jCMeDw223u83m22222ww29GGHow9GGGGHow9PAYiPAjhw82ZmZmZmZmZ4fAKUpSlKUpSlKUpSlzbYZT8U+l9Ie0PaMYR7Ftvd7tvN5vNtt5vBh7sPB4MMMMPBhhiIYiIengPpHizMzMzMzMzPReilKUpSlKUpSlKUpW22wy4fH0vpx9YQj7RhHghtt7tvN5sNvR5tttttsPN4MPNhh4MMPBhjgxwYiIfEiIjp6DMzMzMz0ZlKUpS4UpSlKUpSlKUsrejKU+Ppz9b6w9oe0Yw7Fvdttt5tvN5tviMMNvBh6MPBhh4MdIh4PSOkRHkekzMzMzMzMp4UpSlKUpSlKUpSlKUsrejKXhPrfXk+0IRjyc3w3u2283m82Hu8GHow8GGHow9Hgw8Ijow8PAiIiI8XjxmZnhmeGZeAUpSlKUpSlKUpSlKUu7DOU/B/W+sfaHtGMeDx23u923m83g+Iw82GHow8IYiIYiGIhiIY6MRHqszMzMzM8PRSlKUpSlKUpSlKUpSlKXuwz6/S+t9b631j7QhDseG2+G93m283wHu8G23g9GGIhiIYYiGIjpwjwIiI4cPBmZmZmZnoplKUpSlKUpSlKUpSlKUpeByp315+t9L6R9oe0Ydt7tvhvd7vNh5vR4PR8B8BiIYiGIhiI4RDEQxEeJ5PWZmZnopSlKUpSlKUpSlKUpSlKUsstvTlX14+t9L6X0j7Q9ow5PDbe74b3ebwfEh4PBh6PRh4MQ8HhDERHCOHgREdOHHjMzMs9FKUpSlKUpSlKUpSlKUpSylKXm83hSvrfTp9I+0YQ4PQ3u93y2HxHg8GHo9GHgwxEMRDEREQxEMRHSIjyZmZmZZ6KUpSlKUpSlKUpSlKUpSyyy+RS9ufpfS+l9Ie0faMOt9Leb3ebzeDzej0YYeEPRhiGGIYiOEMRERHT0njMzMy8ApSlKUpSlKUpSlKUpSlKUssvkUp+19L6X0vpfSMY+bfQ3m+gPiPgMcIYiGIYYhiIhiIYiIiIiIiI8HwZmZ6LhSlKUpSlKUpSlKUpSlKUsssviSlP2l7X1vrfWHtH2jyejvnvN5vkPgPgMRDERHCGIiIYiIiOEcI8CPJmZnheFKUpSlKUpSlKUpSlKUpSlllll8Scp+0vaftfW+t9I+0fW764+A+A9GIiGIYiGIhiIiIiI6RHDxZmZllwpSlKUpSlKUpSlKUpSlKUsssssvnc/aXtP2vpfXg/B98d894PgPSGIhiIYiIiIiIiIjhEREREeTMzPClKUpSlKUpSlKUpSlKUpSllllll8nOftP2l7S9r68/X5NvmeAxEMRDDEQxDEREQxERERHCOnmzMsylKUpSlKUpSlKUpSlKUpSlKWWWWXzOftP2l7S9r6X1vr/QRwiPAjhwhiIYiIiIiIiOHTw23qyyyyylKUpSlKUpSlKUpSlKUpSlLLLLLLL5Ep+17UvaftP2vrfT5UeZwiHwHhDEMRERERERERERERER4szLLKUpSlKUpSlKUpSlKUpSlKUpZZZZZfNT9r2r2J+0/aXtfT5kcPAfAYiGIiIiIiIiIiIiIiIiIiLfBlllllKUpSlKUpSlKUpSlKUpSlLLLLLLLL5uV7V7V7EvaXtfXk9vlnkPgREREREMRERERERERERHmzLLLKUpSlKUpSlKUpSlKUpSlKWWWWWWWX0SvYvavY4H7X15PmHSIiIhiIiIiIiIiIiIiIjhEcI8GWWWWUspSlKUpSlKUpSlKUpSlKUsssssssy+iexe3eze1L2l7Xsj5x0jwOEREREREREREREREREd3iyyyyyylKUpSlKUpSlKUpSlKUpSyyyyyyyzPoO9q9nqntS9uD2+eeBEREREREREMRERERERERER4LLLLLKUpSlKUpSlKUpSlKUpSlKWWWWWWWWfRL2L2fBLe1P2vZ80jpEdI4RERERERERERERERw8FllllllKUpSlKUpSlKUpSlKUpSlllllllmWZ9K9vwCXsS0L2f0B4EREMRERERERERERERER4bxZZZZZSlKUpSlKUpSlKUpcFKUpZZZZZZZln03jezexwe1e3P+C9vyzzIjwIiIiIiIiIiIiIiIiO7bMsssspSlKUpSlLgpSlKUpSlKUsssssssy9fSxS9rwW38Rez55EeBEQxERERERERERERERHhsyyyyyylKUpSlwXBSlLgpSlKUpZZZZZZZZfWybBL2eoahP8Aj+jIjhERERERERERERERERHdlllllKUpS4LoKXQUuClKUpSlLLLLLLLL8DNL2+yaEf8AB806RHgRwiIiIiIiIiIiIiI8NllllllKUpcF6AAAuClKUpSyllllllllmeLPqYNml7P88280D+kIjhEREREREREREREREd2WWWWWWXwQAAAABSlKUssssssyyzxfXwSzf5cmxNwj2+adIiIjpEREREREREREREeGyyyyyyyl64AAAALgpSlLLKWWWZZZ4vwNlml/P/K/9lqRaP6E8SIiIiIiIiIiIiIiO7bbLLLLLwXwQAAAABSlLLLLLLLLL8XUWb/K/wDTaH8rYf0ZERERERERERERERERFttsssssxi+EAAAAAC4KUssssssss/FHG2F/6rT3/wBFgiIiOEREREREcERERHdttlllmMfhgAAIAAFKWWWWWWWWWfjuVm/yv/Xe6J6P6E8CI4REREcERERERHNtllmMY/EAAAAAAClKWWWWWWX5TlYtEP5wn848iIiIiIiIiIiIjgi2222WWYx+MAAAAAAAUsssssssvyhRJP53CP8Alf0JERERERERERERERwc222WYxjH4gAAAAAAUssssssssvzHJJjwjQIP6AiIiOEREREREREREW22yzGMY/FAAgAAAAssssssssvzhKNhWkf/AI/oTwOERERERERERDbbbLMYxj8UAAgAAACyyyyyyyy/0D9sKpSW+5806eJEREREREREQ2222zGMYx+IUQEAAAFllllllll/ovqNsxyufNOnThHCIiIiIiIbbbeGMYxr8MKqqgAA8DFllllll/pH9/yIH64b884REREREREREQ222zGMY8LX4dVVVAABiyyyyyyy83+k/mruCxHA6PziIiIiIiIiIiItt6MY1rX4tVVVVAAGLLLLLLLx/pQCIjoxflrQAR0fmkRERERERERHNt6MY1rWvw6qqqiADGLMWWWXq/07Ul6Jfxv4EAEdH5hEREREREREQ2+AY1rWtfCq+vVVVABjGLLLLLLxf6lFob/MLdchyaPyTpERERERERbb4BrWta15WtfVqqqgMYxiyyyyy8f6z+W4bzAjEPkHSIiIiIiIbfANa1rWta8ryteV8aq1r0DGMYsssssv9cKMQLLGtNQBo/GOERERERFttvRrWta1rWNeVrWta1rWtaxjGMYxZZZZf7FGJFF2N0CAj+YR+IcIiIiIht8Ra1rWMYxjGMYxjWta1rWsYxjGMWWWW3+zUEZTgIiDT+b7GEfhHSIiLbfI7WMYxjGMYxjGMa1rWta1rGMYxiyyyy/2qAjIkQjaScgA/mJ+4DaeucI5tvoHmMYxjGMYxjGMYxjWta1rWMYxiyyyy83+2dk7P5nI9ibZBchv3A5/ML9wGxaenttvoHGMYxrWta1rWtYxjGMa1rWtaxjGMYssts83+3dyI/mUyezPZmuT9bfP5v3v1v1gQYmPX/wmta1rWta1rWtaxjGMYxrWta1jGMZtttvX+6FHR/Mhn83sz257M9qfvez/ADftfpfrH6iH7v8AfH+vUMAxjGMYxrWta1jWMYxjWta1rHwDbbbbf740njmfzIZ/N7M9v+b9b979L979r9b9I/Ufu/3f6v8AXH+7/d/vn/d/u/34g/qYxjGta1rWsYxjGta18cbbbbbbzf8AgGjH3frfrfpfpftfrfvftfpfrH7j9R+o/d/u/wBdP9X+uf8AfL++/wDro/qeDzfDnwB73zwbbzf+FFJic+7979r9r9L9L9r9r9b9Y/cfqP1H6v8Ad/u/3f6v9X+r/d/vn/fysPw+G22/8UpMX6X636363737373636R+o/UfqP3f7j9x+r/V/rj/AHz/AL7f6+KPD4bbbb0j/iVO3+17d+9+1+t+l+l+kfuP3H7j9R+o/UfqP3f7v98f6+KHB4bbb0iIjp/w+5HKl+t+l+l+l+kT9I/UfqP1H7j9xSn7j9cHwj4eNhhhhiOERERw/wCKIUpyHCQpSkIfqIQhSlORwIU5nMhCEGGGGIiIiI6R/R//2Q==" />
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/apps/website/public/images/demos/community-workflows-og.png b/apps/website/public/images/demos/community-workflows-og.png
new file mode 100644
index 0000000000..7e46105c88
Binary files /dev/null and b/apps/website/public/images/demos/community-workflows-og.png differ
diff --git a/apps/website/public/images/demos/community-workflows-thumb.webp b/apps/website/public/images/demos/community-workflows-thumb.webp
new file mode 100644
index 0000000000..0e2427c14c
Binary files /dev/null and b/apps/website/public/images/demos/community-workflows-thumb.webp differ
diff --git a/apps/website/public/images/demos/image-to-video-og.png b/apps/website/public/images/demos/image-to-video-og.png
new file mode 100644
index 0000000000..144ca94c41
Binary files /dev/null and b/apps/website/public/images/demos/image-to-video-og.png differ
diff --git a/apps/website/public/images/demos/image-to-video-thumb.webp b/apps/website/public/images/demos/image-to-video-thumb.webp
new file mode 100644
index 0000000000..24119e7b64
Binary files /dev/null and b/apps/website/public/images/demos/image-to-video-thumb.webp differ
diff --git a/apps/website/public/images/demos/workflow-templates-og.png b/apps/website/public/images/demos/workflow-templates-og.png
new file mode 100644
index 0000000000..f13a49c448
Binary files /dev/null and b/apps/website/public/images/demos/workflow-templates-og.png differ
diff --git a/apps/website/public/images/demos/workflow-templates-thumb.webp b/apps/website/public/images/demos/workflow-templates-thumb.webp
new file mode 100644
index 0000000000..7c2e78ab4a
Binary files /dev/null and b/apps/website/public/images/demos/workflow-templates-thumb.webp differ
diff --git a/apps/website/public/robots.txt b/apps/website/public/robots.txt
index 5e6114b55e..da06a725ac 100644
--- a/apps/website/public/robots.txt
+++ b/apps/website/public/robots.txt
@@ -29,5 +29,30 @@ Allow: /
 Disallow: /_astro/
 Disallow: /_website/
 Disallow: /_vercel/
+Disallow: /payment/
+
+User-agent: GPTBot
+Allow: /
+
+User-agent: OAI-SearchBot
+Allow: /
+
+User-agent: ChatGPT-User
+Allow: /
+
+User-agent: ClaudeBot
+Allow: /
+
+User-agent: Claude-User
+Allow: /
+
+User-agent: Claude-SearchBot
+Allow: /
+
+User-agent: PerplexityBot
+Allow: /
+
+User-agent: Google-Extended
+Allow: /
 
 Sitemap: https://comfy.org/sitemap-index.xml
diff --git a/apps/website/scripts/generate-models.ts b/apps/website/scripts/generate-models.ts
new file mode 100644
index 0000000000..a546f608be
--- /dev/null
+++ b/apps/website/scripts/generate-models.ts
@@ -0,0 +1,396 @@
+import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const WORKFLOW_TEMPLATES_BASE =
+  'https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates'
+
+const TEMPLATES_DIR = fileURLToPath(
+  new URL('../../../../workflow_templates/templates', import.meta.url)
+)
+
+const QUANT_SUFFIXES = [
+  '_fp8_e4m3fn_scaled',
+  '_fp8_e4m3fn',
+  '_fp8_scaled',
+  '_fp4_mixed',
+  '_fp8mixed',
+  '_fp8',
+  '_fp16',
+  '_fp4',
+  '_bf16',
+  '_int8'
+]
+
+interface RawModel {
+  name: string
+  url: string
+  directory: string
+}
+
+interface ModelData {
+  url: string
+  directory: string
+  templates: Set<string>
+  firstTemplate?: string
+}
+
+interface OutputModel {
+  slug: string
+  name: string
+  huggingFaceUrl: string
+  directory: string
+  workflowCount: number
+  displayName: string
+  docsUrl?: string
+  thumbnailUrl?: string
+  canonicalSlug?: string
+}
+
+// Maps api_*.json filename prefix to a canonical display name and slug.
+// Add entries here as new partner integrations land in workflow_templates.
+const API_PROVIDER_MAP: Record<string, { name: string; slug: string }> = {
+  nano: { name: 'Nano Banana', slug: 'nano-banana' },
+  kling: { name: 'Kling AI', slug: 'kling-ai' },
+  kling2: { name: 'Kling AI', slug: 'kling-ai' },
+  meshy: { name: 'Meshy AI', slug: 'meshy-ai' },
+  luma: { name: 'Luma Dream Machine', slug: 'luma-dream-machine' },
+  runway: { name: 'Runway', slug: 'runway' },
+  vidu: { name: 'Vidu', slug: 'vidu' },
+  bfl: { name: 'Flux (API)', slug: 'flux-api' },
+  grok: { name: 'Grok Image', slug: 'grok-image' },
+  stability: { name: 'Stability AI', slug: 'stability-ai' },
+  bytedance: { name: 'Seedance (ByteDance)', slug: 'seedance-bytedance' },
+  bytedace: { name: 'Seedance (ByteDance)', slug: 'seedance-bytedance' },
+  google: { name: 'Gemini Image', slug: 'gemini-image' },
+  hailuo: { name: 'Hailuo MiniMax', slug: 'hailuo-minimax' },
+  ideogram: { name: 'Ideogram', slug: 'ideogram' },
+  pixverse: { name: 'Pixverse', slug: 'pixverse' },
+  rodin: { name: 'Rodin 3D', slug: 'rodin-3d' },
+  magnific: { name: 'Magnific AI', slug: 'magnific-ai' },
+  bria: { name: 'Bria AI', slug: 'bria-ai' },
+  tripo: { name: 'Tripo 3D', slug: 'tripo-3d' },
+  tripo3: { name: 'Tripo 3D', slug: 'tripo-3d' },
+  hunyuan3d: { name: 'Hunyuan 3D', slug: 'hunyuan-3d' },
+  recraft: { name: 'Recraft', slug: 'recraft' },
+  topaz: { name: 'Topaz Labs', slug: 'topaz-labs' },
+  moonvalley: { name: 'Moonvalley', slug: 'moonvalley' },
+  ltxv: { name: 'LTX Video (API)', slug: 'ltxv-api' },
+  openai: { name: 'OpenAI DALL-E', slug: 'openai-dall-e' },
+  wan: { name: 'Wan (API)', slug: 'wan-api' },
+  wan2: { name: 'Wan (API)', slug: 'wan-api' },
+  veo2: { name: 'Veo 2', slug: 'veo-2' },
+  veo3: { name: 'Veo 3', slug: 'veo-3' },
+  flux2: { name: 'Flux 2 (API)', slug: 'flux-2-api' },
+  wavespeed: { name: 'Wavespeed', slug: 'wavespeed' },
+  wavespped: { name: 'Wavespeed', slug: 'wavespeed' }
+}
+
+function stripExt(name: string): string {
+  return name.replace(/\.(safetensors|ckpt|pt|bin)$/, '')
+}
+
+function stripQuant(base: string): string {
+  for (const suffix of QUANT_SUFFIXES) {
+    if (base.endsWith(suffix)) return base.slice(0, -suffix.length)
+  }
+  return base
+}
+
+function makeSlug(name: string): string {
+  const base = stripExt(name)
+  return base
+    .toLowerCase()
+    .replace(/[_.]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '')
+}
+
+function makeDisplayName(name: string): string {
+  const base = stripExt(name)
+  return base
+    .split(/[_-]/)
+    .map((part) => {
+      if (/^(fp\d+|bf\d+|int\d+)$/i.test(part)) return part.toUpperCase()
+      if (/^(e4m3fn|scaled|mixed|fp8mixed)$/i.test(part)) return part
+      if (/^\d+(\.\d+)?[bBkKmM]?$/.test(part)) return part
+      return part.charAt(0).toUpperCase() + part.slice(1)
+    })
+    .join(' ')
+}
+
+function extractModels(
+  obj: unknown,
+  templateName: string,
+  models: Map<string, ModelData>
+): void {
+  if (obj === null || typeof obj !== 'object') return
+
+  if (Array.isArray(obj)) {
+    for (const item of obj) extractModels(item, templateName, models)
+    return
+  }
+
+  const record = obj as Record<string, unknown>
+
+  if (Array.isArray(record['models'])) {
+    for (const m of record['models'] as unknown[]) {
+      if (m === null || typeof m !== 'object' || Array.isArray(m)) continue
+      const model = m as Record<string, unknown>
+      if (typeof model['name'] !== 'string') continue
+
+      const name = model['name']
+      const url = typeof model['url'] === 'string' ? model['url'] : ''
+      const directory =
+        typeof model['directory'] === 'string' ? model['directory'] : ''
+
+      if (!models.has(name)) {
+        models.set(name, {
+          url,
+          directory,
+          templates: new Set(),
+          firstTemplate: templateName
+        })
+      }
+      models.get(name)!.templates.add(templateName)
+    }
+  }
+
+  for (const value of Object.values(record)) {
+    extractModels(value, templateName, models)
+  }
+}
+
+interface ApiModelData {
+  slug: string
+  name: string
+  directory: 'partner_nodes'
+  templateCount: number
+}
+
+function extractApiModels(files: string[]): ApiModelData[] {
+  const counts = new Map<string, number>()
+  for (const file of files) {
+    if (!file.startsWith('api_')) continue
+    const prefix = file.slice(4).split('_')[0]
+    const entry = API_PROVIDER_MAP[prefix]
+    if (!entry) continue
+    counts.set(entry.slug, (counts.get(entry.slug) ?? 0) + 1)
+  }
+  return [...counts.entries()].map(([slug, count]) => {
+    const found = Object.values(API_PROVIDER_MAP).find((e) => e.slug === slug)!
+    return {
+      slug,
+      name: found.name,
+      directory: 'partner_nodes' as const,
+      templateCount: count
+    }
+  })
+}
+
+// Reads all locale index.json files to build a map of
+// raw model filename → tutorialUrl. Index entries name the template file;
+// that file's embedded model objects give the actual filenames.
+function buildTutorialUrlMap(templatesDir: string): Map<string, string> {
+  const map = new Map<string, string>()
+  const indexFiles = readdirSync(templatesDir).filter(
+    (f) =>
+      f.startsWith('index') &&
+      f.endsWith('.json') &&
+      !f.includes('schema') &&
+      !f.includes('logo')
+  )
+  // Collect template-name → tutorialUrl from all locale indexes (first wins)
+  const templateTutorialMap = new Map<string, string>()
+  const sorted = ['index.json', ...indexFiles.filter((f) => f !== 'index.json')]
+  for (const file of sorted) {
+    let data: unknown
+    try {
+      data = JSON.parse(readFileSync(join(templatesDir, file), 'utf8'))
+    } catch {
+      continue
+    }
+    if (!Array.isArray(data)) continue
+    for (const cat of data as unknown[]) {
+      if (typeof cat !== 'object' || cat === null) continue
+      const templates = (cat as Record<string, unknown>)['templates']
+      if (!Array.isArray(templates)) continue
+      for (const t of templates) {
+        if (typeof t !== 'object' || t === null) continue
+        const entry = t as Record<string, unknown>
+        const tutorialUrl =
+          typeof entry['tutorialUrl'] === 'string'
+            ? entry['tutorialUrl']
+            : undefined
+        const templateName =
+          typeof entry['name'] === 'string' ? entry['name'] : undefined
+        if (
+          tutorialUrl &&
+          templateName &&
+          !templateTutorialMap.has(templateName)
+        ) {
+          templateTutorialMap.set(templateName, tutorialUrl)
+        }
+      }
+    }
+  }
+
+  // For each template with a tutorialUrl, open the template file and map
+  // every embedded model filename to that tutorialUrl
+  for (const [templateName, tutorialUrl] of templateTutorialMap) {
+    const filePath = join(templatesDir, `${templateName}.json`)
+    let data: unknown
+    try {
+      data = JSON.parse(readFileSync(filePath, 'utf8'))
+    } catch {
+      continue
+    }
+
+    function extractModelNames(obj: unknown): void {
+      if (obj === null || typeof obj !== 'object') return
+      if (Array.isArray(obj)) {
+        for (const item of obj) extractModelNames(item)
+        return
+      }
+      const record = obj as Record<string, unknown>
+      if (Array.isArray(record['models'])) {
+        for (const m of record['models'] as unknown[]) {
+          if (m === null || typeof m !== 'object' || Array.isArray(m)) continue
+          const model = m as Record<string, unknown>
+          if (typeof model['name'] === 'string' && !map.has(model['name'])) {
+            map.set(model['name'], tutorialUrl)
+          }
+        }
+      }
+      for (const value of Object.values(record)) {
+        extractModelNames(value)
+      }
+    }
+
+    extractModelNames(data)
+  }
+
+  return map
+}
+
+function templateThumbnailUrl(
+  firstTemplate: string | undefined,
+  templatesDir: string
+): string | undefined {
+  if (!firstTemplate) return undefined
+  const base = firstTemplate.replace(/\.json$/, '')
+  const localPath = join(templatesDir, `${base}-1.webp`)
+  if (!existsSync(localPath)) return undefined
+  return `${WORKFLOW_TEMPLATES_BASE}/${encodeURIComponent(base)}-1.webp`
+}
+
+function run(): void {
+  const models = new Map<string, ModelData>()
+
+  const files = readdirSync(TEMPLATES_DIR).filter((f) => f.endsWith('.json'))
+
+  for (const file of files) {
+    const filePath = join(TEMPLATES_DIR, file)
+    try {
+      const raw = readFileSync(filePath, 'utf8')
+      const data: unknown = JSON.parse(raw)
+      extractModels(data, file, models)
+    } catch (error) {
+      throw new Error(
+        `Failed to parse ${file}: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      )
+    }
+  }
+
+  const apiModels = extractApiModels(files)
+  const tutorialUrlMap = buildTutorialUrlMap(TEMPLATES_DIR)
+
+  const sorted = [...models.entries()].sort(
+    ([, a], [, b]) => b.templates.size - a.templates.size
+  )
+
+  // Build quant convergence map
+  const groups = new Map<string, Array<[string, ModelData]>>()
+  for (const [name, data] of sorted) {
+    const base = stripExt(name)
+    const canonicalBase = stripQuant(base)
+    if (!groups.has(canonicalBase)) groups.set(canonicalBase, [])
+    groups.get(canonicalBase)!.push([name, data])
+  }
+
+  const canonicalMap = new Map<string, string | null>()
+  for (const members of groups.values()) {
+    if (members.length > 1) {
+      const membersSorted = [...members].sort(
+        ([, a], [, b]) => b.templates.size - a.templates.size
+      )
+      const canonicalName = membersSorted[0][0]
+      canonicalMap.set(canonicalName, null)
+      for (const [name] of membersSorted.slice(1)) {
+        canonicalMap.set(name, canonicalName)
+      }
+    } else {
+      canonicalMap.set(members[0][0], null)
+    }
+  }
+
+  const output: OutputModel[] = sorted.map(([name, data]) => {
+    const canonicalRaw = canonicalMap.get(name) ?? null
+    const result: OutputModel = {
+      slug: makeSlug(name),
+      name,
+      huggingFaceUrl: data.url,
+      directory: data.directory,
+      workflowCount: data.templates.size,
+      displayName: makeDisplayName(name)
+    }
+    const docsUrl = tutorialUrlMap.get(name)
+    if (docsUrl) result.docsUrl = docsUrl
+    const thumb = templateThumbnailUrl(data.firstTemplate, TEMPLATES_DIR)
+    if (thumb) result.thumbnailUrl = thumb
+    if (canonicalRaw !== null) {
+      result.canonicalSlug = makeSlug(canonicalRaw)
+    }
+    return result
+  })
+
+  const apiOutput: OutputModel[] = apiModels
+    .sort((a, b) => b.templateCount - a.templateCount)
+    .map((m) => ({
+      slug: m.slug,
+      name: m.name,
+      huggingFaceUrl: '',
+      directory: m.directory,
+      workflowCount: m.templateCount,
+      displayName: m.name
+    }))
+
+  const combined = [...apiOutput, ...output]
+
+  const withThumbs = combined.filter((m) => m.thumbnailUrl).length
+  process.stdout.write(
+    `  ${withThumbs}/${combined.length} models have thumbnails\n`
+  )
+
+  const defaultOut = join(
+    fileURLToPath(new URL('.', import.meta.url)),
+    '../src/config/generated-models.json'
+  )
+  const outputArg = process.argv[2] ?? defaultOut
+  const json = JSON.stringify(combined, null, 2) + '\n'
+
+  writeFileSync(outputArg, json, 'utf8')
+  process.stdout.write(
+    `Written ${combined.length} models ` +
+      `(${apiOutput.length} partner, ${output.length} local) to ${outputArg}\n`
+  )
+}
+
+try {
+  run()
+} catch (err) {
+  process.stderr.write(`${err instanceof Error ? err.message : String(err)}\n`)
+  process.exit(1)
+}
diff --git a/apps/website/scripts/refresh-cloud-nodes-snapshot.ts b/apps/website/scripts/refresh-cloud-nodes-snapshot.ts
new file mode 100644
index 0000000000..4817bb2168
--- /dev/null
+++ b/apps/website/scripts/refresh-cloud-nodes-snapshot.ts
@@ -0,0 +1,32 @@
+import { renameSync, writeFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+import { fetchCloudNodesForBuild } from '../src/utils/cloudNodes'
+
+const snapshotPath = fileURLToPath(
+  new URL('../src/data/cloud-nodes.snapshot.json', import.meta.url)
+)
+const tempPath = `${snapshotPath}.tmp`
+
+const outcome = await fetchCloudNodesForBuild()
+
+if (outcome.status !== 'fresh') {
+  const reason = 'reason' in outcome ? outcome.reason : '(none)'
+  console.error(
+    `Snapshot refresh aborted. Outcome: ${outcome.status}; reason: ${reason}`
+  )
+  process.exit(1)
+}
+
+const serialized = JSON.stringify(outcome.snapshot, null, 2) + '\n'
+
+writeFileSync(tempPath, serialized, 'utf8')
+renameSync(tempPath, snapshotPath)
+
+const totalNodes = outcome.snapshot.packs.reduce(
+  (n, pack) => n + pack.nodes.length,
+  0
+)
+process.stdout.write(
+  `Wrote snapshot with ${outcome.snapshot.packs.length} pack(s) and ${totalNodes} node(s) to ${snapshotPath}\n`
+)
diff --git a/apps/website/src/components/careers/RolesSection.vue b/apps/website/src/components/careers/RolesSection.vue
index db6053a3e1..f57a400f02 100644
--- a/apps/website/src/components/careers/RolesSection.vue
+++ b/apps/website/src/components/careers/RolesSection.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { useEventListener, useTemplateRefsList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 import type { Department } from '../../data/roles'
 import type { Locale } from '../../i18n/translations'
 
+import { prefersReducedMotion } from '../../composables/useReducedMotion'
 import { t } from '../../i18n/translations'
+import { scrollTo } from '../../scripts/smoothScroll'
 import CategoryNav from '../common/CategoryNav.vue'
 import SectionLabel from '../common/SectionLabel.vue'
 
@@ -13,24 +16,72 @@ const { locale = 'en', departments = [] } = defineProps<{
   departments?: readonly Department[]
 }>()
 
-const activeCategory = ref('all')
-
 const visibleDepartments = computed(() =>
   departments.filter((d) => d.roles.length > 0)
 )
 
-const categories = computed(() => [
-  { label: 'ALL', value: 'all' },
-  ...visibleDepartments.value.map((d) => ({ label: d.name, value: d.key }))
-])
-
-const filteredDepartments = computed(() =>
-  activeCategory.value === 'all'
-    ? visibleDepartments.value
-    : visibleDepartments.value.filter((d) => d.key === activeCategory.value)
+const categories = computed(() =>
+  visibleDepartments.value.map((d) => ({ label: d.name, value: d.key }))
 )
 
 const hasRoles = computed(() => visibleDepartments.value.length > 0)
+
+const activeCategory = ref('')
+
+const sectionRefs = useTemplateRefsList<HTMLElement>()
+
+let isScrolling = false
+let pendingFrame = 0
+
+const HEADER_OFFSET = -144
+const ACTIVATION_OFFSET = 300
+
+const deptElementId = (key: string) => `careers-dept-${key}`
+
+function pickActiveSection() {
+  pendingFrame = 0
+  if (isScrolling) return
+  const sections = sectionRefs.value as HTMLElement[]
+  if (sections.length === 0) return
+
+  let active = sections[0]
+  for (const el of sections) {
+    if (el.getBoundingClientRect().top - ACTIVATION_OFFSET <= 0) {
+      active = el
+    } else {
+      break
+    }
+  }
+  activeCategory.value = active.id.replace(/^careers-dept-/, '')
+}
+
+function scheduleUpdate() {
+  if (pendingFrame !== 0) return
+  pendingFrame = requestAnimationFrame(pickActiveSection)
+}
+
+onMounted(pickActiveSection)
+useEventListener('scroll', scheduleUpdate, { passive: true })
+useEventListener('resize', scheduleUpdate, { passive: true })
+
+function scrollToDepartment(deptKey: string) {
+  activeCategory.value = deptKey
+  isScrolling = true
+  const el = document.getElementById(deptElementId(deptKey))
+  if (!el) {
+    isScrolling = false
+    return
+  }
+  scrollTo(el, {
+    offset: HEADER_OFFSET,
+    duration: 0.8,
+    immediate: prefersReducedMotion(),
+    onComplete: () => {
+      isScrolling = false
+      pickActiveSection()
+    }
+  })
+}
 </script>
 
 <template>
@@ -48,9 +99,10 @@ const hasRoles = computed(() => visibleDepartments.value.length > 0)
             </h2>
             <CategoryNav
               v-if="hasRoles"
-              v-model="activeCategory"
               :categories="categories"
+              :model-value="activeCategory"
               class="mt-4"
+              @update:model-value="scrollToDepartment"
             />
           </div>
         </div>
@@ -65,9 +117,11 @@ const hasRoles = computed(() => visibleDepartments.value.length > 0)
           </p>
 
           <div
-            v-for="dept in filteredDepartments"
+            v-for="dept in visibleDepartments"
+            :id="deptElementId(dept.key)"
+            :ref="sectionRefs.set"
             :key="dept.key"
-            class="mb-12 last:mb-0"
+            class="mb-12 scroll-mt-24 last:mb-0 md:scroll-mt-36"
           >
             <SectionLabel>
               {{ dept.name }}
@@ -76,7 +130,7 @@ const hasRoles = computed(() => visibleDepartments.value.length > 0)
             <a
               v-for="role in dept.roles"
               :key="role.id"
-              :href="role.applyUrl"
+              :href="role.jobUrl"
               target="_blank"
               rel="noopener noreferrer"
               class="border-primary-warm-gray/20 group flex items-center justify-between border-b py-5"
diff --git a/apps/website/src/components/careers/TeamPhotosSection.vue b/apps/website/src/components/careers/TeamPhotosSection.vue
index a2bd8fa782..afbbf94909 100644
--- a/apps/website/src/components/careers/TeamPhotosSection.vue
+++ b/apps/website/src/components/careers/TeamPhotosSection.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
-
 const photos = [
   {
     src: 'https://media.comfy.org/website/careers/team0.webp',
@@ -17,45 +15,34 @@ const photos = [
   {
     src: 'https://media.comfy.org/website/careers/team3.webp',
     alt: 'Team on a boat'
+  },
+  {
+    src: 'https://media.comfy.org/website/careers/team4.webp',
+    alt: 'Teammates posing at a restaurant'
+  },
+  {
+    src: 'https://media.comfy.org/website/careers/team5.webp',
+    alt: 'Teammates at a social gathering'
+  },
+  {
+    src: 'https://media.comfy.org/website/careers/team6.webp',
+    alt: 'Team sailing at golden hour'
+  },
+  {
+    src: 'https://media.comfy.org/website/careers/team7.webp',
+    alt: 'Team on a sailboat at sunset'
   }
 ]
-
-const loopedPhotos = [...photos, ...photos, ...photos]
-
-const scrollRef = ref<HTMLElement>()
-
-function onScroll() {
-  const el = scrollRef.value
-  if (!el) return
-
-  const third = el.scrollWidth / 3
-  const maxScroll = el.scrollWidth - el.clientWidth
-
-  if (el.scrollLeft >= maxScroll - 1) {
-    el.scrollLeft -= third
-  } else if (el.scrollLeft <= 1) {
-    el.scrollLeft += third
-  }
-}
-
-onMounted(() => {
-  const el = scrollRef.value
-  if (el) {
-    el.scrollLeft = el.scrollWidth / 3
-  }
-})
 </script>
 
 <template>
   <section class="py-12 md:py-24">
     <div
-      ref="scrollRef"
       class="flex gap-4 overflow-x-auto px-6 md:gap-6 md:px-20"
       style="scrollbar-width: none"
-      @scroll="onScroll"
     >
       <div
-        v-for="(photo, i) in loopedPhotos"
+        v-for="(photo, i) in photos"
         :key="i"
         class="aspect-3/4 h-64 shrink-0 md:h-96"
       >
diff --git a/apps/website/src/components/cloud-nodes/HeroSection.vue b/apps/website/src/components/cloud-nodes/HeroSection.vue
new file mode 100644
index 0000000000..84717017c8
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/HeroSection.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+import SectionLabel from '../common/SectionLabel.vue'
+
+const { locale = 'en' } = defineProps<{
+  locale?: Locale
+}>()
+</script>
+
+<template>
+  <section class="px-6 pt-24 pb-14 md:px-20 md:pt-32 md:pb-20">
+    <div class="mx-auto flex w-full max-w-6xl flex-col gap-7">
+      <SectionLabel>
+        {{ t('cloudNodes.hero.label', locale) }}
+      </SectionLabel>
+
+      <h1
+        class="text-primary-comfy-canvas max-w-4xl text-4xl/tight md:text-6xl"
+      >
+        {{ t('cloudNodes.hero.heading', locale) }}
+      </h1>
+
+      <p class="text-primary-warm-gray max-w-3xl text-base/relaxed md:text-lg">
+        {{ t('cloudNodes.hero.body', locale) }}
+      </p>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/cloud-nodes/NodeList.vue b/apps/website/src/components/cloud-nodes/NodeList.vue
new file mode 100644
index 0000000000..2b4653dc60
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/NodeList.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import type { PackNode } from '../../data/cloudNodes'
+import type { Locale } from '../../i18n/translations'
+
+import { useNodesByCategory } from '../../composables/useNodesByCategory'
+import { t } from '../../i18n/translations'
+
+const { locale = 'en', nodes } = defineProps<{
+  locale?: Locale
+  nodes: readonly PackNode[]
+}>()
+
+const { groupedNodes } = useNodesByCategory(() => nodes)
+</script>
+
+<template>
+  <details
+    class="group border-primary-warm-gray/20 rounded-2xl border px-4 py-3"
+  >
+    <summary
+      class="text-primary-comfy-canvas cursor-pointer list-none text-sm font-semibold"
+    >
+      {{ t('cloudNodes.card.nodesHeading', locale) }}
+    </summary>
+
+    <div class="mt-4 flex flex-col gap-5">
+      <div
+        v-for="group in groupedNodes"
+        :key="group.category"
+        class="flex flex-col gap-2"
+      >
+        <h4
+          class="text-primary-warm-gray text-xs font-semibold tracking-widest uppercase"
+        >
+          {{ group.category }}
+        </h4>
+        <ul class="flex flex-col gap-1">
+          <li
+            v-for="node in group.nodes"
+            :key="node.name"
+            class="text-primary-comfy-canvas text-sm/relaxed"
+          >
+            {{ node.displayName }}
+          </li>
+        </ul>
+      </div>
+    </div>
+  </details>
+</template>
diff --git a/apps/website/src/components/cloud-nodes/PackBanner.vue b/apps/website/src/components/cloud-nodes/PackBanner.vue
new file mode 100644
index 0000000000..77c983001a
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/PackBanner.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { useBannerImage } from '../../composables/useBannerImage'
+
+const { bannerUrl, iconUrl, name } = defineProps<{
+  bannerUrl?: string
+  iconUrl?: string
+  name: string
+}>()
+
+const {
+  DEFAULT_BANNER,
+  isImageError,
+  showDefaultBanner,
+  imgSrc,
+  onImageError
+} = useBannerImage({
+  bannerUrl: () => bannerUrl,
+  iconUrl: () => iconUrl
+})
+</script>
+
+<template>
+  <div
+    class="z-0 aspect-7/3 w-full overflow-hidden"
+    data-testid="cloud-node-pack-banner"
+  >
+    <div v-if="showDefaultBanner" class="size-full">
+      <img
+        :src="DEFAULT_BANNER"
+        :alt="`${name} banner`"
+        class="size-full object-cover"
+      />
+    </div>
+    <div v-else class="relative size-full">
+      <div
+        v-if="imgSrc && !isImageError"
+        class="absolute inset-0 bg-cover bg-center bg-no-repeat opacity-30"
+        :style="{ backgroundImage: `url(${imgSrc})`, filter: 'blur(10px)' }"
+      />
+      <img
+        :src="isImageError ? DEFAULT_BANNER : imgSrc"
+        :alt="`${name} banner`"
+        :class="
+          isImageError
+            ? 'relative z-10 size-full object-cover'
+            : 'relative z-10 size-full object-contain'
+        "
+        @error="onImageError"
+      />
+    </div>
+  </div>
+</template>
diff --git a/apps/website/src/components/cloud-nodes/PackCard.vue b/apps/website/src/components/cloud-nodes/PackCard.vue
new file mode 100644
index 0000000000..ecb22168b9
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/PackCard.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import type { Pack } from '../../data/cloudNodes'
+import type { Locale } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+import NodeList from './NodeList.vue'
+import PackBanner from './PackBanner.vue'
+
+const { locale = 'en', pack } = defineProps<{
+  locale?: Locale
+  pack: Pack
+}>()
+
+const detailHref =
+  locale === 'zh-CN'
+    ? `/zh-CN/cloud/supported-nodes/${pack.id}`
+    : `/cloud/supported-nodes/${pack.id}`
+
+function nodeCountLabel(nodeCount: number): string {
+  const key =
+    new Intl.PluralRules(locale).select(nodeCount) === 'one'
+      ? 'cloudNodes.card.nodeCountOne'
+      : 'cloudNodes.card.nodeCountOther'
+  return t(key, locale).replace('{count}', String(nodeCount))
+}
+</script>
+
+<template>
+  <article
+    class="bg-transparency-white-t5 border-primary-warm-gray/20 flex h-full flex-col overflow-hidden rounded-3xl border"
+    data-testid="cloud-node-pack-card"
+  >
+    <PackBanner
+      :banner-url="pack.bannerUrl"
+      :icon-url="pack.iconUrl"
+      :name="pack.displayName"
+    />
+
+    <div class="flex flex-1 flex-col gap-5 p-5 md:p-6">
+      <div class="flex flex-col gap-2">
+        <h3 class="text-primary-comfy-canvas text-2xl/tight font-semibold">
+          <a
+            :href="detailHref"
+            class="hover:text-primary-comfy-yellow"
+            data-testid="cloud-node-pack-card-link"
+          >
+            {{ pack.displayName }}
+          </a>
+        </h3>
+        <p class="text-primary-warm-gray text-sm/relaxed">
+          {{
+            pack.description ||
+            t('cloudNodes.card.unavailableDescription', locale)
+          }}
+        </p>
+      </div>
+
+      <div class="flex flex-wrap items-center gap-3 text-sm">
+        <a
+          v-if="pack.repoUrl"
+          :href="pack.repoUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="text-primary-comfy-yellow hover:text-primary-comfy-yellow/85 font-semibold underline"
+        >
+          {{ t('cloudNodes.card.viewRepo', locale) }}
+        </a>
+        <span v-else class="text-primary-warm-gray">
+          {{ t('cloudNodes.card.viewRepo', locale) }}
+        </span>
+        <span class="text-primary-warm-gray">•</span>
+        <span class="text-primary-comfy-canvas">{{
+          nodeCountLabel(pack.nodes.length)
+        }}</span>
+      </div>
+
+      <NodeList :locale="locale" :nodes="pack.nodes" class="mt-auto" />
+    </div>
+  </article>
+</template>
diff --git a/apps/website/src/components/cloud-nodes/PackDetail.vue b/apps/website/src/components/cloud-nodes/PackDetail.vue
new file mode 100644
index 0000000000..b5cb777963
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/PackDetail.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { Pack } from '../../data/cloudNodes'
+import type { Locale } from '../../i18n/translations'
+
+import {
+  formatLocalizedMediumDate,
+  formatLocalizedNumber
+} from '@comfyorg/shared-frontend-utils/formatUtil'
+
+import { useNodesByCategory } from '../../composables/useNodesByCategory'
+import { t } from '../../i18n/translations'
+import PackBanner from './PackBanner.vue'
+
+const { pack, locale = 'en' } = defineProps<{
+  pack: Pack
+  locale?: Locale
+}>()
+
+const backHref =
+  locale === 'zh-CN' ? '/zh-CN/cloud/supported-nodes' : '/cloud/supported-nodes'
+
+const { groupedNodes } = useNodesByCategory(() => pack.nodes)
+</script>
+
+<template>
+  <article
+    class="px-6 pb-20 md:px-20 md:pb-28"
+    data-testid="cloud-node-pack-detail"
+  >
+    <div class="mx-auto flex w-full max-w-6xl flex-col gap-8">
+      <a
+        :href="backHref"
+        class="text-primary-comfy-yellow hover:text-primary-comfy-yellow/85 w-fit text-sm font-semibold underline"
+      >
+        {{ t('cloudNodes.detail.back', locale) }}
+      </a>
+
+      <div
+        class="bg-transparency-white-t5 border-primary-warm-gray/20 overflow-hidden rounded-3xl border"
+      >
+        <PackBanner
+          :banner-url="pack.bannerUrl"
+          :icon-url="pack.iconUrl"
+          :name="pack.displayName"
+        />
+
+        <div class="flex flex-col gap-7 p-5 md:p-6">
+          <header class="flex flex-col gap-2">
+            <h1
+              class="text-primary-comfy-canvas text-3xl/tight font-semibold md:text-4xl"
+            >
+              {{ pack.displayName }}
+            </h1>
+            <p
+              class="text-primary-warm-gray text-sm/relaxed md:text-base/relaxed"
+            >
+              {{
+                pack.description ||
+                t('cloudNodes.card.unavailableDescription', locale)
+              }}
+            </p>
+          </header>
+
+          <dl class="grid grid-cols-1 gap-4 text-sm md:grid-cols-2">
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.card.viewRepo', locale) }}
+              </dt>
+              <dd>
+                <a
+                  v-if="pack.repoUrl"
+                  :href="pack.repoUrl"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  class="text-primary-comfy-yellow hover:text-primary-comfy-yellow/85 font-semibold underline"
+                >
+                  {{ pack.repoUrl }}
+                </a>
+                <span v-else class="text-primary-comfy-canvas">—</span>
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.publisher', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ pack.publisher?.name || pack.publisher?.id || '—' }}
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.downloads', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ formatLocalizedNumber(pack.downloads, locale) }}
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.stars', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ formatLocalizedNumber(pack.githubStars, locale) }}
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.latestVersion', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ pack.latestVersion || '—' }}
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.license', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ pack.license || '—' }}
+              </dd>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <dt class="text-primary-warm-gray">
+                {{ t('cloudNodes.detail.lastUpdated', locale) }}
+              </dt>
+              <dd class="text-primary-comfy-canvas">
+                {{ formatLocalizedMediumDate(pack.lastUpdated, locale) }}
+              </dd>
+            </div>
+          </dl>
+
+          <section class="flex flex-col gap-4">
+            <h2
+              class="text-primary-comfy-canvas text-xl font-semibold md:text-2xl"
+            >
+              {{ t('cloudNodes.detail.nodesHeading', locale) }}
+            </h2>
+
+            <section
+              v-for="group in groupedNodes"
+              :key="group.category"
+              class="border-primary-warm-gray/20 rounded-2xl border p-4"
+            >
+              <h3 class="text-primary-comfy-canvas text-base font-semibold">
+                {{ group.category }}
+              </h3>
+              <ul class="mt-3 flex flex-col gap-3">
+                <li
+                  v-for="node in group.nodes"
+                  :key="node.name"
+                  class="border-primary-warm-gray/20 rounded-xl border p-3"
+                  data-testid="cloud-node-pack-detail-node"
+                >
+                  <div class="flex flex-wrap items-center gap-2">
+                    <span
+                      class="text-primary-comfy-canvas text-sm font-semibold"
+                    >
+                      {{ node.displayName }}
+                    </span>
+                    <span
+                      v-if="node.experimental"
+                      :class="
+                        cn(
+                          'bg-primary-comfy-yellow/20 text-primary-comfy-canvas rounded-full px-2 py-0.5 text-xs font-semibold'
+                        )
+                      "
+                    >
+                      {{ t('cloudNodes.detail.experimental', locale) }}
+                    </span>
+                    <span
+                      v-if="node.deprecated"
+                      :class="
+                        cn(
+                          'text-primary-comfy-canvas rounded-full bg-red-500/15 px-2 py-0.5 text-xs font-semibold'
+                        )
+                      "
+                    >
+                      {{ t('cloudNodes.detail.deprecated', locale) }}
+                    </span>
+                  </div>
+                  <p
+                    v-if="node.description"
+                    class="text-primary-warm-gray mt-2 text-sm/relaxed"
+                  >
+                    {{ node.description }}
+                  </p>
+                </li>
+              </ul>
+            </section>
+          </section>
+        </div>
+      </div>
+    </div>
+  </article>
+</template>
diff --git a/apps/website/src/components/cloud-nodes/PackGridSection.vue b/apps/website/src/components/cloud-nodes/PackGridSection.vue
new file mode 100644
index 0000000000..c8eea1a7db
--- /dev/null
+++ b/apps/website/src/components/cloud-nodes/PackGridSection.vue
@@ -0,0 +1,113 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { Pack } from '../../data/cloudNodes'
+import type { Locale } from '../../i18n/translations'
+
+import { useFilteredPacks } from '../../composables/useFilteredPacks'
+import type { PackSortMode } from '../../composables/useFilteredPacks'
+import { t } from '../../i18n/translations'
+import SectionLabel from '../common/SectionLabel.vue'
+import PackCard from './PackCard.vue'
+
+const { locale = 'en', packs } = defineProps<{
+  locale?: Locale
+  packs: readonly Pack[]
+}>()
+
+const query = defineModel<string>('query', { default: '' })
+const sortMode = ref<PackSortMode>('downloads')
+
+const { filteredPacks } = useFilteredPacks({
+  packs: () => packs,
+  query,
+  sortMode
+})
+</script>
+
+<template>
+  <section class="px-6 pb-20 md:px-20 md:pb-32">
+    <div class="mx-auto flex w-full max-w-6xl flex-col gap-8">
+      <div class="flex flex-col gap-3">
+        <SectionLabel>
+          {{ t('cloudNodes.hero.label', locale) }}
+        </SectionLabel>
+        <h2
+          class="text-primary-comfy-canvas text-3xl/tight font-medium md:text-4xl"
+        >
+          {{ t('cloudNodes.section.heading', locale) }}
+        </h2>
+      </div>
+
+      <div
+        class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between"
+      >
+        <label for="cloud-nodes-search" class="sr-only">
+          {{ t('cloudNodes.search.label', locale) }}
+        </label>
+        <input
+          id="cloud-nodes-search"
+          v-model="query"
+          :placeholder="t('cloudNodes.search.placeholder', locale)"
+          :class="
+            cn(
+              'bg-transparency-white-t5 border-primary-warm-gray/30 text-primary-comfy-canvas placeholder:text-primary-warm-gray/80 w-full rounded-2xl border px-4 py-3 text-sm md:max-w-md'
+            )
+          "
+          data-testid="cloud-nodes-search"
+        />
+
+        <label for="cloud-nodes-sort" class="sr-only">
+          {{ t('cloudNodes.sort.label', locale) }}
+        </label>
+        <select
+          id="cloud-nodes-sort"
+          v-model="sortMode"
+          class="bg-transparency-white-t5 border-primary-warm-gray/30 text-primary-comfy-canvas w-full appearance-none rounded-2xl border bg-size-[0.65rem_0.65rem] bg-position-[right_1rem_center] bg-no-repeat py-3 pr-12 pl-4 text-sm md:w-64"
+          :style="{
+            backgroundImage:
+              'url(\'data:image/svg+xml;utf8,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 12 12%22 fill=%22%23a39b8d%22><path d=%22M6 9.2L1.4 4.6 2.8 3.2 6 6.4l3.2-3.2 1.4 1.4z%22/></svg>\')'
+          }"
+        >
+          <option value="downloads">
+            {{ t('cloudNodes.sort.downloads', locale) }}
+          </option>
+          <option value="mostNodes">
+            {{ t('cloudNodes.sort.mostNodes', locale) }}
+          </option>
+          <option value="az">{{ t('cloudNodes.sort.az', locale) }}</option>
+          <option value="recentlyUpdated">
+            {{ t('cloudNodes.sort.recentlyUpdated', locale) }}
+          </option>
+        </select>
+      </div>
+
+      <p
+        v-if="filteredPacks.length === 0"
+        class="text-primary-warm-gray rounded-2xl border border-dashed border-current/30 px-5 py-6 text-sm"
+      >
+        <span class="text-primary-comfy-canvas block text-base font-semibold">
+          {{ t('cloudNodes.empty.heading', locale) }}
+        </span>
+        <span class="mt-2 block">{{ t('cloudNodes.empty.body', locale) }}</span>
+      </p>
+
+      <div
+        v-else
+        class="grid grid-cols-1 gap-5 md:grid-cols-2"
+        role="list"
+        :aria-label="t('cloudNodes.list.ariaLabel', locale)"
+      >
+        <PackCard
+          v-for="pack in filteredPacks"
+          :key="pack.id"
+          :pack="pack"
+          :locale="locale"
+          role="listitem"
+        />
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/common/ContentSection.vue b/apps/website/src/components/common/ContentSection.vue
index d79485cac6..a45794b915 100644
--- a/apps/website/src/components/common/ContentSection.vue
+++ b/apps/website/src/components/common/ContentSection.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
-import { useIntersectionObserver, useTemplateRefsList } from '@vueuse/core'
-import { computed, ref } from 'vue'
+import {
+  useEventListener,
+  useIntersectionObserver,
+  useTemplateRefsList
+} from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 import type { Locale, TranslationKey } from '../../i18n/translations'
 
@@ -40,13 +44,25 @@ const activeSection = ref(sections[0]?.id ?? '')
 
 const sectionRefs = useTemplateRefsList<HTMLElement>()
 let isScrolling = false
+let scrollSafetyTimer: ReturnType<typeof setTimeout> | undefined
 
 const HEADER_OFFSET = -144
+const BOTTOM_THRESHOLD_PX = 4
+const SCROLL_SAFETY_MS = 1500
+
+function clearScrollLock() {
+  isScrolling = false
+  if (scrollSafetyTimer !== undefined) {
+    clearTimeout(scrollSafetyTimer)
+    scrollSafetyTimer = undefined
+  }
+}
 
 useIntersectionObserver(
   sectionRefs,
   (entries) => {
     if (isScrolling) return
+    if (isAtBottom()) return
     let best: IntersectionObserverEntry | null = null
     for (const entry of entries) {
       if (!entry.isIntersecting) continue
@@ -58,22 +74,39 @@ useIntersectionObserver(
   { rootMargin: '-20% 0px -60% 0px' }
 )
 
+function isAtBottom(): boolean {
+  const scrollBottom = window.scrollY + window.innerHeight
+  return (
+    scrollBottom >= document.documentElement.scrollHeight - BOTTOM_THRESHOLD_PX
+  )
+}
+
+function activateLastIfAtBottom() {
+  if (isScrolling) return
+  if (!isAtBottom()) return
+  const lastId = sections[sections.length - 1]?.id
+  if (lastId) activeSection.value = lastId
+}
+
+onMounted(activateLastIfAtBottom)
+useEventListener('scroll', activateLastIfAtBottom, { passive: true })
+
 function scrollToSection(id: string) {
   activeSection.value = id
+  clearScrollLock()
   isScrolling = true
+  scrollSafetyTimer = setTimeout(clearScrollLock, SCROLL_SAFETY_MS)
   const el = document.getElementById(id)
   if (el) {
     scrollTo(el, {
       offset: HEADER_OFFSET,
       duration: 0.8,
       immediate: prefersReducedMotion(),
-      onComplete: () => {
-        isScrolling = false
-      }
+      onComplete: clearScrollLock
     })
     return
   }
-  isScrolling = false
+  clearScrollLock()
 }
 </script>
 
diff --git a/apps/website/src/components/common/GitHubStarBadge.vue b/apps/website/src/components/common/GitHubStarBadge.vue
index ec13808484..03ae84cd03 100644
--- a/apps/website/src/components/common/GitHubStarBadge.vue
+++ b/apps/website/src/components/common/GitHubStarBadge.vue
@@ -13,7 +13,7 @@ const { stars } = defineProps<{
     target="_blank"
     rel="noopener noreferrer"
     :aria-label="`ComfyUI on GitHub — ${stars} stars`"
-    class="hidden shrink-0 items-center gap-2 lg:flex"
+    class="hidden shrink-0 items-center gap-1 lg:flex"
   >
     <NodeBadge
       :segments="[{ text: stars }]"
@@ -22,7 +22,7 @@ const { stars } = defineProps<{
       size-class="h-5 sm:h-5"
     />
     <span
-      class="bg-primary-comfy-yellow block size-7"
+      class="bg-primary-comfy-yellow block size-6 shrink-0"
       aria-hidden="true"
       style="mask: url('/icons/social/github.svg') center / contain no-repeat"
     />
diff --git a/apps/website/src/components/common/NodeBadge.vue b/apps/website/src/components/common/NodeBadge.vue
index b5c395602c..8a6e9e2857 100644
--- a/apps/website/src/components/common/NodeBadge.vue
+++ b/apps/website/src/components/common/NodeBadge.vue
@@ -26,7 +26,7 @@ const {
     <img
       src="/icons/node-left.svg"
       alt=""
-      class="-mx-px self-stretch"
+      class="-mx-px h-full w-auto self-stretch"
       aria-hidden="true"
     />
 
@@ -38,7 +38,7 @@ const {
         v-if="i > 0"
         src="/icons/node-union.svg"
         alt=""
-        class="-mx-px self-stretch"
+        class="-mx-px h-full w-auto self-stretch"
         aria-hidden="true"
       />
       <span
@@ -72,7 +72,7 @@ const {
     <img
       src="/icons/node-right.svg"
       alt=""
-      class="-mx-px self-stretch"
+      class="-mx-px h-full w-auto self-stretch"
       aria-hidden="true"
     />
   </div>
diff --git a/apps/website/src/components/common/SocialProofBarSection.vue b/apps/website/src/components/common/SocialProofBarSection.vue
index 4cea331a62..e261a18591 100644
--- a/apps/website/src/components/common/SocialProofBarSection.vue
+++ b/apps/website/src/components/common/SocialProofBarSection.vue
@@ -14,23 +14,28 @@ const logos = [
   'Ubisoft'
 ]
 
-const desktopLogos = Array.from({ length: 4 }, () => logos).flat()
-const row1 = logos.slice(0, 6)
-const mobileRow1 = [...row1, ...row1]
-const row2 = logos.slice(6)
-const mobileRow2 = [...row2, ...row2]
+const mobileRow1Logos = logos.slice(0, 6)
+const mobileRow2Logos = logos.slice(6)
 </script>
 
 <template>
   <section class="overflow-hidden py-12">
     <!-- Single row on desktop -->
-    <div class="animate-marquee hidden items-center gap-2 md:flex">
+    <div data-testid="social-proof-desktop" class="hidden w-max gap-2 md:flex">
       <div
-        v-for="(logo, i) in desktopLogos"
-        :key="`${logo}-${i}`"
-        class="flex h-20 w-50 shrink-0 items-center justify-center"
+        v-for="copy in 2"
+        :key="copy"
+        class="animate-marquee flex shrink-0 items-center gap-2"
+        style="--marquee-gap: 0.5rem"
+        :aria-hidden="copy === 2 ? 'true' : undefined"
       >
-        <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+        <div
+          v-for="logo in logos"
+          :key="logo"
+          class="flex h-20 w-50 shrink-0 items-center justify-center"
+        >
+          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+        </div>
       </div>
     </div>
 
@@ -39,22 +44,38 @@ const mobileRow2 = [...row2, ...row2]
       data-testid="social-proof-mobile"
       class="flex flex-col gap-8 md:hidden"
     >
-      <div class="animate-marquee flex items-center gap-8">
+      <div class="flex w-max gap-8">
         <div
-          v-for="(logo, i) in mobileRow1"
-          :key="`${logo}-${i}`"
-          class="flex h-14 w-40 shrink-0 items-center justify-center"
+          v-for="copy in 2"
+          :key="copy"
+          class="animate-marquee flex shrink-0 items-center gap-8"
+          style="--marquee-gap: 2rem"
+          :aria-hidden="copy === 2 ? 'true' : undefined"
         >
-          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          <div
+            v-for="logo in mobileRow1Logos"
+            :key="logo"
+            class="flex h-14 w-40 shrink-0 items-center justify-center"
+          >
+            <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          </div>
         </div>
       </div>
-      <div class="animate-marquee-reverse flex items-center gap-8">
+      <div class="flex w-max gap-8">
         <div
-          v-for="(logo, i) in mobileRow2"
-          :key="`${logo}-${i}`"
-          class="flex h-14 w-40 shrink-0 items-center justify-center"
+          v-for="copy in 2"
+          :key="copy"
+          class="animate-marquee-reverse flex shrink-0 items-center gap-8"
+          style="--marquee-gap: 2rem"
+          :aria-hidden="copy === 2 ? 'true' : undefined"
         >
-          <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          <div
+            v-for="logo in mobileRow2Logos"
+            :key="logo"
+            class="flex h-14 w-40 shrink-0 items-center justify-center"
+          >
+            <img :src="`/icons/clients/${logo}.svg`" :alt="logo" />
+          </div>
         </div>
       </div>
     </div>
diff --git a/apps/website/src/components/customers/FeedbackSection.vue b/apps/website/src/components/customers/FeedbackSection.vue
index 452aacd528..0039847150 100644
--- a/apps/website/src/components/customers/FeedbackSection.vue
+++ b/apps/website/src/components/customers/FeedbackSection.vue
@@ -75,7 +75,7 @@ const progressPercent = computed(() => `${progress.value * 100}%`)
       <!-- Progress bar -->
       <div class="h-1 flex-1 rounded-full bg-white/20">
         <div
-          class="bg-primary-comfy-yellow h-full rounded-full transition-all duration-200"
+          class="bg-primary-comfy-yellow h-full rounded-full"
           :style="{ width: progressPercent }"
         />
       </div>
diff --git a/apps/website/src/components/customers/HeroSection.vue b/apps/website/src/components/customers/HeroSection.vue
index c50acdd696..bdd5296a4e 100644
--- a/apps/website/src/components/customers/HeroSection.vue
+++ b/apps/website/src/components/customers/HeroSection.vue
@@ -5,6 +5,7 @@ import { useHeroAnimation } from '../../composables/useHeroAnimation'
 import SectionLabel from '../common/SectionLabel.vue'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'
+import { ScrollTrigger } from '../../scripts/gsapSetup'
 import VideoPlayer from '../common/VideoPlayer.vue'
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
@@ -22,6 +23,10 @@ useHeroAnimation({
   logo: logoRef,
   video: videoRef
 })
+
+function handleLogoLoad() {
+  ScrollTrigger.refresh(true)
+}
 </script>
 
 <template>
@@ -37,7 +42,10 @@ useHeroAnimation({
         <img
           src="https://media.comfy.org/website/customers/c-projection.webp"
           alt="Comfy 3D logo"
-          class="mx-auto w-full max-w-md lg:max-w-none"
+          width="1568"
+          height="1763"
+          class="mx-auto h-auto w-full max-w-md lg:max-w-none"
+          @load="handleLogoLoad"
         />
       </div>
 
diff --git a/apps/website/src/components/demos/ArcadeEmbed.vue b/apps/website/src/components/demos/ArcadeEmbed.vue
new file mode 100644
index 0000000000..bd8e572af8
--- /dev/null
+++ b/apps/website/src/components/demos/ArcadeEmbed.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { ref } from 'vue'
+
+import { t } from '../../i18n/translations'
+
+const {
+  arcadeId,
+  title,
+  aspectRatio = 16 / 9,
+  locale = 'en'
+} = defineProps<{
+  arcadeId: string
+  title: string
+  aspectRatio?: number
+  locale?: Locale
+}>()
+
+const loaded = ref(false)
+</script>
+
+<template>
+  <section
+    class="px-4 py-8 lg:px-20 lg:py-16"
+    :aria-label="t('demos.embed.label', locale)"
+  >
+    <div
+      class="relative mx-auto max-w-6xl overflow-hidden rounded-4xl border border-white/10"
+      :style="{ aspectRatio }"
+    >
+      <div
+        v-if="!loaded"
+        aria-hidden="true"
+        class="absolute inset-0 flex flex-col items-center justify-center bg-black/50"
+      >
+        <div
+          class="border-primary-comfy-canvas/60 mb-4 size-10 animate-pulse rounded-full border-2"
+        />
+        <p class="text-primary-warm-gray text-sm">
+          {{ t('demos.loading', locale) }}
+        </p>
+      </div>
+
+      <iframe
+        class="size-full"
+        :src="`https://demo.arcade.software/${arcadeId}?embed&show_title=0`"
+        :title="`${t('demos.embed.label', locale)}: ${title}`"
+        loading="lazy"
+        allow="clipboard-write"
+        referrerpolicy="strict-origin-when-cross-origin"
+        @load="loaded = true"
+      />
+    </div>
+
+    <noscript>
+      <p class="text-primary-warm-gray mt-4 text-sm">
+        {{ t('demos.noscript', locale) }}
+        <a
+          class="text-primary-comfy-yellow ml-2 underline"
+          :href="`https://demo.arcade.software/${arcadeId}`"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          {{ t('demos.noscript.link', locale) }}
+        </a>
+      </p>
+    </noscript>
+  </section>
+</template>
diff --git a/apps/website/src/components/demos/DemoHeroSection.vue b/apps/website/src/components/demos/DemoHeroSection.vue
new file mode 100644
index 0000000000..85309fe429
--- /dev/null
+++ b/apps/website/src/components/demos/DemoHeroSection.vue
@@ -0,0 +1,60 @@
+<script setup lang="ts">
+import type { Locale, TranslationKey } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+
+const {
+  label,
+  title,
+  description,
+  difficulty,
+  estimatedTime,
+  locale = 'en'
+} = defineProps<{
+  label: string
+  title: string
+  description: string
+  difficulty: 'beginner' | 'intermediate' | 'advanced'
+  estimatedTime: string
+  locale?: Locale
+}>()
+
+const difficultyKey = `demos.difficulty.${difficulty}` as TranslationKey
+</script>
+
+<template>
+  <section class="pt-16 lg:px-20 lg:pt-40 lg:pb-8">
+    <div class="mx-auto flex max-w-4xl flex-col items-center text-center">
+      <span
+        class="text-primary-comfy-yellow text-xs font-semibold tracking-widest uppercase"
+      >
+        {{ label }}
+      </span>
+
+      <h1
+        class="text-primary-comfy-canvas mt-4 text-3xl/tight font-light lg:text-5xl/tight"
+      >
+        {{ title }}
+      </h1>
+
+      <p
+        class="text-primary-warm-gray mt-6 max-w-xl text-sm/relaxed lg:text-base/relaxed"
+      >
+        {{ description }}
+      </p>
+
+      <div class="mt-6 flex flex-wrap justify-center gap-3">
+        <span
+          class="bg-transparency-white-t4 text-primary-comfy-canvas rounded-full px-3 py-1 text-xs font-semibold tracking-wide uppercase"
+        >
+          {{ t(difficultyKey, locale) }}
+        </span>
+        <span
+          class="bg-transparency-white-t4 text-primary-comfy-canvas rounded-full px-3 py-1 text-xs font-semibold"
+        >
+          {{ t(estimatedTime as TranslationKey, locale) }}
+        </span>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/demos/DemoNavSection.vue b/apps/website/src/components/demos/DemoNavSection.vue
new file mode 100644
index 0000000000..14ff5c8e22
--- /dev/null
+++ b/apps/website/src/components/demos/DemoNavSection.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import type { Locale, TranslationKey } from '../../i18n/translations'
+
+import { t } from '../../i18n/translations'
+
+const {
+  nextTitle,
+  nextSlug,
+  nextThumbnail,
+  locale = 'en'
+} = defineProps<{
+  nextTitle: string
+  nextSlug: string
+  nextThumbnail: string
+  locale?: Locale
+}>()
+
+const localePrefix = locale === 'en' ? '' : `/${locale}`
+const nextHref = `${localePrefix}/demos/${nextSlug}`
+</script>
+
+<template>
+  <section class="px-4 py-16 lg:px-20 lg:py-24">
+    <h2 class="text-primary-comfy-canvas mb-10 text-2xl font-light lg:text-3xl">
+      {{ t('demos.nav.nextDemo' as TranslationKey, locale) }}
+    </h2>
+
+    <div
+      class="bg-transparency-white-t4 rounded-5xl mx-auto flex flex-col gap-8 p-2 lg:max-w-237.5 lg:flex-row lg:items-center"
+    >
+      <a :href="nextHref" class="shrink-0 lg:w-1/2">
+        <img
+          :src="nextThumbnail"
+          :alt="nextTitle"
+          class="w-full rounded-4xl object-cover"
+        />
+      </a>
+
+      <div class="flex flex-col gap-6">
+        <h3 class="text-primary-comfy-canvas text-xl font-light lg:text-2xl">
+          {{ nextTitle }}
+        </h3>
+
+        <a :href="nextHref" class="flex items-center gap-3">
+          <span
+            class="bg-primary-comfy-yellow text-primary-comfy-ink flex size-10 items-center justify-center rounded-full"
+          >
+            <span class="text-lg font-bold">›</span>
+          </span>
+          <span
+            class="text-primary-comfy-canvas ppformula-text-center text-sm font-semibold tracking-wider uppercase"
+          >
+            {{ t('demos.nav.viewDemo' as TranslationKey, locale) }}
+          </span>
+        </a>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/demos/DemoTranscript.vue b/apps/website/src/components/demos/DemoTranscript.vue
new file mode 100644
index 0000000000..99f0cbdc4a
--- /dev/null
+++ b/apps/website/src/components/demos/DemoTranscript.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import type { Locale } from '../../i18n/translations'
+
+import { cn } from '@comfyorg/tailwind-utils'
+import { ref } from 'vue'
+
+import { t } from '../../i18n/translations'
+
+const { transcript, locale = 'en' } = defineProps<{
+  transcript: string
+  locale?: Locale
+}>()
+
+const expanded = ref(false)
+</script>
+
+<template>
+  <section
+    class="px-4 py-8 lg:px-20 lg:py-12"
+    :aria-label="t('demos.transcript.label', locale)"
+  >
+    <div class="mx-auto max-w-4xl">
+      <button
+        type="button"
+        class="text-primary-comfy-canvas text-left"
+        :aria-expanded="expanded"
+        @click="expanded = !expanded"
+      >
+        <span class="text-sm font-semibold tracking-wide uppercase">
+          {{ t('demos.transcript.label', locale) }}
+        </span>
+        <span class="text-primary-warm-gray ml-2 text-xs">
+          {{ t('demos.transcript.note', locale) }}
+        </span>
+      </button>
+
+      <div
+        role="region"
+        :aria-label="t('demos.transcript.label', locale)"
+        :class="
+          cn(
+            expanded ? 'mt-4' : 'sr-only',
+            'text-primary-warm-gray text-sm/relaxed'
+          )
+        "
+        v-html="transcript"
+      />
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/home/HeroSection.vue b/apps/website/src/components/home/HeroSection.vue
index 7cb4978442..7618385e33 100644
--- a/apps/website/src/components/home/HeroSection.vue
+++ b/apps/website/src/components/home/HeroSection.vue
@@ -1,24 +1,31 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+
 import type { Locale } from '../../i18n/translations'
 import { externalLinks } from '../../config/routes'
+import { useHeroLogo } from '../../composables/useHeroLogo'
 import { t } from '../../i18n/translations'
 import BrandButton from '../common/BrandButton.vue'
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
+
+const logoContainer = ref<HTMLElement>()
+const { loaded: logoLoaded } = useHeroLogo(logoContainer)
 </script>
 
 <template>
   <section
     class="relative flex min-h-auto flex-col lg:flex-row lg:items-center"
   >
-    <div class="relative flex-1">
-      <video
-        src="https://media.comfy.org/website/homepage/hero-logo-seq.webm"
-        autoplay
-        loop
-        muted
-        playsinline
-        class="w-full"
+    <div
+      ref="logoContainer"
+      class="relative flex aspect-square w-full flex-1 items-center justify-center"
+    >
+      <img
+        v-show="!logoLoaded"
+        src="https://media.comfy.org/website/homepage/hero-logo-seq/Logo00.webp"
+        alt="Comfy logo"
+        class="w-3/5"
       />
     </div>
 
diff --git a/apps/website/src/components/home/UseCaseSection.vue b/apps/website/src/components/home/UseCaseSection.vue
index efa7c18492..8c8c101104 100644
--- a/apps/website/src/components/home/UseCaseSection.vue
+++ b/apps/website/src/components/home/UseCaseSection.vue
@@ -25,7 +25,7 @@ const categories: Category[] = [
   {
     label: t('useCase.vfx', locale),
     leftSrc: 'https://media.comfy.org/website/homepage/use-case/left1.webm',
-    rightSrc: 'https://media.comfy.org/website/homepage/use-case/right1.webp'
+    rightSrc: 'https://media.comfy.org/website/homepage/use-case/right1.webm'
   },
   {
     label: t('useCase.advertising', locale),
diff --git a/apps/website/src/components/models/ModelHeroSection.vue b/apps/website/src/components/models/ModelHeroSection.vue
new file mode 100644
index 0000000000..4ef460d190
--- /dev/null
+++ b/apps/website/src/components/models/ModelHeroSection.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+import BrandButton from '../common/BrandButton.vue'
+import { t } from '../../i18n/translations'
+
+const {
+  displayName,
+  huggingFaceUrl,
+  docsUrl,
+  blogUrl,
+  hubSlug,
+  workflowCount,
+  directory
+} = defineProps<{
+  displayName: string
+  huggingFaceUrl: string
+  docsUrl?: string
+  blogUrl?: string
+  hubSlug?: string
+  workflowCount: number
+  directory: string
+}>()
+
+const workflowsUrl = hubSlug
+  ? `https://www.comfy.org/workflows/model/${hubSlug}`
+  : null
+
+const dirDisplayMap: Record<string, string> = {
+  diffusion_models: 'Diffusion Model',
+  checkpoints: 'Checkpoint',
+  loras: 'LoRA',
+  controlnet: 'ControlNet',
+  clip_vision: 'CLIP Vision',
+  model_patches: 'Model Patch',
+  vae: 'VAE',
+  text_encoders: 'Text Encoder',
+  audio_encoders: 'Audio Encoder',
+  latent_upscale_models: 'Latent Upscale Model',
+  upscale_models: 'Upscale Model',
+  style_models: 'Style Model',
+  partner_nodes: 'Partner Node'
+}
+
+const eyebrow = dirDisplayMap[directory] ?? directory
+const isPartnerNode = directory === 'partner_nodes'
+</script>
+
+<template>
+  <section
+    :class="
+      cn(
+        'mx-auto flex max-w-7xl flex-col gap-8 px-6 py-16',
+        'lg:flex-row lg:items-center lg:gap-16 lg:px-8 lg:py-24'
+      )
+    "
+  >
+    <div class="flex max-w-2xl flex-1 flex-col gap-6">
+      <p
+        class="text-sm font-medium uppercase tracking-widest text-primary-comfy-yellow"
+      >
+        {{ eyebrow }}
+      </p>
+
+      <h1 class="text-4xl font-bold text-primary-comfy-canvas lg:text-6xl">
+        {{ displayName }} in ComfyUI
+      </h1>
+
+      <p class="text-sm text-primary-comfy-canvas/60">
+        {{
+          t('models.hero.workflowCount').replace(
+            '{count}',
+            String(workflowCount)
+          )
+        }}
+      </p>
+
+      <div class="flex flex-col gap-3 sm:flex-row">
+        <BrandButton
+          v-if="workflowsUrl"
+          :href="workflowsUrl"
+          variant="solid"
+          size="lg"
+          class="w-full uppercase sm:w-auto sm:min-w-48"
+        >
+          {{ t('models.hero.primaryCta') }}
+        </BrandButton>
+
+        <BrandButton
+          v-if="!isPartnerNode && huggingFaceUrl"
+          :href="huggingFaceUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          :variant="workflowsUrl ? 'outline' : 'solid'"
+          size="lg"
+          class="w-full uppercase sm:w-auto sm:min-w-48"
+        >
+          {{ t('models.hero.secondaryCta') }}
+        </BrandButton>
+
+        <BrandButton
+          v-if="!workflowsUrl"
+          href="https://www.comfy.org/cloud"
+          target="_blank"
+          rel="noopener noreferrer"
+          :variant="huggingFaceUrl && !isPartnerNode ? 'outline' : 'solid'"
+          size="lg"
+          class="w-full uppercase sm:w-auto sm:min-w-48"
+        >
+          {{ t('models.hero.cloudCta') }}
+        </BrandButton>
+
+        <BrandButton
+          v-if="docsUrl"
+          :href="docsUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          variant="outline"
+          size="lg"
+          class="w-full uppercase sm:w-auto sm:min-w-48"
+        >
+          {{ t('models.hero.tutorialCta') }}
+        </BrandButton>
+      </div>
+
+      <div v-if="blogUrl" class="text-sm text-primary-comfy-canvas/60">
+        <a
+          :href="blogUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="hover:text-primary-comfy-canvas underline"
+        >
+          {{ t('models.hero.blogLink') }}
+        </a>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/payment/PaymentStatusSection.vue b/apps/website/src/components/payment/PaymentStatusSection.vue
new file mode 100644
index 0000000000..0d8aec3f1e
--- /dev/null
+++ b/apps/website/src/components/payment/PaymentStatusSection.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import { externalLinks } from '../../config/routes'
+import type { Locale } from '../../i18n/translations'
+import { t } from '../../i18n/translations'
+import BrandButton from '../common/BrandButton.vue'
+import SectionLabel from '../common/SectionLabel.vue'
+
+// Display-only thank-you / failure pages: payment state is verified
+// server-side via Stripe webhooks (see comfy-api). These pages exist
+// solely as the redirect target for Stripe Checkout.
+
+type Status = 'success' | 'failed'
+
+const { status, locale = 'en' } = defineProps<{
+  status: Status
+  locale?: Locale
+}>()
+
+const primaryHref =
+  status === 'success' ? externalLinks.cloud : externalLinks.support
+const secondaryHref =
+  status === 'success'
+    ? externalLinks.platformUsage
+    : externalLinks.docsSubscription
+
+const iconRingClass =
+  status === 'success'
+    ? 'border-primary-comfy-yellow text-primary-comfy-yellow'
+    : 'border-secondary-mauve text-secondary-mauve'
+</script>
+
+<template>
+  <section
+    class="flex min-h-[calc(100dvh-12rem)] items-center justify-center px-6 py-16 lg:py-24"
+  >
+    <div class="flex max-w-2xl flex-col items-center gap-6 text-center">
+      <div
+        :class="
+          cn(
+            'flex size-20 items-center justify-center rounded-full border-2',
+            iconRingClass
+          )
+        "
+        aria-hidden="true"
+      >
+        <svg
+          v-if="status === 'success'"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2.5"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          class="size-10"
+        >
+          <path d="M5 12.5l4.5 4.5L19 7.5" />
+        </svg>
+        <svg
+          v-else
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2.5"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          class="size-10"
+        >
+          <path d="M6 6l12 12" />
+          <path d="M18 6L6 18" />
+        </svg>
+      </div>
+
+      <SectionLabel>{{ t(`payment.${status}.label`, locale) }}</SectionLabel>
+
+      <h1
+        class="text-primary-comfy-canvas text-4xl/tight font-light md:text-5xl/tight lg:text-6xl/tight"
+      >
+        {{ t(`payment.${status}.title`, locale) }}
+      </h1>
+
+      <p
+        class="text-primary-comfy-canvas/80 max-w-xl text-base font-light lg:text-lg"
+      >
+        {{ t(`payment.${status}.subtitle`, locale) }}
+      </p>
+
+      <div
+        class="mt-2 flex flex-col items-stretch gap-3 sm:flex-row sm:items-center sm:justify-center"
+      >
+        <BrandButton :href="primaryHref" variant="solid" size="nav">
+          {{ t(`payment.${status}.primaryCta`, locale) }}
+        </BrandButton>
+        <BrandButton :href="secondaryHref" variant="outline" size="nav">
+          {{ t(`payment.${status}.secondaryCta`, locale) }}
+        </BrandButton>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/apps/website/src/components/pricing/PriceSection.vue b/apps/website/src/components/pricing/PriceSection.vue
index 7682656ec7..ccd8192a3c 100644
--- a/apps/website/src/components/pricing/PriceSection.vue
+++ b/apps/website/src/components/pricing/PriceSection.vue
@@ -7,6 +7,7 @@ import { ref } from 'vue'
 import BrandButton from '../common/BrandButton.vue'
 import PricingPlanFeatureList from './PricingPlanFeatureList.vue'
 import PricingTierCard from './PricingTierCard.vue'
+import { SHOW_FREE_TIER } from '../../config/features'
 import { externalLinks, getRoutes } from '../../config/routes'
 import { t } from '../../i18n/translations'
 
@@ -37,21 +38,23 @@ interface PricingPlan {
   isEnterprise?: boolean
 }
 
+const freePlan: PricingPlan = {
+  id: 'free',
+  labelKey: 'pricing.plan.free.label',
+  summaryKey: 'pricing.plan.free.summary',
+  priceKey: 'pricing.plan.free.price',
+  creditsKey: 'pricing.plan.free.credits',
+  estimateKey: 'pricing.plan.free.estimate',
+  ctaKey: 'pricing.plan.free.cta',
+  ctaHref: externalLinks.cloud,
+  features: [
+    { text: 'pricing.plan.free.feature1' },
+    { text: 'pricing.plan.free.feature2' }
+  ]
+}
+
 const plans: PricingPlan[] = [
-  {
-    id: 'free',
-    labelKey: 'pricing.plan.free.label',
-    summaryKey: 'pricing.plan.free.summary',
-    priceKey: 'pricing.plan.free.price',
-    creditsKey: 'pricing.plan.free.credits',
-    estimateKey: 'pricing.plan.free.estimate',
-    ctaKey: 'pricing.plan.free.cta',
-    ctaHref: externalLinks.cloud,
-    features: [
-      { text: 'pricing.plan.free.feature1' },
-      { text: 'pricing.plan.free.feature2' }
-    ]
-  },
+  ...(SHOW_FREE_TIER ? [freePlan] : []),
   {
     id: 'standard',
     labelKey: 'pricing.plan.standard.label',
@@ -61,7 +64,9 @@ const plans: PricingPlan[] = [
     estimateKey: 'pricing.plan.standard.estimate',
     ctaKey: 'pricing.plan.standard.cta',
     ctaHref: subscribeUrl('standard'),
-    featureIntroKey: 'pricing.plan.standard.featureIntro',
+    featureIntroKey: SHOW_FREE_TIER
+      ? 'pricing.plan.standard.featureIntro'
+      : undefined,
     features: [
       { text: 'pricing.plan.standard.feature1' },
       { text: 'pricing.plan.standard.feature2' }
@@ -77,7 +82,10 @@ const plans: PricingPlan[] = [
     ctaKey: 'pricing.plan.creator.cta',
     ctaHref: subscribeUrl('creator'),
     featureIntroKey: 'pricing.plan.creator.featureIntro',
-    features: [{ text: 'pricing.plan.creator.feature1' }],
+    features: [
+      { text: 'pricing.plan.creator.feature1' },
+      { text: 'pricing.plan.creator.feature2' }
+    ],
     isPopular: true
   },
   {
@@ -90,7 +98,10 @@ const plans: PricingPlan[] = [
     ctaKey: 'pricing.plan.pro.cta',
     ctaHref: subscribeUrl('pro'),
     featureIntroKey: 'pricing.plan.pro.featureIntro',
-    features: [{ text: 'pricing.plan.pro.feature1' }]
+    features: [
+      { text: 'pricing.plan.pro.feature1' },
+      { text: 'pricing.plan.pro.feature2' }
+    ]
   },
   {
     id: 'enterprise',
@@ -144,9 +155,14 @@ const activePlanIndex = ref(0)
       </button>
     </div>
 
-    <!-- Desktop: 4-column grid / Mobile: single card -->
+    <!-- Desktop: dynamic grid (3 or 4 columns) / Mobile: single card -->
     <div
-      class="rounded-5xl bg-transparency-white-t4 hidden p-2 lg:grid lg:grid-cols-4 lg:gap-2"
+      :class="
+        cn(
+          'rounded-5xl bg-transparency-white-t4 hidden p-2 lg:grid lg:gap-2',
+          standardPlans.length === 4 ? 'lg:grid-cols-4' : 'lg:grid-cols-3'
+        )
+      "
     >
       <PricingTierCard v-for="plan in standardPlans" :key="plan.id">
         <!-- Label + badge -->
@@ -217,10 +233,18 @@ const activePlanIndex = ref(0)
 
         <!-- Features -->
         <div v-if="plan.features.length" class="px-6 py-3">
-          <p class="text-primary-comfy-canvas mb-2 text-sm font-semibold">
-            {{
-              plan.featureIntroKey ? t(plan.featureIntroKey, locale) : '&nbsp;'
-            }}
+          <p
+            v-if="plan.featureIntroKey"
+            class="text-primary-comfy-canvas mb-2 text-sm font-semibold"
+          >
+            {{ t(plan.featureIntroKey, locale) }}
+          </p>
+          <p
+            v-else
+            class="text-primary-comfy-canvas mb-2 text-sm font-semibold"
+            aria-hidden="true"
+          >
+            &nbsp;
           </p>
           <ul class="space-y-2">
             <li
diff --git a/apps/website/src/components/product/cloud/PricingSection.vue b/apps/website/src/components/product/cloud/PricingSection.vue
index 0b3fe7c1af..347bb8ee27 100644
--- a/apps/website/src/components/product/cloud/PricingSection.vue
+++ b/apps/website/src/components/product/cloud/PricingSection.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Locale } from '../../../i18n/translations'
 
+import { SHOW_FREE_TIER } from '../../../config/features'
 import { getRoutes } from '../../../config/routes'
 import { t } from '../../../i18n/translations'
 
@@ -25,7 +26,10 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
           {{ t('cloud.pricing.description', locale) }}
         </p>
 
-        <p class="text-primary-comfy-ink mt-4 text-base font-bold">
+        <p
+          v-if="SHOW_FREE_TIER"
+          class="text-primary-comfy-ink mt-4 text-base font-bold"
+        >
           {{ t('cloud.pricing.tagline', locale) }}
         </p>
       </div>
diff --git a/apps/website/src/components/product/enterprise/HeroSection.vue b/apps/website/src/components/product/enterprise/HeroSection.vue
index 66513d79fa..5f7f8f71ce 100644
--- a/apps/website/src/components/product/enterprise/HeroSection.vue
+++ b/apps/website/src/components/product/enterprise/HeroSection.vue
@@ -35,20 +35,20 @@ onMounted(() => {
 
 <template>
   <section
-    class="max-w-9xl relative mx-auto flex flex-col items-center overflow-hidden lg:flex-row-reverse lg:items-center lg:overflow-x-visible lg:overflow-y-clip lg:pb-[min(8vw,10rem)]"
+    class="max-w-9xl relative mx-auto flex flex-col items-center overflow-hidden pt-16 lg:flex-row-reverse lg:items-center lg:overflow-x-visible lg:overflow-y-clip lg:pt-[min(8vw,10rem)] lg:pb-[min(8vw,10rem)]"
   >
     <!-- Illustration (overlaps text slightly; stacks above on mobile, right on lg) -->
     <div
-      class="aspect-square w-4/5 max-w-md scale-150 self-center md:max-w-2xl lg:pointer-events-none lg:z-1 lg:-ml-12 lg:-translate-x-[10%] lg:translate-y-[40px] lg:self-center xl:size-[clamp(32rem,max(40vh,32vw),36rem)] xl:min-h-[min(32vw,24rem)] xl:min-w-[min(24vw,20rem)]"
+      class="aspect-square w-4/5 max-w-md scale-150 self-center md:max-w-2xl lg:pointer-events-none lg:z-1 lg:-ml-12 lg:-translate-x-[10%] lg:self-center xl:size-[clamp(32rem,max(40vh,32vw),36rem)] xl:min-h-[min(32vw,24rem)] xl:min-w-[min(24vw,20rem)]"
     >
       <svg
         ref="svgRef"
-        class="block size-full"
+        class="block size-full overflow-visible"
         viewBox="0 0 1600 1046"
         fill="none"
         aria-hidden="true"
       >
-        <g clip-path="url(#enterpriseHeroClip)">
+        <g>
           <rect width="1600" height="1046" fill="#211927" />
           <rect
             width="800"
@@ -84,7 +84,7 @@ onMounted(() => {
           />
 
           <!-- Exploding block cluster -->
-          <g class="block-cluster">
+          <g class="block-cluster" clip-path="url(#enterpriseHeroBlockClip)">
             <path
               class="block-piece"
               d="M1018.44 635.715L1018.45 581.73C1018.46 574.554 1013.42 565.829 1007.21 562.242L960.479 535.262C956.544 532.99 949.469 533.096 945.535 535.368L898.79 562.373C892.576 565.963 887.537 574.691 887.535 581.867L887.52 635.852C887.519 640.395 890.967 646.574 894.902 648.845L941.632 675.825C947.845 679.412 957.918 679.409 964.132 675.819L1010.88 648.815C1014.82 646.538 1018.44 640.267 1018.44 635.715Z"
@@ -353,7 +353,7 @@ onMounted(() => {
             <stop stop-color="#211927" stop-opacity="0" />
             <stop offset="1" stop-color="#211927" />
           </linearGradient>
-          <clipPath id="enterpriseHeroClip">
+          <clipPath id="enterpriseHeroBlockClip">
             <rect width="1600" height="1046" fill="white" />
           </clipPath>
         </defs>
diff --git a/apps/website/src/components/product/local/EcoSystemSection.vue b/apps/website/src/components/product/local/EcoSystemSection.vue
index f9fac310bf..3778729c8f 100644
--- a/apps/website/src/components/product/local/EcoSystemSection.vue
+++ b/apps/website/src/components/product/local/EcoSystemSection.vue
@@ -28,7 +28,11 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
         <!-- CTA buttons -->
         <div class="mt-10 flex flex-col gap-4 lg:flex-row">
           <DownloadLocalButton :locale />
-          <BrandButton :href="externalLinks.github" variant="outline" size="lg">
+          <BrandButton
+            :href="externalLinks.githubInstall"
+            variant="outline"
+            size="lg"
+          >
             <span class="inline-flex items-center gap-2">
               <i
                 class="icon-mask size-5 -translate-y-px mask-[url('/icons/social/github.svg')]"
diff --git a/apps/website/src/components/product/local/HeroSection.vue b/apps/website/src/components/product/local/HeroSection.vue
index 59db6a2993..8a2d5b7019 100644
--- a/apps/website/src/components/product/local/HeroSection.vue
+++ b/apps/website/src/components/product/local/HeroSection.vue
@@ -276,29 +276,6 @@ onUnmounted(() => {
             fill="#211927"
           />
         </g>
-
-        <!-- Left-edge fade -->
-        <rect
-          x="300"
-          y="150"
-          width="250"
-          height="900"
-          fill="url(#localHeroFadeLeft)"
-        />
-
-        <defs>
-          <linearGradient
-            id="localHeroFadeLeft"
-            x1="550"
-            y1="600"
-            x2="300"
-            y2="600"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#211927" stop-opacity="0" />
-            <stop offset="1" stop-color="#211927" />
-          </linearGradient>
-        </defs>
       </svg>
     </div>
 
@@ -323,7 +300,7 @@ onUnmounted(() => {
       <div class="mt-8 flex flex-col gap-4 lg:flex-row">
         <DownloadLocalButton :locale class="lg:min-w-60 lg:p-4" />
         <BrandButton
-          :href="externalLinks.github"
+          :href="externalLinks.githubInstall"
           variant="outline"
           size="lg"
           class="lg:min-w-60 lg:p-4"
diff --git a/apps/website/src/components/product/shared/CloudBannerSection.vue b/apps/website/src/components/product/shared/CloudBannerSection.vue
index 761786e8f3..61aba594e2 100644
--- a/apps/website/src/components/product/shared/CloudBannerSection.vue
+++ b/apps/website/src/components/product/shared/CloudBannerSection.vue
@@ -8,7 +8,9 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 </script>
 
 <template>
-  <section class="bg-transparency-white-t4 p-4 text-center lg:px-20 lg:py-8">
+  <section
+    class="bg-transparency-white-t4 relative z-20 p-4 text-center lg:px-20 lg:py-8"
+  >
     <p
       class="text-primary-comfy-canvas relative z-10 text-lg font-semibold lg:text-sm lg:font-normal"
     >
diff --git a/apps/website/src/composables/useBannerImage.test.ts b/apps/website/src/composables/useBannerImage.test.ts
new file mode 100644
index 0000000000..bf23aca09e
--- /dev/null
+++ b/apps/website/src/composables/useBannerImage.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from 'vitest'
+import { ref } from 'vue'
+
+import { useBannerImage } from './useBannerImage'
+
+describe('useBannerImage', () => {
+  it('shows the default banner when neither url is provided', () => {
+    const { showDefaultBanner, imgSrc } = useBannerImage({})
+    expect(showDefaultBanner.value).toBe(true)
+    expect(imgSrc.value).toBeUndefined()
+  })
+
+  it('prefers bannerUrl over iconUrl when both are provided', () => {
+    const { showDefaultBanner, imgSrc } = useBannerImage({
+      bannerUrl: 'https://example.com/banner.png',
+      iconUrl: 'https://example.com/icon.png'
+    })
+    expect(showDefaultBanner.value).toBe(false)
+    expect(imgSrc.value).toBe('https://example.com/banner.png')
+  })
+
+  it('falls back to iconUrl when bannerUrl is missing', () => {
+    const { imgSrc } = useBannerImage({
+      iconUrl: 'https://example.com/icon.png'
+    })
+    expect(imgSrc.value).toBe('https://example.com/icon.png')
+  })
+
+  it('reactively updates when sources change', () => {
+    const banner = ref<string | undefined>(undefined)
+    const { showDefaultBanner, imgSrc } = useBannerImage({ bannerUrl: banner })
+
+    expect(showDefaultBanner.value).toBe(true)
+    banner.value = 'https://example.com/new.png'
+    expect(showDefaultBanner.value).toBe(false)
+    expect(imgSrc.value).toBe('https://example.com/new.png')
+  })
+
+  it('flips isImageError when onImageError is called', () => {
+    const { isImageError, onImageError } = useBannerImage({
+      bannerUrl: 'x'
+    })
+    expect(isImageError.value).toBe(false)
+    onImageError()
+    expect(isImageError.value).toBe(true)
+  })
+
+  it('exposes the default banner constant for consumers', () => {
+    const { DEFAULT_BANNER } = useBannerImage({})
+    expect(DEFAULT_BANNER).toBe('/assets/images/fallback-gradient-avatar.svg')
+  })
+})
diff --git a/apps/website/src/composables/useBannerImage.ts b/apps/website/src/composables/useBannerImage.ts
new file mode 100644
index 0000000000..0ceaf96aff
--- /dev/null
+++ b/apps/website/src/composables/useBannerImage.ts
@@ -0,0 +1,30 @@
+import { computed, ref, toValue } from 'vue'
+import type { MaybeRefOrGetter } from 'vue'
+
+const DEFAULT_BANNER = '/assets/images/fallback-gradient-avatar.svg'
+
+interface UseBannerImageInput {
+  bannerUrl?: MaybeRefOrGetter<string | undefined>
+  iconUrl?: MaybeRefOrGetter<string | undefined>
+}
+
+export function useBannerImage({ bannerUrl, iconUrl }: UseBannerImageInput) {
+  const isImageError = ref(false)
+
+  const showDefaultBanner = computed(
+    () => !toValue(bannerUrl) && !toValue(iconUrl)
+  )
+  const imgSrc = computed(() => toValue(bannerUrl) || toValue(iconUrl))
+
+  function onImageError() {
+    isImageError.value = true
+  }
+
+  return {
+    DEFAULT_BANNER,
+    isImageError,
+    showDefaultBanner,
+    imgSrc,
+    onImageError
+  }
+}
diff --git a/apps/website/src/composables/useFilteredPacks.test.ts b/apps/website/src/composables/useFilteredPacks.test.ts
new file mode 100644
index 0000000000..f3073f561f
--- /dev/null
+++ b/apps/website/src/composables/useFilteredPacks.test.ts
@@ -0,0 +1,144 @@
+import { describe, expect, it } from 'vitest'
+import { ref } from 'vue'
+
+import type { Pack, PackNode } from '../data/cloudNodes'
+
+import { useFilteredPacks } from './useFilteredPacks'
+import type { PackSortMode } from './useFilteredPacks'
+
+function pack(overrides: Partial<Pack> = {}): Pack {
+  return {
+    id: overrides.id ?? 'pack',
+    displayName: overrides.displayName ?? 'Pack',
+    nodes: overrides.nodes ?? [],
+    downloads: overrides.downloads,
+    lastUpdated: overrides.lastUpdated,
+    ...overrides
+  }
+}
+
+function node(name: string, displayName: string): PackNode {
+  return { name, displayName, category: 'x' }
+}
+
+describe('useFilteredPacks', () => {
+  const packs: readonly Pack[] = [
+    pack({
+      id: 'a',
+      displayName: 'Alpha',
+      downloads: 100,
+      lastUpdated: '2025-01-01T00:00:00Z',
+      nodes: [node('aa', 'Aardvark')]
+    }),
+    pack({
+      id: 'b',
+      displayName: 'Beta',
+      downloads: 300,
+      lastUpdated: '2025-06-01T00:00:00Z',
+      nodes: [node('bb', 'Beaver'), node('bb2', 'Bumblebee')]
+    }),
+    pack({
+      id: 'c',
+      displayName: 'Gamma',
+      downloads: 200,
+      lastUpdated: '2025-03-01T00:00:00Z',
+      nodes: [
+        node('cc', 'Cat'),
+        node('cc2', 'Crocodile'),
+        node('cc3', 'Capybara')
+      ]
+    })
+  ]
+
+  it('sorts by downloads desc by default', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: '',
+      sortMode: 'downloads' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.id)).toEqual(['b', 'c', 'a'])
+  })
+
+  it('sorts most-nodes places highest count first', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: '',
+      sortMode: 'mostNodes' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.id)).toEqual(['c', 'b', 'a'])
+  })
+
+  it('sorts A → Z by display name', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: '',
+      sortMode: 'az' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.displayName)).toEqual([
+      'Alpha',
+      'Beta',
+      'Gamma'
+    ])
+  })
+
+  it('sorts recently updated newest first', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: '',
+      sortMode: 'recentlyUpdated' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.id)).toEqual(['b', 'c', 'a'])
+  })
+
+  it('treats invalid lastUpdated as 0', () => {
+    const broken = [
+      pack({ id: 'x', lastUpdated: 'nonsense' }),
+      pack({ id: 'y', lastUpdated: '2025-01-01T00:00:00Z' })
+    ]
+    const { filteredPacks } = useFilteredPacks({
+      packs: broken,
+      query: '',
+      sortMode: 'recentlyUpdated' as PackSortMode
+    })
+    expect(filteredPacks.value[0].id).toBe('y')
+  })
+
+  it('matches the search query against pack display names', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: 'beta',
+      sortMode: 'az' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.id)).toEqual(['b'])
+  })
+
+  it('matches the search query against node display names', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: 'CAPYBARA',
+      sortMode: 'az' as PackSortMode
+    })
+    expect(filteredPacks.value.map((p) => p.id)).toEqual(['c'])
+  })
+
+  it('returns empty when nothing matches', () => {
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query: 'zzz-no-such-thing',
+      sortMode: 'az' as PackSortMode
+    })
+    expect(filteredPacks.value).toHaveLength(0)
+  })
+
+  it('reacts when the query ref changes', () => {
+    const query = ref('beta')
+    const { filteredPacks } = useFilteredPacks({
+      packs,
+      query,
+      sortMode: 'az' as PackSortMode
+    })
+    expect(filteredPacks.value).toHaveLength(1)
+    query.value = ''
+    expect(filteredPacks.value).toHaveLength(3)
+  })
+})
diff --git a/apps/website/src/composables/useFilteredPacks.ts b/apps/website/src/composables/useFilteredPacks.ts
new file mode 100644
index 0000000000..0c26400123
--- /dev/null
+++ b/apps/website/src/composables/useFilteredPacks.ts
@@ -0,0 +1,53 @@
+import { computed, toValue } from 'vue'
+import type { MaybeRefOrGetter } from 'vue'
+
+import type { Pack } from '../data/cloudNodes'
+
+export type PackSortMode = 'downloads' | 'mostNodes' | 'az' | 'recentlyUpdated'
+
+interface UseFilteredPacksInput {
+  packs: MaybeRefOrGetter<readonly Pack[]>
+  query: MaybeRefOrGetter<string>
+  sortMode: MaybeRefOrGetter<PackSortMode>
+}
+
+function matchesQuery(pack: Pack, normalizedQuery: string): boolean {
+  if (pack.displayName.toLowerCase().includes(normalizedQuery)) return true
+  return pack.nodes.some((node) =>
+    node.displayName.toLowerCase().includes(normalizedQuery)
+  )
+}
+
+function safeTimestamp(value: string | undefined): number {
+  if (!value) return 0
+  const ts = Date.parse(value)
+  return Number.isNaN(ts) ? 0 : ts
+}
+
+export function useFilteredPacks(input: UseFilteredPacksInput) {
+  const filteredPacks = computed<Pack[]>(() => {
+    const allPacks = toValue(input.packs)
+    const normalizedQuery = toValue(input.query).trim().toLowerCase()
+
+    const matching =
+      normalizedQuery.length === 0
+        ? [...allPacks]
+        : allPacks.filter((pack) => matchesQuery(pack, normalizedQuery))
+
+    const mode = toValue(input.sortMode)
+    if (mode === 'az') {
+      return matching.sort((a, b) => a.displayName.localeCompare(b.displayName))
+    }
+    if (mode === 'recentlyUpdated') {
+      return matching.sort(
+        (a, b) => safeTimestamp(b.lastUpdated) - safeTimestamp(a.lastUpdated)
+      )
+    }
+    if (mode === 'mostNodes') {
+      return matching.sort((a, b) => b.nodes.length - a.nodes.length)
+    }
+    return matching.sort((a, b) => (b.downloads ?? 0) - (a.downloads ?? 0))
+  })
+
+  return { filteredPacks }
+}
diff --git a/apps/website/src/composables/useHeroLogo.ts b/apps/website/src/composables/useHeroLogo.ts
new file mode 100644
index 0000000000..3a1e0b847a
--- /dev/null
+++ b/apps/website/src/composables/useHeroLogo.ts
@@ -0,0 +1,328 @@
+import type { Ref } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
+
+import * as THREE from 'three'
+import { SVGLoader } from 'three/addons/loaders/SVGLoader.js'
+
+import { prefersReducedMotion } from './useReducedMotion'
+
+const IMAGE_COUNT = 16
+const BASE_URL = 'https://media.comfy.org/website/homepage/hero-logo-seq'
+
+const SVG_MARKUP = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 375 404"><path fill="#000000" d="M296.597 302.576C297.299 300.205 297.682 297.705 297.682 295.078C297.682 280.529 285.938 268.736 271.45 268.736H153.883C147.564 268.8 142.395 263.673 142.395 257.328C142.395 256.174 142.586 255.084 142.841 254.059L174.499 143.309C175.839 138.438 180.307 134.849 185.541 134.849L303.554 134.72C328.446 134.72 349.444 117.864 355.763 94.8555L373.506 33.1353C374.081 30.9562 374.4 28.5848 374.4 26.2134C374.4 11.7288 362.72 0 348.295 0H205.518C180.754 0 159.819 16.7279 153.373 39.4804L141.373 81.5886C139.969 86.3954 135.565 89.9205 130.332 89.9205H96.0573C71.4845 89.9205 50.7412 106.328 44.1034 128.824L0.957382 280.144C0.319127 282.387 0 284.823 0 287.258C0 301.807 11.7439 313.6 26.2323 313.6H59.9321C66.2508 313.6 71.4207 318.727 71.4207 325.137C71.4207 326.226 71.293 327.316 70.9739 328.341L59.0385 370.065C58.4641 372.308 58.0811 374.615 58.0811 376.987C58.0811 391.471 69.7612 403.2 84.1857 403.2L227.027 403.072C251.855 403.072 272.79 386.28 279.172 363.399L296.533 302.64L296.597 302.576Z"/></svg>`
+
+interface HeroLogoConfig {
+  speed: number
+  tiltX: number
+  tiltZ: number
+  zoom: number
+  fov: number
+  logoColor: string
+  extrudeDepth: number
+  cursorTiltStrength: number
+  bgScale: number
+  slideDuration: number
+}
+
+const DEFAULTS: HeroLogoConfig = {
+  speed: 1,
+  tiltX: -0.1,
+  tiltZ: -0.1,
+  zoom: 7,
+  fov: 50,
+  logoColor: '#F2FF59',
+  extrudeDepth: 200,
+  cursorTiltStrength: 0.5,
+  bgScale: 0.8,
+  slideDuration: 0.4
+}
+
+function buildImageUrls(): string[] {
+  return Array.from({ length: IMAGE_COUNT }, (_, i) => {
+    const index = String(i).padStart(5, '0')
+    return `${BASE_URL}/image_sequence_${index}.webp`
+  })
+}
+
+function parseShapes(): THREE.Shape[] {
+  const loader = new SVGLoader()
+  const svgData = loader.parse(SVG_MARKUP)
+  const shapes: THREE.Shape[] = []
+  svgData.paths.forEach((path) => {
+    shapes.push(...SVGLoader.createShapes(path))
+  })
+  return shapes
+}
+
+function loadTextures(urls: string[]): Promise<THREE.Texture[]> {
+  return Promise.all(
+    urls.map(
+      (url) =>
+        new Promise<THREE.Texture | null>((resolve) => {
+          const img = new Image()
+          img.crossOrigin = 'anonymous'
+          img.onload = () => {
+            const tex = new THREE.Texture(img)
+            tex.needsUpdate = true
+            tex.colorSpace = THREE.SRGBColorSpace
+            resolve(tex)
+          }
+          img.onerror = () => resolve(null)
+          img.src = url
+        })
+    )
+  ).then((results) => results.filter((t): t is THREE.Texture => t !== null))
+}
+
+export function useHeroLogo(
+  containerRef: Ref<HTMLElement | undefined>,
+  config: Partial<HeroLogoConfig> = {}
+) {
+  const cfg = { ...DEFAULTS, ...config }
+  const loaded = ref(false)
+  let cleanup: (() => void) | undefined
+
+  onMounted(async () => {
+    try {
+      const container = containerRef.value
+      if (!container || prefersReducedMotion()) return
+
+      const { width, height } = container.getBoundingClientRect()
+
+      const renderer = new THREE.WebGLRenderer({
+        antialias: true,
+        stencil: true,
+        alpha: true
+      })
+      renderer.setSize(width, height)
+      renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2))
+      renderer.outputColorSpace = THREE.SRGBColorSpace
+      renderer.domElement.style.position = 'absolute'
+      renderer.domElement.style.inset = '0'
+      renderer.domElement.style.width = '100%'
+      renderer.domElement.style.height = '100%'
+      renderer.domElement.style.opacity = '0'
+      renderer.domElement.setAttribute('aria-hidden', 'true')
+      container.appendChild(renderer.domElement)
+
+      let disposed = false
+      const teardowns: Array<() => void> = []
+      cleanup = () => {
+        disposed = true
+        teardowns.forEach((fn) => fn())
+      }
+      teardowns.push(() => {
+        renderer.dispose()
+        renderer.domElement.remove()
+      })
+
+      const scene = new THREE.Scene()
+      const camera = new THREE.PerspectiveCamera(
+        cfg.fov,
+        width / height,
+        0.1,
+        1000
+      )
+      camera.position.z = cfg.zoom
+
+      // SVG shape
+      const shapes = parseShapes()
+      const tempGeo = new THREE.ShapeGeometry(shapes)
+      tempGeo.computeBoundingBox()
+      const bb = tempGeo.boundingBox!
+      const cx = (bb.max.x + bb.min.x) / 2
+      const cy = (bb.max.y + bb.min.y) / 2
+      const scaleFactor = 3 / (bb.max.y - bb.min.y)
+      tempGeo.dispose()
+
+      // Image sequence textures — load first frame eagerly, rest lazily
+      const urls = buildImageUrls()
+      const textures = await loadTextures(urls.slice(0, 1))
+      if (disposed) return
+
+      renderer.domElement.style.opacity = '1'
+      loaded.value = true
+
+      loadTextures(urls.slice(1)).then((rest) => {
+        if (!disposed) textures.push(...rest)
+      })
+
+      // Background plane (stencil read)
+      const bgPlaneGeo = new THREE.PlaneGeometry(14, 14)
+      const bgPlaneMat = new THREE.MeshBasicMaterial({
+        transparent: true,
+        opacity: 1,
+        map: textures[0] ?? null,
+        depthTest: false,
+        depthWrite: false,
+        stencilWrite: true,
+        stencilFunc: THREE.EqualStencilFunc,
+        stencilRef: 1,
+        stencilFail: THREE.KeepStencilOp,
+        stencilZFail: THREE.KeepStencilOp,
+        stencilZPass: THREE.KeepStencilOp
+      })
+      const bgPlane = new THREE.Mesh(bgPlaneGeo, bgPlaneMat)
+      bgPlane.renderOrder = 1
+      bgPlane.scale.set(cfg.bgScale, cfg.bgScale, 1)
+      scene.add(bgPlane)
+
+      // Logo group
+      const group = new THREE.Group()
+      scene.add(group)
+
+      const s = scaleFactor
+      const depth = cfg.extrudeDepth
+
+      // Front face
+      const shapeGeo = new THREE.ShapeGeometry(shapes)
+      shapeGeo.translate(-cx, -cy, 0)
+      shapeGeo.scale(s, -s, s)
+      const shapeMat = new THREE.MeshBasicMaterial({
+        color: cfg.logoColor,
+        side: THREE.DoubleSide,
+        depthTest: false,
+        depthWrite: false,
+        transparent: true
+      })
+      const logoMesh = new THREE.Mesh(shapeGeo, shapeMat)
+      logoMesh.renderOrder = 2
+      group.add(logoMesh)
+
+      // Extrusion stencil mask
+      const extrudeGeo = new THREE.ExtrudeGeometry(shapes, {
+        depth,
+        bevelEnabled: false
+      })
+      extrudeGeo.translate(-cx, -cy, -depth)
+      extrudeGeo.scale(s, -s, s)
+      const extrudeMat = new THREE.MeshBasicMaterial({
+        colorWrite: false,
+        depthWrite: true,
+        depthTest: true,
+        stencilWrite: true,
+        stencilRef: 1,
+        stencilFunc: THREE.AlwaysStencilFunc,
+        stencilZPass: THREE.ReplaceStencilOp,
+        stencilFail: THREE.KeepStencilOp,
+        stencilZFail: THREE.KeepStencilOp,
+        side: THREE.DoubleSide
+      })
+      const extrudeMesh = new THREE.Mesh(extrudeGeo, extrudeMat)
+      extrudeMesh.renderOrder = 0
+      group.add(extrudeMesh)
+
+      // Interaction
+      let isDragging = false
+      let previousX = 0
+      let dragVelocity = 0
+      let currentTiltX = 0
+      let currentTiltY = 0
+      let pointerX = 0
+      let pointerY = 0
+      let rotationT = 0
+      let currentSlide = 0
+      let slideTimer = 0
+      let animationId = 0
+
+      function onMouseMove(e: MouseEvent) {
+        pointerX = (e.clientX / window.innerWidth) * 2 - 1
+        pointerY = (e.clientY / window.innerHeight) * 2 - 1
+      }
+
+      function onPointerDown(e: PointerEvent) {
+        isDragging = true
+        dragVelocity = 0
+        previousX = e.clientX
+      }
+
+      function onPointerMove(e: PointerEvent) {
+        if (!isDragging) return
+        dragVelocity = (e.clientX - previousX) * 0.005
+        rotationT += dragVelocity
+        previousX = e.clientX
+      }
+
+      function onPointerUp() {
+        isDragging = false
+      }
+
+      function onResize() {
+        const rect = container!.getBoundingClientRect()
+        camera.aspect = rect.width / rect.height
+        camera.updateProjectionMatrix()
+        renderer.setSize(rect.width, rect.height)
+      }
+
+      window.addEventListener('mousemove', onMouseMove)
+      renderer.domElement.addEventListener('pointerdown', onPointerDown)
+      window.addEventListener('pointermove', onPointerMove)
+      window.addEventListener('pointerup', onPointerUp)
+      window.addEventListener('resize', onResize)
+
+      const clock = new THREE.Clock()
+
+      function animate() {
+        if (disposed) return
+        animationId = requestAnimationFrame(animate)
+        const dt = clock.getDelta()
+
+        if (!isDragging && Math.abs(dragVelocity) > 0.0001) {
+          dragVelocity *= 0.95
+          rotationT += dragVelocity
+        } else if (!isDragging) {
+          dragVelocity = 0
+        }
+
+        rotationT += cfg.speed * dt
+
+        currentTiltX += (pointerY - currentTiltX) * 0.08
+        currentTiltY += (pointerX - currentTiltY) * 0.08
+
+        group.rotation.y = rotationT % (Math.PI * 2)
+        group.rotation.x = cfg.tiltX - currentTiltX * cfg.cursorTiltStrength
+        group.rotation.z = cfg.tiltZ
+
+        if (textures.length > 1) {
+          slideTimer += dt
+          if (slideTimer >= cfg.slideDuration) {
+            slideTimer = 0
+            currentSlide = (currentSlide + 1) % textures.length
+            bgPlaneMat.map = textures[currentSlide]
+            bgPlaneMat.needsUpdate = true
+          }
+        }
+
+        renderer.render(scene, camera)
+      }
+
+      animate()
+
+      teardowns.push(
+        () => cancelAnimationFrame(animationId),
+        () => window.removeEventListener('mousemove', onMouseMove),
+        () =>
+          renderer.domElement.removeEventListener('pointerdown', onPointerDown),
+        () => window.removeEventListener('pointermove', onPointerMove),
+        () => window.removeEventListener('pointerup', onPointerUp),
+        () => window.removeEventListener('resize', onResize),
+        () => bgPlaneGeo.dispose(),
+        () => bgPlaneMat.dispose(),
+        () => shapeGeo.dispose(),
+        () => shapeMat.dispose(),
+        () => extrudeGeo.dispose(),
+        () => extrudeMat.dispose(),
+        () => textures.forEach((tex) => tex.dispose())
+      )
+    } catch (err) {
+      console.error('[useHeroLogo] initialization failed:', err)
+      cleanup?.()
+    }
+  })
+
+  onUnmounted(() => {
+    cleanup?.()
+  })
+
+  return { loaded }
+}
diff --git a/apps/website/src/composables/useNodesByCategory.test.ts b/apps/website/src/composables/useNodesByCategory.test.ts
new file mode 100644
index 0000000000..642c598fb5
--- /dev/null
+++ b/apps/website/src/composables/useNodesByCategory.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it } from 'vitest'
+import { ref } from 'vue'
+
+import type { PackNode } from '../data/cloudNodes'
+
+import { useNodesByCategory } from './useNodesByCategory'
+
+function node(name: string, displayName: string, category: string): PackNode {
+  return { name, displayName, category }
+}
+
+describe('useNodesByCategory', () => {
+  it('groups nodes by category', () => {
+    const { groupedNodes } = useNodesByCategory(() => [
+      node('A', 'A', 'cat-1'),
+      node('B', 'B', 'cat-2'),
+      node('C', 'C', 'cat-1')
+    ])
+    expect(groupedNodes.value).toHaveLength(2)
+    expect(groupedNodes.value[0]).toMatchObject({
+      category: 'cat-1',
+      nodes: [
+        expect.objectContaining({ name: 'A' }),
+        expect.objectContaining({ name: 'C' })
+      ]
+    })
+  })
+
+  it('sorts nodes alphabetically by display name within a category', () => {
+    const { groupedNodes } = useNodesByCategory(() => [
+      node('z', 'Zulu', 'x'),
+      node('a', 'Alpha', 'x'),
+      node('m', 'Mike', 'x')
+    ])
+    expect(groupedNodes.value[0].nodes.map((n) => n.displayName)).toEqual([
+      'Alpha',
+      'Mike',
+      'Zulu'
+    ])
+  })
+
+  it('sorts categories alphabetically', () => {
+    const { groupedNodes } = useNodesByCategory(() => [
+      node('a', 'A', 'beta'),
+      node('b', 'B', 'alpha'),
+      node('c', 'C', 'gamma')
+    ])
+    expect(groupedNodes.value.map((g) => g.category)).toEqual([
+      'alpha',
+      'beta',
+      'gamma'
+    ])
+  })
+
+  it('falls back to a placeholder for missing categories', () => {
+    const { groupedNodes } = useNodesByCategory(() => [node('a', 'A', '')])
+    expect(groupedNodes.value[0].category).toBe('—')
+  })
+
+  it('reacts to ref changes', () => {
+    const nodes = ref<PackNode[]>([node('a', 'A', 'x')])
+    const { groupedNodes } = useNodesByCategory(nodes)
+    expect(groupedNodes.value).toHaveLength(1)
+
+    nodes.value = [node('a', 'A', 'x'), node('b', 'B', 'y')]
+    expect(groupedNodes.value).toHaveLength(2)
+  })
+})
diff --git a/apps/website/src/composables/useNodesByCategory.ts b/apps/website/src/composables/useNodesByCategory.ts
new file mode 100644
index 0000000000..f2bf407582
--- /dev/null
+++ b/apps/website/src/composables/useNodesByCategory.ts
@@ -0,0 +1,40 @@
+import { computed, toValue } from 'vue'
+import type { MaybeRefOrGetter } from 'vue'
+
+import type { PackNode } from '../data/cloudNodes'
+
+const UNCATEGORIZED = '—'
+
+interface NodeCategoryGroup {
+  category: string
+  nodes: PackNode[]
+}
+
+export function useNodesByCategory(
+  nodes: MaybeRefOrGetter<readonly PackNode[]>
+) {
+  const groupedNodes = computed<NodeCategoryGroup[]>(() => {
+    const byCategory = new Map<string, PackNode[]>()
+
+    for (const node of toValue(nodes)) {
+      const category = node.category || UNCATEGORIZED
+      const existing = byCategory.get(category)
+      if (existing) {
+        existing.push(node)
+        continue
+      }
+      byCategory.set(category, [node])
+    }
+
+    return [...byCategory.entries()]
+      .map(([category, items]) => ({
+        category,
+        nodes: [...items].sort((a, b) =>
+          a.displayName.localeCompare(b.displayName)
+        )
+      }))
+      .sort((a, b) => a.category.localeCompare(b.category))
+  })
+
+  return { groupedNodes }
+}
diff --git a/apps/website/src/config/demos.ts b/apps/website/src/config/demos.ts
new file mode 100644
index 0000000000..980a7f1dee
--- /dev/null
+++ b/apps/website/src/config/demos.ts
@@ -0,0 +1,95 @@
+import type { TranslationKey } from '../i18n/translations'
+
+interface Demo {
+  readonly slug: string
+  readonly arcadeId: string
+  readonly category: TranslationKey
+  readonly title: TranslationKey
+  readonly description: TranslationKey
+  readonly ogImage: string
+  readonly thumbnail: string
+  readonly estimatedTime: TranslationKey
+  readonly durationIso: string
+  readonly difficulty: 'beginner' | 'intermediate' | 'advanced'
+  readonly tags: readonly string[]
+  readonly transcript?: TranslationKey
+  readonly publishedDate: string
+  readonly modifiedDate: string
+  /**
+   * Width / height of the Arcade demo's source recording (e.g. 1.93 for a
+   * landscape screencast). Sizes the embed container to match so rounded
+   * corners hug the content instead of empty letterbox space. Source from
+   * Arcade's `_serializablePublicFlow.aspectRatio` (which is height/width —
+   * invert it). Defaults to 16/9 if omitted.
+   */
+  readonly aspectRatio?: number
+}
+
+export const demos: readonly Demo[] = [
+  {
+    slug: 'image-to-video',
+    arcadeId: 'F3CTalnGnR4R0qJIVMNX',
+    category: 'demos.category.templates',
+    title: 'demos.image-to-video.title',
+    description: 'demos.image-to-video.description',
+    transcript: 'demos.image-to-video.transcript',
+    ogImage: '/images/demos/image-to-video-og.png',
+    thumbnail: '/images/demos/image-to-video-thumb.webp',
+    estimatedTime: 'demos.duration.2min',
+    durationIso: 'PT2M',
+    difficulty: 'beginner',
+    tags: ['templates', 'image', 'video'],
+    publishedDate: '2026-04-19',
+    modifiedDate: '2026-04-19',
+    aspectRatio: 1.931
+  },
+  {
+    slug: 'workflow-templates',
+    arcadeId: 'KhqcXDElnFWklo7ACBqE',
+    category: 'demos.category.gettingStarted',
+    title: 'demos.workflow-templates.title',
+    description: 'demos.workflow-templates.description',
+    transcript: 'demos.workflow-templates.transcript',
+    ogImage: '/images/demos/workflow-templates-og.png',
+    thumbnail: '/images/demos/workflow-templates-thumb.webp',
+    estimatedTime: 'demos.duration.2min',
+    durationIso: 'PT2M',
+    difficulty: 'beginner',
+    tags: ['getting-started', 'templates', 'workflow'],
+    publishedDate: '2026-04-19',
+    modifiedDate: '2026-04-19',
+    aspectRatio: 1.931
+  },
+  {
+    slug: 'community-workflows',
+    arcadeId: 'mqZh17oWDuWIyhK0xwEV',
+    category: 'demos.category.gettingStarted',
+    title: 'demos.community-workflows.title',
+    description: 'demos.community-workflows.description',
+    transcript: 'demos.community-workflows.transcript',
+    ogImage: '/images/demos/community-workflows-og.png',
+    thumbnail: '/images/demos/community-workflows-thumb.webp',
+    estimatedTime: 'demos.duration.2min',
+    durationIso: 'PT2M',
+    difficulty: 'beginner',
+    tags: ['getting-started', 'community', 'workflow', 'hub'],
+    publishedDate: '2026-05-04',
+    modifiedDate: '2026-05-04',
+    aspectRatio: 1.931
+  }
+]
+
+export function getDemoBySlug(slug: string): Demo | undefined {
+  return demos.find((demo) => demo.slug === slug)
+}
+
+export function getNextDemo(slug: string): Demo {
+  if (demos.length === 0) {
+    throw new Error('No demos configured')
+  }
+  const index = demos.findIndex((demo) => demo.slug === slug)
+  if (index === -1) {
+    throw new Error(`Unknown demo slug: ${slug}`)
+  }
+  return demos[(index + 1) % demos.length]
+}
diff --git a/apps/website/src/config/features.ts b/apps/website/src/config/features.ts
new file mode 100644
index 0000000000..2247d75941
--- /dev/null
+++ b/apps/website/src/config/features.ts
@@ -0,0 +1 @@
+export const SHOW_FREE_TIER = false
diff --git a/apps/website/src/config/generated-models.json b/apps/website/src/config/generated-models.json
new file mode 100644
index 0000000000..7bcf654a75
--- /dev/null
+++ b/apps/website/src/config/generated-models.json
@@ -0,0 +1,1945 @@
+[
+  {
+    "slug": "kling-ai",
+    "name": "Kling AI",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 11,
+    "displayName": "Kling AI"
+  },
+  {
+    "slug": "openai-dall-e",
+    "name": "OpenAI DALL-E",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 10,
+    "displayName": "OpenAI DALL-E"
+  },
+  {
+    "slug": "vidu",
+    "name": "Vidu",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 8,
+    "displayName": "Vidu"
+  },
+  {
+    "slug": "seedance-bytedance",
+    "name": "Seedance (ByteDance)",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 7,
+    "displayName": "Seedance (ByteDance)"
+  },
+  {
+    "slug": "stability-ai",
+    "name": "Stability AI",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 7,
+    "displayName": "Stability AI"
+  },
+  {
+    "slug": "wan-api",
+    "name": "Wan (API)",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 6,
+    "displayName": "Wan (API)"
+  },
+  {
+    "slug": "flux-api",
+    "name": "Flux (API)",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 5,
+    "displayName": "Flux (API)"
+  },
+  {
+    "slug": "runway",
+    "name": "Runway",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 5,
+    "displayName": "Runway"
+  },
+  {
+    "slug": "tripo-3d",
+    "name": "Tripo 3D",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 5,
+    "displayName": "Tripo 3D"
+  },
+  {
+    "slug": "grok-image",
+    "name": "Grok Image",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 4,
+    "displayName": "Grok Image"
+  },
+  {
+    "slug": "luma-dream-machine",
+    "name": "Luma Dream Machine",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 4,
+    "displayName": "Luma Dream Machine"
+  },
+  {
+    "slug": "moonvalley",
+    "name": "Moonvalley",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 4,
+    "displayName": "Moonvalley"
+  },
+  {
+    "slug": "hailuo-minimax",
+    "name": "Hailuo MiniMax",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Hailuo MiniMax"
+  },
+  {
+    "slug": "magnific-ai",
+    "name": "Magnific AI",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Magnific AI"
+  },
+  {
+    "slug": "meshy-ai",
+    "name": "Meshy AI",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Meshy AI"
+  },
+  {
+    "slug": "pixverse",
+    "name": "Pixverse",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Pixverse"
+  },
+  {
+    "slug": "recraft",
+    "name": "Recraft",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Recraft"
+  },
+  {
+    "slug": "rodin-3d",
+    "name": "Rodin 3D",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 3,
+    "displayName": "Rodin 3D"
+  },
+  {
+    "slug": "bria-ai",
+    "name": "Bria AI",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "Bria AI"
+  },
+  {
+    "slug": "gemini-image",
+    "name": "Gemini Image",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "Gemini Image"
+  },
+  {
+    "slug": "hunyuan-3d",
+    "name": "Hunyuan 3D",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "Hunyuan 3D"
+  },
+  {
+    "slug": "ltxv-api",
+    "name": "LTX Video (API)",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "LTX Video (API)"
+  },
+  {
+    "slug": "topaz-labs",
+    "name": "Topaz Labs",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "Topaz Labs"
+  },
+  {
+    "slug": "wavespeed",
+    "name": "Wavespeed",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 2,
+    "displayName": "Wavespeed"
+  },
+  {
+    "slug": "ideogram",
+    "name": "Ideogram",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 1,
+    "displayName": "Ideogram"
+  },
+  {
+    "slug": "nano-banana",
+    "name": "Nano Banana",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 1,
+    "displayName": "Nano Banana"
+  },
+  {
+    "slug": "veo-2",
+    "name": "Veo 2",
+    "huggingFaceUrl": "",
+    "directory": "partner_nodes",
+    "workflowCount": 1,
+    "displayName": "Veo 2"
+  },
+  {
+    "slug": "umt5-xxl-fp8-e4m3fn-scaled",
+    "name": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 34,
+    "displayName": "Umt5 Xxl FP8 e4m3fn scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "wan-2-1-vae",
+    "name": "wan_2.1_vae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors",
+    "directory": "vae",
+    "workflowCount": 29,
+    "displayName": "Wan 2.1 Vae",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "ae",
+    "name": "ae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/vae/ae.safetensors",
+    "directory": "vae",
+    "workflowCount": 26,
+    "displayName": "Ae",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/z-image/z-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/01_get_started_text_to_image-1.webp"
+  },
+  {
+    "slug": "qwen-2-5-vl-7b-fp8-scaled",
+    "name": "qwen_2.5_vl_7b_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 25,
+    "displayName": "Qwen 2.5 Vl 7b FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/02_qwen_Image_edit_subgraphed-1.webp"
+  },
+  {
+    "slug": "qwen-image-vae",
+    "name": "qwen_image_vae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/vae/qwen_image_vae.safetensors",
+    "directory": "vae",
+    "workflowCount": 19,
+    "displayName": "Qwen Image Vae",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/02_qwen_Image_edit_subgraphed-1.webp"
+  },
+  {
+    "slug": "clip-l",
+    "name": "clip_l.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/clip_l.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 14,
+    "displayName": "Clip L",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-fill-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_krea_dev-1.webp"
+  },
+  {
+    "slug": "t5xxl-fp16",
+    "name": "t5xxl_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 12,
+    "displayName": "T5xxl FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-fill-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_krea_dev-1.webp"
+  },
+  {
+    "slug": "clip-vision-h",
+    "name": "clip_vision_h.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors",
+    "directory": "clip_vision",
+    "workflowCount": 12,
+    "displayName": "Clip Vision H",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-animate",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_chrono_edit_14B-1.webp"
+  },
+  {
+    "slug": "flux2-vae",
+    "name": "flux2-vae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-dev/resolve/main/split_files/vae/flux2-vae.safetensors",
+    "directory": "vae",
+    "workflowCount": 9,
+    "displayName": "Flux2 Vae",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2-1.webp"
+  },
+  {
+    "slug": "qwen-3-4b",
+    "name": "qwen_3_4b.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/text_encoders/qwen_3_4b.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 8,
+    "displayName": "Qwen 3 4b",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/z-image/z-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/01_get_started_text_to_image-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-fp8-e4m3fn",
+    "name": "qwen_image_edit_2509_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2509_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 8,
+    "displayName": "Qwen Image Edit 2509 FP8 e4m3fn",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/02_qwen_Image_edit_subgraphed-1.webp"
+  },
+  {
+    "slug": "t5xxl-fp8-e4m3fn-scaled",
+    "name": "t5xxl_fp8_e4m3fn_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 8,
+    "displayName": "T5xxl FP8 e4m3fn scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-kontext-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_kontext_dev_basic-1.webp",
+    "canonicalSlug": "t5xxl-fp16"
+  },
+  {
+    "slug": "wan2-2-i2v-lightx2v-4steps-lora-v1-high-noise",
+    "name": "wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors",
+    "directory": "loras",
+    "workflowCount": 7,
+    "displayName": "Wan2.2 I2v Lightx2v 4steps Lora V1 High Noise",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "wan2-2-i2v-lightx2v-4steps-lora-v1-low-noise",
+    "name": "wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors",
+    "directory": "loras",
+    "workflowCount": 7,
+    "displayName": "Wan2.2 I2v Lightx2v 4steps Lora V1 Low Noise",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "gemma-3-12b-it-fp4-mixed",
+    "name": "gemma_3_12B_it_fp4_mixed.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/ltx-2/resolve/main/split_files/text_encoders/gemma_3_12B_it_fp4_mixed.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 7,
+    "displayName": "Gemma 3 12B It FP4 mixed",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-2-spatial-upscaler-x2-1-0",
+    "name": "ltx-2-spatial-upscaler-x2-1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-spatial-upscaler-x2-1.0.safetensors",
+    "directory": "latent_upscale_models",
+    "workflowCount": 7,
+    "displayName": "Ltx 2 Spatial Upscaler X2 1.0",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-lightning-4steps-v1-0-bf16",
+    "name": "Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 6,
+    "displayName": "Qwen Image Edit 2509 Lightning 4steps V1.0 BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/02_qwen_Image_edit_subgraphed-1.webp"
+  },
+  {
+    "slug": "wan2-1-vace-1-3b-fp16",
+    "name": "wan2.1_vace_1.3B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_vace_1.3B_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 6,
+    "displayName": "Wan2.1 Vace 1.3B FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/vace",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan_vace_14B_ref2v-1.webp"
+  },
+  {
+    "slug": "wan21-causvid-bidirect2-t2v-1-3b-lora-rank32",
+    "name": "Wan21_CausVid_bidirect2_T2V_1_3B_lora_rank32.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan21_CausVid_bidirect2_T2V_1_3B_lora_rank32.safetensors",
+    "directory": "loras",
+    "workflowCount": 6,
+    "displayName": "Wan21 CausVid Bidirect2 T2V 1 3B Lora Rank32",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/vace",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan_vace_14B_ref2v-1.webp"
+  },
+  {
+    "slug": "umt5-xxl-fp16",
+    "name": "umt5_xxl_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 6,
+    "displayName": "Umt5 Xxl FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/vace",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan_vace_14B_ref2v-1.webp",
+    "canonicalSlug": "umt5-xxl-fp8-e4m3fn-scaled"
+  },
+  {
+    "slug": "wan2-1-vace-14b-fp16",
+    "name": "wan2.1_vace_14B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_vace_14B_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 6,
+    "displayName": "Wan2.1 Vace 14B FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/vace",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan_vace_14B_ref2v-1.webp"
+  },
+  {
+    "slug": "wan21-causvid-14b-t2v-lora-rank32",
+    "name": "Wan21_CausVid_14B_T2V_lora_rank32.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan21_CausVid_14B_T2V_lora_rank32.safetensors",
+    "directory": "loras",
+    "workflowCount": 6,
+    "displayName": "Wan21 CausVid 14B T2V Lora Rank32",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/vace",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan_vace_14B_ref2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-i2v-high-noise-14b-fp8-scaled",
+    "name": "wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 5,
+    "displayName": "Wan2.2 I2v High Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "wan2-2-i2v-low-noise-14b-fp8-scaled",
+    "name": "wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 5,
+    "displayName": "Wan2.2 I2v Low Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/03_video_wan2_2_14B_i2v_subgraphed-1.webp"
+  },
+  {
+    "slug": "vae-ft-mse-840000-ema-pruned",
+    "name": "vae-ft-mse-840000-ema-pruned.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors",
+    "directory": "vae",
+    "workflowCount": 5,
+    "displayName": "Vae Ft Mse 840000 Ema Pruned",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_depth_lora_example-1.webp"
+  },
+  {
+    "slug": "lotus-depth-d-v1-1",
+    "name": "lotus-depth-d-v1-1.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/lotus/resolve/main/lotus-depth-d-v1-1.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 5,
+    "displayName": "Lotus Depth D V1 1",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_depth_lora_example-1.webp"
+  },
+  {
+    "slug": "clip-g-hidream",
+    "name": "clip_g_hidream.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/text_encoders/clip_g_hidream.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 5,
+    "displayName": "Clip G Hidream",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_e1_1-1.webp"
+  },
+  {
+    "slug": "clip-l-hidream",
+    "name": "clip_l_hidream.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/text_encoders/clip_l_hidream.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 5,
+    "displayName": "Clip L Hidream",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_e1_1-1.webp"
+  },
+  {
+    "slug": "llama-3-1-8b-instruct-fp8-scaled",
+    "name": "llama_3.1_8b_instruct_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/text_encoders/llama_3.1_8b_instruct_fp8_scaled.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 5,
+    "displayName": "Llama 3.1 8b Instruct FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_e1_1-1.webp"
+  },
+  {
+    "slug": "qwen-image-lightning-4steps-v1-0",
+    "name": "Qwen-Image-Lightning-4steps-V1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V1.0.safetensors",
+    "directory": "loras",
+    "workflowCount": 5,
+    "displayName": "Qwen Image Lightning 4steps V1.0",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_Image_2512-1.webp"
+  },
+  {
+    "slug": "qwen-image-fp8-e4m3fn",
+    "name": "qwen_image_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 5,
+    "displayName": "Qwen Image FP8 e4m3fn",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image-1.webp"
+  },
+  {
+    "slug": "lightx2v-i2v-14b-480p-cfg-step-distill-rank64-bf16",
+    "name": "lightx2v_I2V_14B_480p_cfg_step_distill_rank64_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Lightx2v/lightx2v_I2V_14B_480p_cfg_step_distill_rank64_bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 5,
+    "displayName": "Lightx2v I2V 14B 480p Cfg Step Distill Rank64 BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-animate",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_humo-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-dev-fp8",
+    "name": "ltx-2-19b-dev-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-19b-dev-fp8.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 5,
+    "displayName": "Ltx 2 19b Dev FP8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-distilled-lora-384",
+    "name": "ltx-2-19b-distilled-lora-384.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-19b-distilled-lora-384.safetensors",
+    "directory": "loras",
+    "workflowCount": 5,
+    "displayName": "Ltx 2 19b Distilled Lora 384",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-distilled",
+    "name": "ltx-2-19b-distilled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-19b-distilled.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 5,
+    "displayName": "Ltx 2 19b Distilled",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "z-image-turbo-bf16",
+    "name": "z_image_turbo_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/diffusion_models/z_image_turbo_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 4,
+    "displayName": "Z Image Turbo BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/z-image/z-image-turbo",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/01_get_started_text_to_image-1.webp"
+  },
+  {
+    "slug": "ace-step-v1-3-5b",
+    "name": "ace_step_v1_3.5b.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/ACE-Step_ComfyUI_repackaged/resolve/main/all_in_one/ace_step_v1_3.5b.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 4,
+    "displayName": "Ace Step V1 3.5b",
+    "docsUrl": "https://docs.comfy.org/tutorials/audio/ace-step/ace-step-v1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/05_audio_ace_step_1_t2a_song_subgraphed-1.webp"
+  },
+  {
+    "slug": "sd3-5-large-fp8-scaled",
+    "name": "sd3.5_large_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/sd3.5_large_fp8_scaled.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 4,
+    "displayName": "Sd3.5 Large FP8 scaled",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sd3.5_large_blur-1.webp"
+  },
+  {
+    "slug": "sd-xl-base-1-0",
+    "name": "sd_xl_base_1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 4,
+    "displayName": "Sd Xl Base 1.0",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sdxl/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sdxl_refiner_prompt_example-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-lora-camera-control-dolly-left",
+    "name": "ltx-2-19b-lora-camera-control-dolly-left.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2-19b-LoRA-Camera-Control-Dolly-Left/resolve/main/ltx-2-19b-lora-camera-control-dolly-left.safetensors",
+    "directory": "loras",
+    "workflowCount": 4,
+    "displayName": "Ltx 2 19b Lora Camera Control Dolly Left",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_i2v-1.webp"
+  },
+  {
+    "slug": "sigclip-vision-patch14-384",
+    "name": "sigclip_vision_patch14_384.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
+    "directory": "clip_vision",
+    "workflowCount": 3,
+    "displayName": "Sigclip Vision Patch14 384",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-uso",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_dev_uso_reference_image_gen-1.webp"
+  },
+  {
+    "slug": "flux1-dev",
+    "name": "flux1-dev.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/flux1-dev.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 3,
+    "displayName": "Flux1 Dev",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-text-to-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_dev_checkpoint_example-1.webp"
+  },
+  {
+    "slug": "hunyuan-video-vae-bf16",
+    "name": "hunyuan_video_vae_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors?download=true",
+    "directory": "vae",
+    "workflowCount": 3,
+    "displayName": "Hunyuan Video Vae BF16",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/hunyuan_video/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hunyuan_video_text_to_video-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2511-bf16",
+    "name": "qwen_image_edit_2511_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2511_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 3,
+    "displayName": "Qwen Image Edit 2511 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image-qwen_image_edit_2511-lora-inflation-1.webp"
+  },
+  {
+    "slug": "flux2-dev-fp8mixed",
+    "name": "flux2_dev_fp8mixed.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-dev/resolve/main/split_files/diffusion_models/flux2_dev_fp8mixed.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 3,
+    "displayName": "Flux2 Dev fp8mixed",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2-1.webp"
+  },
+  {
+    "slug": "qwen-3-8b-fp8mixed",
+    "name": "qwen_3_8b_fp8mixed.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-klein-9B/resolve/main/split_files/text_encoders/qwen_3_8b_fp8mixed.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 3,
+    "displayName": "Qwen 3 8b fp8mixed",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_image_edit_9b_base-1.webp"
+  },
+  {
+    "slug": "wan2-2-vae",
+    "name": "wan2.2_vae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/vae/wan2.2_vae.safetensors",
+    "directory": "vae",
+    "workflowCount": 3,
+    "displayName": "Wan2.2 Vae",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_5B_fun_control-1.webp"
+  },
+  {
+    "slug": "hunyuan-3d-v2-1",
+    "name": "hunyuan_3d_v2.1.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/hunyuan3D_2.1_repackaged/resolve/main/hunyuan_3d_v2.1.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 2,
+    "displayName": "Hunyuan 3d V2.1",
+    "docsUrl": "https://docs.comfy.org/tutorials/3d/hunyuan3D-2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/04_hunyuan_3d_2.1_subgraphed-1.webp"
+  },
+  {
+    "slug": "flux1-dev-fp8",
+    "name": "flux1-dev-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/flux1-dev-fp8.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 2,
+    "displayName": "Flux1 Dev FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-uso",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_dev_uso_reference_image_gen-1.webp"
+  },
+  {
+    "slug": "flux1-fill-dev",
+    "name": "flux1-fill-dev.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/split_files/diffusion_models/flux1-fill-dev.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Flux1 Fill Dev",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-fill-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_fill_inpaint_example-1.webp"
+  },
+  {
+    "slug": "mistral-3-small-flux2-bf16",
+    "name": "mistral_3_small_flux2_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-dev/resolve/main/split_files/text_encoders/mistral_3_small_flux2_bf16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 2,
+    "displayName": "Mistral 3 Small Flux2 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-base-9b-fp8",
+    "name": "flux-2-klein-base-9b-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/black-forest-labs/FLUX.2-klein-base-9b-fp8/resolve/main/flux-2-klein-base-9b-fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Flux 2 Klein Base 9b FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_image_edit_9b_base-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-9b-fp8",
+    "name": "flux-2-klein-9b-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/black-forest-labs/FLUX.2-klein-9b-fp8/resolve/main/flux-2-klein-9b-fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Flux 2 Klein 9b FP8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_image_edit_9b_distilled-1.webp"
+  },
+  {
+    "slug": "qwen-2-5-vl-fp16",
+    "name": "qwen_2.5_vl_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/text_encoders/qwen_2.5_vl_fp16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 2,
+    "displayName": "Qwen 2.5 Vl FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/omnigen/omnigen2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_omnigen2_image_edit-1.webp"
+  },
+  {
+    "slug": "omnigen2-fp16",
+    "name": "omnigen2_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Omnigen2_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/omnigen2_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Omnigen2 FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/omnigen/omnigen2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_omnigen2_image_edit-1.webp"
+  },
+  {
+    "slug": "qwen-image-2512-fp8-e4m3fn",
+    "name": "qwen_image_2512_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_2512_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Qwen Image 2512 FP8 e4m3fn",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_Image_2512-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2511-lightning-4steps-v1-0-bf16",
+    "name": "Qwen-Image-Edit-2511-Lightning-4steps-V1.0-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Edit-2511-Lightning/resolve/main/Qwen-Image-Edit-2511-Lightning-4steps-V1.0-bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 2,
+    "displayName": "Qwen Image Edit 2511 Lightning 4steps V1.0 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_edit_2511-1.webp"
+  },
+  {
+    "slug": "qwen-image-layered-vae",
+    "name": "qwen_image_layered_vae.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Layered_ComfyUI/resolve/main/split_files/vae/qwen_image_layered_vae.safetensors",
+    "directory": "vae",
+    "workflowCount": 2,
+    "displayName": "Qwen Image Layered Vae",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_layered-1.webp"
+  },
+  {
+    "slug": "sd-xl-refiner-1-0",
+    "name": "sd_xl_refiner_1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 2,
+    "displayName": "Sd Xl Refiner 1.0",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sdxl/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sdxl_refiner_prompt_example-1.webp"
+  },
+  {
+    "slug": "wan2-1-vae-bf16",
+    "name": "Wan2_1_VAE_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1_VAE_bf16.safetensors",
+    "directory": "vae",
+    "workflowCount": 2,
+    "displayName": "Wan2 1 VAE BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/template-Animation_Trajectory_Control_Wan_ATI-1.webp"
+  },
+  {
+    "slug": "wan2-1-i2v-ati-14b-fp8-e4m3fn",
+    "name": "Wan2_1-I2V-ATI-14B_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1-I2V-ATI-14B_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Wan2 1 I2V ATI 14B FP8 e4m3fn",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan-ati",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/template-Animation_Trajectory_Control_Wan_ATI-1.webp"
+  },
+  {
+    "slug": "qwen-edit-2509-multiple-angles",
+    "name": "Qwen-Edit-2509-Multiple-angles.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/loras/Qwen-Edit-2509-Multiple-angles.safetensors",
+    "directory": "loras",
+    "workflowCount": 2,
+    "displayName": "Qwen Edit 2509 Multiple Angles",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/templates-1_click_multiple_character_angles-v1.0-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-lightning-8steps-v1-0-bf16",
+    "name": "Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 2,
+    "displayName": "Qwen Image Edit 2509 Lightning 8steps V1.0 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/templates-image_to_real-1.webp"
+  },
+  {
+    "slug": "byt5-small-glyphxl-fp16",
+    "name": "byt5_small_glyphxl_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/text_encoders/byt5_small_glyphxl_fp16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 2,
+    "displayName": "Byt5 Small Glyphxl FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_i2v-1.webp"
+  },
+  {
+    "slug": "hunyuanvideo15-latent-upsampler-1080p",
+    "name": "hunyuanvideo15_latent_upsampler_1080p.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/latent_upscale_models/hunyuanvideo15_latent_upsampler_1080p.safetensors",
+    "directory": "latent_upscale_models",
+    "workflowCount": 2,
+    "displayName": "Hunyuanvideo15 Latent Upsampler 1080p",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_i2v-1.webp"
+  },
+  {
+    "slug": "hunyuanvideo1-5-1080p-sr-distilled-fp16",
+    "name": "hunyuanvideo1.5_1080p_sr_distilled_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/diffusion_models/hunyuanvideo1.5_1080p_sr_distilled_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Hunyuanvideo1.5 1080p Sr Distilled FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_i2v-1.webp"
+  },
+  {
+    "slug": "hunyuanvideo15-vae-fp16",
+    "name": "hunyuanvideo15_vae_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/vae/hunyuanvideo15_vae_fp16.safetensors",
+    "directory": "vae",
+    "workflowCount": 2,
+    "displayName": "Hunyuanvideo15 Vae FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_i2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-t2v-lightx2v-4steps-lora-v1-1-high-noise",
+    "name": "wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors",
+    "directory": "loras",
+    "workflowCount": 2,
+    "displayName": "Wan2.2 T2v Lightx2v 4steps Lora V1.1 High Noise",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_s2v-1.webp"
+  },
+  {
+    "slug": "wan21-wanmove-fp8-scaled-e4m3fn-kj",
+    "name": "Wan21-WanMove_fp8_scaled_e4m3fn_KJ.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/WanMove/Wan21-WanMove_fp8_scaled_e4m3fn_KJ.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 2,
+    "displayName": "Wan21 WanMove FP8 scaled e4m3fn KJ",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wanmove_480p-1.webp"
+  },
+  {
+    "slug": "hunyuan3d-dit-v2-fp16",
+    "name": "hunyuan3d-dit-v2_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/hunyuan3D_2.0_repackaged/resolve/main/split_files/hunyuan3d-dit-v2_fp16.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Hunyuan3d Dit V2 FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/3d_hunyuan3d_image_to_model-1.webp"
+  },
+  {
+    "slug": "hunyuan3d-dit-v2-mv-fp16",
+    "name": "hunyuan3d-dit-v2-mv_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/hunyuan3D_2.0_repackaged/resolve/main/split_files/hunyuan3d-dit-v2-mv_fp16.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Hunyuan3d Dit V2 Mv FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/3d_hunyuan3d_multiview_to_model-1.webp"
+  },
+  {
+    "slug": "hunyuan3d-dit-v2-mv-turbo-fp16",
+    "name": "hunyuan3d-dit-v2-mv-turbo_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/hunyuan3D_2.0_repackaged/resolve/main/split_files/hunyuan3d-dit-v2-mv-turbo_fp16.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Hunyuan3d Dit V2 Mv Turbo FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/3d_hunyuan3d_multiview_to_model_turbo-1.webp"
+  },
+  {
+    "slug": "stable-audio-open-1-0",
+    "name": "stable-audio-open-1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-audio-open-1.0_repackaged/resolve/main/stable-audio-open-1.0.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Stable Audio Open 1.0",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/audio/"
+  },
+  {
+    "slug": "t5-base",
+    "name": "t5-base.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/ComfyUI-Wiki/t5-base/resolve/main/t5-base.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "T5 Base",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/audio/"
+  },
+  {
+    "slug": "v1-5-pruned-emaonly-fp16",
+    "name": "v1-5-pruned-emaonly-fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-diffusion-v1-5-archive/resolve/main/v1-5-pruned-emaonly-fp16.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "V1 5 Pruned Emaonly FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/basic/text-to-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/default-1.webp"
+  },
+  {
+    "slug": "uso-flux1-projector-v1",
+    "name": "uso-flux1-projector-v1.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/USO_1.0_Repackaged/resolve/main/split_files/model_patches/uso-flux1-projector-v1.safetensors",
+    "directory": "model_patches",
+    "workflowCount": 1,
+    "displayName": "Uso Flux1 Projector V1",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-uso",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_dev_uso_reference_image_gen-1.webp"
+  },
+  {
+    "slug": "uso-flux1-dit-lora-v1",
+    "name": "uso-flux1-dit-lora-v1.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/USO_1.0_Repackaged/resolve/main/split_files/loras/uso-flux1-dit-lora-v1.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Uso Flux1 Dit Lora V1",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-uso",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_dev_uso_reference_image_gen-1.webp"
+  },
+  {
+    "slug": "flux1-krea-dev-fp8-scaled",
+    "name": "flux1-krea-dev_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/FLUX.1-Krea-dev_ComfyUI/resolve/main/split_files/diffusion_models/flux1-krea-dev_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux1 Krea Dev FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux1-krea-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux1_krea_dev-1.webp"
+  },
+  {
+    "slug": "flux1-canny-dev",
+    "name": "flux1-canny-dev.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/split_files/diffusion_models/flux1-canny-dev.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux1 Canny Dev",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-controlnet",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_canny_model_example-1.webp"
+  },
+  {
+    "slug": "flux1-depth-dev-lora",
+    "name": "flux1-depth-dev-lora.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/split_files/loras/flux1-depth-dev-lora.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Flux1 Depth Dev Lora",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-controlnet",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_depth_lora_example-1.webp"
+  },
+  {
+    "slug": "flux1-dev-kontext-fp8-scaled",
+    "name": "flux1-dev-kontext_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-kontext-dev_ComfyUI/resolve/main/split_files/diffusion_models/flux1-dev-kontext_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux1 Dev Kontext FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-kontext-dev",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_kontext_dev_basic-1.webp"
+  },
+  {
+    "slug": "flux1-redux-dev",
+    "name": "flux1-redux-dev.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Flux1-Redux-Dev/resolve/main/flux1-redux-dev.safetensors",
+    "directory": "style_models",
+    "workflowCount": 1,
+    "displayName": "Flux1 Redux Dev",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-controlnet",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_redux_model_example-1.webp"
+  },
+  {
+    "slug": "flux1-schnell-fp8",
+    "name": "flux1-schnell-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-schnell/resolve/main/flux1-schnell-fp8.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Flux1 Schnell FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-text-to-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_schnell-1.webp"
+  },
+  {
+    "slug": "flux1-schnell",
+    "name": "flux1-schnell.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux1-schnell/resolve/main/flux1-schnell.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux1 Schnell",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-1-text-to-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/flux_schnell_full_text_to_image-1.webp"
+  },
+  {
+    "slug": "hidream-e1-1-bf16",
+    "name": "hidream_e1_1_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/diffusion_models/hidream_e1_1_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hidream E1 1 BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-e1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_e1_1-1.webp"
+  },
+  {
+    "slug": "hidream-e1-full-bf16",
+    "name": "hidream_e1_full_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/diffusion_models/hidream_e1_full_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hidream E1 Full BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-e1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_e1_full-1.webp"
+  },
+  {
+    "slug": "hidream-i1-dev-fp8",
+    "name": "hidream_i1_dev_fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/diffusion_models/hidream_i1_dev_fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hidream I1 Dev FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_i1_dev-1.webp"
+  },
+  {
+    "slug": "hidream-i1-fast-fp8",
+    "name": "hidream_i1_fast_fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/diffusion_models/hidream_i1_fast_fp8.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hidream I1 Fast FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_i1_fast-1.webp"
+  },
+  {
+    "slug": "hidream-i1-full-fp8",
+    "name": "hidream_i1_full_fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HiDream-I1_ComfyUI/resolve/main/split_files/diffusion_models/hidream_i1_full_fp8.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hidream I1 Full FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/hidream/hidream-i1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hidream_i1_full-1.webp"
+  },
+  {
+    "slug": "llava-llama3-fp8-scaled",
+    "name": "llava_llama3_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp8_scaled.safetensors?download=true",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Llava Llama3 FP8 scaled",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/hunyuan_video/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hunyuan_video_text_to_video-1.webp"
+  },
+  {
+    "slug": "hunyuan-video-t2v-720p-bf16",
+    "name": "hunyuan_video_t2v_720p_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_t2v_720p_bf16.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hunyuan Video T2v 720p BF16",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/hunyuan_video/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/hunyuan_video_text_to_video-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2511-systms-infl8",
+    "name": "Qwen_Image_Edit_2511-SYSTMS_INFL8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/systms/SYSTMS-INFL8-LoRA-Qwen-Image-Edit-2511/resolve/main/SYSTMS_INFL8_LoRA_Qwen_Image_Edit_2511.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit 2511 SYSTMS INFL8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image-qwen_image_edit_2511-lora-inflation-1.webp"
+  },
+  {
+    "slug": "chroma-radiance-x0",
+    "name": "chroma-radiance-x0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Chroma1-Radiance_Repackaged/resolve/main/split_files/diffusion_models/chroma-radiance-x0.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Chroma Radiance X0",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_chroma1_radiance_text_to_image-1.webp"
+  },
+  {
+    "slug": "chroma1-hd-fp8mixed",
+    "name": "Chroma1-HD-fp8mixed.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Chroma1-HD_repackaged/resolve/main/split_files/diffusion_models/Chroma1-HD-fp8mixed.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Chroma1 HD fp8mixed",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_chroma_text_to_image-1.webp"
+  },
+  {
+    "slug": "chronoedit-distill-lora",
+    "name": "chronoedit_distill_lora.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/chronoedit_distill_lora.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Chronoedit Distill Lora",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_chrono_edit_14B-1.webp"
+  },
+  {
+    "slug": "chrono-edit-14b-fp16",
+    "name": "chrono_edit_14B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/chrono_edit_14B_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Chrono Edit 14B FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_chrono_edit_14B-1.webp"
+  },
+  {
+    "slug": "flux-1-fill-dev-onereward-transformer-fp8",
+    "name": "flux.1-fill-dev-OneReward-transformer_fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/OneReward_repackaged/resolve/main/split_files/diffusion_models/flux.1-fill-dev-OneReward-transformer_fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux.1 Fill Dev OneReward Transformer FP8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux.1_fill_dev_OneReward-1.webp"
+  },
+  {
+    "slug": "removal-timestep-alpha-2-1740",
+    "name": "removal_timestep_alpha-2-1740.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lrzjason/ObjectRemovalFluxFill/resolve/main/removal_timestep_alpha-2-1740.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Removal Timestep Alpha 2 1740",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux.1_fill_dev_OneReward-1.webp"
+  },
+  {
+    "slug": "flux-2-turbo-lora-comfyui",
+    "name": "Flux_2-Turbo-LoRA_comfyui.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/ByteZSzn/Flux.2-Turbo-ComfyUI/resolve/main/Flux_2-Turbo-LoRA_comfyui.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Flux 2 Turbo LoRA Comfyui",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2-1.webp"
+  },
+  {
+    "slug": "mistral-3-small-flux2-fp8",
+    "name": "mistral_3_small_flux2_fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-dev/resolve/main/split_files/text_encoders/mistral_3_small_flux2_fp8.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Mistral 3 Small Flux2 FP8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_fp8-1.webp",
+    "canonicalSlug": "mistral-3-small-flux2-bf16"
+  },
+  {
+    "slug": "flux2turbocomfyv2",
+    "name": "Flux2TurboComfyv2.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-dev/resolve/main/split_files/loras/Flux2TurboComfyv2.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Flux2TurboComfyv2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_fp8-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-base-4b-fp8",
+    "name": "flux-2-klein-base-4b-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/black-forest-labs/FLUX.2-klein-base-4b-fp8/resolve/main/flux-2-klein-base-4b-fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux 2 Klein Base 4b FP8",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_image_edit_4b_base-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-4b-fp8",
+    "name": "flux-2-klein-4b-fp8.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/black-forest-labs/FLUX.2-klein-4b-fp8/resolve/main/flux-2-klein-4b-fp8.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux 2 Klein 4b FP8",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_image_edit_4b_distilled-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-base-4b",
+    "name": "flux-2-klein-base-4b.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-klein/resolve/main/split_files/diffusion_models/flux-2-klein-base-4b.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux 2 Klein Base 4b",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_text_to_image-1.webp"
+  },
+  {
+    "slug": "flux-2-klein-4b",
+    "name": "flux-2-klein-4b.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/flux2-klein/resolve/main/split_files/diffusion_models/flux-2-klein-4b.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Flux 2 Klein 4b",
+    "docsUrl": "https://docs.comfy.org/tutorials/flux/flux-2-klein",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_flux2_klein_text_to_image-1.webp"
+  },
+  {
+    "slug": "netayumev35-pretrained-all-in-one",
+    "name": "NetaYumev35_pretrained_all_in_one.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/duongve/NetaYume-Lumina-Image-2.0/resolve/main/NetaYumev35_pretrained_all_in_one.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "NetaYumev35 Pretrained All In One",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/newbie-image/newbie-image-exp-0-1",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_netayume_lumina_t2i-1.webp"
+  },
+  {
+    "slug": "newbie-image-exp0-1-bf16",
+    "name": "NewBie-Image-Exp0.1-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/NewBie-image-Exp0.1_repackaged/resolve/main/split_files/diffusion_models/NewBie-Image-Exp0.1-bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "NewBie Image Exp0.1 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_newbieimage_exp0_1-t2i-1.webp"
+  },
+  {
+    "slug": "gemma-3-4b-it-bf16",
+    "name": "gemma_3_4b_it_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/NewBie-image-Exp0.1_repackaged/resolve/main/split_files/text_encoders/gemma_3_4b_it_bf16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Gemma 3 4b It BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_newbieimage_exp0_1-t2i-1.webp"
+  },
+  {
+    "slug": "jina-clip-v2-bf16",
+    "name": "jina_clip_v2_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/NewBie-image-Exp0.1_repackaged/resolve/main/split_files/text_encoders/jina_clip_v2_bf16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Jina Clip V2 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_newbieimage_exp0_1-t2i-1.webp"
+  },
+  {
+    "slug": "ovis-image-bf16",
+    "name": "ovis_image_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Ovis-Image/resolve/main/split_files/diffusion_models/ovis_image_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Ovis Image BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_ovis_text_to_image-1.webp"
+  },
+  {
+    "slug": "ovis-2-5",
+    "name": "ovis_2.5.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Ovis-Image/resolve/main/split_files/text_encoders/ovis_2.5.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Ovis 2.5",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_ovis_text_to_image-1.webp"
+  },
+  {
+    "slug": "qwen-image-lightning-8steps-v1-0",
+    "name": "Qwen-Image-Lightning-8steps-V1.0.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.0.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Lightning 8steps V1.0",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image-1.webp"
+  },
+  {
+    "slug": "wuli-qwen-image-2512-turbo-lora-2steps-v1-0-bf16",
+    "name": "Wuli-Qwen-Image-2512-Turbo-LoRA-2steps-V1.0-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Wuli-art/Qwen-Image-2512-Turbo-LoRA-2-Steps/resolve/main/Wuli-Qwen-Image-2512-Turbo-LoRA-2steps-V1.0-bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Wuli Qwen Image 2512 Turbo LoRA 2steps V1.0 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_2512_with_2stpes_lora-1.webp"
+  },
+  {
+    "slug": "qwen-image-canny-diffsynth-controlnet",
+    "name": "qwen_image_canny_diffsynth_controlnet.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-DiffSynth-ControlNets/resolve/main/split_files/model_patches/qwen_image_canny_diffsynth_controlnet.safetensors",
+    "directory": "model_patches",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Canny Diffsynth Controlnet",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_controlnet_patch-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-fp8-e4m3fn",
+    "name": "qwen_image_edit_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit FP8 e4m3fn",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_edit-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-lightning-4steps-v1-0-bf16",
+    "name": "Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit Lightning 4steps V1.0 BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image-edit",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_edit-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-relight",
+    "name": "Qwen-Image-Edit-2509-Relight.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/loras/Qwen-Image-Edit-2509-Relight.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit 2509 Relight",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_edit_2509_relight-1.webp"
+  },
+  {
+    "slug": "qwen-image-instantx-controlnet-union",
+    "name": "Qwen-Image-InstantX-ControlNet-Union.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Union.safetensors",
+    "directory": "controlnet",
+    "workflowCount": 1,
+    "displayName": "Qwen Image InstantX ControlNet Union",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_instantx_controlnet-1.webp"
+  },
+  {
+    "slug": "qwen-image-instantx-controlnet-inpainting",
+    "name": "Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
+    "directory": "controlnet",
+    "workflowCount": 1,
+    "displayName": "Qwen Image InstantX ControlNet Inpainting",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_instantx_inpainting_controlnet-1.webp"
+  },
+  {
+    "slug": "qwen-image-layered-bf16",
+    "name": "qwen_image_layered_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Layered_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_layered_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Layered BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_layered-1.webp"
+  },
+  {
+    "slug": "qwen-image-layered-control-bf16",
+    "name": "qwen_image_layered_control_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/DiffSynth-Studio/Qwen-Image-Layered-Control/resolve/main/qwen_image_layered_control_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Layered Control BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_layered_control-1.webp"
+  },
+  {
+    "slug": "qwen-image-union-diffsynth-lora",
+    "name": "qwen_image_union_diffsynth_lora.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-DiffSynth-ControlNets/resolve/main/split_files/loras/qwen_image_union_diffsynth_lora.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Union Diffsynth Lora",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/qwen/qwen-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_qwen_image_union_control_lora-1.webp"
+  },
+  {
+    "slug": "wan2-1-i2v-480p-14b-fp16",
+    "name": "wan2.1_i2v_480p_14B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 I2v 480p 14B FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan-video",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_to_video_wan-1.webp"
+  },
+  {
+    "slug": "z-image-bf16",
+    "name": "z_image_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/z_image/resolve/main/split_files/diffusion_models/z_image_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Z Image BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/image/z-image/z-image",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_z_image-1.webp"
+  },
+  {
+    "slug": "pixel-art-style-z-image-turbo",
+    "name": "pixel_art_style_z_image_turbo.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/tarn59/pixel_art_style_lora_z_image_turbo/resolve/main/pixel_art_style_z_image_turbo.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Pixel Art Style Z Image Turbo",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_z_image_turbo-1.webp"
+  },
+  {
+    "slug": "z-image-turbo-fun-controlnet-union",
+    "name": "Z-Image-Turbo-Fun-Controlnet-Union.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/alibaba-pai/Z-Image-Turbo-Fun-Controlnet-Union/resolve/main/Z-Image-Turbo-Fun-Controlnet-Union.safetensors",
+    "directory": "model_patches",
+    "workflowCount": 1,
+    "displayName": "Z Image Turbo Fun Controlnet Union",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/image_z_image_turbo_fun_union_controlnet-1.webp"
+  },
+  {
+    "slug": "ltx-video-2b-v0-9-5",
+    "name": "ltx-video-2b-v0.9.5.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Ltx Video 2b V0.9.5",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/ltxv",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/ltxv_image_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-video-2b-v0-9",
+    "name": "ltx-video-2b-v0.9.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Ltx Video 2b V0.9",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/ltxv",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/ltxv_text_to_video-1.webp"
+  },
+  {
+    "slug": "sd3-5-large-controlnet-blur",
+    "name": "sd3.5_large_controlnet_blur.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-controlnets_ComfyUI_repackaged/resolve/main/split_files/controlnet/sd3.5_large_controlnet_blur.safetensors",
+    "directory": "controlnet",
+    "workflowCount": 1,
+    "displayName": "Sd3.5 Large Controlnet Blur",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sd3.5_large_blur-1.webp"
+  },
+  {
+    "slug": "sd3-5-large-controlnet-canny",
+    "name": "sd3.5_large_controlnet_canny.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-controlnets_ComfyUI_repackaged/resolve/main/split_files/controlnet/sd3.5_large_controlnet_canny.safetensors",
+    "directory": "controlnet",
+    "workflowCount": 1,
+    "displayName": "Sd3.5 Large Controlnet Canny",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sd3.5_large_canny_controlnet_example-1.webp"
+  },
+  {
+    "slug": "sd3-5-large-controlnet-depth",
+    "name": "sd3.5_large_controlnet_depth.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-controlnets_ComfyUI_repackaged/resolve/main/split_files/controlnet/sd3.5_large_controlnet_depth.safetensors",
+    "directory": "controlnet",
+    "workflowCount": 1,
+    "displayName": "Sd3.5 Large Controlnet Depth",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sd3/#sd35-controlnets",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sd3.5_large_depth-1.webp"
+  },
+  {
+    "slug": "clip-vision-g",
+    "name": "clip_vision_g.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors?download=true",
+    "directory": "clip_vision",
+    "workflowCount": 1,
+    "displayName": "Clip Vision G",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sdxl/#revision",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sdxl_revision_text_prompts-1.webp"
+  },
+  {
+    "slug": "sd-xl-turbo-1-0-fp16",
+    "name": "sd_xl_turbo_1.0_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/stabilityai/sdxl-turbo/resolve/main/sd_xl_turbo_1.0_fp16.safetensors",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Sd Xl Turbo 1.0 FP16",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/sdturbo/",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/sdxlturbo_example-1.webp"
+  },
+  {
+    "slug": "wan21-t2v-14b-lightx2v-cfg-step-distill-lora-rank32",
+    "name": "Wan21_T2V_14B_lightx2v_cfg_step_distill_lora_rank32.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan21_T2V_14B_lightx2v_cfg_step_distill_lora_rank32.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Wan21 T2V 14B Lightx2v Cfg Step Distill Lora Rank32",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/template-Animation_Trajectory_Control_Wan_ATI-1.webp"
+  },
+  {
+    "slug": "umt5-xxl-enc-bf16",
+    "name": "umt5-xxl-enc-bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/umt5-xxl-enc-bf16.safetensors",
+    "directory": "text_encoders",
+    "workflowCount": 1,
+    "displayName": "Umt5 Xxl Enc BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/template-Animation_Trajectory_Control_Wan_ATI-1.webp"
+  },
+  {
+    "slug": "clip-vit-h-14-laion2b-s32b-b79k",
+    "name": "CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/CLIP-ViT-H-14-laion2B-s32B-b79K_repackaged/resolve/main/split_files/clip_vision/CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors",
+    "directory": "clip_vision",
+    "workflowCount": 1,
+    "displayName": "CLIP ViT H 14 Laion2B S32B B79K",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/template-Animation_Trajectory_Control_Wan_ATI-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-anything2realalpha",
+    "name": "Qwen-Image-Edit-2509-Anything2RealAlpha.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/loras/Qwen-Image-Edit-2509-Anything2RealAlpha.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit 2509 Anything2RealAlpha",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/templates-image_to_real-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-light-migration",
+    "name": "Qwen-Image-Edit-2509-Light-Migration.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/loras/Qwen-Image-Edit-2509-Light-Migration.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit 2509 Light Migration",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/templates-portrait_light_migration-1.webp"
+  },
+  {
+    "slug": "qwen-image-edit-2509-fusion",
+    "name": "Qwen-Image-Edit-2509-Fusion.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/loras/Qwen-Image-Edit-2509-Fusion.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Qwen Image Edit 2509 Fusion",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/templates-qwen_image_edit-crop_and_stitch-fusion-1.webp"
+  },
+  {
+    "slug": "wan2-1-t2v-1-3b-fp16",
+    "name": "wan2.1_t2v_1.3B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_fp16.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 T2v 1.3B FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan-video",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/text_to_video_wan-1.webp"
+  },
+  {
+    "slug": "svd-xt",
+    "name": "svd_xt.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/stabilityai/stable-video-diffusion-img2vid-xt/resolve/main/svd_xt.safetensors?download=true",
+    "directory": "checkpoints",
+    "workflowCount": 1,
+    "displayName": "Svd Xt",
+    "docsUrl": "https://comfyanonymous.github.io/ComfyUI_examples/video/#image-to-video",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/txt_to_image_to_video-1.webp"
+  },
+  {
+    "slug": "realesrgan-x4plus",
+    "name": "RealESRGAN_x4plus.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Real-ESRGAN_repackaged/resolve/main/RealESRGAN_x4plus.safetensors",
+    "directory": "upscale_models",
+    "workflowCount": 1,
+    "displayName": "RealESRGAN X4plus",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/ultility-gan_upscaler-1.webp"
+  },
+  {
+    "slug": "humo-17b-fp8-e4m3fn",
+    "name": "humo_17B_fp8_e4m3fn.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HuMo_ComfyUI/resolve/main/split_files/diffusion_models/humo_17B_fp8_e4m3fn.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Humo 17B FP8 e4m3fn",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_humo-1.webp"
+  },
+  {
+    "slug": "whisper-large-v3-fp16",
+    "name": "whisper_large_v3_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HuMo_ComfyUI/resolve/main/split_files/audio_encoders/whisper_large_v3_fp16.safetensors",
+    "directory": "audio_encoders",
+    "workflowCount": 1,
+    "displayName": "Whisper Large V3 FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_humo-1.webp"
+  },
+  {
+    "slug": "hunyuanvideo1-5-720p-i2v-fp16",
+    "name": "hunyuanvideo1.5_720p_i2v_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/diffusion_models/hunyuanvideo1.5_720p_i2v_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hunyuanvideo1.5 720p I2v FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_i2v-1.webp"
+  },
+  {
+    "slug": "hunyuanvideo1-5-720p-t2v-fp16",
+    "name": "hunyuanvideo1.5_720p_t2v_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/HunyuanVideo_1.5_repackaged/resolve/main/split_files/diffusion_models/hunyuanvideo1.5_720p_t2v_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Hunyuanvideo1.5 720p T2v FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_hunyuan_video_1.5_720p_t2v-1.webp"
+  },
+  {
+    "slug": "kandinsky5lite-i2v-5s",
+    "name": "kandinsky5lite_i2v_5s.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/kandinskylab/Kandinsky-5.0-I2V-Lite-5s/resolve/main/model/kandinsky5lite_i2v_5s.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Kandinsky5lite I2v 5s",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_kandinsky5_i2v-1.webp"
+  },
+  {
+    "slug": "kandinsky5lite-t2v-sft-5s",
+    "name": "kandinsky5lite_t2v_sft_5s.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/kandinskylab/Kandinsky-5.0-T2V-Lite-sft-5s/resolve/main/model/kandinsky5lite_t2v_sft_5s.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Kandinsky5lite T2v Sft 5s",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_kandinsky5_t2v-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-ic-lora-canny-control",
+    "name": "ltx-2-19b-ic-lora-canny-control.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2-19b-IC-LoRA-Canny-Control/resolve/main/ltx-2-19b-ic-lora-canny-control.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Ltx 2 19b Ic Lora Canny Control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_canny_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-ic-lora-depth-control",
+    "name": "ltx-2-19b-ic-lora-depth-control.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2-19b-IC-LoRA-Depth-Control/resolve/main/ltx-2-19b-ic-lora-depth-control.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Ltx 2 19b Ic Lora Depth Control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_depth_to_video-1.webp"
+  },
+  {
+    "slug": "ltx-2-19b-ic-lora-pose-control",
+    "name": "ltx-2-19b-ic-lora-pose-control.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Lightricks/LTX-2-19b-IC-LoRA-Pose-Control/resolve/main/ltx-2-19b-ic-lora-pose-control.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Ltx 2 19b Ic Lora Pose Control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_ltx2_pose_to_video-1.webp"
+  },
+  {
+    "slug": "wan2-1-t2v-14b-fp8-scaled",
+    "name": "wan2.1_t2v_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 T2v 14B FP8 scaled",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_alpha_t2v_14B-1.webp"
+  },
+  {
+    "slug": "wan-alpha-2-1-rgba-lora",
+    "name": "wan_alpha_2.1_rgba_lora.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/loras/wan_alpha_2.1_rgba_lora.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Wan Alpha 2.1 Rgba Lora",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_alpha_t2v_14B-1.webp"
+  },
+  {
+    "slug": "wan-alpha-2-1-vae-rgb-channel",
+    "name": "wan_alpha_2.1_vae_rgb_channel.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_alpha_2.1_vae_rgb_channel.safetensors",
+    "directory": "vae",
+    "workflowCount": 1,
+    "displayName": "Wan Alpha 2.1 Vae Rgb Channel",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_alpha_t2v_14B-1.webp"
+  },
+  {
+    "slug": "wan-alpha-2-1-vae-alpha-channel",
+    "name": "wan_alpha_2.1_vae_alpha_channel.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_alpha_2.1_vae_alpha_channel.safetensors",
+    "directory": "vae",
+    "workflowCount": 1,
+    "displayName": "Wan Alpha 2.1 Vae Alpha Channel",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_alpha_t2v_14B-1.webp"
+  },
+  {
+    "slug": "lightx2v-t2v-14b-cfg-step-distill-v2-lora-rank64-bf16",
+    "name": "lightx2v_T2V_14B_cfg_step_distill_v2_lora_rank64_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Lightx2v/lightx2v_T2V_14B_cfg_step_distill_v2_lora_rank64_bf16.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Lightx2v T2V 14B Cfg Step Distill V2 Lora Rank64 BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_alpha_t2v_14B-1.webp"
+  },
+  {
+    "slug": "wan2-1-fun-camera-v1-1-1-3b-bf16",
+    "name": "wan2.1_fun_camera_v1.1_1.3B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_fun_camera_v1.1_1.3B_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 Fun Camera V1.1 1.3B BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/fun-control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_fun_camera_v1.1_1.3B-1.webp"
+  },
+  {
+    "slug": "wan2-1-fun-camera-v1-1-14b-bf16",
+    "name": "wan2.1_fun_camera_v1.1_14B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_fun_camera_v1.1_14B_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 Fun Camera V1.1 14B BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/fun-control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2.1_fun_camera_v1.1_14B-1.webp"
+  },
+  {
+    "slug": "wan2-1-i2v-14b-480p-fp8-e4m3fn-scaled-kj",
+    "name": "Wan2_1-I2V-14B-480p_fp8_e4m3fn_scaled_KJ.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/I2V/Wan2_1-I2V-14B-480p_fp8_e4m3fn_scaled_KJ.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2 1 I2V 14B 480p FP8 e4m3fn scaled KJ",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_1_infinitetalk-1.webp"
+  },
+  {
+    "slug": "wan2-1-infinitetalk-multi-fp16",
+    "name": "wan2.1_infiniteTalk_multi_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/model_patches/wan2.1_infiniteTalk_multi_fp16.safetensors",
+    "directory": "model_patches",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 InfiniteTalk Multi FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_1_infinitetalk-1.webp"
+  },
+  {
+    "slug": "wav2vec2-chinese-base-fp16",
+    "name": "wav2vec2-chinese-base_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/wav2vec2_safetensors/resolve/main/wav2vec2-chinese-base_fp16.safetensors",
+    "directory": "audio_encoders",
+    "workflowCount": 1,
+    "displayName": "Wav2vec2 Chinese Base FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_1_infinitetalk-1.webp"
+  },
+  {
+    "slug": "wananimate-relight-lora-fp16",
+    "name": "WanAnimate_relight_lora_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/Wan22_relight/WanAnimate_relight_lora_fp16.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "WanAnimate Relight Lora FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-animate",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_animate-1.webp"
+  },
+  {
+    "slug": "wan2-2-animate-14b-fp8-e4m3fn-scaled-kj",
+    "name": "Wan2_2-Animate-14B_fp8_e4m3fn_scaled_KJ.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/Wan22Animate/Wan2_2-Animate-14B_fp8_e4m3fn_scaled_KJ.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2 2 Animate 14B FP8 e4m3fn scaled KJ",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-animate",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_animate-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-camera-high-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_camera_high_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_camera_high_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Camera High Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-camera",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_camera-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-camera-low-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_camera_low_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_camera_low_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Camera Low Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-camera",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_camera-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-control-high-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_control_high_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_control_high_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Control High Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_control-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-control-low-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_control_low_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_control_low_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Control Low Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_control-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-inpaint-high-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_inpaint_high_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_inpaint_high_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Inpaint High Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-inp",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_inpaint-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-inpaint-low-noise-14b-fp8-scaled",
+    "name": "wan2.2_fun_inpaint_low_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_inpaint_low_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Inpaint Low Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-fun-inp",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_fun_inpaint-1.webp"
+  },
+  {
+    "slug": "wav2vec2-large-english-fp16",
+    "name": "wav2vec2_large_english_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/audio_encoders/wav2vec2_large_english_fp16.safetensors",
+    "directory": "audio_encoders",
+    "workflowCount": 1,
+    "displayName": "Wav2vec2 Large English FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-s2v",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_s2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-s2v-14b-fp8-scaled",
+    "name": "wan2.2_s2v_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_s2v_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 S2v 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2-2-s2v",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_s2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-t2v-low-noise-14b-fp8-scaled",
+    "name": "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 T2v Low Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_t2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-t2v-high-noise-14b-fp8-scaled",
+    "name": "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 T2v High Noise 14B FP8 scaled",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_t2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-t2v-lightx2v-4steps-lora-v1-1-low-noise",
+    "name": "wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors",
+    "directory": "loras",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 T2v Lightx2v 4steps Lora V1.1 Low Noise",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan2_2",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_14B_t2v-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-control-5b-bf16",
+    "name": "wan2.2_fun_control_5B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_control_5B_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Control 5B BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_5B_fun_control-1.webp"
+  },
+  {
+    "slug": "wan2-2-fun-inpaint-5b-bf16",
+    "name": "wan2.2_fun_inpaint_5B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_fun_inpaint_5B_bf16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Fun Inpaint 5B BF16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_5B_fun_inpaint-1.webp"
+  },
+  {
+    "slug": "wan2-2-ti2v-5b-fp16",
+    "name": "wan2.2_ti2v_5B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_ti2v_5B_fp16.safetensors",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.2 Ti2v 5B FP16",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/video_wan2_2_5B_ti2v-1.webp"
+  },
+  {
+    "slug": "wan2-1-flf2v-720p-14b-fp16",
+    "name": "wan2.1_flf2v_720p_14B_fp16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_flf2v_720p_14B_fp16.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 Flf2v 720p 14B FP16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/wan-flf",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/wan2.1_flf2v_720_f16-1.webp"
+  },
+  {
+    "slug": "wan2-1-fun-control-1-3b-bf16",
+    "name": "wan2.1_fun_control_1.3B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_fun_control_1.3B_bf16.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 Fun Control 1.3B BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/fun-control",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/wan2.1_fun_control-1.webp"
+  },
+  {
+    "slug": "wan2-1-fun-inp-1-3b-bf16",
+    "name": "wan2.1_fun_inp_1.3B_bf16.safetensors",
+    "huggingFaceUrl": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_fun_inp_1.3B_bf16.safetensors?download=true",
+    "directory": "diffusion_models",
+    "workflowCount": 1,
+    "displayName": "Wan2.1 Fun Inp 1.3B BF16",
+    "docsUrl": "https://docs.comfy.org/tutorials/video/wan/fun-inp",
+    "thumbnailUrl": "https://raw.githubusercontent.com/Comfy-Org/workflow_templates/main/templates/wan2.1_fun_inp-1.webp"
+  }
+]
diff --git a/apps/website/src/config/model-metadata.ts b/apps/website/src/config/model-metadata.ts
new file mode 100644
index 0000000000..07f8e1ec15
--- /dev/null
+++ b/apps/website/src/config/model-metadata.ts
@@ -0,0 +1,208 @@
+interface ModelOverride {
+  docsUrl?: string
+  blogUrl?: string
+  featured?: boolean
+  // Slug used on comfy.org/workflows/model/{hubSlug}. Only set when the page exists.
+  hubSlug?: string
+}
+
+export const modelMetadata: Record<string, ModelOverride> = {
+  'nano-banana': {
+    docsUrl:
+      'https://docs.comfy.org/tutorials/partner-nodes/google/nano-banana-pro',
+    hubSlug: 'nano-banana',
+    featured: true
+  },
+  'kling-ai': {
+    docsUrl:
+      'https://docs.comfy.org/tutorials/partner-nodes/kling/kling-motion-control',
+    hubSlug: 'kling',
+    featured: true
+  },
+  'meshy-ai': {
+    docsUrl: 'https://docs.comfy.org/tutorials/partner-nodes/meshy/meshy-6',
+    hubSlug: 'meshy',
+    featured: true
+  },
+  'openai-dall-e': {
+    docsUrl: 'https://docs.comfy.org/tutorials/partner-nodes/openai/dall-e-3',
+    hubSlug: 'openai',
+    featured: true
+  },
+  'ltxv-api': {
+    docsUrl: 'https://docs.comfy.org/tutorials/video/ltxv',
+    hubSlug: 'ltx-2-3',
+    featured: true
+  },
+  'wan-api': {
+    docsUrl: 'https://docs.comfy.org/tutorials/video/wan/wan2_2',
+    hubSlug: 'wan',
+    featured: true
+  },
+  'wan-2-2': {
+    docsUrl: 'https://docs.comfy.org/tutorials/video/wan/wan2_2',
+    hubSlug: 'wan',
+    featured: true
+  },
+  'wan-2-1': {
+    docsUrl: 'https://docs.comfy.org/tutorials/video/wan/wan-video',
+    hubSlug: 'wan',
+    featured: true
+  },
+  'flux-1-kontext-dev': {
+    docsUrl:
+      'https://docs.comfy.org/tutorials/partner-nodes/black-forest-labs/flux-1-kontext',
+    hubSlug: 'flux-1-kontext',
+    featured: true
+  },
+  'flux1-dev': {
+    docsUrl: 'https://docs.comfy.org/tutorials/flux/flux-1-text-to-image',
+    hubSlug: 'flux-1',
+    featured: true
+  },
+  'flux1-schnell': {
+    hubSlug: 'flux-1',
+    featured: true
+  },
+  'hunyuan-video': {
+    docsUrl: 'https://docs.comfy.org/tutorials/video/hunyuan/hunyuan-video',
+    hubSlug: 'hunyuan-video',
+    featured: true
+  },
+  'hunyuan-3d': {
+    docsUrl: 'https://docs.comfy.org/tutorials/3d/hunyuan3D-2',
+    hubSlug: 'hunyuan-3d',
+    featured: true
+  },
+  vidu: {
+    hubSlug: 'vidu',
+    featured: true
+  },
+  runway: {
+    hubSlug: 'runway',
+    featured: true
+  },
+  'stability-ai': {
+    hubSlug: 'stability',
+    featured: true
+  },
+  'seedance-bytedance': {
+    hubSlug: 'seedance',
+    featured: true
+  },
+  'grok-image': {
+    hubSlug: 'grok',
+    featured: false
+  },
+  'luma-dream-machine': {
+    hubSlug: 'luma',
+    featured: false
+  },
+  moonvalley: {
+    hubSlug: 'moonvalley',
+    featured: false
+  },
+  'magnific-ai': {
+    hubSlug: 'magnific',
+    featured: false
+  },
+  pixverse: {
+    hubSlug: 'pixverse',
+    featured: false
+  },
+  'rodin-3d': {
+    hubSlug: 'rodin',
+    featured: false
+  },
+  recraft: {
+    hubSlug: 'recraft',
+    featured: false
+  },
+  'bria-ai': {
+    hubSlug: 'bria',
+    featured: false
+  },
+  'topaz-labs': {
+    hubSlug: 'topaz',
+    featured: false
+  },
+  wavespeed: {
+    hubSlug: 'wavespeed',
+    featured: false
+  },
+  ideogram: {
+    hubSlug: 'ideogram',
+    featured: false
+  },
+  'veo-2': {
+    hubSlug: 'veo',
+    featured: false
+  },
+  'veo-3': {
+    hubSlug: 'veo',
+    featured: false
+  },
+  'flux-2-api': {
+    hubSlug: 'flux-2',
+    featured: false
+  },
+  'ace-step-v1-3-5b': {
+    docsUrl: 'https://docs.comfy.org/tutorials/audio/ace-step/ace-step-v1',
+    hubSlug: 'ace-step',
+    featured: false
+  },
+  'hidream-i1-dev-fp8': {
+    docsUrl: 'https://docs.comfy.org/tutorials/image/hidream/hidream-i1',
+    hubSlug: 'hidream',
+    featured: false
+  },
+  'omnigen2-fp16': {
+    hubSlug: 'omnigen',
+    featured: false
+  },
+  'sd-xl-base-1-0': {
+    hubSlug: 'sdxl',
+    featured: false
+  },
+  'z-image-bf16': {
+    hubSlug: 'z-image',
+    featured: false
+  },
+  'z-image-turbo-bf16': {
+    hubSlug: 'z-image',
+    featured: false
+  },
+  'svd-xt': {
+    hubSlug: 'svd',
+    featured: false
+  },
+  'flux1-dev-kontext-fp8-scaled': {
+    docsUrl: 'https://docs.comfy.org/tutorials/flux/flux-1-kontext-dev',
+    hubSlug: 'flux-1-kontext',
+    featured: false
+  },
+  'ltx-2-19b-dev-fp8': {
+    hubSlug: 'ltx-2',
+    featured: false
+  },
+  'ltx-2-19b-distilled': {
+    hubSlug: 'ltx-2',
+    featured: false
+  },
+  'flux1-fill-dev': {
+    hubSlug: 'flux-1',
+    featured: false
+  },
+  'flux-2-klein-base-9b-fp8': {
+    hubSlug: 'flux-2',
+    featured: false
+  },
+  'qwen-image-fp8-e4m3fn': {
+    hubSlug: 'qwen',
+    featured: false
+  },
+  'qwen-image-edit-2509-fp8-e4m3fn': {
+    hubSlug: 'qwen',
+    featured: false
+  }
+}
diff --git a/apps/website/src/config/models.ts b/apps/website/src/config/models.ts
new file mode 100644
index 0000000000..c779ac1430
--- /dev/null
+++ b/apps/website/src/config/models.ts
@@ -0,0 +1,81 @@
+import generatedModels from './generated-models.json'
+import { modelMetadata } from './model-metadata'
+
+type ModelDirectory =
+  | 'diffusion_models'
+  | 'checkpoints'
+  | 'loras'
+  | 'controlnet'
+  | 'clip_vision'
+  | 'model_patches'
+  | 'vae'
+  | 'text_encoders'
+  | 'audio_encoders'
+  | 'latent_upscale_models'
+  | 'upscale_models'
+  | 'style_models'
+  | 'partner_nodes'
+
+interface Model {
+  readonly slug: string
+  readonly canonicalSlug?: string
+  readonly name: string
+  readonly displayName: string
+  readonly directory: ModelDirectory
+  readonly huggingFaceUrl: string
+  readonly thumbnailUrl?: string
+  readonly docsUrl?: string
+  readonly blogUrl?: string
+  readonly hubSlug?: string
+  readonly featured: boolean
+  readonly workflowCount: number
+}
+
+export const models: readonly Model[] = (
+  generatedModels as Array<{
+    slug: string
+    canonicalSlug?: string
+    name: string
+    displayName: string
+    directory: string
+    huggingFaceUrl: string
+    docsUrl?: string
+    thumbnailUrl?: string
+    workflowCount: number
+  }>
+).map((m) => ({
+  slug: m.slug,
+  ...(m.canonicalSlug ? { canonicalSlug: m.canonicalSlug } : {}),
+  name: m.name,
+  displayName: m.displayName,
+  directory: m.directory as ModelDirectory,
+  huggingFaceUrl: m.huggingFaceUrl,
+  ...(m.docsUrl ? { docsUrl: m.docsUrl } : {}),
+  ...(m.thumbnailUrl ? { thumbnailUrl: m.thumbnailUrl } : {}),
+  featured: false,
+  workflowCount: m.workflowCount,
+  ...modelMetadata[m.slug]
+}))
+
+const slugSet = new Set(models.map((m) => m.slug))
+if (slugSet.size !== models.length) {
+  for (const model of models) {
+    if (models.filter((m) => m.slug === model.slug).length > 1) {
+      throw new Error(`Duplicate model slug: ${model.slug}`)
+    }
+  }
+}
+for (const model of models) {
+  if (
+    model.canonicalSlug !== undefined &&
+    (!slugSet.has(model.canonicalSlug) || model.canonicalSlug === model.slug)
+  ) {
+    throw new Error(
+      `Invalid canonicalSlug "${model.canonicalSlug}" on "${model.slug}"`
+    )
+  }
+}
+
+export function getModelBySlug(slug: string): Model | undefined {
+  return models.find((m) => m.slug === slug)
+}
diff --git a/apps/website/src/config/routes.ts b/apps/website/src/config/routes.ts
index 8fa008e3b9..eb215b5c98 100644
--- a/apps/website/src/config/routes.ts
+++ b/apps/website/src/config/routes.ts
@@ -11,9 +11,11 @@ const baseRoutes = {
   about: '/about',
   careers: '/careers',
   customers: '/customers',
+  demos: '/demos',
   termsOfService: '/terms-of-service',
   privacyPolicy: '/privacy-policy',
-  contact: '/contact'
+  contact: '/contact',
+  models: '/p/supported-models'
 } as const
 
 type Routes = typeof baseRoutes
@@ -33,8 +35,11 @@ export const externalLinks = {
   discord: 'https://discord.com/invite/comfyorg',
   docs: 'https://docs.comfy.org/',
   docsApi: 'https://docs.comfy.org/api-reference/cloud',
+  docsSubscription: 'https://docs.comfy.org/support/subscription/subscribing',
   github: 'https://github.com/Comfy-Org/ComfyUI',
+  githubInstall: 'https://github.com/Comfy-Org/ComfyUI#installing',
   platform: 'https://platform.comfy.org',
+  platformUsage: 'https://platform.comfy.org/profile/usage',
   support: 'https://support.comfy.org/hc/en-us',
   workflows: 'https://comfy.org/workflows',
   youtube: 'https://www.youtube.com/@ComfyOrg'
diff --git a/apps/website/src/data/ashby-roles.snapshot.json b/apps/website/src/data/ashby-roles.snapshot.json
index b738e98407..455930cd62 100644
--- a/apps/website/src/data/ashby-roles.snapshot.json
+++ b/apps/website/src/data/ashby-roles.snapshot.json
@@ -1,37 +1,30 @@
 {
-  "fetchedAt": "2026-05-02T20:15:18.321Z",
+  "fetchedAt": "2026-05-12T16:10:34.114Z",
   "departments": [
     {
       "name": "DESIGN",
       "key": "design",
       "roles": [
         {
-          "id": "e915f2c78b17f93b",
+          "id": "18743530eb448c99",
           "title": "Senior Product Designer",
           "department": "Design",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/b2e864c6-4754-4e04-8f46-1022baa103c3/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/b2e864c6-4754-4e04-8f46-1022baa103c3"
         },
         {
-          "id": "b9f9a23219be7cd4",
-          "title": "Design Engineer",
-          "department": "Design",
-          "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/abc787b9-ad85-421c-8218-debd23bea096/application"
-        },
-        {
-          "id": "547b6ba622c800a5",
+          "id": "8718d17012f26fa2",
           "title": "Senior Product Designer - Craft",
           "department": "Design",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a32c6769-b791-41f4-9225-50bbd8a1cf0f/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/a32c6769-b791-41f4-9225-50bbd8a1cf0f"
         },
         {
-          "id": "7bb02634a24763bc",
+          "id": "1e181b9ed8fb2e86",
           "title": "Staff Product Designer - Systems",
           "department": "Design",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/0bc8356b-615e-4f40-b632-fd3b2691be34/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/0bc8356b-615e-4f40-b632-fd3b2691be34"
         }
       ]
     },
@@ -40,67 +33,67 @@
       "key": "engineering",
       "roles": [
         {
-          "id": "102d58e35a8a9817",
+          "id": "6a6d865eeb3c10a8",
           "title": "Senior Software Engineer, Frontend",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/c3e0584d-5490-491f-aae4-b5922ef63fd2/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/c3e0584d-5490-491f-aae4-b5922ef63fd2"
         },
         {
-          "id": "d01d69fba7743905",
+          "id": "1b4f7f1da9616e14",
           "title": "Senior Software Engineer, Backend Generalist",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/732f8b39-076d-4847-afe3-f54d4451607e/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/732f8b39-076d-4847-afe3-f54d4451607e"
         },
         {
-          "id": "f36f60cfd5bb5910",
+          "id": "a6d8269c66e37c5c",
           "title": "Senior/Staff Applied Machine Learning Engineer",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/5cc4d0bc-97b0-463b-8466-3ec1d07f6ac0/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/5cc4d0bc-97b0-463b-8466-3ec1d07f6ac0"
         },
         {
-          "id": "9d8ec4c65e20b19e",
+          "id": "841da783e6e41928",
           "title": "Software Engineer, Frontend",
           "department": "Engineering",
           "location": "Remote",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/99dc26c7-51ca-43cd-a1ba-7d475a0f4a40/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/99dc26c7-51ca-43cd-a1ba-7d475a0f4a40"
         },
         {
-          "id": "be94b193d1f4d482",
+          "id": "5d01d58b03870d7a",
           "title": "Tech Lead Manager, Frontend",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a0665088-3314-457a-aa7b-12ca5c3eb261/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/a0665088-3314-457a-aa7b-12ca5c3eb261"
         },
         {
-          "id": "ab48f5db6bd1783c",
+          "id": "91604c4182a1bc3c",
           "title": "Software Engineer, Core ComfyUI Contributor",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/7d4062d6-d500-445a-9a5f-014971af259f/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/7d4062d6-d500-445a-9a5f-014971af259f"
         },
         {
-          "id": "c5dff4ee628bdcd1",
+          "id": "a1dbc0576ab14034",
           "title": "Software Engineer, ComfyUI Desktop",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/ad2f76cb-a787-47d8-81c5-7e7f917747c0/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/ad2f76cb-a787-47d8-81c5-7e7f917747c0"
         },
         {
-          "id": "4302a7aaa87e16e3",
+          "id": "0b8f4fecd89c3b11",
           "title": "Product Manager, ComfyUI",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/9e4b9029-c3e9-436b-82c4-a1a9f1b8c16e/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/9e4b9029-c3e9-436b-82c4-a1a9f1b8c16e"
         },
         {
-          "id": "2eb53e8943cc9396",
+          "id": "2f6bac39d723dfef",
           "title": "Growth Engineer",
           "department": "Engineering",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/f1fdde76-84ae-48c1-b0f9-9654dd8e7de5/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/f1fdde76-84ae-48c1-b0f9-9654dd8e7de5"
         }
       ]
     },
@@ -109,39 +102,39 @@
       "key": "marketing",
       "roles": [
         {
-          "id": "4c5d6afb78652df7",
+          "id": "23dd98cab77ff459",
           "title": "Freelance Motion Designer",
           "department": "Marketing",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a7ccc2b4-4d9d-4e04-b39c-28a711995b5b/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/a7ccc2b4-4d9d-4e04-b39c-28a711995b5b"
         },
         {
-          "id": "0f5256cf302e552b",
+          "id": "a998b9fc973ff3c0",
           "title": "Creative Artist",
           "department": "Marketing",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/19ba10aa-4961-45e8-8473-66a8a7a8079d/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/19ba10aa-4961-45e8-8473-66a8a7a8079d"
         },
         {
-          "id": "5746486d87874937",
+          "id": "3e730938026d6e70",
           "title": "Graphic Designer",
           "department": "Marketing",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/49fa0b07-3fa1-4a3a-b2c6-d2cc684ad63f/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/49fa0b07-3fa1-4a3a-b2c6-d2cc684ad63f"
         },
         {
-          "id": "b5803a0d4785d406",
+          "id": "6f771af6858283aa",
           "title": "Lifecycle Growth Marketer",
           "department": "Marketing",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/be74d210-3b50-408c-9f61-8fee8833ce64/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/be74d210-3b50-408c-9f61-8fee8833ce64"
         },
         {
-          "id": "130d7218d7895bdb",
+          "id": "527a47e82970afc1",
           "title": "Partnership & Events Marketing Manager",
           "department": "Marketing",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/89d3ff75-2055-4e92-9c69-81feff55627c/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/89d3ff75-2055-4e92-9c69-81feff55627c"
         }
       ]
     },
@@ -150,25 +143,18 @@
       "key": "operations",
       "roles": [
         {
-          "id": "ec68ae44dd5943c9",
-          "title": "Talent Lead",
+          "id": "0c6cc3685194ab7a",
+          "title": "Head of Talent",
           "department": "Operations",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/d5008532-c45d-46e6-ba2c-20489d364362/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/d5008532-c45d-46e6-ba2c-20489d364362"
         },
         {
-          "id": "16f556001ce1cef4",
-          "title": "BizOps Strategist",
-          "department": "Operations",
-          "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/145b8558-0ab4-43e8-8fac-b59059cf2537/application"
-        },
-        {
-          "id": "8e773a72c1b8e099",
+          "id": "82bd6ed26adab1c3",
           "title": "Founding Customer Success Manager",
           "department": "Operations",
           "location": "San Francisco",
-          "applyUrl": "https://jobs.ashbyhq.com/comfy-org/a1c5c5ed-62ac-4767-af57-a3ba4e0bf5e4/application"
+          "jobUrl": "https://jobs.ashbyhq.com/comfy-org/a1c5c5ed-62ac-4767-af57-a3ba4e0bf5e4"
         }
       ]
     }
diff --git a/apps/website/src/data/cloud-nodes.snapshot.json b/apps/website/src/data/cloud-nodes.snapshot.json
new file mode 100644
index 0000000000..a5a85565db
--- /dev/null
+++ b/apps/website/src/data/cloud-nodes.snapshot.json
@@ -0,0 +1,394 @@
+{
+  "fetchedAt": "2026-05-04T16:29:55.587Z",
+  "packs": [
+    {
+      "id": "comfyui-impact-pack",
+      "registryId": "comfyui-impact-pack",
+      "displayName": "ComfyUI Impact Pack",
+      "description": "Production-grade detailer, detector, and SEG (segmentation) tooling. The most-used pack for face restoration, region-based refinement, and iterative upscaling on Comfy Cloud.",
+      "repoUrl": "https://github.com/ltdrdata/ComfyUI-Impact-Pack",
+      "publisher": {
+        "id": "drltdata",
+        "name": "Dr.Lt.Data"
+      },
+      "downloads": 2618646,
+      "githubStars": 3092,
+      "latestVersion": "8.28.3",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2026-04-19T17:08:04.993918Z",
+      "nodes": [
+        {
+          "name": "FaceDetailer",
+          "displayName": "FaceDetailer",
+          "category": "ImpactPack/Detailer",
+          "description": "Detect and refine faces with iterative passes."
+        },
+        {
+          "name": "DetailerForEach",
+          "displayName": "DetailerForEach",
+          "category": "ImpactPack/Detailer",
+          "description": "Run iterative detail refinement over detected SEG regions."
+        },
+        {
+          "name": "UltralyticsDetectorProvider",
+          "displayName": "UltralyticsDetectorProvider",
+          "category": "ImpactPack/Detector",
+          "description": "Provide detector models powered by Ultralytics YOLO."
+        },
+        {
+          "name": "SAMLoader",
+          "displayName": "SAMLoader",
+          "category": "ImpactPack/Detector",
+          "description": "Load Segment Anything models for high-fidelity masking."
+        },
+        {
+          "name": "MaskToSEGS",
+          "displayName": "MaskToSEGS",
+          "category": "ImpactPack/Operation",
+          "description": "Convert binary masks into SEGS regions for the detailer pipeline."
+        }
+      ]
+    },
+    {
+      "id": "ComfyUI-Crystools",
+      "registryId": "ComfyUI-Crystools",
+      "displayName": "ComfyUI-Crystools",
+      "description": "Live system monitoring (GPU, RAM, disk) and rich image inspection inside your workflow. The most-installed quality-of-life pack on the registry.",
+      "iconUrl": "https://raw.githubusercontent.com/crystian/ComfyUI-Crystools/main/docs/screwdriver.png",
+      "repoUrl": "https://github.com/crystian/ComfyUI-Crystools",
+      "publisher": {
+        "id": "crystian",
+        "name": "Crystian"
+      },
+      "downloads": 1671447,
+      "githubStars": 1855,
+      "latestVersion": "1.27.4",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2025-10-26T19:11:09.943366Z",
+      "supportedOs": ["OS Independent"],
+      "supportedAccelerators": ["GPU :: NVIDIA CUDA"],
+      "nodes": [
+        {
+          "name": "CCrystools_Show_Resources",
+          "displayName": "CCrystools_Show_Resources",
+          "category": "crystools/show",
+          "description": "Display GPU, RAM and disk usage live in the workflow."
+        },
+        {
+          "name": "CCrystools_Show_Image",
+          "displayName": "CCrystools_Show_Image",
+          "category": "crystools/show",
+          "description": "Inspect images at full resolution with metadata overlays."
+        },
+        {
+          "name": "CCrystools_Json",
+          "displayName": "CCrystools_Json",
+          "category": "crystools/json",
+          "description": "Compose and parse JSON inline for advanced workflows."
+        },
+        {
+          "name": "CCrystools_Pipe_To_Any",
+          "displayName": "CCrystools_Pipe_To_Any",
+          "category": "crystools/pipe",
+          "description": "Convert a pipe bus into individual outputs."
+        },
+        {
+          "name": "CCrystools_Save_Metadata",
+          "displayName": "CCrystools_Save_Metadata",
+          "category": "crystools/save",
+          "description": "Save images with workflow metadata embedded."
+        }
+      ]
+    },
+    {
+      "id": "rgthree-comfy",
+      "registryId": "rgthree-comfy",
+      "displayName": "rgthree-comfy",
+      "description": "Quality-of-life nodes that make complex workflows readable: Power Lora Loader, group bypassers, smarter reroutes, and inline debug widgets.",
+      "iconUrl": "https://comfy.rgthree.com/media/rgthree.svg",
+      "repoUrl": "https://github.com/rgthree/rgthree-comfy",
+      "publisher": {
+        "id": "rgthree"
+      },
+      "downloads": 3025389,
+      "githubStars": 3028,
+      "latestVersion": "1.0.2604070017",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2026-04-07T04:19:24.689627Z",
+      "nodes": [
+        {
+          "name": "Power Lora Loader (rgthree)",
+          "displayName": "Power Lora Loader (rgthree)",
+          "category": "rgthree",
+          "description": "Stack multiple LoRAs in a single, foldable widget."
+        },
+        {
+          "name": "Fast Groups Bypasser (rgthree)",
+          "displayName": "Fast Groups Bypasser (rgthree)",
+          "category": "rgthree",
+          "description": "Toggle whole groups on or off without rewiring."
+        },
+        {
+          "name": "Seed (rgthree)",
+          "displayName": "Seed (rgthree)",
+          "category": "rgthree",
+          "description": "A predictable seed control with quick reset."
+        },
+        {
+          "name": "Reroute (rgthree)",
+          "displayName": "Reroute (rgthree)",
+          "category": "rgthree",
+          "description": "A clean reroute alternative with persistent labels."
+        },
+        {
+          "name": "Display Any (rgthree)",
+          "displayName": "Display Any (rgthree)",
+          "category": "rgthree",
+          "description": "Inspect any value with a compact debug widget."
+        }
+      ]
+    },
+    {
+      "id": "comfyui-kjnodes",
+      "registryId": "comfyui-kjnodes",
+      "displayName": "ComfyUI-KJNodes",
+      "description": "Daily-driver utilities for image, latent and string handling: color matching, batch counters, resize helpers, and prompt presets.",
+      "iconUrl": "https://avatars.githubusercontent.com/u/40791699",
+      "repoUrl": "https://github.com/kijai/ComfyUI-KJNodes",
+      "publisher": {
+        "id": "kijai",
+        "name": "Kijai"
+      },
+      "downloads": 3319866,
+      "githubStars": 2544,
+      "latestVersion": "1.3.9",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2026-04-24T09:32:28.326616Z",
+      "nodes": [
+        {
+          "name": "ColorMatch",
+          "displayName": "ColorMatch",
+          "category": "KJNodes/image",
+          "description": "Match the colors of one image to another using statistics."
+        },
+        {
+          "name": "ImageResizeKJ",
+          "displayName": "ImageResizeKJ",
+          "category": "KJNodes/image",
+          "description": "Resize images with intuitive size and divisibility controls."
+        },
+        {
+          "name": "StringConstantMultiline",
+          "displayName": "StringConstantMultiline",
+          "category": "KJNodes/string",
+          "description": "A multi-line string constant suitable for prompts."
+        },
+        {
+          "name": "EmptyLatentImagePresets",
+          "displayName": "EmptyLatentImagePresets",
+          "category": "KJNodes/latent",
+          "description": "Quickly create empty latents at common resolutions."
+        },
+        {
+          "name": "GetImageSizeAndCount",
+          "displayName": "GetImageSizeAndCount",
+          "category": "KJNodes/image",
+          "description": "Read width, height and batch size from an image input."
+        }
+      ]
+    },
+    {
+      "id": "comfyui-easy-use",
+      "registryId": "comfyui-easy-use",
+      "displayName": "ComfyUI-Easy-Use",
+      "description": "Simplified, opinionated nodes that bundle common patterns into single drop-ins — full loader, pre-sampling, easy KSampler, and XY plotting.",
+      "iconUrl": "https://mintlify.s3.us-west-1.amazonaws.com/yolain/images/logo.svg",
+      "repoUrl": "https://github.com/yolain/ComfyUI-Easy-Use",
+      "publisher": {
+        "id": "yolain",
+        "name": "yolain"
+      },
+      "downloads": 2767609,
+      "githubStars": 2500,
+      "latestVersion": "1.3.6",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2026-01-23T06:19:17.505188Z",
+      "nodes": [
+        {
+          "name": "easy fullLoader",
+          "displayName": "easy fullLoader",
+          "category": "EasyUse/Loaders",
+          "description": "Combined checkpoint, VAE and CLIP loader with sensible defaults."
+        },
+        {
+          "name": "easy preSampling",
+          "displayName": "easy preSampling",
+          "category": "EasyUse/PreSampling",
+          "description": "A unified pre-sampling node bundling common settings."
+        },
+        {
+          "name": "easy kSampler",
+          "displayName": "easy kSampler",
+          "category": "EasyUse/KSampler",
+          "description": "A simplified KSampler with extra quality-of-life options."
+        },
+        {
+          "name": "easy showAnything",
+          "displayName": "easy showAnything",
+          "category": "EasyUse/Util",
+          "description": "Display any value inline for debugging."
+        },
+        {
+          "name": "easy XYPlot",
+          "displayName": "easy XYPlot",
+          "category": "EasyUse/XYPlot",
+          "description": "Compose XY plots over arbitrary parameters."
+        }
+      ]
+    },
+    {
+      "id": "comfyui-advanced-controlnet",
+      "registryId": "comfyui-advanced-controlnet",
+      "displayName": "ComfyUI-Advanced-ControlNet",
+      "description": "ControlNet with timestep keyframes, per-frame masks, and advanced strength scheduling — essential for animation and batched-latent workflows.",
+      "repoUrl": "https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet",
+      "publisher": {
+        "id": "kosinkadink",
+        "name": "Kosinkadink"
+      },
+      "downloads": 590539,
+      "githubStars": 967,
+      "latestVersion": "1.5.7",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2026-03-30T01:40:06.836236Z",
+      "nodes": [
+        {
+          "name": "Apply Advanced ControlNet",
+          "displayName": "Apply Advanced ControlNet",
+          "category": "Adv-ControlNet/conditioning",
+          "description": "Apply ControlNet with timestep keyframes and per-frame masks."
+        },
+        {
+          "name": "ControlNetLoaderAdvanced",
+          "displayName": "ControlNetLoaderAdvanced",
+          "category": "Adv-ControlNet/loaders",
+          "description": "Load ControlNet models with the advanced wrapper."
+        },
+        {
+          "name": "Latent Keyframe Group",
+          "displayName": "Latent Keyframe Group",
+          "category": "Adv-ControlNet/keyframes",
+          "description": "Schedule ControlNet strength over a batch of latents."
+        },
+        {
+          "name": "Timestep Keyframe",
+          "displayName": "Timestep Keyframe",
+          "category": "Adv-ControlNet/keyframes",
+          "description": "Set ControlNet strength at a specific timestep."
+        },
+        {
+          "name": "Scaled Soft Mask",
+          "displayName": "Scaled Soft Mask",
+          "category": "Adv-ControlNet/masks",
+          "description": "Apply a soft attention mask to ControlNet conditioning."
+        }
+      ]
+    },
+    {
+      "id": "was-node-suite-comfyui",
+      "registryId": "was-node-suite-comfyui",
+      "displayName": "WAS Node Suite",
+      "description": "A broad utility suite covering image adjustments, compositing, text, math, and I/O — the original \"kitchen sink\" pack still relied on by thousands of workflows.",
+      "repoUrl": "https://github.com/WASasquatch/was-node-suite-comfyui",
+      "publisher": {
+        "id": "was",
+        "name": "WAS"
+      },
+      "downloads": 981051,
+      "githubStars": 1777,
+      "latestVersion": "1.0.1",
+      "license": "See repository LICENSE",
+      "lastUpdated": "2024-08-01T05:28:23.655235Z",
+      "nodes": [
+        {
+          "name": "Image Filter Adjustments",
+          "displayName": "Image Filter Adjustments",
+          "category": "WAS Suite/Image/Adjustment",
+          "description": "Adjust brightness, contrast, saturation and more."
+        },
+        {
+          "name": "Image Blending Mode",
+          "displayName": "Image Blending Mode",
+          "category": "WAS Suite/Image/Compositing",
+          "description": "Composite two images with Photoshop-style blend modes."
+        },
+        {
+          "name": "Text String",
+          "displayName": "Text String",
+          "category": "WAS Suite/Text",
+          "description": "A reusable text constant suitable for prompts."
+        },
+        {
+          "name": "Number to Float",
+          "displayName": "Number to Float",
+          "category": "WAS Suite/Number",
+          "description": "Cast integer or string values to a float."
+        },
+        {
+          "name": "Image Save",
+          "displayName": "Image Save",
+          "category": "WAS Suite/IO",
+          "description": "Save an image to disk with rich filename templating."
+        }
+      ]
+    },
+    {
+      "id": "comfyui_ipadapter_plus",
+      "registryId": "comfyui_ipadapter_plus",
+      "displayName": "ComfyUI_IPAdapter_plus",
+      "description": "Reference-image conditioning with IPAdapter — style transfer, Face ID, and multi-image embeddings. The most-installed conditioning pack on the registry, used in countless portrait, product, and animation workflows.",
+      "repoUrl": "https://github.com/cubiq/ComfyUI_IPAdapter_plus",
+      "publisher": {
+        "id": "matteo",
+        "name": "Matteo"
+      },
+      "downloads": 1208394,
+      "githubStars": 5938,
+      "latestVersion": "2.0.0",
+      "license": "GPL-3.0 license",
+      "lastUpdated": "2024-06-05T06:57:13.485481Z",
+      "nodes": [
+        {
+          "name": "IPAdapterUnifiedLoader",
+          "displayName": "IPAdapterUnifiedLoader",
+          "category": "ipadapter",
+          "description": "Load IPAdapter, image encoder and CLIP vision in one node."
+        },
+        {
+          "name": "IPAdapterFaceID",
+          "displayName": "IPAdapterFaceID",
+          "category": "ipadapter/faceid",
+          "description": "Apply Face ID embeddings for high-fidelity portrait reference."
+        },
+        {
+          "name": "IPAdapterStyleComposition",
+          "displayName": "IPAdapterStyleComposition",
+          "category": "ipadapter",
+          "description": "Reference an image for style without copying its content."
+        },
+        {
+          "name": "IPAdapterAdvanced",
+          "displayName": "IPAdapterAdvanced",
+          "category": "ipadapter",
+          "description": "Full-control IPAdapter with masking, weights, and noise injection."
+        },
+        {
+          "name": "IPAdapterEncoder",
+          "displayName": "IPAdapterEncoder",
+          "category": "ipadapter/embeds",
+          "description": "Encode reference images into IPAdapter embeddings for reuse."
+        }
+      ]
+    }
+  ]
+}
diff --git a/apps/website/src/data/cloudNodes.ts b/apps/website/src/data/cloudNodes.ts
new file mode 100644
index 0000000000..fb25603564
--- /dev/null
+++ b/apps/website/src/data/cloudNodes.ts
@@ -0,0 +1,52 @@
+export interface PackNode {
+  name: string
+  displayName: string
+  category: string
+  description?: string
+  deprecated?: boolean
+  experimental?: boolean
+}
+
+export interface Pack {
+  id: string
+  registryId?: string
+  displayName: string
+  description?: string
+  bannerUrl?: string
+  iconUrl?: string
+  repoUrl?: string
+  publisher?: {
+    id: string
+    name?: string
+  }
+  downloads?: number
+  githubStars?: number
+  latestVersion?: string
+  license?: string
+  lastUpdated?: string
+  supportedOs?: string[]
+  supportedAccelerators?: string[]
+  nodes: PackNode[]
+}
+
+export interface NodesSnapshot {
+  fetchedAt: string
+  packs: Pack[]
+}
+
+export function isNodesSnapshot(value: unknown): value is NodesSnapshot {
+  if (value === null || typeof value !== 'object') return false
+  const candidate = value as { fetchedAt?: unknown; packs?: unknown }
+  if (typeof candidate.fetchedAt !== 'string') return false
+  if (!Array.isArray(candidate.packs)) return false
+
+  return candidate.packs.every((pack) => {
+    if (pack === null || typeof pack !== 'object') return false
+    const p = pack as { id?: unknown; displayName?: unknown; nodes?: unknown }
+    return (
+      typeof p.id === 'string' &&
+      typeof p.displayName === 'string' &&
+      Array.isArray(p.nodes)
+    )
+  })
+}
diff --git a/apps/website/src/data/roles.ts b/apps/website/src/data/roles.ts
index d1e4cf075d..dd2896d28f 100644
--- a/apps/website/src/data/roles.ts
+++ b/apps/website/src/data/roles.ts
@@ -3,7 +3,7 @@ export interface Role {
   title: string
   department: string
   location: string
-  applyUrl: string
+  jobUrl: string
 }
 
 export interface Department {
diff --git a/apps/website/src/i18n/translations.ts b/apps/website/src/i18n/translations.ts
index 06342ace68..1bf6dfa1ff 100644
--- a/apps/website/src/i18n/translations.ts
+++ b/apps/website/src/i18n/translations.ts
@@ -735,6 +735,142 @@ const translations = {
     'zh-CN': '免费试用 COMFY CLOUD'
   },
 
+  'cloudNodes.hero.label': {
+    en: 'CLOUD NODES',
+    'zh-CN': '云端节点目录'
+  },
+  'cloudNodes.hero.heading': {
+    en: 'Run your favorite ComfyUI custom nodes on the cloud',
+    'zh-CN': '在云端运行你喜爱的 ComfyUI 自定义节点'
+  },
+  'cloudNodes.hero.body': {
+    en: 'Spin up workflows with hundreds of community-built nodes — detailers, ControlNet preprocessors, animation tools, and quality-of-life utilities — preinstalled on Comfy Cloud and ready to run on managed GPUs.',
+    'zh-CN':
+      '在 Comfy Cloud 托管 GPU 上即开即用，预装数百个社区节点——细节修复、ControlNet 预处理、动画工具与日常便利组件，应有尽有。'
+  },
+  'cloudNodes.section.heading': {
+    en: 'Find a custom-node pack',
+    'zh-CN': '查找自定义节点包'
+  },
+  'cloudNodes.search.placeholder': {
+    en: 'Search packs or nodes',
+    'zh-CN': '搜索节点包或节点名称'
+  },
+  'cloudNodes.sort.downloads': {
+    en: 'Most installed',
+    'zh-CN': '按安装量'
+  },
+  'cloudNodes.sort.mostNodes': {
+    en: 'Most nodes',
+    'zh-CN': '按节点数量'
+  },
+  'cloudNodes.sort.az': {
+    en: 'A → Z',
+    'zh-CN': '按名称 A → Z'
+  },
+  'cloudNodes.sort.recentlyUpdated': {
+    en: 'Recently updated',
+    'zh-CN': '最近更新'
+  },
+  'cloudNodes.search.label': {
+    en: 'Search custom-node packs',
+    'zh-CN': '搜索自定义节点包'
+  },
+  'cloudNodes.sort.label': {
+    en: 'Sort packs',
+    'zh-CN': '排序节点包'
+  },
+  'cloudNodes.list.ariaLabel': {
+    en: 'Custom-node packs supported on Comfy Cloud',
+    'zh-CN': 'Comfy Cloud 支持的自定义节点包'
+  },
+  'cloudNodes.meta.title': {
+    en: 'Custom-node packs on Comfy Cloud — supported by default',
+    'zh-CN': 'Comfy Cloud 自定义节点包合集——开箱即用'
+  },
+  'cloudNodes.meta.description': {
+    en: 'Browse hundreds of ComfyUI custom-node packs preinstalled on Comfy Cloud. Detailers, ControlNet preprocessors, animation tools, samplers, and more — search by pack or by node name.',
+    'zh-CN':
+      '浏览 Comfy Cloud 预装的数百个 ComfyUI 自定义节点包：细节修复、ControlNet 预处理、动画工具、采样器等——按节点包或节点名搜索。'
+  },
+  'cloudNodes.detail.metaTitle': {
+    en: '{pack} on Comfy Cloud',
+    'zh-CN': '{pack}（Comfy Cloud）'
+  },
+  'cloudNodes.detail.metaDescription': {
+    en: '{pack} is preinstalled on Comfy Cloud — {nodeCount} nodes ready to run on managed GPUs. {description}',
+    'zh-CN':
+      '{pack} 已预装于 Comfy Cloud——{nodeCount} 个节点可在托管 GPU 上即时运行。{description}'
+  },
+  'cloudNodes.empty.heading': {
+    en: 'No matching packs',
+    'zh-CN': '未找到匹配的节点包'
+  },
+  'cloudNodes.empty.body': {
+    en: 'Try a different search term or clear your filters.',
+    'zh-CN': '试试其他关键词，或清空筛选条件。'
+  },
+  'cloudNodes.card.nodeCountOne': {
+    en: '{count} node',
+    'zh-CN': '{count} 个节点'
+  },
+  'cloudNodes.card.nodeCountOther': {
+    en: '{count} nodes',
+    'zh-CN': '{count} 个节点'
+  },
+  'cloudNodes.card.viewRepo': {
+    en: 'View repository',
+    'zh-CN': '查看仓库'
+  },
+  'cloudNodes.card.unavailableDescription': {
+    en: 'Description unavailable.',
+    'zh-CN': '暂无描述信息。'
+  },
+  'cloudNodes.card.nodesHeading': {
+    en: 'Included nodes',
+    'zh-CN': '包含节点'
+  },
+  'cloudNodes.detail.back': {
+    en: 'Back to all packs',
+    'zh-CN': '返回所有节点包'
+  },
+  'cloudNodes.detail.publisher': {
+    en: 'Publisher',
+    'zh-CN': '发布者'
+  },
+  'cloudNodes.detail.downloads': {
+    en: 'Downloads',
+    'zh-CN': '下载量'
+  },
+  'cloudNodes.detail.stars': {
+    en: 'GitHub stars',
+    'zh-CN': 'GitHub 星标'
+  },
+  'cloudNodes.detail.latestVersion': {
+    en: 'Latest version',
+    'zh-CN': '最新版本'
+  },
+  'cloudNodes.detail.license': {
+    en: 'License',
+    'zh-CN': '许可证'
+  },
+  'cloudNodes.detail.lastUpdated': {
+    en: 'Last updated',
+    'zh-CN': '最后更新'
+  },
+  'cloudNodes.detail.deprecated': {
+    en: 'Deprecated',
+    'zh-CN': '已弃用'
+  },
+  'cloudNodes.detail.experimental': {
+    en: 'Experimental',
+    'zh-CN': '实验性'
+  },
+  'cloudNodes.detail.nodesHeading': {
+    en: 'Nodes in this pack',
+    'zh-CN': '此节点包中的节点'
+  },
+
   // Cloud – ReasonSection
   'cloud.reason.heading': {
     en: 'Why\nprofessionals\nchoose ',
@@ -1119,6 +1255,10 @@ const translations = {
     en: 'Import your own LoRAs',
     'zh-CN': '导入你自己的 LoRA'
   },
+  'pricing.plan.creator.feature2': {
+    en: '3 concurrent API jobs',
+    'zh-CN': '3 个并发 API 任务'
+  },
 
   'pricing.plan.pro.label': { en: 'PRO', 'zh-CN': '专业版' },
   'pricing.plan.pro.summary': {
@@ -1143,6 +1283,10 @@ const translations = {
     en: 'Longer workflow runtime (up to 1 hour)',
     'zh-CN': '更长工作流运行时长（最长 1 小时）'
   },
+  'pricing.plan.pro.feature2': {
+    en: '5 concurrent API jobs',
+    'zh-CN': '5 个并发 API 任务'
+  },
 
   'pricing.enterprise.label': { en: 'ENTERPRISE', 'zh-CN': '企业版' },
   'pricing.enterprise.heading': {
@@ -1599,7 +1743,7 @@ const translations = {
   },
   'nav.comfyHub': { en: 'Comfy Hub', 'zh-CN': 'Comfy Hub' },
   'nav.gallery': { en: 'Gallery', 'zh-CN': '画廊' },
-  'nav.blogs': { en: 'Blogs', 'zh-CN': '博客' },
+  'nav.blogs': { en: 'Blog', 'zh-CN': '博客' },
   'nav.github': { en: 'GitHub', 'zh-CN': 'GitHub' },
   'nav.discord': { en: 'Discord', 'zh-CN': 'Discord' },
   'nav.docs': { en: 'Docs', 'zh-CN': '文档' },
@@ -3498,18 +3642,6 @@ const translations = {
     en: 'Dale Carman | Co-founder @ Groove Jones',
     'zh-CN': 'Dale Carman | Groove Jones 联合创始人'
   },
-  'customers.detail.groove-jones.topic-10.block.2.label': {
-    en: 'GROOVE JONES CONTRIBUTORS',
-    'zh-CN': 'GROOVE JONES 贡献者'
-  },
-  'customers.detail.groove-jones.topic-10.block.2.name': {
-    en: 'TBD',
-    'zh-CN': '待补充'
-  },
-  'customers.detail.groove-jones.topic-10.block.2.role': {
-    en: 'TBD',
-    'zh-CN': '待补充'
-  },
 
   // Contact – FormSection
   'contact.form.badge': {
@@ -3542,6 +3674,94 @@ const translations = {
     'zh-CN': '我们会为您处理请求。'
   },
 
+  'demos.category.templates': { en: 'TEMPLATES', 'zh-CN': '模板' },
+  'demos.category.gettingStarted': { en: 'GETTING STARTED', 'zh-CN': '入门' },
+
+  'demos.image-to-video.title': {
+    en: 'Create a Video from an Image',
+    'zh-CN': '从图片创建视频'
+  },
+  'demos.image-to-video.description': {
+    en: 'Learn how to use the Image to Video workflow template in ComfyUI to generate short video clips from a single image.',
+    'zh-CN':
+      '了解如何使用 ComfyUI 中的图片转视频工作流模板，从单张图片生成短视频。'
+  },
+  'demos.image-to-video.transcript': {
+    en: '<ol><li><strong>Open ComfyUI</strong> — Launch the application and you\'ll see the node-based workflow canvas where all your AI pipelines are built.</li><li><strong>Browse templates</strong> — Click the workflow templates button in the sidebar to browse available starting points.</li><li><strong>Select Image to Video</strong> — Find and select the "Image to Video" template from the list to load it onto your canvas.</li><li><strong>Upload your image</strong> — Click the image upload node and select the source image you want to animate.</li><li><strong>Run the workflow</strong> — Click the "Queue" button to execute the workflow and generate your video output.</li></ol>',
+    'zh-CN':
+      '<ol><li><strong>打开 ComfyUI</strong> — 启动应用程序，您将看到基于节点的工作流画布。</li><li><strong>浏览模板</strong> — 点击侧栏中的工作流模板按钮，浏览可用模板。</li><li><strong>选择图片转视频</strong> — 从列表中找到并选择"图片转视频"模板。</li><li><strong>上传图片</strong> — 点击图片上传节点，选择要动画化的源图片。</li><li><strong>运行工作流</strong> — 点击"排队"按钮执行工作流并生成视频输出。</li></ol>'
+  },
+
+  'demos.workflow-templates.title': {
+    en: 'Browse Workflow Templates',
+    'zh-CN': '浏览工作流模板'
+  },
+  'demos.workflow-templates.description': {
+    en: "Explore ComfyUI's built-in workflow templates to quickly get started with common AI generation tasks.",
+    'zh-CN': '探索 ComfyUI 内置的工作流模板，快速开始常见的 AI 生成任务。'
+  },
+  'demos.workflow-templates.transcript': {
+    en: '<ol><li><strong>Open the template browser</strong> — Click the templates icon in the ComfyUI sidebar to open the template library.</li><li><strong>Browse categories</strong> — Templates are organized by task: image generation, video, upscaling, and more.</li><li><strong>Preview a template</strong> — Hover over any template to see a preview of its workflow and expected output.</li><li><strong>Load and customize</strong> — Click to load a template, then modify parameters to fit your needs.</li></ol>',
+    'zh-CN':
+      '<ol><li><strong>打开模板浏览器</strong> — 点击 ComfyUI 侧栏中的模板图标。</li><li><strong>浏览分类</strong> — 模板按任务分类：图像生成、视频、放大等。</li><li><strong>预览模板</strong> — 将鼠标悬停在模板上查看预览。</li><li><strong>加载并自定义</strong> — 点击加载模板，然后修改参数。</li></ol>'
+  },
+
+  'demos.community-workflows.title': {
+    en: 'Explore and Use a Community Workflow from the Hub',
+    'zh-CN': '探索并使用社区工作流'
+  },
+  'demos.community-workflows.description': {
+    en: 'Discover how to find and get started with popular community workflows for generative AI projects.',
+    'zh-CN': '了解如何查找并使用流行的社区工作流来构建生成式 AI 项目。'
+  },
+  'demos.community-workflows.transcript': {
+    en: '<ol><li><strong>Open the Workflow Hub</strong> — From the ComfyUI sidebar, navigate to the community Workflow Hub to browse curated and trending workflows shared by the community.</li><li><strong>Browse popular workflows</strong> — Explore featured projects sorted by popularity, recency, and category to find one that matches your goal.</li><li><strong>Preview a workflow</strong> — Click a workflow card to see example outputs, required models, and a description of what it produces.</li><li><strong>Open in ComfyUI</strong> — Use the "Get Started" action to load the selected community workflow directly onto your canvas.</li><li><strong>Run and customize</strong> — Queue the workflow to generate your first result, then tweak prompts, models, and parameters to make it your own.</li></ol>',
+    'zh-CN':
+      '<ol><li><strong>打开工作流中心</strong> — 在 ComfyUI 侧栏中，进入社区工作流中心，浏览社区分享的精选和热门工作流。</li><li><strong>浏览热门工作流</strong> — 按热度、时间和分类浏览精选项目，找到符合需求的工作流。</li><li><strong>预览工作流</strong> — 点击工作流卡片，查看示例输出、所需模型和功能描述。</li><li><strong>在 ComfyUI 中打开</strong> — 使用"开始使用"按钮，将选中的社区工作流直接加载到画布。</li><li><strong>运行并自定义</strong> — 排队执行工作流以生成首个结果，然后调整提示词、模型和参数。</li></ol>'
+  },
+
+  'demos.nav.nextDemo': { en: "What's Next", 'zh-CN': '下一个演示' },
+  'demos.nav.viewDemo': { en: 'View Demo', 'zh-CN': '查看演示' },
+  'demos.nav.allDemos': { en: 'All Demos', 'zh-CN': '所有演示' },
+  'demos.transcript.label': { en: 'Demo transcript', 'zh-CN': '演示文字记录' },
+  'demos.transcript.note': {
+    en: '(for accessibility & search)',
+    'zh-CN': '（无障碍和搜索）'
+  },
+  'demos.loading': {
+    en: 'Loading interactive demo…',
+    'zh-CN': '正在加载互动演示…'
+  },
+  'demos.noscript': {
+    en: 'This interactive demo requires JavaScript.',
+    'zh-CN': '此互动演示需要 JavaScript。'
+  },
+  'demos.noscript.link': {
+    en: 'View on Arcade →',
+    'zh-CN': '在 Arcade 上查看 →'
+  },
+  'demos.duration.2min': { en: '~2 min', 'zh-CN': '~2 分钟' },
+  'demos.difficulty.beginner': { en: 'Beginner', 'zh-CN': '入门' },
+  'demos.difficulty.intermediate': {
+    en: 'Intermediate',
+    'zh-CN': '中级'
+  },
+  'demos.difficulty.advanced': { en: 'Advanced', 'zh-CN': '高级' },
+  'demos.embed.label': {
+    en: 'Interactive demo',
+    'zh-CN': '互动演示'
+  },
+  'demos.comingSoon.title': {
+    en: 'Coming Soon',
+    'zh-CN': '即将推出'
+  },
+  'demos.comingSoon.body': {
+    en: 'This page is being redesigned. Check back soon.',
+    'zh-CN': '此页面正在重新设计中，请稍后再来。'
+  },
+  'demos.breadcrumb.home': { en: 'Home', 'zh-CN': '首页' },
+  'demos.breadcrumb.demos': { en: 'Demos', 'zh-CN': '演示' },
+
   'customers.story.whatsNext': {
     en: "What's next?",
     'zh-CN': '接下来看什么？'
@@ -3592,6 +3812,103 @@ const translations = {
   'customers.feedback.role3': {
     en: 'Head of AI at Creative Studios',
     'zh-CN': 'Creative Studios AI 负责人'
+  },
+
+  // Models – UI keys
+  'models.hero.eyebrow': {
+    en: 'AI Model',
+    'zh-CN': 'AI 模型'
+  },
+  'models.hero.primaryCta': {
+    en: 'TRY IN COMFY',
+    'zh-CN': '在 Comfy 中试用'
+  },
+  'models.hero.secondaryCta': {
+    en: 'DOWNLOAD MODEL',
+    'zh-CN': '下载模型'
+  },
+  'models.hero.cloudCta': {
+    en: 'RUN ON CLOUD',
+    'zh-CN': '云端运行'
+  },
+  'models.hero.tutorialCta': {
+    en: 'VIEW TUTORIAL',
+    'zh-CN': '查看教程'
+  },
+  'models.hero.blogLink': {
+    en: 'Read blog post',
+    'zh-CN': '阅读博客文章'
+  },
+  'models.hero.workflowCount': {
+    en: '{count} workflows use this model',
+    'zh-CN': '{count} 个工作流使用此模型'
+  },
+  'models.whatIs.heading': {
+    en: 'What is {name}?',
+    'zh-CN': '什么是 {name}？'
+  },
+  'models.whatIs.tutorialLink': {
+    en: 'Read the full tutorial →',
+    'zh-CN': '阅读完整教程 →'
+  },
+  'models.index.title': {
+    en: 'Supported Models',
+    'zh-CN': '支持的模型'
+  },
+  'models.index.subtitle': {
+    en: "Run the world's leading AI models in ComfyUI",
+    'zh-CN': '在 ComfyUI 中运行世界领先的 AI 模型'
+  },
+  'models.breadcrumb.home': {
+    en: 'Home',
+    'zh-CN': '首页'
+  },
+  'models.breadcrumb.models': {
+    en: 'Supported Models',
+    'zh-CN': '支持的模型'
+  },
+
+  // Payment status pages
+  'payment.success.label': {
+    en: 'PAYMENT',
+    'zh-CN': '支付'
+  },
+  'payment.success.title': {
+    en: 'Payment successful',
+    'zh-CN': '支付成功'
+  },
+  'payment.success.subtitle': {
+    en: "Thanks for your purchase. Your account has been credited and you're ready to keep building.",
+    'zh-CN': '感谢您的购买。您的账户已充值完成，可以继续创作了。'
+  },
+  'payment.success.primaryCta': {
+    en: 'CONTINUE TO COMFY CLOUD',
+    'zh-CN': '前往 COMFY CLOUD'
+  },
+  'payment.success.secondaryCta': {
+    en: 'VIEW USAGE & PAYMENTS',
+    'zh-CN': '查看用量与支付'
+  },
+  'payment.failed.label': {
+    en: 'PAYMENT',
+    'zh-CN': '支付'
+  },
+  'payment.failed.title': {
+    en: 'Unable to complete payment',
+    'zh-CN': '无法完成支付'
+  },
+  'payment.failed.subtitle': {
+    en: "Your payment didn't go through and you have not been charged. Reach out to support or read the subscription docs if you need help.",
+    'zh-CN':
+      '您的支付未能完成，未发生扣款。如需帮助，请联系支持或查阅订阅文档。'
+  },
+  'payment.failed.primaryCta': {
+    en: 'CONTACT SUPPORT',
+    'zh-CN': '联系支持'
+  },
+  'payment.failed.secondaryCta': {
+    en: 'READ SUBSCRIPTION DOCS',
+    'zh-CN': '查看订阅文档'
   }
 } as const satisfies Record<string, Record<Locale, string>>
 
diff --git a/apps/website/src/layouts/BaseLayout.astro b/apps/website/src/layouts/BaseLayout.astro
index 77cf76131c..d46e85c7b3 100644
--- a/apps/website/src/layouts/BaseLayout.astro
+++ b/apps/website/src/layouts/BaseLayout.astro
@@ -5,11 +5,13 @@ import '../styles/global.css'
 import type { Locale } from '../i18n/translations'
 import SiteFooter from '../components/common/SiteFooter.vue'
 import SiteNav from '../components/common/SiteNav.vue'
+import { escapeJsonLd } from '../utils/escapeJsonLd'
 import { fetchGitHubStars, formatStarCount } from '../utils/github'
 
 interface Props {
   title: string
   description?: string
+  keywords?: string[]
   ogImage?: string
   noindex?: boolean
 }
@@ -17,10 +19,13 @@ interface Props {
 const {
   title,
   description = 'Comfy is the AI creation engine for visual professionals who demand control.',
+  keywords,
   ogImage = 'https://media.comfy.org/website/comfy.webp',
   noindex = false,
 } = Astro.props
 
+const keywordsContent = keywords && keywords.length > 0 ? keywords.join(', ') : undefined
+
 const siteBase = Astro.site ?? 'https://comfy.org'
 const canonicalURL = new URL(Astro.url.pathname, siteBase)
 const ogImageURL = new URL(ogImage, siteBase)
@@ -62,6 +67,7 @@ const websiteJsonLd = {
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content={description} />
+    {keywordsContent && <meta name="keywords" content={keywordsContent} />}
     {noindex && <meta name="robots" content="noindex, nofollow" />}
     <title>{title}</title>
 
@@ -89,8 +95,11 @@ const websiteJsonLd = {
     <meta name="twitter:image" content={ogImageURL.href} />
 
     <!-- Structured Data -->
-    <script is:inline type="application/ld+json" set:html={JSON.stringify(organizationJsonLd)} />
-    <script is:inline type="application/ld+json" set:html={JSON.stringify(websiteJsonLd)} />
+    <script is:inline type="application/ld+json" set:html={escapeJsonLd(organizationJsonLd)} />
+    <script is:inline type="application/ld+json" set:html={escapeJsonLd(websiteJsonLd)} />
+    <slot name="head" />
+
+    <slot name="head" />
 
     <!-- Google Tag Manager -->
     {gtmEnabled && (
@@ -109,6 +118,7 @@ const websiteJsonLd = {
     )}
 
     <ClientRouter />
+    <slot name="head" />
   </head>
   <body class="bg-primary-comfy-ink text-white font-formula antialiased overflow-x-clip">
     {gtmEnabled && (
diff --git a/apps/website/src/pages/cloud/index.astro b/apps/website/src/pages/cloud/index.astro
index bf2268943b..889a98adb8 100644
--- a/apps/website/src/pages/cloud/index.astro
+++ b/apps/website/src/pages/cloud/index.astro
@@ -7,9 +7,14 @@ import AudienceSection from '../../components/product/cloud/AudienceSection.vue'
 import PricingSection from '../../components/product/cloud/PricingSection.vue'
 import ProductCardsSection from '../../components/product/cloud/ProductCardsSection.vue'
 import FAQSection from '../../components/product/cloud/FAQSection.vue'
+import { t } from '../../i18n/translations'
 ---
 
-<BaseLayout title="Comfy Cloud — AI in the Cloud">
+<BaseLayout
+  title="Comfy Cloud — AI in the Cloud"
+  description={t('cloud.hero.subtitle', 'en')}
+  keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'comfy cloud', 'comfy ui application', 'comfyui browser', 'cloud comfyui', 'managed comfyui']}
+>
   <HeroSection />
   <ReasonSection />
   <AIModelsSection />
diff --git a/apps/website/src/pages/cloud/supported-nodes.astro b/apps/website/src/pages/cloud/supported-nodes.astro
new file mode 100644
index 0000000000..5d1e14aae5
--- /dev/null
+++ b/apps/website/src/pages/cloud/supported-nodes.astro
@@ -0,0 +1,42 @@
+---
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import HeroSection from '../../components/cloud-nodes/HeroSection.vue'
+import PackGridSection from '../../components/cloud-nodes/PackGridSection.vue'
+import { t } from '../../i18n/translations'
+import { loadPacksForBuild } from '../../utils/cloudNodes.build'
+import { escapeJsonLd } from '../../utils/escapeJsonLd'
+
+const packs = await loadPacksForBuild()
+
+const siteBase = Astro.site ?? new URL('https://comfy.org')
+const pageUrl = new URL('/cloud/supported-nodes', siteBase).href
+
+const itemListJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'ItemList',
+  name: 'Custom-node packs supported on Comfy Cloud',
+  url: pageUrl,
+  numberOfItems: packs.length,
+  itemListElement: packs.map((pack, index) => ({
+    '@type': 'ListItem',
+    position: index + 1,
+    url: new URL(`/cloud/supported-nodes/${pack.id}`, siteBase).href,
+    name: pack.displayName,
+    image: pack.bannerUrl || pack.iconUrl
+  }))
+}
+---
+
+<BaseLayout
+  title={t('cloudNodes.meta.title', 'en')}
+  description={t('cloudNodes.meta.description', 'en')}
+>
+  <script
+    is:inline
+    slot="head"
+    type="application/ld+json"
+    set:html={escapeJsonLd(itemListJsonLd)}
+  />
+  <HeroSection client:visible />
+  <PackGridSection packs={packs} client:visible />
+</BaseLayout>
diff --git a/apps/website/src/pages/cloud/supported-nodes/AGENTS.md b/apps/website/src/pages/cloud/supported-nodes/AGENTS.md
new file mode 100644
index 0000000000..0ae27dd0b6
--- /dev/null
+++ b/apps/website/src/pages/cloud/supported-nodes/AGENTS.md
@@ -0,0 +1,48 @@
+# Cloud Nodes Pages
+
+Build-time catalog of custom-node packs preinstalled on Comfy Cloud. Index at `/cloud/supported-nodes`, per-pack details at `/cloud/supported-nodes/[pack]`, both also under `/zh-CN/`.
+
+## Sources
+
+- **Cloud `/api/object_info`** — authoritative list of nodes available on Comfy Cloud (auth: `WEBSITE_CLOUD_API_KEY`)
+- **ComfyUI Custom Node Registry** ([dashboard](https://registry.comfy.org), API at `https://api.comfy.org/nodes`) — public pack metadata (banner, icon, description, downloads, stars, license, version, repo, publisher)
+
+The registry is the same one the in-app Manager dialog reads from. For reference and additional reading, see the existing client wrappers in `src/`:
+
+- [`src/services/comfyRegistryService.ts`](../../../../../../src/services/comfyRegistryService.ts) — typed wrappers around `/nodes`, `/nodes/search`, `/nodes/{id}`, `/nodes/{id}/versions/{version}/comfy-nodes`, etc.
+- [`src/stores/comfyRegistryStore.ts`](../../../../../../src/stores/comfyRegistryStore.ts) — cached store + `getPacksByIds` batch helper
+- [`packages/registry-types/src/comfyRegistryTypes.ts`](../../../../../../packages/registry-types/src/comfyRegistryTypes.ts) — generated OpenAPI types
+- Public docs: <https://docs.comfy.org/registry>
+
+## Build pipeline
+
+| File                                                                                                                    | Role                                                                    |
+| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| [`pages/cloud/supported-nodes.astro`](./supported-nodes.astro) and [`[pack].astro`](./supported-nodes/%5Bpack%5D.astro) | Page shells (and `zh-CN` twins)                                         |
+| [`utils/cloudNodes.build.ts`](../../../utils/cloudNodes.build.ts)                                                       | `loadPacksForBuild()` shared by index + detail routes                   |
+| [`utils/cloudNodes.ts`](../../../utils/cloudNodes.ts)                                                                   | Cloud `object_info` fetcher with retry, sanitization, snapshot fallback |
+| [`utils/cloudNodes.registry.ts`](../../../utils/cloudNodes.registry.ts)                                                 | Registry enrichment (batches of 50, soft-fail)                          |
+| [`utils/cloudNodes.ci.ts`](../../../utils/cloudNodes.ci.ts)                                                             | GitHub Actions annotations + step summary                               |
+| [`utils/escapeJsonLd.ts`](../../../utils/escapeJsonLd.ts)                                                               | XSS-safe `<script type="application/ld+json">` serializer               |
+| [`composables/useFilteredPacks.ts`](../../../composables/useFilteredPacks.ts)                                           | Search + sort logic for the index page                                  |
+| [`composables/useNodesByCategory.ts`](../../../composables/useNodesByCategory.ts)                                       | Group nodes by category, alphabetized                                   |
+| [`scripts/refresh-cloud-nodes-snapshot.ts`](../../../../scripts/refresh-cloud-nodes-snapshot.ts)                        | Manual `pnpm cloud-nodes:refresh-snapshot`                              |
+| [`packages/object-info-parser`](../../../../../../packages/object-info-parser)                                          | Shared Zod schemas, classifier, `sanitizeUserContent`                   |
+
+## Key invariants
+
+- **Sanitization is mandatory.** The cloud `/api/object_info` endpoint mixes the calling user's uploaded files into combo input lists; `sanitizeUserContent()` strips them before the snapshot is written. Tests in [`packages/object-info-parser/src/__tests__/sanitizeUserContent.test.ts`](../../../../../../packages/object-info-parser/src/__tests__/sanitizeUserContent.test.ts).
+- **All remote data is Zod-validated.** `cloudNodes.schema.ts` validates the cloud envelope; `@comfyorg/object-info-parser` validates each node def; `cloudNodes.registry.ts` validates the registry response shape with a passthrough Zod schema (defense-in-depth on top of the generated OpenAPI types). The fetcher never trusts a network response.
+- **JSON-LD must be escaped.** Pack metadata is registry-controlled; route every `<script type="application/ld+json">` payload through `escapeJsonLd()`.
+- **Index and detail share one fetch.** Both call `loadPacksForBuild()` so the static routes can never diverge from the rendered list.
+- **No `PUBLIC_` prefix on env vars.** Astro inlines `PUBLIC_*` into the client bundle; build-time secrets never start with that prefix.
+
+## Why `Pack` is a domain projection, not the raw registry `Node`
+
+`apps/website/src/data/cloudNodes.ts` defines its own `Pack` and `PackNode` types instead of re-exporting `components['schemas']['Node']` from `@comfyorg/registry-types`. That is intentional:
+
+- A `Pack` joins **two upstream sources** — the cloud `object_info` shape (which has `python_module`, `category`, `display_name`, etc.) and the registry `Node` shape (which has `banner_url`, `downloads`, `github_stars`, etc.). Neither shape on its own captures both.
+- A `Pack` is **post-sanitization**. Combo input lists, user-uploaded filenames, and any other build-time-stripped data are guaranteed gone by the time the type appears. The raw `Node` carries fields we never expose.
+- A `Pack` adds **safe-URL invariants** (banner / icon / repo all flow through `safeExternalUrl()` before becoming part of the type), which the registry's optional `string` fields don't encode.
+
+The `Pack`/`PackNode` types live next to the snapshot they describe; the validated build-time projections feed Astro's static routes directly. The OpenAPI-generated `Node` type is still consumed inside `cloudNodes.registry.ts` as `RegistryPack` for the upstream fetch.
diff --git a/apps/website/src/pages/cloud/supported-nodes/[pack].astro b/apps/website/src/pages/cloud/supported-nodes/[pack].astro
new file mode 100644
index 0000000000..1b5fa30f94
--- /dev/null
+++ b/apps/website/src/pages/cloud/supported-nodes/[pack].astro
@@ -0,0 +1,63 @@
+---
+import type { GetStaticPaths } from 'astro'
+
+import type { Pack } from '../../../data/cloudNodes'
+
+import PackDetail from '../../../components/cloud-nodes/PackDetail.vue'
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import { t } from '../../../i18n/translations'
+import { loadPacksForBuild } from '../../../utils/cloudNodes.build'
+import { escapeJsonLd } from '../../../utils/escapeJsonLd'
+
+export const getStaticPaths: GetStaticPaths = async () => {
+  const packs = await loadPacksForBuild()
+  return packs.map((pack) => ({
+    params: { pack: pack.id },
+    props: { pack }
+  }))
+}
+
+const { pack } = Astro.props as { pack: Pack }
+const fallbackDescription = t('cloudNodes.card.unavailableDescription', 'en')
+const description = pack.description || fallbackDescription
+const title = t('cloudNodes.detail.metaTitle', 'en').replace(
+  '{pack}',
+  pack.displayName
+)
+const metaDescription = t('cloudNodes.detail.metaDescription', 'en')
+  .replace('{pack}', pack.displayName)
+  .replace('{nodeCount}', String(pack.nodes.length))
+  .replace('{description}', description)
+
+const siteBase = Astro.site ?? new URL('https://comfy.org')
+const pageUrl = new URL(`/cloud/supported-nodes/${pack.id}`, siteBase).href
+
+const softwareJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'SoftwareApplication',
+  name: pack.displayName,
+  applicationCategory: 'DeveloperApplication',
+  applicationSubCategory: 'ComfyUI custom-node pack',
+  operatingSystem: 'Comfy Cloud (managed)',
+  url: pageUrl,
+  description,
+  image: pack.bannerUrl || pack.iconUrl,
+  softwareVersion: pack.latestVersion,
+  license: pack.license,
+  codeRepository: pack.repoUrl,
+  author: pack.publisher?.name
+    ? { '@type': 'Person', name: pack.publisher.name }
+    : undefined,
+  offers: { '@type': 'Offer', price: 0, priceCurrency: 'USD' }
+}
+---
+
+<BaseLayout title={title} description={metaDescription} ogImage={pack.bannerUrl}>
+  <script
+    is:inline
+    slot="head"
+    type="application/ld+json"
+    set:html={escapeJsonLd(softwareJsonLd)}
+  />
+  <PackDetail pack={pack} />
+</BaseLayout>
diff --git a/apps/website/src/pages/demos/[slug].astro b/apps/website/src/pages/demos/[slug].astro
new file mode 100644
index 0000000000..79f9d7c963
--- /dev/null
+++ b/apps/website/src/pages/demos/[slug].astro
@@ -0,0 +1,140 @@
+---
+import type { GetStaticPaths } from 'astro'
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import DemoHeroSection from '../../components/demos/DemoHeroSection.vue'
+import ArcadeEmbed from '../../components/demos/ArcadeEmbed.vue'
+import DemoTranscript from '../../components/demos/DemoTranscript.vue'
+import DemoNavSection from '../../components/demos/DemoNavSection.vue'
+import { demos, getDemoBySlug, getNextDemo } from '../../config/demos'
+import { t } from '../../i18n/translations'
+
+export const getStaticPaths: GetStaticPaths = () => {
+  return demos.map((demo) => ({
+    params: { slug: demo.slug }
+  }))
+}
+
+const { slug } = Astro.params
+const demo = getDemoBySlug(slug as string)!
+const nextDemo = getNextDemo(slug as string)
+const title = t(demo.title)
+const description = t(demo.description)
+const canonicalURL = new URL(`/demos/${demo.slug}`, Astro.site)
+
+const howToJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'HowTo',
+  name: title,
+  description,
+  image: new URL(demo.ogImage, Astro.site).href,
+  totalTime: demo.durationIso,
+  datePublished: demo.publishedDate,
+  dateModified: demo.modifiedDate,
+  author: {
+    '@type': 'Organization',
+    name: 'Comfy Org',
+    url: 'https://comfy.org'
+  }
+}
+
+const learningResourceJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'LearningResource',
+  name: title,
+  description,
+  learningResourceType: 'interactive tutorial',
+  interactivityType: 'active',
+  educationalLevel: demo.difficulty === 'beginner'
+    ? 'Beginner'
+    : demo.difficulty === 'intermediate'
+      ? 'Intermediate'
+      : 'Advanced',
+  url: canonicalURL.href,
+  datePublished: demo.publishedDate,
+  dateModified: demo.modifiedDate,
+  author: {
+    '@type': 'Organization',
+    name: 'Comfy Org',
+    url: 'https://comfy.org'
+  }
+}
+
+const breadcrumbJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'BreadcrumbList',
+  itemListElement: [
+    {
+      '@type': 'ListItem',
+      position: 1,
+      name: t('demos.breadcrumb.home'),
+      item: 'https://comfy.org'
+    },
+    {
+      '@type': 'ListItem',
+      position: 2,
+      name: t('demos.breadcrumb.demos'),
+      item: 'https://comfy.org/demos'
+    },
+    {
+      '@type': 'ListItem',
+      position: 3,
+      name: title
+    }
+  ]
+}
+---
+
+<BaseLayout
+  title={`${title} — Comfy`}
+  description={description}
+  ogImage={demo.ogImage}
+>
+  <Fragment slot="head">
+    <meta property="article:published_time" content={demo.publishedDate} />
+    <meta property="article:modified_time" content={demo.modifiedDate} />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(howToJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(learningResourceJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(breadcrumbJsonLd)}
+    />
+    <link rel="preconnect" href="https://demo.arcade.software" />
+  </Fragment>
+
+  <DemoHeroSection
+    label={t(demo.category)}
+    title={title}
+    description={description}
+    difficulty={demo.difficulty}
+    estimatedTime={demo.estimatedTime}
+  />
+
+  <ArcadeEmbed
+    arcadeId={demo.arcadeId}
+    title={title}
+    aspectRatio={demo.aspectRatio}
+    client:load
+  />
+
+  {demo.transcript && (
+    <DemoTranscript
+      transcript={t(demo.transcript)}
+      client:visible
+    />
+  )}
+
+  <DemoNavSection
+    nextTitle={t(nextDemo.title)}
+    nextSlug={nextDemo.slug}
+    nextThumbnail={nextDemo.thumbnail}
+  />
+</BaseLayout>
diff --git a/apps/website/src/pages/demos/index.astro b/apps/website/src/pages/demos/index.astro
new file mode 100644
index 0000000000..05d3caa106
--- /dev/null
+++ b/apps/website/src/pages/demos/index.astro
@@ -0,0 +1,8 @@
+---
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import ComingSoon from '../../components/common/ComingSoon.astro'
+---
+
+<BaseLayout title="Demos — Comfy" description="Interactive demos and tutorials for ComfyUI.">
+  <ComingSoon />
+</BaseLayout>
diff --git a/apps/website/src/pages/download.astro b/apps/website/src/pages/download.astro
index fba35c5e57..3ff4bb0d99 100644
--- a/apps/website/src/pages/download.astro
+++ b/apps/website/src/pages/download.astro
@@ -7,9 +7,14 @@ import ReasonSection from '../components/product/local/ReasonSection.vue'
 import EcoSystemSection from '../components/product/local/EcoSystemSection.vue'
 import ProductCardsSection from '../components/product/local/ProductCardsSection.vue'
 import FAQSection from '../components/product/local/FAQSection.vue'
+import { t } from '../i18n/translations'
 ---
 
-<BaseLayout title="Download Comfy — Run AI Locally">
+<BaseLayout
+  title="Download Comfy — Run AI Locally"
+  description={t('download.hero.subtitle', 'en')}
+  keywords={['comfyui app', 'comfyui desktop app', 'comfy ui application', 'comfyui download', 'download comfyui', 'comfyui windows', 'comfyui mac', 'comfyui linux', 'comfyui local']}
+>
   <CloudBannerSection />
   <HeroSection client:load />
   <ReasonSection />
diff --git a/apps/website/src/pages/index.astro b/apps/website/src/pages/index.astro
index 42472b493b..9b1a8906c8 100644
--- a/apps/website/src/pages/index.astro
+++ b/apps/website/src/pages/index.astro
@@ -8,9 +8,14 @@ import UseCaseSection from '../components/home/UseCaseSection.vue'
 import CaseStudySpotlightSection from '../components/home/CaseStudySpotlightSection.vue'
 import GetStartedSection from '../components/home/GetStartedSection.vue'
 import BuildWhatSection from '../components/home/BuildWhatSection.vue'
+import { t } from '../i18n/translations'
 ---
 
-<BaseLayout title="Comfy — Professional Control of Visual AI">
+<BaseLayout
+  title="Comfy — Professional Control of Visual AI"
+  description={t('hero.subtitle', 'en')}
+  keywords={['comfyui app', 'comfyui web app', 'comfy ui application', 'comfyui application', 'comfy app', 'comfyui', 'visual ai app', 'node-based ai', 'generative ai workflows']}
+>
   <HeroSection client:load />
   <SocialProofBarSection />
   <ProductShowcaseSection client:load />
diff --git a/apps/website/src/pages/p/supported-models/[slug].astro b/apps/website/src/pages/p/supported-models/[slug].astro
new file mode 100644
index 0000000000..39a8333526
--- /dev/null
+++ b/apps/website/src/pages/p/supported-models/[slug].astro
@@ -0,0 +1,185 @@
+---
+import type { GetStaticPaths } from 'astro'
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import ModelHeroSection from '../../../components/models/ModelHeroSection.vue'
+import { models, getModelBySlug } from '../../../config/models'
+import { t } from '../../../i18n/translations'
+
+export const getStaticPaths: GetStaticPaths = () => {
+  return models.map((model) => ({
+    params: { slug: model.slug }
+  }))
+}
+
+const { slug } = Astro.params
+const model = getModelBySlug(slug as string)!
+
+if (model.canonicalSlug) {
+  return Astro.redirect(`/p/supported-models/${model.canonicalSlug}`, 301)
+}
+
+const { displayName } = model
+const canonicalURL = new URL(`/p/supported-models/${model.slug}`, Astro.site)
+
+const dirDescriptions: Record<string, string> = {
+  diffusion_models: 'a diffusion model that generates images or video from text and image prompts',
+  checkpoints: 'an all-in-one checkpoint model that bundles a diffusion model, text encoder, and VAE',
+  loras: 'a LoRA (Low-Rank Adaptation) that fine-tunes an existing model for a specific style or subject',
+  controlnet: 'a ControlNet that steers image generation using structural guides like depth maps, edges, or poses',
+  clip_vision: 'a CLIP Vision encoder that converts images into embeddings for conditioning or style transfer',
+  vae: 'a VAE (Variational Autoencoder) that encodes and decodes latent representations',
+  text_encoders: 'a text encoder that converts prompts into embeddings used to guide generation',
+  audio_encoders: 'an audio encoder that converts audio into embeddings for audio-conditioned generation',
+  upscale_models: 'an upscale model that increases image resolution while preserving or enhancing detail',
+  latent_upscale_models: 'a latent upscale model that refines latents at higher resolution before decoding',
+  style_models: 'a style model that transfers artistic style onto generated images',
+  model_patches: 'a model patch that modifies or extends the behavior of an existing base model',
+  partner_nodes: 'a cloud API model accessible through ComfyUI partner nodes without local hardware requirements'
+}
+
+const dirDesc = dirDescriptions[model.directory] ?? 'an AI model'
+const whatIsDescription = `${displayName} is ${dirDesc}. You can run it locally in ComfyUI with full control over every parameter, or access it through Comfy Cloud. ComfyUI's node-based workflow editor lets you connect ${displayName} with ControlNets, LoRAs, upscalers, and custom nodes to build any pipeline you need. There are ${model.workflowCount} community workflow templates using ${displayName} on Comfy Hub, ready to load and customize.`
+
+const softwareAppJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'SoftwareApplication',
+  name: displayName,
+  applicationCategory: 'MultimediaApplication',
+  operatingSystem: 'Any',
+  url: canonicalURL.href,
+  author: {
+    '@type': 'Organization',
+    name: 'Comfy Org',
+    url: 'https://comfy.org'
+  }
+}
+
+const breadcrumbJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'BreadcrumbList',
+  itemListElement: [
+    {
+      '@type': 'ListItem',
+      position: 1,
+      name: t('models.breadcrumb.home'),
+      item: 'https://comfy.org'
+    },
+    {
+      '@type': 'ListItem',
+      position: 2,
+      name: t('models.breadcrumb.models'),
+      item: 'https://comfy.org/p/supported-models'
+    },
+    {
+      '@type': 'ListItem',
+      position: 3,
+      name: displayName
+    }
+  ]
+}
+
+const faqJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'FAQPage',
+  mainEntity: [
+    {
+      '@type': 'Question',
+      name: `What is ${displayName}?`,
+      acceptedAnswer: {
+        '@type': 'Answer',
+        text: whatIsDescription
+      }
+    },
+    {
+      '@type': 'Question',
+      name: `How do I use ${displayName} in ComfyUI?`,
+      acceptedAnswer: {
+        '@type': 'Answer',
+        text: model.docsUrl
+          ? `Follow the step-by-step tutorial at ${model.docsUrl}. You can also load any of the ${model.workflowCount} community workflow templates that use ${displayName} directly in ComfyUI.`
+          : `Open ComfyUI and browse the ${model.workflowCount} community workflow templates that use ${displayName}. Load one as a starting point, then customize the nodes and parameters to fit your use case.`
+      }
+    },
+    {
+      '@type': 'Question',
+      name: `How many ComfyUI workflows use ${displayName}?`,
+      acceptedAnswer: {
+        '@type': 'Answer',
+        text: `There are ${model.workflowCount} community workflow templates that use ${displayName} on Comfy Hub. Each template is ready to run in ComfyUI and can be customized to suit your project.`
+      }
+    },
+    {
+      '@type': 'Question',
+      name: `Is ${displayName} free to use in ComfyUI?`,
+      acceptedAnswer: {
+        '@type': 'Answer',
+        text: `ComfyUI is free and open source. ${model.huggingFaceUrl ? `${displayName} weights are available to download from Hugging Face.` : `${displayName} is available as a cloud API through Comfy Cloud.`} You only pay for compute when running on Comfy Cloud; local inference on your own hardware is always free.`
+      }
+    }
+  ]
+}
+
+const pageTitle = `${displayName} in ComfyUI`
+const pageDescription = `Run ${displayName} in ComfyUI with full parameter control. ${model.workflowCount} community workflow templates, step-by-step tutorials, and free local inference.`
+---
+
+<BaseLayout
+  title={`${pageTitle} — Comfy`}
+  description={pageDescription}
+  ogImage={model.thumbnailUrl}
+>
+  <Fragment slot="head">
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(softwareAppJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(breadcrumbJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(faqJsonLd)}
+    />
+  </Fragment>
+
+  <ModelHeroSection
+    displayName={displayName}
+    huggingFaceUrl={model.huggingFaceUrl}
+    docsUrl={model.docsUrl}
+    blogUrl={model.blogUrl}
+    hubSlug={model.hubSlug}
+    workflowCount={model.workflowCount}
+    directory={model.directory}
+  />
+
+  <section class="mx-auto max-w-7xl px-6 py-16 lg:px-8">
+    <h2 class="text-2xl font-bold text-primary-comfy-canvas lg:text-3xl">
+      {t('models.whatIs.heading').replace('{name}', displayName)}
+    </h2>
+    <p class="mt-4 max-w-3xl text-base/relaxed text-primary-comfy-canvas/70 lg:text-lg/relaxed">
+      {whatIsDescription}
+    </p>
+    {model.docsUrl && (
+      <a
+        href={model.docsUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+        class="mt-6 inline-block text-primary-comfy-yellow hover:underline"
+      >
+        {t('models.whatIs.tutorialLink')}
+      </a>
+    )}
+  </section>
+
+  <section>
+    {/* TODO: workflow gallery — pulls from hub API */}
+  </section>
+
+  <section>
+    {/* TODO: shared HowComfyWorks component */}
+  </section>
+</BaseLayout>
diff --git a/apps/website/src/pages/p/supported-models/index.astro b/apps/website/src/pages/p/supported-models/index.astro
new file mode 100644
index 0000000000..b69bcebe70
--- /dev/null
+++ b/apps/website/src/pages/p/supported-models/index.astro
@@ -0,0 +1,68 @@
+---
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import { models } from '../../../config/models'
+import { t } from '../../../i18n/translations'
+
+const title = t('models.index.title')
+const subtitle = t('models.index.subtitle')
+
+const dirLabel: Record<string, string> = {
+  diffusion_models: 'Diffusion',
+  checkpoints: 'Checkpoint',
+  loras: 'LoRA',
+  controlnet: 'ControlNet',
+  clip_vision: 'CLIP Vision',
+  model_patches: 'Patch',
+  vae: 'VAE',
+  text_encoders: 'Text Encoder',
+  audio_encoders: 'Audio Encoder',
+  latent_upscale_models: 'Latent Upscale',
+  upscale_models: 'Upscale',
+  style_models: 'Style',
+  partner_nodes: 'Partner Node'
+}
+---
+
+<BaseLayout
+  title={`${title} — Comfy`}
+  description={subtitle}
+>
+  <div class="mx-auto max-w-7xl px-6 py-16 lg:px-8 lg:py-24">
+    <header class="mb-12">
+      <p
+        class="mb-2 text-sm font-medium uppercase tracking-widest text-primary-comfy-yellow"
+      >
+        {t('models.hero.eyebrow')}
+      </p>
+      <h1 class="text-4xl font-bold text-primary-comfy-canvas lg:text-6xl">
+        {title}
+      </h1>
+      <p class="mt-4 max-w-2xl text-lg text-primary-comfy-canvas/70">
+        {subtitle}
+      </p>
+    </header>
+
+    <ul class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+      {models.map((model) => (
+        <li>
+          <a
+            href={`/p/supported-models/${model.slug}`}
+            class="flex h-full flex-col gap-3 rounded-xl border border-white/10 p-5 transition-colors hover:border-white/25 hover:bg-white/5"
+          >
+            <div class="flex items-start justify-between gap-2">
+              <span class="text-base font-semibold leading-tight text-primary-comfy-canvas">
+                {model.displayName}
+              </span>
+              <span class="shrink-0 rounded-full bg-white/10 px-2 py-0.5 text-xs font-medium text-primary-comfy-canvas/70">
+                {dirLabel[model.directory] ?? model.directory}
+              </span>
+            </div>
+            <p class="mt-auto text-xs text-primary-comfy-canvas/50">
+              {model.workflowCount} workflows
+            </p>
+          </a>
+        </li>
+      ))}
+    </ul>
+  </div>
+</BaseLayout>
diff --git a/apps/website/src/pages/payment/failed.astro b/apps/website/src/pages/payment/failed.astro
new file mode 100644
index 0000000000..2acbf18cfe
--- /dev/null
+++ b/apps/website/src/pages/payment/failed.astro
@@ -0,0 +1,12 @@
+---
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import PaymentStatusSection from '../../components/payment/PaymentStatusSection.vue'
+---
+
+<BaseLayout
+  title="Payment Failed — Comfy"
+  description="Your payment was not completed."
+  noindex
+>
+  <PaymentStatusSection status="failed" />
+</BaseLayout>
diff --git a/apps/website/src/pages/payment/success.astro b/apps/website/src/pages/payment/success.astro
new file mode 100644
index 0000000000..07a3c7f725
--- /dev/null
+++ b/apps/website/src/pages/payment/success.astro
@@ -0,0 +1,12 @@
+---
+import BaseLayout from '../../layouts/BaseLayout.astro'
+import PaymentStatusSection from '../../components/payment/PaymentStatusSection.vue'
+---
+
+<BaseLayout
+  title="Payment Successful — Comfy"
+  description="Your payment was processed successfully."
+  noindex
+>
+  <PaymentStatusSection status="success" />
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/cloud/index.astro b/apps/website/src/pages/zh-CN/cloud/index.astro
index 705babf616..0f3ee8b065 100644
--- a/apps/website/src/pages/zh-CN/cloud/index.astro
+++ b/apps/website/src/pages/zh-CN/cloud/index.astro
@@ -7,9 +7,14 @@ import AudienceSection from '../../../components/product/cloud/AudienceSection.v
 import PricingSection from '../../../components/product/cloud/PricingSection.vue'
 import ProductCardsSection from '../../../components/product/cloud/ProductCardsSection.vue'
 import FAQSection from '../../../components/product/cloud/FAQSection.vue'
+import { t } from '../../../i18n/translations'
 ---
 
-<BaseLayout title="Comfy Cloud — 云端 AI">
+<BaseLayout
+  title="Comfy Cloud — 云端 AI"
+  description={t('cloud.hero.subtitle', 'zh-CN')}
+  keywords={['comfyui web app', 'comfyui app', 'comfyui online', 'comfyui cloud', 'ComfyUI 网页版', 'ComfyUI 云端', 'ComfyUI 应用', 'Comfy Cloud', '云端 ComfyUI']}
+>
   <HeroSection locale="zh-CN" />
   <ReasonSection locale="zh-CN" />
   <AIModelsSection locale="zh-CN" />
diff --git a/apps/website/src/pages/zh-CN/cloud/supported-nodes.astro b/apps/website/src/pages/zh-CN/cloud/supported-nodes.astro
new file mode 100644
index 0000000000..3d4f32e2a4
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/cloud/supported-nodes.astro
@@ -0,0 +1,42 @@
+---
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import HeroSection from '../../../components/cloud-nodes/HeroSection.vue'
+import PackGridSection from '../../../components/cloud-nodes/PackGridSection.vue'
+import { t } from '../../../i18n/translations'
+import { loadPacksForBuild } from '../../../utils/cloudNodes.build'
+import { escapeJsonLd } from '../../../utils/escapeJsonLd'
+
+const packs = await loadPacksForBuild()
+
+const siteBase = Astro.site ?? new URL('https://comfy.org')
+const pageUrl = new URL('/zh-CN/cloud/supported-nodes', siteBase).href
+
+const itemListJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'ItemList',
+  name: 'Comfy Cloud 支持的自定义节点包',
+  url: pageUrl,
+  numberOfItems: packs.length,
+  itemListElement: packs.map((pack, index) => ({
+    '@type': 'ListItem',
+    position: index + 1,
+    url: new URL(`/zh-CN/cloud/supported-nodes/${pack.id}`, siteBase).href,
+    name: pack.displayName,
+    image: pack.bannerUrl || pack.iconUrl
+  }))
+}
+---
+
+<BaseLayout
+  title={t('cloudNodes.meta.title', 'zh-CN')}
+  description={t('cloudNodes.meta.description', 'zh-CN')}
+>
+  <script
+    is:inline
+    slot="head"
+    type="application/ld+json"
+    set:html={escapeJsonLd(itemListJsonLd)}
+  />
+  <HeroSection locale="zh-CN" client:visible />
+  <PackGridSection locale="zh-CN" packs={packs} client:visible />
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/cloud/supported-nodes/[pack].astro b/apps/website/src/pages/zh-CN/cloud/supported-nodes/[pack].astro
new file mode 100644
index 0000000000..b74d4ebd27
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/cloud/supported-nodes/[pack].astro
@@ -0,0 +1,63 @@
+---
+import type { GetStaticPaths } from 'astro'
+
+import type { Pack } from '../../../../data/cloudNodes'
+
+import PackDetail from '../../../../components/cloud-nodes/PackDetail.vue'
+import BaseLayout from '../../../../layouts/BaseLayout.astro'
+import { t } from '../../../../i18n/translations'
+import { loadPacksForBuild } from '../../../../utils/cloudNodes.build'
+import { escapeJsonLd } from '../../../../utils/escapeJsonLd'
+
+export const getStaticPaths: GetStaticPaths = async () => {
+  const packs = await loadPacksForBuild()
+  return packs.map((pack) => ({
+    params: { pack: pack.id },
+    props: { pack }
+  }))
+}
+
+const { pack } = Astro.props as { pack: Pack }
+const fallbackDescription = t('cloudNodes.card.unavailableDescription', 'zh-CN')
+const description = pack.description || fallbackDescription
+const title = t('cloudNodes.detail.metaTitle', 'zh-CN').replace(
+  '{pack}',
+  pack.displayName
+)
+const metaDescription = t('cloudNodes.detail.metaDescription', 'zh-CN')
+  .replace('{pack}', pack.displayName)
+  .replace('{nodeCount}', String(pack.nodes.length))
+  .replace('{description}', description)
+
+const siteBase = Astro.site ?? new URL('https://comfy.org')
+const pageUrl = new URL(`/zh-CN/cloud/supported-nodes/${pack.id}`, siteBase).href
+
+const softwareJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'SoftwareApplication',
+  name: pack.displayName,
+  applicationCategory: 'DeveloperApplication',
+  applicationSubCategory: 'ComfyUI custom-node pack',
+  operatingSystem: 'Comfy Cloud (managed)',
+  url: pageUrl,
+  description,
+  image: pack.bannerUrl || pack.iconUrl,
+  softwareVersion: pack.latestVersion,
+  license: pack.license,
+  codeRepository: pack.repoUrl,
+  author: pack.publisher?.name
+    ? { '@type': 'Person', name: pack.publisher.name }
+    : undefined,
+  offers: { '@type': 'Offer', price: 0, priceCurrency: 'USD' }
+}
+---
+
+<BaseLayout title={title} description={metaDescription} ogImage={pack.bannerUrl}>
+  <script
+    is:inline
+    slot="head"
+    type="application/ld+json"
+    set:html={escapeJsonLd(softwareJsonLd)}
+  />
+  <PackDetail pack={pack} locale="zh-CN" />
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/demos/[slug].astro b/apps/website/src/pages/zh-CN/demos/[slug].astro
new file mode 100644
index 0000000000..fb31d3a40a
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/demos/[slug].astro
@@ -0,0 +1,144 @@
+---
+import type { GetStaticPaths } from 'astro'
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import DemoHeroSection from '../../../components/demos/DemoHeroSection.vue'
+import ArcadeEmbed from '../../../components/demos/ArcadeEmbed.vue'
+import DemoTranscript from '../../../components/demos/DemoTranscript.vue'
+import DemoNavSection from '../../../components/demos/DemoNavSection.vue'
+import { demos, getDemoBySlug, getNextDemo } from '../../../config/demos'
+import { t } from '../../../i18n/translations'
+
+export const getStaticPaths: GetStaticPaths = () => {
+  return demos.map((demo) => ({
+    params: { slug: demo.slug }
+  }))
+}
+
+const { slug } = Astro.params
+const demo = getDemoBySlug(slug as string)!
+const nextDemo = getNextDemo(slug as string)
+const title = t(demo.title, 'zh-CN')
+const description = t(demo.description, 'zh-CN')
+const canonicalURL = new URL(`/zh-CN/demos/${demo.slug}`, Astro.site)
+
+const howToJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'HowTo',
+  name: title,
+  description,
+  image: new URL(demo.ogImage, Astro.site).href,
+  totalTime: demo.durationIso,
+  datePublished: demo.publishedDate,
+  dateModified: demo.modifiedDate,
+  author: {
+    '@type': 'Organization',
+    name: 'Comfy Org',
+    url: 'https://comfy.org'
+  }
+}
+
+const learningResourceJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'LearningResource',
+  name: title,
+  description,
+  learningResourceType: 'interactive tutorial',
+  interactivityType: 'active',
+  educationalLevel: demo.difficulty === 'beginner'
+    ? 'Beginner'
+    : demo.difficulty === 'intermediate'
+      ? 'Intermediate'
+      : 'Advanced',
+  url: canonicalURL.href,
+  datePublished: demo.publishedDate,
+  dateModified: demo.modifiedDate,
+  author: {
+    '@type': 'Organization',
+    name: 'Comfy Org',
+    url: 'https://comfy.org'
+  }
+}
+
+const breadcrumbJsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'BreadcrumbList',
+  itemListElement: [
+    {
+      '@type': 'ListItem',
+      position: 1,
+      name: t('demos.breadcrumb.home', 'zh-CN'),
+      item: 'https://comfy.org/zh-CN'
+    },
+    {
+      '@type': 'ListItem',
+      position: 2,
+      name: t('demos.breadcrumb.demos', 'zh-CN'),
+      item: 'https://comfy.org/zh-CN/demos'
+    },
+    {
+      '@type': 'ListItem',
+      position: 3,
+      name: title
+    }
+  ]
+}
+---
+
+<BaseLayout
+  title={`${title} — Comfy`}
+  description={description}
+  ogImage={demo.ogImage}
+>
+  <Fragment slot="head">
+    <meta property="article:published_time" content={demo.publishedDate} />
+    <meta property="article:modified_time" content={demo.modifiedDate} />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(howToJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(learningResourceJsonLd)}
+    />
+    <script
+      is:inline
+      type="application/ld+json"
+      set:html={JSON.stringify(breadcrumbJsonLd)}
+    />
+    <link rel="preconnect" href="https://demo.arcade.software" />
+  </Fragment>
+
+  <DemoHeroSection
+    label={t(demo.category, 'zh-CN')}
+    title={title}
+    description={description}
+    difficulty={demo.difficulty}
+    estimatedTime={demo.estimatedTime}
+    locale="zh-CN"
+  />
+
+  <ArcadeEmbed
+    arcadeId={demo.arcadeId}
+    title={title}
+    aspectRatio={demo.aspectRatio}
+    locale="zh-CN"
+    client:load
+  />
+
+  {demo.transcript && (
+    <DemoTranscript
+      transcript={t(demo.transcript, 'zh-CN')}
+      locale="zh-CN"
+      client:visible
+    />
+  )}
+
+  <DemoNavSection
+    nextTitle={t(nextDemo.title, 'zh-CN')}
+    nextSlug={nextDemo.slug}
+    nextThumbnail={nextDemo.thumbnail}
+    locale="zh-CN"
+  />
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/demos/index.astro b/apps/website/src/pages/zh-CN/demos/index.astro
new file mode 100644
index 0000000000..0bf35df318
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/demos/index.astro
@@ -0,0 +1,17 @@
+---
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import { t } from '../../../i18n/translations'
+---
+
+<BaseLayout title="演示 — Comfy" description="ComfyUI 的互动演示和教程。">
+  <section class="flex min-h-[60vh] items-center justify-center px-6">
+    <div class="text-center">
+      <h1 class="text-primary-comfy-canvas text-4xl font-light">
+        {t('demos.comingSoon.title', 'zh-CN')}
+      </h1>
+      <p class="text-primary-warm-gray mt-4 text-sm">
+        {t('demos.comingSoon.body', 'zh-CN')}
+      </p>
+    </div>
+  </section>
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/download.astro b/apps/website/src/pages/zh-CN/download.astro
index 0899ad3e4c..108bf80b5d 100644
--- a/apps/website/src/pages/zh-CN/download.astro
+++ b/apps/website/src/pages/zh-CN/download.astro
@@ -7,9 +7,14 @@ import ReasonSection from '../../components/product/local/ReasonSection.vue'
 import EcoSystemSection from '../../components/product/local/EcoSystemSection.vue'
 import ProductCardsSection from '../../components/product/local/ProductCardsSection.vue'
 import FAQSection from '../../components/product/local/FAQSection.vue'
+import { t } from '../../i18n/translations'
 ---
 
-<BaseLayout title="下载 — Comfy">
+<BaseLayout
+  title="下载 — Comfy"
+  description={t('download.hero.subtitle', 'zh-CN')}
+  keywords={['comfyui app', 'comfyui desktop app', 'comfyui download', 'ComfyUI 下载', 'ComfyUI 桌面应用', 'ComfyUI 应用', 'ComfyUI Windows', 'ComfyUI macOS', 'ComfyUI Linux']}
+>
   <CloudBannerSection locale="zh-CN" />
   <HeroSection locale="zh-CN" client:load />
   <ReasonSection locale="zh-CN" />
diff --git a/apps/website/src/pages/zh-CN/index.astro b/apps/website/src/pages/zh-CN/index.astro
index 35ba15273d..df9e74f70a 100644
--- a/apps/website/src/pages/zh-CN/index.astro
+++ b/apps/website/src/pages/zh-CN/index.astro
@@ -8,9 +8,14 @@ import UseCaseSection from '../../components/home/UseCaseSection.vue'
 import CaseStudySpotlightSection from '../../components/home/CaseStudySpotlightSection.vue'
 import GetStartedSection from '../../components/home/GetStartedSection.vue'
 import BuildWhatSection from '../../components/home/BuildWhatSection.vue'
+import { t } from '../../i18n/translations'
 ---
 
-<BaseLayout title="Comfy — 视觉 AI 的最强可控性">
+<BaseLayout
+  title="Comfy — 视觉 AI 的最强可控性"
+  description={t('hero.subtitle', 'zh-CN')}
+  keywords={['comfyui app', 'comfyui web app', 'comfyui application', 'ComfyUI 应用', 'ComfyUI 网页版', 'ComfyUI 桌面应用', 'ComfyUI 下载', '可视化 AI', '节点式 AI', '生成式 AI 工作流']}
+>
   <HeroSection locale="zh-CN" client:load />
   <SocialProofBarSection />
   <ProductShowcaseSection locale="zh-CN" client:load />
diff --git a/apps/website/src/pages/zh-CN/payment/failed.astro b/apps/website/src/pages/zh-CN/payment/failed.astro
new file mode 100644
index 0000000000..85a07ae04b
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/payment/failed.astro
@@ -0,0 +1,8 @@
+---
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import PaymentStatusSection from '../../../components/payment/PaymentStatusSection.vue'
+---
+
+<BaseLayout title="支付失败 — Comfy" description="您的支付未能完成。" noindex>
+  <PaymentStatusSection status="failed" locale="zh-CN" />
+</BaseLayout>
diff --git a/apps/website/src/pages/zh-CN/payment/success.astro b/apps/website/src/pages/zh-CN/payment/success.astro
new file mode 100644
index 0000000000..1e48c69e71
--- /dev/null
+++ b/apps/website/src/pages/zh-CN/payment/success.astro
@@ -0,0 +1,8 @@
+---
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import PaymentStatusSection from '../../../components/payment/PaymentStatusSection.vue'
+---
+
+<BaseLayout title="支付成功 — Comfy" description="您的支付已成功完成。" noindex>
+  <PaymentStatusSection status="success" locale="zh-CN" />
+</BaseLayout>
diff --git a/apps/website/src/styles/global.css b/apps/website/src/styles/global.css
index a6051ff497..c3d934adc5 100644
--- a/apps/website/src/styles/global.css
+++ b/apps/website/src/styles/global.css
@@ -101,13 +101,13 @@
     transform: translateX(0);
   }
   100% {
-    transform: translateX(-50%);
+    transform: translateX(calc(-100% - var(--marquee-gap, 0px)));
   }
 }
 
 @keyframes marquee-reverse {
   0% {
-    transform: translateX(-50%);
+    transform: translateX(calc(-100% - var(--marquee-gap, 0px)));
   }
   100% {
     transform: translateX(0);
@@ -115,11 +115,15 @@
 }
 
 @utility animate-marquee {
-  animation: marquee 30s linear infinite;
+  @media (prefers-reduced-motion: no-preference) {
+    animation: marquee 30s linear infinite;
+  }
 }
 
 @utility animate-marquee-reverse {
-  animation: marquee-reverse 30s linear infinite;
+  @media (prefers-reduced-motion: no-preference) {
+    animation: marquee-reverse 30s linear infinite;
+  }
 }
 
 @keyframes ripple-effect {
diff --git a/apps/website/src/utils/ashby.ci.test.ts b/apps/website/src/utils/ashby.ci.test.ts
index bc5551c8c9..7d10a71307 100644
--- a/apps/website/src/utils/ashby.ci.test.ts
+++ b/apps/website/src/utils/ashby.ci.test.ts
@@ -22,7 +22,7 @@ function baseSnapshot(): RolesSnapshot {
             title: 'Design Engineer',
             department: 'Engineering',
             location: 'San Francisco',
-            applyUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
+            jobUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
           }
         ]
       }
@@ -50,7 +50,7 @@ function freshOutcome(droppedCount = 0): FetchOutcome {
               title: 'Design Engineer',
               department: 'Engineering',
               location: 'San Francisco',
-              applyUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
+              jobUrl: 'https://jobs.ashbyhq.com/comfy-org/x'
             }
           ]
         }
diff --git a/apps/website/src/utils/ashby.test.ts b/apps/website/src/utils/ashby.test.ts
index 5c17dbc75b..5719690016 100644
--- a/apps/website/src/utils/ashby.test.ts
+++ b/apps/website/src/utils/ashby.test.ts
@@ -40,7 +40,7 @@ function makeSnapshot(roleCount = 2): RolesSnapshot {
     title: `Snapshot Role ${i}`,
     department: 'Engineering',
     location: 'San Francisco',
-    applyUrl: `https://jobs.ashbyhq.com/comfy-org/snapshot-${i}`
+    jobUrl: `https://jobs.ashbyhq.com/comfy-org/snapshot-${i}`
   }))
   return {
     fetchedAt: '2026-04-01T00:00:00.000Z',
@@ -85,26 +85,7 @@ describe('fetchRolesForBuild', () => {
     if (outcome.status !== 'fresh') return
     expect(outcome.droppedCount).toBe(0)
     expect(outcome.snapshot.departments).toHaveLength(1)
-    expect(outcome.snapshot.departments[0]!.roles[0]!.applyUrl).toMatch(
-      /design-engineer\/apply$/
-    )
-  })
-
-  it('falls back to jobUrl when applyUrl is missing and keeps the role', async () => {
-    const job = validJob()
-    delete (job as Record<string, unknown>).applyUrl
-    const fetchImpl = vi.fn(async () =>
-      response({ apiVersion: '1', jobs: [job] })
-    )
-    const outcome = await fetchRolesForBuild({
-      apiKey: KEY,
-      boardName: BOARD,
-      baseUrl: BASE_URL,
-      fetchImpl: fetchImpl as unknown as typeof fetch
-    })
-    expect(outcome.status).toBe('fresh')
-    if (outcome.status !== 'fresh') return
-    expect(outcome.snapshot.departments[0]!.roles[0]!.applyUrl).toBe(
+    expect(outcome.snapshot.departments[0]!.roles[0]!.jobUrl).toBe(
       'https://jobs.ashbyhq.com/comfy-org/design-engineer'
     )
   })
diff --git a/apps/website/src/utils/ashby.ts b/apps/website/src/utils/ashby.ts
index c863172db2..6402a80bec 100644
--- a/apps/website/src/utils/ashby.ts
+++ b/apps/website/src/utils/ashby.ts
@@ -243,13 +243,13 @@ function groupByDepartment(jobs: readonly AshbyJobPosting[]): Department[] {
 }
 
 function toDomainRole(job: AshbyJobPosting, department: string): Role {
-  const applyUrl = job.applyUrl ?? job.jobUrl
+  const jobUrl = job.jobUrl
   return {
-    id: createHash('sha1').update(applyUrl).digest('hex').slice(0, 16),
+    id: createHash('sha1').update(jobUrl).digest('hex').slice(0, 16),
     title: job.title,
     department: capitalize(department),
     location: (job.location ?? '').trim() || DEFAULT_LOCATION,
-    applyUrl
+    jobUrl
   }
 }
 
diff --git a/apps/website/src/utils/cloudNodes.build.ts b/apps/website/src/utils/cloudNodes.build.ts
new file mode 100644
index 0000000000..d874adf80c
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.build.ts
@@ -0,0 +1,27 @@
+import type { Pack } from '../data/cloudNodes'
+
+import { fetchCloudNodesForBuild } from './cloudNodes'
+import { reportCloudNodesOutcome } from './cloudNodes.ci'
+
+/**
+ * Resolve the list of packs to render at build time.
+ *
+ * Used by both the index page and the per-pack detail pages so that the
+ * static index and the static detail routes are always derived from the
+ * same source. `fetchCloudNodesForBuild` is memoized on a module-level
+ * `inflight` promise, so repeated calls in the same build process share a
+ * single network round-trip and the same outcome.
+ */
+export async function loadPacksForBuild(): Promise<Pack[]> {
+  const outcome = await fetchCloudNodesForBuild()
+  reportCloudNodesOutcome(outcome)
+
+  if (outcome.status === 'failed') {
+    throw new Error(
+      `Cloud nodes fetch failed and no snapshot is available. Reason: ${outcome.reason}. ` +
+        'Run `pnpm --filter @comfyorg/website cloud-nodes:refresh-snapshot` locally and commit the snapshot.'
+    )
+  }
+
+  return outcome.snapshot.packs
+}
diff --git a/apps/website/src/utils/cloudNodes.ci.test.ts b/apps/website/src/utils/cloudNodes.ci.test.ts
new file mode 100644
index 0000000000..eca5599b5a
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.ci.test.ts
@@ -0,0 +1,121 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { FetchOutcome } from './cloudNodes'
+import type { NodesSnapshot } from '../data/cloudNodes'
+
+import {
+  reportCloudNodesOutcome,
+  resetCloudNodesReporterForTests
+} from './cloudNodes.ci'
+
+function baseSnapshot(): NodesSnapshot {
+  return {
+    fetchedAt: new Date().toISOString(),
+    packs: [
+      {
+        id: 'pack-id',
+        displayName: 'Pack',
+        nodes: [
+          {
+            name: 'NodeClass',
+            displayName: 'Node Class',
+            category: 'misc'
+          }
+        ]
+      }
+    ]
+  }
+}
+
+function freshOutcome(droppedCount = 0): FetchOutcome {
+  return {
+    status: 'fresh',
+    droppedCount,
+    droppedNodes:
+      droppedCount === 0
+        ? []
+        : [{ name: 'BadNode', reason: 'invalid display_name' }],
+    snapshot: baseSnapshot()
+  }
+}
+
+describe('reportCloudNodesOutcome', () => {
+  let writeSpy: ReturnType<typeof vi.spyOn>
+  let summaryDir: string
+  let summaryPath: string
+  const originalSummary = process.env.GITHUB_STEP_SUMMARY
+
+  beforeEach(() => {
+    resetCloudNodesReporterForTests()
+    writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true)
+    summaryDir = mkdtempSync(join(tmpdir(), 'cloud-nodes-summary-'))
+    summaryPath = join(summaryDir, 'summary.md')
+    writeFileSync(summaryPath, '')
+    process.env.GITHUB_STEP_SUMMARY = summaryPath
+  })
+
+  afterEach(() => {
+    writeSpy.mockRestore()
+    rmSync(summaryDir, { recursive: true, force: true })
+    if (originalSummary === undefined) delete process.env.GITHUB_STEP_SUMMARY
+    else process.env.GITHUB_STEP_SUMMARY = originalSummary
+  })
+
+  it('emits nothing on a clean fresh outcome', () => {
+    reportCloudNodesOutcome(freshOutcome(0))
+    expect(writeSpy).not.toHaveBeenCalled()
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Fresh')
+  })
+
+  it('emits exactly one set of annotations across repeated calls', () => {
+    reportCloudNodesOutcome(freshOutcome(1))
+    reportCloudNodesOutcome(freshOutcome(1))
+    expect(writeSpy).toHaveBeenCalledTimes(1)
+    const annotation = writeSpy.mock.calls[0]?.[0] as string
+    expect(annotation).toContain(
+      '::warning title=Cloud nodes: dropped 1 invalid'
+    )
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Dropped')
+  })
+
+  it('emits ::error for auth failures in a stale outcome', () => {
+    reportCloudNodesOutcome({
+      status: 'stale',
+      reason: 'HTTP 401 Unauthorized',
+      snapshot: baseSnapshot()
+    })
+    const annotation = writeSpy.mock.calls[0]?.[0] as string
+    expect(annotation).toContain(
+      '::error title=Cloud nodes authentication failed'
+    )
+  })
+
+  it('emits ::warning for missing-env stale outcomes', () => {
+    reportCloudNodesOutcome({
+      status: 'stale',
+      reason: 'missing WEBSITE_CLOUD_API_KEY',
+      snapshot: baseSnapshot()
+    })
+    const annotation = writeSpy.mock.calls[0]?.[0] as string
+    expect(annotation).toContain('::warning title=Cloud nodes integration')
+  })
+
+  it('emits ::error for a failed outcome and writes no fresh-only sections', () => {
+    reportCloudNodesOutcome({
+      status: 'failed',
+      reason: 'HTTP 500 Server Error'
+    })
+    const annotation = writeSpy.mock.calls[0]?.[0] as string
+    expect(annotation).toContain('::error title=Cloud nodes fetch failed')
+    expect(readFileSync(summaryPath, 'utf8')).toContain('Failed')
+  })
+
+  it('does not throw when GITHUB_STEP_SUMMARY is not set', () => {
+    delete process.env.GITHUB_STEP_SUMMARY
+    expect(() => reportCloudNodesOutcome(freshOutcome(0))).not.toThrow()
+  })
+})
diff --git a/apps/website/src/utils/cloudNodes.ci.ts b/apps/website/src/utils/cloudNodes.ci.ts
new file mode 100644
index 0000000000..1f78d40e7b
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.ci.ts
@@ -0,0 +1,115 @@
+import { appendFileSync } from 'node:fs'
+
+import type { FetchOutcome } from './cloudNodes'
+
+let hasReported = false
+
+export function resetCloudNodesReporterForTests(): void {
+  hasReported = false
+}
+
+export function reportCloudNodesOutcome(outcome: FetchOutcome): void {
+  if (hasReported) return
+  hasReported = true
+
+  const lines = buildAnnotations(outcome)
+  for (const line of lines) {
+    process.stdout.write(`${line}\n`)
+  }
+
+  const summaryPath = process.env.GITHUB_STEP_SUMMARY
+  if (summaryPath) {
+    try {
+      appendFileSync(summaryPath, buildStepSummary(outcome))
+    } catch {
+      // Writing the summary is best-effort; do not fail the build if the
+      // runner's summary file is unavailable (e.g. local dev).
+    }
+  }
+}
+
+function buildAnnotations(outcome: FetchOutcome): string[] {
+  if (outcome.status === 'fresh') {
+    if (outcome.droppedCount === 0) return []
+    const nodeCount = outcome.droppedCount === 1 ? 'node' : 'nodes'
+    const drops = outcome.droppedNodes
+      .map((d) => {
+        const name = escapeAnnotation(d.name ? `"${d.name}"` : '(unnamed)')
+        const reason = escapeAnnotation(d.reason)
+        return `  - ${name}: ${reason}`
+      })
+      .join('%0A')
+    return [
+      `::warning title=Cloud nodes: dropped ${outcome.droppedCount} invalid ${nodeCount}::Dropped nodes:%0A${drops}%0A%0AAction items:%0A  1. Verify node definitions returned by cloud /api/object_info.%0A  2. If a valid node shape changed, update @comfyorg/object-info-parser/src/schemas/nodeDefSchema.ts and add tests.%0A  3. Dropped nodes are not shown on /cloud/supported-nodes until fixed.`
+    ]
+  }
+
+  if (outcome.status === 'stale') {
+    return [staleAnnotation(outcome.reason)]
+  }
+
+  return [
+    `::error title=Cloud nodes fetch failed and no snapshot is available::Cannot build cloud nodes page without data.%0A%0AReason: ${escapeAnnotation(outcome.reason)}%0A%0AAction items:%0A  1. Run \`pnpm --filter @comfyorg/website cloud-nodes:refresh-snapshot\` locally with a valid WEBSITE_CLOUD_API_KEY.%0A  2. Commit apps/website/src/data/cloud-nodes.snapshot.json.%0A  3. Push and re-run CI.`
+  ]
+}
+
+function staleAnnotation(reason: string): string {
+  const escaped = escapeAnnotation(reason)
+  if (reason.startsWith('missing ')) {
+    return `::warning title=Cloud nodes integration::${escaped}. Falling back to committed snapshot.%0A%0AAction items:%0A  1. If you're a contributor without key access, this is expected. The snapshot will be used.%0A  2. If this is CI, check that the \`WEBSITE_CLOUD_API_KEY\` secret exists in the repo and is referenced in .github/workflows/ci-website-build.yaml.`
+  }
+  if (reason.startsWith('HTTP 401') || reason.startsWith('HTTP 403')) {
+    return `::error title=Cloud nodes authentication failed::${escaped}. The WEBSITE_CLOUD_API_KEY is missing, invalid, or revoked. Build continues with the last-known-good snapshot.%0A%0AAction items:%0A  1. Verify the Cloud API key is active and scoped for /api/object_info.%0A  2. Update the \`WEBSITE_CLOUD_API_KEY\` secret in GitHub Actions and Vercel.%0A  3. Re-run this workflow.`
+  }
+  if (reason.startsWith('envelope')) {
+    return `::error title=Cloud nodes schema mismatch::${escaped}. The Cloud API contract likely changed. Build continues with the snapshot, but future updates will fail until schema is fixed.%0A%0AAction items:%0A  1. Check cloud/services/ingest/openapi.yaml for /api/object_info changes.%0A  2. Update apps/website/src/utils/cloudNodes.schema.ts and @comfyorg/object-info-parser schema as needed.`
+  }
+  return `::warning title=Cloud nodes API unavailable::${escaped}. Using last-known-good snapshot.%0A%0AAction items:%0A  1. Check cloud service health.%0A  2. Re-run this workflow once cloud.comfy.org is healthy.`
+}
+
+function escapeAnnotation(value: string): string {
+  return value.replace(/%/g, '%25').replace(/\r/g, '%0D').replace(/\n/g, '%0A')
+}
+
+function buildStepSummary(outcome: FetchOutcome): string {
+  const header = '## ☁️ Cloud nodes\n'
+  const rows: Array<[string, string]> = []
+
+  if (outcome.status === 'fresh') {
+    rows.push(['Status', '✅ Fresh (fetched from Cloud API)'])
+    rows.push(['Packs', String(outcome.snapshot.packs.length)])
+    rows.push([
+      'Nodes',
+      String(outcome.snapshot.packs.reduce((n, p) => n + p.nodes.length, 0))
+    ])
+    rows.push(['Dropped', String(outcome.droppedCount)])
+  } else if (outcome.status === 'stale') {
+    rows.push(['Status', '⚠️ Stale (using snapshot — Cloud fetch failed)'])
+    rows.push(['Packs', String(outcome.snapshot.packs.length)])
+    rows.push([
+      'Nodes',
+      String(outcome.snapshot.packs.reduce((n, p) => n + p.nodes.length, 0))
+    ])
+    rows.push(['Reason', outcome.reason])
+    rows.push(['Snapshot age', describeSnapshotAge(outcome.snapshot.fetchedAt)])
+  } else {
+    rows.push(['Status', '❌ Failed (no snapshot available)'])
+    rows.push(['Reason', outcome.reason])
+  }
+
+  const table =
+    '| | |\n|---|---|\n' +
+    rows.map(([k, v]) => `| **${k}** | ${v} |`).join('\n') +
+    '\n'
+
+  return `${header}${table}\n`
+}
+
+function describeSnapshotAge(fetchedAt: string): string {
+  const fetched = new Date(fetchedAt).getTime()
+  if (Number.isNaN(fetched)) return 'unknown'
+  const days = Math.floor((Date.now() - fetched) / 86_400_000)
+  if (days <= 0) return 'today'
+  if (days === 1) return '1 day'
+  return `${days} days`
+}
diff --git a/apps/website/src/utils/cloudNodes.registry.test.ts b/apps/website/src/utils/cloudNodes.registry.test.ts
new file mode 100644
index 0000000000..26af6e3fb5
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.registry.test.ts
@@ -0,0 +1,77 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import {
+  DEFAULT_REGISTRY_BASE_URL,
+  fetchRegistryPacks
+} from './cloudNodes.registry'
+
+function jsonResponse(
+  body: unknown,
+  init: Partial<ResponseInit> = {}
+): Response {
+  return new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { 'content-type': 'application/json' },
+    ...init
+  })
+}
+
+describe('fetchRegistryPacks', () => {
+  it('requests node ids in batches of 50', async () => {
+    const ids = Array.from({ length: 120 }, (_, i) => `pack-${i}`)
+    const fetchImpl = vi.fn(async (input: RequestInfo | URL) => {
+      const url = new URL(String(input))
+      const batchIds = url.searchParams.getAll('node_id')
+      return jsonResponse({
+        nodes: batchIds.map((id) => ({ id, name: id })),
+        total: batchIds.length,
+        page: 1,
+        limit: 50
+      })
+    })
+
+    const result = await fetchRegistryPacks(ids, {
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(fetchImpl).toHaveBeenCalledTimes(3)
+    expect(result.size).toBe(120)
+    const firstCallUrl = new URL(String(fetchImpl.mock.calls[0]?.[0]))
+    expect(firstCallUrl.origin).toBe(DEFAULT_REGISTRY_BASE_URL)
+    expect(firstCallUrl.pathname).toBe('/nodes')
+    expect(firstCallUrl.searchParams.getAll('node_id')).toHaveLength(50)
+  })
+
+  it('retries a failed batch once and then succeeds', async () => {
+    const fetchImpl = vi
+      .fn<(input: RequestInfo | URL, init?: RequestInit) => Promise<Response>>()
+      .mockResolvedValueOnce(new Response('{}', { status: 503 }))
+      .mockResolvedValueOnce(
+        jsonResponse({
+          nodes: [{ id: 'pack-1', name: 'Pack One' }],
+          total: 1,
+          page: 1,
+          limit: 50
+        })
+      )
+
+    const result = await fetchRegistryPacks(['pack-1'], {
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+
+    expect(fetchImpl).toHaveBeenCalledTimes(2)
+    expect(result.get('pack-1')?.name).toBe('Pack One')
+  })
+
+  it('returns an empty map when all batches fail (soft failure)', async () => {
+    const ids = ['pack-a', 'pack-b']
+    const fetchImpl = vi.fn(async () => new Response('{}', { status: 500 }))
+
+    const result = await fetchRegistryPacks(ids, {
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(fetchImpl).toHaveBeenCalledTimes(2)
+    expect(result.size).toBe(0)
+  })
+})
diff --git a/apps/website/src/utils/cloudNodes.registry.ts b/apps/website/src/utils/cloudNodes.registry.ts
new file mode 100644
index 0000000000..46a6458f13
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.registry.ts
@@ -0,0 +1,197 @@
+import { z } from 'zod'
+
+import type { components } from '@comfyorg/registry-types'
+
+export const DEFAULT_REGISTRY_BASE_URL = 'https://api.comfy.org'
+const DEFAULT_TIMEOUT_MS = 5_000
+const BATCH_SIZE = 50
+
+export type RegistryPack = components['schemas']['Node']
+
+const RegistryPackSchema = z
+  .object({
+    id: z.string().optional(),
+    name: z.string().optional(),
+    description: z.string().optional(),
+    icon: z.string().optional(),
+    banner_url: z.string().optional(),
+    repository: z.string().optional(),
+    license: z.string().optional(),
+    downloads: z.number().optional(),
+    github_stars: z.number().optional(),
+    created_at: z.string().optional(),
+    supported_os: z.array(z.string()).optional(),
+    supported_accelerators: z.array(z.string()).optional(),
+    publisher: z
+      .object({
+        id: z.string().optional(),
+        name: z.string().optional()
+      })
+      .passthrough()
+      .optional(),
+    latest_version: z
+      .object({
+        version: z.string().optional(),
+        createdAt: z.string().optional()
+      })
+      .passthrough()
+      .optional()
+  })
+  .passthrough()
+
+const RegistryListResponseSchema = z
+  .object({
+    nodes: z.array(RegistryPackSchema)
+  })
+  .passthrough()
+
+interface FetchRegistryOptions {
+  baseUrl?: string
+  timeoutMs?: number
+  fetchImpl?: typeof fetch
+}
+
+export async function fetchRegistryPacks(
+  packIds: readonly string[],
+  options: FetchRegistryOptions = {}
+): Promise<Map<string, RegistryPack | null>> {
+  const uniquePackIds = [...new Set(packIds.filter((id) => id.length > 0))]
+  if (uniquePackIds.length === 0) {
+    return new Map()
+  }
+
+  const baseUrl = options.baseUrl ?? DEFAULT_REGISTRY_BASE_URL
+  const timeoutMs = clampTimeoutMs(options.timeoutMs)
+  const fetchImpl = options.fetchImpl ?? fetch
+
+  const batches = chunk(uniquePackIds, BATCH_SIZE)
+  const resolved = new Map<string, RegistryPack | null>()
+  let successCount = 0
+  let failureCount = 0
+
+  for (const batch of batches) {
+    const nodes = await fetchBatchWithRetry(
+      fetchImpl,
+      baseUrl,
+      batch,
+      timeoutMs
+    )
+    if (!nodes) {
+      failureCount += 1
+      for (const packId of batch) {
+        resolved.set(packId, null)
+      }
+      continue
+    }
+
+    successCount += 1
+    const nodesById = new Map(
+      nodes
+        .map((node) => [node.id, node] as const)
+        .filter(([id]) => typeof id === 'string' && id.length > 0)
+    )
+
+    for (const packId of batch) {
+      resolved.set(packId, nodesById.get(packId) ?? null)
+    }
+  }
+
+  if (failureCount > 0) {
+    console.warn(
+      `[cloud-nodes] registry enrichment: ${successCount}/${batches.length} batches succeeded, ${failureCount} failed`
+    )
+  }
+
+  if (successCount === 0) {
+    return new Map()
+  }
+
+  return resolved
+}
+
+async function fetchBatchWithRetry(
+  fetchImpl: typeof fetch,
+  baseUrl: string,
+  packIds: readonly string[],
+  timeoutMs: number
+): Promise<RegistryPack[] | null> {
+  const firstAttempt = await fetchBatch(fetchImpl, baseUrl, packIds, timeoutMs)
+  if (firstAttempt.kind === 'ok') {
+    return firstAttempt.nodes
+  }
+  if (!firstAttempt.retryable) {
+    return null
+  }
+
+  const secondAttempt = await fetchBatch(fetchImpl, baseUrl, packIds, timeoutMs)
+  if (secondAttempt.kind === 'ok') {
+    return secondAttempt.nodes
+  }
+  return null
+}
+
+type BatchResponse =
+  | { kind: 'ok'; nodes: RegistryPack[] }
+  | { kind: 'err'; retryable: boolean }
+
+async function fetchBatch(
+  fetchImpl: typeof fetch,
+  baseUrl: string,
+  packIds: readonly string[],
+  timeoutMs: number
+): Promise<BatchResponse> {
+  const params = new URLSearchParams()
+  for (const packId of packIds) {
+    params.append('node_id', packId)
+  }
+
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), timeoutMs)
+
+  try {
+    const res = await fetchImpl(`${baseUrl}/nodes?${params.toString()}`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json'
+      },
+      signal: controller.signal
+    })
+
+    if (!res.ok) {
+      return {
+        kind: 'err',
+        retryable: res.status === 429 || (res.status >= 500 && res.status < 600)
+      }
+    }
+
+    const rawBody: unknown = await res.json()
+    const parsed = RegistryListResponseSchema.safeParse(rawBody)
+    if (!parsed.success) {
+      return { kind: 'err', retryable: false }
+    }
+    return { kind: 'ok', nodes: parsed.data.nodes as RegistryPack[] }
+  } catch {
+    return { kind: 'err', retryable: true }
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+function chunk<T>(values: readonly T[], size: number): T[][] {
+  const chunks: T[][] = []
+  for (let i = 0; i < values.length; i += size) {
+    chunks.push(values.slice(i, i + size))
+  }
+  return chunks
+}
+
+function clampTimeoutMs(candidate: number | undefined): number {
+  if (
+    typeof candidate !== 'number' ||
+    !Number.isFinite(candidate) ||
+    candidate <= 0
+  ) {
+    return DEFAULT_TIMEOUT_MS
+  }
+  return Math.floor(candidate)
+}
diff --git a/apps/website/src/utils/cloudNodes.schema.ts b/apps/website/src/utils/cloudNodes.schema.ts
new file mode 100644
index 0000000000..c1af5ee5b7
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.schema.ts
@@ -0,0 +1,3 @@
+import { z } from 'zod'
+
+export const CloudNodesEnvelopeSchema = z.record(z.unknown())
diff --git a/apps/website/src/utils/cloudNodes.test.ts b/apps/website/src/utils/cloudNodes.test.ts
new file mode 100644
index 0000000000..83b8939911
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.test.ts
@@ -0,0 +1,309 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { NodesSnapshot } from '../data/cloudNodes'
+import type * as ObjectInfoParser from '@comfyorg/object-info-parser'
+
+const fetchRegistryPacksMock = vi.hoisted(() => vi.fn(async () => new Map()))
+const sanitizeCallSpy = vi.hoisted(() => vi.fn())
+
+vi.mock('./cloudNodes.registry', () => ({
+  DEFAULT_REGISTRY_BASE_URL: 'https://api.comfy.org',
+  fetchRegistryPacks: fetchRegistryPacksMock
+}))
+
+vi.mock('@comfyorg/object-info-parser', async (importOriginal) => {
+  const actual = (await importOriginal()) as typeof ObjectInfoParser
+  return {
+    ...actual,
+    sanitizeUserContent: (
+      defs: Parameters<typeof actual.sanitizeUserContent>[0]
+    ) => {
+      sanitizeCallSpy(defs)
+      return actual.sanitizeUserContent(defs)
+    }
+  }
+})
+
+import {
+  fetchCloudNodesForBuild,
+  resetCloudNodesFetcherForTests
+} from './cloudNodes'
+
+const BASE_URL = 'https://cloud.test'
+const KEY = 'cloud-secret'
+
+function validNode(
+  overrides: Partial<Record<string, unknown>> = {}
+): Record<string, unknown> {
+  return {
+    name: 'ImpactNode',
+    display_name: 'Impact Node',
+    description: 'Node description',
+    category: 'impact/testing',
+    output_node: false,
+    python_module: 'custom_nodes.comfyui-impact-pack.nodes',
+    ...overrides
+  }
+}
+
+function response(body: unknown, init: Partial<ResponseInit> = {}): Response {
+  return new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { 'content-type': 'application/json' },
+    ...init
+  })
+}
+
+function makeSnapshot(packCount = 1): NodesSnapshot {
+  const packs = Array.from({ length: packCount }, (_, i) => ({
+    id: `snapshot-pack-${i}`,
+    displayName: `Snapshot Pack ${i}`,
+    nodes: [
+      {
+        name: `SnapshotNode${i}`,
+        displayName: `Snapshot Node ${i}`,
+        category: 'snapshot'
+      }
+    ]
+  }))
+
+  return {
+    fetchedAt: '2026-04-01T00:00:00.000Z',
+    packs
+  }
+}
+
+function withSnapshotDir(snapshot: NodesSnapshot | null): URL {
+  const dir = mkdtempSync(join(tmpdir(), 'cloud-nodes-test-'))
+  const file = join(dir, 'cloud-nodes.snapshot.json')
+  if (snapshot) writeFileSync(file, JSON.stringify(snapshot))
+  return pathToFileURL(file)
+}
+
+describe('fetchCloudNodesForBuild', () => {
+  const savedCloudApiKey = process.env.WEBSITE_CLOUD_API_KEY
+
+  beforeEach(() => {
+    resetCloudNodesFetcherForTests()
+    fetchRegistryPacksMock.mockReset()
+    fetchRegistryPacksMock.mockResolvedValue(new Map())
+    sanitizeCallSpy.mockReset()
+    delete process.env.WEBSITE_CLOUD_API_KEY
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+    process.env.WEBSITE_CLOUD_API_KEY = savedCloudApiKey
+  })
+
+  it('returns fresh when API succeeds', async () => {
+    fetchRegistryPacksMock.mockResolvedValue(
+      new Map([
+        [
+          'comfyui-impact-pack',
+          {
+            id: 'comfyui-impact-pack',
+            name: 'ComfyUI Impact Pack',
+            repository: 'https://github.com/ltdrdata/ComfyUI-Impact-Pack'
+          }
+        ]
+      ])
+    )
+
+    const fetchImpl = vi.fn(async () => response({ ImpactNode: validNode() }))
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.droppedCount).toBe(0)
+    expect(outcome.snapshot.packs).toHaveLength(1)
+    expect(outcome.snapshot.packs[0]?.repoUrl).toBe(
+      'https://github.com/ltdrdata/ComfyUI-Impact-Pack'
+    )
+  })
+
+  it('drops invalid nodes individually and keeps valid nodes', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () =>
+      response({
+        ValidNode: validNode({ name: 'ValidNode' }),
+        BrokenNode: {
+          name: 'BrokenNode',
+          python_module: 'custom_nodes.some-pack'
+        }
+      })
+    )
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(outcome.status).toBe('fresh')
+    if (outcome.status !== 'fresh') return
+    expect(outcome.droppedCount).toBe(1)
+    expect(outcome.droppedNodes[0]?.name).toBe('BrokenNode')
+    expect(outcome.snapshot.packs[0]?.nodes).toHaveLength(1)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('applies sanitizer before grouping', async () => {
+    const fetchImpl = vi.fn(async () =>
+      response({
+        LoadImage: validNode({
+          name: 'LoadImage',
+          python_module: 'nodes',
+          input: {
+            required: {
+              image: [['private.png', 'public.webp'], {}]
+            }
+          }
+        }),
+        ImpactNode: validNode({
+          input: {
+            required: {
+              choice: [['safe', 'movie.mov'], {}]
+            }
+          }
+        })
+      })
+    )
+
+    await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(sanitizeCallSpy).toHaveBeenCalledTimes(1)
+  })
+
+  it('returns stale with missing env when snapshot is present', async () => {
+    const snapshot = makeSnapshot()
+    const snapshotUrl = withSnapshotDir(snapshot)
+    const fetchImpl = vi.fn()
+    const outcome = await fetchCloudNodesForBuild({
+      snapshotUrl,
+      fetchImpl: fetchImpl as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^missing /)
+    expect(fetchImpl).not.toHaveBeenCalled()
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('returns failed when env and snapshot are missing', async () => {
+    const snapshotUrl = withSnapshotDir(null)
+    const outcome = await fetchCloudNodesForBuild({
+      snapshotUrl,
+      fetchImpl: vi.fn() as unknown as typeof fetch
+    })
+    expect(outcome.status).toBe('failed')
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('does not retry on HTTP 401', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({}, { status: 401 }))
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^HTTP 401/)
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('retries 5xx then falls back to snapshot', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response({}, { status: 503 }))
+    const sleep = vi.fn(async () => undefined)
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      retryDelaysMs: [1, 1, 1],
+      sleep,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    expect(fetchImpl).toHaveBeenCalledTimes(4)
+    expect(sleep).toHaveBeenCalledTimes(3)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('falls back to snapshot on envelope schema mismatch', async () => {
+    const snapshotUrl = withSnapshotDir(makeSnapshot())
+    const fetchImpl = vi.fn(async () => response(['unexpected-array-envelope']))
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      snapshotUrl,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+    expect(outcome.status).toBe('stale')
+    if (outcome.status !== 'stale') return
+    expect(outcome.reason).toMatch(/^envelope schema/)
+    rmSync(new URL('.', snapshotUrl), { recursive: true, force: true })
+  })
+
+  it('memoizes within a single process', async () => {
+    const fetchImpl = vi.fn(async () => response({ ImpactNode: validNode() }))
+    const opts = {
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as typeof fetch
+    }
+
+    const [a, b] = await Promise.all([
+      fetchCloudNodesForBuild(opts),
+      fetchCloudNodesForBuild(opts)
+    ])
+
+    expect(a).toBe(b)
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+  })
+
+  it('throws when called twice with materially different options', async () => {
+    const fetchImpl = vi.fn(async () => response({ ImpactNode: validNode() }))
+    await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+
+    expect(() =>
+      fetchCloudNodesForBuild({
+        apiKey: 'different-key',
+        baseUrl: BASE_URL,
+        fetchImpl: fetchImpl as typeof fetch
+      })
+    ).toThrow(/called twice with different options/)
+  })
+
+  it('returns fresh even when registry enrichment fails', async () => {
+    fetchRegistryPacksMock.mockResolvedValue(new Map())
+    const fetchImpl = vi.fn(async () => response({ ImpactNode: validNode() }))
+    const outcome = await fetchCloudNodesForBuild({
+      apiKey: KEY,
+      baseUrl: BASE_URL,
+      fetchImpl: fetchImpl as typeof fetch
+    })
+    expect(outcome.status).toBe('fresh')
+  })
+})
diff --git a/apps/website/src/utils/cloudNodes.ts b/apps/website/src/utils/cloudNodes.ts
new file mode 100644
index 0000000000..2ad97a966e
--- /dev/null
+++ b/apps/website/src/utils/cloudNodes.ts
@@ -0,0 +1,355 @@
+import { readFile } from 'node:fs/promises'
+
+import {
+  groupNodesByPack,
+  sanitizeUserContent,
+  validateComfyNodeDef
+} from '@comfyorg/object-info-parser'
+
+import type { RegistryPack } from './cloudNodes.registry'
+import type { NodesSnapshot, Pack, PackNode } from '../data/cloudNodes'
+
+import bundledSnapshot from '../data/cloud-nodes.snapshot.json' with { type: 'json' }
+import { isNodesSnapshot } from '../data/cloudNodes'
+import { fetchRegistryPacks } from './cloudNodes.registry'
+import { CloudNodesEnvelopeSchema } from './cloudNodes.schema'
+
+const DEFAULT_BASE_URL = 'https://cloud.comfy.org'
+const DEFAULT_TIMEOUT_MS = 10_000
+const RETRY_DELAYS_MS = [1_000, 2_000, 4_000]
+
+export interface DroppedNode {
+  name: string
+  reason: string
+}
+
+export type FetchOutcome =
+  | {
+      status: 'fresh'
+      snapshot: NodesSnapshot
+      droppedCount: number
+      droppedNodes: DroppedNode[]
+    }
+  | { status: 'stale'; snapshot: NodesSnapshot; reason: string }
+  | { status: 'failed'; reason: string }
+
+interface FetchCloudNodesOptions {
+  apiKey?: string
+  baseUrl?: string
+  timeoutMs?: number
+  retryDelaysMs?: readonly number[]
+  fetchImpl?: typeof fetch
+  snapshotUrl?: URL
+  sleep?: (ms: number) => Promise<void>
+}
+
+let inflight: Promise<FetchOutcome> | undefined
+let inflightOptions: FetchCloudNodesOptions | undefined
+
+export function resetCloudNodesFetcherForTests(): void {
+  inflight = undefined
+  inflightOptions = undefined
+}
+
+function optionsDifferMaterially(
+  a: FetchCloudNodesOptions,
+  b: FetchCloudNodesOptions
+): boolean {
+  return (
+    a.apiKey !== b.apiKey ||
+    a.baseUrl !== b.baseUrl ||
+    a.timeoutMs !== b.timeoutMs ||
+    a.snapshotUrl?.href !== b.snapshotUrl?.href
+  )
+}
+
+export function fetchCloudNodesForBuild(
+  options: FetchCloudNodesOptions = {}
+): Promise<FetchOutcome> {
+  if (inflight && inflightOptions) {
+    if (optionsDifferMaterially(inflightOptions, options)) {
+      throw new Error(
+        'fetchCloudNodesForBuild called twice with different options; call resetCloudNodesFetcherForTests() between distinct configurations'
+      )
+    }
+    return inflight
+  }
+  inflightOptions = options
+  inflight = doFetchCloudNodesForBuild(options)
+  return inflight
+}
+
+async function doFetchCloudNodesForBuild(
+  options: FetchCloudNodesOptions
+): Promise<FetchOutcome> {
+  const apiKey = options.apiKey ?? process.env.WEBSITE_CLOUD_API_KEY
+
+  if (!apiKey) {
+    return fallback('missing WEBSITE_CLOUD_API_KEY', options.snapshotUrl)
+  }
+
+  const result = await tryFetchAndParse(apiKey, options)
+  if (result.kind === 'ok') {
+    return {
+      status: 'fresh',
+      snapshot: {
+        fetchedAt: new Date().toISOString(),
+        packs: result.packs
+      },
+      droppedCount: result.droppedNodes.length,
+      droppedNodes: result.droppedNodes
+    }
+  }
+
+  return fallback(result.reason, options.snapshotUrl)
+}
+
+async function fallback(
+  reason: string,
+  snapshotUrl: URL | undefined
+): Promise<FetchOutcome> {
+  const snapshot = await readSnapshot(snapshotUrl)
+  if (snapshot) return { status: 'stale', snapshot, reason }
+  return { status: 'failed', reason }
+}
+
+interface FetchOk {
+  kind: 'ok'
+  packs: Pack[]
+  droppedNodes: DroppedNode[]
+}
+
+interface FetchErr {
+  kind: 'err'
+  reason: string
+}
+
+async function tryFetchAndParse(
+  apiKey: string,
+  options: FetchCloudNodesOptions
+): Promise<FetchOk | FetchErr> {
+  const baseUrl = options.baseUrl ?? DEFAULT_BASE_URL
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS
+  const retryDelaysMs = options.retryDelaysMs ?? RETRY_DELAYS_MS
+  const fetchImpl = options.fetchImpl ?? fetch
+  const sleep = options.sleep ?? defaultSleep
+
+  const url = `${baseUrl}/api/object_info`
+
+  let lastReason = 'unknown error'
+  for (let attempt = 0; attempt <= retryDelaysMs.length; attempt++) {
+    if (attempt > 0) await sleep(retryDelaysMs[attempt - 1])
+
+    const response = await callOnce(fetchImpl, url, apiKey, timeoutMs)
+    if (response.kind === 'err') {
+      lastReason = response.reason
+      if (!response.retryable) return response
+      continue
+    }
+
+    const envelope = CloudNodesEnvelopeSchema.safeParse(response.body)
+    if (!envelope.success) {
+      return {
+        kind: 'err',
+        reason: `envelope schema validation failed: ${envelope.error.issues
+          .map((i) => `${i.path.join('.') || '<root>'}: ${i.message}`)
+          .join('; ')}`
+      }
+    }
+
+    if (Object.keys(envelope.data).length === 0) {
+      return {
+        kind: 'err',
+        reason:
+          'envelope schema validation failed: <root>: expected non-empty object'
+      }
+    }
+
+    return parseCloudNodes(envelope.data, options)
+  }
+
+  return { kind: 'err', reason: lastReason }
+}
+
+type CallResponse =
+  | { kind: 'ok'; body: unknown }
+  | { kind: 'err'; reason: string; retryable: boolean }
+
+async function callOnce(
+  fetchImpl: typeof fetch,
+  url: string,
+  apiKey: string,
+  timeoutMs: number
+): Promise<CallResponse> {
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), timeoutMs)
+  try {
+    const res = await fetchImpl(url, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        'X-API-Key': apiKey
+      },
+      signal: controller.signal
+    })
+    if (res.ok) {
+      return { kind: 'ok', body: await res.json() }
+    }
+    const retryable =
+      res.status === 429 || (res.status >= 500 && res.status < 600)
+    return {
+      kind: 'err',
+      reason: `HTTP ${res.status} ${res.statusText || ''}`.trim(),
+      retryable
+    }
+  } catch (error) {
+    const reason =
+      error instanceof Error
+        ? `network error: ${error.message}`
+        : 'network error'
+    return { kind: 'err', reason, retryable: true }
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+async function parseCloudNodes(
+  envelope: Record<string, unknown>,
+  options: FetchCloudNodesOptions
+): Promise<FetchOk> {
+  const validDefs: Record<string, ReturnType<typeof validateComfyNodeDef>> = {}
+  const droppedNodes: DroppedNode[] = []
+
+  for (const [name, rawDef] of Object.entries(envelope)) {
+    let validationError = 'unknown validation error'
+    const parsed = validateComfyNodeDef(rawDef, (error) => {
+      validationError = error
+    })
+    if (!parsed) {
+      droppedNodes.push({ name, reason: validationError })
+      continue
+    }
+    validDefs[name] = parsed
+  }
+
+  const sanitizedDefs = sanitizeUserContent(
+    validDefs as Record<string, NonNullable<(typeof validDefs)[string]>>
+  )
+  const grouped = groupNodesByPack(sanitizedDefs)
+
+  let registryMap = new Map<string, RegistryPack | null>()
+  try {
+    registryMap = await fetchRegistryPacks(
+      grouped.map((pack) => pack.id),
+      { fetchImpl: options.fetchImpl }
+    )
+  } catch {
+    registryMap = new Map()
+  }
+
+  const packs = grouped.map((pack) =>
+    toDomainPack(
+      pack.id,
+      pack.displayName,
+      pack.nodes,
+      registryMap.get(pack.id)
+    )
+  )
+
+  return { kind: 'ok', packs, droppedNodes }
+}
+
+function safeExternalUrl(value: string | undefined): string | undefined {
+  if (!value) return undefined
+  try {
+    const url = new URL(value)
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') return undefined
+    if (!url.host) return undefined
+    return url.toString()
+  } catch {
+    return undefined
+  }
+}
+
+function toDomainPack(
+  packId: string,
+  fallbackDisplayName: string,
+  nodes: Array<{
+    className: string
+    def: {
+      display_name: string
+      category: string
+      description: string
+      deprecated?: boolean
+      experimental?: boolean
+    }
+  }>,
+  registryPack: RegistryPack | null | undefined
+): Pack {
+  return {
+    id: packId,
+    registryId: registryPack?.id,
+    displayName: registryPack?.name?.trim() || fallbackDisplayName || packId,
+    description: registryPack?.description?.trim() || undefined,
+    bannerUrl: safeExternalUrl(registryPack?.banner_url),
+    iconUrl: safeExternalUrl(registryPack?.icon),
+    repoUrl: safeExternalUrl(registryPack?.repository),
+    publisher: registryPack?.publisher?.id
+      ? {
+          id: registryPack.publisher.id,
+          name: registryPack.publisher.name
+        }
+      : undefined,
+    downloads: registryPack?.downloads,
+    githubStars: registryPack?.github_stars,
+    latestVersion: registryPack?.latest_version?.version,
+    license: registryPack?.license,
+    lastUpdated:
+      registryPack?.latest_version?.createdAt ?? registryPack?.created_at,
+    supportedOs: registryPack?.supported_os,
+    supportedAccelerators: registryPack?.supported_accelerators,
+    nodes: nodes
+      .map((node) => toDomainNode(node.className, node.def))
+      .sort((a, b) => a.displayName.localeCompare(b.displayName))
+  }
+}
+
+function toDomainNode(
+  className: string,
+  def: {
+    display_name: string
+    category: string
+    description: string
+    deprecated?: boolean
+    experimental?: boolean
+  }
+): PackNode {
+  return {
+    name: className,
+    displayName: def.display_name,
+    category: def.category,
+    description: def.description || undefined,
+    deprecated: def.deprecated,
+    experimental: def.experimental
+  }
+}
+
+async function readSnapshot(
+  snapshotUrl: URL | undefined
+): Promise<NodesSnapshot | null> {
+  if (!snapshotUrl) {
+    return isNodesSnapshot(bundledSnapshot) ? bundledSnapshot : null
+  }
+  try {
+    const text = await readFile(snapshotUrl, 'utf8')
+    const parsed: unknown = JSON.parse(text)
+    if (isNodesSnapshot(parsed)) return parsed
+    return null
+  } catch {
+    return null
+  }
+}
+
+function defaultSleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
diff --git a/apps/website/src/utils/escapeJsonLd.ts b/apps/website/src/utils/escapeJsonLd.ts
new file mode 100644
index 0000000000..0f59b04b02
--- /dev/null
+++ b/apps/website/src/utils/escapeJsonLd.ts
@@ -0,0 +1,24 @@
+/**
+ * Serialize an object to a JSON string safe to embed inside an inline
+ * `<script type="application/ld+json">` tag.
+ *
+ * Pack metadata flows in from the public ComfyUI registry, where any user
+ * can publish a pack with a `displayName`, `description`, or
+ * `publisher.name` that contains `</script>` or `<!--`. Without escaping,
+ * those sequences would close the surrounding `<script>` tag and allow
+ * stored XSS.
+ *
+ * Escapes:
+ * - Every `<` (covers `</script>`, `<script`, `<!--`)
+ * - U+2028 LINE SEPARATOR and U+2029 PARAGRAPH SEPARATOR (which are
+ *   line terminators in HTML script context but valid characters
+ *   elsewhere in JSON, so `JSON.stringify` does not escape them)
+ *
+ * Reference: https://v8.dev/features/subsume-json
+ */
+export function escapeJsonLd(value: unknown): string {
+  return JSON.stringify(value)
+    .replace(/</g, '\\u003c')
+    .replace(/\u2028/g, '\\u2028')
+    .replace(/\u2029/g, '\\u2029')
+}
diff --git a/browser_tests/assets/missing/nested_subgraph_installed_model.json b/browser_tests/assets/missing/nested_subgraph_installed_model.json
new file mode 100644
index 0000000000..e5a4ca39d3
--- /dev/null
+++ b/browser_tests/assets/missing/nested_subgraph_installed_model.json
@@ -0,0 +1,232 @@
+{
+  "id": "14af6003-d4ee-4dee-8e3d-cbff2e5519b3",
+  "revision": 0,
+  "last_node_id": 205,
+  "last_link_id": 383,
+  "nodes": [
+    {
+      "id": 205,
+      "type": "821645cc-a5d2-468f-990c-17d9de2e0d1b",
+      "pos": [4720, 5820],
+      "size": [400, 470],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "label": "lotus_model",
+          "name": "unet_name_1",
+          "type": "COMBO",
+          "widget": {
+            "name": "unet_name_1"
+          },
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        }
+      ],
+      "properties": {
+        "proxyWidgets": [["76", "unet_name"]]
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "821645cc-a5d2-468f-990c-17d9de2e0d1b",
+        "version": 1,
+        "state": {
+          "lastGroupId": 8,
+          "lastNodeId": 205,
+          "lastLinkId": 383,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Depth to Image (Z-Image-Turbo)",
+        "inputNode": {
+          "id": -10,
+          "bounding": [28, 4936, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1599, 4936, 128, 68]
+        },
+        "inputs": [
+          {
+            "id": "80e6915f-5d59-4d6b-a197-d8c565ad2922",
+            "name": "unet_name_1",
+            "type": "COMBO",
+            "linkIds": [258],
+            "pos": [132, 4960]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "47f9a22d-6619-4917-9447-a7d5d08dceb5",
+            "name": "IMAGE",
+            "type": "IMAGE",
+            "linkIds": [],
+            "pos": [1623, 4960]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 76,
+            "type": "a1134394-29e4-48dc-9b1e-e601a14d6fb8",
+            "pos": [250, 4910],
+            "size": [400, 210],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "name": "unet_name",
+                "type": "COMBO",
+                "widget": {
+                  "name": "unet_name"
+                },
+                "link": 258
+              }
+            ],
+            "outputs": [
+              {
+                "name": "IMAGE",
+                "type": "IMAGE",
+                "links": []
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [["203", "unet_name"]]
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 258,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 76,
+            "target_slot": 0,
+            "type": "COMBO"
+          }
+        ],
+        "extra": {
+          "workflowRendererVersion": "LG",
+          "ds": {
+            "scale": 1,
+            "offset": [-30, -4760]
+          }
+        }
+      },
+      {
+        "id": "a1134394-29e4-48dc-9b1e-e601a14d6fb8",
+        "version": 1,
+        "state": {
+          "lastGroupId": 8,
+          "lastNodeId": 205,
+          "lastLinkId": 383,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Image to Depth Map (Lotus)",
+        "inputNode": {
+          "id": -10,
+          "bounding": [-60, -173, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1650, -173, 128, 68]
+        },
+        "inputs": [
+          {
+            "id": "d721b249-fd2a-441b-9a78-2805f04e2644",
+            "name": "unet_name",
+            "type": "COMBO",
+            "linkIds": [256],
+            "pos": [44, -149]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "2ec278bd-0b66-4b30-9c5b-994d5f638214",
+            "name": "IMAGE",
+            "type": "IMAGE",
+            "linkIds": [],
+            "pos": [1674, -149]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 203,
+            "type": "UNETLoader",
+            "pos": [180, -200],
+            "size": [400, 200],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "name": "unet_name",
+                "type": "COMBO",
+                "widget": {
+                  "name": "unet_name"
+                },
+                "link": 256
+              }
+            ],
+            "outputs": [
+              {
+                "name": "MODEL",
+                "type": "MODEL",
+                "links": []
+              }
+            ],
+            "properties": {},
+            "widgets_values": ["lotus-depth-d-v1-1.safetensors", "default"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 256,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 203,
+            "target_slot": 0,
+            "type": "COMBO"
+          }
+        ],
+        "extra": {
+          "workflowRendererVersion": "LG",
+          "ds": {
+            "scale": 1,
+            "offset": [40, 350]
+          }
+        }
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "workflowRendererVersion": "LG",
+    "ds": {
+      "scale": 1,
+      "offset": [-4500, -5670]
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/missing/node_replacement_multi.json b/browser_tests/assets/missing/node_replacement_multi.json
new file mode 100644
index 0000000000..c4473f216a
--- /dev/null
+++ b/browser_tests/assets/missing/node_replacement_multi.json
@@ -0,0 +1,68 @@
+{
+  "last_node_id": 4,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "E2E_OldSampler",
+      "pos": [100, 100],
+      "size": [400, 262],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        { "name": "model", "type": "MODEL", "link": null },
+        { "name": "positive", "type": "CONDITIONING", "link": null },
+        { "name": "negative", "type": "CONDITIONING", "link": null },
+        { "name": "latent_image", "type": "LATENT", "link": null }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [],
+          "slot_index": 0
+        }
+      ],
+      "properties": { "Node name for S&R": "E2E_OldSampler" },
+      "widgets_values": [42, 20, 7, "euler", "normal"]
+    },
+    {
+      "id": 2,
+      "type": "E2E_OldUpscaler",
+      "pos": [500, 100],
+      "size": [400, 200],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [{ "name": "image", "type": "IMAGE", "link": null }],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [2],
+          "slot_index": 0
+        }
+      ],
+      "properties": { "Node name for S&R": "E2E_OldUpscaler" },
+      "widgets_values": ["lanczos", 1.5]
+    },
+    {
+      "id": 3,
+      "type": "SaveImage",
+      "pos": [900, 100],
+      "size": [400, 200],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [{ "name": "images", "type": "IMAGE", "link": 2 }],
+      "properties": { "Node name for S&R": "SaveImage" },
+      "widgets_values": ["ComfyUI"]
+    }
+  ],
+  "links": [[2, 2, 0, 3, 0, "IMAGE"]],
+  "groups": [],
+  "config": {},
+  "extra": { "ds": { "scale": 1, "offset": [0, 0] } },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/missing/node_replacement_simple.json b/browser_tests/assets/missing/node_replacement_simple.json
new file mode 100644
index 0000000000..ce0de205b7
--- /dev/null
+++ b/browser_tests/assets/missing/node_replacement_simple.json
@@ -0,0 +1,59 @@
+{
+  "last_node_id": 3,
+  "last_link_id": 1,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "E2E_OldSampler",
+      "pos": [100, 100],
+      "size": [400, 262],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        { "name": "model", "type": "MODEL", "link": null },
+        { "name": "positive", "type": "CONDITIONING", "link": null },
+        { "name": "negative", "type": "CONDITIONING", "link": null },
+        { "name": "latent_image", "type": "LATENT", "link": null }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [1],
+          "slot_index": 0
+        }
+      ],
+      "properties": { "Node name for S&R": "E2E_OldSampler" },
+      "widgets_values": [42, 20, 7, "euler", "normal"]
+    },
+    {
+      "id": 2,
+      "type": "VAEDecode",
+      "pos": [500, 100],
+      "size": [400, 200],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        { "name": "samples", "type": "LATENT", "link": 1 },
+        { "name": "vae", "type": "VAE", "link": null }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [],
+          "slot_index": 0
+        }
+      ],
+      "properties": { "Node name for S&R": "VAEDecode" },
+      "widgets_values": []
+    }
+  ],
+  "links": [[1, 1, 0, 2, 0, "LATENT"]],
+  "groups": [],
+  "config": {},
+  "extra": { "ds": { "scale": 1, "offset": [0, 0] } },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/large-subgraph-80-nodes.json b/browser_tests/assets/subgraphs/large-subgraph-80-nodes.json
new file mode 100644
index 0000000000..f0d5d69aff
--- /dev/null
+++ b/browser_tests/assets/subgraphs/large-subgraph-80-nodes.json
@@ -0,0 +1,1449 @@
+{
+  "id": "0d334859-c564-4e64-9f6c-59f454fb80ee",
+  "revision": 0,
+  "last_node_id": 3,
+  "last_link_id": 0,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "8d95b22c-eac2-415c-839a-93cf7cad91fd",
+      "pos": [400, 300],
+      "size": [400, 200],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": []
+    },
+    {
+      "id": 2,
+      "type": "Note",
+      "pos": [100, 300],
+      "size": [210, 130],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [],
+      "properties": {
+        "text": ""
+      },
+      "widgets_values": ["Root graph context node 1"]
+    },
+    {
+      "id": 3,
+      "type": "Note",
+      "pos": [100, 500],
+      "size": [210, 130],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [],
+      "properties": {
+        "text": ""
+      },
+      "widgets_values": ["Root graph context node 2"]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "8d95b22c-eac2-415c-839a-93cf7cad91fd",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 80,
+          "lastLinkId": 0,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Large Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [-100, 150, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [2650, 150, 120, 60]
+        },
+        "inputs": [],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 1,
+            "type": "Note",
+            "pos": [100, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 1"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 2,
+            "type": "Note",
+            "pos": [350, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 2"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 3,
+            "type": "Note",
+            "pos": [600, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 3"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 4,
+            "type": "Note",
+            "pos": [850, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 3,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 4"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 5,
+            "type": "Note",
+            "pos": [1100, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 4,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 5"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 6,
+            "type": "Note",
+            "pos": [1350, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 5,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 6"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 7,
+            "type": "Note",
+            "pos": [1600, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 6,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 7"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 8,
+            "type": "Note",
+            "pos": [1850, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 7,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 8"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 9,
+            "type": "Note",
+            "pos": [2100, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 8,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 9"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 10,
+            "type": "Note",
+            "pos": [2350, 100],
+            "size": [210, 130],
+            "flags": {},
+            "order": 9,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 10"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 11,
+            "type": "Note",
+            "pos": [100, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 10,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 11"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 12,
+            "type": "Note",
+            "pos": [350, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 11,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 12"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 13,
+            "type": "Note",
+            "pos": [600, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 12,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 13"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 14,
+            "type": "Note",
+            "pos": [850, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 13,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 14"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 15,
+            "type": "Note",
+            "pos": [1100, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 14,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 15"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 16,
+            "type": "Note",
+            "pos": [1350, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 15,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 16"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 17,
+            "type": "Note",
+            "pos": [1600, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 16,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 17"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 18,
+            "type": "Note",
+            "pos": [1850, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 17,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 18"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 19,
+            "type": "Note",
+            "pos": [2100, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 18,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 19"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 20,
+            "type": "Note",
+            "pos": [2350, 280],
+            "size": [210, 130],
+            "flags": {},
+            "order": 19,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 20"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 21,
+            "type": "Note",
+            "pos": [100, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 20,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 21"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 22,
+            "type": "Note",
+            "pos": [350, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 21,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 22"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 23,
+            "type": "Note",
+            "pos": [600, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 22,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 23"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 24,
+            "type": "Note",
+            "pos": [850, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 23,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 24"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 25,
+            "type": "Note",
+            "pos": [1100, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 24,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 25"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 26,
+            "type": "Note",
+            "pos": [1350, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 25,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 26"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 27,
+            "type": "Note",
+            "pos": [1600, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 26,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 27"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 28,
+            "type": "Note",
+            "pos": [1850, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 27,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 28"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 29,
+            "type": "Note",
+            "pos": [2100, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 28,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 29"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 30,
+            "type": "Note",
+            "pos": [2350, 460],
+            "size": [210, 130],
+            "flags": {},
+            "order": 29,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 30"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 31,
+            "type": "Note",
+            "pos": [100, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 30,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 31"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 32,
+            "type": "Note",
+            "pos": [350, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 31,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 32"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 33,
+            "type": "Note",
+            "pos": [600, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 32,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 33"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 34,
+            "type": "Note",
+            "pos": [850, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 33,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 34"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 35,
+            "type": "Note",
+            "pos": [1100, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 34,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 35"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 36,
+            "type": "Note",
+            "pos": [1350, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 35,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 36"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 37,
+            "type": "Note",
+            "pos": [1600, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 36,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 37"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 38,
+            "type": "Note",
+            "pos": [1850, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 37,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 38"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 39,
+            "type": "Note",
+            "pos": [2100, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 38,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 39"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 40,
+            "type": "Note",
+            "pos": [2350, 640],
+            "size": [210, 130],
+            "flags": {},
+            "order": 39,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 40"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 41,
+            "type": "Note",
+            "pos": [100, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 40,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 41"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 42,
+            "type": "Note",
+            "pos": [350, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 41,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 42"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 43,
+            "type": "Note",
+            "pos": [600, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 42,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 43"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 44,
+            "type": "Note",
+            "pos": [850, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 43,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 44"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 45,
+            "type": "Note",
+            "pos": [1100, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 44,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 45"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 46,
+            "type": "Note",
+            "pos": [1350, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 45,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 46"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 47,
+            "type": "Note",
+            "pos": [1600, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 46,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 47"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 48,
+            "type": "Note",
+            "pos": [1850, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 47,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 48"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 49,
+            "type": "Note",
+            "pos": [2100, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 48,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 49"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 50,
+            "type": "Note",
+            "pos": [2350, 820],
+            "size": [210, 130],
+            "flags": {},
+            "order": 49,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 50"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 51,
+            "type": "Note",
+            "pos": [100, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 50,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 51"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 52,
+            "type": "Note",
+            "pos": [350, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 51,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 52"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 53,
+            "type": "Note",
+            "pos": [600, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 52,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 53"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 54,
+            "type": "Note",
+            "pos": [850, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 53,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 54"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 55,
+            "type": "Note",
+            "pos": [1100, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 54,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 55"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 56,
+            "type": "Note",
+            "pos": [1350, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 55,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 56"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 57,
+            "type": "Note",
+            "pos": [1600, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 56,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 57"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 58,
+            "type": "Note",
+            "pos": [1850, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 57,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 58"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 59,
+            "type": "Note",
+            "pos": [2100, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 58,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 59"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 60,
+            "type": "Note",
+            "pos": [2350, 1000],
+            "size": [210, 130],
+            "flags": {},
+            "order": 59,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 60"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 61,
+            "type": "Note",
+            "pos": [100, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 60,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 61"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 62,
+            "type": "Note",
+            "pos": [350, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 61,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 62"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 63,
+            "type": "Note",
+            "pos": [600, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 62,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 63"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 64,
+            "type": "Note",
+            "pos": [850, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 63,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 64"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 65,
+            "type": "Note",
+            "pos": [1100, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 64,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 65"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 66,
+            "type": "Note",
+            "pos": [1350, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 65,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 66"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 67,
+            "type": "Note",
+            "pos": [1600, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 66,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 67"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 68,
+            "type": "Note",
+            "pos": [1850, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 67,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 68"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 69,
+            "type": "Note",
+            "pos": [2100, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 68,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 69"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 70,
+            "type": "Note",
+            "pos": [2350, 1180],
+            "size": [210, 130],
+            "flags": {},
+            "order": 69,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 70"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 71,
+            "type": "Note",
+            "pos": [100, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 70,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 71"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 72,
+            "type": "Note",
+            "pos": [350, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 71,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 72"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 73,
+            "type": "Note",
+            "pos": [600, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 72,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 73"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 74,
+            "type": "Note",
+            "pos": [850, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 73,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 74"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 75,
+            "type": "Note",
+            "pos": [1100, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 74,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 75"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 76,
+            "type": "Note",
+            "pos": [1350, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 75,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 76"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 77,
+            "type": "Note",
+            "pos": [1600, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 76,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 77"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 78,
+            "type": "Note",
+            "pos": [1850, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 77,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 78"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 79,
+            "type": "Note",
+            "pos": [2100, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 78,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 79"],
+            "color": "#432",
+            "bgcolor": "#653"
+          },
+          {
+            "id": 80,
+            "type": "Note",
+            "pos": [2350, 1360],
+            "size": [210, 130],
+            "flags": {},
+            "order": 79,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [],
+            "properties": {
+              "text": ""
+            },
+            "widgets_values": ["Node 80"],
+            "color": "#432",
+            "bgcolor": "#653"
+          }
+        ],
+        "links": [],
+        "groups": [],
+        "reroutes": []
+      }
+    ]
+  },
+  "config": {},
+  "extra": {},
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-link-and-proxied-primitive.json b/browser_tests/assets/subgraphs/subgraph-with-link-and-proxied-primitive.json
new file mode 100644
index 0000000000..433d1b7458
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-with-link-and-proxied-primitive.json
@@ -0,0 +1,179 @@
+{
+  "id": "5c4a1450-26b8-4b34-b5ea-e3465273441e",
+  "revision": 0,
+  "last_node_id": 4,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "16aadaf6-aa66-4041-843e-589a6572a3ac",
+      "pos": [602, 409],
+      "size": [225, 144],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [],
+      "properties": {
+        "proxyWidgets": [
+          ["1", "value"],
+          ["4", "value"]
+        ]
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "16aadaf6-aa66-4041-843e-589a6572a3ac",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 4,
+          "lastLinkId": 2,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [349, 383, 128, 68]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [867, 383, 128, 48]
+        },
+        "inputs": [
+          {
+            "id": "50fd1af4-4f20-434f-9828-6971210be4e9",
+            "name": "value",
+            "type": "STRING",
+            "linkIds": [1],
+            "pos": [453, 407]
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 1,
+            "type": "PrimitiveString",
+            "pos": [537, 368],
+            "size": [270, 108],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 1
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveString"
+            },
+            "widgets_values": [""]
+          },
+          {
+            "id": 3,
+            "type": "PrimitiveInt",
+            "pos": [534.9899497487436, 515.4924623115581],
+            "size": [270, 104],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "INT",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 2
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "INT",
+                "name": "INT",
+                "type": "INT",
+                "links": null
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveInt"
+            },
+            "widgets_values": [0, "randomize"]
+          },
+          {
+            "id": 4,
+            "type": "PrimitiveNode",
+            "pos": [258.4381232333541, 549.1608040200999],
+            "size": [225, 104],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "name": "INT",
+                "type": "INT",
+                "widget": {
+                  "name": "value"
+                },
+                "links": [2]
+              }
+            ],
+            "properties": {
+              "Run widget replace on values": false
+            },
+            "widgets_values": [0, "randomize"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 2,
+            "origin_id": 4,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "INT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "frontendVersion": "1.44.17"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/vueNodes/ksampler-denoise-widget-link.json b/browser_tests/assets/vueNodes/ksampler-denoise-widget-link.json
new file mode 100644
index 0000000000..1dbfccd2e9
--- /dev/null
+++ b/browser_tests/assets/vueNodes/ksampler-denoise-widget-link.json
@@ -0,0 +1,90 @@
+{
+  "id": "06e5b524-5a40-40b9-b561-199dfab18cf0",
+  "revision": 0,
+  "last_node_id": 12,
+  "last_link_id": 10,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "KSampler",
+      "pos": [230, 110],
+      "size": [270, 317.5666809082031],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": null
+        },
+        {
+          "name": "denoise",
+          "type": "FLOAT",
+          "widget": {
+            "name": "denoise"
+          },
+          "link": 10
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "KSampler"
+      },
+      "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
+    },
+    {
+      "id": 11,
+      "type": "PrimitiveFloat",
+      "pos": [-80.55032348632812, 375.2260443115233],
+      "size": [270, 80.23332977294922],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "FLOAT",
+          "type": "FLOAT",
+          "links": [10]
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PrimitiveFloat"
+      },
+      "widgets_values": [0]
+    }
+  ],
+  "links": [[10, 11, 0, 10, 4, "FLOAT"]],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.8264462809917354,
+      "offset": [1335.8909766107738, 692.7345403667316]
+    },
+    "frontendVersion": "1.45.4"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/widgets/load_image_widget_missing_file.json b/browser_tests/assets/widgets/load_image_widget_missing_file.json
new file mode 100644
index 0000000000..4e101b8d44
--- /dev/null
+++ b/browser_tests/assets/widgets/load_image_widget_missing_file.json
@@ -0,0 +1,42 @@
+{
+  "last_node_id": 10,
+  "last_link_id": 10,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "LoadImage",
+      "pos": [50, 50],
+      "size": [315, 314],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["this-image-does-not-exist-deadbeef.png", "image"]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "offset": [0, 0],
+      "scale": 1
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index 7323933e99..fc767db226 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -190,6 +190,9 @@ export class ComfyPage {
   /** Worker index to test user ID */
   public readonly userIds: string[] = []
 
+  /** Whether the current test runs in Vue Nodes mode (initialized from `@vue-nodes` tag). */
+  public isVueNodes = false
+
   /** Test user ID for the current context */
   get id() {
     return this.userIds[comfyPageFixture.info().parallelIndex]
@@ -282,10 +285,12 @@ export class ComfyPage {
 
   async setup({
     clearStorage = true,
-    mockReleases = true
+    mockReleases = true,
+    url
   }: {
     clearStorage?: boolean
     mockReleases?: boolean
+    url?: string
   } = {}) {
     // Mock release endpoint to prevent changelog popups (before navigation)
     if (mockReleases) {
@@ -317,7 +322,7 @@ export class ComfyPage {
       }, this.id)
     }
 
-    await this.goto()
+    await this.goto({ url })
 
     await this.page.waitForFunction(() => document.fonts.ready)
     await this.waitForAppReady()
@@ -344,14 +349,20 @@ export class ComfyPage {
     return assetPath(fileName)
   }
 
-  async goto() {
-    await this.page.goto(this.url)
+  async goto({ url }: { url?: string } = {}) {
+    await this.page.goto(url ? new URL(url, this.url).toString() : this.url)
   }
 
   async nextFrame() {
     await nextFrame(this.page)
   }
 
+  async idleFrames(count: number) {
+    for (let i = 0; i < count; i++) {
+      await this.nextFrame()
+    }
+  }
+
   async delay(ms: number) {
     return sleep(ms)
   }
@@ -460,10 +471,20 @@ export const testComfySnapToGridGridSize = 50
 const COLLECT_COVERAGE = process.env.COLLECT_COVERAGE === 'true'
 
 export const comfyPageFixture = base.extend<{
+  initialFeatureFlags: Record<string, unknown>
+  initialSettings: Record<string, unknown>
   comfyPage: ComfyPage
   comfyMouse: ComfyMouse
   comfyFiles: ComfyFiles
 }>({
+  // Allows configuring feature flags for tests with before initial setup:
+  // `test.use({ initialFeatureFlags: { my_flag: true } })`.
+  initialFeatureFlags: [{}, { option: true }],
+  // Allows seeding user settings before initial page load:
+  // `test.use({ initialSettings: { 'Comfy.Locale': 'zh' } })`. Merged on top of
+  // the fixture's defaults so per-test values win.
+  initialSettings: [{}, { option: true }],
+
   page: async ({ page, browserName }, use) => {
     if (browserName !== 'chromium' || !COLLECT_COVERAGE) {
       return use(page)
@@ -480,7 +501,11 @@ export const comfyPageFixture = base.extend<{
     await mcr.add(coverage)
   },
 
-  comfyPage: async ({ page, request }, use, testInfo) => {
+  comfyPage: async (
+    { page, request, initialFeatureFlags, initialSettings },
+    use,
+    testInfo
+  ) => {
     const comfyPage = new ComfyPage(page, request)
 
     const { parallelIndex } = testInfo
@@ -489,6 +514,7 @@ export const comfyPageFixture = base.extend<{
     comfyPage.userIds[parallelIndex] = userId
 
     const isVueNodes = testInfo.tags.includes('@vue-nodes')
+    comfyPage.isVueNodes = isVueNodes
 
     try {
       await comfyPage.setupSettings({
@@ -505,6 +531,7 @@ export const comfyPageFixture = base.extend<{
         'Comfy.userId': userId,
         // Set tutorial completed to true to avoid loading the tutorial workflow.
         'Comfy.TutorialCompleted': true,
+        'Comfy.Queue.MaxHistoryItems': 64,
         'Comfy.SnapToGrid.GridSize': testComfySnapToGridGridSize,
         'Comfy.VueNodes.AutoScaleLayout': false,
         // Disable toast warning about version compatibility, as they may or
@@ -513,7 +540,8 @@ export const comfyPageFixture = base.extend<{
         // Disable errors tab to prevent missing model detection from
         // rendering error indicators on nodes during unrelated tests.
         'Comfy.RightSidePanel.ShowErrorsTab': false,
-        ...(isVueNodes && { 'Comfy.VueNodes.Enabled': true })
+        ...(isVueNodes && { 'Comfy.VueNodes.Enabled': true }),
+        ...initialSettings
       })
     } catch (e) {
       console.error(e)
@@ -523,6 +551,10 @@ export const comfyPageFixture = base.extend<{
       await comfyPage.cloudAuth.mockAuth()
     }
 
+    if (Object.keys(initialFeatureFlags).length > 0) {
+      await comfyPage.featureFlags.seedFlags(initialFeatureFlags)
+    }
+
     await comfyPage.setup()
 
     if (isVueNodes) {
diff --git a/browser_tests/fixtures/VueNodeHelpers.ts b/browser_tests/fixtures/VueNodeHelpers.ts
index e7bdab272f..679dd52a5e 100644
--- a/browser_tests/fixtures/VueNodeHelpers.ts
+++ b/browser_tests/fixtures/VueNodeHelpers.ts
@@ -5,6 +5,7 @@ import type { Locator, Page } from '@playwright/test'
 
 import { TestIds } from '@e2e/fixtures/selectors'
 import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'
+import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
 
 export class VueNodeHelpers {
   /**
@@ -37,6 +38,22 @@ export class VueNodeHelpers {
     return this.getNodeLocator(nodeId).getByTestId(TestIds.node.innerWrapper)
   }
 
+  getInputSlotRow(nodeId: string, slotIndex: number): Locator {
+    return this.getNodeLocator(nodeId)
+      .locator('.lg-slot--input')
+      .filter({
+        has: this.page.locator(
+          `[data-slot-key="${getSlotKey(nodeId, slotIndex, true)}"]`
+        )
+      })
+  }
+
+  getInputSlotConnectionDot(nodeId: string, slotIndex: number): Locator {
+    return this.getInputSlotRow(nodeId, slotIndex).getByTestId(
+      TestIds.node.slotConnectionDot
+    )
+  }
+
   /**
    * Get locator for Vue nodes by the node's title (displayed name in the header).
    * Matches against the actual title element, not the full node body.
@@ -200,13 +217,20 @@ export class VueNodeHelpers {
     }
   }
 
+  /**
+   * Locator for the Enter Subgraph footer button.
+   */
+  getSubgraphEnterButton(nodeId?: string): Locator {
+    const root = nodeId ? this.getNodeLocator(nodeId) : this.page
+    return root.getByTestId(TestIds.widgets.subgraphEnterButton).first()
+  }
+
   /**
    * Enter the subgraph of a node.
    * @param nodeId - The ID of the node to enter the subgraph of. If not provided, the first matched subgraph will be entered.
    */
   async enterSubgraph(nodeId?: string): Promise<void> {
-    const locator = nodeId ? this.getNodeLocator(nodeId) : this.page
-    const editButton = locator.getByTestId(TestIds.widgets.subgraphEnterButton)
+    const editButton = this.getSubgraphEnterButton(nodeId)
 
     // The footer tab button extends below the node body (visible area),
     // but its bounding box center overlaps the node body div.
diff --git a/browser_tests/fixtures/assetApiFixture.ts b/browser_tests/fixtures/assetApiFixture.ts
index 8cc6c06536..2c157b1fc2 100644
--- a/browser_tests/fixtures/assetApiFixture.ts
+++ b/browser_tests/fixtures/assetApiFixture.ts
@@ -1,8 +1,34 @@
 import { test as base } from '@playwright/test'
+import type { Page, Route } from '@playwright/test'
 
+import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
 import type { AssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
 import { createAssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
 
+const ASSETS_ROUTE_PATTERN = /\/api\/assets(?:\?.*)?$/
+const cloudAssetRequestsByPage = new WeakMap<Page, string[]>()
+
+function makeAssetsResponse(assets: ReadonlyArray<Asset>): ListAssetsResponse {
+  return { assets: [...assets], total: assets.length, has_more: false }
+}
+
+export function assetRequestIncludesTag(url: string, tag: string): boolean {
+  const includeTags = new URL(url).searchParams.get('include_tags') ?? ''
+  return includeTags
+    .split(',')
+    .map((value) => value.trim())
+    .filter(Boolean)
+    .includes(tag)
+}
+
+export function countAssetRequestsByTag(
+  requests: string[],
+  tag: string
+): number {
+  return requests.filter((url) => assetRequestIncludesTag(url, tag)).length
+}
+
 export const assetApiFixture = base.extend<{
   assetApi: AssetHelper
 }>({
@@ -14,3 +40,31 @@ export const assetApiFixture = base.extend<{
     await assetApi.clearMocks()
   }
 })
+
+export function createCloudAssetsFixture(assets: ReadonlyArray<Asset>) {
+  return comfyPageFixture.extend<{
+    cloudAssetRequests: string[]
+  }>({
+    page: async ({ page }, use) => {
+      const cloudAssetRequests: string[] = []
+      cloudAssetRequestsByPage.set(page, cloudAssetRequests)
+
+      async function assetsRouteHandler(route: Route) {
+        cloudAssetRequests.push(route.request().url())
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(makeAssetsResponse(assets))
+        })
+      }
+
+      await page.route(ASSETS_ROUTE_PATTERN, assetsRouteHandler)
+      await use(page)
+      await page.unroute(ASSETS_ROUTE_PATTERN, assetsRouteHandler)
+      cloudAssetRequestsByPage.delete(page)
+    },
+    cloudAssetRequests: async ({ page }, use) => {
+      await use(cloudAssetRequestsByPage.get(page) ?? [])
+    }
+  })
+}
diff --git a/browser_tests/fixtures/components/Actionbar.ts b/browser_tests/fixtures/components/Actionbar.ts
index a559a013cb..0fad74979a 100644
--- a/browser_tests/fixtures/components/Actionbar.ts
+++ b/browser_tests/fixtures/components/Actionbar.ts
@@ -39,10 +39,32 @@ class ComfyQueueButton {
     await this.dropdownButton.click()
     return new ComfyQueueButtonOptions(this.actionbar.page)
   }
+
+  public async openOptions() {
+    const options = new ComfyQueueButtonOptions(this.actionbar.page)
+    if (!(await options.menu.isVisible())) {
+      await this.dropdownButton.click()
+    }
+    return options
+  }
 }
 
 class ComfyQueueButtonOptions {
-  constructor(public readonly page: Page) {}
+  public readonly menu: Locator
+  public readonly modeItems: Locator
+
+  constructor(public readonly page: Page) {
+    this.menu = page.getByRole('menu')
+    this.modeItems = this.menu.getByRole('menuitem')
+  }
+
+  public modeItem(name: string) {
+    return this.menu.getByRole('menuitem', { name, exact: true })
+  }
+
+  public async selectMode(name: string) {
+    await this.modeItem(name).click()
+  }
 
   public async setMode(mode: AutoQueueMode) {
     await this.page.evaluate((mode) => {
diff --git a/browser_tests/fixtures/components/ContextMenu.ts b/browser_tests/fixtures/components/ContextMenu.ts
index fab6059baa..df22d95dad 100644
--- a/browser_tests/fixtures/components/ContextMenu.ts
+++ b/browser_tests/fixtures/components/ContextMenu.ts
@@ -20,6 +20,7 @@ export class ContextMenu {
 
   async clickMenuItemExact(name: string): Promise<void> {
     await this.page.getByRole('menuitem', { name, exact: true }).click()
+    await this.waitForHidden()
   }
 
   /**
diff --git a/browser_tests/fixtures/components/SidebarTab.ts b/browser_tests/fixtures/components/SidebarTab.ts
index 82cc28bfcc..79670d56df 100644
--- a/browser_tests/fixtures/components/SidebarTab.ts
+++ b/browser_tests/fixtures/components/SidebarTab.ts
@@ -384,11 +384,14 @@ export class AssetsSidebarTab extends SidebarTab {
     return this.page.locator('.p-contextmenu').getByText(label)
   }
 
-  override async open() {
+  override async open({ waitForAssets = true } = {}) {
     // Remove any toast notifications that may overlay the sidebar button
     await this.dismissToasts()
     await super.open()
     await this.generatedTab.waitFor({ state: 'visible' })
+    if (waitForAssets) {
+      await this.waitForAssets()
+    }
   }
 
   /** Dismiss all visible toast notifications by clicking their close buttons. */
diff --git a/browser_tests/fixtures/components/Topbar.ts b/browser_tests/fixtures/components/Topbar.ts
index 96e6e3866c..608a262f07 100644
--- a/browser_tests/fixtures/components/Topbar.ts
+++ b/browser_tests/fixtures/components/Topbar.ts
@@ -1,16 +1,23 @@
 import type { Locator, Page } from '@playwright/test'
 
 import type { WorkspaceStore } from '@e2e/types/globals'
+import { TestIds } from '@e2e/fixtures/selectors'
 
 export class Topbar {
   private readonly menuLocator: Locator
   private readonly menuTrigger: Locator
   readonly newWorkflowButton: Locator
+  readonly workflowTabs: Locator
+  readonly integratedTabBarActions: Locator
 
   constructor(public readonly page: Page) {
     this.menuLocator = page.locator('.comfy-command-menu')
     this.menuTrigger = page.locator('.comfy-menu-button-wrapper')
     this.newWorkflowButton = page.locator('.new-blank-workflow-button')
+    this.workflowTabs = page.getByTestId(TestIds.topbar.workflowTabs)
+    this.integratedTabBarActions = this.workflowTabs.getByTestId(
+      TestIds.topbar.integratedTabBarActions
+    )
   }
 
   async getTabNames(): Promise<string[]> {
@@ -75,7 +82,7 @@ export class Topbar {
   }
 
   getSaveDialog(): Locator {
-    return this.page.locator('.p-dialog-content input')
+    return this.page.getByRole('dialog').getByRole('textbox')
   }
 
   saveWorkflow(workflowName: string): Promise<void> {
@@ -109,9 +116,9 @@ export class Topbar {
 
     // Check if a confirmation dialog appeared (e.g., "Overwrite existing file?")
     // If so, return early to let the test handle the confirmation
-    const confirmationDialog = this.page.locator(
-      '.p-dialog:has-text("Overwrite")'
-    )
+    const confirmationDialog = this.page
+      .getByRole('dialog')
+      .filter({ hasText: 'Overwrite' })
     if (await confirmationDialog.isVisible()) {
       return
     }
diff --git a/browser_tests/fixtures/components/WidgetSelectDropdown.ts b/browser_tests/fixtures/components/WidgetSelectDropdown.ts
new file mode 100644
index 0000000000..15221961ff
--- /dev/null
+++ b/browser_tests/fixtures/components/WidgetSelectDropdown.ts
@@ -0,0 +1,12 @@
+import type { Locator } from '@playwright/test'
+
+export class WidgetSelectDropdownFixture {
+  public readonly selection: Locator
+
+  constructor(public readonly root: Locator) {
+    this.selection = root.locator('button span span')
+  }
+  async selectedItem(): Promise<string> {
+    return await this.selection.innerText()
+  }
+}
diff --git a/browser_tests/fixtures/data/nodeReplacements.ts b/browser_tests/fixtures/data/nodeReplacements.ts
new file mode 100644
index 0000000000..31c9cd2af2
--- /dev/null
+++ b/browser_tests/fixtures/data/nodeReplacements.ts
@@ -0,0 +1,47 @@
+import type { NodeReplacementResponse } from '@/platform/nodeReplacement/types'
+
+/**
+ * Mock node replacement mappings for e2e tests.
+ *
+ * Maps fake "missing" node types (E2E_OldSampler, E2E_OldUpscaler) to real
+ * core node types that are always available in the test server.
+ */
+export const mockNodeReplacements: NodeReplacementResponse = {
+  E2E_OldSampler: [
+    {
+      new_node_id: 'KSampler',
+      old_node_id: 'E2E_OldSampler',
+      old_widget_ids: ['seed', 'steps', 'cfg', 'sampler_name', 'scheduler'],
+      input_mapping: [
+        { new_id: 'model', old_id: 'model' },
+        { new_id: 'positive', old_id: 'positive' },
+        { new_id: 'negative', old_id: 'negative' },
+        { new_id: 'latent_image', old_id: 'latent_image' },
+        { new_id: 'seed', old_id: 'seed' },
+        { new_id: 'steps', old_id: 'steps' },
+        { new_id: 'cfg', old_id: 'cfg' },
+        { new_id: 'sampler_name', old_id: 'sampler_name' },
+        { new_id: 'scheduler', old_id: 'scheduler' }
+      ],
+      output_mapping: [{ new_idx: 0, old_idx: 0 }]
+    }
+  ],
+  E2E_OldUpscaler: [
+    {
+      new_node_id: 'ImageScaleBy',
+      old_node_id: 'E2E_OldUpscaler',
+      old_widget_ids: ['upscale_method', 'scale_by'],
+      input_mapping: [
+        { new_id: 'image', old_id: 'image' },
+        { new_id: 'upscale_method', old_id: 'upscale_method' },
+        { new_id: 'scale_by', old_id: 'scale_by' }
+      ],
+      output_mapping: [{ new_idx: 0, old_idx: 0 }]
+    }
+  ]
+}
+
+/** Subset containing only the E2E_OldSampler replacement. */
+export const mockNodeReplacementsSingle: NodeReplacementResponse = {
+  E2E_OldSampler: mockNodeReplacements.E2E_OldSampler
+}
diff --git a/browser_tests/fixtures/helpers/AppModeHelper.ts b/browser_tests/fixtures/helpers/AppModeHelper.ts
index f8337f1444..3951eda5d8 100644
--- a/browser_tests/fixtures/helpers/AppModeHelper.ts
+++ b/browser_tests/fixtures/helpers/AppModeHelper.ts
@@ -9,13 +9,15 @@ import { BuilderFooterHelper } from '@e2e/fixtures/helpers/BuilderFooterHelper'
 import { BuilderSaveAsHelper } from '@e2e/fixtures/helpers/BuilderSaveAsHelper'
 import { BuilderSelectHelper } from '@e2e/fixtures/helpers/BuilderSelectHelper'
 import { BuilderStepsHelper } from '@e2e/fixtures/helpers/BuilderStepsHelper'
+import { MobileAppHelper } from '@e2e/fixtures/helpers/MobileAppHelper'
 
 export class AppModeHelper {
-  readonly steps: BuilderStepsHelper
   readonly footer: BuilderFooterHelper
+  readonly mobile: MobileAppHelper
   readonly saveAs: BuilderSaveAsHelper
   readonly select: BuilderSelectHelper
   readonly outputHistory: OutputHistoryComponent
+  readonly steps: BuilderStepsHelper
   readonly widgets: AppModeWidgetHelper
 
   /** The "Connect an output" popover shown when saving without outputs. */
@@ -60,13 +62,16 @@ export class AppModeHelper {
   public readonly vueNodeSwitchDismissButton: Locator
   /** The "Don't show again" checkbox inside the Vue Node switch popup. */
   public readonly vueNodeSwitchDontShowAgainCheckbox: Locator
+  /** The main content area where outputs are displayed*/
+  public readonly centerPanel: Locator
 
   constructor(private readonly comfyPage: ComfyPage) {
-    this.steps = new BuilderStepsHelper(comfyPage)
+    this.mobile = new MobileAppHelper(comfyPage)
     this.footer = new BuilderFooterHelper(comfyPage)
     this.saveAs = new BuilderSaveAsHelper(comfyPage)
     this.select = new BuilderSelectHelper(comfyPage)
     this.outputHistory = new OutputHistoryComponent(comfyPage.page)
+    this.steps = new BuilderStepsHelper(comfyPage)
     this.widgets = new AppModeWidgetHelper(comfyPage)
 
     this.connectOutputPopover = this.page.getByTestId(
@@ -125,6 +130,7 @@ export class AppModeHelper {
     this.vueNodeSwitchDontShowAgainCheckbox = this.page.getByTestId(
       TestIds.appMode.vueNodeSwitchDontShowAgain
     )
+    this.centerPanel = this.page.getByTestId(TestIds.linear.centerPanel)
   }
 
   private get page(): Page {
diff --git a/browser_tests/fixtures/helpers/AssetHelper.ts b/browser_tests/fixtures/helpers/AssetHelper.ts
index e5d7171998..6bcfaa14cf 100644
--- a/browser_tests/fixtures/helpers/AssetHelper.ts
+++ b/browser_tests/fixtures/helpers/AssetHelper.ts
@@ -215,11 +215,12 @@ export class AssetHelper {
     return this.store.size
   }
   private handleListAssets(route: Route, url: URL) {
-    const includeTags = url.searchParams.get('include_tags')?.split(',') ?? []
+    const includeTags = parseAssetTagParam(url.searchParams.get('include_tags'))
+    const excludeTags = parseAssetTagParam(url.searchParams.get('exclude_tags'))
     const limit = parseInt(url.searchParams.get('limit') ?? '0', 10)
     const offset = parseInt(url.searchParams.get('offset') ?? '0', 10)
 
-    let filtered = this.getFilteredAssets(includeTags)
+    let filtered = this.getFilteredAssets(includeTags, excludeTags)
     if (limit > 0) {
       filtered = filtered.slice(offset, offset + limit)
     }
@@ -296,15 +297,29 @@ export class AssetHelper {
     this.paginationOptions = null
     this.uploadResponse = null
   }
-  private getFilteredAssets(tags: string[]): Asset[] {
+  private getFilteredAssets(
+    includeTags: string[],
+    excludeTags: string[]
+  ): Asset[] {
     const assets = [...this.store.values()]
-    if (tags.length === 0) return assets
 
-    return assets.filter((asset) =>
-      tags.every((tag) => (asset.tags ?? []).includes(tag))
+    return assets.filter(
+      (asset) =>
+        includeTags.every((tag) => (asset.tags ?? []).includes(tag)) &&
+        excludeTags.every((tag) => !(asset.tags ?? []).includes(tag))
     )
   }
 }
+
+function parseAssetTagParam(value: string | null): string[] {
+  return (
+    value
+      ?.split(',')
+      .map((tag) => tag.trim())
+      .filter(Boolean) ?? []
+  )
+}
+
 export function createAssetHelper(
   page: Page,
   ...operators: AssetOperator[]
diff --git a/browser_tests/fixtures/helpers/BuilderSelectHelper.ts b/browser_tests/fixtures/helpers/BuilderSelectHelper.ts
index 6b56182e6b..5a878556c4 100644
--- a/browser_tests/fixtures/helpers/BuilderSelectHelper.ts
+++ b/browser_tests/fixtures/helpers/BuilderSelectHelper.ts
@@ -127,9 +127,7 @@ export class BuilderSelectHelper {
     await popoverTrigger.click()
     await this.page.getByText('Rename', { exact: true }).click()
 
-    const dialogInput = this.page.locator(
-      '.p-dialog-content input[type="text"]'
-    )
+    const dialogInput = this.page.getByRole('dialog').getByRole('textbox')
     await dialogInput.fill(newName)
     await this.page.keyboard.press('Enter')
     await dialogInput.waitFor({ state: 'hidden' })
diff --git a/browser_tests/fixtures/helpers/DragDropHelper.ts b/browser_tests/fixtures/helpers/DragDropHelper.ts
index ee89551e45..6f02b776d6 100644
--- a/browser_tests/fixtures/helpers/DragDropHelper.ts
+++ b/browser_tests/fixtures/helpers/DragDropHelper.ts
@@ -1,4 +1,5 @@
 import { readFileSync } from 'fs'
+import { basename } from 'path'
 
 import type { Page } from '@playwright/test'
 
@@ -13,6 +14,7 @@ export class DragDropHelper {
   async dragAndDropExternalResource(
     options: {
       fileName?: string
+      filePath?: string
       url?: string
       dropPosition?: Position
       waitForUpload?: boolean
@@ -22,13 +24,14 @@ export class DragDropHelper {
     const {
       dropPosition = { x: 100, y: 100 },
       fileName,
+      filePath,
       url,
       waitForUpload = false,
       preserveNativePropagation = false
     } = options
 
-    if (!fileName && !url)
-      throw new Error('Must provide either fileName or url')
+    if (!fileName && !filePath && !url)
+      throw new Error('Must provide fileName, filePath, or url')
 
     const evaluateParams: {
       dropPosition: Position
@@ -39,12 +42,22 @@ export class DragDropHelper {
       preserveNativePropagation: boolean
     } = { dropPosition, preserveNativePropagation }
 
-    if (fileName) {
-      const filePath = assetPath(fileName)
-      const buffer = readFileSync(filePath)
+    if (fileName || filePath) {
+      const resolvedPath = filePath ?? assetPath(fileName!)
+      const displayName = fileName ?? basename(resolvedPath)
+      let buffer: Buffer
+      try {
+        buffer = readFileSync(resolvedPath)
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error)
+        throw new Error(
+          `Failed to read drag-and-drop fixture at "${resolvedPath}": ${reason}`,
+          { cause: error }
+        )
+      }
 
-      evaluateParams.fileName = fileName
-      evaluateParams.fileType = getMimeType(fileName)
+      evaluateParams.fileName = displayName
+      evaluateParams.fileType = getMimeType(displayName)
       evaluateParams.buffer = [...new Uint8Array(buffer)]
     }
 
@@ -148,6 +161,13 @@ export class DragDropHelper {
     return this.dragAndDropExternalResource({ fileName, ...options })
   }
 
+  async dragAndDropFilePath(
+    filePath: string,
+    options: { dropPosition?: Position; waitForUpload?: boolean } = {}
+  ): Promise<void> {
+    return this.dragAndDropExternalResource({ filePath, ...options })
+  }
+
   async dragAndDropURL(
     url: string,
     options: {
diff --git a/browser_tests/fixtures/helpers/ExecutionHelper.ts b/browser_tests/fixtures/helpers/ExecutionHelper.ts
index 3483a13667..e13f8c0db0 100644
--- a/browser_tests/fixtures/helpers/ExecutionHelper.ts
+++ b/browser_tests/fixtures/helpers/ExecutionHelper.ts
@@ -1,6 +1,10 @@
 import type { WebSocketRoute } from '@playwright/test'
 
-import type { NodeError, PromptResponse } from '@/schemas/apiSchema'
+import type {
+  NodeError,
+  NodeProgressState,
+  PromptResponse
+} from '@/schemas/apiSchema'
 import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { createMockJob } from '@e2e/fixtures/helpers/AssetsHelper'
@@ -230,6 +234,16 @@ export class ExecutionHelper {
     )
   }
 
+  /** Send `progress_state` WS event with per-node execution state. */
+  progressState(jobId: string, nodes: Record<string, NodeProgressState>): void {
+    this.requireWs().send(
+      JSON.stringify({
+        type: 'progress_state',
+        data: { prompt_id: jobId, nodes }
+      })
+    )
+  }
+
   /**
    * Complete a job by adding it to mock history, sending execution_success,
    * and triggering a history refresh via a status event.
diff --git a/browser_tests/fixtures/helpers/JobsApiMock.ts b/browser_tests/fixtures/helpers/JobsApiMock.ts
new file mode 100644
index 0000000000..aa61696c8f
--- /dev/null
+++ b/browser_tests/fixtures/helpers/JobsApiMock.ts
@@ -0,0 +1,176 @@
+import type { Page, Route } from '@playwright/test'
+import type {
+  JobDetailResponse,
+  JobEntry,
+  JobsListResponse
+} from '@comfyorg/ingest-types'
+
+const jobsListRoutePattern = /\/api\/jobs(?:\?.*)?$/
+const jobDetailRoutePattern = /\/api\/jobs\/[^/?#]+(?:\?.*)?$/
+const historyRoutePattern = /\/api\/history(?:\?.*)?$/
+const defaultJobsListLimit = 100
+
+export type MockJobRecord = {
+  listItem: JobEntry
+  detail: JobDetailResponse
+}
+
+function parsePositiveIntegerParam(url: URL, name: string): number | undefined {
+  const value = Number(url.searchParams.get(name))
+
+  return Number.isInteger(value) && value > 0 ? value : undefined
+}
+
+function getJobIdFromRequest(route: Route): string | null {
+  const url = new URL(route.request().url())
+  const jobId = url.pathname.split('/').at(-1)
+
+  return jobId ? decodeURIComponent(jobId) : null
+}
+
+export class JobsApiMock {
+  private listRouteHandler: ((route: Route) => Promise<void>) | null = null
+  private detailRouteHandler: ((route: Route) => Promise<void>) | null = null
+  private historyRouteHandler: ((route: Route) => Promise<void>) | null = null
+  private jobsById = new Map<string, MockJobRecord>()
+
+  constructor(private readonly page: Page) {}
+
+  async mockJobs(jobs: MockJobRecord[]): Promise<void> {
+    this.jobsById = new Map(
+      jobs.map(
+        (job) => [job.listItem.id, job] satisfies [string, MockJobRecord]
+      )
+    )
+    await this.ensureRoutesRegistered()
+  }
+
+  async clear(): Promise<void> {
+    this.jobsById.clear()
+
+    if (this.listRouteHandler) {
+      await this.page.unroute(jobsListRoutePattern, this.listRouteHandler)
+      this.listRouteHandler = null
+    }
+
+    if (this.detailRouteHandler) {
+      await this.page.unroute(jobDetailRoutePattern, this.detailRouteHandler)
+      this.detailRouteHandler = null
+    }
+
+    if (this.historyRouteHandler) {
+      await this.page.unroute(historyRoutePattern, this.historyRouteHandler)
+      this.historyRouteHandler = null
+    }
+  }
+
+  private async ensureRoutesRegistered(): Promise<void> {
+    if (!this.listRouteHandler) {
+      this.listRouteHandler = async (route: Route) => {
+        const url = new URL(route.request().url())
+        const statuses = url.searchParams
+          .get('status')
+          ?.split(',')
+          .map((status) => status.trim())
+          .filter(Boolean)
+
+        let filteredJobs = Array.from(
+          this.jobsById.values(),
+          ({ listItem }) => listItem
+        )
+
+        if (statuses?.length) {
+          filteredJobs = filteredJobs.filter((job) =>
+            statuses.includes(job.status)
+          )
+        }
+
+        const offset = parsePositiveIntegerParam(url, 'offset') ?? 0
+        const limit =
+          parsePositiveIntegerParam(url, 'limit') ?? defaultJobsListLimit
+        const total = filteredJobs.length
+        const visibleJobs = filteredJobs.slice(offset, offset + limit)
+
+        const response = {
+          jobs: visibleJobs,
+          pagination: {
+            offset,
+            limit,
+            total,
+            has_more: offset + visibleJobs.length < total
+          }
+        } satisfies JobsListResponse
+
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(response)
+        })
+      }
+
+      await this.page.route(jobsListRoutePattern, this.listRouteHandler)
+    }
+
+    if (!this.detailRouteHandler) {
+      this.detailRouteHandler = async (route: Route) => {
+        const jobId = getJobIdFromRequest(route)
+        const job = jobId ? this.jobsById.get(jobId) : undefined
+
+        if (!job) {
+          await route.fulfill({
+            status: 404,
+            contentType: 'application/json',
+            body: JSON.stringify({ error: 'Job not found' })
+          })
+          return
+        }
+
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify(job.detail)
+        })
+      }
+
+      await this.page.route(jobDetailRoutePattern, this.detailRouteHandler)
+    }
+
+    if (!this.historyRouteHandler) {
+      this.historyRouteHandler = async (route: Route) => {
+        const request = route.request()
+        if (request.method() !== 'POST') {
+          await route.continue()
+          return
+        }
+
+        const requestBody = request.postDataJSON() as
+          | { delete?: string[]; clear?: boolean }
+          | undefined
+
+        if (requestBody?.clear) {
+          this.jobsById = new Map(
+            Array.from(this.jobsById).filter(([, job]) => {
+              const status = job.listItem.status
+
+              return status === 'pending' || status === 'in_progress'
+            })
+          )
+        }
+
+        if (requestBody?.delete?.length) {
+          for (const jobId of requestBody.delete) {
+            this.jobsById.delete(jobId)
+          }
+        }
+
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({})
+        })
+      }
+
+      await this.page.route(historyRoutePattern, this.historyRouteHandler)
+    }
+  }
+}
diff --git a/browser_tests/fixtures/helpers/MaskEditorHelper.ts b/browser_tests/fixtures/helpers/MaskEditorHelper.ts
new file mode 100644
index 0000000000..9d9a6a54df
--- /dev/null
+++ b/browser_tests/fixtures/helpers/MaskEditorHelper.ts
@@ -0,0 +1,136 @@
+import type { Locator } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+
+const MASK_CANVAS_INDEX = 2
+const RGB_CANVAS_INDEX = 1
+
+export type BrushSliderLabel = 'thickness'
+
+export class MaskEditorHelper {
+  constructor(private comfyPage: ComfyPage) {}
+
+  private get page() {
+    return this.comfyPage.page
+  }
+
+  async loadImageOnNode() {
+    await this.comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+
+    const loadImageNode = (
+      await this.comfyPage.nodeOps.getNodeRefsByType('LoadImage')
+    )[0]
+    const { x, y } = await loadImageNode.getPosition()
+
+    await this.comfyPage.dragDrop.dragAndDropFile('image64x64.webp', {
+      dropPosition: { x, y }
+    })
+
+    const imagePreview = this.page.locator('.image-preview')
+    await expect(imagePreview).toBeVisible()
+    await expect(imagePreview.locator('img')).toBeVisible()
+    await expect(imagePreview).toContainText('x')
+
+    return {
+      imagePreview,
+      nodeId: String(loadImageNode.id)
+    }
+  }
+
+  async openDialog(): Promise<Locator> {
+    const { imagePreview } = await this.loadImageOnNode()
+
+    await imagePreview.getByRole('region').hover()
+    await this.page.getByLabel('Edit or mask image').click()
+
+    const dialog = this.page.locator('.mask-editor-dialog')
+    await expect(dialog).toBeVisible()
+    await expect(
+      dialog.getByRole('heading', { name: 'Mask Editor' })
+    ).toBeVisible()
+
+    const canvasContainer = dialog.locator('#maskEditorCanvasContainer')
+    await expect(canvasContainer).toBeVisible()
+    await expect(canvasContainer.locator('canvas')).toHaveCount(4)
+
+    return dialog
+  }
+
+  async drawStrokeOnPointerZone(dialog: Locator) {
+    const pointerZone = dialog.getByTestId('pointer-zone')
+    await expect(pointerZone).toBeVisible()
+
+    const box = await pointerZone.boundingBox()
+    if (!box) throw new Error('Pointer zone bounding box not found')
+
+    const startX = box.x + box.width * 0.3
+    const startY = box.y + box.height * 0.5
+    const endX = box.x + box.width * 0.7
+    const endY = box.y + box.height * 0.5
+
+    await this.page.mouse.move(startX, startY)
+    await this.page.mouse.down()
+    await this.page.mouse.move(endX, endY, { steps: 10 })
+    await this.page.mouse.up()
+
+    return { startX, startY, endX, endY, box }
+  }
+
+  async drawStrokeAndExpectPixels(dialog: Locator) {
+    await this.drawStrokeOnPointerZone(dialog)
+    await expect.poll(() => this.pollMaskPixelCount()).toBeGreaterThan(0)
+  }
+
+  getCanvasPixelData(canvasIndex: number) {
+    return this.page.evaluate((idx) => {
+      const canvases = document.querySelectorAll(
+        '#maskEditorCanvasContainer canvas'
+      )
+      const canvas = canvases[idx] as HTMLCanvasElement | undefined
+      if (!canvas) return null
+      const ctx = canvas.getContext('2d')
+      if (!ctx) return null
+      const data = ctx.getImageData(0, 0, canvas.width, canvas.height)
+      let nonTransparentPixels = 0
+      for (let i = 3; i < data.data.length; i += 4) {
+        if (data.data[i] > 0) nonTransparentPixels++
+      }
+      return { nonTransparentPixels, totalPixels: data.data.length / 4 }
+    }, canvasIndex)
+  }
+
+  pollMaskPixelCount(): Promise<number> {
+    return this.getCanvasPixelData(MASK_CANVAS_INDEX).then(
+      (d) => d?.nonTransparentPixels ?? 0
+    )
+  }
+
+  pollRgbPixelCount(): Promise<number> {
+    return this.getCanvasPixelData(RGB_CANVAS_INDEX).then(
+      (d) => d?.nonTransparentPixels ?? 0
+    )
+  }
+
+  getCanvasSnapshot(canvasIndex: number): Promise<string> {
+    return this.page.evaluate((idx) => {
+      const canvas = document.querySelectorAll(
+        '#maskEditorCanvasContainer canvas'
+      )[idx] as HTMLCanvasElement | undefined
+      return canvas?.toDataURL() ?? ''
+    }, canvasIndex)
+  }
+
+  brushInput(dialog: Locator, label: BrushSliderLabel): Locator {
+    return dialog.getByTestId(`brush-${label}-input`)
+  }
+}
+
+export const maskEditorTest = comfyPageFixture.extend<{
+  maskEditor: MaskEditorHelper
+}>({
+  maskEditor: async ({ comfyPage }, use) => {
+    await use(new MaskEditorHelper(comfyPage))
+  }
+})
diff --git a/browser_tests/fixtures/helpers/MobileAppHelper.ts b/browser_tests/fixtures/helpers/MobileAppHelper.ts
new file mode 100644
index 0000000000..54dc77b83d
--- /dev/null
+++ b/browser_tests/fixtures/helpers/MobileAppHelper.ts
@@ -0,0 +1,33 @@
+import type { Locator, Page } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { TestIds } from '@e2e/fixtures/selectors'
+
+export class MobileAppHelper {
+  private readonly page: Page
+  readonly contentPanel: Locator
+  readonly navigation: Locator
+  readonly navigationTabs: Locator
+  readonly view: Locator
+  readonly workflows: Locator
+
+  constructor(comfyPage: ComfyPage) {
+    this.page = comfyPage.page
+    this.view = this.page.getByTestId(TestIds.linear.mobile)
+    this.contentPanel = this.page.getByRole('tabpanel')
+    this.navigation = this.page.getByRole('tablist').filter({ hasText: 'Run' })
+    this.navigationTabs = this.navigation.getByRole('tab')
+    this.workflows = this.view.getByTestId(TestIds.linear.mobileWorkflows)
+  }
+
+  async switchWorkflow(workflowName: string) {
+    await this.workflows.click()
+    await this.page.getByRole('menu').getByText(workflowName).click()
+  }
+  async navigateTab(name: 'run' | 'outputs' | 'assets') {
+    await this.navigation.getByRole('tab', { name }).click()
+  }
+  async tap(locator: Locator, { count = 1 }: { count?: number } = {}) {
+    for (let i = 0; i < count; i++) await locator.tap()
+  }
+}
diff --git a/browser_tests/fixtures/helpers/NodeOperationsHelper.ts b/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
index 9ad8cc8009..a0fadd2f74 100644
--- a/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
+++ b/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
@@ -18,9 +18,7 @@ export class NodeOperationsHelper {
   public readonly promptDialogInput: Locator
 
   constructor(private comfyPage: ComfyPage) {
-    this.promptDialogInput = this.page.locator(
-      '.p-dialog-content input[type="text"]'
-    )
+    this.promptDialogInput = this.page.getByRole('dialog').getByRole('textbox')
   }
 
   private get page() {
diff --git a/browser_tests/fixtures/helpers/NodeReplacementHelper.ts b/browser_tests/fixtures/helpers/NodeReplacementHelper.ts
new file mode 100644
index 0000000000..31584e7bef
--- /dev/null
+++ b/browser_tests/fixtures/helpers/NodeReplacementHelper.ts
@@ -0,0 +1,93 @@
+import type { Locator, Page } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { TestIds } from '@e2e/fixtures/selectors'
+import type { NodeReplacementResponse } from '@/platform/nodeReplacement/types'
+
+/**
+ * Mock `/api/node_replacements` and enable the node replacement feature.
+ *
+ * Unlike features that only consult settings (e.g. shareWorkflowDialog,
+ * managerDialog), node replacement gates on `api.serverFeatureFlags`. The
+ * server sends a `feature_flags` WS message that wholesale replaces
+ * `serverFeatureFlags`, racing with any test-side override done via
+ * `page.evaluate`. To make the flow deterministic across CI shards, this
+ * helper patches `WebSocket.prototype` so every incoming `feature_flags`
+ * message has `node_replacements: true` injected before the api's WS
+ * handler sees it. Reload the page so the patched WebSocket and persisted
+ * settings apply to a fresh app boot, then wait for the resulting
+ * `/api/node_replacements` fetch before returning.
+ */
+export async function setupNodeReplacement(
+  comfyPage: ComfyPage,
+  replacements: NodeReplacementResponse
+): Promise<void> {
+  await comfyPage.page.route('**/api/node_replacements', (route) =>
+    route.fulfill({ json: replacements })
+  )
+
+  await comfyPage.settings.setSetting(
+    'Comfy.RightSidePanel.ShowErrorsTab',
+    true
+  )
+  await comfyPage.settings.setSetting('Comfy.NodeReplacement.Enabled', true)
+
+  await comfyPage.page.addInitScript(() => {
+    const proto = window.WebSocket.prototype
+    const originalAdd = proto.addEventListener
+    proto.addEventListener = function patchedAdd(
+      this: WebSocket,
+      type: string,
+      listener: EventListenerOrEventListenerObject | null,
+      options?: AddEventListenerOptions | boolean
+    ) {
+      if (type === 'message' && typeof listener === 'function') {
+        const wrapped = function (this: WebSocket, event: Event) {
+          const msgEvent = event as MessageEvent
+          if (typeof msgEvent.data === 'string') {
+            try {
+              const msg = JSON.parse(msgEvent.data)
+              if (
+                msg &&
+                msg.type === 'feature_flags' &&
+                msg.data &&
+                typeof msg.data === 'object'
+              ) {
+                msg.data.node_replacements = true
+                const patched = new MessageEvent('message', {
+                  data: JSON.stringify(msg),
+                  origin: msgEvent.origin,
+                  lastEventId: msgEvent.lastEventId
+                })
+                return (listener as EventListener).call(this, patched)
+              }
+            } catch {
+              // not JSON or not a feature_flags message - pass through
+            }
+          }
+          return (listener as EventListener).call(this, event)
+        }
+        return originalAdd.call(this, type, wrapped as EventListener, options)
+      }
+      return originalAdd.call(
+        this,
+        type,
+        listener as EventListenerOrEventListenerObject,
+        options
+      )
+    }
+  })
+
+  const fetchPromise = comfyPage.page.waitForResponse(
+    (response) =>
+      response.url().includes('/api/node_replacements') && response.ok(),
+    { timeout: 10000 }
+  )
+
+  await comfyPage.workflow.reloadAndWaitForApp()
+  await fetchPromise
+}
+
+export function getSwapNodesGroup(page: Page): Locator {
+  return page.getByTestId(TestIds.dialogs.swapNodesGroup)
+}
diff --git a/browser_tests/fixtures/helpers/SubgraphHelper.ts b/browser_tests/fixtures/helpers/SubgraphHelper.ts
index 9660667165..1c9f059991 100644
--- a/browser_tests/fixtures/helpers/SubgraphHelper.ts
+++ b/browser_tests/fixtures/helpers/SubgraphHelper.ts
@@ -362,6 +362,9 @@ export class SubgraphHelper {
 
     await this.comfyPage.nextFrame()
     await expect.poll(async () => this.isInSubgraph()).toBe(false)
+    if (this.comfyPage.isVueNodes) {
+      await this.comfyPage.vueNodes.waitForNodes()
+    }
   }
 
   async countGraphPseudoPreviewEntries(): Promise<number> {
diff --git a/browser_tests/fixtures/helpers/ToastHelper.ts b/browser_tests/fixtures/helpers/ToastHelper.ts
index 7fc175bcf8..cfe7581bc8 100644
--- a/browser_tests/fixtures/helpers/ToastHelper.ts
+++ b/browser_tests/fixtures/helpers/ToastHelper.ts
@@ -4,10 +4,16 @@ import type { Locator, Page } from '@playwright/test'
 export class ToastHelper {
   public readonly visibleToasts: Locator
   public readonly toastErrors: Locator
+  public readonly toastSuccesses: Locator
+  public readonly toastWarnings: Locator
 
   constructor(private readonly page: Page) {
     this.visibleToasts = page.locator('.p-toast-message:visible')
     this.toastErrors = page.locator('.p-toast-message.p-toast-message-error')
+    this.toastSuccesses = page.locator(
+      '.p-toast-message.p-toast-message-success'
+    )
+    this.toastWarnings = page.locator('.p-toast-message.p-toast-message-warn')
   }
 
   async closeToasts(requireCount = 0): Promise<void> {
diff --git a/browser_tests/fixtures/jobsApiMockFixture.ts b/browser_tests/fixtures/jobsApiMockFixture.ts
new file mode 100644
index 0000000000..cb25fbc472
--- /dev/null
+++ b/browser_tests/fixtures/jobsApiMockFixture.ts
@@ -0,0 +1,15 @@
+import { test as base } from '@playwright/test'
+
+import { JobsApiMock } from '@e2e/fixtures/helpers/JobsApiMock'
+
+export const jobsApiMockFixture = base.extend<{
+  jobsApi: JobsApiMock
+}>({
+  jobsApi: async ({ page }, use) => {
+    const jobsApi = new JobsApiMock(page)
+
+    await use(jobsApi)
+
+    await jobsApi.clear()
+  }
+})
diff --git a/browser_tests/fixtures/selectors.ts b/browser_tests/fixtures/selectors.ts
index 57124fdcaa..6f401f5056 100644
--- a/browser_tests/fixtures/selectors.ts
+++ b/browser_tests/fixtures/selectors.ts
@@ -64,6 +64,7 @@ export const TestIds = {
     missingModelRefresh: 'missing-model-refresh',
     missingModelImportUnsupported: 'missing-model-import-unsupported',
     missingMediaGroup: 'error-group-missing-media',
+    swapNodesGroup: 'error-group-swap-nodes',
     missingMediaRow: 'missing-media-row',
     missingMediaUploadDropzone: 'missing-media-upload-dropzone',
     missingMediaLibrarySelect: 'missing-media-library-select',
@@ -90,6 +91,8 @@ export const TestIds = {
     loginButton: 'login-button',
     loginButtonPopover: 'login-button-popover',
     loginButtonPopoverLearnMore: 'login-button-popover-learn-more',
+    workflowTabs: 'topbar-workflow-tabs',
+    integratedTabBarActions: 'integrated-tab-bar-actions',
     actionBarButtons: 'action-bar-buttons'
   },
   nodeLibrary: {
@@ -113,7 +116,8 @@ export const TestIds = {
     titleInput: 'node-title-input',
     pinIndicator: 'node-pin-indicator',
     innerWrapper: 'node-inner-wrapper',
-    mainImage: 'main-image'
+    mainImage: 'main-image',
+    slotConnectionDot: 'slot-connection-dot'
   },
   selectionToolbox: {
     root: 'selection-toolbox',
@@ -140,6 +144,14 @@ export const TestIds = {
     domWidgetTextarea: 'dom-widget-textarea',
     subgraphEnterButton: 'subgraph-enter-button'
   },
+  linear: {
+    centerPanel: 'linear-center-panel',
+    mobile: 'linear-mobile',
+    mobileNavigation: 'linear-mobile-navigation',
+    mobileWorkflows: 'linear-mobile-workflows',
+    outputInfo: 'linear-output-info',
+    widgetContainer: 'linear-widgets'
+  },
   builder: {
     footerNav: 'builder-footer-nav',
     saveButton: 'builder-save-button',
@@ -210,6 +222,7 @@ export const TestIds = {
   },
   queue: {
     overlayToggle: 'queue-overlay-toggle',
+    jobDetailsPopover: 'queue-job-details-popover',
     clearHistoryAction: 'clear-history-action',
     jobAssetsList: 'job-assets-list',
     notificationBanner: 'queue-notification-banner'
diff --git a/browser_tests/fixtures/utils/groupHelpers.ts b/browser_tests/fixtures/utils/groupHelpers.ts
new file mode 100644
index 0000000000..37d1de232b
--- /dev/null
+++ b/browser_tests/fixtures/utils/groupHelpers.ts
@@ -0,0 +1,34 @@
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+
+const GROUP_TITLE_CLICK_OFFSET_X = 50
+const GROUP_TITLE_CLICK_OFFSET_Y = 15
+
+/**
+ * Returns the client-space position of a group's title bar (for clicking).
+ */
+export async function getGroupTitlePosition(
+  comfyPage: ComfyPage,
+  title: string
+): Promise<{ x: number; y: number }> {
+  const pos = await comfyPage.page.evaluate(
+    ({ title, offsetX, offsetY }) => {
+      const app = window.app!
+      const group = app.graph.groups.find(
+        (g: { title: string }) => g.title === title
+      )
+      if (!group) return null
+      const clientPos = app.canvasPosToClientPos([
+        group.pos[0] + offsetX,
+        group.pos[1] + offsetY
+      ])
+      return { x: clientPos[0], y: clientPos[1] }
+    },
+    {
+      title,
+      offsetX: GROUP_TITLE_CLICK_OFFSET_X,
+      offsetY: GROUP_TITLE_CLICK_OFFSET_Y
+    }
+  )
+  if (!pos) throw new Error(`Group "${title}" not found`)
+  return pos
+}
diff --git a/browser_tests/fixtures/utils/jobFixtures.ts b/browser_tests/fixtures/utils/jobFixtures.ts
new file mode 100644
index 0000000000..b674a9455f
--- /dev/null
+++ b/browser_tests/fixtures/utils/jobFixtures.ts
@@ -0,0 +1,52 @@
+import type { JobDetailResponse, JobEntry } from '@comfyorg/ingest-types'
+
+import type { MockJobRecord } from '@e2e/fixtures/helpers/JobsApiMock'
+
+export function createMockJob(
+  overrides: Partial<JobEntry> & { id: string }
+): JobEntry {
+  const now = Date.now()
+
+  return {
+    status: 'completed',
+    create_time: now,
+    execution_start_time: now,
+    execution_end_time: now + 5_000,
+    preview_output: {
+      filename: `output_${overrides.id}.png`,
+      subfolder: '',
+      type: 'output',
+      nodeId: '1',
+      mediaType: 'images'
+    },
+    outputs_count: 1,
+    ...overrides
+  }
+}
+
+function isTerminalStatus(status: JobEntry['status']) {
+  return status === 'completed' || status === 'failed' || status === 'cancelled'
+}
+
+function createMockJobRecord(listItem: JobEntry): MockJobRecord {
+  const updateTime =
+    listItem.execution_end_time ??
+    listItem.execution_start_time ??
+    listItem.create_time
+  const detail: JobDetailResponse = {
+    ...listItem,
+    update_time: updateTime,
+    ...(isTerminalStatus(listItem.status) ? { outputs: {} } : {})
+  }
+
+  return {
+    listItem,
+    detail
+  }
+}
+
+export function createMockJobRecords(
+  listItems: readonly JobEntry[]
+): MockJobRecord[] {
+  return listItems.map(createMockJobRecord)
+}
diff --git a/browser_tests/fixtures/utils/mimeTypeUtil.ts b/browser_tests/fixtures/utils/mimeTypeUtil.ts
index 88f5b20a60..8ec0b1a8e1 100644
--- a/browser_tests/fixtures/utils/mimeTypeUtil.ts
+++ b/browser_tests/fixtures/utils/mimeTypeUtil.ts
@@ -7,6 +7,9 @@ export function getMimeType(fileName: string): string {
   if (name.endsWith('.avif')) return 'image/avif'
   if (name.endsWith('.webm')) return 'video/webm'
   if (name.endsWith('.mp4')) return 'video/mp4'
+  if (name.endsWith('.mp3')) return 'audio/mpeg'
+  if (name.endsWith('.flac')) return 'audio/flac'
+  if (name.endsWith('.ogg') || name.endsWith('.opus')) return 'audio/ogg'
   if (name.endsWith('.json')) return 'application/json'
   if (name.endsWith('.glb')) return 'model/gltf-binary'
   return 'application/octet-stream'
diff --git a/browser_tests/fixtures/utils/paths.ts b/browser_tests/fixtures/utils/paths.ts
index c8bc5ee3cb..682336d4b2 100644
--- a/browser_tests/fixtures/utils/paths.ts
+++ b/browser_tests/fixtures/utils/paths.ts
@@ -1,3 +1,7 @@
 export function assetPath(fileName: string): string {
   return `./browser_tests/assets/${fileName}`
 }
+
+export function metadataFixturePath(fileName: string): string {
+  return `./src/scripts/metadata/__fixtures__/${fileName}`
+}
diff --git a/browser_tests/fixtures/utils/selectionToolbox.ts b/browser_tests/fixtures/utils/selectionToolbox.ts
new file mode 100644
index 0000000000..d135df4a4d
--- /dev/null
+++ b/browser_tests/fixtures/utils/selectionToolbox.ts
@@ -0,0 +1,20 @@
+import type { Locator } from '@playwright/test'
+
+import { comfyExpect as expect } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+
+/**
+ * Opens the selection toolbox "More Options" menu and returns the menu
+ * locator so callers can scope follow-up queries to it.
+ */
+export async function openMoreOptions(comfyPage: ComfyPage): Promise<Locator> {
+  await expect(comfyPage.selectionToolbox).toBeVisible()
+
+  const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
+  await expect(moreOptionsBtn).toBeVisible()
+  await moreOptionsBtn.click()
+
+  const menu = comfyPage.page.locator('.p-contextmenu')
+  await expect(menu.getByText('Copy', { exact: true })).toBeVisible()
+  return menu
+}
diff --git a/browser_tests/fixtures/utils/vueNodeFixtures.ts b/browser_tests/fixtures/utils/vueNodeFixtures.ts
index 5616fcdf0e..b2ce49d994 100644
--- a/browser_tests/fixtures/utils/vueNodeFixtures.ts
+++ b/browser_tests/fixtures/utils/vueNodeFixtures.ts
@@ -13,6 +13,8 @@ export class VueNodeFixture {
   public readonly collapseButton: Locator
   public readonly collapseIcon: Locator
   public readonly root: Locator
+  public readonly widgets: Locator
+  public readonly imagePreview: Locator
 
   constructor(private readonly locator: Locator) {
     this.header = locator.locator('[data-testid^="node-header-"]')
@@ -23,6 +25,8 @@ export class VueNodeFixture {
     this.collapseButton = locator.getByTestId('node-collapse-button')
     this.collapseIcon = this.collapseButton.locator('i')
     this.root = locator
+    this.widgets = this.locator.locator('.lg-node-widget')
+    this.imagePreview = locator.locator('.image-preview')
   }
 
   async getTitle(): Promise<string> {
@@ -39,6 +43,16 @@ export class VueNodeFixture {
     await this.collapseButton.click()
   }
 
+  /**
+   * Select this node and delete it via the Delete key, waiting for the node
+   * element to leave the DOM before resolving.
+   */
+  async delete(): Promise<void> {
+    await this.header.click()
+    await this.header.press('Delete')
+    await this.locator.waitFor({ state: 'hidden' })
+  }
+
   async getCollapseIconClass(): Promise<string> {
     return (await this.collapseIcon.getAttribute('class')) ?? ''
   }
diff --git a/browser_tests/tests/appMode.spec.ts b/browser_tests/tests/appMode.spec.ts
new file mode 100644
index 0000000000..2a84b9f418
--- /dev/null
+++ b/browser_tests/tests/appMode.spec.ts
@@ -0,0 +1,154 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+import { WidgetSelectDropdownFixture } from '@e2e/fixtures/components/WidgetSelectDropdown'
+
+test.describe('App mode usage', () => {
+  test('Drag and Drop', async ({ comfyPage, comfyFiles }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+    const { centerPanel } = comfyPage.appMode
+    await comfyPage.appMode.enterAppModeWithInputs([['3', 'seed']])
+    await expect(centerPanel, 'Enter app mode').toBeVisible()
+
+    //an app without an image input will load the workflow
+    await test.step('App without an image input loads workflow', async () => {
+      await comfyPage.dragDrop.dragAndDropFile('workflowInMedia/workflow.webp')
+      await expect(centerPanel).toBeHidden()
+    })
+
+    //prep a load image
+    await test.step('Add a load image node', async () => {
+      await comfyPage.workflow.loadWorkflow('default')
+      await comfyPage.page.mouse.dblclick(200, 200, { delay: 5 })
+      await comfyPage.searchBox.fillAndSelectFirstNode('Load Image')
+      const loadImage = await comfyPage.vueNodes.getNodeLocator('10')
+      await expect(loadImage).toBeVisible()
+    })
+
+    const imageInput = new WidgetSelectDropdownFixture(
+      comfyPage.appMode.linearWidgets.locator('.lg-node-widget')
+    )
+
+    await test.step('Enter app mode with image input', async () => {
+      await comfyPage.appMode.enterAppModeWithInputs([['10', 'image']])
+      await expect(centerPanel).toBeVisible()
+
+      await expect(imageInput.root).toBeVisible()
+    })
+
+    await test.step('Dragging an image redirects to image input', async () => {
+      const initialImage = await imageInput.selectedItem()
+
+      await comfyPage.dragDrop.dragAndDropExternalResource({
+        fileName: 'workflow.webp',
+        filePath: './browser_tests/assets/workflowInMedia/workflow.webp',
+        preserveNativePropagation: true
+      })
+      comfyFiles.deleteAfterTest({ filename: 'workflow.webp', type: 'input' })
+
+      await expect(imageInput.selection).not.toHaveText(initialImage)
+      await expect(
+        centerPanel,
+        'A file with workflow should not open a new workflow'
+      ).toBeVisible()
+    })
+
+    await test.step('Dragging a url redirects to image input', async () => {
+      const secondImage = await imageInput.selectedItem()
+      await comfyPage.dragDrop.dragAndDropURL('/assets/images/og-image.png', {
+        preserveNativePropagation: true
+      })
+      comfyFiles.deleteAfterTest({
+        filename: 'og-image.png',
+        type: 'input'
+      })
+      await expect(imageInput.selection).not.toHaveText(secondImage)
+    })
+  })
+
+  test('Widget Interaction', async ({ comfyPage }) => {
+    await comfyPage.appMode.enterAppModeWithInputs([
+      ['3', 'seed'],
+      ['3', 'sampler_name'],
+      ['6', 'text']
+    ])
+    const seed = comfyPage.appMode.linearWidgets.getByLabel('seed', {
+      exact: true
+    })
+    const { input, incrementButton, decrementButton } =
+      comfyPage.vueNodes.getInputNumberControls(seed)
+    const initialValue = Number(await input.inputValue())
+
+    await seed.dragTo(incrementButton, { steps: 5 })
+    const intermediateValue = Number(await input.inputValue())
+    expect(intermediateValue).toBeGreaterThan(initialValue)
+
+    await seed.dragTo(decrementButton, { steps: 5 })
+    const endValue = Number(await input.inputValue())
+    expect(endValue).toBeLessThan(intermediateValue)
+
+    const sampler = comfyPage.appMode.linearWidgets.getByLabel('sampler_name', {
+      exact: true
+    })
+    await sampler.click()
+
+    await comfyPage.page.getByRole('searchbox').fill('uni')
+    await comfyPage.page.keyboard.press('ArrowDown')
+    await comfyPage.page.keyboard.press('Enter')
+    await expect(sampler).toHaveText('uni_pc')
+
+    //verify values are consistent with litegraph
+  })
+
+  test.describe('Mobile', { tag: ['@mobile'] }, () => {
+    test('panel navigation', async ({ comfyPage }) => {
+      const { mobile } = comfyPage.appMode
+      await comfyPage.appMode.enterAppModeWithInputs([['3', 'steps']])
+      await expect(mobile.view).toBeVisible()
+      await expect(mobile.navigation).toBeVisible()
+
+      await mobile.navigateTab('assets')
+      await expect(mobile.contentPanel).toHaveAccessibleName('Assets')
+
+      const buttons = await mobile.navigationTabs.all()
+      await buttons[0].dragTo(buttons[2], { steps: 5 })
+      await expect(mobile.contentPanel).toHaveAccessibleName('Outputs')
+
+      await mobile.navigateTab('run')
+      await expect(comfyPage.appMode.linearWidgets).toBeInViewport({ ratio: 1 })
+
+      const steps = comfyPage.page.getByRole('spinbutton')
+      const initialValue = Number(await steps.inputValue())
+      await mobile.tap(
+        comfyPage.page.getByRole('button', { name: 'increment' }),
+        { count: 5 }
+      )
+      await expect(steps).toHaveValue(String(initialValue + 5))
+      await mobile.tap(
+        comfyPage.page.getByRole('button', { name: 'decrement' }),
+        { count: 3 }
+      )
+
+      await expect(steps).toHaveValue(String(initialValue + 2))
+    })
+
+    test('workflow selection', async ({ comfyPage }) => {
+      const widgetNames = ['seed', 'steps', 'denoise', 'cfg']
+      for (const name of widgetNames)
+        await comfyPage.appMode.enterAppModeWithInputs([['3', name]])
+      await expect(comfyPage.appMode.mobile.workflows).toBeVisible()
+
+      const widgets = comfyPage.appMode.linearWidgets
+      await comfyPage.appMode.mobile.navigateTab('run')
+      for (let i = 0; i < widgetNames.length; i++) {
+        await comfyPage.appMode.mobile.switchWorkflow(`(${i + 2})`)
+        await expect(widgets.getByText(widgetNames[i])).toBeVisible()
+      }
+    })
+  })
+})
diff --git a/browser_tests/tests/appModeBuilder.spec.ts b/browser_tests/tests/appModeBuilder.spec.ts
new file mode 100644
index 0000000000..99392b0445
--- /dev/null
+++ b/browser_tests/tests/appModeBuilder.spec.ts
@@ -0,0 +1,121 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+
+test.describe('App mode builder selection', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.appMode.enableLinearMode()
+  })
+
+  test('Can independently select inputs of same name', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    const items = comfyPage.appMode.select.inputItems
+
+    await comfyPage.vueNodes.selectNodes(['6', '7'])
+    await comfyPage.command.executeCommand('Comfy.Graph.ConvertToSubgraph')
+
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    const prompts = comfyPage.vueNodes
+      .getNodeByTitle('New Subgraph')
+      .locator('.lg-node-widget')
+    const count = await prompts.count()
+    for (let i = 0; i < count; i++) {
+      await expect(prompts.nth(i)).toBeVisible()
+      await prompts.nth(i).click()
+      await expect(items).toHaveCount(i + 1)
+    }
+  })
+
+  test('Can select outputs', async ({ comfyPage }) => {
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToOutputs()
+
+    await comfyPage.nodeOps
+      .getNodeRefById('9')
+      .then((ref) => ref.centerOnNode())
+    const saveImage = await comfyPage.vueNodes.getNodeLocator('9')
+    await saveImage.click()
+
+    const items = comfyPage.appMode.select.inputItems
+    await expect(items).toHaveCount(1)
+  })
+
+  test('Can not select nodes with errors or notes', async ({ comfyPage }) => {
+    //Manually set error state on checkpoint loader
+    //Shouldn't be needed on ci, but has spotty reliability
+    await comfyPage.page.evaluate(() => (graph!.nodes[6].has_errors = true))
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+
+    const items = comfyPage.appMode.select.inputItems
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.appMode.select.selectInputWidget(
+      'Load Checkpoint',
+      'ckpt_name'
+    )
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.workflow.loadWorkflow('nodes/note_nodes')
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+    await expect(items).toHaveCount(0)
+
+    await comfyPage.appMode.select.selectInputWidget('Note', 'text')
+    await comfyPage.appMode.select.selectInputWidget('Markdown Note', 'text')
+
+    await expect(items).toHaveCount(0)
+  })
+
+  test('Marks canvas readOnly', async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas is initially editable'
+    ).toHaveCount(1)
+    await comfyPage.page.keyboard.press('Escape')
+
+    await comfyPage.appMode.enterBuilder()
+    await comfyPage.appMode.steps.goToInputs()
+
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Entering builder makes the canvas readonly'
+    ).toHaveCount(0)
+
+    await comfyPage.page.keyboard.press('Space')
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas remains readonly after pressing space'
+    ).toHaveCount(0)
+
+    const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+    // oxlint-disable-next-line playwright/no-force-option -- Node container has conditional pointer-events:none that blocks actionability
+    await ksampler.header.dblclick({ force: true })
+    await expect(
+      ksampler.titleEditor.input,
+      'Double clicking node titles will not initiate a rename'
+    ).toBeHidden()
+
+    await comfyPage.page.keyboard.press('Escape')
+    await comfyPage.page.mouse.dblclick(100, 100, { delay: 5 })
+    await expect(
+      comfyPage.searchBox.input,
+      'Canvas is no longer readonly after exiting'
+    ).toHaveCount(1)
+  })
+})
diff --git a/browser_tests/tests/assetDeleteClearsLoadImage.spec.ts b/browser_tests/tests/assetDeleteClearsLoadImage.spec.ts
new file mode 100644
index 0000000000..c6a90fb164
--- /dev/null
+++ b/browser_tests/tests/assetDeleteClearsLoadImage.spec.ts
@@ -0,0 +1,199 @@
+/**
+ * FE-230: Deleting an asset must clear the Load Image node preview, widget
+ * value, and mark the workflow dirty.
+ *
+ * Local run (requires cloud build of the frontend):
+ *   pnpm build:cloud
+ *   pnpm exec playwright test --project=cloud \
+ *     browser_tests/tests/assetDeleteClearsLoadImage.spec.ts --reporter=list
+ *
+ * The cloud project is required because input-asset deletion is gated on
+ * `isCloud === true` (see `useMediaAssetActions.deleteAssetApi`).
+ */
+import type { Page, Route } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import {
+  STABLE_CHECKPOINT,
+  STABLE_INPUT_IMAGE
+} from '@e2e/fixtures/data/assetFixtures'
+
+// The asset name must match the dropped file so that the deletion flow's
+// widget-value matching (name + `name [input]`) actually targets the same
+// value the drag-and-drop set on the Load Image widget.
+const DROPPED_FILE = 'image64x64.webp'
+const TARGET_ASSET: Asset = {
+  ...STABLE_INPUT_IMAGE,
+  name: DROPPED_FILE,
+  mime_type: 'image/webp'
+}
+const SEEDED_ASSETS: Asset[] = [STABLE_CHECKPOINT, TARGET_ASSET]
+// MediaAssetCard renders the basename without extension, so card-text
+// matching uses the stripped form.
+const TARGET_CARD_TEXT = TARGET_ASSET.name.replace(/\.[^.]+$/, '')
+
+type AssetMockApi = {
+  readonly deleteCalls: ReadonlyArray<string>
+}
+
+const assetMockByPage = new WeakMap<Page, { deleteCalls: string[] }>()
+
+function filterByTags(assets: Asset[], url: URL): Asset[] {
+  const includeTags = parseTagParam(url.searchParams.get('include_tags'))
+  const excludeTags = parseTagParam(url.searchParams.get('exclude_tags'))
+  return assets.filter(
+    (asset) =>
+      includeTags.every((tag) => (asset.tags ?? []).includes(tag)) &&
+      excludeTags.every((tag) => !(asset.tags ?? []).includes(tag))
+  )
+}
+
+function parseTagParam(value: string | null): string[] {
+  return (
+    value
+      ?.split(',')
+      .map((tag) => tag.trim())
+      .filter(Boolean) ?? []
+  )
+}
+
+// Narrow the route patterns to the cloud API endpoints we actually want to
+// intercept. Using a broader pattern (e.g. `**/assets**`) collides with the
+// cloud build's static bundle paths under `/assets/*.js` and starves the app
+// of its own JavaScript, leaving it stuck on the loading splash.
+async function registerAssetMocks(
+  page: Page,
+  assets: Asset[],
+  deleteCalls: string[]
+): Promise<void> {
+  await page.route(/\/api\/assets(?:\?.*)?$/, (route: Route) => {
+    if (route.request().method() !== 'GET') return route.fallback()
+    const url = new URL(route.request().url())
+    const filtered = filterByTags(assets, url)
+    const body: ListAssetsResponse = {
+      assets: filtered,
+      total: filtered.length,
+      has_more: false
+    }
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify(body)
+    })
+  })
+
+  await page.route(/\/api\/assets\/([^/?#]+)$/, (route: Route) => {
+    const method = route.request().method()
+    const id = new URL(route.request().url()).pathname.split('/').pop() ?? ''
+    if (method === 'DELETE') {
+      deleteCalls.push(id)
+      return route.fulfill({ status: 204, body: '' })
+    }
+    if (method === 'GET') {
+      const found = assets.find((asset) => asset.id === id)
+      if (found) return route.fulfill({ status: 200, json: found })
+      return route.fulfill({ status: 404, json: { error: 'Not found' } })
+    }
+    return route.fallback()
+  })
+}
+
+const baseTest = comfyPageFixture.extend<{ assetMock: AssetMockApi }>({
+  page: async ({ page }, use) => {
+    const deleteCalls: string[] = []
+    await registerAssetMocks(page, SEEDED_ASSETS, deleteCalls)
+    assetMockByPage.set(page, { deleteCalls })
+    await use(page)
+    assetMockByPage.delete(page)
+  },
+  assetMock: async ({ page }, use) => {
+    const state = assetMockByPage.get(page)
+    if (!state) throw new Error('assetMock state missing for page')
+    await use({
+      get deleteCalls() {
+        return state.deleteCalls
+      }
+    })
+  }
+})
+
+baseTest.describe(
+  'FE-230 asset delete clears Load Image preview',
+  { tag: '@cloud' },
+  () => {
+    baseTest(
+      'deleting an input asset clears widget value, preview cache, and marks workflow modified',
+      async ({ comfyPage, assetMock }) => {
+        await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+
+        // Drive the production drag-and-drop flow to point the Load Image
+        // widget at the asset we are about to delete and populate the preview
+        // cache. FE-230 is asserting that the deletion tears these down.
+        const loadImageNode = (
+          await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
+        )[0]
+        const { x, y } = await loadImageNode.getPosition()
+        await comfyPage.dragDrop.dragAndDropFile(DROPPED_FILE, {
+          dropPosition: { x, y },
+          waitForUpload: true
+        })
+        const imageWidget = await loadImageNode.getWidget(0)
+        await expect.poll(() => imageWidget.getValue()).toBe(DROPPED_FILE)
+
+        // Re-baseline the change tracker so the deletion-side mutation is the
+        // only thing that can flip `isModified` later.
+        await comfyPage.page.evaluate(() => {
+          const tracker =
+            window.app?.extensionManager?.workflow?.activeWorkflow
+              ?.changeTracker
+          tracker?.reset?.()
+        })
+        await expect
+          .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
+          .toBe(false)
+
+        // Drive the real production flow: assets sidebar → Imported tab →
+        // right-click asset card → Delete → confirm dialog.
+        const sidebar = comfyPage.menu.assetsTab
+        // The default `open()` waits for assets on the Generated tab; we seed
+        // only an input asset, so skip that wait and let `waitForAssets(1)`
+        // gate on the Imported tab instead.
+        await sidebar.open({ waitForAssets: false })
+        await sidebar.switchToImported()
+        await sidebar.waitForAssets(1)
+        await sidebar.rightClickAsset(TARGET_CARD_TEXT)
+
+        const deleteMenuItem = sidebar.contextMenuItem('Delete')
+        await expect(deleteMenuItem).toBeVisible()
+        await deleteMenuItem.click()
+
+        await comfyPage.confirmDialog.click('delete')
+
+        // Mocked DELETE was issued.
+        await expect
+          .poll(() => assetMock.deleteCalls.includes(TARGET_ASSET.id))
+          .toBe(true)
+
+        // Widget value was cleared.
+        await expect.poll(() => imageWidget.getValue()).toBe('')
+
+        // Preview cache was cleared.
+        await expect
+          .poll(() =>
+            comfyPage.page.evaluate((nodeId) => {
+              const node = window.app!.graph.getNodeById(nodeId)
+              return node?.imgs?.length ?? 0
+            }, loadImageNode.id)
+          )
+          .toBe(0)
+
+        // Workflow was marked dirty by changeTracker.captureCanvasState().
+        await expect
+          .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
+          .toBe(true)
+      }
+    )
+  }
+)
diff --git a/browser_tests/tests/assetHelper.spec.ts b/browser_tests/tests/assetHelper.spec.ts
index 8e4721d8d0..508fc50c68 100644
--- a/browser_tests/tests/assetHelper.spec.ts
+++ b/browser_tests/tests/assetHelper.spec.ts
@@ -133,6 +133,29 @@ test.describe('AssetHelper', () => {
       expect(data.assets[0].id).toBe(STABLE_CHECKPOINT.id)
     })
 
+    test('GET /assets filters by exclude_tags', async ({
+      comfyPage,
+      assetApi
+    }) => {
+      assetApi.configure(
+        withAsset(STABLE_INPUT_IMAGE),
+        withAsset({
+          ...STABLE_INPUT_IMAGE,
+          id: 'missing-input',
+          tags: ['input', 'missing']
+        })
+      )
+      await assetApi.mock()
+
+      const { body } = await assetApi.fetch(
+        `${comfyPage.url}/api/assets?include_tags=input,&exclude_tags= missing,`
+      )
+      const data = body as { assets: Array<{ id: string }> }
+      expect(data.assets.map((asset) => asset.id)).toEqual([
+        STABLE_INPUT_IMAGE.id
+      ])
+    })
+
     test('GET /assets/:id returns single asset or 404', async ({
       comfyPage,
       assetApi
diff --git a/browser_tests/tests/cloud-asset-default.spec.ts b/browser_tests/tests/cloud-asset-default.spec.ts
index b345bf80e1..ef5b0df3ff 100644
--- a/browser_tests/tests/cloud-asset-default.spec.ts
+++ b/browser_tests/tests/cloud-asset-default.spec.ts
@@ -1,51 +1,20 @@
 import { expect } from '@playwright/test'
-import type { Route } from '@playwright/test'
 
-import type { Asset, ListAssetsResponse } from '@comfyorg/ingest-types'
-import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import type { Asset } from '@comfyorg/ingest-types'
+import {
+  assetRequestIncludesTag,
+  createCloudAssetsFixture
+} from '@e2e/fixtures/assetApiFixture'
 import {
   STABLE_CHECKPOINT,
   STABLE_CHECKPOINT_2
 } from '@e2e/fixtures/data/assetFixtures'
 
-function makeAssetsResponse(assets: Asset[]): ListAssetsResponse {
-  return { assets, total: assets.length, has_more: false }
-}
-
 const CLOUD_ASSETS: Asset[] = [STABLE_CHECKPOINT, STABLE_CHECKPOINT_2]
 const WAITING_FOR_WIDGET_TYPE = 'waiting:type'
 const WAITING_FOR_WIDGET_VALUE = 'waiting:value'
 
-// Stub /api/assets before the app loads. The local ComfyUI backend has no
-// /api/assets endpoint (returns 503), which poisons the assets store on
-// first load. Narrow pattern avoids intercepting static /assets/*.js bundles.
-//
-// TODO: Consider moving this stub into ComfyPage fixture for all @cloud tests.
-const test = comfyPageFixture.extend<{
-  cloudAssetRequests: string[]
-  stubCloudAssets: void
-}>({
-  cloudAssetRequests: async ({ page: _page }, use) => {
-    await use([])
-  },
-  stubCloudAssets: [
-    async ({ cloudAssetRequests, page }, use) => {
-      const pattern = /\/api\/assets(?:\?.*)?$/
-      const assetsRouteHandler = (route: Route) => {
-        cloudAssetRequests.push(route.request().url())
-        return route.fulfill({
-          status: 200,
-          contentType: 'application/json',
-          body: JSON.stringify(makeAssetsResponse(CLOUD_ASSETS))
-        })
-      }
-      await page.route(pattern, assetsRouteHandler)
-      await use()
-      await page.unroute(pattern, assetsRouteHandler)
-    },
-    { auto: true }
-  ]
-})
+const test = createCloudAssetsFixture(CLOUD_ASSETS)
 
 test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
   test.afterEach(async ({ comfyPage }) => {
@@ -62,11 +31,9 @@ test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
     // new nodes resolve against the cloud asset list after the fetch.
     await expect
       .poll(() =>
-        cloudAssetRequests.some((url) => {
-          const includeTags =
-            new URL(url).searchParams.get('include_tags') ?? ''
-          return includeTags.split(',').includes('checkpoints')
-        })
+        cloudAssetRequests.some((url) =>
+          assetRequestIncludesTag(url, 'checkpoints')
+        )
       )
       .toBe(true)
 
diff --git a/browser_tests/tests/customNodeLocales.spec.ts b/browser_tests/tests/customNodeLocales.spec.ts
new file mode 100644
index 0000000000..4c626a3ece
--- /dev/null
+++ b/browser_tests/tests/customNodeLocales.spec.ts
@@ -0,0 +1,101 @@
+import type { Page } from '@playwright/test'
+
+import type { CustomNodesI18n } from '@/schemas/apiSchema'
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '@e2e/fixtures/ComfyPage'
+
+const NODE_TYPE = 'DevToolsNodeWithStringInput'
+const LOCALIZED_ZH = '本地化字符串输入 (ZH)'
+const LOCALIZED_ZH_TW = '本地化字串輸入 (ZH-TW)'
+const LOCALIZED_EN = 'Localized String Input (EN)'
+
+async function routeCustomNodesI18n(page: Page, body: CustomNodesI18n) {
+  await page.route('**/api/i18n', async (route) => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify(body)
+    })
+  })
+}
+
+test.describe(
+  'Custom node locales loading',
+  { tag: ['@ui', '@vue-nodes'] },
+  () => {
+    test.describe('shipped base tag', () => {
+      test.use({ initialSettings: { 'Comfy.Locale': 'zh' } })
+
+      test.beforeEach(async ({ page }) => {
+        await routeCustomNodesI18n(page, {
+          zh: { nodeDefs: { [NODE_TYPE]: { display_name: LOCALIZED_ZH } } }
+        })
+      })
+
+      // Regression test for PR #7214 (issue #7025): custom-node i18n data was
+      // clobbered when a non-English locale was lazily loaded, so nodes from
+      // custom packs lost their translated display_name on locale switch.
+      test('preserves custom-node /api/i18n translation through lazy locale load', async ({
+        comfyPage
+      }) => {
+        await comfyPage.nodeOps.addNode(NODE_TYPE)
+
+        await expect(
+          comfyPage.vueNodes.getNodeByTitle(LOCALIZED_ZH)
+        ).toHaveCount(1)
+      })
+    })
+
+    test.describe('unsupported tag clamps to en', () => {
+      // Regression test for PR #11712 (issue #10563): when Comfy.Locale holds
+      // an unsupported tag, the boundary helper clamps it to 'en'. Custom-node
+      // 'en' translations must still merge into the active locale messages.
+      test.use({ initialSettings: { 'Comfy.Locale': 'de' } })
+
+      test.beforeEach(async ({ page }) => {
+        await routeCustomNodesI18n(page, {
+          en: { nodeDefs: { [NODE_TYPE]: { display_name: LOCALIZED_EN } } }
+        })
+      })
+
+      test('renders en custom-node translation when locale clamps to en', async ({
+        comfyPage
+      }) => {
+        await comfyPage.nodeOps.addNode(NODE_TYPE)
+
+        await expect(
+          comfyPage.vueNodes.getNodeByTitle(LOCALIZED_EN)
+        ).toHaveCount(1)
+      })
+    })
+
+    test.describe('regional tag preserved', () => {
+      // Regression test for PR #11712: full-tag match must beat base-tag
+      // fallback, so a shipped regional tag like 'zh-TW' is not collapsed to
+      // its base ('zh'). Both keys are present in the payload — the active
+      // locale must merge the regional variant.
+      test.use({ initialSettings: { 'Comfy.Locale': 'zh-TW' } })
+
+      test.beforeEach(async ({ page }) => {
+        await routeCustomNodesI18n(page, {
+          zh: { nodeDefs: { [NODE_TYPE]: { display_name: LOCALIZED_ZH } } },
+          'zh-TW': {
+            nodeDefs: { [NODE_TYPE]: { display_name: LOCALIZED_ZH_TW } }
+          }
+        })
+      })
+
+      test('uses zh-TW custom-node translation, not zh base-tag fallback', async ({
+        comfyPage
+      }) => {
+        await comfyPage.nodeOps.addNode(NODE_TYPE)
+
+        await expect(
+          comfyPage.vueNodes.getNodeByTitle(LOCALIZED_ZH_TW)
+        ).toHaveCount(1)
+      })
+    })
+  }
+)
diff --git a/browser_tests/tests/defaultKeybindings.spec.ts b/browser_tests/tests/defaultKeybindings.spec.ts
index 3ecdf0e89a..54ea64f90d 100644
--- a/browser_tests/tests/defaultKeybindings.spec.ts
+++ b/browser_tests/tests/defaultKeybindings.spec.ts
@@ -229,9 +229,9 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       // The dialog appearing proves the keybinding was intercepted by the app.
       await comfyPage.keyboard.press('Control+s')
 
-      // The Save As dialog should appear (p-dialog overlay)
-      const dialogOverlay = comfyPage.page.locator('.p-dialog-mask')
-      await expect(dialogOverlay).toBeVisible()
+      // The Save As dialog should appear
+      const saveDialog = comfyPage.page.getByRole('dialog')
+      await expect(saveDialog).toBeVisible()
 
       // Dismiss the dialog
       await comfyPage.keyboard.press('Escape')
diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts b/browser_tests/tests/dialogs/publishDialog.spec.ts
index 00d7db0bbe..4820d35851 100644
--- a/browser_tests/tests/dialogs/publishDialog.spec.ts
+++ b/browser_tests/tests/dialogs/publishDialog.spec.ts
@@ -16,9 +16,9 @@ async function saveAndOpenPublishDialog(
   workflowName: string
 ): Promise<void> {
   await comfyPage.menu.topbar.saveWorkflow(workflowName)
-  const overwriteDialog = comfyPage.page.locator(
-    '.p-dialog:has-text("Overwrite")'
-  )
+  const overwriteDialog = comfyPage.page
+    .getByRole('dialog')
+    .filter({ hasText: 'Overwrite' })
   // Bounded wait: point-in-time isVisible() can miss dialogs that open
   // slightly after saveWorkflow() resolves.
   try {
diff --git a/browser_tests/tests/groupCopyPaste.spec.ts b/browser_tests/tests/groupCopyPaste.spec.ts
index 8263b4aa4b..de6e514663 100644
--- a/browser_tests/tests/groupCopyPaste.spec.ts
+++ b/browser_tests/tests/groupCopyPaste.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { getGroupTitlePosition } from '@e2e/fixtures/utils/groupHelpers'
 
 test.describe('Group Copy Paste', { tag: ['@canvas'] }, () => {
   test.afterEach(async ({ comfyPage }) => {
@@ -12,15 +13,7 @@ test.describe('Group Copy Paste', { tag: ['@canvas'] }, () => {
   }) => {
     await comfyPage.workflow.loadWorkflow('groups/single_group_only')
 
-    const titlePos = await comfyPage.page.evaluate(() => {
-      const app = window.app!
-      const group = app.graph.groups[0]
-      const clientPos = app.canvasPosToClientPos([
-        group.pos[0] + 50,
-        group.pos[1] + 15
-      ])
-      return { x: clientPos[0], y: clientPos[1] }
-    })
+    const titlePos = await getGroupTitlePosition(comfyPage, 'Group')
     await comfyPage.canvas.click({ position: titlePos })
     await comfyPage.nextFrame()
 
diff --git a/browser_tests/tests/groupSelectChildren.spec.ts b/browser_tests/tests/groupSelectChildren.spec.ts
index 931bbf8d94..263e488f47 100644
--- a/browser_tests/tests/groupSelectChildren.spec.ts
+++ b/browser_tests/tests/groupSelectChildren.spec.ts
@@ -2,29 +2,7 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-
-/**
- * Returns the client-space position of a group's title bar (for clicking).
- */
-async function getGroupTitlePosition(
-  comfyPage: ComfyPage,
-  title: string
-): Promise<{ x: number; y: number }> {
-  const pos = await comfyPage.page.evaluate((title) => {
-    const app = window.app!
-    const group = app.graph.groups.find(
-      (g: { title: string }) => g.title === title
-    )
-    if (!group) return null
-    const clientPos = app.canvasPosToClientPos([
-      group.pos[0] + 50,
-      group.pos[1] + 15
-    ])
-    return { x: clientPos[0], y: clientPos[1] }
-  }, title)
-  if (!pos) throw new Error(`Group "${title}" not found`)
-  return pos
-}
+import { getGroupTitlePosition } from '@e2e/fixtures/utils/groupHelpers'
 
 /**
  * Returns {selectedNodeCount, selectedGroupCount, selectedItemCount}
diff --git a/browser_tests/tests/i18nLocaleFallback.spec.ts b/browser_tests/tests/i18nLocaleFallback.spec.ts
new file mode 100644
index 0000000000..d32f662982
--- /dev/null
+++ b/browser_tests/tests/i18nLocaleFallback.spec.ts
@@ -0,0 +1,47 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+
+// Regression test for https://github.com/Comfy-Org/ComfyUI_frontend/issues/10563
+//
+// Pins the end-to-end cascade through createI18n + coreSettings defaultValue +
+// GraphView watchEffect: when navigator.language base tag is unsupported (e.g.
+// 'de-DE') and Comfy.Locale is unset (fresh-install state), sidebar labels
+// must render translated strings, not literal i18n keys like
+// 'sideToolbar.labels.assets'.
+test.describe('i18n locale fallback', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.page.addInitScript(() => {
+      Object.defineProperty(navigator, 'language', {
+        value: 'de-DE',
+        configurable: true
+      })
+      Object.defineProperty(navigator, 'languages', {
+        value: ['de-DE', 'de'],
+        configurable: true
+      })
+    })
+    // Default sidebar size on small viewports hides labels; force normal so
+    // .side-bar-button-label is rendered for the assertion.
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'normal')
+    await comfyPage.page.reload()
+    await comfyPage.waitForAppReady()
+  })
+
+  test('sidebar labels render translated strings, not raw i18n keys', async ({
+    comfyPage
+  }) => {
+    const { page } = comfyPage
+    await page.setViewportSize({ width: 1920, height: 1080 })
+
+    const labelTexts = await page
+      .getByTestId('side-toolbar')
+      .locator('.side-bar-button-label')
+      .allTextContents()
+
+    expect(labelTexts.length).toBeGreaterThan(0)
+    for (const text of labelTexts) {
+      expect(text).not.toContain('sideToolbar.labels')
+    }
+  })
+})
diff --git a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png
index 194fd5756d..7b9b6d67a6 100644
Binary files a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png and b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-default-50-chromium-linux.png differ
diff --git a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png
index 7886baf27b..433a0b263a 100644
Binary files a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png and b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-25-chromium-linux.png differ
diff --git a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png
index c26fb12929..db4143f56f 100644
Binary files a/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png and b/browser_tests/tests/imageCompare.spec.ts-snapshots/image-compare-slider-75-chromium-linux.png differ
diff --git a/browser_tests/tests/keybindingPanel.spec.ts b/browser_tests/tests/keybindingPanel.spec.ts
new file mode 100644
index 0000000000..934e2c31d4
--- /dev/null
+++ b/browser_tests/tests/keybindingPanel.spec.ts
@@ -0,0 +1,548 @@
+import type { Locator, Page } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+
+const MULTI_BINDING_COMMAND = 'Comfy.Canvas.DeleteSelectedItems'
+const SINGLE_BINDING_COMMAND = 'Comfy.SaveWorkflow'
+const NO_BINDING_COMMAND = 'TestCommand.KeybindingPanelE2E.NoBinding'
+
+async function searchKeybindings(page: Page, query: string) {
+  await getKeybindingSearchInput(page).fill(query)
+}
+
+async function clearSearch(page: Page) {
+  await getKeybindingSearchInput(page).clear()
+}
+
+function getKeybindingSearchInput(page: Page): Locator {
+  return page.getByPlaceholder('Search Keybindings...')
+}
+
+function getCommandRow(page: Page, commandId: string): Locator {
+  return page
+    .locator('.keybinding-panel tr')
+    .filter({ has: page.locator(`[title="${commandId}"]`) })
+}
+
+function getExpansionContent(page: Page, commandId: string): Locator {
+  // PrimeVue renders the expansion row as the next sibling <tr> of the
+  // expanded row. Scoping by sibling avoids matching unrelated expanded rows.
+  return getCommandRow(page, commandId)
+    .locator('xpath=following-sibling::tr[1]')
+    .getByTestId('keybinding-expansion-content')
+}
+
+async function openContextMenu(page: Page, commandId: string) {
+  const row = getCommandRow(page, commandId)
+  await row.locator(`[title="${commandId}"]`).click({ button: 'right' })
+  await expect(
+    page.getByRole('menuitem', { name: /Change keybinding/i })
+  ).toBeVisible()
+}
+
+function getKeybindingInput(page: Page): Locator {
+  return getEditKeybindingDialog(page).locator('input[autofocus]')
+}
+
+function getEditKeybindingDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Modify keybinding/i })
+}
+
+function getRemoveAllKeybindingsDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Remove all keybindings/i })
+}
+
+function getResetAllKeybindingsDialog(page: Page): Locator {
+  return page.getByRole('dialog', { name: /Reset all keybindings/i })
+}
+
+async function pressComboOnInput(page: Page, combo: string) {
+  const input = getKeybindingInput(page)
+  await expect(input).toBeFocused()
+  await input.press(combo)
+}
+
+async function saveAndCloseKeybindingDialog(page: Page) {
+  const dialog = getEditKeybindingDialog(page)
+  await dialog.getByRole('button', { name: /Save/i }).click()
+  await expect(dialog).toBeHidden()
+}
+
+async function cancelAndCloseDialog(page: Page) {
+  const dialog = getEditKeybindingDialog(page)
+  await dialog.getByRole('button', { name: /Cancel/i }).click()
+  await expect(dialog).toBeHidden()
+}
+
+async function addKeybindingToRow(page: Page, row: Locator, combo: string) {
+  await row.getByRole('button', { name: /Add new keybinding/i }).click()
+  await pressComboOnInput(page, combo)
+  await saveAndCloseKeybindingDialog(page)
+}
+
+test.beforeEach(async ({ comfyPage }) => {
+  await registerNoBindingCommand(comfyPage)
+  await comfyPage.settingDialog.open()
+  await comfyPage.settingDialog.category('Keybinding').click()
+})
+
+test.afterEach(async ({ comfyPage }) => {
+  await comfyPage.settings.setSetting('Comfy.Keybinding.NewBindings', [])
+  await comfyPage.settings.setSetting('Comfy.Keybinding.UnsetBindings', [])
+})
+
+async function registerNoBindingCommand(comfyPage: ComfyPage) {
+  await comfyPage.page.evaluate((commandId) => {
+    const app = window.app!
+    app.registerExtension({
+      name: 'TestExtension.KeybindingPanelE2E',
+      commands: [{ id: commandId, function: () => {} }]
+    })
+  }, NO_BINDING_COMMAND)
+}
+
+test.describe('Keybinding Panel', { tag: '@keyboard' }, () => {
+  test.describe('Row Expansion', () => {
+    test('Click on row with 2+ keybindings toggles expansion', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+      const row = getCommandRow(page, MULTI_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      await row.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      await expect(expansionContent).toBeHidden()
+    })
+
+    test('Click on row with 1 keybinding does not expand', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${SINGLE_BINDING_COMMAND}"]`).click()
+
+      const expansionContent = getExpansionContent(page, SINGLE_BINDING_COMMAND)
+      await expect(expansionContent).toBeHidden()
+    })
+  })
+
+  test.describe('Double-Click', () => {
+    test('Double-click row with 0 keybindings opens Add dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${NO_BINDING_COMMAND}"]`).dblclick()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Double-click row with 1 keybinding opens Edit dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(row).toBeVisible()
+
+      await row.locator(`[title="${SINGLE_BINDING_COMMAND}"]`).dblclick()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+  })
+
+  test.describe('Context Menu', () => {
+    test('Right-click row shows context menu with correct items', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      const changeItem = page.getByRole('menuitem', {
+        name: /Change keybinding/i
+      })
+      const addItem = page.getByRole('menuitem', {
+        name: /Add new keybinding/i
+      })
+      const resetItem = page.getByRole('menuitem', {
+        name: /Reset to default/i
+      })
+      const removeItem = page.getByRole('menuitem', {
+        name: /Remove keybinding/i
+      })
+
+      await expect(changeItem).toBeVisible()
+      await expect(addItem).toBeVisible()
+      await expect(resetItem).toBeVisible()
+      await expect(removeItem).toBeVisible()
+
+      await page.keyboard.press('Escape')
+    })
+
+    test("Context menu 'Add new keybinding' opens add dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Add new keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test("Context menu 'Change keybinding' on single-binding command opens edit dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Change keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test("Context menu 'Change keybinding' on multi-binding command expands row", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeHidden()
+
+      await openContextMenu(page, MULTI_BINDING_COMMAND)
+
+      await page.getByRole('menuitem', { name: /Change keybinding/i }).click()
+
+      await expect(expansionContent).toBeVisible()
+    })
+
+    test("Context menu 'Remove keybinding' after adding second binding shows confirm dialog", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F9')
+
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+      await page.getByRole('menuitem', { name: /Remove keybinding/i }).click()
+
+      const confirmDialog = getRemoveAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await confirmDialog.getByRole('button', { name: /Remove all/i }).click()
+
+      await expect(row.locator('td').nth(1)).toContainText('-')
+    })
+
+    test("Context menu 'Reset to default' resets modified command", async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F10')
+
+      await openContextMenu(page, SINGLE_BINDING_COMMAND)
+      await page.getByRole('menuitem', { name: /Reset to default/i }).click()
+
+      await expect(row.getByRole('button', { name: /Reset/i })).toBeDisabled()
+    })
+
+    test('Context menu items disabled when no keybindings', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      await openContextMenu(page, NO_BINDING_COMMAND)
+
+      const changeItem = page.getByRole('menuitem', {
+        name: /Change keybinding/i
+      })
+      const removeItem = page.getByRole('menuitem', {
+        name: /Remove keybinding/i
+      })
+
+      await expect(changeItem).toHaveAttribute('data-disabled', '')
+      await expect(removeItem).toHaveAttribute('data-disabled', '')
+
+      await page.keyboard.press('Escape')
+    })
+  })
+
+  test.describe('Action Buttons', () => {
+    test('Edit button opens edit dialog for single-binding command', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      const editButton = row.getByRole('button', { name: /^Edit$/i })
+      await expect(editButton).toBeVisible()
+      await editButton.click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Add button opens add dialog', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await row.getByRole('button', { name: /Add new keybinding/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Reset button is disabled for unmodified commands', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      const resetButton = row.getByRole('button', { name: /Reset/i })
+      await expect(resetButton).toBeDisabled()
+    })
+
+    test('Reset button resets modified keybinding', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F11')
+
+      const resetButton = row.getByRole('button', { name: /Reset/i })
+      await expect(resetButton).toBeEnabled()
+
+      await resetButton.click()
+
+      await expect(resetButton).toBeDisabled()
+    })
+
+    test('Delete button is disabled for commands with 0 keybindings', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await expect(deleteButton).toBeDisabled()
+    })
+
+    test('Delete button removes single keybinding directly', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, NO_BINDING_COMMAND)
+      const row = getCommandRow(page, NO_BINDING_COMMAND)
+
+      await addKeybindingToRow(page, row, 'Control+Shift+F12')
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await expect(deleteButton).toBeEnabled()
+      await deleteButton.click()
+
+      await expect(row.locator('td').nth(1)).toContainText('-')
+    })
+
+    test('Delete button on command with 2+ keybindings shows confirm dialog', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+      const row = getCommandRow(page, MULTI_BINDING_COMMAND)
+
+      const deleteButton = row.getByRole('button', { name: /Delete/i })
+      await deleteButton.click()
+
+      const confirmDialog = getRemoveAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+
+      await confirmDialog.getByRole('button', { name: /Cancel/i }).click()
+      await expect(confirmDialog).toBeHidden()
+      await expect(row.locator('td').nth(1)).not.toContainText('-')
+    })
+  })
+
+  test.describe('Expanded Row Actions', () => {
+    test('Edit button in expanded row opens edit dialog for that binding', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      const firstBindingRow = expansionContent
+        .getByTestId('keybinding-expansion-binding')
+        .first()
+      await firstBindingRow.getByRole('button', { name: /^Edit$/i }).click()
+
+      const input = getKeybindingInput(page)
+      await expect(input).toBeVisible()
+
+      await cancelAndCloseDialog(page)
+    })
+
+    test('Delete button in expanded row removes that binding and collapses', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      const bindingRows = expansionContent.getByTestId(
+        'keybinding-expansion-binding'
+      )
+      await expect
+        .poll(() => bindingRows.count(), {
+          message: 'Expected at least 2 bindings'
+        })
+        .toBeGreaterThanOrEqual(2)
+      const initialBindingCount = await bindingRows.count()
+
+      await bindingRows
+        .first()
+        .getByRole('button', { name: /Remove keybinding/i })
+        .click()
+
+      if (initialBindingCount === 2) {
+        // Expansion auto-collapses when bindings drop below 2
+        await expect(expansionContent).toBeHidden()
+      } else {
+        await expect(bindingRows).toHaveCount(initialBindingCount - 1)
+      }
+    })
+  })
+
+  test.describe('Reset All', () => {
+    test('Reset All button shows confirmation and resets on confirm', async ({
+      comfyPage
+    }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const row = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await addKeybindingToRow(page, row, 'Control+Shift+F8')
+
+      await expect(row.getByRole('button', { name: /Reset/i })).toBeEnabled()
+
+      await clearSearch(page)
+
+      const resetAllButton = page
+        .locator('.keybinding-panel')
+        .getByRole('button', { name: /Reset All/i })
+      await resetAllButton.click()
+
+      const confirmDialog = getResetAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await expect(confirmDialog).toContainText(/Reset all keybindings/i)
+
+      await confirmDialog.getByRole('button', { name: /Reset All/i }).click()
+
+      await expect(comfyPage.toast.visibleToasts).toHaveCount(1)
+
+      await searchKeybindings(page, SINGLE_BINDING_COMMAND)
+      const rowAfterReset = getCommandRow(page, SINGLE_BINDING_COMMAND)
+      await expect(
+        rowAfterReset.getByRole('button', { name: /Reset/i })
+      ).toBeDisabled()
+    })
+
+    test('Reset All confirmation can be cancelled', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      const resetAllButton = page
+        .locator('.keybinding-panel')
+        .getByRole('button', { name: /Reset All/i })
+      await resetAllButton.click()
+
+      const confirmDialog = getResetAllKeybindingsDialog(page)
+      await expect(confirmDialog).toBeVisible()
+      await confirmDialog.getByRole('button', { name: /Cancel/i }).click()
+
+      await expect(confirmDialog).toBeHidden()
+    })
+  })
+
+  test.describe('Search Filter', () => {
+    test('Typing in search clears expanded rows', async ({ comfyPage }) => {
+      const { page } = comfyPage
+
+      await searchKeybindings(page, MULTI_BINDING_COMMAND)
+
+      await page.locator(`[title="${MULTI_BINDING_COMMAND}"]`).click()
+      const expansionContent = getExpansionContent(page, MULTI_BINDING_COMMAND)
+      await expect(expansionContent).toBeVisible()
+
+      // Changing the filter triggers watch(filters, ...) which clears expansion
+      await searchKeybindings(page, MULTI_BINDING_COMMAND + ' ')
+      await expect(expansionContent).toBeHidden()
+    })
+  })
+})
diff --git a/browser_tests/tests/layoutSidebarSettings.spec.ts b/browser_tests/tests/layoutSidebarSettings.spec.ts
new file mode 100644
index 0000000000..497df6f8a1
--- /dev/null
+++ b/browser_tests/tests/layoutSidebarSettings.spec.ts
@@ -0,0 +1,127 @@
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '@e2e/fixtures/ComfyPage'
+
+test.describe('Layout & sidebar settings', { tag: ['@settings'] }, () => {
+  test.describe('Comfy.Sidebar.Size', () => {
+    test('"small" applies small-sidebar class', async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'small')
+      await expect(comfyPage.menu.sideToolbar).toContainClass('small-sidebar')
+    })
+
+    test('"normal" does not apply small-sidebar class', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'normal')
+      await expect(comfyPage.menu.sideToolbar).not.toContainClass(
+        'small-sidebar'
+      )
+    })
+  })
+
+  test.describe('Comfy.Sidebar.Style', () => {
+    // `isConnected` overrides the Style setting when the toolbar overflows;
+    // small (48px) items keep content under the default viewport so Style
+    // actually drives rendering.
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'small')
+    })
+
+    test('"connected" applies connected-sidebar class', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Style', 'connected')
+      await expect(comfyPage.menu.sideToolbar).toContainClass(
+        'connected-sidebar'
+      )
+      await expect(comfyPage.menu.sideToolbar).not.toContainClass(
+        'floating-sidebar'
+      )
+    })
+
+    test('"floating" applies floating-sidebar class', async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Style', 'floating')
+      await expect(comfyPage.menu.sideToolbar).toContainClass(
+        'floating-sidebar'
+      )
+      await expect(comfyPage.menu.sideToolbar).not.toContainClass(
+        'connected-sidebar'
+      )
+    })
+
+    test('"floating" + Size "normal" is overridden to connected by overflow', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'normal')
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Style', 'floating')
+      await expect(comfyPage.menu.sideToolbar).toContainClass(
+        'connected-sidebar'
+      )
+      await expect(comfyPage.menu.sideToolbar).toContainClass(
+        'overflowing-sidebar'
+      )
+    })
+
+    test('"floating" + Size "normal" renders floating in a viewport tall enough to fit', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'normal')
+      await comfyPage.settings.setSetting('Comfy.Sidebar.Style', 'floating')
+      await comfyPage.page.setViewportSize({ width: 1280, height: 1500 })
+      await expect(comfyPage.menu.sideToolbar).toContainClass(
+        'floating-sidebar'
+      )
+      await expect(comfyPage.menu.sideToolbar).not.toContainClass(
+        'overflowing-sidebar'
+      )
+    })
+  })
+
+  test.describe('Comfy.UI.TabBarLayout', () => {
+    test('"Default" renders integrated tab bar actions container', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.UI.TabBarLayout', 'Default')
+      await expect(comfyPage.menu.topbar.integratedTabBarActions).toBeAttached()
+    })
+
+    test('"Legacy" does not render integrated tab bar actions container', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.UI.TabBarLayout', 'Legacy')
+      await expect(comfyPage.menu.topbar.integratedTabBarActions).toHaveCount(0)
+    })
+  })
+
+  test.describe('Comfy.TreeExplorer.ItemPadding', () => {
+    // The setting writes a CSS var consumed by .p-tree-node-content,
+    // which only renders in the legacy PrimeVue Tree.
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
+      await comfyPage.menu.nodeLibraryTab.open()
+    })
+
+    test('low padding (0px) is applied to tree node content', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.TreeExplorer.ItemPadding', 0)
+      await expect(
+        comfyPage.menu.nodeLibraryTab.nodeLibraryTree
+          .locator('.p-tree-node-content')
+          .first()
+      ).toHaveCSS('padding', '0px')
+    })
+
+    test('high padding (8px) is applied to tree node content', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.TreeExplorer.ItemPadding', 8)
+      await expect(
+        comfyPage.menu.nodeLibraryTab.nodeLibraryTree
+          .locator('.p-tree-node-content')
+          .first()
+      ).toHaveCSS('padding', '8px')
+    })
+  })
+})
diff --git a/browser_tests/tests/load3d/load3dLod.spec.ts b/browser_tests/tests/load3d/load3dLod.spec.ts
new file mode 100644
index 0000000000..ef51612fd7
--- /dev/null
+++ b/browser_tests/tests/load3d/load3dLod.spec.ts
@@ -0,0 +1,32 @@
+import { expect } from '@playwright/test'
+
+import { load3dTest as test } from '@e2e/fixtures/helpers/Load3DFixtures'
+
+test.describe('Load3D LOD', () => {
+  test(
+    'canvas pixel dimensions scale with ComfyUI canvas zoom level',
+    { tag: '@smoke' },
+    async ({ comfyPage, load3d }) => {
+      await expect(load3d.canvas).toBeVisible()
+
+      await expect
+        .poll(() => load3d.canvas.evaluate((el: HTMLCanvasElement) => el.width))
+        .toBeGreaterThan(0)
+
+      const initialWidth = await load3d.canvas.evaluate(
+        (el: HTMLCanvasElement) => el.width
+      )
+
+      await comfyPage.page.evaluate(() => {
+        const node = window.app!.graph!.nodes[0]
+        window.app!.canvas.ds.scale = 2.0
+        node.onResize?.(node.size)
+      })
+      await comfyPage.nextFrame()
+
+      await expect
+        .poll(() => load3d.canvas.evaluate((el: HTMLCanvasElement) => el.width))
+        .toBeGreaterThan(initialWidth)
+    }
+  )
+})
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts b/browser_tests/tests/loadWorkflowInMedia.spec.ts
index 48d2a9f271..49df32f0ce 100644
--- a/browser_tests/tests/loadWorkflowInMedia.spec.ts
+++ b/browser_tests/tests/loadWorkflowInMedia.spec.ts
@@ -74,6 +74,90 @@ test.describe(
       })
     })
 
+    test.describe('Image without workflow', () => {
+      test('places LoadImage at the drop cursor when graph_mouse is stale', async ({
+        comfyPage
+      }) => {
+        await comfyPage.nodeOps.clearGraph()
+        await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+
+        await comfyPage.page.evaluate(() => {
+          window.app!.canvas.graph_mouse[0] = -9999
+          window.app!.canvas.graph_mouse[1] = -9999
+        })
+
+        const dropPosition = { x: 480, y: 320 }
+        await comfyPage.dragDrop.dragAndDropFile('image32x32.webp', {
+          dropPosition,
+          waitForUpload: true
+        })
+
+        await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
+
+        const { nodePos, expectedPos } = await comfyPage.page.evaluate(
+          (drop) => {
+            const canvas = window.app!.canvas
+            const expected = canvas.convertEventToCanvasOffset(
+              new MouseEvent('drop', {
+                clientX: drop.x,
+                clientY: drop.y
+              })
+            ) as [number, number]
+            const node = window.app!.graph.nodes[0]
+            return {
+              nodePos: [node.pos[0], node.pos[1]] as [number, number],
+              expectedPos: expected
+            }
+          },
+          dropPosition
+        )
+
+        expect(nodePos[0]).toBeCloseTo(expectedPos[0], 0)
+        expect(nodePos[1]).toBeCloseTo(expectedPos[1], 0)
+        expect(nodePos[0]).not.toBe(-9999)
+        expect(nodePos[1]).not.toBe(-9999)
+      })
+
+      test('places LoadImage above existing nodes (zIndex)', async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const initialNodeIds = await comfyPage.vueNodes.getNodeIds()
+        expect(initialNodeIds.length).toBeGreaterThan(0)
+
+        await comfyPage.dragDrop.dragAndDropFile('image32x32.webp', {
+          dropPosition: { x: 540, y: 380 },
+          waitForUpload: true
+        })
+
+        await expect
+          .poll(() => comfyPage.vueNodes.getNodeCount())
+          .toBe(initialNodeIds.length + 1)
+
+        const newNodeIds = await comfyPage.vueNodes.getNodeIds()
+        const addedNodeId = newNodeIds.find(
+          (id) => !initialNodeIds.includes(id)
+        )
+        expect(addedNodeId).toBeDefined()
+
+        const newNodeZ = await comfyPage.vueNodes
+          .getNodeLocator(addedNodeId!)
+          .evaluate((el) => Number((el as HTMLElement).style.zIndex))
+
+        const existingZIndexes = await comfyPage.vueNodes.nodes.evaluateAll(
+          (els, id) =>
+            els
+              .filter((el) => el.getAttribute('data-node-id') !== id)
+              .map((el) => Number((el as HTMLElement).style.zIndex)),
+          addedNodeId!
+        )
+
+        expect(newNodeZ).toBeGreaterThan(Math.max(0, ...existingZIndexes))
+      })
+    })
+
     test('Load workflow from URL dropped onto Vue node', async ({
       comfyPage
     }) => {
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png
index c7be8c99e4..f617ff8b15 100644
Binary files a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png and b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-webm-chromium-linux.png differ
diff --git a/browser_tests/tests/maskEditor.spec.ts b/browser_tests/tests/maskEditor.spec.ts
index d9bce93dc3..badf78e621 100644
--- a/browser_tests/tests/maskEditor.spec.ts
+++ b/browser_tests/tests/maskEditor.spec.ts
@@ -1,117 +1,13 @@
-import type { Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { maskEditorTest as test } from '@e2e/fixtures/helpers/MaskEditorHelper'
 
 test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
-  async function loadImageOnNode(comfyPage: ComfyPage) {
-    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
-
-    const loadImageNode = (
-      await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
-    )[0]
-    const { x, y } = await loadImageNode.getPosition()
-
-    await comfyPage.dragDrop.dragAndDropFile('image64x64.webp', {
-      dropPosition: { x, y }
-    })
-
-    const imagePreview = comfyPage.page.locator('.image-preview')
-    await expect(imagePreview).toBeVisible()
-    await expect(imagePreview.locator('img')).toBeVisible()
-    await expect(imagePreview).toContainText('x')
-
-    return {
-      imagePreview,
-      nodeId: String(loadImageNode.id)
-    }
-  }
-
-  async function openMaskEditorDialog(comfyPage: ComfyPage) {
-    const { imagePreview } = await loadImageOnNode(comfyPage)
-
-    await imagePreview.getByRole('region').hover()
-    await comfyPage.page.getByLabel('Edit or mask image').click()
-
-    const dialog = comfyPage.page.locator('.mask-editor-dialog')
-    await expect(dialog).toBeVisible()
-    await expect(
-      dialog.getByRole('heading', { name: 'Mask Editor' })
-    ).toBeVisible()
-
-    const canvasContainer = dialog.locator('#maskEditorCanvasContainer')
-    await expect(canvasContainer).toBeVisible()
-    await expect(canvasContainer.locator('canvas')).toHaveCount(4)
-
-    return dialog
-  }
-
-  async function getMaskCanvasPixelData(page: Page) {
-    return page.evaluate(() => {
-      const canvases = document.querySelectorAll(
-        '#maskEditorCanvasContainer canvas'
-      )
-      // The mask canvas is the 3rd canvas (index 2, z-30)
-      const maskCanvas = canvases[2] as HTMLCanvasElement
-      if (!maskCanvas) return null
-      const ctx = maskCanvas.getContext('2d')
-      if (!ctx) return null
-      const data = ctx.getImageData(0, 0, maskCanvas.width, maskCanvas.height)
-      let nonTransparentPixels = 0
-      for (let i = 3; i < data.data.length; i += 4) {
-        if (data.data[i] > 0) nonTransparentPixels++
-      }
-      return { nonTransparentPixels, totalPixels: data.data.length / 4 }
-    })
-  }
-
-  function pollMaskPixelCount(page: Page): Promise<number> {
-    return getMaskCanvasPixelData(page).then(
-      (d) => d?.nonTransparentPixels ?? 0
-    )
-  }
-
-  async function drawStrokeOnPointerZone(
-    page: Page,
-    dialog: ReturnType<typeof page.locator>
-  ) {
-    const pointerZone = dialog.locator(
-      '.maskEditor-ui-container [class*="w-[calc"]'
-    )
-    await expect(pointerZone).toBeVisible()
-
-    const box = await pointerZone.boundingBox()
-    if (!box) throw new Error('Pointer zone bounding box not found')
-
-    const startX = box.x + box.width * 0.3
-    const startY = box.y + box.height * 0.5
-    const endX = box.x + box.width * 0.7
-    const endY = box.y + box.height * 0.5
-
-    await page.mouse.move(startX, startY)
-    await page.mouse.down()
-    await page.mouse.move(endX, endY, { steps: 10 })
-    await page.mouse.up()
-
-    return { startX, startY, endX, endY, box }
-  }
-
-  async function drawStrokeAndExpectPixels(
-    comfyPage: ComfyPage,
-    dialog: ReturnType<typeof comfyPage.page.locator>
-  ) {
-    await drawStrokeOnPointerZone(comfyPage.page, dialog)
-    await expect
-      .poll(() => pollMaskPixelCount(comfyPage.page))
-      .toBeGreaterThan(0)
-  }
-
   test(
     'opens mask editor from image preview button',
     { tag: ['@smoke', '@screenshot'] },
-    async ({ comfyPage }) => {
-      const { imagePreview } = await loadImageOnNode(comfyPage)
+    async ({ comfyPage, maskEditor }) => {
+      const { imagePreview } = await maskEditor.loadImageOnNode()
 
       // Hover over the image panel to reveal action buttons
       await imagePreview.getByRole('region').hover()
@@ -139,8 +35,8 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   test(
     'opens mask editor from context menu',
     { tag: ['@smoke', '@screenshot'] },
-    async ({ comfyPage }) => {
-      const { nodeId } = await loadImageOnNode(comfyPage)
+    async ({ comfyPage, maskEditor }) => {
+      const { nodeId } = await maskEditor.loadImageOnNode()
 
       const nodeHeader = comfyPage.vueNodes
         .getNodeLocator(nodeId)
@@ -166,63 +62,61 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
     }
   )
 
-  test('draws a brush stroke on the mask canvas', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('draws a brush stroke on the mask canvas', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    const dataBefore = await getMaskCanvasPixelData(comfyPage.page)
+    const dataBefore = await maskEditor.getCanvasPixelData(2)
     expect(dataBefore).not.toBeNull()
     expect(dataBefore!.nonTransparentPixels).toBe(0)
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
   })
 
-  test('undo reverts a brush stroke', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('undo reverts a brush stroke', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
 
     const undoButton = dialog.locator('button[title="Undo"]')
     await expect(undoButton).toBeVisible()
     await undoButton.click()
 
-    await expect.poll(() => pollMaskPixelCount(comfyPage.page)).toBe(0)
+    await expect.poll(() => maskEditor.pollMaskPixelCount()).toBe(0)
   })
 
-  test('redo restores an undone stroke', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('redo restores an undone stroke', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
 
     const undoButton = dialog.locator('button[title="Undo"]')
     await undoButton.click()
 
-    await expect.poll(() => pollMaskPixelCount(comfyPage.page)).toBe(0)
+    await expect.poll(() => maskEditor.pollMaskPixelCount()).toBe(0)
 
     const redoButton = dialog.locator('button[title="Redo"]')
     await expect(redoButton).toBeVisible()
     await redoButton.click()
 
-    await expect
-      .poll(() => pollMaskPixelCount(comfyPage.page))
-      .toBeGreaterThan(0)
+    await expect.poll(() => maskEditor.pollMaskPixelCount()).toBeGreaterThan(0)
   })
 
-  test('clear button removes all mask content', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('clear button removes all mask content', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
 
     const clearButton = dialog.getByRole('button', { name: 'Clear' })
     await expect(clearButton).toBeVisible()
     await clearButton.click()
 
-    await expect.poll(() => pollMaskPixelCount(comfyPage.page)).toBe(0)
+    await expect.poll(() => maskEditor.pollMaskPixelCount()).toBe(0)
   })
 
-  test('cancel closes the dialog without saving', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('cancel closes the dialog without saving', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
 
     const cancelButton = dialog.getByRole('button', { name: 'Cancel' })
     await cancelButton.click()
@@ -230,10 +124,10 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
     await expect(dialog).toBeHidden()
   })
 
-  test('invert button inverts the mask', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('invert button inverts the mask', async ({ maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
-    const dataBefore = await getMaskCanvasPixelData(comfyPage.page)
+    const dataBefore = await maskEditor.getCanvasPixelData(2)
     expect(dataBefore).not.toBeNull()
     const pixelsBefore = dataBefore!.nonTransparentPixels
 
@@ -242,26 +136,29 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
     await invertButton.click()
 
     await expect
-      .poll(() => pollMaskPixelCount(comfyPage.page))
+      .poll(() => maskEditor.pollMaskPixelCount())
       .toBeGreaterThan(pixelsBefore)
   })
 
-  test('keyboard shortcut Ctrl+Z triggers undo', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('keyboard shortcut Ctrl+Z triggers undo', async ({
+    comfyPage,
+    maskEditor
+  }) => {
+    const dialog = await maskEditor.openDialog()
 
-    await drawStrokeAndExpectPixels(comfyPage, dialog)
+    await maskEditor.drawStrokeAndExpectPixels(dialog)
 
     const modifier = process.platform === 'darwin' ? 'Meta+z' : 'Control+z'
     await comfyPage.page.keyboard.press(modifier)
 
-    await expect.poll(() => pollMaskPixelCount(comfyPage.page)).toBe(0)
+    await expect.poll(() => maskEditor.pollMaskPixelCount()).toBe(0)
   })
 
   test(
     'tool panel shows all five tools',
     { tag: ['@smoke'] },
-    async ({ comfyPage }) => {
-      const dialog = await openMaskEditorDialog(comfyPage)
+    async ({ maskEditor }) => {
+      const dialog = await maskEditor.openDialog()
 
       const toolPanel = dialog.locator('.maskEditor-ui-container')
       await expect(toolPanel).toBeVisible()
@@ -279,9 +176,9 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   )
 
   test('switching tools updates the selected indicator', async ({
-    comfyPage
+    maskEditor
   }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+    const dialog = await maskEditor.openDialog()
 
     const toolEntries = dialog.locator('.maskEditor_toolPanelContainer')
     await expect(toolEntries).toHaveCount(5)
@@ -300,9 +197,9 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   })
 
   test('brush settings panel is visible with thickness controls', async ({
-    comfyPage
+    maskEditor
   }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+    const dialog = await maskEditor.openDialog()
 
     // The side panel should show brush settings by default
     const thicknessLabel = dialog.getByText('Thickness')
@@ -315,8 +212,11 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
     await expect(hardnessLabel).toBeVisible()
   })
 
-  test('save uploads all layers and closes dialog', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('save uploads all layers and closes dialog', async ({
+    comfyPage,
+    maskEditor
+  }) => {
+    const dialog = await maskEditor.openDialog()
 
     let maskUploadCount = 0
     let imageUploadCount = 0
@@ -359,8 +259,8 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
     ).toBeGreaterThan(0)
   })
 
-  test('save failure keeps dialog open', async ({ comfyPage }) => {
-    const dialog = await openMaskEditorDialog(comfyPage)
+  test('save failure keeps dialog open', async ({ comfyPage, maskEditor }) => {
+    const dialog = await maskEditor.openDialog()
 
     // Fail all upload routes
     await comfyPage.page.route('**/upload/mask', (route) =>
@@ -380,23 +280,23 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
   test(
     'eraser tool removes mask content',
     { tag: ['@screenshot'] },
-    async ({ comfyPage }) => {
-      const dialog = await openMaskEditorDialog(comfyPage)
+    async ({ maskEditor }) => {
+      const dialog = await maskEditor.openDialog()
 
       // Draw a stroke with the mask pen (default tool)
-      await drawStrokeAndExpectPixels(comfyPage, dialog)
+      await maskEditor.drawStrokeAndExpectPixels(dialog)
 
-      const pixelsAfterDraw = await getMaskCanvasPixelData(comfyPage.page)
+      const pixelsAfterDraw = await maskEditor.getCanvasPixelData(2)
 
       // Switch to eraser tool (3rd tool, index 2)
       const toolEntries = dialog.locator('.maskEditor_toolPanelContainer')
       await toolEntries.nth(2).click()
 
       // Draw over the same area with the eraser
-      await drawStrokeOnPointerZone(comfyPage.page, dialog)
+      await maskEditor.drawStrokeOnPointerZone(dialog)
 
       await expect
-        .poll(() => pollMaskPixelCount(comfyPage.page))
+        .poll(() => maskEditor.pollMaskPixelCount())
         .toBeLessThan(pixelsAfterDraw!.nonTransparentPixels)
     }
   )
diff --git a/browser_tests/tests/maskEditorBrushLayers.spec.ts b/browser_tests/tests/maskEditorBrushLayers.spec.ts
new file mode 100644
index 0000000000..78c7ad96d8
--- /dev/null
+++ b/browser_tests/tests/maskEditorBrushLayers.spec.ts
@@ -0,0 +1,100 @@
+import { expect } from '@playwright/test'
+
+import { maskEditorTest as test } from '@e2e/fixtures/helpers/MaskEditorHelper'
+
+const RGB_PAINT_TOOL_INDEX = 1 // RGB / color paint tool
+const ERASER_TOOL_INDEX = 2 // Eraser tool
+
+test.describe(
+  'Mask Editor brush adjustment and layer management',
+  { tag: '@vue-nodes' },
+  () => {
+    test.describe('Brush settings interaction', () => {
+      test('Adjusting brush thickness slider changes stroke output', async ({
+        comfyPage,
+        maskEditor
+      }) => {
+        const dialog = await maskEditor.openDialog()
+        const thicknessInput = maskEditor.brushInput(dialog, 'thickness')
+
+        // Thin brush
+        await thicknessInput.fill('2')
+        await expect(thicknessInput).toHaveValue('2')
+
+        await maskEditor.drawStrokeOnPointerZone(dialog)
+        await expect
+          .poll(() => maskEditor.pollMaskPixelCount())
+          .toBeGreaterThan(0)
+        const thinPixels = await maskEditor.pollMaskPixelCount()
+
+        await comfyPage.page.keyboard.press('Control+z')
+        await expect.poll(() => maskEditor.pollMaskPixelCount()).toBe(0)
+
+        // Thick brush
+        await thicknessInput.fill('200')
+        await expect(thicknessInput).toHaveValue('200')
+
+        await maskEditor.drawStrokeOnPointerZone(dialog)
+        await expect
+          .poll(() => maskEditor.pollMaskPixelCount())
+          .toBeGreaterThan(thinPixels)
+      })
+    })
+
+    test.describe('Layer management', () => {
+      test('Drawing on different tools produces independent mask data', async ({
+        maskEditor
+      }) => {
+        const dialog = await maskEditor.openDialog()
+
+        await maskEditor.drawStrokeOnPointerZone(dialog)
+        await expect
+          .poll(() => maskEditor.pollMaskPixelCount())
+          .toBeGreaterThan(0)
+        const maskSnapshotAfterPen = await maskEditor.getCanvasSnapshot(2)
+
+        const toolEntries = dialog.locator('.maskEditor_toolPanelContainer')
+        await expect(toolEntries).toHaveCount(5)
+        await toolEntries.nth(RGB_PAINT_TOOL_INDEX).click()
+        await expect(toolEntries.nth(RGB_PAINT_TOOL_INDEX)).toHaveClass(
+          /Selected/
+        )
+
+        await maskEditor.drawStrokeOnPointerZone(dialog)
+        await expect
+          .poll(() => maskEditor.pollRgbPixelCount())
+          .toBeGreaterThan(0)
+
+        await expect
+          .poll(() => maskEditor.getCanvasSnapshot(2))
+          .toBe(maskSnapshotAfterPen)
+      })
+
+      test("Switching between tools preserves previous tool's mask data", async ({
+        maskEditor
+      }) => {
+        const dialog = await maskEditor.openDialog()
+
+        await maskEditor.drawStrokeOnPointerZone(dialog)
+        await expect
+          .poll(() => maskEditor.pollMaskPixelCount())
+          .toBeGreaterThan(0)
+
+        const maskSnapshot = await maskEditor.getCanvasSnapshot(2)
+
+        const toolEntries = dialog.locator('.maskEditor_toolPanelContainer')
+        await expect(toolEntries).toHaveCount(5)
+
+        await toolEntries.nth(ERASER_TOOL_INDEX).click()
+        await expect(toolEntries.nth(ERASER_TOOL_INDEX)).toHaveClass(/Selected/)
+
+        await toolEntries.nth(0).click()
+        await expect(toolEntries.nth(0)).toHaveClass(/Selected/)
+
+        await expect
+          .poll(() => maskEditor.getCanvasSnapshot(2))
+          .toBe(maskSnapshot)
+      })
+    })
+  }
+)
diff --git a/browser_tests/tests/metadataWorkflowImport.spec.ts b/browser_tests/tests/metadataWorkflowImport.spec.ts
new file mode 100644
index 0000000000..ef2efb91e0
--- /dev/null
+++ b/browser_tests/tests/metadataWorkflowImport.spec.ts
@@ -0,0 +1,62 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+import { metadataFixturePath } from '@e2e/fixtures/utils/paths'
+
+type MetadataFixture = {
+  fileName: string
+  parser: string
+}
+
+// Each fixture embeds the same single-KSampler workflow (see
+// scripts/generate-embedded-metadata-test-files.py), exercising a different
+// parser in src/scripts/metadata/. Dropping the file should import that
+// workflow.
+const FIXTURES: readonly MetadataFixture[] = [
+  { fileName: 'with_metadata.png', parser: 'png' },
+  { fileName: 'with_metadata.avif', parser: 'avif' },
+  { fileName: 'with_metadata.webp', parser: 'webp' },
+  { fileName: 'with_metadata_exif_prefix.webp', parser: 'webp (exif prefix)' },
+  { fileName: 'with_metadata.flac', parser: 'flac' },
+  { fileName: 'with_metadata.mp3', parser: 'mp3' },
+  { fileName: 'with_metadata.opus', parser: 'ogg' },
+  { fileName: 'with_metadata.mp4', parser: 'isobmff' },
+  { fileName: 'with_metadata.webm', parser: 'ebml (webm)' }
+] as const
+
+test.describe(
+  'Metadata drop-to-load workflow import',
+  { tag: ['@workflow'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.nodeOps.clearGraph()
+      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+    })
+
+    for (const { fileName, parser } of FIXTURES) {
+      test(`loads embedded workflow from ${fileName} (${parser})`, async ({
+        comfyPage
+      }) => {
+        await test.step(`drop ${fileName} on canvas`, async () => {
+          await comfyPage.dragDrop.dragAndDropFilePath(
+            metadataFixturePath(fileName)
+          )
+        })
+
+        await test.step('graph contains only the embedded KSampler', async () => {
+          await expect
+            .poll(() => comfyPage.nodeOps.getGraphNodesCount())
+            .toBe(1)
+
+          const ksamplers =
+            await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+          expect(
+            ksamplers,
+            'exactly one KSampler should have been loaded from the fixture'
+          ).toHaveLength(1)
+        })
+      })
+    }
+  }
+)
diff --git a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png
index 2126a2a400..bde5c1cb00 100644
Binary files a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png and b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts b/browser_tests/tests/nodeBadge.spec.ts
index e33237be11..975225b389 100644
--- a/browser_tests/tests/nodeBadge.spec.ts
+++ b/browser_tests/tests/nodeBadge.spec.ts
@@ -8,6 +8,9 @@ test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
+const DEPRECATED_NODE_TYPE = 'ImageBatch'
+const API_NODE_TYPE = 'FluxProUltraImageNode'
+
 test.describe('Node Badge', { tag: ['@screenshot', '@smoke', '@node'] }, () => {
   test('Can add badge', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
@@ -141,3 +144,73 @@ test.describe(
     })
   }
 )
+
+for (const vueEnabled of [false, true] as const) {
+  const renderer = vueEnabled ? 'vue' : 'classic'
+  const tag = vueEnabled
+    ? ['@vue-nodes', '@screenshot', '@node']
+    : ['@screenshot', '@node']
+
+  test.describe(`Node lifecycle badge (${renderer})`, { tag }, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Graph.CanvasInfo', false)
+    })
+
+    for (const mode of [NodeBadgeMode.ShowAll, NodeBadgeMode.None] as const) {
+      test(`renders deprecated node with mode=${mode}`, async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.NodeLifeCycleBadgeMode',
+          mode
+        )
+        await comfyPage.nodeOps.clearGraph()
+        await comfyPage.nodeOps.addNode(DEPRECATED_NODE_TYPE, undefined, {
+          x: 100,
+          y: 100
+        })
+        await comfyPage.canvasOps.resetView()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `node-lifecycle-${mode}-${renderer}.png`
+        )
+      })
+    }
+  })
+
+  test.describe(`API pricing badge (${renderer})`, { tag }, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Graph.CanvasInfo', false)
+      await comfyPage.page.evaluate((type) => {
+        const registered = window.LiteGraph!.registered_node_types[type] as {
+          nodeData?: { price_badge?: unknown }
+        }
+        if (!registered?.nodeData) throw new Error(`No nodeData for ${type}`)
+        registered.nodeData.price_badge = {
+          engine: 'jsonata',
+          expr: "{'type': 'text', 'text': '99.9 credits/Run'}",
+          depends_on: { widgets: [], inputs: [], input_groups: [] }
+        }
+      }, API_NODE_TYPE)
+    })
+
+    for (const enabled of [true, false] as const) {
+      test(`renders api node with showApiPricing=${enabled}`, async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.ShowApiPricing',
+          enabled
+        )
+        await comfyPage.nodeOps.clearGraph()
+        await comfyPage.nodeOps.addNode(API_NODE_TYPE, undefined, {
+          x: 100,
+          y: 100
+        })
+        await comfyPage.canvasOps.resetView()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `api-pricing-${enabled ? 'on' : 'off'}-${renderer}.png`
+        )
+      })
+    }
+  })
+}
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-classic-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-classic-chromium-linux.png
new file mode 100644
index 0000000000..e60b605005
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-classic-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png
new file mode 100644
index 0000000000..cbc87ffc7c
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-classic-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-classic-chromium-linux.png
new file mode 100644
index 0000000000..e151d56bc0
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-classic-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png
new file mode 100644
index 0000000000..e0f46d3791
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-classic-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-classic-chromium-linux.png
new file mode 100644
index 0000000000..7820eff13a
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-classic-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-vue-chromium-linux.png
new file mode 100644
index 0000000000..e0edd2135a
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-None-vue-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-classic-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-classic-chromium-linux.png
new file mode 100644
index 0000000000..6ee2971450
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-classic-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-vue-chromium-linux.png
new file mode 100644
index 0000000000..7f679259f8
Binary files /dev/null and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-lifecycle-Show-all-vue-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeReplacement.spec.ts b/browser_tests/tests/nodeReplacement.spec.ts
new file mode 100644
index 0000000000..89ca766343
--- /dev/null
+++ b/browser_tests/tests/nodeReplacement.spec.ts
@@ -0,0 +1,168 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '@e2e/fixtures/ComfyPage'
+import {
+  mockNodeReplacements,
+  mockNodeReplacementsSingle
+} from '@e2e/fixtures/data/nodeReplacements'
+import { loadWorkflowAndOpenErrorsTab } from '@e2e/fixtures/helpers/ErrorsTabHelper'
+import {
+  getSwapNodesGroup,
+  setupNodeReplacement
+} from '@e2e/fixtures/helpers/NodeReplacementHelper'
+
+const renderModes = [
+  { name: 'vue nodes', vueNodesEnabled: true },
+  { name: 'litegraph', vueNodesEnabled: false }
+] as const
+
+test.describe('Node replacement', { tag: ['@node', '@ui'] }, () => {
+  for (const mode of renderModes) {
+    test.describe(`(${mode.name})`, () => {
+      test.describe('Single replacement', () => {
+        test.beforeEach(async ({ comfyPage }) => {
+          await comfyPage.settings.setSetting(
+            'Comfy.VueNodes.Enabled',
+            mode.vueNodesEnabled
+          )
+          await setupNodeReplacement(comfyPage, mockNodeReplacementsSingle)
+          await loadWorkflowAndOpenErrorsTab(
+            comfyPage,
+            'missing/node_replacement_simple'
+          )
+        })
+
+        test('Swap Nodes group appears in errors tab for replaceable nodes', async ({
+          comfyPage
+        }) => {
+          const swapGroup = getSwapNodesGroup(comfyPage.page)
+          await expect(swapGroup).toBeVisible()
+          await expect(swapGroup).toContainText('E2E_OldSampler')
+          await expect(
+            swapGroup.getByRole('button', { name: 'Replace All', exact: true })
+          ).toBeVisible()
+        })
+
+        test('Replace Node replaces a single group in-place', async ({
+          comfyPage
+        }) => {
+          const swapGroup = getSwapNodesGroup(comfyPage.page)
+          await swapGroup.getByRole('button', { name: /replace node/i }).click()
+          await expect(swapGroup).toBeHidden()
+
+          const workflow = await comfyPage.workflow.getExportedWorkflow()
+          expect(
+            workflow.nodes,
+            'Node count should be unchanged after in-place replacement'
+          ).toHaveLength(2)
+
+          const nodeTypes = workflow.nodes.map((n) => n.type)
+          expect(nodeTypes).not.toContain('E2E_OldSampler')
+          expect(nodeTypes).toContain('KSampler')
+
+          const ksampler = workflow.nodes.find((n) => n.type === 'KSampler')
+          expect(
+            ksampler?.id,
+            'Replaced node should keep the original id'
+          ).toBe(1)
+
+          const linkFromReplacedToDecode = workflow.links?.find(
+            (l) => l[1] === 1 && l[3] === 2
+          )
+          expect(
+            linkFromReplacedToDecode,
+            'Output link from replaced node to VAEDecode should be preserved'
+          ).toBeDefined()
+        })
+
+        test('Widget values are preserved after replacement', async ({
+          comfyPage
+        }) => {
+          await getSwapNodesGroup(comfyPage.page)
+            .getByRole('button', { name: /replace node/i })
+            .click()
+
+          const workflow = await comfyPage.workflow.getExportedWorkflow()
+          const ksampler = workflow.nodes.find((n) => n.type === 'KSampler')
+
+          expect(ksampler?.widgets_values).toBeDefined()
+          const widgetValues = ksampler!.widgets_values as unknown[]
+          expect(widgetValues).toEqual([
+            42,
+            'randomize',
+            20,
+            7,
+            'euler',
+            'normal',
+            1
+          ])
+        })
+
+        test('Success toast is shown after replacement', async ({
+          comfyPage
+        }) => {
+          await getSwapNodesGroup(comfyPage.page)
+            .getByRole('button', { name: /replace node/i })
+            .click()
+
+          await expect(comfyPage.visibleToasts.first()).toContainText(
+            /replaced|swapped/i
+          )
+        })
+      })
+
+      test.describe('Multi-type replacement', () => {
+        test.beforeEach(async ({ comfyPage }) => {
+          await comfyPage.settings.setSetting(
+            'Comfy.VueNodes.Enabled',
+            mode.vueNodesEnabled
+          )
+          await setupNodeReplacement(comfyPage, mockNodeReplacements)
+          await loadWorkflowAndOpenErrorsTab(
+            comfyPage,
+            'missing/node_replacement_multi'
+          )
+        })
+
+        test('Replace All replaces all groups across multiple types', async ({
+          comfyPage
+        }) => {
+          const swapGroup = getSwapNodesGroup(comfyPage.page)
+          await expect(swapGroup).toBeVisible()
+          await expect(swapGroup).toContainText('E2E_OldSampler')
+          await expect(swapGroup).toContainText('E2E_OldUpscaler')
+
+          await swapGroup
+            .getByRole('button', { name: 'Replace All', exact: true })
+            .click()
+          await expect(swapGroup).toBeHidden()
+
+          const workflow = await comfyPage.workflow.getExportedWorkflow()
+          const nodeTypes = workflow.nodes.map((n) => n.type)
+          expect(nodeTypes).not.toContain('E2E_OldSampler')
+          expect(nodeTypes).not.toContain('E2E_OldUpscaler')
+          expect(nodeTypes).toContain('KSampler')
+          expect(nodeTypes).toContain('ImageScaleBy')
+        })
+
+        test('Output connections are preserved across replacement with output mapping', async ({
+          comfyPage
+        }) => {
+          await getSwapNodesGroup(comfyPage.page)
+            .getByRole('button', { name: 'Replace All', exact: true })
+            .click()
+
+          const replacedNodeOutputLinkCount = await comfyPage.page.evaluate(
+            () =>
+              window.app!.graph!.getNodeById(2)?.outputs[0]?.links?.length ?? 0
+          )
+          expect(
+            replacedNodeOutputLinkCount,
+            'Replaced upscaler should still drive its downstream consumer'
+          ).toBeGreaterThan(0)
+        })
+      })
+    })
+  }
+})
diff --git a/browser_tests/tests/painter.spec.ts b/browser_tests/tests/painter.spec.ts
index e8aa977055..a790a956be 100644
--- a/browser_tests/tests/painter.spec.ts
+++ b/browser_tests/tests/painter.spec.ts
@@ -549,7 +549,7 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
       expect(uploadCount, 'should upload exactly once').toBe(1)
     })
 
-    test('Empty canvas does not upload on serialization', async ({
+    test('Empty canvas uploads a transparent placeholder on serialization', async ({
       comfyPage
     }) => {
       let uploadCount = 0
@@ -566,7 +566,10 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
 
       await triggerSerialization(comfyPage.page)
 
-      expect(uploadCount, 'empty canvas should not upload').toBe(0)
+      expect(
+        uploadCount,
+        'empty canvas should upload a transparent PNG so the backend receives a valid asset reference (Painter.execute treats painter_alpha=0 as no-mask)'
+      ).toBe(1)
     })
 
     test('Upload failure shows error toast', async ({ comfyPage }) => {
@@ -692,19 +695,27 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
     })
   })
 
-  test('Controls collapse to single column in compact mode', async ({
+  test('Controls stack label above widget in compact mode', async ({
     comfyPage
   }) => {
     const painterWidget = comfyPage.vueNodes
       .getNodeLocator('1')
       .locator('.widget-expands')
     const toolLabel = painterWidget.getByText('Tool', { exact: true })
+    const brushButton = painterWidget.getByText('Brush', { exact: true })
 
     await expect(
       toolLabel,
-      'tool label should be visible in two-column layout'
+      'tool label should be visible in wide layout'
     ).toBeVisible()
 
+    const wideLabelBox = await toolLabel.boundingBox()
+    const wideBrushBox = await brushButton.boundingBox()
+    expect(
+      wideLabelBox && wideBrushBox && wideLabelBox.x < wideBrushBox.x,
+      'label should sit to the left of the brush button in wide layout'
+    ).toBe(true)
+
     await comfyPage.page.evaluate(() => {
       const graph = window.graph as TestGraphAccess | undefined
       const node = graph?._nodes_by_id?.['1']
@@ -716,8 +727,22 @@ test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
 
     await expect(
       toolLabel,
-      'tool label should hide in compact single-column layout'
-    ).toBeHidden()
+      'tool label should remain visible in compact layout'
+    ).toBeVisible()
+
+    await expect
+      .poll(
+        async () => {
+          const labelBox = await toolLabel.boundingBox()
+          const brushBox = await brushButton.boundingBox()
+          if (!labelBox || !brushBox) return false
+          return labelBox.y + labelBox.height <= brushBox.y
+        },
+        {
+          message: 'label should stack above the brush button in compact layout'
+        }
+      )
+      .toBe(true)
   })
 
   test('Multiple sequential strokes at different positions all accumulate', async ({
diff --git a/browser_tests/tests/performance.spec.ts b/browser_tests/tests/performance.spec.ts
index 2988653fe3..3882fa61cd 100644
--- a/browser_tests/tests/performance.spec.ts
+++ b/browser_tests/tests/performance.spec.ts
@@ -351,6 +351,45 @@ test.describe('Performance', { tag: ['@perf'] }, () => {
     })
   })
 
+  test(
+    'subgraph transition (enter and exit)',
+    { tag: ['@vue-nodes'] },
+    async ({ comfyPage }, testInfo) => {
+      // Heaviest perf test: loads an 80-node subgraph and pays ~30s/repeat.
+      // The signal is dominated by N=80 mount cost, so a single sample per
+      // CI invocation is sufficient — early-return on subsequent repeats.
+      if (testInfo.repeatEachIndex > 0) return
+
+      // Load workflow with a subgraph containing 80 interior nodes.
+      // Entering the subgraph unmounts root nodes and mounts all 80 interior
+      // nodes synchronously — this is the bottleneck we're measuring.
+      await comfyPage.workflow.loadWorkflow('subgraphs/large-subgraph-80-nodes')
+
+      await comfyPage.idleFrames(30)
+
+      await comfyPage.vueNodes.enterSubgraph()
+      await comfyPage.vueNodes.waitForNodes(80)
+      await comfyPage.idleFrames(30)
+
+      // Exit back to root graph before measuring a fresh enter/exit cycle
+      await comfyPage.subgraph.exitViaBreadcrumb()
+      await comfyPage.idleFrames(10)
+
+      // Start measuring the enter transition
+      await comfyPage.perf.startMeasuring()
+
+      await comfyPage.vueNodes.enterSubgraph()
+      await comfyPage.vueNodes.waitForNodes(80)
+      await comfyPage.idleFrames(30)
+
+      const m = await comfyPage.perf.stopMeasuring('subgraph-transition-enter')
+      recordMeasurement(m)
+      console.log(
+        `Subgraph enter (80 nodes): ${m.taskDurationMs.toFixed(0)}ms task, ${m.layouts} layouts, TBT=${m.totalBlockingTimeMs.toFixed(0)}ms`
+      )
+    }
+  )
+
   test('workflow execution', async ({ comfyPage }) => {
     // Uses lightweight PrimitiveString → PreviewAny workflow (no GPU needed)
     await comfyPage.workflow.loadWorkflow('execution/partial_execution')
diff --git a/browser_tests/tests/previewAsText.spec.ts b/browser_tests/tests/previewAsText.spec.ts
new file mode 100644
index 0000000000..8d8338119e
--- /dev/null
+++ b/browser_tests/tests/previewAsText.spec.ts
@@ -0,0 +1,42 @@
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '../fixtures/ComfyPage'
+
+test.describe('Preview as Text node', () => {
+  test('does not include preview widget values in the API prompt', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.evaluate(() => {
+      const node = window.LiteGraph!.createNode('PreviewAny')!
+      node.pos = [500, 200]
+      window.app!.graph.add(node)
+    })
+
+    // Simulate a previous execution: backend returned text and the frontend
+    // populated the preview widget values. The next prompt submission must
+    // NOT echo those values back as inputs (which would change the cache
+    // signature and trigger a redundant re-execution).
+    await comfyPage.page.evaluate(() => {
+      const node = window.app!.graph.nodes.find((n) => n.type === 'PreviewAny')!
+      for (const widget of node.widgets ?? []) {
+        if (widget.name?.startsWith('preview_')) {
+          widget.value = 'rendered preview content from previous execution'
+        }
+      }
+    })
+
+    const apiWorkflow = await comfyPage.workflow.getExportedWorkflow({
+      api: true
+    })
+
+    const previewEntry = Object.values(apiWorkflow).find(
+      (n) => n.class_type === 'PreviewAny'
+    )
+    expect(previewEntry).toBeDefined()
+
+    expect(previewEntry!.inputs).not.toHaveProperty('preview_markdown')
+    expect(previewEntry!.inputs).not.toHaveProperty('preview_text')
+    expect(previewEntry!.inputs).not.toHaveProperty('previewMode')
+  })
+})
diff --git a/browser_tests/tests/propertiesPanel/errorsTabCloudMissingModels.spec.ts b/browser_tests/tests/propertiesPanel/errorsTabCloudMissingModels.spec.ts
new file mode 100644
index 0000000000..a2bdc77bf6
--- /dev/null
+++ b/browser_tests/tests/propertiesPanel/errorsTabCloudMissingModels.spec.ts
@@ -0,0 +1,93 @@
+import { expect } from '@playwright/test'
+
+import type { Asset } from '@comfyorg/ingest-types'
+import {
+  countAssetRequestsByTag,
+  createCloudAssetsFixture
+} from '@e2e/fixtures/assetApiFixture'
+import { TestIds } from '@e2e/fixtures/selectors'
+import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
+
+const WORKFLOW = 'missing/nested_subgraph_installed_model'
+const OUTER_SUBGRAPH_NODE_ID = '205'
+const LOTUS_MODEL_NAME = 'lotus-depth-d-v1-1.safetensors'
+
+const LOTUS_DIFFUSION_MODEL: Asset = {
+  id: 'test-lotus-depth-d-v1-1',
+  name: LOTUS_MODEL_NAME,
+  asset_hash:
+    'blake3:0000000000000000000000000000000000000000000000000000000000000203',
+  size: 1_024,
+  mime_type: 'application/octet-stream',
+  tags: ['models', 'diffusion_models'],
+  created_at: '2026-05-05T00:00:00Z',
+  updated_at: '2026-05-05T00:00:00Z',
+  last_access_time: '2026-05-05T00:00:00Z',
+  user_metadata: {
+    filename: LOTUS_MODEL_NAME
+  }
+}
+
+const test = createCloudAssetsFixture([LOTUS_DIFFUSION_MODEL])
+
+test.describe(
+  'Errors tab - Cloud missing models',
+  { tag: ['@cloud', '@vue-nodes'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.RightSidePanel.ShowErrorsTab',
+        true
+      )
+    })
+
+    test('keeps installed models resolved after returning from a nested subgraph', async ({
+      cloudAssetRequests,
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+      const panel = new PropertiesPanelHelper(comfyPage.page)
+      const errorOverlay = comfyPage.page.getByTestId(
+        TestIds.dialogs.errorOverlay
+      )
+      const errorsTab = panel.root.getByTestId(
+        TestIds.propertiesPanel.errorsTab
+      )
+
+      await expect
+        .poll(
+          () => countAssetRequestsByTag(cloudAssetRequests, 'diffusion_models'),
+          { timeout: 10_000 }
+        )
+        .toBeGreaterThan(0)
+      await expect(errorOverlay).toBeHidden()
+      await panel.open(comfyPage.actionbar.propertiesButton)
+      await expect(errorsTab).toBeHidden()
+      await panel.close()
+
+      await comfyPage.vueNodes.enterSubgraph(OUTER_SUBGRAPH_NODE_ID)
+      await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+      await expect(errorOverlay).toBeHidden()
+
+      const requestCountBeforeRootReturn = countAssetRequestsByTag(
+        cloudAssetRequests,
+        'diffusion_models'
+      )
+
+      await comfyPage.subgraph.exitViaBreadcrumb()
+      await panel.open(comfyPage.actionbar.propertiesButton)
+
+      await expect
+        .poll(
+          () =>
+            countAssetRequestsByTag(cloudAssetRequests, 'diffusion_models') >
+            requestCountBeforeRootReturn,
+          { timeout: 10_000 }
+        )
+        .toBe(true)
+
+      await expect(errorsTab).toBeHidden()
+    })
+  }
+)
diff --git a/browser_tests/tests/queue/queueOverlay.spec.ts b/browser_tests/tests/queue/queueOverlay.spec.ts
index a10d102c3e..3e996c31ab 100644
--- a/browser_tests/tests/queue/queueOverlay.spec.ts
+++ b/browser_tests/tests/queue/queueOverlay.spec.ts
@@ -1,13 +1,19 @@
-import { expect } from '@playwright/test'
+import { expect, mergeTests } from '@playwright/test'
+import type { JobEntry } from '@comfyorg/ingest-types'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { createMockJob } from '@e2e/fixtures/helpers/AssetsHelper'
+import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import { jobsApiMockFixture } from '@e2e/fixtures/jobsApiMockFixture'
+import {
+  createMockJob,
+  createMockJobRecords
+} from '@e2e/fixtures/utils/jobFixtures'
 import { TestIds } from '@e2e/fixtures/selectors'
-import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+
+const test = mergeTests(comfyPageFixture, jobsApiMockFixture)
 
 const now = Date.now()
 
-const MOCK_JOBS: RawJobListItem[] = [
+const MOCK_JOBS: JobEntry[] = [
   createMockJob({
     id: 'job-completed-1',
     status: 'completed',
@@ -31,20 +37,25 @@ const MOCK_JOBS: RawJobListItem[] = [
     execution_start_time: now - 30_000,
     execution_end_time: now - 28_000,
     outputs_count: 0
+  }),
+  createMockJob({
+    id: 'job-failed-bottom',
+    status: 'failed',
+    create_time: now - 180_000,
+    execution_start_time: now - 180_000,
+    execution_end_time: now - 178_000,
+    outputs_count: 0
   })
 ]
 
 test.describe('Queue overlay', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.assets.mockOutputHistory(MOCK_JOBS)
+  test.beforeEach(async ({ comfyPage, jobsApi }) => {
+    await jobsApi.mockJobs(createMockJobRecords(MOCK_JOBS))
+    await comfyPage.settings.setSetting('Comfy.Minimap.Visible', false)
     await comfyPage.settings.setSetting('Comfy.Queue.QPOV2', false)
     await comfyPage.setup()
   })
 
-  test.afterEach(async ({ comfyPage }) => {
-    await comfyPage.assets.clearMocks()
-  })
-
   test('Toggle button opens expanded queue overlay', async ({ comfyPage }) => {
     const toggle = comfyPage.page.getByTestId(TestIds.queue.overlayToggle)
     await toggle.click()
@@ -106,4 +117,64 @@ test.describe('Queue overlay', () => {
 
     await expect(comfyPage.page.locator('[data-job-id]').first()).toBeHidden()
   })
+
+  test('Job details popover stays inside the viewport for bottom rows', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.setViewportSize({ width: 1280, height: 420 })
+
+    const toggle = comfyPage.page.getByTestId(TestIds.queue.overlayToggle)
+    await toggle.click()
+
+    const bottomJob = comfyPage.page.locator(
+      '[data-job-id="job-failed-bottom"]'
+    )
+    await expect(bottomJob).toBeVisible()
+    await bottomJob.scrollIntoViewIfNeeded()
+    await expect(bottomJob).toBeVisible()
+
+    const viewportSize = comfyPage.page.viewportSize()
+    if (!viewportSize) throw new Error('Viewport must be available')
+
+    const rowBox = await bottomJob.boundingBox()
+    if (!rowBox) throw new Error('Bottom job row should be measurable')
+    expect(
+      rowBox.y + rowBox.height,
+      'Test row should be low enough to exercise bottom-edge collision handling'
+    ).toBeGreaterThan(viewportSize.height * 0.55)
+    await expect
+      .poll(async () =>
+        bottomJob.evaluate((element) => {
+          const rect = element.getBoundingClientRect()
+          const hitTarget = document.elementFromPoint(
+            rect.x + rect.width / 2,
+            rect.y + rect.height / 2
+          )
+          return hitTarget ? element.contains(hitTarget) : false
+        })
+      )
+      .toBe(true)
+
+    await comfyPage.page.mouse.move(0, 0)
+    await comfyPage.page.mouse.move(
+      rowBox.x + rowBox.width / 2,
+      rowBox.y + rowBox.height / 2,
+      { steps: 5 }
+    )
+
+    const popover = comfyPage.page.getByTestId(TestIds.queue.jobDetailsPopover)
+    await expect(popover).toBeVisible()
+
+    await expect
+      .poll(async () => {
+        const popoverBox = await popover.boundingBox()
+        if (!popoverBox) return false
+
+        return (
+          popoverBox.y >= 0 &&
+          popoverBox.y + popoverBox.height <= viewportSize.height
+        )
+      })
+      .toBe(true)
+  })
 })
diff --git a/browser_tests/tests/queue/queueSettings.spec.ts b/browser_tests/tests/queue/queueSettings.spec.ts
index 337e57cfed..8fc49afe39 100644
--- a/browser_tests/tests/queue/queueSettings.spec.ts
+++ b/browser_tests/tests/queue/queueSettings.spec.ts
@@ -15,6 +15,7 @@ import { webSocketFixture } from '@e2e/fixtures/ws'
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 
 const TOTAL_MOCK_JOBS = 20
+const MAX_HISTORY_ITEMS_SETTING = 'Comfy.Queue.MaxHistoryItems'
 const overflowJobsListRoutePattern = '**/api/jobs?*'
 
 function isHistoryJobsRequest(url: string): boolean {
@@ -59,7 +60,7 @@ test.describe('Queue settings', { tag: '@canvas' }, () => {
       }) => {
         const TARGET_LIMIT = 6
         await comfyPage.settings.setSetting(
-          'Comfy.Queue.MaxHistoryItems',
+          MAX_HISTORY_ITEMS_SETTING,
           TARGET_LIMIT
         )
 
@@ -106,7 +107,7 @@ test.describe('Queue settings', { tag: '@canvas' }, () => {
 
       const VISIBLE_LIMIT = 6
       await comfyPage.settings.setSetting(
-        'Comfy.Queue.MaxHistoryItems',
+        MAX_HISTORY_ITEMS_SETTING,
         VISIBLE_LIMIT
       )
       const exec = new ExecutionHelper(comfyPage, await getWebSocket())
diff --git a/browser_tests/tests/queueButtonModes.spec.ts b/browser_tests/tests/queueButtonModes.spec.ts
new file mode 100644
index 0000000000..03fa580651
--- /dev/null
+++ b/browser_tests/tests/queueButtonModes.spec.ts
@@ -0,0 +1,63 @@
+import { expect } from '@playwright/test'
+
+import type { PromptResponse } from '@/schemas/apiSchema'
+
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+
+const queueModeLabels = ['Run', 'Run (On Change)', 'Run (Instant)']
+const runOnChangeLabel = queueModeLabels[1]
+
+test.describe('Queue button modes', { tag: '@ui' }, () => {
+  test('Run button is visible in topbar', async ({ comfyPage }) => {
+    await expect(comfyPage.actionbar.queueButton.primaryButton).toBeVisible()
+  })
+
+  test('Queue mode trigger menu is visible', async ({ comfyPage }) => {
+    await expect(comfyPage.actionbar.queueButton.dropdownButton).toBeVisible()
+  })
+
+  test('Clicking queue mode trigger opens mode menu', async ({ comfyPage }) => {
+    const options = await comfyPage.actionbar.queueButton.openOptions()
+
+    await expect(options.menu).toBeVisible()
+  })
+
+  test('Queue mode menu shows available modes', async ({ comfyPage }) => {
+    const options = await comfyPage.actionbar.queueButton.openOptions()
+
+    await expect(options.menu).toBeVisible()
+    await expect(options.modeItems).toHaveText(queueModeLabels)
+  })
+
+  test('Selecting a non-default mode updates the Run button label', async ({
+    comfyPage
+  }) => {
+    const queueButton = comfyPage.actionbar.queueButton
+    const options = await queueButton.openOptions()
+
+    await expect(options.menu).toBeVisible()
+    await options.selectMode(runOnChangeLabel)
+
+    await expect(queueButton.primaryButton).toContainText(runOnChangeLabel)
+  })
+
+  test('Run button sends prompt when clicked', async ({ comfyPage }) => {
+    let promptQueued = false
+    const mockResponse: PromptResponse = {
+      prompt_id: 'test-id',
+      node_errors: {},
+      error: ''
+    }
+    await comfyPage.page.route('**/api/prompt', async (route) => {
+      promptQueued = true
+      await route.fulfill({
+        status: 200,
+        body: JSON.stringify(mockResponse)
+      })
+    })
+
+    await comfyPage.actionbar.queueButton.primaryButton.click()
+
+    await expect.poll(() => promptQueued).toBe(true)
+  })
+})
diff --git a/browser_tests/tests/saveImageAndWebp.spec.ts b/browser_tests/tests/saveImageAndWebp.spec.ts
index 36357fa042..ac4507c215 100644
--- a/browser_tests/tests/saveImageAndWebp.spec.ts
+++ b/browser_tests/tests/saveImageAndWebp.spec.ts
@@ -16,7 +16,7 @@ test.describe(
       await comfyPage.runButton.click()
 
       const saveImageNode = comfyPage.vueNodes.getNodeByTitle('Save Image')
-      const saveWebmNode = comfyPage.vueNodes.getNodeByTitle('SaveWEBM')
+      const saveWebmNode = comfyPage.vueNodes.getNodeByTitle('Save WEBM')
 
       // Wait for SaveImage to render an img inside .image-preview
       await expect(saveImageNode.locator('.image-preview img')).toBeVisible({
diff --git a/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png
index 16ec205bea..20cfac2ef1 100644
Binary files a/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png and b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png differ
diff --git a/browser_tests/tests/selectionToolboxMoreActions.spec.ts b/browser_tests/tests/selectionToolboxMoreActions.spec.ts
index ee700e2081..6c2d7f0991 100644
--- a/browser_tests/tests/selectionToolboxMoreActions.spec.ts
+++ b/browser_tests/tests/selectionToolboxMoreActions.spec.ts
@@ -2,21 +2,7 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '@e2e/fixtures/ComfyPage'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-
-async function openMoreOptions(comfyPage: ComfyPage) {
-  await expect(comfyPage.selectionToolbox).toBeVisible()
-
-  const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
-  await expect(moreOptionsBtn).toBeVisible()
-  await moreOptionsBtn.click()
-  await comfyPage.nextFrame()
-
-  // Wait for the context menu to appear by checking for 'Copy', which is
-  // always present regardless of single or multi-node selection.
-  const menu = comfyPage.page.locator('.p-contextmenu')
-  await expect(menu.getByText('Copy', { exact: true })).toBeVisible()
-}
+import { openMoreOptions } from '@e2e/fixtures/utils/selectionToolbox'
 
 test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
   test.describe('Single node actions', () => {
@@ -34,14 +20,14 @@ test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
 
       await expect(nodeRef).not.toBePinned()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Pin', { exact: true }).click()
+      let menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Pin', { exact: true }).click()
       await comfyPage.nextFrame()
 
       await expect(nodeRef).toBePinned()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Unpin', { exact: true }).click()
+      menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Unpin', { exact: true }).click()
       await comfyPage.nextFrame()
 
       await expect(nodeRef).not.toBePinned()
@@ -57,14 +43,14 @@ test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
 
       await expect(nodeRef).not.toBeCollapsed()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Minimize Node', { exact: true }).click()
+      let menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Minimize Node', { exact: true }).click()
       await comfyPage.nextFrame()
 
       await expect(nodeRef).toBeCollapsed()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Expand Node', { exact: true }).click()
+      menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Expand Node', { exact: true }).click()
       await comfyPage.nextFrame()
 
       await expect(nodeRef).not.toBeCollapsed()
@@ -78,8 +64,8 @@ test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
 
       const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Copy', { exact: true }).click()
+      const menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Copy', { exact: true }).click()
       await comfyPage.nextFrame()
 
       // Paste the copied node
@@ -99,8 +85,8 @@ test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
 
       const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
 
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Duplicate', { exact: true }).click()
+      const menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Duplicate', { exact: true }).click()
       await comfyPage.nextFrame()
 
       await expect
diff --git a/browser_tests/tests/selectionToolboxRename.spec.ts b/browser_tests/tests/selectionToolboxRename.spec.ts
new file mode 100644
index 0000000000..0bbd77fe9b
--- /dev/null
+++ b/browser_tests/tests/selectionToolboxRename.spec.ts
@@ -0,0 +1,96 @@
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '@e2e/fixtures/ComfyPage'
+import { getGroupTitlePosition } from '@e2e/fixtures/utils/groupHelpers'
+import { openMoreOptions } from '@e2e/fixtures/utils/selectionToolbox'
+
+test.describe('Selection toolbox rename', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
+    await comfyPage.workflow.loadWorkflow('default')
+    await comfyPage.nextFrame()
+  })
+
+  test.describe('Single rename', () => {
+    test('Rename via More Options opens title editor for single node', async ({
+      comfyPage
+    }) => {
+      const nodeRef = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
+      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
+
+      const menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Rename', { exact: true }).click()
+
+      await expect(comfyPage.page.getByTestId('node-title-input')).toHaveValue(
+        'KSampler'
+      )
+    })
+
+    test('Rename shows prompt dialog for group', async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting(
+        'LiteGraph.Group.SelectChildrenOnClick',
+        false
+      )
+      await comfyPage.workflow.loadWorkflow('groups/nested-groups-1-inner-node')
+      await comfyPage.nextFrame()
+
+      const outerGroupPos = await getGroupTitlePosition(
+        comfyPage,
+        'Outer Group'
+      )
+      await comfyPage.canvas.click({ position: outerGroupPos })
+
+      const menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Rename', { exact: true }).click()
+
+      await expect(comfyPage.nodeOps.promptDialogInput).toBeVisible()
+      await comfyPage.nodeOps.promptDialogInput.fill('Renamed Group')
+      await comfyPage.page.keyboard.press('Enter')
+      await expect(comfyPage.nodeOps.promptDialogInput).toBeHidden()
+
+      await expect
+        .poll(() =>
+          comfyPage.page.evaluate(() => {
+            return window.app!.graph.groups.some(
+              (g) => g.title === 'Renamed Group'
+            )
+          })
+        )
+        .toBe(true)
+    })
+  })
+
+  test.describe('Batch rename', () => {
+    test('Batch rename multiple selected nodes', async ({ comfyPage }) => {
+      const ksampler = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
+      const emptyLatent = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('Empty Latent Image')
+      )[0]
+
+      await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
+
+      const menu = await openMoreOptions(comfyPage)
+      await menu.getByText('Rename', { exact: true }).click()
+
+      await expect(comfyPage.nodeOps.promptDialogInput).toBeVisible()
+      await comfyPage.nodeOps.promptDialogInput.fill('TestNode')
+      await comfyPage.page.keyboard.press('Enter')
+      await expect(comfyPage.nodeOps.promptDialogInput).toBeHidden()
+
+      await expect
+        .poll(async () => {
+          const titles = await Promise.all([
+            ksampler.getProperty<string>('title'),
+            emptyLatent.getProperty<string>('title')
+          ])
+          return [...titles].sort()
+        })
+        .toEqual(['TestNode 1', 'TestNode 2'])
+    })
+  })
+})
diff --git a/browser_tests/tests/sidebar/assets.spec.ts b/browser_tests/tests/sidebar/assets.spec.ts
index cadd23d6ae..573edf05e7 100644
--- a/browser_tests/tests/sidebar/assets.spec.ts
+++ b/browser_tests/tests/sidebar/assets.spec.ts
@@ -82,6 +82,19 @@ const JOB_GAMMA_DETAIL: JobDetail = {
         }
       ]
     }
+  },
+  workflow: {
+    extra_data: {
+      extra_pnginfo: {
+        workflow: {
+          version: 0.4,
+          last_node_id: 0,
+          last_link_id: 0,
+          nodes: [],
+          links: []
+        }
+      }
+    }
   }
 }
 
@@ -112,7 +125,7 @@ test.describe('Assets sidebar - empty states', () => {
 
   test('Shows empty-state copy for generated tab', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
-    await tab.open()
+    await tab.open({ waitForAssets: false })
 
     await expect(tab.emptyStateTitle('No generated files found')).toBeVisible()
     await expect(tab.emptyStateMessage).toBeVisible()
@@ -120,7 +133,7 @@ test.describe('Assets sidebar - empty states', () => {
 
   test('Shows empty-state copy for imported tab', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
-    await tab.open()
+    await tab.open({ waitForAssets: false })
     await tab.switchToImported()
 
     await expect(tab.emptyStateTitle('No imported files found')).toBeVisible()
@@ -129,7 +142,7 @@ test.describe('Assets sidebar - empty states', () => {
 
   test('No asset cards are rendered when empty', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
-    await tab.open()
+    await tab.open({ waitForAssets: false })
 
     await expect(tab.assetCards).toHaveCount(0)
   })
@@ -209,7 +222,6 @@ test.describe('Assets sidebar - grid view display', () => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
 
-    await tab.waitForAssets()
     await expect.poll(() => tab.assetCards.count()).toBeGreaterThanOrEqual(1)
   })
 
@@ -270,7 +282,6 @@ test.describe('Assets sidebar - view mode toggle', () => {
   test('Can switch to list view via settings menu', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Open settings menu and select list view
     await tab.openSettingsMenu()
@@ -283,7 +294,6 @@ test.describe('Assets sidebar - view mode toggle', () => {
   test('Can switch back to grid view', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Switch to list view
     await tab.openSettingsMenu()
@@ -326,7 +336,6 @@ test.describe('Assets sidebar - search', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = await tab.assetCards.count()
 
@@ -340,7 +349,6 @@ test.describe('Assets sidebar - search', () => {
   test('Clearing search restores all assets', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = await tab.assetCards.count()
 
@@ -355,7 +363,6 @@ test.describe('Assets sidebar - search', () => {
   test('Search with no matches shows empty state', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.searchInput.fill('nonexistent_file_xyz')
     await expect(tab.assetCards).toHaveCount(0)
@@ -380,7 +387,6 @@ test.describe('Assets sidebar - selection', () => {
   test('Clicking an asset card selects it', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Click first asset card
     await tab.assetCards.first().click()
@@ -392,7 +398,6 @@ test.describe('Assets sidebar - selection', () => {
   test('Ctrl+click adds to selection', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const cards = tab.assetCards
     await expect.poll(() => cards.count()).toBeGreaterThanOrEqual(2)
@@ -411,7 +416,6 @@ test.describe('Assets sidebar - selection', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Select an asset
     await tab.assetCards.first().click()
@@ -423,7 +427,6 @@ test.describe('Assets sidebar - selection', () => {
   test('Deselect all clears selection', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Select an asset
     await tab.assetCards.first().click()
@@ -441,7 +444,6 @@ test.describe('Assets sidebar - selection', () => {
   test('Selection is cleared when switching tabs', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Select an asset
     await tab.assetCards.first().click()
@@ -475,7 +477,6 @@ test.describe('Assets sidebar - context menu', () => {
   test('Right-clicking an asset shows context menu', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Right-click first asset
     await tab.assetCards.first().click({ button: 'right' })
@@ -490,7 +491,6 @@ test.describe('Assets sidebar - context menu', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
     await comfyPage.page
@@ -505,7 +505,6 @@ test.describe('Assets sidebar - context menu', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
     await comfyPage.page
@@ -520,7 +519,6 @@ test.describe('Assets sidebar - context menu', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
     await comfyPage.page
@@ -535,7 +533,6 @@ test.describe('Assets sidebar - context menu', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
     await comfyPage.page
@@ -550,7 +547,6 @@ test.describe('Assets sidebar - context menu', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
 
@@ -563,12 +559,79 @@ test.describe('Assets sidebar - context menu', () => {
     await expect(tab.contextMenuItem('Export workflow')).toBeVisible()
   })
 
+  test('Cancelling export-workflow filename prompt does not show an error toast', async ({
+    comfyPage
+  }) => {
+    // job-gamma is the first card; its detail carries a valid workflow so
+    // extraction succeeds and the filename prompt opens.
+    await comfyPage.assets.mockJobDetail('job-gamma', JOB_GAMMA_DETAIL)
+
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+
+    await tab.assetCards.first().click({ button: 'right' })
+    await tab.contextMenuItem('Export workflow').click()
+
+    const promptDialog = comfyPage.page.getByRole('dialog', {
+      name: 'Export Workflow'
+    })
+    await expect(promptDialog).toBeVisible()
+
+    await comfyPage.page.keyboard.press('Escape')
+    await expect(promptDialog).toBeHidden()
+
+    await expect(comfyPage.toast.toastErrors).toBeHidden({ timeout: 1500 })
+  })
+
+  test('Confirming export-workflow prompt downloads the file and shows a success toast', async ({
+    comfyPage
+  }) => {
+    await comfyPage.assets.mockJobDetail('job-gamma', JOB_GAMMA_DETAIL)
+
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+
+    await tab.assetCards.first().click({ button: 'right' })
+    await tab.contextMenuItem('Export workflow').click()
+
+    const promptDialog = comfyPage.page.getByRole('dialog', {
+      name: 'Export Workflow'
+    })
+    await expect(promptDialog).toBeVisible()
+
+    const downloadPromise = comfyPage.page.waitForEvent('download')
+    await promptDialog.getByRole('button', { name: 'Confirm' }).click()
+
+    const download = await downloadPromise
+    expect(download.suggestedFilename()).toBe('abstract_art.json')
+
+    await expect(comfyPage.toast.toastSuccesses).toBeVisible()
+  })
+
+  test('Export-workflow shows a warning toast when the asset has no workflow', async ({
+    comfyPage
+  }) => {
+    // Strip the workflow field so extraction yields null and the export
+    // action returns { success: false, error: 'No workflow…' }.
+    const { workflow: _, ...detailWithoutWorkflow } = JOB_GAMMA_DETAIL
+    await comfyPage.assets.mockJobDetail('job-gamma', detailWithoutWorkflow)
+
+    const tab = comfyPage.menu.assetsTab
+    await tab.open()
+
+    await tab.assetCards.first().click({ button: 'right' })
+    await tab.contextMenuItem('Export workflow').click()
+
+    // Filename prompt should be skipped: extraction fails before the prompt.
+    await expect(comfyPage.toast.toastWarnings).toBeVisible()
+    await expect(comfyPage.toast.toastSuccesses).toBeHidden({ timeout: 1500 })
+  })
+
   test('Bulk context menu shows when multiple assets selected', async ({
     comfyPage
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const cards = tab.assetCards
     await expect.poll(() => cards.count()).toBeGreaterThanOrEqual(2)
@@ -623,7 +686,6 @@ test.describe('Assets sidebar - bulk actions', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click()
 
@@ -636,7 +698,6 @@ test.describe('Assets sidebar - bulk actions', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click()
 
@@ -647,7 +708,6 @@ test.describe('Assets sidebar - bulk actions', () => {
   test('Selection count displays correct number', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     // Select the two single-output assets (job-alpha, job-beta).
     // The count reflects total outputs, not cards — job-gamma has
@@ -676,7 +736,6 @@ cloudTest.describe('Assets sidebar - cloud exports', { tag: '@cloud' }, () => {
 
       const tab = comfyPage.menu.assetsTab
       await tab.open()
-      await tab.waitForAssets()
 
       await tab.assetCards.first().click()
       await expect(tab.downloadSelectedButton).toBeVisible()
@@ -701,7 +760,6 @@ cloudTest.describe('Assets sidebar - cloud exports', { tag: '@cloud' }, () => {
 
       const tab = comfyPage.menu.assetsTab
       await tab.open()
-      await tab.waitForAssets()
 
       await tab.assetCards
         .first()
@@ -737,7 +795,6 @@ cloudTest.describe('Assets sidebar - cloud exports', { tag: '@cloud' }, () => {
 
       const tab = comfyPage.menu.assetsTab
       await tab.open()
-      await tab.waitForAssets()
 
       await tab.assetCards.nth(1).click()
       await comfyPage.page.keyboard.down('Control')
@@ -784,7 +841,6 @@ test.describe('Assets sidebar - pagination', () => {
 
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const req = await firstRequest
     const url = new URL(req.url())
@@ -840,7 +896,6 @@ test.describe('Assets sidebar - delete confirmation', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     await tab.assetCards.first().click({ button: 'right' })
     await tab.contextMenuItem('Delete').click()
@@ -858,7 +913,6 @@ test.describe('Assets sidebar - delete confirmation', () => {
   }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = await tab.assetCards.count()
 
@@ -880,7 +934,6 @@ test.describe('Assets sidebar - delete confirmation', () => {
   test('Cancelling delete preserves asset', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = await tab.assetCards.count()
 
@@ -977,7 +1030,6 @@ test.describe('Assets sidebar - media type filter', () => {
   test('Unchecking image filter hides image assets', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = tab.assetCards
     await expect(
@@ -998,7 +1050,6 @@ test.describe('Assets sidebar - media type filter', () => {
   test('Re-enabling filter restores hidden assets', async ({ comfyPage }) => {
     const tab = comfyPage.menu.assetsTab
     await tab.open()
-    await tab.waitForAssets()
 
     const initialCount = await tab.assetCards.count()
 
diff --git a/browser_tests/tests/subgraph/subgraphNested.spec.ts b/browser_tests/tests/subgraph/subgraphNested.spec.ts
index 41323f3577..550534f8f1 100644
--- a/browser_tests/tests/subgraph/subgraphNested.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphNested.spec.ts
@@ -3,6 +3,7 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test, comfyExpect } from '@e2e/fixtures/ComfyPage'
 import { SubgraphHelper } from '@e2e/fixtures/helpers/SubgraphHelper'
 import { TestIds } from '@e2e/fixtures/selectors'
+import { getPromotedWidgets } from '@e2e/fixtures/utils/promotedWidgets'
 
 test.describe('Nested Subgraphs', { tag: ['@subgraph'] }, () => {
   test.describe('Nested subgraph configure order', () => {
@@ -190,4 +191,106 @@ test.describe('Nested Subgraphs', { tag: ['@subgraph'] }, () => {
       })
     }
   )
+
+  test.describe(
+    'Nested subgraph input target resolution',
+    { tag: ['@widget', '@vue-nodes'] },
+    () => {
+      const WORKFLOW = 'subgraphs/subgraph-nested-promotion'
+      const OUTER_NODE_ID = '5'
+      const INNER_SUBGRAPH_NODE_ID = '6'
+
+      test('Nested SubgraphNode promoted widgets render without resolution failures', async ({
+        comfyPage
+      }) => {
+        const { warnings, dispose } = SubgraphHelper.collectConsoleWarnings(
+          comfyPage.page,
+          ['No link found', 'Failed to resolve legacy -1']
+        )
+
+        try {
+          await comfyPage.workflow.loadWorkflow(WORKFLOW)
+          await comfyPage.vueNodes.waitForNodes()
+
+          const outerNode = comfyPage.vueNodes.getNodeLocator(OUTER_NODE_ID)
+          await comfyExpect(outerNode).toBeVisible()
+
+          const widgets = outerNode.getByTestId(TestIds.widgets.widget)
+          await comfyExpect(
+            widgets,
+            'asset has 4 promoted widgets on outer subgraph node'
+          ).toHaveCount(4)
+
+          expect(warnings).toEqual([])
+        } finally {
+          dispose()
+        }
+      })
+
+      test('Promoted widgets from inner SubgraphNode are visible with correct values', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(WORKFLOW)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const outerNode = comfyPage.vueNodes.getNodeLocator(OUTER_NODE_ID)
+        await comfyExpect(outerNode).toBeVisible()
+
+        const widgets = outerNode.getByTestId(TestIds.widgets.widget)
+        await comfyExpect(widgets).toHaveCount(4)
+
+        const valueWidget = outerNode
+          .getByRole('textbox', { name: 'value' })
+          .first()
+        await comfyExpect(valueWidget).toBeVisible()
+        await comfyExpect(valueWidget).toHaveValue(/Inner 1/)
+      })
+
+      test('Promoted widgets from inner SubgraphNode carry correct source identity', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(WORKFLOW)
+        await comfyPage.vueNodes.waitForNodes()
+
+        await expect
+          .poll(async () => {
+            const widgets = await getPromotedWidgets(comfyPage, OUTER_NODE_ID)
+            return widgets
+              .filter(
+                ([sourceNodeId]) => sourceNodeId === INNER_SUBGRAPH_NODE_ID
+              )
+              .map(([, sourceWidgetName]) => sourceWidgetName)
+          })
+          .toContain('value')
+      })
+
+      test('Serialize and reload preserves nested promoted widget visibility', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(WORKFLOW)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const outerNode = comfyPage.vueNodes.getNodeLocator(OUTER_NODE_ID)
+        const widgets = outerNode.getByTestId(TestIds.widgets.widget)
+        await comfyExpect(
+          widgets,
+          'asset has 4 promoted widgets on outer subgraph node'
+        ).toHaveCount(4)
+        const initialCount = await widgets.count()
+
+        await comfyPage.subgraph.serializeAndReload()
+        await comfyPage.vueNodes.waitForNodes()
+
+        const outerNodeAfter = comfyPage.vueNodes.getNodeLocator(OUTER_NODE_ID)
+        const widgetsAfter = outerNodeAfter.getByTestId(TestIds.widgets.widget)
+        await comfyExpect(widgetsAfter).toHaveCount(initialCount)
+
+        const valueWidget = outerNodeAfter
+          .getByRole('textbox', { name: 'value' })
+          .first()
+        await comfyExpect(valueWidget).toBeVisible()
+        await comfyExpect(valueWidget).toHaveValue(/Inner 1/)
+      })
+    }
+  )
 })
diff --git a/browser_tests/tests/subgraph/subgraphPromotion.spec.ts b/browser_tests/tests/subgraph/subgraphPromotion.spec.ts
index 91657e4d50..9eb349a0dc 100644
--- a/browser_tests/tests/subgraph/subgraphPromotion.spec.ts
+++ b/browser_tests/tests/subgraph/subgraphPromotion.spec.ts
@@ -535,6 +535,75 @@ test.describe(
           .poll(() => getPromotedWidgetCount(comfyPage, '11'))
           .toBeLessThan(initialWidgetCount)
       })
+
+      test('Does not cleanup unconfigured Primitive', async ({ comfyPage }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-link-and-proxied-primitive'
+        )
+        await expect
+          .poll(
+            () => getPromotedWidgetCount(comfyPage, '2'),
+            'Primitive widget is restored on load'
+          )
+          .toBe(2)
+
+        await comfyPage.page.evaluate(() => app!.canvas.setDirty(true))
+        const subgraphNode = await comfyPage.nodeOps.getFirstNodeRef()
+        const promotedPrimitive = await subgraphNode!.getWidget(1)
+        await expect
+          .poll(
+            () => promotedPrimitive.getValue(),
+            'Primitive widget is not in a disconnected state'
+          )
+          .toBe(0)
+      })
     })
+
+    test.fail(
+      'Promoted text widget is removed when source node is deleted inside the subgraph',
+      { tag: '@vue-nodes' },
+      async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
+        const clipFixture = await comfyPage.vueNodes.getFixtureByTitle(
+          'CLIP Text Encode (Prompt)'
+        )
+        await comfyPage.contextMenu.openForVueNode(clipFixture.header)
+        await comfyPage.contextMenu.clickMenuItemExact('Convert to Subgraph')
+
+        const subgraphNode = comfyPage.vueNodes
+          .getNodeByTitle('New Subgraph')
+          .first()
+        await expect(subgraphNode).toBeVisible()
+
+        const subgraphNodeId =
+          await comfyPage.vueNodes.getNodeIdByTitle('New Subgraph')
+
+        await expect
+          .poll(() => getPromotedWidgetNames(comfyPage, subgraphNodeId))
+          .toContain('text')
+        await expect(
+          subgraphNode.getByTestId(TestIds.widgets.domWidgetTextarea)
+        ).toBeVisible()
+
+        await comfyPage.vueNodes.enterSubgraph(subgraphNodeId)
+        await expect.poll(() => comfyPage.subgraph.isInSubgraph()).toBe(true)
+        await comfyPage.vueNodes.waitForNodes()
+
+        const interiorClip = await comfyPage.vueNodes.getFixtureByTitle(
+          'CLIP Text Encode (Prompt)'
+        )
+        await interiorClip.delete()
+
+        await comfyPage.subgraph.exitViaBreadcrumb()
+
+        const subgraphNodeAfter =
+          comfyPage.vueNodes.getNodeLocator(subgraphNodeId)
+        await expect(subgraphNodeAfter).toBeVisible()
+        await expect(
+          subgraphNodeAfter.getByTestId(TestIds.widgets.domWidgetTextarea)
+        ).toBeHidden()
+      }
+    )
   }
 )
diff --git a/browser_tests/tests/templates.spec.ts b/browser_tests/tests/templates.spec.ts
index ce43d51c53..06b53a9bbc 100644
--- a/browser_tests/tests/templates.spec.ts
+++ b/browser_tests/tests/templates.spec.ts
@@ -106,6 +106,49 @@ test.describe('Templates', { tag: ['@slow', '@workflow'] }, () => {
     await expect(comfyPage.templates.content).toBeVisible()
   })
 
+  test('dialog should not be shown when first-time user opens a shared workflow link', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.route(
+      '**/workflows/published/test-share-id',
+      async (route) => {
+        await route.fulfill({
+          status: 200,
+          contentType: 'application/json',
+          body: JSON.stringify({
+            share_id: 'test-share-id',
+            workflow_id: 'wf-1',
+            name: 'Shared Workflow',
+            listed: true,
+            publish_time: new Date().toISOString(),
+            workflow_json: {
+              version: 0.4,
+              nodes: [],
+              links: [],
+              groups: [],
+              config: {},
+              extra: {}
+            },
+            assets: []
+          })
+        })
+      }
+    )
+
+    await comfyPage.settings.setSetting('Comfy.TutorialCompleted', false)
+
+    await comfyPage.setup({
+      clearStorage: true,
+      url: '/?share=test-share-id'
+    })
+
+    await expect(
+      comfyPage.page.getByRole('heading', { name: 'Open shared workflow' })
+    ).toBeVisible()
+
+    await expect(comfyPage.templates.content).toBeHidden()
+  })
+
   test('Uses proper locale files for templates', async ({ comfyPage }) => {
     await comfyPage.settings.setSetting('Comfy.Locale', 'fr')
 
@@ -131,48 +174,51 @@ test.describe('Templates', { tag: ['@slow', '@workflow'] }, () => {
   test('Falls back to English templates when locale file not found', async ({
     comfyPage
   }) => {
-    // Set locale to a language that doesn't have a template file
-    await comfyPage.settings.setSetting('Comfy.Locale', 'de') // German - no index.de.json exists
+    // Pick a shipped LTR locale and simulate its template index returning 404.
+    // (Previously this test used 'de', but unsupported locales are now
+    // clamped to 'en' at boot so they never hit the template fallback path.
+    // 'fa' would also work but flips document.dir to rtl, which can leak
+    // into adjacent specs in the same worker.)
+    const locale = 'tr'
 
-    // Wait for the German request (expected to 404)
-    const germanRequestPromise = comfyPage.page.waitForRequest(
-      '**/templates/index.de.json'
+    await comfyPage.page.route(
+      `**/templates/index.${locale}.json`,
+      async (route) => {
+        await route.fulfill({
+          status: 404,
+          headers: { 'Content-Type': 'text/plain' },
+          body: 'Not Found'
+        })
+      }
     )
 
-    // Wait for the fallback English request
-    const englishRequestPromise = comfyPage.page.waitForRequest(
-      '**/templates/index.json'
-    )
-
-    // Intercept the German file to simulate a 404
-    await comfyPage.page.route('**/templates/index.de.json', async (route) => {
-      await route.fulfill({
-        status: 404,
-        headers: { 'Content-Type': 'text/plain' },
-        body: 'Not Found'
-      })
-    })
-
-    // Allow the English index to load normally
     await comfyPage.page.route('**/templates/index.json', (route) =>
       route.continue()
     )
 
-    // Load the templates dialog
+    await comfyPage.settings.setSetting('Comfy.Locale', locale)
+
+    const localeRequestPromise = comfyPage.page.waitForRequest(
+      `**/templates/index.${locale}.json`
+    )
+    const englishRequestPromise = comfyPage.page.waitForRequest(
+      '**/templates/index.json'
+    )
+
     await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
     await expect(comfyPage.templates.content).toBeVisible()
 
-    // Verify German was requested first, then English as fallback
-    const germanRequest = await germanRequestPromise
+    const localeRequest = await localeRequestPromise
     const englishRequest = await englishRequestPromise
 
-    expect(germanRequest.url()).toContain('templates/index.de.json')
+    expect(localeRequest.url()).toContain(`templates/index.${locale}.json`)
     expect(englishRequest.url()).toContain('templates/index.json')
 
-    // Verify English titles are shown as fallback
-    await expect(
-      comfyPage.page.getByRole('main').getByText('All Templates')
-    ).toBeVisible()
+    // Assert on rendered content, not just the container — the container
+    // testid is present even when the dialog body is empty, which would let
+    // a regression where the fallback fetch succeeds but no cards render
+    // pass silently.
+    await expect(comfyPage.templates.allTemplateCards.first()).toBeVisible()
   })
 
   test('template cards are dynamically sized and responsive', async ({
diff --git a/browser_tests/tests/topbar/workflowTabs.spec.ts b/browser_tests/tests/topbar/workflowTabs.spec.ts
index 264a94dad3..34954d3b3f 100644
--- a/browser_tests/tests/topbar/workflowTabs.spec.ts
+++ b/browser_tests/tests/topbar/workflowTabs.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
@@ -125,6 +126,48 @@ test.describe('Workflow tabs', () => {
     await expect(activeTab.locator('text=•')).toBeVisible()
   })
 
+  test('Can drag tab to end', async ({ comfyPage }) => {
+    const topbar = comfyPage.menu.topbar
+
+    await topbar.newWorkflowButton.click()
+    await topbar.newWorkflowButton.click()
+    await expect.poll(() => topbar.getTabNames()).toHaveLength(3)
+    const [a, b, c] = await topbar.getTabNames()
+
+    await topbar.getTab(0).dragTo(topbar.getTab(2))
+
+    await expect.poll(() => topbar.getTabNames()).toEqual([b, c, a])
+  })
+
+  test('Can drag tab to start', async ({ comfyPage }) => {
+    const topbar = comfyPage.menu.topbar
+
+    await topbar.newWorkflowButton.click()
+    await topbar.newWorkflowButton.click()
+    await expect.poll(() => topbar.getTabNames()).toHaveLength(3)
+    const [a, b, c] = await topbar.getTabNames()
+
+    await topbar.getTab(2).dragTo(topbar.getTab(0))
+
+    await expect.poll(() => topbar.getTabNames()).toEqual([c, a, b])
+  })
+
+  test('Drag preserves active tab', async ({ comfyPage }) => {
+    const topbar = comfyPage.menu.topbar
+
+    await topbar.newWorkflowButton.click()
+    await topbar.newWorkflowButton.click()
+    await expect.poll(() => topbar.getTabNames()).toHaveLength(3)
+
+    const [, b] = await topbar.getTabNames()
+    await topbar.getTab(1).click()
+    await expect.poll(() => topbar.getActiveTabName()).toContain(b)
+
+    await topbar.getTab(0).dragTo(topbar.getTab(2))
+
+    await expect.poll(() => topbar.getActiveTabName()).toContain(b)
+  })
+
   test('Multiple tabs can be created, switched, and closed', async ({
     comfyPage
   }) => {
@@ -146,4 +189,79 @@ test.describe('Workflow tabs', () => {
     await topbar.closeWorkflowTab('Unsaved Workflow (2)')
     await expect.poll(() => topbar.getTabNames()).toHaveLength(2)
   })
+
+  test.describe('Closing a modified workflow tab (FE-419)', () => {
+    async function modifyActiveWorkflow(page: Page, activeTab: Locator) {
+      await page.evaluate(() => {
+        const graph = window.app?.graph
+        const node = window.LiteGraph?.createNode('Note')
+        if (graph && node) graph.add(node)
+      })
+      await expect(
+        activeTab.getByTestId('workflow-dirty-indicator')
+      ).toHaveCount(1)
+    }
+
+    test('shows "Close anyway" label and no Cancel button on dirtyClose dialog', async ({
+      comfyPage
+    }) => {
+      const topbar = comfyPage.menu.topbar
+
+      await topbar.newWorkflowButton.click()
+      await expect.poll(() => topbar.getTabNames()).toHaveLength(2)
+
+      await modifyActiveWorkflow(comfyPage.page, topbar.getActiveTab())
+      await topbar.closeWorkflowTab('Unsaved Workflow (2)')
+
+      const dialog = comfyPage.page.getByRole('dialog')
+      await expect(dialog).toBeVisible()
+      await expect(
+        dialog.getByRole('button', { name: 'Close anyway' })
+      ).toBeVisible()
+      await expect(dialog.getByRole('button', { name: 'Save' })).toBeVisible()
+      await expect(dialog.getByRole('button', { name: 'Cancel' })).toHaveCount(
+        0
+      )
+    })
+
+    test('clicking "Close anyway" closes the tab without saving', async ({
+      comfyPage
+    }) => {
+      const topbar = comfyPage.menu.topbar
+
+      await topbar.newWorkflowButton.click()
+      await expect.poll(() => topbar.getTabNames()).toHaveLength(2)
+
+      await modifyActiveWorkflow(comfyPage.page, topbar.getActiveTab())
+      await topbar.closeWorkflowTab('Unsaved Workflow (2)')
+
+      await comfyPage.page
+        .getByRole('dialog')
+        .getByRole('button', { name: 'Close anyway' })
+        .click()
+
+      await expect.poll(() => topbar.getTabNames()).toHaveLength(1)
+      await expect
+        .poll(() => topbar.getActiveTabName())
+        .toContain('Unsaved Workflow')
+    })
+
+    test('dismissing the dialog keeps the modified tab open', async ({
+      comfyPage
+    }) => {
+      const topbar = comfyPage.menu.topbar
+
+      await topbar.newWorkflowButton.click()
+      await expect.poll(() => topbar.getTabNames()).toHaveLength(2)
+
+      await modifyActiveWorkflow(comfyPage.page, topbar.getActiveTab())
+      await topbar.closeWorkflowTab('Unsaved Workflow (2)')
+
+      await expect(comfyPage.page.getByRole('dialog')).toBeVisible()
+      await comfyPage.page.keyboard.press('Escape')
+      await expect(comfyPage.page.getByRole('dialog')).toBeHidden()
+
+      await expect.poll(() => topbar.getTabNames()).toHaveLength(2)
+    })
+  })
 })
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
index 260c240f1a..6b0e1b752a 100644
--- a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
@@ -1133,3 +1133,108 @@ test.describe(
     })
   }
 )
+
+test.describe('Vue Node Widget Link Position', { tag: '@vue-nodes' }, () => {
+  test('should keep widget-input link aligned after persisted-workflow reload', async ({
+    comfyPage
+  }) => {
+    test.setTimeout(30000)
+
+    await comfyPage.workflow.loadWorkflow(
+      'vueNodes/ksampler-denoise-widget-link'
+    )
+    await comfyPage.vueNodes.waitForNodes(2)
+    await comfyPage.workflow.waitForDraftPersisted()
+    await comfyPage.workflow.reloadAndWaitForApp()
+    await comfyPage.vueNodes.waitForNodes(2)
+
+    const ksampler = await comfyPage.page.evaluate(() => {
+      const node = window.app!.graph.nodes.find((n) => n.type === 'KSampler')
+      if (!node) return null
+      const findIndex = (name: string) =>
+        node.inputs.findIndex(
+          (input) => input.name === name || input.widget?.name === name
+        )
+      return {
+        id: node.id,
+        denoiseIndex: findIndex('denoise'),
+        schedulerIndex: findIndex('scheduler')
+      }
+    })
+    if (!ksampler) {
+      throw new Error('KSampler should be present in fixture')
+    }
+    expect(
+      ksampler.denoiseIndex,
+      'denoise input slot not found'
+    ).toBeGreaterThanOrEqual(0)
+    expect(
+      ksampler.schedulerIndex,
+      'scheduler input slot not found'
+    ).toBeGreaterThanOrEqual(0)
+
+    const denoiseSlot = slotLocator(
+      comfyPage.page,
+      ksampler.id,
+      ksampler.denoiseIndex,
+      true
+    )
+    const schedulerSlot = slotLocator(
+      comfyPage.page,
+      ksampler.id,
+      ksampler.schedulerIndex,
+      true
+    )
+    await expectVisibleAll(denoiseSlot, schedulerSlot)
+
+    await expect
+      .poll(() =>
+        getInputLinkDetails(comfyPage.page, ksampler.id, ksampler.denoiseIndex)
+      )
+      .toMatchObject({
+        targetId: ksampler.id,
+        targetSlot: ksampler.denoiseIndex
+      })
+
+    // If the regression returns, getInputPos stays stale relative to the
+    // grown slot DOM and the endpoint drifts toward scheduler. Re-read
+    // positions each retry so layout settle doesn't cause flakes.
+    await expect(async () => {
+      const linkEnd = await comfyPage.page.evaluate(
+        ([nodeId, targetSlotIndex]) => {
+          const node = window.app!.graph.getNodeById(nodeId)
+          if (!node) return null
+          const slotPos = node.getInputPos(targetSlotIndex)
+          const [cx, cy] = window.app!.canvas.ds.convertOffsetToCanvas([
+            slotPos[0],
+            slotPos[1]
+          ])
+          const rect = window.app!.canvas.canvas.getBoundingClientRect()
+          return { x: cx + rect.left, y: cy + rect.top }
+        },
+        [ksampler.id, ksampler.denoiseIndex] as const
+      )
+      expect(linkEnd, 'link endpoint should resolve').not.toBeNull()
+
+      const denoiseCenter = await getCenter(denoiseSlot)
+      const schedulerCenter = await getCenter(schedulerSlot)
+      const distToDenoise = Math.hypot(
+        linkEnd!.x - denoiseCenter.x,
+        linkEnd!.y - denoiseCenter.y
+      )
+      const rowGap = Math.hypot(
+        denoiseCenter.x - schedulerCenter.x,
+        denoiseCenter.y - schedulerCenter.y
+      )
+
+      // Bound at rowGap / 4 - half the inter-slot midpoint, so any drift
+      // toward scheduler fails well before reaching it.
+      expect(
+        distToDenoise,
+        `Link endpoint (${linkEnd!.x.toFixed(1)}, ${linkEnd!.y.toFixed(1)}) is ` +
+          `${distToDenoise.toFixed(1)}px from denoise — should be within ` +
+          `${(rowGap / 4).toFixed(1)}px (quarter of inter-slot gap ${rowGap.toFixed(1)}px)`
+      ).toBeLessThan(rowGap / 4)
+    }).toPass({ timeout: 5000 })
+  })
+})
diff --git a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts
index 0f22d70569..4050cafaff 100644
--- a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts
@@ -21,9 +21,8 @@ test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => {
     })
 
     const nodeId = String(loadImageNode.id)
-    const imagePreview = comfyPage.vueNodes
-      .getNodeLocator(nodeId)
-      .locator('.image-preview')
+    const { imagePreview } =
+      await comfyPage.vueNodes.getFixtureByTitle('Load Image')
 
     await expect(imagePreview).toBeVisible()
     await expect(imagePreview.locator('img')).toBeVisible({ timeout: 30_000 })
@@ -44,6 +43,25 @@ test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => {
     await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible()
   })
 
+  test('hides mask and download buttons when image is missing', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(
+      'widgets/load_image_widget_missing_file'
+    )
+
+    const { imagePreview } =
+      await comfyPage.vueNodes.getFixtureByTitle('Load Image')
+
+    await expect(imagePreview).toBeVisible()
+    await expect(imagePreview.getByTestId('error-loading-image')).toBeVisible()
+
+    await imagePreview.getByRole('region').hover()
+
+    await expect(imagePreview.getByLabel('Edit or mask image')).toHaveCount(0)
+    await expect(imagePreview.getByLabel('Download image')).toHaveCount(0)
+  })
+
   test('shows image context menu options', async ({ comfyPage }) => {
     const { nodeId } = await loadImageOnNode(comfyPage)
 
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
index 53642662f5..af0ce5761c 100644
--- a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
@@ -1,3 +1,5 @@
+import type { Locator } from '@playwright/test'
+
 import {
   comfyExpect as expect,
   comfyPageFixture as test
@@ -39,6 +41,19 @@ test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
     expect(Math.abs(a.y - b.y)).toBeLessThanOrEqual(tol)
   }
 
+  const dragFromTabButton = async (comfyPage: ComfyPage, button: Locator) => {
+    const box = await button.boundingBox()
+    if (!box) throw new Error('Tab button has no bounding box')
+    const start = {
+      x: box.x + box.width / 2,
+      y: box.y + box.height * 0.75
+    }
+    await comfyPage.canvasOps.dragAndDrop(start, {
+      x: start.x + 120,
+      y: start.y + 80
+    })
+  }
+
   test('should allow moving nodes by dragging', async ({ comfyPage }) => {
     const loadCheckpointHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
     await comfyPage.canvasOps.dragAndDrop(loadCheckpointHeaderPos, {
@@ -90,6 +105,63 @@ test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
     await expectPosChanged(headerPos, afterPos)
   })
 
+  test('should not toggle advanced inputs when dragging by the Advanced button', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting(
+      'Comfy.Node.AlwaysShowAdvancedWidgets',
+      false
+    )
+    await comfyPage.nodeOps.addNode(
+      'ModelSamplingFlux',
+      {},
+      {
+        x: 500,
+        y: 200
+      }
+    )
+    await comfyPage.vueNodes.waitForNodes()
+
+    const node = comfyPage.vueNodes.getNodeByTitle('ModelSamplingFlux')
+    const showButton = node.getByText('Show advanced inputs')
+    const widgets = node.locator('.lg-node-widget')
+
+    await expect(showButton).toBeVisible()
+    await expect(widgets).toHaveCount(2)
+
+    const beforePos = await node.boundingBox()
+    if (!beforePos) throw new Error('Node has no bounding box')
+
+    await dragFromTabButton(comfyPage, showButton)
+
+    await expect(showButton).toBeVisible()
+    await expect(node.getByText('Hide advanced inputs')).toBeHidden()
+    await expect(widgets).toHaveCount(2)
+
+    const afterPos = await node.boundingBox()
+    if (!afterPos) throw new Error('Node missing after drag')
+    await expectPosChanged(beforePos, afterPos)
+  })
+
+  test('should not enter subgraph when dragging by the Enter Subgraph button', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+
+    const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
+    const beforePos = await subgraphNode.getPosition()
+
+    await dragFromTabButton(
+      comfyPage,
+      comfyPage.vueNodes.getSubgraphEnterButton('2')
+    )
+
+    expect(await comfyPage.subgraph.isInSubgraph()).toBe(false)
+
+    const afterPos = await subgraphNode.getPosition()
+    await expectPosChanged(beforePos, afterPos)
+  })
+
   test('should move all selected nodes together when dragging one with Meta held', async ({
     comfyPage
   }) => {
diff --git a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
index 926d5e2594..f64d1e1376 100644
--- a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
@@ -13,6 +13,7 @@ import {
   ExecutionHelper,
   buildKSamplerError
 } from '@e2e/fixtures/helpers/ExecutionHelper'
+import { fitToViewInstant } from '@e2e/fixtures/utils/fitToView'
 import { webSocketFixture } from '@e2e/fixtures/ws'
 
 const test = mergeTests(comfyPageFixture, webSocketFixture)
@@ -20,6 +21,7 @@ const test = mergeTests(comfyPageFixture, webSocketFixture)
 const ERROR_CLASS = /ring-destructive-background/
 const UNKNOWN_NODE_ID = '1'
 const INNER_EXECUTION_ID = '2:1'
+const KSAMPLER_MODEL_INPUT_NAME = 'model'
 
 test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
   test('should display error state when node is missing (node from workflow is not installed)', async ({
@@ -71,6 +73,59 @@ test.describe('Vue Node Error', { tag: '@vue-nodes' }, () => {
       ).toHaveClass(ERROR_CLASS)
     })
 
+    test(
+      'highlights the missing required input slot',
+      { tag: ['@screenshot', '@node'] },
+      async ({ comfyPage }) => {
+        const ksamplerId = await comfyPage.vueNodes.getNodeIdByTitle('KSampler')
+        const ksamplerNode = comfyPage.vueNodes.getNodeLocator(ksamplerId)
+        const modelInputIndex = await comfyPage.page.evaluate(
+          ({ nodeId, inputName }) => {
+            const node = window.app!.graph.getNodeById(nodeId)
+            const index =
+              node?.inputs?.findIndex((input) => input.name === inputName) ?? -1
+            if (index < 0) {
+              throw new Error(`Input slot "${inputName}" not found`)
+            }
+            return index
+          },
+          { nodeId: ksamplerId, inputName: KSAMPLER_MODEL_INPUT_NAME }
+        )
+        const modelInputSlotRow = comfyPage.vueNodes.getInputSlotRow(
+          ksamplerId,
+          modelInputIndex
+        )
+        const modelInputSlotHighlight =
+          comfyPage.vueNodes.getInputSlotConnectionDot(
+            ksamplerId,
+            modelInputIndex
+          )
+        const exec = new ExecutionHelper(comfyPage)
+        await exec.mockValidationFailure({
+          [ksamplerId]: buildKSamplerError(
+            'required_input_missing',
+            KSAMPLER_MODEL_INPUT_NAME,
+            `Required input is missing: ${KSAMPLER_MODEL_INPUT_NAME}`
+          )
+        })
+
+        await comfyPage.runButton.click()
+        await dismissErrorOverlay(comfyPage)
+        await fitToViewInstant(comfyPage)
+
+        await expect(modelInputSlotRow).toBeVisible()
+        await expect(modelInputSlotRow).toBeInViewport()
+        await expect(modelInputSlotHighlight).toHaveClass(/before:ring-error/)
+        await expect(
+          comfyPage.vueNodes.getNodeInnerWrapper(ksamplerId)
+        ).toHaveClass(ERROR_CLASS)
+        await comfyPage.expectScreenshot(
+          ksamplerNode,
+          'vue-node-required-input-missing-slot-error.png'
+        )
+      }
+    )
+
     test('clears error ring when user edits an out-of-range number widget back into range', async ({
       comfyPage
     }) => {
diff --git a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts-snapshots/vue-node-required-input-missing-slot-error-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts-snapshots/vue-node-required-input-missing-slot-error-chromium-linux.png
new file mode 100644
index 0000000000..3222d1a6c2
Binary files /dev/null and b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts-snapshots/vue-node-required-input-missing-slot-error-chromium-linux.png differ
diff --git a/browser_tests/tests/workflowDeleteSettings.spec.ts b/browser_tests/tests/workflowDeleteSettings.spec.ts
new file mode 100644
index 0000000000..28887668cc
--- /dev/null
+++ b/browser_tests/tests/workflowDeleteSettings.spec.ts
@@ -0,0 +1,49 @@
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+
+const WORKFLOW_NAME = 'test-confirm-delete'
+
+async function startDeletingFromSidebar(comfyPage: ComfyPage) {
+  const { workflowsTab } = comfyPage.menu
+  await workflowsTab.open()
+  await workflowsTab.getPersistedItem(WORKFLOW_NAME).click({ button: 'right' })
+  await comfyPage.contextMenu.clickMenuItem('Delete')
+}
+
+test.describe('Comfy.Workflow.ConfirmDelete', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.menu.topbar.saveWorkflowAs(WORKFLOW_NAME)
+  })
+
+  test.afterEach(async ({ comfyPage }) => {
+    await comfyPage.workflow.setupWorkflowsDirectory({})
+  })
+
+  test('on (default): right-click → Delete prompts the confirm dialog', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting('Comfy.Workflow.ConfirmDelete', true)
+
+    await startDeletingFromSidebar(comfyPage)
+
+    await expect(comfyPage.confirmDialog.root).toBeVisible()
+    await expect(comfyPage.confirmDialog.delete).toBeVisible()
+  })
+
+  test('off: right-click → Delete bypasses the confirm dialog', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting('Comfy.Workflow.ConfirmDelete', false)
+
+    await startDeletingFromSidebar(comfyPage)
+
+    const { workflowsTab } = comfyPage.menu
+    await expect(comfyPage.confirmDialog.root).toBeHidden()
+    await expect
+      .poll(() => workflowsTab.getTopLevelSavedWorkflowNames())
+      .not.toContain(WORKFLOW_NAME)
+  })
+})
diff --git a/browser_tests/tests/wsReconnectStaleJob.spec.ts b/browser_tests/tests/wsReconnectStaleJob.spec.ts
new file mode 100644
index 0000000000..d67d404c7d
--- /dev/null
+++ b/browser_tests/tests/wsReconnectStaleJob.spec.ts
@@ -0,0 +1,211 @@
+import type { WebSocketRoute } from '@playwright/test'
+import { mergeTests } from '@playwright/test'
+import type { z } from 'zod'
+
+import {
+  comfyExpect as expect,
+  comfyPageFixture
+} from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
+import { webSocketFixture } from '@e2e/fixtures/ws'
+import type {
+  RawJobListItem,
+  zJobsListResponse
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+
+type JobsListResponse = z.infer<typeof zJobsListResponse>
+
+const test = mergeTests(comfyPageFixture, webSocketFixture)
+
+const KSAMPLER_NODE = '3'
+const EXECUTING_CLASS = /outline-node-stroke-executing/
+
+const QUEUE_ROUTE = /\/api\/jobs\?[^/]*status=in_progress,pending/
+const HISTORY_ROUTE = /\/api\/jobs\?[^/]*status=completed/
+
+function jobsResponse(jobs: RawJobListItem[]): JobsListResponse {
+  return {
+    jobs,
+    pagination: { offset: 0, limit: 200, total: jobs.length, has_more: false }
+  }
+}
+
+async function mockJobsRoute(
+  comfyPage: ComfyPage,
+  pattern: RegExp,
+  body: string,
+  status: number = 200
+): Promise<() => number> {
+  let count = 0
+  await comfyPage.page.route(pattern, async (route) => {
+    count += 1
+    await route.fulfill({
+      status,
+      contentType: 'application/json',
+      body
+    })
+  })
+  return () => count
+}
+
+const emptyJobsBody = JSON.stringify(jobsResponse([]))
+
+type Scenario = {
+  name: string
+  /** Built per-test so it can incorporate the runtime-assigned jobId. */
+  queueBody: (jobId: string) => string
+  /** Whether the active job state should still be reflected after reconnect. */
+  expectsActiveAfter: boolean
+}
+
+const scenarios: Scenario[] = [
+  {
+    name: 'clears stale active job when queue is empty after reconnect',
+    queueBody: () => emptyJobsBody,
+    expectsActiveAfter: false
+  },
+  {
+    name: 'preserves active job when the job is still in the queue',
+    queueBody: (jobId) =>
+      JSON.stringify(
+        jobsResponse([
+          { id: jobId, status: 'in_progress', create_time: Date.now() }
+        ])
+      ),
+    expectsActiveAfter: true
+  }
+]
+
+/**
+ * Stub the queue/history endpoints per `scenario`, close the WS, and wait
+ * for the auto-reconnect to issue a fresh queue fetch.
+ */
+async function triggerReconnect(
+  comfyPage: ComfyPage,
+  ws: WebSocketRoute,
+  scenario: Scenario,
+  jobId: string
+): Promise<void> {
+  await mockJobsRoute(comfyPage, HISTORY_ROUTE, emptyJobsBody)
+  const queueFetches = await mockJobsRoute(
+    comfyPage,
+    QUEUE_ROUTE,
+    scenario.queueBody(jobId)
+  )
+  const fetchesBeforeClose = queueFetches()
+  await ws.close()
+  await expect.poll(queueFetches).toBeGreaterThan(fetchesBeforeClose)
+}
+
+test.describe('WebSocket reconnect with stale job', { tag: '@ui' }, () => {
+  test.describe('app mode skeleton', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.appMode.enterAppModeWithInputs([[KSAMPLER_NODE, 'seed']])
+      await expect(comfyPage.appMode.linearWidgets).toBeVisible()
+    })
+
+    for (const scenario of scenarios) {
+      test(scenario.name, async ({ comfyPage, getWebSocket }) => {
+        const ws = await getWebSocket()
+        const exec = new ExecutionHelper(comfyPage, ws)
+
+        const jobId = await exec.run()
+        exec.executionStart(jobId)
+
+        // Skeleton visibility is the deterministic sync point: it appears
+        // once both `storeJob` (HTTP) and `executionStart` (WS) have been
+        // processed, regardless of arrival order.
+        const firstSkeleton = comfyPage.appMode.outputHistory.skeletons.first()
+        await expect(firstSkeleton).toBeVisible()
+
+        await triggerReconnect(comfyPage, ws, scenario, jobId)
+
+        if (scenario.expectsActiveAfter) {
+          await expect(firstSkeleton).toBeVisible()
+        } else {
+          await expect(comfyPage.appMode.outputHistory.skeletons).toHaveCount(0)
+        }
+      })
+    }
+
+    test('preserves active job when the queue endpoint fails on reconnect', async ({
+      comfyPage,
+      getWebSocket
+    }) => {
+      const ws = await getWebSocket()
+      const exec = new ExecutionHelper(comfyPage, ws)
+
+      const jobId = await exec.run()
+      exec.executionStart(jobId)
+
+      const firstSkeleton = comfyPage.appMode.outputHistory.skeletons.first()
+      await expect(firstSkeleton).toBeVisible()
+
+      await mockJobsRoute(comfyPage, HISTORY_ROUTE, emptyJobsBody)
+
+      // Prime queueStore.runningTasks with the active job — a WS status
+      // event drives GraphView.onStatus -> queueStore.update().
+      const primer = await mockJobsRoute(
+        comfyPage,
+        QUEUE_ROUTE,
+        JSON.stringify(
+          jobsResponse([
+            { id: jobId, status: 'in_progress', create_time: Date.now() }
+          ])
+        )
+      )
+      exec.status(1)
+      await expect.poll(primer).toBeGreaterThanOrEqual(1)
+
+      // Swap to a failing handler so the reconnect-driven fetch 500s.
+      // The fix should preserve runningTasks from the priming call rather
+      // than overwriting it with empty/error state.
+      await comfyPage.page.unroute(QUEUE_ROUTE)
+      const failed = await mockJobsRoute(comfyPage, QUEUE_ROUTE, '{}', 500)
+
+      const before = failed()
+      await ws.close()
+      await expect.poll(failed).toBeGreaterThan(before)
+
+      await expect(firstSkeleton).toBeVisible()
+    })
+  })
+
+  test.describe('vue node executing class', { tag: '@vue-nodes' }, () => {
+    for (const scenario of scenarios) {
+      test(scenario.name, async ({ comfyPage, getWebSocket }) => {
+        const ws = await getWebSocket()
+        const exec = new ExecutionHelper(comfyPage, ws)
+
+        // The executing outline lives on the outer `[data-node-id]`
+        // container, not the inner wrapper.
+        const ksamplerNode = comfyPage.vueNodes.getNodeLocator(KSAMPLER_NODE)
+        await expect(ksamplerNode).toBeVisible()
+
+        const jobId = await exec.run()
+        exec.executionStart(jobId)
+        exec.progressState(jobId, {
+          [KSAMPLER_NODE]: {
+            value: 0,
+            max: 1,
+            state: 'running',
+            node_id: KSAMPLER_NODE,
+            display_node_id: KSAMPLER_NODE,
+            prompt_id: jobId
+          }
+        })
+
+        await expect(ksamplerNode).toHaveClass(EXECUTING_CLASS)
+
+        await triggerReconnect(comfyPage, ws, scenario, jobId)
+
+        if (scenario.expectsActiveAfter) {
+          await expect(ksamplerNode).toHaveClass(EXECUTING_CLASS)
+        } else {
+          await expect(ksamplerNode).not.toHaveClass(EXECUTING_CLASS)
+        }
+      })
+    }
+  })
+})
diff --git a/docs/adr/0008-entity-component-system.md b/docs/adr/0008-entity-component-system.md
index 42b427f0f6..36233903a0 100644
--- a/docs/adr/0008-entity-component-system.md
+++ b/docs/adr/0008-entity-component-system.md
@@ -249,6 +249,7 @@ Companion architecture documents that expand on the design in this ADR:
 | [ECS Lifecycle Scenarios](../architecture/ecs-lifecycle-scenarios.md)                            | Before/after walkthroughs of lifecycle operations (node removal, link creation, etc.)       |
 | [World API and Command Layer](../architecture/ecs-world-command-api.md)                          | How each lifecycle scenario maps to a command in the World API                              |
 | [Subgraph Boundaries and Widget Promotion](../architecture/subgraph-boundaries-and-promotion.md) | Design rationale for modeling subgraphs as node components, not separate entities           |
+| [ADR 0009: Subgraph promoted widgets](0009-subgraph-promoted-widgets-use-linked-inputs.md)       | Follow-up decision for promoted widget identity and value ownership at subgraph boundaries  |
 | [Appendix: Critical Analysis](../architecture/appendix-critical-analysis.md)                     | Independent verification of the accuracy of the architecture documents                      |
 | [Change Tracker](../architecture/change-tracker.md)                                              | Documents the current undo/redo system that ECS cross-cutting concerns will replace         |
 
diff --git a/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs.md b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs.md
new file mode 100644
index 0000000000..daec5aacfb
--- /dev/null
+++ b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs.md
@@ -0,0 +1,328 @@
+# 9. Subgraph promoted widgets use linked inputs
+
+Date: 2026-05-05
+
+Appendices:
+
+- [Before/after flow diagrams](./0009-subgraph-promoted-widgets-use-linked-inputs/before-after-flows.md)
+- [System comparison](./0009-subgraph-promoted-widgets-use-linked-inputs/system-comparison.md)
+- [Removing `disambiguatingSourceNodeId`](./0009-subgraph-promoted-widgets-use-linked-inputs/disambiguating-source-node-id.md)
+
+## Status
+
+Proposed
+
+## Context
+
+Subgraph widget promotion historically had two overlapping representations:
+
+1. `properties.proxyWidgets`, a serialized list of source node/widget tuples;
+2. linked subgraph inputs, where an interior widget-bearing input is exposed
+   through the subgraph boundary.
+
+This created ambiguous ownership. Runtime value reads could collapse to an
+interior source widget, while host `widgets_values` could also carry an
+exterior value. Multiple host instances of the same subgraph could therefore
+stomp one another, and serialization could mutate interior widgets as a
+persistence carrier for exterior values.
+
+The ECS widget migration makes that ambiguity more expensive: widgets are
+becoming entities with component state keyed by stable entity identity, and
+subgraphs are modeled as graph boundary structure rather than a separate
+promotion-specific entity kind.
+
+## Decision
+
+Promoted widgets are represented only as standard linked `SubgraphInput`
+widgets. A promoted widget is a host-scoped widget entity owned by a subgraph
+input on a host `SubgraphNode`. The interior source widget supplies schema,
+type, options, tooltip, and default metadata, but it is not the owner of the
+host value.
+
+Display-only preview surfacing, such as `$$canvas-image-preview`, is not a
+promoted widget. It is a separate preview-exposure system because it has no
+host-owned widget value, does not feed prompt serialization, and often points at
+virtual `serialize: false` pseudo-widgets that may not exist on the source node.
+
+`properties.proxyWidgets` becomes a legacy load-time input only. Successful
+repair consumes entries from `proxyWidgets`; canonical saves do not re-emit
+those entries. The standard serialized representation is the existing subgraph
+interface/input form plus host-node `widgets_values`.
+
+Display-only preview exposures use their own host-node-scoped serialized entry,
+`properties.previewExposures`, instead of `properties.proxyWidgets` and instead
+of linked `SubgraphInput` widgets. Canonical preview-exposure JSON uses preview
+language, not widget language:
+
+```ts
+type PreviewExposure = {
+  name: string
+  sourceNodeId: string
+  sourcePreviewName: string
+}
+```
+
+Host-node scope preserves current behavior where different instances of the
+same subgraph can choose different exposed previews.
+
+The entry intentionally stores only host preview identity and source locator
+identity. `name` is the host-scoped stable identity for this preview exposure,
+analogous to `SubgraphInput.name`; it is not a display label. It is generated
+with existing collision behavior, such as `nextUniqueName(...)`, when an
+exposure is created. Media type, display labels, titles, image/video/audio URLs,
+and other runtime preview details are derived from the current graph and output
+state. Array order is the canonical display order. Preview exposures do not get
+a separate persisted `label` in this slice; if a future rename UX needs one, it
+should follow the same rule as subgraph inputs: `name` is identity and `label`
+is display-only.
+
+Preview exposures are persisted user choices after creation. Packing nodes into
+a subgraph may auto-add recommended preview exposures for supported output
+nodes, and users may explicitly add or remove additional preview exposures
+afterward. Normal load/save does not re-derive previews from node type alone,
+because that would make old workflows change when support for new preview node
+types is added. Unresolved preview exposures remain persisted and inert;
+automatic cleanup does not prune them. They are removed only by explicit user
+action or by destruction/unpacking of the owning host.
+
+Preview exposures compose through nested subgraph hosts by chaining immediate
+boundaries. If an outer subgraph wants to show a preview exposed by an inner
+subgraph host, the outer `previewExposures` entry points at the immediate inner
+`SubgraphNode`, and `sourcePreviewName` names the inner host's preview-exposure
+identity, not the deepest interior preview name. Runtime preview resolution may
+then follow the inner host's own preview exposures to find media. Canonical JSON
+does not persist flattened deep paths, because deep paths would couple host UI
+state to private nested graph internals.
+
+## Identity and value ownership
+
+- UI/value identity is host-scoped: host node locator plus
+  `SubgraphInput.name`.
+- Host-scoped identity means the host `SubgraphNode` instance within its
+  containing `graphScope`; the interior source node is not the state or
+  persistence owner.
+- `SubgraphInput.name` is the stable internal identity.
+- `SubgraphInput.label` / `localized_name` are display-only.
+- `SubgraphInput.id` may be used for slot-instance reconciliation, not as the
+  persisted widget value key.
+- Source node/widget identity remains metadata for diagnostics, missing-model
+  lookup, schema projection, and migration only.
+- The host/exterior value wins over the interior/source value during repair,
+  persistence, and prompt serialization.
+
+This follows the existing widget/slot convention: `name` is identity, `label`
+is display.
+
+Promoted-widget value state is a host-scoped sparse overlay over source-widget
+metadata and defaults. The source widget remains the schema/default provider;
+host value state is materialized only when the exterior value differs from the
+effective source default or when restored from persisted host state. Canonical
+save/load must not eagerly mirror source defaults or use interior widgets as
+persistence carriers.
+
+## Forward migration
+
+Loading a workflow with legacy `proxyWidgets` runs a one-way repair:
+
+1. Parse `properties.proxyWidgets` with the existing Zod-inferred tuple type.
+2. Invalid raw `proxyWidgets` data logs `console.error`, does not throw, and is
+   not quarantined.
+3. Build a multi-pass association map before mutation:
+   - normalized legacy proxy entry;
+   - projected legacy promoted-widget order;
+   - host `widgets_values` value, preserving sparse holes;
+   - repair strategy or failure reason;
+   - whether the entry is a value widget or display-only preview exposure.
+4. Defer mutations until node IDs/entity IDs are stable and the subgraph graph
+   is configured.
+5. On flush, re-resolve against current graph state, because clone/paste/load
+   flows may have remapped or created nodes and links.
+6. If already represented by a linked `SubgraphInput`, consider the legacy
+   entry resolved and consume it.
+7. Otherwise repair through existing subgraph input/link systems.
+8. If the entry is display-only preview surfacing, migrate it into the separate
+   preview-exposure representation instead of creating a linked `SubgraphInput`.
+9. If value-widget repair fails, write inert quarantine metadata and warn.
+
+The repair is idempotent. Pending plans store tuple/value data and re-check the
+current graph before applying mutations.
+
+Legacy entries are classified as preview exposures when either:
+
+- the legacy source name starts with `$$`; or
+- the source node resolves to a matching pseudo-preview widget, such as a
+  `serialize: false` preview/video/audio UI widget.
+
+Everything else is treated as a value-widget promotion candidate. An unresolved
+preview-shaped entry remains inert at runtime and is still persisted, because
+preview-capable pseudo-widgets and output media can be removed and re-added
+dynamically. It is not quarantined because it has no user value to preserve. A
+non-`$$` entry that cannot resolve to a source widget is a value-widget repair
+failure and follows the quarantine path unless it can resolve to a
+pseudo-preview widget.
+
+## Proxy widget error quarantine
+
+Valid legacy entries that cannot be repaired are persisted in
+`properties.proxyWidgetErrorQuarantine`. Quarantined entries are inert: they do
+not hydrate runtime promoted widgets, do not participate in execution, and are
+not used for app-mode/favorites identity.
+
+Quarantine entries preserve enough information to avoid data loss and support
+future tooling:
+
+```ts
+type ProxyWidgetErrorQuarantineEntry = {
+  originalEntry: ProxyWidgetTuple
+  reason:
+    | 'missingSourceNode'
+    | 'missingSourceWidget'
+    | 'missingSubgraphInput'
+    | 'ambiguousSubgraphInput'
+    | 'unlinkedSourceWidget'
+    | 'primitiveBypassFailed'
+  hostValue?: TWidgetValue
+  attemptedAtVersion: 1
+}
+```
+
+Unresolved legacy UI selections/favorites are dropped with `console.warn`.
+Workflow-level promotion/value intent is preserved by
+`proxyWidgetErrorQuarantine`, not by a second UI quarantine format.
+
+## Primitive-node repair
+
+Legacy `proxyWidgets` may point at `PrimitiveNode` outputs. Primitive nodes
+serve nearly the same purpose as subgraph inputs: they provide a widget value to
+one or more target widget inputs. The migration repairs this expected legacy
+shape in the first migration rather than quarantining it by default.
+
+Primitive repair:
+
+- coalesces exact duplicate legacy entries during planning;
+- uses the primitive node's user title as the base input name when the node was
+  renamed, otherwise the primitive output widget name;
+- applies existing naming behavior and `nextUniqueName(...)` for collisions;
+- uses the existing primitive merge/config compatibility logic;
+- creates one `SubgraphInput` for the primitive fanout;
+- reconnects every former primitive output target to that input in target
+  order, using standard connect/disconnect APIs;
+- applies the host value when one exists, otherwise seeds from the source
+  primitive value;
+- leaves the primitive node and its widget value in place, but disconnected and
+  inert.
+
+Primitive repair is all-or-quarantine. If any target cannot be validated or
+reconnected, the migration does not leave a partial rewrite; it quarantines the
+entry with `hostValue` and logs the reason.
+
+## Serialization
+
+After repair/quarantine:
+
+- `properties.proxyWidgets` is omitted for repaired entries;
+- display-only preview entries are omitted from `properties.proxyWidgets` and
+  emitted through `properties.previewExposures`;
+- `properties.proxyWidgetErrorQuarantine` carries unrepaired valid entries;
+- preview exposures do not carry quarantine values because they do not own user
+  values; unresolved preview exposures remain inert in `previewExposures`;
+- host `widgets_values` contains host-owned values only for canonical host
+  widgets, not source-owned defaults or interior persistence copies;
+- quarantined legacy values live in `proxyWidgetErrorQuarantine.hostValue`;
+- array-form `widgets_values` remains for now.
+
+Preview exposures are display-only UI metadata. They drive host canvas/app-mode
+preview rendering, but they do not create prompt inputs, do not create
+`widgets_values`, do not alter node execution order, do not become executable
+graph edges, and do not participate in prompt serialization. Runtime mapping
+from backend `display_node`/output messages to a host preview exposure is a UI
+projection only.
+
+The old `SubgraphNode.serialize()` behavior that copied exterior promoted
+values into connected interior widgets is removed. A temporary TODO should mark
+that removal point until the migration is proven stable. Host values are
+serialized through standard subgraph-input widgets instead.
+
+Longer term, `widgets_values` should move from array order to an object/map
+keyed by stable widget name, but that migration is out of scope for this
+decision.
+
+## App mode, builder, and favorites
+
+The runtime migration and UI identity migration ship in the same slice. The UI
+must not persist promoted selections by source node/widget identity after this
+change.
+
+Canonical UI identity is:
+
+```ts
+type PromotedWidgetUiIdentity = {
+  hostNodeLocator: string
+  subgraphInputName: string
+}
+```
+
+Legacy source-identity selections are migrated when they resolve through the
+standard input created or confirmed by the migration. Unresolved selections are
+dropped with a warning.
+
+Preview exposure output selections are also host-scoped and must not persist
+interior source node identity. Canonical preview/output identity is:
+
+```ts
+type PreviewExposureUiIdentity = {
+  hostNodeLocator: string
+  previewName: string
+}
+```
+
+The UI references the explicit preview exposure itself. This keeps subgraphs
+opaque: consumers select the host boundary contract, not the interior node that
+currently supplies media. Legacy output selections that refer to interior
+preview source nodes may migrate if they resolve to a preview-exposure chain;
+otherwise they are dropped with `console.warn`. There is no separate preview UI
+quarantine.
+
+## PromotionStore
+
+`PromotionStore` becomes vestigial. It may remain temporarily as a derived
+runtime compatibility/index layer for existing consumers, but it is not
+serialized authority, must not create promotions without linked
+`SubgraphInput`s, and should be removed once consumers query the standard graph
+interface directly.
+
+## Considered options
+
+### Keep `proxyWidgets` as canonical serialized topology
+
+Rejected. This preserves two representations for the same concept and keeps
+source-widget identity in the value-ownership path.
+
+### Preserve bare promoted widgets as degraded runtime state
+
+Rejected. This would avoid some migration complexity, but it perpetuates the
+ambiguity that caused host/source value bugs and makes ECS identity less clear.
+
+### Quarantine primitive-node promotions by default
+
+Rejected. Primitive-node proxy promotions are expected legacy workflows, and
+quarantining them would break users unnecessarily. They are repaired by bypassing
+the primitive node when the repair can be validated all-or-nothing.
+
+### Migrate `widgets_values` to object/map form now
+
+Rejected for this slice. Name-keyed object form is the desired long-term
+direction, but combining it with the promotion migration increases blast radius
+for existing workflow consumers that still assume array order.
+
+## Consequences
+
+- Promoted widget values become host-instance-owned and ECS-compatible.
+- Source widgets remain metadata/default providers, not persistence carriers.
+- Legacy workflows are repaired toward one standard representation.
+- Quarantine preserves unrepaired valid legacy data without reintroducing bare
+  runtime promotion.
+- Primitive fanout repair is more complex, but avoids breaking common existing
+  workflows.
+- UI code must migrate with the runtime migration to avoid mixed identity states.
+- `PromotionStore` has a clear removal path.
diff --git a/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/before-after-flows.md b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/before-after-flows.md
new file mode 100644
index 0000000000..2f8dcd7d08
--- /dev/null
+++ b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/before-after-flows.md
@@ -0,0 +1,210 @@
+# Appendix: Before and after flows
+
+This appendix visualizes the ownership and migration flows described in
+[ADR 0009](../0009-subgraph-promoted-widgets-use-linked-inputs.md).
+
+## Before: proxy widgets and linked inputs overlap
+
+Historically, promoted widgets could be represented both as serialized
+`properties.proxyWidgets` entries and as linked subgraph inputs. Runtime value
+reads could collapse back to the interior source widget, while host
+`widgets_values` could also carry an exterior value for the same promoted UI.
+
+```mermaid
+flowchart TD
+  workflow[Workflow JSON] --> proxyWidgets[properties.proxyWidgets]
+  workflow --> hostValues[host widgets_values]
+  proxyWidgets --> promotionStore[PromotionStore / promotion runtime]
+  promotionStore --> sourceWidget[Interior source widget]
+  linkedInput[Linked SubgraphInput] --> hostWidget[Host promoted widget]
+  sourceWidget --> hostWidget
+  hostValues --> hostWidget
+  hostWidget --> prompt[Prompt serialization]
+  hostWidget -. may copy value back .-> sourceWidget
+  sourceWidget -. shared by host instances .-> otherHost[Another host instance]
+
+  classDef legacy fill:#fff3cd,stroke:#a66f00,color:#332200
+  classDef ambiguous fill:#f8d7da,stroke:#842029,color:#330000
+  classDef canonical fill:#d1e7dd,stroke:#0f5132,color:#052e16
+
+  class proxyWidgets,promotionStore legacy
+  class sourceWidget,hostValues ambiguous
+  class linkedInput,hostWidget canonical
+```
+
+Key problems in the old flow:
+
+- `properties.proxyWidgets` and linked `SubgraphInput` widgets could describe
+  the same promotion.
+- Interior source widgets supplied both schema metadata and, in some flows,
+  persisted host values.
+- Multiple host instances of the same subgraph could stomp one another through
+  the shared interior widget value.
+- Display-only previews were mixed into widget-promotion language even though
+  they do not own values or feed prompt serialization.
+
+## After: linked inputs are the promoted-widget boundary
+
+Promoted value widgets are now represented only as standard linked
+`SubgraphInput` widgets. The source widget remains the schema/default provider,
+but the host `SubgraphNode` owns the promoted value.
+
+```mermaid
+flowchart TD
+  workflow[Workflow JSON] --> subgraphInterface[Subgraph interface / inputs]
+  workflow --> hostValues[host widgets_values]
+  subgraphInterface --> subgraphInput[SubgraphInput.name]
+  subgraphInput --> hostWidget[Host-scoped widget entity]
+  hostValues --> hostWidget
+  sourceWidget[Interior source widget] --> schema[Schema, type, options, tooltip, default]
+  schema --> hostWidget
+  hostWidget --> prompt[Prompt serialization]
+
+  hostIdentity[Host node locator + SubgraphInput.name] --> hostWidget
+  sourceWidget -. metadata only .-> diagnostics[Diagnostics / lookup / migration]
+  sourceWidget -. no host value ownership .-> schema
+
+  classDef owner fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef metadata fill:#cff4fc,stroke:#055160,color:#032830
+  classDef persisted fill:#e2e3e5,stroke:#41464b,color:#212529
+
+  class subgraphInterface,subgraphInput,hostWidget,hostIdentity owner
+  class sourceWidget,schema,diagnostics metadata
+  class workflow,hostValues persisted
+```
+
+Canonical ownership after the migration:
+
+- UI/value identity is host-scoped: host node locator plus
+  `SubgraphInput.name`.
+- `SubgraphInput.name` is stable identity; labels and localized names are
+  display-only.
+- Host values win during repair, persistence, and prompt serialization.
+- Source widgets provide metadata and defaults only.
+- Canonical saves omit repaired `properties.proxyWidgets` entries.
+
+## Legacy load migration
+
+Loading a workflow with legacy `proxyWidgets` performs an idempotent repair. The
+repair builds a plan before mutating graph state, then re-resolves against the
+current graph when node IDs and links are stable.
+
+```mermaid
+flowchart TD
+  start[Load workflow] --> parse{Parse properties.proxyWidgets}
+  parse -->|invalid raw data| invalid[console.error and ignore]
+  parse -->|valid tuples| plan[Build repair plan]
+  plan --> classify{Classify entry}
+
+  classify -->|value widget| valueRepair{Already linked SubgraphInput?}
+  valueRepair -->|yes| consume[Consume legacy proxy entry]
+  valueRepair -->|no| repair[Repair through subgraph input/link systems]
+  repair --> repairResult{Repair succeeded?}
+  repairResult -->|yes| consume
+  repairResult -->|no| quarantine[Persist proxyWidgetErrorQuarantine]
+
+  classify -->|primitive fanout| primitive[Validate all primitive targets]
+  primitive --> primitiveResult{All targets reconnectable?}
+  primitiveResult -->|yes| primitiveRepair[Create one SubgraphInput and reconnect fanout]
+  primitiveRepair --> consume
+  primitiveResult -->|no| quarantine
+
+  classify -->|display-only preview| preview[Create / keep previewExposures entry]
+  preview --> consume
+
+  consume --> save[Canonical save]
+  quarantine --> save
+  save --> omit[Omit repaired entries from proxyWidgets]
+  save --> keepQuarantine[Persist unrepaired value intent in quarantine]
+  save --> keepPreview[Persist previews in previewExposures]
+
+  classDef ok fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef warn fill:#fff3cd,stroke:#a66f00,color:#332200
+  classDef error fill:#f8d7da,stroke:#842029,color:#330000
+  classDef neutral fill:#e2e3e5,stroke:#41464b,color:#212529
+
+  class consume,repair,primitiveRepair,preview,save,omit,keepPreview ok
+  class plan,classify,valueRepair,primitive,primitiveResult,repairResult neutral
+  class quarantine,keepQuarantine warn
+  class invalid error
+```
+
+## Preview exposures are separate from value widgets
+
+Display-only previews, such as `$$canvas-image-preview`, are not promoted
+widgets. They have host-scoped serialized identity, but they do not create
+prompt inputs, do not create `widgets_values`, and do not own user values.
+
+```mermaid
+flowchart TD
+  hostNode[Host SubgraphNode] --> previewExposures[properties.previewExposures]
+  previewExposures --> exposure[PreviewExposure.name]
+  exposure --> sourceLocator[sourceNodeId + sourcePreviewName]
+  sourceLocator --> runtimePreview[Runtime preview/output state]
+  runtimePreview --> hostCanvas[Host canvas / app-mode preview]
+
+  exposure --> uiIdentity[hostNodeLocator + previewName]
+  runtimePreview -. UI projection only .-> hostCanvas
+  previewExposures -. no prompt input .-> noPrompt[No prompt serialization]
+  previewExposures -. no value widget .-> noValue[No widgets_values entry]
+  previewExposures -. no graph edge .-> noEdge[No executable graph edge]
+
+  classDef preview fill:#cff4fc,stroke:#055160,color:#032830
+  classDef noValue fill:#f8d7da,stroke:#842029,color:#330000
+  classDef persisted fill:#e2e3e5,stroke:#41464b,color:#212529
+
+  class previewExposures,exposure,sourceLocator,runtimePreview,hostCanvas,uiIdentity preview
+  class noPrompt,noValue,noEdge noValue
+  class hostNode persisted
+```
+
+For nested subgraphs, preview exposures chain across immediate host boundaries
+instead of persisting flattened deep paths.
+
+```mermaid
+flowchart LR
+  outerHost[Outer SubgraphNode] --> outerExposure[Outer previewExposures entry]
+  outerExposure --> innerHost[Immediate inner SubgraphNode]
+  innerHost --> innerExposure[Inner previewExposures entry]
+  innerExposure --> deepestPreview[Interior preview source]
+  deepestPreview --> media[Resolved media]
+
+  outerExposure -. sourcePreviewName names inner preview identity .-> innerExposure
+  outerExposure -. does not persist deep private path .-> opaque[Subgraph internals remain opaque]
+
+  classDef boundary fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef preview fill:#cff4fc,stroke:#055160,color:#032830
+  classDef note fill:#fff3cd,stroke:#a66f00,color:#332200
+
+  class outerHost,innerHost boundary
+  class outerExposure,innerExposure,deepestPreview,media preview
+  class opaque note
+```
+
+## Serialization summary
+
+```mermaid
+flowchart TD
+  canonical[Canonical serialized SubgraphNode] --> inputs[Subgraph interface / inputs]
+  canonical --> values[widgets_values for host-owned values]
+  canonical --> previews[properties.previewExposures]
+  canonical --> quarantine[properties.proxyWidgetErrorQuarantine]
+  canonical -. omits repaired entries .-> noProxy[No canonical proxyWidgets]
+
+  inputs --> valueWidgets[Promoted value widgets]
+  values --> valueWidgets
+  previews --> previewUi[Display-only preview UI]
+  quarantine --> futureTooling[Future recovery tooling]
+
+  valueWidgets --> prompt[Prompt serialization]
+  previewUi -. not serialized into prompt .-> prompt
+  quarantine -. inert .-> prompt
+
+  classDef canonical fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef inert fill:#fff3cd,stroke:#a66f00,color:#332200
+  classDef removed fill:#f8d7da,stroke:#842029,color:#330000
+
+  class inputs,values,valueWidgets,prompt,canonical canonical
+  class previews,previewUi,quarantine,futureTooling inert
+  class noProxy removed
+```
diff --git a/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/disambiguating-source-node-id.md b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/disambiguating-source-node-id.md
new file mode 100644
index 0000000000..f9cb51b1f4
--- /dev/null
+++ b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/disambiguating-source-node-id.md
@@ -0,0 +1,147 @@
+# Appendix: Removing `disambiguatingSourceNodeId`
+
+This appendix explains where the existing promotion system needs
+`disambiguatingSourceNodeId`, why that need appears, and how the canonical form
+chosen by [ADR 0009](../0009-subgraph-promoted-widgets-use-linked-inputs.md)
+removes the pattern from promoted-widget identity.
+
+## Why the disambiguator exists
+
+The legacy promotion model identifies a promoted widget by source location:
+
+```ts
+type PromotedWidgetSource = {
+  sourceNodeId: string
+  sourceWidgetName: string
+  disambiguatingSourceNodeId?: string
+}
+```
+
+`sourceNodeId` is the immediate interior node visible from the host subgraph.
+That is not always the original widget owner. When promotions pass through
+nested subgraphs, two promoted widgets can have the same immediate
+`sourceNodeId` and `sourceWidgetName` while pointing at different leaf widgets.
+`disambiguatingSourceNodeId` carries the deepest source node ID so the runtime
+can choose the right promoted view.
+
+```mermaid
+flowchart TD
+  outerHost[Outer host SubgraphNode] --> middleNode[Interior middle SubgraphNode]
+  middleNode --> middleWidgetA[Promoted widget view: text]
+  middleNode --> middleWidgetB[Promoted widget view: text]
+  middleWidgetA --> leafA[Leaf source node 17 / widget text]
+  middleWidgetB --> leafB[Leaf source node 42 / widget text]
+
+  oldKeyA[Old key: middleNodeId + text + disambiguatingSourceNodeId 17]
+  oldKeyB[Old key: middleNodeId + text + disambiguatingSourceNodeId 42]
+  middleWidgetA -. requires .-> oldKeyA
+  middleWidgetB -. requires .-> oldKeyB
+
+  classDef host fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef ambiguous fill:#fff3cd,stroke:#a66f00,color:#332200
+  classDef leaf fill:#cff4fc,stroke:#055160,color:#032830
+
+  class outerHost host
+  class middleNode,middleWidgetA,middleWidgetB,oldKeyA,oldKeyB ambiguous
+  class leafA,leafB leaf
+```
+
+The disambiguator is therefore not a domain concept. It is compensating for an
+identity model that asks host UI state to identify private nested internals.
+
+## Existing places that need it
+
+| Area                         | Current use of `disambiguatingSourceNodeId`                                                                                                   | Ambiguity being patched                                                                             |
+| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| Promotion source types       | `PromotedWidgetSource` and `PromotedWidgetView` carry the optional field.                                                                     | Source identity needs more than immediate node ID plus widget name for nested promoted views.       |
+| Concrete widget resolution   | `findWidgetByIdentity(...)` matches promoted views by `(disambiguatingSourceNodeId ?? sourceNodeId)` when a source node ID is supplied.       | Multiple promoted views under the same intermediate node can share a widget name.                   |
+| Legacy proxy normalization   | Prefixed legacy names such as `123:widget_name` are converted into structured source identity and tested with candidate disambiguators.       | Old serialized names encode leaf identity inside the widget name string.                            |
+| Promotion store keys         | `makePromotionEntryKey(...)`, `isPromoted(...)`, and `demote(...)` include the field in equality.                                             | Store-level uniqueness would collapse distinct nested promotions without the leaf ID.               |
+| Linked promotion propagation | `SubgraphNode._resolveLinkedPromotionBySubgraphInput(...)` preserves the leaf ID when a linked input targets an inner subgraph promoted view. | The outer host otherwise sees only the immediate inner `SubgraphNode` and the promoted widget name. |
+| Subgraph editor UI           | The editor uses the field when resolving active widgets and when writing reordered/toggled promotions back to the store.                      | UI list operations must not merge same-name promoted views from different leaves.                   |
+
+## New promoted-widget identity
+
+ADR 0009 moves promoted value identity to the host boundary:
+
+```ts
+type PromotedWidgetUiIdentity = {
+  hostNodeLocator: string
+  subgraphInputName: string
+}
+```
+
+The canonical widget is owned by a `SubgraphInput` on the host
+`SubgraphNode`. The host widget no longer needs to identify the deepest source
+node to preserve value identity. The source widget is consulted for schema,
+defaults, diagnostics, and migration, but it is not the value owner.
+
+```mermaid
+flowchart TD
+  host[Host SubgraphNode] --> inputA[SubgraphInput.name: prompt]
+  host --> inputB[SubgraphInput.name: negative_prompt]
+  inputA --> hostWidgetA[Host-owned widget entity]
+  inputB --> hostWidgetB[Host-owned widget entity]
+
+  hostWidgetA -. schema/default metadata .-> sourceA[Interior source widget text]
+  hostWidgetB -. schema/default metadata .-> sourceB[Interior source widget text]
+
+  identityA[Identity: hostNodeLocator + prompt] --> hostWidgetA
+  identityB[Identity: hostNodeLocator + negative_prompt] --> hostWidgetB
+  sourceA -. not part of host value key .-> identityA
+  sourceB -. not part of host value key .-> identityB
+
+  classDef owner fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef metadata fill:#cff4fc,stroke:#055160,color:#032830
+  classDef removed fill:#f8d7da,stroke:#842029,color:#330000
+
+  class host,inputA,inputB,hostWidgetA,hostWidgetB,identityA,identityB owner
+  class sourceA,sourceB metadata
+```
+
+This is the same rule the subgraph interface already uses: `name` is stable
+identity, and `label` / `localized_name` are display-only.
+
+## How the new form removes each need
+
+| Previous disambiguation site                      | New canonical replacement                                                                                                         |
+| ------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `PromotedWidgetSource.disambiguatingSourceNodeId` | Host value identity is `hostNodeLocator + SubgraphInput.name`; source locator fields become migration/diagnostic metadata only.   |
+| `PromotedWidgetView.disambiguatingSourceNodeId`   | Host-scoped widget entities are derived from subgraph inputs, not from promoted views chained through nested source widgets.      |
+| `findWidgetByIdentity(...)` leaf matching         | Runtime value lookup starts from the host input identity; source traversal is metadata resolution, not value identity resolution. |
+| Legacy prefixed widget-name normalization         | Load migration consumes legacy source-shaped entries and writes standard subgraph input state or quarantine metadata.             |
+| PromotionStore source-key equality                | `PromotionStore` becomes a temporary derived index; canonical consumers query subgraph inputs directly.                           |
+| Linked promotion propagation across nested hosts  | Nested value composition is represented boundary-by-boundary by linked subgraph inputs with stable names.                         |
+| Subgraph editor active widget matching            | Editor state can operate on host boundary entries instead of matching leaf source widgets through same-name promoted views.       |
+
+## Boundary-by-boundary nested flow
+
+The new form avoids flattened deep source paths. Each host boundary exposes its
+own named input, and the next outer host links to that immediate boundary
+contract.
+
+```mermaid
+flowchart LR
+  leaf[Leaf node widget] --> innerInput[Inner SubgraphInput.name: text]
+  innerInput --> innerHostWidget[Inner host-owned widget]
+  innerHostWidget --> outerInput[Outer SubgraphInput.name: prompt]
+  outerInput --> outerHostWidget[Outer host-owned widget]
+
+  innerIdentity[Inner value key: innerHost + text] --> innerHostWidget
+  outerIdentity[Outer value key: outerHost + prompt] --> outerHostWidget
+  leaf -. schema/default source .-> innerHostWidget
+  leaf -. not persisted as outer value key .-> outerIdentity
+
+  classDef boundary fill:#d1e7dd,stroke:#0f5132,color:#052e16
+  classDef source fill:#cff4fc,stroke:#055160,color:#032830
+  classDef note fill:#fff3cd,stroke:#a66f00,color:#332200
+
+  class innerInput,innerHostWidget,outerInput,outerHostWidget,innerIdentity,outerIdentity boundary
+  class leaf source
+```
+
+Because each layer has its own stable `SubgraphInput.name`, two same-name leaf
+widgets no longer require a persisted leaf-node disambiguator at the outer host.
+If the user exposes both, the collision is resolved when the host inputs are
+created by assigning distinct input names with the existing unique-name
+behavior.
diff --git a/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/system-comparison.md b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/system-comparison.md
new file mode 100644
index 0000000000..82265820e5
--- /dev/null
+++ b/docs/adr/0009-subgraph-promoted-widgets-use-linked-inputs/system-comparison.md
@@ -0,0 +1,37 @@
+# Appendix: System comparison
+
+This appendix compares the legacy promoted-widget systems with the canonical
+linked-input model chosen by
+[ADR 0009](../0009-subgraph-promoted-widgets-use-linked-inputs.md).
+
+| Concern                    | Legacy `properties.proxyWidgets` promotions                                                              | Linked `SubgraphInput` promotions before migration                                               | New canonical linked-input system                                                                           |
+| -------------------------- | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------- |
+| Serialized authority       | `properties.proxyWidgets` stores source node/widget tuples as promotion topology.                        | Subgraph interface/input links can also represent the same exposed widget.                       | Subgraph interface/input links are the only canonical topology for promoted value widgets.                  |
+| Load-time role             | Hydrates promoted widgets directly from legacy tuples.                                                   | May already describe the promoted widget, creating overlap with `proxyWidgets`.                  | Existing linked inputs are accepted as resolved; legacy tuples are consumed by repair or quarantined.       |
+| Save-time role             | Could be re-emitted as promotion state.                                                                  | Serialized as normal subgraph interface data.                                                    | Repaired `proxyWidgets` entries are omitted; standard subgraph inputs plus host `widgets_values` are saved. |
+| Value owner                | Ambiguous: host `widgets_values` and the interior source widget could both carry the value.              | Closer to the desired boundary model, but still coexisted with source/proxy ownership paths.     | Host `SubgraphNode` owns value state through host-scoped widget identity.                                   |
+| Schema/default provider    | Interior source widget provides schema and may also become persistence carrier.                          | Interior source widget provides source metadata through the link.                                | Interior source widget provides schema, type, options, tooltip, and defaults only.                          |
+| UI identity                | Often persisted by source node/widget identity.                                                          | Can use subgraph input identity, but mixed states still exist while proxy identity remains.      | Host node locator plus `SubgraphInput.name`.                                                                |
+| Display label handling     | Source widget identity and display concerns can blur.                                                    | Uses existing subgraph input naming conventions.                                                 | `SubgraphInput.name` is stable identity; `label` / `localized_name` are display-only.                       |
+| Multiple host instances    | Risk of host instances stomping one another through shared interior values.                              | Better host boundary shape, but overlap with proxy/source value paths can reintroduce ambiguity. | Host-instance-owned sparse overlay prevents shared interior widget value stomping.                          |
+| Prompt serialization       | May read values through promoted runtime state that can collapse to source widgets.                      | Can serialize through standard subgraph input widgets when used consistently.                    | Promoted values serialize only through standard host-owned subgraph-input widgets.                          |
+| Interior mutation on save  | Existing `SubgraphNode.serialize()` behavior could copy exterior values into connected interior widgets. | Could still be affected by legacy copy-back behavior.                                            | Copy-back is removed; source widgets are not persistence carriers.                                          |
+| Primitive-node promotions  | Legacy tuples may point at `PrimitiveNode` outputs.                                                      | Not the canonical primitive fanout representation by itself.                                     | Repaired all-or-nothing into one `SubgraphInput` that reconnects validated fanout targets.                  |
+| Invalid or unresolved data | Invalid data could sit in legacy promotion state or fail repair paths.                                   | Missing linked inputs can be ambiguous when proxy data exists.                                   | Invalid raw data logs and is ignored; unrepaired valid value entries go to `proxyWidgetErrorQuarantine`.    |
+| Display-only previews      | Often mixed into `proxyWidgets` despite not being value widgets.                                         | Linked inputs are inappropriate because previews do not own values or prompt inputs.             | Separate host-scoped `properties.previewExposures` entries model preview UI only.                           |
+| Preview persistence        | Preview selections can depend on source preview/widget-like identity.                                    | No clean distinction from promoted widget inputs.                                                | Preview identity is host node locator plus `previewName`; unresolved previews stay inert and persisted.     |
+| Nested preview behavior    | Deep source identity can leak through host UI state.                                                     | Linked value inputs do not model display-only preview composition.                               | Preview exposures chain across immediate subgraph host boundaries; deep private paths are not persisted.    |
+| ECS compatibility          | Weak: value identity can depend on source widget tuples and mutable interior widgets.                    | Partial: linked inputs fit boundary modeling, but duplicate authority remains.                   | Strong: host-scoped widget entity identity maps cleanly to ECS component state.                             |
+| Long-term status           | Legacy load-time input only.                                                                             | Becomes the standard representation once overlap is removed.                                     | Canonical system; `PromotionStore` becomes a temporary derived compatibility/index layer.                   |
+
+## Practical migration summary
+
+| Legacy shape                                                               | New result                                                                                                 |
+| -------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| Valid `proxyWidgets` entry already represented by a linked `SubgraphInput` | Entry is consumed; the existing linked input remains canonical.                                            |
+| Valid value-widget `proxyWidgets` entry without a linked input             | Repair creates or reconnects standard subgraph input/link state.                                           |
+| Valid primitive fanout entry                                               | Repair creates one `SubgraphInput`, reconnects all validated targets, and leaves the primitive node inert. |
+| Valid value-widget entry that cannot be repaired                           | Entry is persisted in `properties.proxyWidgetErrorQuarantine` with the host value when available.          |
+| Preview-shaped legacy entry                                                | Entry is migrated into `properties.previewExposures`, not a linked input.                                  |
+| Unresolved preview exposure                                                | Entry remains inert in `previewExposures`; it is not quarantined because it owns no user value.            |
+| Invalid raw `proxyWidgets` data                                            | Logs `console.error`, does not throw, and is not quarantined.                                              |
diff --git a/docs/architecture/ecs-migration-plan.md b/docs/architecture/ecs-migration-plan.md
index a3ba8fbe53..e6a1d1d61a 100644
--- a/docs/architecture/ecs-migration-plan.md
+++ b/docs/architecture/ecs-migration-plan.md
@@ -231,6 +231,11 @@ assigning synthetic widget IDs (via `lastWidgetId` counter on LGraphState).
 the ID mapping — widgets currently lack independent IDs, so the bridge must
 maintain a `(nodeId, widgetName) -> WidgetEntityId` lookup.
 
+**Promoted-widget caveat:** ADR 0009 assigns promoted value widgets a
+host-boundary identity (`host node locator + SubgraphInput.name`). Interior
+source node/widget identity is preserved only as migration and diagnostic
+metadata.
+
 ### 2c. Read-only bridge for Node metadata
 
 Populate `NodeType`, `NodeVisual`, `Properties`, `Execution` components by
@@ -663,6 +668,10 @@ The 6 proto-ECS stores use 6 different keying strategies:
 | NodeOutputStore         | `"${subgraphId}:${nodeId}"`       |
 | SubgraphNavigationStore | subgraphId or `'root'`            |
 
+ADR 0009 refines the promoted-widget target: promoted value widgets should use
+host boundary identity (`host node locator + SubgraphInput.name`), not interior
+source node/widget identity.
+
 The World unifies these under branded entity IDs. But stores that use
 composite keys (e.g., `nodeId:widgetName`) reflect a genuine structural
 reality — a widget is identified by its relationship to a node. Synthetic
diff --git a/docs/architecture/proto-ecs-stores.md b/docs/architecture/proto-ecs-stores.md
index 0831f0535d..f5f09ccb50 100644
--- a/docs/architecture/proto-ecs-stores.md
+++ b/docs/architecture/proto-ecs-stores.md
@@ -17,6 +17,10 @@ Six stores extract entity state out of class instances into centralized, queryab
 | NodeOutputStore         | Execution results   | `nodeLocatorId`               | `"${subgraphId}:${nodeId}"`       | Output data, preview URLs     |
 | SubgraphNavigationStore | Canvas viewport     | `subgraphId`                  | `subgraphId` or `'root'`          | LRU viewport cache            |
 
+ADR 0009 refines promoted-widget identity: promoted value widgets are keyed by
+the host boundary (`host node locator + SubgraphInput.name`), while interior
+source node/widget identity is migration and diagnostic metadata only.
+
 ## 2. WidgetValueStore
 
 **File:** `src/stores/widgetValueStore.ts`
@@ -254,6 +258,9 @@ Each store invents its own identity scheme:
 | NodeOutputStore  | `"${subgraphId}:${nodeId}"`       | Composite string        | No         |
 
 In the ECS target, all of these would use branded entity IDs (`WidgetEntityId`, `NodeEntityId`, etc.) with compile-time cross-kind protection.
+For promoted value widgets, ADR 0009 narrows the target key to host boundary
+identity (`host node locator + SubgraphInput.name`) instead of interior source
+identity.
 
 ## 6. Extraction Map
 
diff --git a/docs/architecture/subgraph-boundaries-and-promotion.md b/docs/architecture/subgraph-boundaries-and-promotion.md
index 51d7b8b941..0426a8afe1 100644
--- a/docs/architecture/subgraph-boundaries-and-promotion.md
+++ b/docs/architecture/subgraph-boundaries-and-promotion.md
@@ -404,26 +404,21 @@ Whichever candidate is chosen:
   instance-specific state beyond inputs — must remain reachable. This is a
   constraint, not a current requirement.
 
-### Recommendation and decision criteria
+### Decision
 
-**Lean toward A.** It eliminates an entire subsystem by recognizing a structural
-truth: promotion is adding a typed input to a function signature. The type
-system already handles widget creation for typed inputs. Building a parallel
-mechanism for "promoted widgets" is building a second, narrower version of
-something the system already does.
+[ADR 0009](../adr/0009-subgraph-promoted-widgets-use-linked-inputs.md)
+chooses Candidate A for promoted value widgets. It eliminates an entire
+subsystem by recognizing a structural truth: promotion is adding a typed input
+to a function signature. The type system already handles widget creation for
+typed inputs. Building a parallel mechanism for "promoted widgets" is building
+a second, narrower version of something the system already does.
 
 The cost of A is a migration path for existing `proxyWidgets` serialization. On
-load, the `SerializationSystem` converts `proxyWidgets` entries into interface
-inputs and boundary links. This is a one-time ratchet conversion — once
-loaded and re-saved, the workflow uses the new format.
-
-**Choose B if** the team determines that promoted widgets must remain
-visually or behaviorally distinct from normal input widgets in ways the type →
-widget mapping cannot express, or if the `proxyWidgets` migration burden exceeds
-the current release cycle's capacity.
-
-**Decision needed before** Phase 3 of the ECS migration, when systems are
-introduced and the widget/connectivity architecture solidifies.
+load, the `SerializationSystem` converts value-widget `proxyWidgets` entries
+into interface inputs and boundary links. Once loaded and re-saved, the workflow
+uses the new format. ADR 0009 separates display-only preview exposures from
+promoted value widgets; those previews use their own host-scoped serialized
+representation instead of linked `SubgraphInput` widgets.
 
 ---
 
@@ -471,14 +466,14 @@ and produces the recursive `ExportedSubgraph` structure, matching the current
 format exactly. Existing workflows, the ComfyUI backend, and third-party tools
 see no change.
 
-| Direction       | Format                          | Notes                                    |
-| --------------- | ------------------------------- | ---------------------------------------- |
-| **Save/export** | Nested (current shape)          | SerializationSystem walks scope tree     |
-| **Load/import** | Nested (current) or future flat | Ratchet: normalize to flat World on load |
+| Direction       | Format                          | Notes                                      |
+| --------------- | ------------------------------- | ------------------------------------------ |
+| **Save/export** | Nested (current shape)          | SerializationSystem walks scope tree       |
+| **Load/import** | Nested (current) or future flat | Migration: normalize to flat World on load |
 
-The "ratchet conversion" pattern: load any supported format, normalize to the
-internal model. The system accepts old formats indefinitely but produces the
-current format on save.
+The migration pattern: load any supported format and normalize to the internal
+model. The system accepts old formats indefinitely but produces the current
+format on save.
 
 ### Widget identity at the boundary
 
@@ -511,13 +506,12 @@ SubgraphIO {
 }
 ```
 
-If Candidate A (connections-only promotion) is chosen: promoted widgets become
-interface inputs, serialized as additional `SubgraphIO` entries. On load, legacy
-`proxyWidgets` data is converted to interface inputs and boundary links (ratchet
-migration). On save, `proxyWidgets` is no longer written.
-
-If Candidate B (simplified promotion) is chosen: `proxyWidgets` continues to be
-serialized in its current format.
+ADR 0009 chooses Candidate A (connections-only promotion) for promoted value
+widgets: they become interface inputs, serialized as additional `SubgraphIO`
+entries. On load, legacy value-widget `proxyWidgets` data is converted to
+interface inputs and boundary links. On save, repaired `proxyWidgets` entries
+are no longer written. Display-only preview exposures use separate
+host-scoped `previewExposures` serialization.
 
 ### Backward-compatible loading contract
 
@@ -555,7 +549,7 @@ This document proposes or surfaces the following changes to
 | World structure     | Implied per-graph containment                                            | Flat World with `graphScope` tags; one World per workflow                       |
 | Acyclicity          | Not addressed                                                            | DAG invariant on `SubgraphStructure.graphId` references, enforced on mutation   |
 | Boundary model      | Deferred                                                                 | Typed interface contracts on `SubgraphStructure`; no virtual nodes or magic IDs |
-| Widget promotion    | Treated as a given feature to migrate                                    | Open decision: Candidate A (connections-only) vs B (simplified component)       |
+| Widget promotion    | Treated as a given feature to migrate                                    | ADR 0009 chooses Candidate A: promoted value widgets are linked inputs          |
 | Serialization       | Not explicitly separated from internal model                             | Internal model ≠ wire format; `SerializationSystem` is the membrane             |
 | Backward compat     | Implicit                                                                 | Explicit contract: load any prior format, indefinitely                          |
 
diff --git a/docs/testing/unit-testing.md b/docs/testing/unit-testing.md
index a47012ffa2..181627fd65 100644
--- a/docs/testing/unit-testing.md
+++ b/docs/testing/unit-testing.md
@@ -147,7 +147,7 @@ it('should subscribe to logs API', () => {
 })
 ```
 
-## Mocking Lodash Functions
+## Mocking Utility Functions
 
 Mocking utility functions like debounce:
 
diff --git a/eslint.config.ts b/eslint.config.ts
index e2b06e3d0a..b5f36864b7 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -36,6 +36,7 @@ const settings = {
       alwaysTryTypes: true,
       project: [
         './tsconfig.json',
+        './browser_tests/tsconfig.json',
         './apps/*/tsconfig.json',
         './packages/*/tsconfig.json'
       ],
@@ -250,7 +251,13 @@ export default defineConfig([
           // @/utils/errorUtil instead — see issue #11429.
           selector: "TSAsExpression TSTypeReference[typeName.name='Error']",
           message:
-            'Do not use `as Error` assertions. Use `instanceof Error` narrowing or `toError()` from @/utils/errorUtil instead. See issue #11429.'
+            'Do not use Error type assertions. Use `instanceof Error` narrowing or `toError()` from @/utils/errorUtil instead. See issue #11429.'
+        },
+        {
+          // Bans `<Error>value` and `<Error & { ... }>value`.
+          selector: "TSTypeAssertion TSTypeReference[typeName.name='Error']",
+          message:
+            'Do not use Error type assertions. Use `instanceof Error` narrowing or `toError()` from @/utils/errorUtil instead. See issue #11429.'
         }
       ]
     }
diff --git a/lint-staged.config.ts b/lint-staged.config.ts
index 97a95ddd2f..d5f69648f1 100644
--- a/lint-staged.config.ts
+++ b/lint-staged.config.ts
@@ -34,7 +34,7 @@ function formatAndEslint(fileNames: string[]) {
   const joinedPaths = toJoinedRelativePaths(fileNames)
   return [
     `pnpm exec oxfmt --write ${joinedPaths}`,
-    `pnpm exec oxlint --fix ${joinedPaths}`,
+    `pnpm exec oxlint --type-aware --fix ${joinedPaths}`,
     `pnpm exec eslint --cache --fix --no-warn-ignored ${joinedPaths}`
   ]
 }
diff --git a/package.json b/package.json
index 2748b0cb63..e50b597347 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.44.15",
+  "version": "1.45.6",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",
@@ -11,7 +11,7 @@
     "build:cloud": "cross-env DISTRIBUTION=cloud NODE_OPTIONS='--max-old-space-size=8192' nx build",
     "build:desktop": "nx build @comfyorg/desktop-ui",
     "build-storybook": "storybook build",
-    "build:types": "nx build --config vite.types.config.mts && node scripts/prepare-types.js",
+    "build:types": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nx build --config vite.types.config.mts && node scripts/prepare-types.js",
     "build:analyze": "cross-env ANALYZE_BUNDLE=true pnpm build",
     "build": "cross-env NODE_OPTIONS='--max-old-space-size=8192' pnpm typecheck && nx build",
     "size:collect": "node scripts/size-collect.js",
@@ -60,6 +60,7 @@
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
     "@comfyorg/comfyui-electron-types": "catalog:",
     "@comfyorg/design-system": "workspace:*",
+    "@comfyorg/object-info-parser": "workspace:*",
     "@comfyorg/registry-types": "workspace:*",
     "@comfyorg/shared-frontend-utils": "workspace:*",
     "@comfyorg/tailwind-utils": "workspace:*",
diff --git a/packages/design-system/src/css/style.css b/packages/design-system/src/css/style.css
index 5106ed90e9..767e8c25bc 100644
--- a/packages/design-system/src/css/style.css
+++ b/packages/design-system/src/css/style.css
@@ -16,7 +16,7 @@
 @plugin "./lucideStrokePlugin.js";
 
 /* Safelist dynamic comfy icons for node library folders */
-@source inline("icon-[comfy--{ai-model,bfl,bria,bytedance,credits,elevenlabs,extensions-blocks,file-output,gemini,grok,hitpaw,ideogram,image-ai-edit,kling,ltxv,luma,magnific,mask,meshy,minimax,moonvalley-marey,node,openai,pin,pixverse,play,recraft,reve,rodin,runway,sora,stability-ai,template,tencent,topaz,tripo,veo,vidu,wan,wavespeed,workflow,quiver}]");
+@source inline("icon-[comfy--{ai-model,anthropic,bfl,bria,bytedance,credits,elevenlabs,extensions-blocks,file-output,gemini,grok,hitpaw,ideogram,image-ai-edit,kling,ltxv,luma,magnific,mask,meshy,minimax,moonvalley-marey,node,openai,pin,pixverse,play,recraft,reve,rodin,runway,sora,stability-ai,template,tencent,topaz,tripo,veo,vidu,wan,wavespeed,workflow,quiver}]");
 
 /* Safelist dynamic comfy icons for essential nodes (kebab-case of node names) */
 @source inline("icon-[comfy--{save-image,load-video,save-video,load-3-d,save-glb,image-batch,batch-images-node,image-crop,image-scale,image-rotate,image-blur,image-invert,canny,recraft-remove-background-node,kling-lip-sync-audio-to-video-node,load-audio,save-audio,stability-text-to-audio,lora-loader,lora-loader-model-only,primitive-string-multiline,get-video-components,video-slice,tencent-text-to-model-node,tencent-image-to-model-node,open-ai-chat-node,preview-image,image-and-mask-preview,layer-mask-mask-preview,mask-preview,image-preview-from-latent,i-tools-preview-image,i-tools-compare-image,canny-to-image,image-edit,text-to-image,pose-to-image,depth-to-video,image-to-image,canny-to-video,depth-to-image,image-to-video,pose-to-video,text-to-video,image-inpainting,image-outpainting}]");
diff --git a/packages/design-system/src/icons/anthropic.svg b/packages/design-system/src/icons/anthropic.svg
new file mode 100644
index 0000000000..f9f90c67c9
--- /dev/null
+++ b/packages/design-system/src/icons/anthropic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" fill-rule="evenodd"><title>Anthropic</title><path d="M13.827 3.52h3.603L24 20h-3.603l-6.57-16.48zm-7.258 0h3.767L16.906 20h-3.674l-1.343-3.461H5.017l-1.344 3.46H0L6.57 3.522zm4.132 9.959L8.453 7.687 6.205 13.48H10.7z"/></svg>
diff --git a/packages/ingest-types/src/index.ts b/packages/ingest-types/src/index.ts
index 94fb077aa3..03a4f5ca9c 100644
--- a/packages/ingest-types/src/index.ts
+++ b/packages/ingest-types/src/index.ts
@@ -29,6 +29,17 @@ export type {
   BillingStatus,
   BillingStatusResponse,
   BindingErrorResponse,
+  BulkRevokeApiKeysResponse,
+  BulkRevokeWorkspaceMemberApiKeysData,
+  BulkRevokeWorkspaceMemberApiKeysError,
+  BulkRevokeWorkspaceMemberApiKeysErrors,
+  BulkRevokeWorkspaceMemberApiKeysResponse,
+  BulkRevokeWorkspaceMemberApiKeysResponses,
+  CancelJobData,
+  CancelJobError,
+  CancelJobErrors,
+  CancelJobResponse,
+  CancelJobResponses,
   CancelSubscriptionData,
   CancelSubscriptionError,
   CancelSubscriptionErrors,
@@ -307,6 +318,28 @@ export type {
   GetJwksData,
   GetJwksResponse,
   GetJwksResponses,
+  GetLegacyAssetContentData,
+  GetLegacyAssetContentErrors,
+  GetLegacyHistoryByIdData,
+  GetLegacyHistoryByIdErrors,
+  GetLegacyHistoryData,
+  GetLegacyHistoryErrors,
+  GetLegacyJobByIdData,
+  GetLegacyJobByIdErrors,
+  GetLegacyJobOutputsData,
+  GetLegacyJobOutputsErrors,
+  GetLegacyModelsByFolderData,
+  GetLegacyModelsByFolderErrors,
+  GetLegacyModelsData,
+  GetLegacyModelsErrors,
+  GetLegacyObjectInfoByNodeClassData,
+  GetLegacyObjectInfoByNodeClassErrors,
+  GetLegacyPromptByIdData,
+  GetLegacyPromptByIdErrors,
+  GetLegacyUserdataV2Data,
+  GetLegacyUserdataV2Errors,
+  GetLegacyViewMetadataData,
+  GetLegacyViewMetadataErrors,
   GetLogsData,
   GetLogsError,
   GetLogsErrors,
@@ -505,6 +538,7 @@ export type {
   InterruptJobError,
   InterruptJobErrors,
   InterruptJobResponses,
+  JobCancelResponse,
   JobDetailResponse,
   JobEntry,
   JobsListResponse,
@@ -719,6 +753,13 @@ export type {
   SubscribeResponses,
   SubscriptionDuration,
   SubscriptionTier,
+  SyncApiKeyData,
+  SyncApiKeyError,
+  SyncApiKeyErrors,
+  SyncApiKeyRequest,
+  SyncApiKeyResponse,
+  SyncApiKeyResponse2,
+  SyncApiKeyResponses,
   SystemStatsResponse,
   TagInfo,
   TagsModificationResponse,
diff --git a/packages/ingest-types/src/types.gen.ts b/packages/ingest-types/src/types.gen.ts
index 5af8c4b07d..c0cf784658 100644
--- a/packages/ingest-types/src/types.gen.ts
+++ b/packages/ingest-types/src/types.gen.ts
@@ -4,6 +4,9 @@ export type ClientOptions = {
   baseUrl: `${string}://${string}` | (string & {})
 }
 
+/**
+ * Response indicating whether a Hub username is available.
+ */
 export type HubUsernameCheckResponse = {
   /**
    * The username that was checked.
@@ -23,6 +26,9 @@ export type HubUsernameCheckResponse = {
   validation_error?: string
 }
 
+/**
+ * Response containing a signed upload URL and the target asset path.
+ */
 export type HubAssetUploadUrlResponse = {
   /**
    * Presigned R2 URL for uploading the file via PUT.
@@ -38,6 +44,9 @@ export type HubAssetUploadUrlResponse = {
   token: string
 }
 
+/**
+ * Request body for requesting a signed upload URL for a Hub asset.
+ */
 export type HubAssetUploadUrlRequest = {
   /**
    * Original filename for display purposes. Not used in the storage key.
@@ -116,6 +125,9 @@ export type UpdateHubWorkflowRequest = {
   } | null
 }
 
+/**
+ * Request body for publishing or updating a workflow on the Hub.
+ */
 export type PublishHubWorkflowRequest = {
   /**
    * Username of the hub profile to publish under. The authenticated user must belong to the workspace that owns this profile.
@@ -177,6 +189,9 @@ export type PublishHubWorkflowRequest = {
   sample_image_tokens_or_urls?: Array<string>
 }
 
+/**
+ * Paginated list of Hub workflows matching search criteria.
+ */
 export type HubWorkflowListResponse = {
   /**
    * Array of HubWorkflowSummary (default) or HubWorkflowDetail (when detail=true).
@@ -188,6 +203,9 @@ export type HubWorkflowListResponse = {
   next_cursor?: string
 }
 
+/**
+ * Lightweight asset reference used in workflow publishing payloads.
+ */
 export type AssetInfo = {
   /**
    * Asset identifier.
@@ -213,6 +231,9 @@ export type AssetInfo = {
   in_library: boolean
 }
 
+/**
+ * Full Hub workflow detail including versions, assets, and statistics.
+ */
 export type HubWorkflowDetail = {
   share_id: string
   workflow_id: string
@@ -241,6 +262,9 @@ export type HubWorkflowDetail = {
   profile: HubProfileSummary
 }
 
+/**
+ * Abbreviated Hub profile used in workflow listings.
+ */
 export type HubProfileSummary = {
   username: string
   display_name?: string
@@ -250,6 +274,9 @@ export type HubProfileSummary = {
   avatar_url?: string
 }
 
+/**
+ * Reference to a Hub label by ID.
+ */
 export type LabelRef = {
   /**
    * Slug identifier (e.g. "video-generation", "flux").
@@ -270,6 +297,9 @@ export type HubWorkflowStatus =
   | 'rejected'
   | 'deprecated'
 
+/**
+ * Abbreviated Hub workflow metadata used in search and listing results.
+ */
 export type HubWorkflowSummary = {
   share_id: string
   name: string
@@ -290,6 +320,9 @@ export type HubWorkflowSummary = {
   sample_image_urls?: Array<string>
 }
 
+/**
+ * Metadata for a single Hub label.
+ */
 export type HubLabelInfo = {
   /**
    * Slug identifier.
@@ -309,6 +342,9 @@ export type HubLabelInfo = {
   type: 'tag' | 'model' | 'custom_node'
 }
 
+/**
+ * List of available Hub labels for categorizing workflows.
+ */
 export type HubLabelListResponse = {
   /**
    * Available labels filtered by type (or all if no type specified).
@@ -316,6 +352,9 @@ export type HubLabelListResponse = {
   labels: Array<HubLabelInfo>
 }
 
+/**
+ * Entry in the curated workflow template gallery shown on the home page.
+ */
 export type HubWorkflowTemplateEntry = {
   /**
    * Slug identifier for the template
@@ -410,6 +449,9 @@ export type HubWorkflowTemplateEntry = {
   contentTemplate?: string
 }
 
+/**
+ * Request body for updating an existing Hub profile.
+ */
 export type UpdateHubProfileRequest = {
   display_name?: string
   description?: string
@@ -424,6 +466,9 @@ export type UpdateHubProfileRequest = {
   website_urls?: Array<string>
 }
 
+/**
+ * Request body for creating a new Hub profile.
+ */
 export type CreateHubProfileRequest = {
   /**
    * ID of the workspace to create the hub profile for. The authenticated user must belong to this workspace.
@@ -446,6 +491,9 @@ export type CreateHubProfileRequest = {
   website_urls?: Array<string>
 }
 
+/**
+ * Full public profile for a Hub creator.
+ */
 export type HubProfile = {
   username: string
   display_name?: string
@@ -460,17 +508,39 @@ export type HubProfile = {
   website_urls?: Array<string>
 }
 
+/**
+ * Response after importing published workflow assets.
+ */
 export type ImportPublishedAssetsResponse = {
   assets: Array<AssetInfo>
 }
 
+/**
+ * Request body for importing assets from a published workflow.
+ */
 export type ImportPublishedAssetsRequest = {
   /**
    * IDs of published assets (inputs and models) to import.
    */
   published_asset_ids: Array<string>
+  /**
+   * Optional. Share ID of the published workflow these assets belong to.
+   * When provided (non-null, non-empty): all published_asset_ids must
+   * belong to this share's workflow version; returns
+   * 400/CodeInvalidAssets if the share is not found or any asset does
+   * not belong to it.
+   * When omitted, null, or empty string: no share-scoped validation is
+   * performed and the assets are validated only against global rules
+   * (legacy behaviour, preserved for clients that have not yet adopted
+   * share_id).
+   *
+   */
+  share_id?: string | null
 }
 
+/**
+ * Full detail of a publicly published workflow on the Hub.
+ */
 export type PublishedWorkflowDetail = {
   share_id: string
   workflow_id: string
@@ -492,16 +562,25 @@ export type PublishedWorkflowDetail = {
   assets: Array<AssetInfo>
 }
 
+/**
+ * Response containing assets associated with a workflow.
+ */
 export type WorkflowApiAssetsResponse = {
   assets: Array<AssetInfo>
 }
 
+/**
+ * Request body for querying assets associated with a workflow.
+ */
 export type WorkflowApiAssetsRequest = {
   workflow_api_json: {
     [key: string]: unknown
   }
 }
 
+/**
+ * Request body for publishing workflow assets to the Hub.
+ */
 export type PublishWorkflowAssetsRequest = {
   /**
    * IDs of assets (inputs and models) to snapshot.
@@ -509,6 +588,9 @@ export type PublishWorkflowAssetsRequest = {
   asset_ids: Array<string>
 }
 
+/**
+ * Publishing metadata for a workflow shared to the Hub.
+ */
 export type WorkflowPublishInfo = {
   workflow_id: string
   share_id: string
@@ -520,6 +602,9 @@ export type WorkflowPublishInfo = {
   assets: Array<AssetInfo>
 }
 
+/**
+ * Request body for forking an existing workflow into the user's account.
+ */
 export type ForkWorkflowRequest = {
   /**
    * Version number to fork from
@@ -531,6 +616,9 @@ export type ForkWorkflowRequest = {
   name?: string
 }
 
+/**
+ * Full workflow version including the serialized workflow JSON.
+ */
 export type WorkflowVersionContentResponse = {
   id: string
   version: number
@@ -542,6 +630,9 @@ export type WorkflowVersionContentResponse = {
   dependency_asset_ids?: Array<string>
 }
 
+/**
+ * Metadata for a single workflow version.
+ */
 export type WorkflowVersionResponse = {
   id: string
   version: number
@@ -550,6 +641,9 @@ export type WorkflowVersionResponse = {
   created_at: string
 }
 
+/**
+ * Request body for creating a new version of a saved workflow.
+ */
 export type CreateWorkflowVersionRequest = {
   /**
    * The version number this change is based on (for optimistic concurrency)
@@ -563,11 +657,17 @@ export type CreateWorkflowVersionRequest = {
   }
 }
 
+/**
+ * Paginated list of saved workflows.
+ */
 export type WorkflowListResponse = {
   data: Array<WorkflowResponse>
   pagination: PaginationInfo
 }
 
+/**
+ * Offset/limit-based pagination metadata included in list responses.
+ */
 export type PaginationInfo = {
   /**
    * Current offset (0-based)
@@ -587,11 +687,17 @@ export type PaginationInfo = {
   has_more: boolean
 }
 
+/**
+ * Reference to the parent workflow from which this workflow was forked.
+ */
 export type WorkflowForkedFrom = {
   workflow_id?: string
   workflow_version_id?: string
 }
 
+/**
+ * Full workflow entity including metadata and version history.
+ */
 export type WorkflowResponse = {
   id: string
   name?: string
@@ -604,6 +710,9 @@ export type WorkflowResponse = {
   updated_at: string
 }
 
+/**
+ * Request body for updating an existing saved workflow.
+ */
 export type UpdateWorkflowRequest = {
   /**
    * New display name
@@ -619,6 +728,9 @@ export type UpdateWorkflowRequest = {
   default_view?: 'workflow' | 'app'
 }
 
+/**
+ * Request body for creating a new saved workflow.
+ */
 export type CreateWorkflowRequest = {
   /**
    * Display name for the workflow
@@ -648,6 +760,9 @@ export type CreateWorkflowRequest = {
   forked_from_workflow_version_id?: string
 }
 
+/**
+ * Response after recording partner usage data.
+ */
 export type PartnerUsageResponse = {
   /**
    * Result status (e.g., "ok")
@@ -655,6 +770,9 @@ export type PartnerUsageResponse = {
   status: string
 }
 
+/**
+ * Request body for reporting partner resource usage (admin endpoint).
+ */
 export type PartnerUsageRequest = {
   /**
    * The workspace ID to bill usage against
@@ -684,6 +802,9 @@ export type PartnerUsageRequest = {
   }
 }
 
+/**
+ * Status of an asynchronous billing operation.
+ */
 export type BillingOpStatusResponse = {
   /**
    * Unique identifier for the billing operation
@@ -707,6 +828,9 @@ export type BillingOpStatusResponse = {
   completed_at?: string
 }
 
+/**
+ * Response after successfully purchasing a credit top-up.
+ */
 export type CreateTopupResponse = {
   /**
    * Billing operation ID to poll for status via GET /api/billing/ops/{id}
@@ -726,6 +850,9 @@ export type CreateTopupResponse = {
   amount_cents: number
 }
 
+/**
+ * Request body for purchasing a one-time credit top-up.
+ */
 export type CreateTopupRequest = {
   /**
    * Amount to charge and grant as credits (in cents). Minimum $5.00.
@@ -739,6 +866,9 @@ export type CreateTopupRequest = {
   idempotency_key?: string
 }
 
+/**
+ * Response containing a redirect URL to the payment portal.
+ */
 export type PaymentPortalResponse = {
   /**
    * Stripe Billing Portal URL
@@ -746,6 +876,9 @@ export type PaymentPortalResponse = {
   url: string
 }
 
+/**
+ * Request body for generating a payment portal session URL.
+ */
 export type PaymentPortalRequest = {
   /**
    * URL to redirect after the user exits the portal
@@ -753,6 +886,9 @@ export type PaymentPortalRequest = {
   return_url?: string
 }
 
+/**
+ * Response after successfully resubscribing to a billing plan.
+ */
 export type ResubscribeResponse = {
   /**
    * Billing operation ID to poll for status via GET /api/billing/ops/{id}
@@ -768,6 +904,9 @@ export type ResubscribeResponse = {
   message?: string
 }
 
+/**
+ * Request body for reactivating a previously cancelled subscription.
+ */
 export type ResubscribeRequest = {
   /**
    * Client-provided key to prevent duplicate operations.
@@ -777,6 +916,9 @@ export type ResubscribeRequest = {
   idempotency_key?: string
 }
 
+/**
+ * Response after successfully cancelling a subscription.
+ */
 export type CancelSubscriptionResponse = {
   /**
    * Billing operation ID to poll for status via GET /api/billing/ops/{id}
@@ -788,6 +930,9 @@ export type CancelSubscriptionResponse = {
   cancel_at: string
 }
 
+/**
+ * Request body for cancelling the current subscription.
+ */
 export type CancelSubscriptionRequest = {
   /**
    * Client-provided key to prevent duplicate operations.
@@ -797,6 +942,9 @@ export type CancelSubscriptionRequest = {
   idempotency_key?: string
 }
 
+/**
+ * Response after successfully subscribing to a billing plan.
+ */
 export type SubscribeResponse = {
   /**
    * Billing operation ID to poll for status via GET /api/billing/ops/{id}
@@ -820,6 +968,9 @@ export type SubscribeResponse = {
   payment_method_url?: string
 }
 
+/**
+ * Request body for subscribing a workspace to a billing plan.
+ */
 export type SubscribeRequest = {
   /**
    * Target plan slug to subscribe to
@@ -907,6 +1058,9 @@ export type SubscriptionTier =
   | 'PRO'
   | 'FOUNDERS_EDITION'
 
+/**
+ * Itemized cost preview for a pending subscription change.
+ */
 export type PreviewSubscribeResponse = {
   /**
    * Whether this subscription change is allowed
@@ -952,6 +1106,9 @@ export type PreviewSubscribeResponse = {
   new_plan: PreviewPlanInfo
 }
 
+/**
+ * Request body for previewing the cost of a plan subscription change.
+ */
 export type PreviewSubscribeRequest = {
   /**
    * Target plan slug to preview subscribing to
@@ -959,6 +1116,9 @@ export type PreviewSubscribeRequest = {
   plan_slug: string
 }
 
+/**
+ * List of available billing plans for subscription.
+ */
 export type BillingPlansResponse = {
   /**
    * Current plan slug if subscribed
@@ -977,6 +1137,9 @@ export type PlanAvailabilityReason =
   | 'requires_personal'
   | 'exceeds_max_seats'
 
+/**
+ * Availability and eligibility information for a billing plan.
+ */
 export type PlanAvailability = {
   /**
    * Whether the workspace can subscribe to this plan
@@ -985,6 +1148,9 @@ export type PlanAvailability = {
   reason?: PlanAvailabilityReason
 }
 
+/**
+ * Billing plan details including pricing, limits, and features.
+ */
 export type Plan = {
   /**
    * Plan identifier (e.g., "pro-monthly", "team-standard-annual")
@@ -1008,10 +1174,16 @@ export type Plan = {
   seat_summary: PlanSeatSummary
 }
 
+/**
+ * List of user secrets with metadata only.
+ */
 export type SecretListResponse = {
   data: Array<SecretResponse>
 }
 
+/**
+ * User secret metadata (the secret value itself is never returned after creation).
+ */
 export type SecretResponse = {
   /**
    * Unique identifier for the secret
@@ -1039,6 +1211,9 @@ export type SecretResponse = {
   updated_at: string
 }
 
+/**
+ * Request body for updating an existing user secret.
+ */
 export type UpdateSecretRequest = {
   /**
    * New name for the secret
@@ -1050,6 +1225,9 @@ export type UpdateSecretRequest = {
   secret_value?: string
 }
 
+/**
+ * Request body for creating a new user secret.
+ */
 export type CreateSecretRequest = {
   /**
    * User-provided label for the secret
@@ -1065,6 +1243,9 @@ export type CreateSecretRequest = {
   secret_value: string
 }
 
+/**
+ * Paginated list of billing events for a workspace.
+ */
 export type BillingEventsResponse = {
   /**
    * Total number of events
@@ -1085,6 +1266,9 @@ export type BillingEventsResponse = {
   totalPages: number
 }
 
+/**
+ * A single billing event such as a charge, credit, or adjustment.
+ */
 export type BillingEvent = {
   /**
    * Type of billing event (e.g., subscription.created, payment.succeeded)
@@ -1106,6 +1290,9 @@ export type BillingEvent = {
   createdAt: string
 }
 
+/**
+ * Current credit balance and usage details for a workspace.
+ */
 export type BillingBalanceResponse = {
   /**
    * The total remaining balance in microamount (1/1,000,000 of the currency unit)
@@ -1133,6 +1320,9 @@ export type BillingBalanceResponse = {
   currency: string
 }
 
+/**
+ * Current billing and subscription status for a workspace.
+ */
 export type BillingStatusResponse = {
   /**
    * Whether the workspace has an active subscription
@@ -1173,6 +1363,9 @@ export type BillingStatus =
   | 'payment_failed'
   | 'inactive'
 
+/**
+ * A single JSON Web Key entry within a JWKS response.
+ */
 export type JwkKey = {
   kty: string
   crv: string
@@ -1189,10 +1382,59 @@ export type JwkKey = {
   y: string
 }
 
+/**
+ * JSON Web Key Set containing the public keys used to verify Cloud JWTs.
+ */
 export type JwksResponse = {
   keys: Array<JwkKey>
 }
 
+/**
+ * Response after synchronizing an API key into the local database.
+ */
+export type SyncApiKeyResponse = {
+  /**
+   * `revoked` — matching row found, was active, now revoked.
+   * `already_revoked` — matching row found, already revoked.
+   * `no_op` — no row matches the supplied hash.
+   *
+   */
+  result: 'revoked' | 'already_revoked' | 'no_op'
+}
+
+/**
+ * Request body for synchronizing an API key from the external registry.
+ */
+export type SyncApiKeyRequest = {
+  /**
+   * Lifecycle event type. Only `delete` is supported in Phase 1.
+   */
+  event: 'delete'
+  /**
+   * SHA-256 hex digest of the plaintext API key (64 hex characters).
+   * Case-insensitive: the server lowercases the value before lookup, so
+   * producers may emit lowercase or uppercase hex. The lowercase form
+   * is recommended for consistency with the rest of the codebase, which
+   * computes hashes via `hex.EncodeToString`.
+   *
+   */
+  key_hash: string
+  /**
+   * Firebase UID of the key's owner according to comfy-api. Required on
+   * the request so cloud can detect drift between the two systems, but
+   * **advisory only**: `key_hash` is the sole authoritative identifier
+   * for the revocation. A mismatch against cloud's stored `user_id` is
+   * logged and emits `admin.api_key_sync.delete.customer_mismatch`, but
+   * does not change the outcome — the matching row is still revoked so
+   * a subsequent sync call can repair drift.
+   *
+   */
+  customer_id: string
+}
+
+/**
+ * Response confirming the validity and scope of a workspace API key.
+ */
 export type VerifyApiKeyResponse = {
   /**
    * Firebase UID of the key creator
@@ -1242,6 +1484,9 @@ export type VerifyApiKeyResponse = {
   permissions: Array<string>
 }
 
+/**
+ * Request body for verifying a workspace API key (admin endpoint).
+ */
 export type VerifyApiKeyRequest = {
   /**
    * The full plaintext API key to verify
@@ -1249,10 +1494,26 @@ export type VerifyApiKeyRequest = {
   api_key: string
 }
 
+/**
+ * Response after bulk-revoking API keys for a workspace member.
+ */
+export type BulkRevokeApiKeysResponse = {
+  /**
+   * Number of API keys that were revoked
+   */
+  revoked_count: number
+}
+
+/**
+ * List of API keys associated with the current workspace.
+ */
 export type ListWorkspaceApiKeysResponse = {
   api_keys: Array<WorkspaceApiKeyInfo>
 }
 
+/**
+ * Metadata for a workspace-scoped API key (secret is never returned).
+ */
 export type WorkspaceApiKeyInfo = {
   /**
    * API key ID
@@ -1292,6 +1553,9 @@ export type WorkspaceApiKeyInfo = {
   created_at: string
 }
 
+/**
+ * Response containing the newly created workspace API key.
+ */
 export type CreateWorkspaceApiKeyResponse = {
   /**
    * API key ID
@@ -1319,6 +1583,9 @@ export type CreateWorkspaceApiKeyResponse = {
   created_at: string
 }
 
+/**
+ * Request body for creating a new workspace-scoped API key.
+ */
 export type CreateWorkspaceApiKeyRequest = {
   /**
    * User-provided label for the key
@@ -1330,6 +1597,9 @@ export type CreateWorkspaceApiKeyRequest = {
   expires_at?: string
 }
 
+/**
+ * Response returned after successfully accepting a workspace invitation.
+ */
 export type AcceptInviteResponse = {
   /**
    * ID of the workspace joined
@@ -1341,6 +1611,9 @@ export type AcceptInviteResponse = {
   workspace_name: string
 }
 
+/**
+ * Request body for inviting a user to a workspace.
+ */
 export type CreateInviteRequest = {
   /**
    * Email address to invite
@@ -1348,10 +1621,16 @@ export type CreateInviteRequest = {
   email: string
 }
 
+/**
+ * List of pending invitations for the current workspace.
+ */
 export type ListInvitesResponse = {
   invites: Array<PendingInvite>
 }
 
+/**
+ * An outstanding workspace invitation that has not yet been accepted.
+ */
 export type PendingInvite = {
   /**
    * Invite ID
@@ -1375,11 +1654,17 @@ export type PendingInvite = {
   expires_at: string
 }
 
+/**
+ * List of members in the current workspace.
+ */
 export type ListMembersResponse = {
   members: Array<Member>
   pagination: PaginationInfo
 }
 
+/**
+ * Workspace member with profile and role information.
+ */
 export type Member = {
   /**
    * User ID
@@ -1403,6 +1688,9 @@ export type Member = {
   joined_at: string
 }
 
+/**
+ * Request body for updating an existing workspace's settings.
+ */
 export type UpdateWorkspaceRequest = {
   /**
    * New display name for the workspace
@@ -1410,6 +1698,9 @@ export type UpdateWorkspaceRequest = {
   name?: string
 }
 
+/**
+ * Request body for creating a new workspace.
+ */
 export type CreateWorkspaceRequest = {
   /**
    * Display name for the workspace
@@ -1417,6 +1708,9 @@ export type CreateWorkspaceRequest = {
   name: string
 }
 
+/**
+ * Workspace entity annotated with the requesting user's role.
+ */
 export type WorkspaceWithRole = {
   id: string
   name: string
@@ -1433,10 +1727,16 @@ export type WorkspaceWithRole = {
   subscription_tier?: SubscriptionTier
 }
 
+/**
+ * Paginated list of workspaces the authenticated user belongs to.
+ */
 export type ListWorkspacesResponse = {
   workspaces: Array<WorkspaceWithRole>
 }
 
+/**
+ * Full workspace entity with configuration and ownership details.
+ */
 export type Workspace = {
   id: string
   name: string
@@ -1444,12 +1744,18 @@ export type Workspace = {
   created_at: string
 }
 
+/**
+ * Abbreviated workspace metadata used in list responses.
+ */
 export type WorkspaceSummary = {
   id: string
   name: string
   type: 'personal' | 'team'
 }
 
+/**
+ * Response containing the issued Cloud JWT and its expiry.
+ */
 export type ExchangeTokenResponse = {
   /**
    * Cloud JWT token
@@ -1470,6 +1776,12 @@ export type ExchangeTokenResponse = {
   permissions: Array<string>
 }
 
+/**
+ * Optional request body for the token exchange endpoint. The Firebase JWT
+ * being exchanged is supplied via the `Authorization: Bearer` header; this
+ * body only carries workspace-selection input.
+ *
+ */
 export type ExchangeTokenRequest = {
   /**
    * Workspace ID to get token for. Defaults to personal workspace if omitted.
@@ -1561,6 +1873,9 @@ export type TaskEntry = {
   completed_at?: string
 }
 
+/**
+ * Paginated list of background tasks for the authenticated user.
+ */
 export type TasksListResponse = {
   /**
    * Array of tasks ordered by create_time
@@ -1569,6 +1884,9 @@ export type TasksListResponse = {
   pagination: PaginationInfo
 }
 
+/**
+ * Details of a pending or completed user data deletion request.
+ */
 export type DeletionRequest = {
   /**
    * Unique identifier for the deletion request
@@ -1588,6 +1906,9 @@ export type DeletionRequest = {
   deletion_status: Array<DeletionStatus>
 }
 
+/**
+ * Current status of a user data deletion request.
+ */
 export type DeletionStatus = {
   /**
    * The name of the deletion status
@@ -1650,7 +1971,13 @@ export type JobDetailResponse = {
    */
   status: 'pending' | 'in_progress' | 'completed' | 'failed' | 'cancelled'
   /**
-   * Full ComfyUI workflow (10-100KB, omitted if not available)
+   * Full ComfyUI workflow (10-100KB, omitted if not available).
+   *
+   * Sensitive credentials are redacted before the response is returned:
+   * `extra_data.api_key_comfy_org`, when present, is replaced with the
+   * literal string `"[REDACTED]"`. The field is preserved (not removed)
+   * so existence checks still pass, but the value is not usable.
+   *
    */
   workflow?: {
     [key: string]: unknown
@@ -1701,6 +2028,19 @@ export type JobDetailResponse = {
   }
 }
 
+/**
+ * Response for POST /api/jobs/{job_id}/cancel. Returned on both fresh cancels and idempotent no-ops.
+ */
+export type JobCancelResponse = {
+  /**
+   * True when a cancel event was successfully dispatched by this call.
+   * False when the job was already in a terminal or cancelling state,
+   * in which case the call is a no-op (still 200 — idempotent).
+   *
+   */
+  cancelled: boolean
+}
+
 /**
  * Lightweight job data for list views (workflow and full outputs excluded)
  */
@@ -1745,6 +2085,9 @@ export type JobEntry = {
   execution_end_time?: number
 }
 
+/**
+ * Paginated list of jobs for the authenticated user.
+ */
 export type JobsListResponse = {
   /**
    * Array of jobs ordered by specified sort field
@@ -1753,6 +2096,9 @@ export type JobsListResponse = {
   pagination: PaginationInfo
 }
 
+/**
+ * Response after adding, updating, or removing tags on an asset.
+ */
 export type TagsModificationResponse = {
   /**
    * Tags that were successfully added (for add operation)
@@ -1776,6 +2122,9 @@ export type TagsModificationResponse = {
   total_tags: Array<string>
 }
 
+/**
+ * Details of a single validation error encountered during asset operations.
+ */
 export type ValidationError = {
   /**
    * Machine-readable error code
@@ -1791,6 +2140,9 @@ export type ValidationError = {
   field: string
 }
 
+/**
+ * Result of validating a set of asset operations.
+ */
 export type ValidationResult = {
   /**
    * Overall validation status (true if all checks passed)
@@ -1806,6 +2158,9 @@ export type ValidationResult = {
   warnings?: Array<ValidationError>
 }
 
+/**
+ * Acknowledgement of an async asset download task; clients poll GET /api/tasks/{task_id} for status.
+ */
 export type AssetDownloadResponse = {
   /**
    * Task ID for tracking download progress via GET /api/tasks/{task_id}
@@ -1821,6 +2176,9 @@ export type AssetDownloadResponse = {
   message?: string
 }
 
+/**
+ * Metadata for a remotely hosted asset resolved by URL.
+ */
 export type AssetMetadataResponse = {
   /**
    * Size of the asset in bytes (-1 if unknown)
@@ -1852,6 +2210,9 @@ export type AssetMetadataResponse = {
   validation?: ValidationResult
 }
 
+/**
+ * Histogram of tag counts used for refining asset search results.
+ */
 export type AssetTagHistogramResponse = {
   /**
    * Map of tag names to their occurrence counts on matching assets
@@ -1861,6 +2222,9 @@ export type AssetTagHistogramResponse = {
   }
 }
 
+/**
+ * Paginated list of available asset tags.
+ */
 export type ListTagsResponse = {
   /**
    * List of tags
@@ -1876,6 +2240,9 @@ export type ListTagsResponse = {
   has_more: boolean
 }
 
+/**
+ * Metadata for a single tag that can be applied to assets.
+ */
 export type TagInfo = {
   /**
    * Tag name
@@ -1887,6 +2254,9 @@ export type TagInfo = {
   count: number
 }
 
+/**
+ * Paginated list of assets belonging to the authenticated user.
+ */
 export type ListAssetsResponse = {
   /**
    * List of assets matching the query
@@ -1902,6 +2272,9 @@ export type ListAssetsResponse = {
   has_more: boolean
 }
 
+/**
+ * Represents a user-owned asset (image, video, or other generated output).
+ */
 export type Asset = {
   /**
    * Unique identifier for the asset
@@ -1948,9 +2321,15 @@ export type Asset = {
    */
   preview_id?: string | null
   /**
-   * ID of the job/prompt that created this asset, if available
+   * Deprecated: use job_id instead. ID of the prompt that created this asset, if available
+   *
+   * @deprecated
    */
   prompt_id?: string | null
+  /**
+   * ID of the job that created this asset, if available
+   */
+  job_id?: string | null
   /**
    * Timestamp when the asset was created
    */
@@ -1969,6 +2348,9 @@ export type Asset = {
   is_immutable?: boolean
 }
 
+/**
+ * Response returned when an existing asset is successfully updated.
+ */
 export type AssetUpdated = {
   /**
    * Asset ID
@@ -2002,6 +2384,9 @@ export type AssetUpdated = {
   updated_at: string
 }
 
+/**
+ * Response returned when a new asset is successfully created.
+ */
 export type AssetCreated = Asset & {
   /**
    * Whether this was a new asset creation (true) or returned existing (false)
@@ -2009,6 +2394,9 @@ export type AssetCreated = Asset & {
   created_new: boolean
 }
 
+/**
+ * Response after updating the review status of a Hub workflow.
+ */
 export type SetReviewStatusResponse = {
   /**
    * The share IDs that were submitted for review
@@ -2020,6 +2408,9 @@ export type SetReviewStatusResponse = {
   status: 'approved' | 'rejected'
 }
 
+/**
+ * Request body for setting the review status of a Hub workflow.
+ */
 export type SetReviewStatusRequest = {
   /**
    * The share IDs of the hub workflows to review
@@ -2233,6 +2624,9 @@ export type PromptErrorResponse = {
   [key: string]: unknown
 }
 
+/**
+ * Individual file entry within a full user data response.
+ */
 export type GetUserDataResponseFullFile = {
   /**
    * File name or path relative to the user directory.
@@ -2248,8 +2642,14 @@ export type GetUserDataResponseFullFile = {
   modified?: number
 }
 
+/**
+ * List of user data file entries (each with path, size, and modification time) returned when full_info=true.
+ */
 export type GetUserDataResponseFull = Array<GetUserDataResponseFullFile>
 
+/**
+ * User data listing entry with file metadata (path, size, modification time).
+ */
 export type UserDataResponseFull = {
   path?: string
   size?: number
@@ -2313,6 +2713,9 @@ export type JobStatusResponse = {
   error_message?: string | null
 }
 
+/**
+ * Response after a queue management action (delete or clear).
+ */
 export type QueueManageResponse = {
   /**
    * Array of job IDs that were successfully cancelled
@@ -2536,6 +2939,9 @@ export type GlobalSubgraphInfo = {
   data?: string
 }
 
+/**
+ * Metadata describing a single ComfyUI node type and its inputs/outputs.
+ */
 export type NodeInfo = {
   /**
    * Input specifications for the node
@@ -2603,6 +3009,9 @@ export type NodeInfo = {
   api_node?: boolean
 }
 
+/**
+ * Metadata about the currently running and queued prompts.
+ */
 export type PromptInfo = {
   exec_info?: {
     /**
@@ -2612,6 +3021,9 @@ export type PromptInfo = {
   }
 }
 
+/**
+ * Response containing a signed download URL for an exported asset archive.
+ */
 export type ExportDownloadUrlResponse = {
   /**
    * Signed URL for downloading the export ZIP file
@@ -2623,15 +3035,24 @@ export type ExportDownloadUrlResponse = {
   expires_at?: string
 }
 
+/**
+ * Error shape returned when request binding or validation fails before the handler runs.
+ */
 export type BindingErrorResponse = {
   message: string
 }
 
+/**
+ * Standard error response with a machine-readable code and human-readable message.
+ */
 export type ErrorResponse = {
   code: string
   message: string
 }
 
+/**
+ * Response returned after successfully queuing a workflow prompt.
+ */
 export type PromptResponse = {
   /**
    * Unique identifier for the prompt execution
@@ -2649,6 +3070,9 @@ export type PromptResponse = {
   }
 }
 
+/**
+ * Request body for submitting a ComfyUI workflow prompt for execution.
+ */
 export type PromptRequest = {
   /**
    * The workflow graph to execute
@@ -2684,6 +3108,9 @@ export type PromptRequest = {
   workflow_version_id?: string
 }
 
+/**
+ * Paginated list of assets belonging to the authenticated user.
+ */
 export type ListAssetsResponseWritable = {
   /**
    * List of assets matching the query
@@ -2699,6 +3126,9 @@ export type ListAssetsResponseWritable = {
   has_more: boolean
 }
 
+/**
+ * Represents a user-owned asset (image, video, or other generated output).
+ */
 export type AssetWritable = {
   /**
    * Unique identifier for the asset
@@ -2739,9 +3169,15 @@ export type AssetWritable = {
    */
   preview_id?: string | null
   /**
-   * ID of the job/prompt that created this asset, if available
+   * Deprecated: use job_id instead. ID of the prompt that created this asset, if available
+   *
+   * @deprecated
    */
   prompt_id?: string | null
+  /**
+   * ID of the job that created this asset, if available
+   */
+  job_id?: string | null
   /**
    * Timestamp when the asset was created
    */
@@ -2760,6 +3196,9 @@ export type AssetWritable = {
   is_immutable?: boolean
 }
 
+/**
+ * Response returned when a new asset is successfully created.
+ */
 export type AssetCreatedWritable = AssetWritable & {
   /**
    * Whether this was a new asset creation (true) or returned existing (false)
@@ -3112,6 +3551,20 @@ export type GetModelPreviewResponses = {
 export type GetModelPreviewResponse =
   GetModelPreviewResponses[keyof GetModelPreviewResponses]
 
+export type GetLegacyHistoryData = {
+  body?: never
+  path?: never
+  query?: never
+  url: '/api/history'
+}
+
+export type GetLegacyHistoryErrors = {
+  /**
+   * Not Found — use /api/history_v2 instead
+   */
+  404: unknown
+}
+
 export type ManageHistoryData = {
   body: HistoryManageRequest
   path?: never
@@ -3322,6 +3775,48 @@ export type GetJobDetailResponses = {
 export type GetJobDetailResponse =
   GetJobDetailResponses[keyof GetJobDetailResponses]
 
+export type CancelJobData = {
+  body?: never
+  path: {
+    /**
+     * Job identifier (UUID)
+     */
+    job_id: string
+  }
+  query?: never
+  url: '/api/jobs/{job_id}/cancel'
+}
+
+export type CancelJobErrors = {
+  /**
+   * Bad Request - job_id is not a valid UUID (emitted by request validation before the handler runs)
+   */
+  400: BindingErrorResponse
+  /**
+   * Unauthorized - Authentication required
+   */
+  401: ErrorResponse
+  /**
+   * Job not found for this user
+   */
+  404: ErrorResponse
+  /**
+   * Internal server error - cancellation failed
+   */
+  500: ErrorResponse
+}
+
+export type CancelJobError = CancelJobErrors[keyof CancelJobErrors]
+
+export type CancelJobResponses = {
+  /**
+   * Success - Cancel request accepted (or job was already terminal)
+   */
+  200: JobCancelResponse
+}
+
+export type CancelJobResponse = CancelJobResponses[keyof CancelJobResponses]
+
 export type ViewFileData = {
   body?: never
   path?: never
@@ -3753,7 +4248,7 @@ export type GetRemoteAssetMetadataResponse =
 export type CreateAssetDownloadData = {
   body: {
     /**
-     * URL of the file to download (must be from huggingface.co or civitai.com)
+     * URL of the file to download (must be from huggingface.co, civitai.com, or civitai.red)
      */
     source_url: string
     /**
@@ -3825,16 +4320,16 @@ export type CreateAssetExportData = {
     /**
      * Strategy for naming files in the ZIP:
      * - group_by_job_id: Group assets by job ID as a parent directory (e.g., "833a1b5c-beab-436a-ae8e-f07e7cd7b2c4/ComfyUI_00001_.png")
-     * - group_by_job_time: Group assets by job execution time as parent directories
      * - preserve: Use original asset names, skip duplicates (first one wins)
      * - asset_id: Use the asset ID as the filename (e.g., "833a1b5c-beab-436a-ae8e-f07e7cd7b2c4.png")
+     * - group_by_job_time: Group by job creation timestamp (e.g., "2026-03-26T16-13-00/ComfyUI_00001_.png")
      *
      */
     naming_strategy?:
       | 'group_by_job_id'
-      | 'group_by_job_time'
       | 'preserve'
       | 'asset_id'
+      | 'group_by_job_time'
     /**
      * Optional per-job asset name filters. When provided for a job ID,
      * only assets whose name matches one of the specified names are included.
@@ -3943,6 +4438,10 @@ export type DeleteAssetErrors = {
    * Asset not found
    */
   404: ErrorResponse
+  /**
+   * Asset cannot be deleted because it is referenced by another resource (e.g., workflow version)
+   */
+  409: ErrorResponse
   /**
    * Internal server error
    */
@@ -4441,10 +4940,6 @@ export type ImportPublishedAssetsErrors = {
    * Unauthorized
    */
   401: ErrorResponse
-  /**
-   * Not found
-   */
-  404: ErrorResponse
   /**
    * Internal server error
    */
@@ -5028,6 +5523,9 @@ export type GetUserdataResponse =
 export type GetUserdataFilePublishData = {
   body?: never
   path: {
+    /**
+     * The workflow file path within the user's data directory (URL encoded if necessary).
+     */
     file: string
   }
   query?: never
@@ -5065,6 +5563,9 @@ export type GetUserdataFilePublishResponse =
 export type PostUserdataFilePublishData = {
   body: PublishWorkflowAssetsRequest
   path: {
+    /**
+     * The workflow file path within the user's data directory (URL encoded if necessary).
+     */
     file: string
   }
   query?: never
@@ -6256,6 +6757,50 @@ export type RevokeWorkspaceApiKeyResponses = {
 export type RevokeWorkspaceApiKeyResponse =
   RevokeWorkspaceApiKeyResponses[keyof RevokeWorkspaceApiKeyResponses]
 
+export type BulkRevokeWorkspaceMemberApiKeysData = {
+  body?: never
+  path: {
+    /**
+     * Firebase UID of the member whose keys to revoke (must be non-empty)
+     */
+    user_id: string
+  }
+  query?: never
+  url: '/api/workspace/members/{user_id}/api-keys'
+}
+
+export type BulkRevokeWorkspaceMemberApiKeysErrors = {
+  /**
+   * Unauthorized
+   */
+  401: ErrorResponse
+  /**
+   * Not authorized (must be workspace owner)
+   */
+  403: ErrorResponse
+  /**
+   * Validation error (e.g. empty user_id)
+   */
+  422: ErrorResponse
+  /**
+   * Internal server error
+   */
+  500: ErrorResponse
+}
+
+export type BulkRevokeWorkspaceMemberApiKeysError =
+  BulkRevokeWorkspaceMemberApiKeysErrors[keyof BulkRevokeWorkspaceMemberApiKeysErrors]
+
+export type BulkRevokeWorkspaceMemberApiKeysResponses = {
+  /**
+   * Keys revoked successfully
+   */
+  200: BulkRevokeApiKeysResponse
+}
+
+export type BulkRevokeWorkspaceMemberApiKeysResponse =
+  BulkRevokeWorkspaceMemberApiKeysResponses[keyof BulkRevokeWorkspaceMemberApiKeysResponses]
+
 export type VerifyWorkspaceApiKeyData = {
   body: VerifyApiKeyRequest
   path?: never
@@ -6359,6 +6904,9 @@ export type SetReviewStatusResponse2 =
 export type UpdateHubWorkflowData = {
   body: UpdateHubWorkflowRequest
   path: {
+    /**
+     * The share ID of the hub workflow to update.
+     */
     share_id: string
   }
   query?: never
@@ -6592,6 +7140,39 @@ export type UpdateSubscriptionCacheResponses = {
 export type UpdateSubscriptionCacheResponse =
   UpdateSubscriptionCacheResponses[keyof UpdateSubscriptionCacheResponses]
 
+export type SyncApiKeyData = {
+  body: SyncApiKeyRequest
+  path?: never
+  query?: never
+  url: '/admin/api/keys/sync'
+}
+
+export type SyncApiKeyErrors = {
+  /**
+   * Malformed request or unsupported event
+   */
+  400: ErrorResponse
+  /**
+   * Missing or invalid admin secret
+   */
+  401: ErrorResponse
+  /**
+   * Internal error
+   */
+  500: ErrorResponse
+}
+
+export type SyncApiKeyError = SyncApiKeyErrors[keyof SyncApiKeyErrors]
+
+export type SyncApiKeyResponses = {
+  /**
+   * Sync processed — see `result` field
+   */
+  200: SyncApiKeyResponse
+}
+
+export type SyncApiKeyResponse2 = SyncApiKeyResponses[keyof SyncApiKeyResponses]
+
 export type GetJobStatusData = {
   body?: never
   path: {
@@ -7209,6 +7790,9 @@ export type CreateWorkflowResponse =
 export type DeleteWorkflowData = {
   body?: never
   path: {
+    /**
+     * The UUID of the workflow to delete.
+     */
     workflow_id: string
   }
   query?: never
@@ -7246,6 +7830,9 @@ export type DeleteWorkflowResponse =
 export type GetWorkflowData = {
   body?: never
   path: {
+    /**
+     * The UUID of the workflow.
+     */
     workflow_id: string
   }
   query?: never
@@ -7286,6 +7873,9 @@ export type GetWorkflowResponse =
 export type UpdateWorkflowData = {
   body: UpdateWorkflowRequest
   path: {
+    /**
+     * The UUID of the workflow to update.
+     */
     workflow_id: string
   }
   query?: never
@@ -7327,6 +7917,9 @@ export type UpdateWorkflowResponse =
 export type CreateWorkflowVersionData = {
   body: CreateWorkflowVersionRequest
   path: {
+    /**
+     * The UUID of the workflow to create a new version for.
+     */
     workflow_id: string
   }
   query?: never
@@ -7376,6 +7969,9 @@ export type CreateWorkflowVersionResponse =
 export type GetWorkflowContentData = {
   body?: never
   path: {
+    /**
+     * The UUID of the workflow whose content should be retrieved.
+     */
     workflow_id: string
   }
   query?: never
@@ -7417,6 +8013,9 @@ export type GetWorkflowContentResponse =
 export type ForkWorkflowData = {
   body: ForkWorkflowRequest
   path: {
+    /**
+     * The UUID of the source workflow to fork from.
+     */
     workflow_id: string
   }
   query?: never
@@ -7576,6 +8175,9 @@ export type CheckHubUsernameResponse =
 export type GetHubProfileByUsernameData = {
   body?: never
   path: {
+    /**
+     * The hub profile username.
+     */
     username: string
   }
   query?: never
@@ -7609,6 +8211,9 @@ export type GetHubProfileByUsernameResponse =
 export type UpdateHubProfileData = {
   body: UpdateHubProfileRequest
   path: {
+    /**
+     * The hub profile username to update.
+     */
     username: string
   }
   query?: never
@@ -7853,6 +8458,9 @@ export type ListHubWorkflowIndexResponse =
 export type DeleteHubWorkflowData = {
   body?: never
   path: {
+    /**
+     * The share ID of the hub workflow to unpublish.
+     */
     share_id: string
   }
   query?: never
@@ -7890,6 +8498,9 @@ export type DeleteHubWorkflowResponse =
 export type GetHubWorkflowData = {
   body?: never
   path: {
+    /**
+     * The share ID of the hub workflow.
+     */
     share_id: string
   }
   query?: never
@@ -7927,6 +8538,9 @@ export type GetHubWorkflowResponse =
 export type GetPublishedWorkflowData = {
   body?: never
   path: {
+    /**
+     * The share ID of the published workflow.
+     */
     share_id: string
   }
   query?: never
@@ -8263,6 +8877,9 @@ export type GetWebsocketErrors = {
 export type GetTemplateProxyData = {
   body?: never
   path: {
+    /**
+     * Template subpath within the versioned GCS bucket.
+     */
     path: string
   }
   query?: never
@@ -8343,6 +8960,9 @@ export type GetMonitoringTasksResponses = {
 export type DeleteMonitoringTasksSubpathData = {
   body?: never
   path: {
+    /**
+     * Asynqmon deletion subpath (e.g. delete task).
+     */
     path: string
   }
   query?: never
@@ -8370,6 +8990,9 @@ export type DeleteMonitoringTasksSubpathResponses = {
 export type GetMonitoringTasksSubpathData = {
   body?: never
   path: {
+    /**
+     * Asynqmon UI subpath (HTML page, SPA XHR, or static asset).
+     */
     path: string
   }
   query?: never
@@ -8397,6 +9020,9 @@ export type GetMonitoringTasksSubpathResponses = {
 export type PostMonitoringTasksSubpathData = {
   body?: never
   path: {
+    /**
+     * Asynqmon action subpath (e.g. retry, archive).
+     */
     path: string
   }
   query?: never
@@ -8424,6 +9050,9 @@ export type PostMonitoringTasksSubpathResponses = {
 export type GetPprofData = {
   body?: never
   path: {
+    /**
+     * pprof endpoint name (e.g. heap, goroutine, allocs, block, mutex, threadcreate).
+     */
     path: string
   }
   query?: never
@@ -8482,6 +9111,9 @@ export type PostPprofSymbolResponses = {
 export type GetStaticExtensionsData = {
   body?: never
   path: {
+    /**
+     * Extension file path relative to /static/extensions on disk.
+     */
     path: string
   }
   query?: never
@@ -8505,6 +9137,9 @@ export type GetStaticExtensionsResponses = {
 export type GetCustomNodeProxyData = {
   body?: never
   path: {
+    /**
+     * Custom node HTTP endpoint path being proxied to the CPU-backed worker.
+     */
     path: string
   }
   query?: never
@@ -8532,6 +9167,9 @@ export type GetCustomNodeProxyResponses = {
 export type PostCustomNodeProxyData = {
   body?: never
   path: {
+    /**
+     * Custom node HTTP endpoint path being proxied to the CPU-backed worker.
+     */
     path: string
   }
   query?: never
@@ -8555,3 +9193,159 @@ export type PostCustomNodeProxyResponses = {
    */
   200: unknown
 }
+
+export type GetLegacyPromptByIdData = {
+  body?: never
+  path: {
+    prompt_id: string
+  }
+  query?: never
+  url: '/api/prompt/{prompt_id}'
+}
+
+export type GetLegacyPromptByIdErrors = {
+  /**
+   * Not Found — use /api/jobs/{prompt_id} instead
+   */
+  404: unknown
+}
+
+export type GetLegacyHistoryByIdData = {
+  body?: never
+  path: {
+    prompt_id: string
+  }
+  query?: never
+  url: '/api/history/{prompt_id}'
+}
+
+export type GetLegacyHistoryByIdErrors = {
+  /**
+   * Not Found — use /api/jobs/{prompt_id} instead
+   */
+  404: unknown
+}
+
+export type GetLegacyJobByIdData = {
+  body?: never
+  path: {
+    job_id: string
+  }
+  query?: never
+  url: '/api/job/{job_id}'
+}
+
+export type GetLegacyJobByIdErrors = {
+  /**
+   * Not Found — use /api/jobs/{job_id} instead
+   */
+  404: unknown
+}
+
+export type GetLegacyJobOutputsData = {
+  body?: never
+  path: {
+    job_id: string
+  }
+  query?: never
+  url: '/api/job/{job_id}/outputs'
+}
+
+export type GetLegacyJobOutputsErrors = {
+  /**
+   * Not Found — use /api/jobs/{job_id} instead
+   */
+  404: unknown
+}
+
+export type GetLegacyModelsData = {
+  body?: never
+  path?: never
+  query?: never
+  url: '/api/models'
+}
+
+export type GetLegacyModelsErrors = {
+  /**
+   * Not Found — use /api/experiment/models instead
+   */
+  404: unknown
+}
+
+export type GetLegacyModelsByFolderData = {
+  body?: never
+  path: {
+    folder: string
+  }
+  query?: never
+  url: '/api/models/{folder}'
+}
+
+export type GetLegacyModelsByFolderErrors = {
+  /**
+   * Not Found — use /api/experiment/models/{folder} instead
+   */
+  404: unknown
+}
+
+export type GetLegacyObjectInfoByNodeClassData = {
+  body?: never
+  path: {
+    node_class: string
+  }
+  query?: never
+  url: '/api/object_info/{node_class}'
+}
+
+export type GetLegacyObjectInfoByNodeClassErrors = {
+  /**
+   * Not Found — use /api/object_info instead
+   */
+  404: unknown
+}
+
+export type GetLegacyUserdataV2Data = {
+  body?: never
+  path?: never
+  query?: never
+  url: '/api/v2/userdata'
+}
+
+export type GetLegacyUserdataV2Errors = {
+  /**
+   * Not Found — use /api/userdata instead
+   */
+  404: unknown
+}
+
+export type GetLegacyAssetContentData = {
+  body?: never
+  path: {
+    id: string
+  }
+  query?: never
+  url: '/api/assets/{id}/content'
+}
+
+export type GetLegacyAssetContentErrors = {
+  /**
+   * Not Found — use /api/assets/download instead
+   */
+  404: unknown
+}
+
+export type GetLegacyViewMetadataData = {
+  body?: never
+  path: {
+    folder_name: string
+  }
+  query?: never
+  url: '/api/view_metadata/{folder_name}'
+}
+
+export type GetLegacyViewMetadataErrors = {
+  /**
+   * Not Found — use /api/experiment/models instead
+   */
+  404: unknown
+}
diff --git a/packages/ingest-types/src/zod.gen.ts b/packages/ingest-types/src/zod.gen.ts
index 1ad5981dd8..117a53448d 100644
--- a/packages/ingest-types/src/zod.gen.ts
+++ b/packages/ingest-types/src/zod.gen.ts
@@ -2,6 +2,9 @@
 
 import { z } from 'zod'
 
+/**
+ * Response indicating whether a Hub username is available.
+ */
 export const zHubUsernameCheckResponse = z.object({
   username: z.string(),
   available: z.boolean(),
@@ -9,12 +12,18 @@ export const zHubUsernameCheckResponse = z.object({
   validation_error: z.string().optional()
 })
 
+/**
+ * Response containing a signed upload URL and the target asset path.
+ */
 export const zHubAssetUploadUrlResponse = z.object({
   upload_url: z.string(),
   public_url: z.string(),
   token: z.string()
 })
 
+/**
+ * Request body for requesting a signed upload URL for a Hub asset.
+ */
 export const zHubAssetUploadUrlRequest = z.object({
   filename: z.string(),
   content_type: z.string()
@@ -46,6 +55,9 @@ export const zUpdateHubWorkflowRequest = z.object({
   metadata: z.record(z.unknown()).nullish()
 })
 
+/**
+ * Request body for publishing or updating a workflow on the Hub.
+ */
 export const zPublishHubWorkflowRequest = z.object({
   username: z.string(),
   name: z.string(),
@@ -63,6 +75,9 @@ export const zPublishHubWorkflowRequest = z.object({
   sample_image_tokens_or_urls: z.array(z.string()).optional()
 })
 
+/**
+ * Lightweight asset reference used in workflow publishing payloads.
+ */
 export const zAssetInfo = z.object({
   id: z.string(),
   name: z.string(),
@@ -73,12 +88,18 @@ export const zAssetInfo = z.object({
   in_library: z.boolean()
 })
 
+/**
+ * Abbreviated Hub profile used in workflow listings.
+ */
 export const zHubProfileSummary = z.object({
   username: z.string(),
   display_name: z.string().optional(),
   avatar_url: z.string().optional()
 })
 
+/**
+ * Reference to a Hub label by ID.
+ */
 export const zLabelRef = z.object({
   name: z.string(),
   display_name: z.string()
@@ -94,6 +115,9 @@ export const zHubWorkflowStatus = z.enum([
   'deprecated'
 ])
 
+/**
+ * Full Hub workflow detail including versions, assets, and statistics.
+ */
 export const zHubWorkflowDetail = z.object({
   share_id: z.string(),
   workflow_id: z.string(),
@@ -115,6 +139,9 @@ export const zHubWorkflowDetail = z.object({
   profile: zHubProfileSummary
 })
 
+/**
+ * Abbreviated Hub workflow metadata used in search and listing results.
+ */
 export const zHubWorkflowSummary = z.object({
   share_id: z.string(),
   name: z.string(),
@@ -133,11 +160,17 @@ export const zHubWorkflowSummary = z.object({
   sample_image_urls: z.array(z.string()).optional()
 })
 
+/**
+ * Paginated list of Hub workflows matching search criteria.
+ */
 export const zHubWorkflowListResponse = z.object({
   workflows: z.array(z.union([zHubWorkflowSummary, zHubWorkflowDetail])),
   next_cursor: z.string().optional()
 })
 
+/**
+ * Metadata for a single Hub label.
+ */
 export const zHubLabelInfo = z.object({
   name: z.string(),
   display_name: z.string(),
@@ -145,10 +178,16 @@ export const zHubLabelInfo = z.object({
   type: z.enum(['tag', 'model', 'custom_node'])
 })
 
+/**
+ * List of available Hub labels for categorizing workflows.
+ */
 export const zHubLabelListResponse = z.object({
   labels: z.array(zHubLabelInfo)
 })
 
+/**
+ * Entry in the curated workflow template gallery shown on the home page.
+ */
 export const zHubWorkflowTemplateEntry = z.object({
   name: z.string(),
   title: z.string(),
@@ -227,6 +266,9 @@ export const zHubWorkflowTemplateEntry = z.object({
   contentTemplate: z.string().optional()
 })
 
+/**
+ * Request body for updating an existing Hub profile.
+ */
 export const zUpdateHubProfileRequest = z.object({
   display_name: z.string().optional(),
   description: z.string().optional(),
@@ -234,6 +276,9 @@ export const zUpdateHubProfileRequest = z.object({
   website_urls: z.array(z.string()).optional()
 })
 
+/**
+ * Request body for creating a new Hub profile.
+ */
 export const zCreateHubProfileRequest = z.object({
   workspace_id: z.string(),
   username: z.string(),
@@ -243,6 +288,9 @@ export const zCreateHubProfileRequest = z.object({
   website_urls: z.array(z.string()).optional()
 })
 
+/**
+ * Full public profile for a Hub creator.
+ */
 export const zHubProfile = z.object({
   username: z.string(),
   display_name: z.string().optional(),
@@ -251,14 +299,24 @@ export const zHubProfile = z.object({
   website_urls: z.array(z.string()).optional()
 })
 
+/**
+ * Response after importing published workflow assets.
+ */
 export const zImportPublishedAssetsResponse = z.object({
   assets: z.array(zAssetInfo)
 })
 
+/**
+ * Request body for importing assets from a published workflow.
+ */
 export const zImportPublishedAssetsRequest = z.object({
-  published_asset_ids: z.array(z.string())
+  published_asset_ids: z.array(z.string()),
+  share_id: z.string().nullish()
 })
 
+/**
+ * Full detail of a publicly published workflow on the Hub.
+ */
 export const zPublishedWorkflowDetail = z.object({
   share_id: z.string(),
   workflow_id: z.string(),
@@ -269,18 +327,30 @@ export const zPublishedWorkflowDetail = z.object({
   assets: z.array(zAssetInfo)
 })
 
+/**
+ * Response containing assets associated with a workflow.
+ */
 export const zWorkflowApiAssetsResponse = z.object({
   assets: z.array(zAssetInfo)
 })
 
+/**
+ * Request body for querying assets associated with a workflow.
+ */
 export const zWorkflowApiAssetsRequest = z.object({
   workflow_api_json: z.record(z.unknown())
 })
 
+/**
+ * Request body for publishing workflow assets to the Hub.
+ */
 export const zPublishWorkflowAssetsRequest = z.object({
   asset_ids: z.array(z.string())
 })
 
+/**
+ * Publishing metadata for a workflow shared to the Hub.
+ */
 export const zWorkflowPublishInfo = z.object({
   workflow_id: z.string(),
   share_id: z.string(),
@@ -289,11 +359,17 @@ export const zWorkflowPublishInfo = z.object({
   assets: z.array(zAssetInfo)
 })
 
+/**
+ * Request body for forking an existing workflow into the user's account.
+ */
 export const zForkWorkflowRequest = z.object({
   source_version: z.number().int(),
   name: z.string().optional()
 })
 
+/**
+ * Full workflow version including the serialized workflow JSON.
+ */
 export const zWorkflowVersionContentResponse = z.object({
   id: z.string(),
   version: z.number().int(),
@@ -303,6 +379,9 @@ export const zWorkflowVersionContentResponse = z.object({
   dependency_asset_ids: z.array(z.string()).optional()
 })
 
+/**
+ * Metadata for a single workflow version.
+ */
 export const zWorkflowVersionResponse = z.object({
   id: z.string(),
   version: z.number().int(),
@@ -311,11 +390,17 @@ export const zWorkflowVersionResponse = z.object({
   created_at: z.string().datetime()
 })
 
+/**
+ * Request body for creating a new version of a saved workflow.
+ */
 export const zCreateWorkflowVersionRequest = z.object({
   base_version: z.number().int(),
   workflow_json: z.record(z.unknown())
 })
 
+/**
+ * Offset/limit-based pagination metadata included in list responses.
+ */
 export const zPaginationInfo = z.object({
   offset: z.number().int().gte(0),
   limit: z.number().int().gte(1),
@@ -323,11 +408,17 @@ export const zPaginationInfo = z.object({
   has_more: z.boolean()
 })
 
+/**
+ * Reference to the parent workflow from which this workflow was forked.
+ */
 export const zWorkflowForkedFrom = z.object({
   workflow_id: z.string().optional(),
   workflow_version_id: z.string().optional()
 })
 
+/**
+ * Full workflow entity including metadata and version history.
+ */
 export const zWorkflowResponse = z.object({
   id: z.string(),
   name: z.string().optional(),
@@ -340,17 +431,26 @@ export const zWorkflowResponse = z.object({
   updated_at: z.string().datetime()
 })
 
+/**
+ * Paginated list of saved workflows.
+ */
 export const zWorkflowListResponse = z.object({
   data: z.array(zWorkflowResponse),
   pagination: zPaginationInfo
 })
 
+/**
+ * Request body for updating an existing saved workflow.
+ */
 export const zUpdateWorkflowRequest = z.object({
   name: z.string().optional(),
   description: z.string().optional(),
   default_view: z.enum(['workflow', 'app']).optional()
 })
 
+/**
+ * Request body for creating a new saved workflow.
+ */
 export const zCreateWorkflowRequest = z.object({
   name: z.string().optional(),
   description: z.string().optional(),
@@ -360,10 +460,16 @@ export const zCreateWorkflowRequest = z.object({
   forked_from_workflow_version_id: z.string().optional()
 })
 
+/**
+ * Response after recording partner usage data.
+ */
 export const zPartnerUsageResponse = z.object({
   status: z.string()
 })
 
+/**
+ * Request body for reporting partner resource usage (admin endpoint).
+ */
 export const zPartnerUsageRequest = z.object({
   workspace_id: z.string().min(1),
   user_id: z.string().optional(),
@@ -373,6 +479,9 @@ export const zPartnerUsageRequest = z.object({
   properties: z.record(z.unknown()).optional()
 })
 
+/**
+ * Status of an asynchronous billing operation.
+ */
 export const zBillingOpStatusResponse = z.object({
   id: z.string(),
   status: z.enum(['pending', 'succeeded', 'failed']),
@@ -381,6 +490,9 @@ export const zBillingOpStatusResponse = z.object({
   completed_at: z.string().datetime().optional()
 })
 
+/**
+ * Response after successfully purchasing a credit top-up.
+ */
 export const zCreateTopupResponse = z.object({
   billing_op_id: z.string(),
   topup_id: z.string(),
@@ -395,6 +507,9 @@ export const zCreateTopupResponse = z.object({
     })
 })
 
+/**
+ * Request body for purchasing a one-time credit top-up.
+ */
 export const zCreateTopupRequest = z.object({
   amount_cents: z.coerce
     .bigint()
@@ -405,33 +520,54 @@ export const zCreateTopupRequest = z.object({
   idempotency_key: z.string().optional()
 })
 
+/**
+ * Response containing a redirect URL to the payment portal.
+ */
 export const zPaymentPortalResponse = z.object({
   url: z.string()
 })
 
+/**
+ * Request body for generating a payment portal session URL.
+ */
 export const zPaymentPortalRequest = z.object({
   return_url: z.string().optional()
 })
 
+/**
+ * Response after successfully resubscribing to a billing plan.
+ */
 export const zResubscribeResponse = z.object({
   billing_op_id: z.string(),
   status: z.enum(['active']),
   message: z.string().optional()
 })
 
+/**
+ * Request body for reactivating a previously cancelled subscription.
+ */
 export const zResubscribeRequest = z.object({
   idempotency_key: z.string().optional()
 })
 
+/**
+ * Response after successfully cancelling a subscription.
+ */
 export const zCancelSubscriptionResponse = z.object({
   billing_op_id: z.string(),
   cancel_at: z.string().datetime()
 })
 
+/**
+ * Request body for cancelling the current subscription.
+ */
 export const zCancelSubscriptionRequest = z.object({
   idempotency_key: z.string().optional()
 })
 
+/**
+ * Response after successfully subscribing to a billing plan.
+ */
 export const zSubscribeResponse = z.object({
   billing_op_id: z.string(),
   status: z.enum(['subscribed', 'needs_payment_method', 'pending_payment']),
@@ -439,6 +575,9 @@ export const zSubscribeResponse = z.object({
   payment_method_url: z.string().optional()
 })
 
+/**
+ * Request body for subscribing a workspace to a billing plan.
+ */
 export const zSubscribeRequest = z.object({
   plan_slug: z.string(),
   idempotency_key: z.string().optional(),
@@ -513,6 +652,9 @@ export const zPreviewPlanInfo = z.object({
   period_end: z.string().datetime().optional()
 })
 
+/**
+ * Itemized cost preview for a pending subscription change.
+ */
 export const zPreviewSubscribeResponse = z.object({
   allowed: z.boolean(),
   reason: z.string().optional(),
@@ -560,6 +702,9 @@ export const zPreviewSubscribeResponse = z.object({
   new_plan: zPreviewPlanInfo
 })
 
+/**
+ * Request body for previewing the cost of a plan subscription change.
+ */
 export const zPreviewSubscribeRequest = z.object({
   plan_slug: z.string()
 })
@@ -575,11 +720,17 @@ export const zPlanAvailabilityReason = z.enum([
   'exceeds_max_seats'
 ])
 
+/**
+ * Availability and eligibility information for a billing plan.
+ */
 export const zPlanAvailability = z.object({
   available: z.boolean(),
   reason: zPlanAvailabilityReason.optional()
 })
 
+/**
+ * Billing plan details including pricing, limits, and features.
+ */
 export const zPlan = z.object({
   slug: z.string(),
   tier: zSubscriptionTier,
@@ -612,11 +763,17 @@ export const zPlan = z.object({
   seat_summary: zPlanSeatSummary
 })
 
+/**
+ * List of available billing plans for subscription.
+ */
 export const zBillingPlansResponse = z.object({
   current_plan_slug: z.string().optional(),
   plans: z.array(zPlan)
 })
 
+/**
+ * User secret metadata (the secret value itself is never returned after creation).
+ */
 export const zSecretResponse = z.object({
   id: z.string().uuid(),
   name: z.string(),
@@ -626,21 +783,33 @@ export const zSecretResponse = z.object({
   updated_at: z.string().datetime()
 })
 
+/**
+ * List of user secrets with metadata only.
+ */
 export const zSecretListResponse = z.object({
   data: z.array(zSecretResponse)
 })
 
+/**
+ * Request body for updating an existing user secret.
+ */
 export const zUpdateSecretRequest = z.object({
   name: z.string().min(1).max(255).optional(),
   secret_value: z.string().min(1).optional()
 })
 
+/**
+ * Request body for creating a new user secret.
+ */
 export const zCreateSecretRequest = z.object({
   name: z.string().min(1).max(255),
   provider: z.string().max(64).optional(),
   secret_value: z.string().min(1)
 })
 
+/**
+ * A single billing event such as a charge, credit, or adjustment.
+ */
 export const zBillingEvent = z.object({
   event_type: z.string(),
   event_id: z.string(),
@@ -648,6 +817,9 @@ export const zBillingEvent = z.object({
   createdAt: z.string().datetime()
 })
 
+/**
+ * Paginated list of billing events for a workspace.
+ */
 export const zBillingEventsResponse = z.object({
   total: z.number().int(),
   events: z.array(zBillingEvent),
@@ -656,6 +828,9 @@ export const zBillingEventsResponse = z.object({
   totalPages: z.number().int()
 })
 
+/**
+ * Current credit balance and usage details for a workspace.
+ */
 export const zBillingBalanceResponse = z.object({
   amount_micros: z.number(),
   prepaid_balance_micros: z.number().optional(),
@@ -676,6 +851,9 @@ export const zBillingStatus = z.enum([
   'inactive'
 ])
 
+/**
+ * Current billing and subscription status for a workspace.
+ */
 export const zBillingStatusResponse = z.object({
   is_active: z.boolean(),
   subscription_status: z.enum(['active', 'ended', 'canceled']).optional(),
@@ -688,6 +866,9 @@ export const zBillingStatusResponse = z.object({
   renewal_date: z.string().datetime().optional()
 })
 
+/**
+ * A single JSON Web Key entry within a JWKS response.
+ */
 export const zJwkKey = z.object({
   kty: z.string(),
   crv: z.string(),
@@ -698,10 +879,32 @@ export const zJwkKey = z.object({
   y: z.string()
 })
 
+/**
+ * JSON Web Key Set containing the public keys used to verify Cloud JWTs.
+ */
 export const zJwksResponse = z.object({
   keys: z.array(zJwkKey)
 })
 
+/**
+ * Response after synchronizing an API key into the local database.
+ */
+export const zSyncApiKeyResponse = z.object({
+  result: z.enum(['revoked', 'already_revoked', 'no_op'])
+})
+
+/**
+ * Request body for synchronizing an API key from the external registry.
+ */
+export const zSyncApiKeyRequest = z.object({
+  event: z.enum(['delete']),
+  key_hash: z.string().regex(/^[0-9a-fA-F]{64}$/),
+  customer_id: z.string().min(1)
+})
+
+/**
+ * Response confirming the validity and scope of a workspace API key.
+ */
 export const zVerifyApiKeyResponse = z.object({
   user_id: z.string(),
   email: z.string(),
@@ -715,10 +918,23 @@ export const zVerifyApiKeyResponse = z.object({
   permissions: z.array(z.string())
 })
 
+/**
+ * Request body for verifying a workspace API key (admin endpoint).
+ */
 export const zVerifyApiKeyRequest = z.object({
   api_key: z.string()
 })
 
+/**
+ * Response after bulk-revoking API keys for a workspace member.
+ */
+export const zBulkRevokeApiKeysResponse = z.object({
+  revoked_count: z.number().int().gte(0)
+})
+
+/**
+ * Metadata for a workspace-scoped API key (secret is never returned).
+ */
 export const zWorkspaceApiKeyInfo = z.object({
   id: z.string().uuid(),
   workspace_id: z.string(),
@@ -731,10 +947,16 @@ export const zWorkspaceApiKeyInfo = z.object({
   created_at: z.string().datetime()
 })
 
+/**
+ * List of API keys associated with the current workspace.
+ */
 export const zListWorkspaceApiKeysResponse = z.object({
   api_keys: z.array(zWorkspaceApiKeyInfo)
 })
 
+/**
+ * Response containing the newly created workspace API key.
+ */
 export const zCreateWorkspaceApiKeyResponse = z.object({
   id: z.string().uuid(),
   name: z.string(),
@@ -744,20 +966,32 @@ export const zCreateWorkspaceApiKeyResponse = z.object({
   created_at: z.string().datetime()
 })
 
+/**
+ * Request body for creating a new workspace-scoped API key.
+ */
 export const zCreateWorkspaceApiKeyRequest = z.object({
   name: z.string(),
   expires_at: z.string().datetime().optional()
 })
 
+/**
+ * Response returned after successfully accepting a workspace invitation.
+ */
 export const zAcceptInviteResponse = z.object({
   workspace_id: z.string(),
   workspace_name: z.string()
 })
 
+/**
+ * Request body for inviting a user to a workspace.
+ */
 export const zCreateInviteRequest = z.object({
   email: z.string().email()
 })
 
+/**
+ * An outstanding workspace invitation that has not yet been accepted.
+ */
 export const zPendingInvite = z.object({
   id: z.string(),
   email: z.string().email(),
@@ -766,10 +1000,16 @@ export const zPendingInvite = z.object({
   expires_at: z.string().datetime()
 })
 
+/**
+ * List of pending invitations for the current workspace.
+ */
 export const zListInvitesResponse = z.object({
   invites: z.array(zPendingInvite)
 })
 
+/**
+ * Workspace member with profile and role information.
+ */
 export const zMember = z.object({
   id: z.string(),
   name: z.string(),
@@ -778,19 +1018,31 @@ export const zMember = z.object({
   joined_at: z.string().datetime()
 })
 
+/**
+ * List of members in the current workspace.
+ */
 export const zListMembersResponse = z.object({
   members: z.array(zMember),
   pagination: zPaginationInfo
 })
 
+/**
+ * Request body for updating an existing workspace's settings.
+ */
 export const zUpdateWorkspaceRequest = z.object({
   name: z.string().min(1).max(100).optional()
 })
 
+/**
+ * Request body for creating a new workspace.
+ */
 export const zCreateWorkspaceRequest = z.object({
   name: z.string().min(1).max(100)
 })
 
+/**
+ * Workspace entity annotated with the requesting user's role.
+ */
 export const zWorkspaceWithRole = z.object({
   id: z.string(),
   name: z.string(),
@@ -801,10 +1053,16 @@ export const zWorkspaceWithRole = z.object({
   subscription_tier: zSubscriptionTier.optional()
 })
 
+/**
+ * Paginated list of workspaces the authenticated user belongs to.
+ */
 export const zListWorkspacesResponse = z.object({
   workspaces: z.array(zWorkspaceWithRole)
 })
 
+/**
+ * Full workspace entity with configuration and ownership details.
+ */
 export const zWorkspace = z.object({
   id: z.string(),
   name: z.string(),
@@ -812,12 +1070,18 @@ export const zWorkspace = z.object({
   created_at: z.string().datetime()
 })
 
+/**
+ * Abbreviated workspace metadata used in list responses.
+ */
 export const zWorkspaceSummary = z.object({
   id: z.string(),
   name: z.string(),
   type: z.enum(['personal', 'team'])
 })
 
+/**
+ * Response containing the issued Cloud JWT and its expiry.
+ */
 export const zExchangeTokenResponse = z.object({
   token: z.string(),
   expires_at: z.string().datetime(),
@@ -826,6 +1090,12 @@ export const zExchangeTokenResponse = z.object({
   permissions: z.array(z.string())
 })
 
+/**
+ * Optional request body for the token exchange endpoint. The Firebase JWT
+ * being exchanged is supplied via the `Authorization: Bearer` header; this
+ * body only carries workspace-selection input.
+ *
+ */
 export const zExchangeTokenRequest = z.object({
   workspace_id: z.string().optional()
 })
@@ -859,16 +1129,25 @@ export const zTaskEntry = z.object({
   completed_at: z.string().datetime().optional()
 })
 
+/**
+ * Paginated list of background tasks for the authenticated user.
+ */
 export const zTasksListResponse = z.object({
   tasks: z.array(zTaskEntry),
   pagination: zPaginationInfo
 })
 
+/**
+ * Current status of a user data deletion request.
+ */
 export const zDeletionStatus = z.object({
   status_name: z.string(),
   status_details: z.string()
 })
 
+/**
+ * Details of a pending or completed user data deletion request.
+ */
 export const zDeletionRequest = z.object({
   id: z.string(),
   firebase_id: z.string(),
@@ -927,6 +1206,13 @@ export const zJobDetailResponse = z.object({
   execution_meta: z.record(z.unknown()).optional()
 })
 
+/**
+ * Response for POST /api/jobs/{job_id}/cancel. Returned on both fresh cancels and idempotent no-ops.
+ */
+export const zJobCancelResponse = z.object({
+  cancelled: z.boolean()
+})
+
 /**
  * Lightweight job data for list views (workflow and full outputs excluded)
  */
@@ -971,11 +1257,17 @@ export const zJobEntry = z.object({
     .optional()
 })
 
+/**
+ * Paginated list of jobs for the authenticated user.
+ */
 export const zJobsListResponse = z.object({
   jobs: z.array(zJobEntry),
   pagination: zPaginationInfo
 })
 
+/**
+ * Response after adding, updating, or removing tags on an asset.
+ */
 export const zTagsModificationResponse = z.object({
   added: z.array(z.string()).optional(),
   removed: z.array(z.string()).optional(),
@@ -984,24 +1276,36 @@ export const zTagsModificationResponse = z.object({
   total_tags: z.array(z.string())
 })
 
+/**
+ * Details of a single validation error encountered during asset operations.
+ */
 export const zValidationError = z.object({
   code: z.string(),
   message: z.string(),
   field: z.string()
 })
 
+/**
+ * Result of validating a set of asset operations.
+ */
 export const zValidationResult = z.object({
   is_valid: z.boolean(),
   errors: z.array(zValidationError).optional(),
   warnings: z.array(zValidationError).optional()
 })
 
+/**
+ * Acknowledgement of an async asset download task; clients poll GET /api/tasks/{task_id} for status.
+ */
 export const zAssetDownloadResponse = z.object({
   task_id: z.string().uuid(),
   status: z.enum(['created', 'running', 'completed', 'failed']),
   message: z.string().optional()
 })
 
+/**
+ * Metadata for a remotely hosted asset resolved by URL.
+ */
 export const zAssetMetadataResponse = z.object({
   content_length: z.coerce
     .bigint()
@@ -1019,21 +1323,33 @@ export const zAssetMetadataResponse = z.object({
   validation: zValidationResult.optional()
 })
 
+/**
+ * Histogram of tag counts used for refining asset search results.
+ */
 export const zAssetTagHistogramResponse = z.object({
   tag_counts: z.record(z.number().int())
 })
 
+/**
+ * Metadata for a single tag that can be applied to assets.
+ */
 export const zTagInfo = z.object({
   name: z.string(),
   count: z.number().int()
 })
 
+/**
+ * Paginated list of available asset tags.
+ */
 export const zListTagsResponse = z.object({
   tags: z.array(zTagInfo),
   total: z.number().int(),
   has_more: z.boolean()
 })
 
+/**
+ * Represents a user-owned asset (image, video, or other generated output).
+ */
 export const zAsset = z.object({
   id: z.string().uuid(),
   name: z.string(),
@@ -1056,18 +1372,25 @@ export const zAsset = z.object({
   preview_url: z.string().url().optional(),
   preview_id: z.string().uuid().nullish(),
   prompt_id: z.string().uuid().nullish(),
+  job_id: z.string().uuid().nullish(),
   created_at: z.string().datetime(),
   updated_at: z.string().datetime(),
   last_access_time: z.string().datetime().optional(),
   is_immutable: z.boolean().optional()
 })
 
+/**
+ * Paginated list of assets belonging to the authenticated user.
+ */
 export const zListAssetsResponse = z.object({
   assets: z.array(zAsset),
   total: z.number().int(),
   has_more: z.boolean()
 })
 
+/**
+ * Response returned when an existing asset is successfully updated.
+ */
 export const zAssetUpdated = z.object({
   id: z.string().uuid(),
   name: z.string().optional(),
@@ -1081,17 +1404,26 @@ export const zAssetUpdated = z.object({
   updated_at: z.string().datetime()
 })
 
+/**
+ * Response returned when a new asset is successfully created.
+ */
 export const zAssetCreated = zAsset.and(
   z.object({
     created_new: z.boolean()
   })
 )
 
+/**
+ * Response after updating the review status of a Hub workflow.
+ */
 export const zSetReviewStatusResponse = z.object({
   share_ids: z.array(z.string()),
   status: z.enum(['approved', 'rejected'])
 })
 
+/**
+ * Request body for setting the review status of a Hub workflow.
+ */
 export const zSetReviewStatusRequest = z.object({
   share_ids: z.array(z.string()).min(1),
   status: z.enum(['approved', 'rejected'])
@@ -1196,6 +1528,9 @@ export const zModelFolder = z.object({
  */
 export const zPromptErrorResponse = z.record(z.unknown())
 
+/**
+ * Individual file entry within a full user data response.
+ */
 export const zGetUserDataResponseFullFile = z.object({
   path: z.string().optional(),
   size: z.number().int().optional(),
@@ -1210,8 +1545,14 @@ export const zGetUserDataResponseFullFile = z.object({
     .optional()
 })
 
+/**
+ * List of user data file entries (each with path, size, and modification time) returned when full_info=true.
+ */
 export const zGetUserDataResponseFull = z.array(zGetUserDataResponseFullFile)
 
+/**
+ * User data listing entry with file metadata (path, size, modification time).
+ */
 export const zUserDataResponseFull = z.object({
   path: z.string().optional(),
   size: z.number().int().optional(),
@@ -1254,6 +1595,9 @@ export const zJobStatusResponse = z.object({
   error_message: z.string().nullish()
 })
 
+/**
+ * Response after a queue management action (delete or clear).
+ */
 export const zQueueManageResponse = z.object({
   deleted: z.array(z.string()).optional(),
   cleared: z.boolean().optional()
@@ -1369,6 +1713,9 @@ export const zGlobalSubgraphInfo = z.object({
   data: z.string().optional()
 })
 
+/**
+ * Metadata describing a single ComfyUI node type and its inputs/outputs.
+ */
 export const zNodeInfo = z.object({
   input: z.record(z.unknown()).optional(),
   input_order: z.record(z.array(z.string())).optional(),
@@ -1387,6 +1734,9 @@ export const zNodeInfo = z.object({
   api_node: z.boolean().optional()
 })
 
+/**
+ * Metadata about the currently running and queued prompts.
+ */
 export const zPromptInfo = z.object({
   exec_info: z
     .object({
@@ -1395,26 +1745,41 @@ export const zPromptInfo = z.object({
     .optional()
 })
 
+/**
+ * Response containing a signed download URL for an exported asset archive.
+ */
 export const zExportDownloadUrlResponse = z.object({
   url: z.string(),
   expires_at: z.string().datetime().optional()
 })
 
+/**
+ * Error shape returned when request binding or validation fails before the handler runs.
+ */
 export const zBindingErrorResponse = z.object({
   message: z.string()
 })
 
+/**
+ * Standard error response with a machine-readable code and human-readable message.
+ */
 export const zErrorResponse = z.object({
   code: z.string(),
   message: z.string()
 })
 
+/**
+ * Response returned after successfully queuing a workflow prompt.
+ */
 export const zPromptResponse = z.object({
   prompt_id: z.string().uuid().optional(),
   number: z.number().optional(),
   node_errors: z.record(z.unknown()).optional()
 })
 
+/**
+ * Request body for submitting a ComfyUI workflow prompt for execution.
+ */
 export const zPromptRequest = z.object({
   prompt: z.record(z.unknown()),
   number: z.number().optional(),
@@ -1425,6 +1790,9 @@ export const zPromptRequest = z.object({
   workflow_version_id: z.string().optional()
 })
 
+/**
+ * Represents a user-owned asset (image, video, or other generated output).
+ */
 export const zAssetWritable = z.object({
   id: z.string().uuid(),
   name: z.string(),
@@ -1446,18 +1814,25 @@ export const zAssetWritable = z.object({
   preview_url: z.string().url().optional(),
   preview_id: z.string().uuid().nullish(),
   prompt_id: z.string().uuid().nullish(),
+  job_id: z.string().uuid().nullish(),
   created_at: z.string().datetime(),
   updated_at: z.string().datetime(),
   last_access_time: z.string().datetime().optional(),
   is_immutable: z.boolean().optional()
 })
 
+/**
+ * Paginated list of assets belonging to the authenticated user.
+ */
 export const zListAssetsResponseWritable = z.object({
   assets: z.array(zAssetWritable),
   total: z.number().int(),
   has_more: z.boolean()
 })
 
+/**
+ * Response returned when a new asset is successfully created.
+ */
 export const zAssetCreatedWritable = zAssetWritable.and(
   z.object({
     created_new: z.boolean()
@@ -1601,6 +1976,12 @@ export const zGetModelPreviewData = z.object({
  */
 export const zGetModelPreviewResponse = z.string()
 
+export const zGetLegacyHistoryData = z.object({
+  body: z.never().optional(),
+  path: z.never().optional(),
+  query: z.never().optional()
+})
+
 export const zManageHistoryData = z.object({
   body: zHistoryManageRequest,
   path: z.never().optional(),
@@ -1670,6 +2051,19 @@ export const zGetJobDetailData = z.object({
  */
 export const zGetJobDetailResponse = zJobDetailResponse
 
+export const zCancelJobData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    job_id: z.string().uuid()
+  }),
+  query: z.never().optional()
+})
+
+/**
+ * Success - Cancel request accepted (or job was already terminal)
+ */
+export const zCancelJobResponse = zJobCancelResponse
+
 export const zViewFileData = z.object({
   body: z.never().optional(),
   path: z.never().optional(),
@@ -1818,7 +2212,7 @@ export const zCreateAssetExportData = z.object({
     job_ids: z.array(z.string()).optional(),
     asset_ids: z.array(z.string()).optional(),
     naming_strategy: z
-      .enum(['group_by_job_id', 'group_by_job_time', 'preserve', 'asset_id'])
+      .enum(['group_by_job_id', 'preserve', 'asset_id', 'group_by_job_time'])
       .optional(),
     job_asset_name_filters: z.record(z.array(z.string()).min(1)).optional()
   }),
@@ -2564,6 +2958,20 @@ export const zRevokeWorkspaceApiKeyData = z.object({
  */
 export const zRevokeWorkspaceApiKeyResponse = z.void()
 
+export const zBulkRevokeWorkspaceMemberApiKeysData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    user_id: z.string().min(1)
+  }),
+  query: z.never().optional()
+})
+
+/**
+ * Keys revoked successfully
+ */
+export const zBulkRevokeWorkspaceMemberApiKeysResponse =
+  zBulkRevokeApiKeysResponse
+
 export const zVerifyWorkspaceApiKeyData = z.object({
   body: zVerifyApiKeyRequest,
   path: z.never().optional(),
@@ -2670,6 +3078,17 @@ export const zUpdateSubscriptionCacheResponse = z.object({
   status: z.string().optional()
 })
 
+export const zSyncApiKeyData = z.object({
+  body: zSyncApiKeyRequest,
+  path: z.never().optional(),
+  query: z.never().optional()
+})
+
+/**
+ * Sync processed — see `result` field
+ */
+export const zSyncApiKeyResponse2 = zSyncApiKeyResponse
+
 export const zGetJobStatusData = z.object({
   body: z.never().optional(),
   path: z.object({
@@ -3337,3 +3756,79 @@ export const zPostCustomNodeProxyData = z.object({
   }),
   query: z.never().optional()
 })
+
+export const zGetLegacyPromptByIdData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    prompt_id: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyHistoryByIdData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    prompt_id: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyJobByIdData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    job_id: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyJobOutputsData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    job_id: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyModelsData = z.object({
+  body: z.never().optional(),
+  path: z.never().optional(),
+  query: z.never().optional()
+})
+
+export const zGetLegacyModelsByFolderData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    folder: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyObjectInfoByNodeClassData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    node_class: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyUserdataV2Data = z.object({
+  body: z.never().optional(),
+  path: z.never().optional(),
+  query: z.never().optional()
+})
+
+export const zGetLegacyAssetContentData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    id: z.string()
+  }),
+  query: z.never().optional()
+})
+
+export const zGetLegacyViewMetadataData = z.object({
+  body: z.never().optional(),
+  path: z.object({
+    folder_name: z.string()
+  }),
+  query: z.never().optional()
+})
diff --git a/packages/object-info-parser/package.json b/packages/object-info-parser/package.json
new file mode 100644
index 0000000000..f6ea11577e
--- /dev/null
+++ b/packages/object-info-parser/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "@comfyorg/object-info-parser",
+  "version": "1.0.0",
+  "description": "Shared object_info schemas and helpers",
+  "license": "GPL-3.0-only",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "test": "vitest run --config ./vitest.config.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "zod": "catalog:",
+    "zod-validation-error": "catalog:"
+  },
+  "devDependencies": {
+    "typescript": "catalog:",
+    "vitest": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:util"
+    ]
+  }
+}
diff --git a/packages/object-info-parser/src/__tests__/groupNodesByPack.test.ts b/packages/object-info-parser/src/__tests__/groupNodesByPack.test.ts
new file mode 100644
index 0000000000..6c490b1d1b
--- /dev/null
+++ b/packages/object-info-parser/src/__tests__/groupNodesByPack.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+
+import { groupNodesByPack } from '../helpers/groupNodesByPack'
+import type { ComfyNodeDef } from '../schemas/nodeDefSchema'
+
+function makeNodeDef(
+  name: string,
+  pythonModule: string,
+  displayName = name
+): ComfyNodeDef {
+  return {
+    name,
+    display_name: displayName,
+    description: '',
+    category: 'test',
+    output_node: false,
+    python_module: pythonModule
+  }
+}
+
+describe('groupNodesByPack', () => {
+  it('excludes core nodes and groups custom nodes by pack id', () => {
+    const grouped = groupNodesByPack({
+      CoreNode: makeNodeDef('CoreNode', 'nodes'),
+      ImpactA: makeNodeDef(
+        'ImpactA',
+        'custom_nodes.comfyui-impact-pack.nodes',
+        'Impact A'
+      ),
+      ImpactB: makeNodeDef(
+        'ImpactB',
+        'custom_nodes.comfyui-impact-pack.nodes',
+        'Impact B'
+      ),
+      AuxNode: makeNodeDef(
+        'AuxNode',
+        'custom_nodes.comfyui-controlnet-aux.nodes',
+        'Aux Node'
+      )
+    })
+
+    expect(grouped).toHaveLength(2)
+    expect(grouped.map((pack) => pack.id)).toEqual([
+      'comfyui-controlnet-aux',
+      'comfyui-impact-pack'
+    ])
+    expect(
+      grouped.find((pack) => pack.id === 'comfyui-impact-pack')?.nodes
+    ).toHaveLength(2)
+    expect(
+      grouped.find((pack) => pack.id === 'comfyui-controlnet-aux')?.nodes
+    ).toHaveLength(1)
+  })
+})
diff --git a/src/schemas/nodeDefSchema.validation.test.ts b/packages/object-info-parser/src/__tests__/nodeDefSchema.test.ts
similarity index 51%
rename from src/schemas/nodeDefSchema.validation.test.ts
rename to packages/object-info-parser/src/__tests__/nodeDefSchema.test.ts
index 707eabd3e4..41f02e7a71 100644
--- a/src/schemas/nodeDefSchema.validation.test.ts
+++ b/packages/object-info-parser/src/__tests__/nodeDefSchema.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 
-import { validateComfyNodeDef } from '@/schemas/nodeDefSchema'
-import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import { validateComfyNodeDef } from '../schemas/nodeDefSchema'
+import type { ComfyNodeDef } from '../schemas/nodeDefSchema'
 
 const EXAMPLE_NODE_DEF: ComfyNodeDef = {
   input: {
@@ -23,52 +23,45 @@ const EXAMPLE_NODE_DEF: ComfyNodeDef = {
 }
 
 describe('validateNodeDef', () => {
-  it('Should accept a valid node definition', async () => {
+  it('accepts a valid node definition', () => {
     expect(validateComfyNodeDef(EXAMPLE_NODE_DEF)).not.toBeNull()
   })
 
-  describe.each([
+  describe.for([
     [{ ckpt_name: ['foo', { default: 1 }] }, ['foo', { default: 1 }]],
-    // Extra input spec should be preserved
     [{ ckpt_name: ['foo', { bar: 1 }] }, ['foo', { bar: 1 }]],
     [{ ckpt_name: ['INT', { bar: 1 }] }, ['INT', { bar: 1 }]],
     [{ ckpt_name: [[1, 2, 3], { bar: 1 }] }, [[1, 2, 3], { bar: 1 }]]
   ])(
     'validateComfyNodeDef with various input spec formats',
-    (inputSpec, expected) => {
-      it(`should accept input spec format: ${JSON.stringify(inputSpec)}`, async () => {
-        expect(
-          // @ts-expect-error fixme ts strict error
-          validateComfyNodeDef({
-            ...EXAMPLE_NODE_DEF,
-            input: {
-              required: inputSpec
-            }
-          }).input.required.ckpt_name
-        ).toEqual(expected)
+    ([inputSpec, expected]) => {
+      it(`accepts input spec format: ${JSON.stringify(inputSpec)}`, () => {
+        const parsed = validateComfyNodeDef({
+          ...EXAMPLE_NODE_DEF,
+          input: {
+            required: inputSpec
+          }
+        })
+        expect(parsed?.input?.required?.ckpt_name).toEqual(expected)
       })
     }
   )
 
-  describe.each([
+  describe.for([
     [{ ckpt_name: { 'model1.safetensors': 'foo' } }],
     [{ ckpt_name: ['*', ''] }],
     [{ ckpt_name: ['foo', { default: 1 }, { default: 2 }] }],
-    // Should reject incorrect default value type.
     [{ ckpt_name: ['INT', { default: '124' }] }]
-  ])(
-    'validateComfyNodeDef rejects with various input spec formats',
-    (inputSpec) => {
-      it(`should accept input spec format: ${JSON.stringify(inputSpec)}`, async () => {
-        expect(
-          validateComfyNodeDef({
-            ...EXAMPLE_NODE_DEF,
-            input: {
-              required: inputSpec
-            }
-          })
-        ).toBeNull()
-      })
-    }
-  )
+  ])('validateComfyNodeDef rejects invalid input specs', (inputSpec) => {
+    it(`rejects input spec format: ${JSON.stringify(inputSpec)}`, () => {
+      expect(
+        validateComfyNodeDef({
+          ...EXAMPLE_NODE_DEF,
+          input: {
+            required: inputSpec
+          }
+        })
+      ).toBeNull()
+    })
+  })
 })
diff --git a/src/types/nodeSource.test.ts b/packages/object-info-parser/src/__tests__/nodeSource.test.ts
similarity index 97%
rename from src/types/nodeSource.test.ts
rename to packages/object-info-parser/src/__tests__/nodeSource.test.ts
index 215b4106be..5e32966faf 100644
--- a/src/types/nodeSource.test.ts
+++ b/packages/object-info-parser/src/__tests__/nodeSource.test.ts
@@ -5,8 +5,8 @@ import {
   getNodeSource,
   isCustomNode,
   isEssentialNode
-} from '@/types/nodeSource'
-import type { NodeSource } from '@/types/nodeSource'
+} from '../classifiers/nodeSource'
+import type { NodeSource } from '../classifiers/nodeSource'
 
 describe('getNodeSource', () => {
   it('should return UNKNOWN_NODE_SOURCE when python_module is undefined', () => {
diff --git a/packages/object-info-parser/src/__tests__/sanitizeUserContent.test.ts b/packages/object-info-parser/src/__tests__/sanitizeUserContent.test.ts
new file mode 100644
index 0000000000..6d0b91b942
--- /dev/null
+++ b/packages/object-info-parser/src/__tests__/sanitizeUserContent.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it } from 'vitest'
+
+import { sanitizeUserContent } from '../helpers/sanitizeUserContent'
+import type { ComfyNodeDef } from '../schemas/nodeDefSchema'
+
+function makeNodeDef(
+  name: string,
+  pythonModule: string,
+  input: ComfyNodeDef['input']
+): ComfyNodeDef {
+  return {
+    name,
+    display_name: name,
+    description: '',
+    category: 'test',
+    output_node: false,
+    python_module: pythonModule,
+    input
+  }
+}
+
+describe('sanitizeUserContent', () => {
+  it('strips known user filenames from combo inputs across all nodes', () => {
+    const defs = {
+      CustomCombo: makeNodeDef('CustomCombo', 'custom_nodes.some-pack', {
+        required: {
+          choice: [['my-secret.png', 'safe-option', 'video.mp4', 42], {}],
+          choiceV2: ['COMBO', { options: ['a.jpg', 'keep-me', 'b'] }]
+        }
+      })
+    }
+
+    const sanitized = sanitizeUserContent(defs)
+    const required = sanitized.CustomCombo.input?.required
+    expect(required?.choice).toEqual([['safe-option', 42], {}])
+    expect(required?.choiceV2).toEqual(['COMBO', { options: ['keep-me', 'b'] }])
+  })
+
+  it('zeros combo lists for known upload nodes in required/optional/hidden sections', () => {
+    const defs = {
+      LoadImage: makeNodeDef('LoadImage', 'nodes', {
+        required: {
+          image: [['personal.png', 'public.png'], { image_upload: true }]
+        },
+        optional: {
+          mask: ['COMBO', { options: ['another.jpg', 'value'] }]
+        },
+        hidden: {
+          cache: [['movie.mov', 'keep'], {}],
+          hiddenV2: ['COMBO', { options: ['private.wav', 'other'] }]
+        }
+      }),
+      LoadVideo: makeNodeDef('LoadVideo', 'nodes', {
+        required: {
+          video: [['clip.mp4', 'clip2.webm'], {}]
+        }
+      }),
+      LoadAudio: makeNodeDef('LoadAudio', 'nodes', {
+        required: {
+          audio: [['song.mp3', 'song.flac'], {}]
+        }
+      })
+    }
+
+    const sanitized = sanitizeUserContent(defs)
+
+    expect(sanitized.LoadImage.input?.required?.image).toEqual([
+      [],
+      { image_upload: true }
+    ])
+    expect(sanitized.LoadImage.input?.optional?.mask).toEqual([
+      'COMBO',
+      { options: [] }
+    ])
+    expect(sanitized.LoadImage.input?.hidden?.cache).toEqual([[], {}])
+    expect(sanitized.LoadImage.input?.hidden?.hiddenV2).toEqual([
+      'COMBO',
+      { options: [] }
+    ])
+    expect(sanitized.LoadVideo.input?.required?.video).toEqual([[], {}])
+    expect(sanitized.LoadAudio.input?.required?.audio).toEqual([[], {}])
+  })
+})
diff --git a/packages/object-info-parser/src/classifiers/nodeSource.ts b/packages/object-info-parser/src/classifiers/nodeSource.ts
new file mode 100644
index 0000000000..b2089d7625
--- /dev/null
+++ b/packages/object-info-parser/src/classifiers/nodeSource.ts
@@ -0,0 +1,97 @@
+export const BLUEPRINT_CATEGORY = 'Subgraph Blueprints'
+
+export enum NodeSourceType {
+  Core = 'core',
+  CustomNodes = 'custom_nodes',
+  Blueprint = 'blueprint',
+  Essentials = 'essentials',
+  Unknown = 'unknown'
+}
+export const CORE_NODE_MODULES = ['nodes', 'comfy_extras', 'comfy_api_nodes']
+
+export type NodeSource = {
+  type: NodeSourceType
+  className: string
+  displayText: string
+  badgeText: string
+}
+
+const UNKNOWN_NODE_SOURCE: NodeSource = {
+  type: NodeSourceType.Unknown,
+  className: 'comfy-unknown',
+  displayText: 'Unknown',
+  badgeText: '?'
+}
+
+function shortenNodeName(name: string) {
+  return name
+    .replace(/^(ComfyUI-|ComfyUI_|Comfy-|Comfy_)/, '')
+    .replace(/(-ComfyUI|_ComfyUI|-Comfy|_Comfy)$/, '')
+}
+
+export function getNodeSource(
+  python_module?: string,
+  essentials_category?: string
+): NodeSource {
+  if (!python_module) {
+    return UNKNOWN_NODE_SOURCE
+  }
+  const modules = python_module.split('.')
+  if (essentials_category) {
+    const moduleName = modules[1] ?? modules[0] ?? 'essentials'
+    const displayName = shortenNodeName(moduleName.split('@')[0])
+    return {
+      type: NodeSourceType.Essentials,
+      className: 'comfy-essentials',
+      displayText: displayName,
+      badgeText: displayName
+    }
+  } else if (CORE_NODE_MODULES.includes(modules[0])) {
+    return {
+      type: NodeSourceType.Core,
+      className: 'comfy-core',
+      displayText: 'Comfy Core',
+      badgeText: '🦊'
+    }
+  } else if (modules[0] === 'blueprint') {
+    return {
+      type: NodeSourceType.Blueprint,
+      className: 'blueprint',
+      displayText: 'Blueprint',
+      badgeText: 'bp'
+    }
+  } else if (modules[0] === 'custom_nodes') {
+    const moduleName = modules[1]
+    if (!moduleName) {
+      return UNKNOWN_NODE_SOURCE
+    }
+    const customNodeName = moduleName.split('@')[0]
+    const displayName = shortenNodeName(customNodeName)
+    return {
+      type: NodeSourceType.CustomNodes,
+      className: 'comfy-custom-nodes',
+      displayText: displayName,
+      badgeText: displayName
+    }
+  } else {
+    return UNKNOWN_NODE_SOURCE
+  }
+}
+
+interface NodeDefLike {
+  nodeSource: NodeSource
+}
+
+export function isEssentialNode(node: NodeDefLike): boolean {
+  return node.nodeSource.type === NodeSourceType.Essentials
+}
+
+export function isCustomNode(node: NodeDefLike): boolean {
+  return node.nodeSource.type === NodeSourceType.CustomNodes
+}
+
+export enum NodeBadgeMode {
+  None = 'None',
+  ShowAll = 'Show all',
+  HideBuiltIn = 'Hide built-in'
+}
diff --git a/packages/object-info-parser/src/helpers/groupNodesByPack.ts b/packages/object-info-parser/src/helpers/groupNodesByPack.ts
new file mode 100644
index 0000000000..509205a800
--- /dev/null
+++ b/packages/object-info-parser/src/helpers/groupNodesByPack.ts
@@ -0,0 +1,47 @@
+import { getNodeSource, NodeSourceType } from '../classifiers/nodeSource'
+import type { ComfyNodeDef } from '../schemas/nodeDefSchema'
+
+export interface PackedNode {
+  className: string
+  def: ComfyNodeDef
+}
+
+export interface NodePack {
+  id: string
+  displayName: string
+  nodes: PackedNode[]
+}
+
+export function groupNodesByPack(
+  defs: Record<string, ComfyNodeDef>
+): NodePack[] {
+  const byPackId = new Map<string, NodePack>()
+
+  for (const [className, def] of Object.entries(defs)) {
+    const source = getNodeSource(def.python_module, def.essentials_category)
+    if (source.type !== NodeSourceType.CustomNodes) {
+      continue
+    }
+
+    const packId = def.python_module.split('.')[1]?.split('@')[0]
+    if (!packId) {
+      continue
+    }
+
+    const existing = byPackId.get(packId)
+    const node = { className, def }
+
+    if (existing) {
+      existing.nodes.push(node)
+      continue
+    }
+
+    byPackId.set(packId, {
+      id: packId,
+      displayName: source.displayText,
+      nodes: [node]
+    })
+  }
+
+  return [...byPackId.values()].sort((a, b) => a.id.localeCompare(b.id))
+}
diff --git a/packages/object-info-parser/src/helpers/sanitizeUserContent.ts b/packages/object-info-parser/src/helpers/sanitizeUserContent.ts
new file mode 100644
index 0000000000..c7d18255fd
--- /dev/null
+++ b/packages/object-info-parser/src/helpers/sanitizeUserContent.ts
@@ -0,0 +1,134 @@
+import type {
+  ComfyNodeDef,
+  ComfyInputsSpec,
+  InputSpec,
+  ComboInputSpec,
+  ComboInputSpecV2
+} from '../schemas/nodeDefSchema'
+import {
+  isComboInputSpecV1,
+  isComboInputSpecV2
+} from '../schemas/nodeDefSchema'
+
+const USER_CONTENT_REGEX =
+  /\.(png|jpe?g|webp|gif|mp4|mov|webm|wav|mp3|flac|ogg|safetensors|ckpt|pt)$/i
+
+const KNOWN_USER_UPLOAD_NODES = new Set([
+  'LoadImage',
+  'LoadImageMask',
+  'LoadImageOutput',
+  'LoadVideo',
+  'LoadAudio'
+])
+
+export function sanitizeUserContent(
+  defs: Record<string, ComfyNodeDef>
+): Record<string, ComfyNodeDef> {
+  const nextEntries = Object.entries(defs).map(([className, def]) => [
+    className,
+    sanitizeNode(def)
+  ])
+  return Object.fromEntries(nextEntries) as Record<string, ComfyNodeDef>
+}
+
+function sanitizeNode(def: ComfyNodeDef): ComfyNodeDef {
+  if (!def.input) return def
+
+  const shouldClearAllComboOptions =
+    def.python_module === 'nodes' && KNOWN_USER_UPLOAD_NODES.has(def.name)
+
+  return {
+    ...def,
+    input: {
+      ...def.input,
+      required: sanitizeInputSpecSection(
+        def.input.required,
+        shouldClearAllComboOptions
+      ),
+      optional: sanitizeInputSpecSection(
+        def.input.optional,
+        shouldClearAllComboOptions
+      ),
+      hidden: sanitizeHiddenSection(
+        def.input.hidden,
+        shouldClearAllComboOptions
+      )
+    }
+  }
+}
+
+function sanitizeInputSpecSection(
+  section: ComfyInputsSpec['required'] | ComfyInputsSpec['optional'],
+  forceEmpty: boolean
+): ComfyInputsSpec['required'] | ComfyInputsSpec['optional'] {
+  if (!section) return section
+
+  const nextEntries = Object.entries(section).map(([key, value]) => {
+    const sanitized = sanitizeInputSpec(value, forceEmpty) as InputSpec
+    return [key, sanitized] as const
+  })
+
+  return Object.fromEntries(nextEntries)
+}
+
+function sanitizeHiddenSection(
+  section: ComfyInputsSpec['hidden'],
+  forceEmpty: boolean
+): ComfyInputsSpec['hidden'] {
+  if (!section) return section
+
+  const nextEntries = Object.entries(section).map(([key, value]) => [
+    key,
+    sanitizeInputSpec(value, forceEmpty)
+  ])
+
+  return Object.fromEntries(nextEntries)
+}
+
+function sanitizeInputSpec(inputSpec: unknown, forceEmpty: boolean): unknown {
+  if (!Array.isArray(inputSpec)) {
+    return inputSpec
+  }
+
+  if (isComboInputSpecV1(inputSpec as InputSpec)) {
+    return sanitizeComboInputSpecV1(inputSpec as ComboInputSpec, forceEmpty)
+  }
+
+  if (isComboInputSpecV2(inputSpec as InputSpec)) {
+    return sanitizeComboInputSpecV2(inputSpec as ComboInputSpecV2, forceEmpty)
+  }
+
+  return inputSpec
+}
+
+function sanitizeComboInputSpecV1(
+  inputSpec: ComboInputSpec,
+  forceEmpty: boolean
+): ComboInputSpec {
+  const [comboValues, options] = inputSpec
+  const sanitizedValues = forceEmpty ? [] : filterComboValues(comboValues)
+  return [sanitizedValues, options]
+}
+
+function sanitizeComboInputSpecV2(
+  inputSpec: ComboInputSpecV2,
+  forceEmpty: boolean
+): ComboInputSpecV2 {
+  const [comboTag, options] = inputSpec
+  if (!options?.options) {
+    return inputSpec
+  }
+
+  const nextOptions = {
+    ...options,
+    options: forceEmpty ? [] : filterComboValues(options.options)
+  }
+
+  return [comboTag, nextOptions]
+}
+
+function filterComboValues(values: (number | string)[]): (number | string)[] {
+  return values.filter((value) =>
+    typeof value === 'string' ? !USER_CONTENT_REGEX.test(value) : true
+  )
+}
diff --git a/packages/object-info-parser/src/index.ts b/packages/object-info-parser/src/index.ts
new file mode 100644
index 0000000000..f512634cc9
--- /dev/null
+++ b/packages/object-info-parser/src/index.ts
@@ -0,0 +1,4 @@
+export * from './schemas/nodeDefSchema'
+export * from './classifiers/nodeSource'
+export * from './helpers/groupNodesByPack'
+export * from './helpers/sanitizeUserContent'
diff --git a/packages/object-info-parser/src/schemas/nodeDefSchema.ts b/packages/object-info-parser/src/schemas/nodeDefSchema.ts
new file mode 100644
index 0000000000..86963dfee0
--- /dev/null
+++ b/packages/object-info-parser/src/schemas/nodeDefSchema.ts
@@ -0,0 +1,384 @@
+import { z } from 'zod'
+import { fromZodError } from 'zod-validation-error'
+
+const CONTROL_OPTIONS = [
+  'fixed',
+  'increment',
+  'decrement',
+  'randomize'
+] as const
+const RESULT_ITEM_TYPE = z.enum(['input', 'output', 'temp'])
+
+const zComboOption = z.union([z.string(), z.number()])
+const zRemoteWidgetConfig = z.object({
+  route: z.string().url().or(z.string().startsWith('/')),
+  refresh: z.number().gte(128).safe().or(z.number().lte(0).safe()).optional(),
+  response_key: z.string().optional(),
+  query_params: z.record(z.string(), z.string()).optional(),
+  refresh_button: z.boolean().optional(),
+  control_after_refresh: z.enum(['first', 'last']).optional(),
+  timeout: z.number().gte(0).optional(),
+  max_retries: z.number().gte(0).optional()
+})
+const zMultiSelectOption = z.object({
+  placeholder: z.string().optional(),
+  chip: z.boolean().optional()
+})
+
+export const zBaseInputOptions = z
+  .object({
+    default: z.any().optional(),
+    defaultInput: z.boolean().optional(),
+    display_name: z.string().optional(),
+    forceInput: z.boolean().optional(),
+    tooltip: z.string().optional(),
+    socketless: z.boolean().optional(),
+    hidden: z.boolean().optional(),
+    advanced: z.boolean().optional(),
+    widgetType: z.string().optional(),
+    /** Backend-only properties. */
+    rawLink: z.boolean().optional(),
+    lazy: z.boolean().optional()
+  })
+  .passthrough()
+
+const zNumericInputOptions = zBaseInputOptions.extend({
+  min: z.number().optional(),
+  max: z.number().optional(),
+  step: z.number().optional(),
+  /** Note: Many node authors are using INT/FLOAT to pass list of INT/FLOAT. */
+  default: z.union([z.number(), z.array(z.number())]).optional(),
+  display: z.enum(['slider', 'number', 'knob', 'gradientslider']).optional()
+})
+
+export const zIntInputOptions = zNumericInputOptions.extend({
+  /**
+   * If true, a linked widget will be added to the node to select the mode
+   * of `control_after_generate`.
+   */
+  control_after_generate: z
+    .union([z.boolean(), z.enum(CONTROL_OPTIONS)])
+    .optional()
+})
+
+export const zColorStop = z.object({
+  offset: z.number(),
+  color: z.tuple([z.number(), z.number(), z.number()])
+})
+
+export const zFloatInputOptions = zNumericInputOptions.extend({
+  round: z.union([z.number(), z.literal(false)]).optional(),
+  gradient_stops: z.array(zColorStop).optional()
+})
+
+export const zBooleanInputOptions = zBaseInputOptions.extend({
+  label_on: z.string().optional(),
+  label_off: z.string().optional(),
+  default: z.boolean().optional()
+})
+
+export const zStringInputOptions = zBaseInputOptions.extend({
+  default: z.string().optional(),
+  multiline: z.boolean().optional(),
+  dynamicPrompts: z.boolean().optional(),
+
+  // Multiline-only fields
+  defaultVal: z.string().optional(),
+  placeholder: z.string().optional()
+})
+
+export const zComboInputOptions = zBaseInputOptions.extend({
+  control_after_generate: z
+    .union([z.boolean(), z.enum(CONTROL_OPTIONS)])
+    .optional(),
+  image_upload: z.boolean().optional(),
+  image_folder: RESULT_ITEM_TYPE.optional(),
+  allow_batch: z.boolean().optional(),
+  video_upload: z.boolean().optional(),
+  audio_upload: z.boolean().optional(),
+  mesh_upload: z.boolean().optional(),
+  upload_subfolder: z.string().optional(),
+  animated_image_upload: z.boolean().optional(),
+  options: z.array(zComboOption).optional(),
+  remote: zRemoteWidgetConfig.optional(),
+  /** Whether the widget is a multi-select widget. */
+  multi_select: zMultiSelectOption.optional()
+})
+
+const zIntInputSpec = z.tuple([z.literal('INT'), zIntInputOptions.optional()])
+const zFloatInputSpec = z.tuple([
+  z.literal('FLOAT'),
+  zFloatInputOptions.optional()
+])
+const zBooleanInputSpec = z.tuple([
+  z.literal('BOOLEAN'),
+  zBooleanInputOptions.optional()
+])
+const zStringInputSpec = z.tuple([
+  z.literal('STRING'),
+  zStringInputOptions.optional()
+])
+/**
+ * Legacy combo syntax.
+ * @deprecated Use `zComboInputSpecV2` instead.
+ */
+const zComboInputSpec = z.tuple([
+  z.array(zComboOption),
+  zComboInputOptions.optional()
+])
+const zComboInputSpecV2 = z.tuple([
+  z.literal('COMBO'),
+  zComboInputOptions.optional()
+])
+
+export function isComboInputSpecV1(
+  inputSpec: InputSpec
+): inputSpec is ComboInputSpec {
+  return Array.isArray(inputSpec[0])
+}
+
+export function isIntInputSpec(
+  inputSpec: InputSpec
+): inputSpec is IntInputSpec {
+  return inputSpec[0] === 'INT'
+}
+
+export function isFloatInputSpec(
+  inputSpec: InputSpec
+): inputSpec is FloatInputSpec {
+  return inputSpec[0] === 'FLOAT'
+}
+
+export function isComboInputSpecV2(
+  inputSpec: InputSpec
+): inputSpec is ComboInputSpecV2 {
+  return inputSpec[0] === 'COMBO'
+}
+
+export function isComboInputSpec(
+  inputSpec: InputSpec
+): inputSpec is ComboInputSpec | ComboInputSpecV2 {
+  return isComboInputSpecV1(inputSpec) || isComboInputSpecV2(inputSpec)
+}
+
+export function isMediaUploadComboInput(inputSpec: InputSpec): boolean {
+  const [inputName, inputOptions] = inputSpec
+  if (!inputOptions) return false
+
+  const isUploadInput =
+    inputOptions['image_upload'] === true ||
+    inputOptions['video_upload'] === true ||
+    inputOptions['animated_image_upload'] === true
+
+  return (
+    isUploadInput && (isComboInputSpecV1(inputSpec) || inputName === 'COMBO')
+  )
+}
+
+/**
+ * Get the type of an input spec.
+ *
+ * @param inputSpec - The input spec to get the type of.
+ * @returns The type of the input spec.
+ */
+export function getInputSpecType(inputSpec: InputSpec): string {
+  return isComboInputSpec(inputSpec) ? 'COMBO' : inputSpec[0]
+}
+
+/**
+ * Get the combo options from a combo input spec.
+ *
+ * @param inputSpec - The input spec to get the combo options from.
+ * @returns The combo options.
+ */
+export function getComboSpecComboOptions(
+  inputSpec: ComboInputSpec | ComboInputSpecV2
+): (number | string)[] {
+  return (
+    (isComboInputSpecV2(inputSpec) ? inputSpec[1]?.options : inputSpec[0]) ?? []
+  )
+}
+
+const excludedLiterals = new Set(['INT', 'FLOAT', 'BOOLEAN', 'STRING', 'COMBO'])
+const zCustomInputSpec = z.tuple([
+  z.string().refine((value) => !excludedLiterals.has(value)),
+  zBaseInputOptions.optional()
+])
+
+const zInputSpec = z.union([
+  zIntInputSpec,
+  zFloatInputSpec,
+  zBooleanInputSpec,
+  zStringInputSpec,
+  zComboInputSpec,
+  zComboInputSpecV2,
+  zCustomInputSpec
+])
+
+export const zComfyInputsSpec = z.object({
+  required: z.record(zInputSpec).optional(),
+  optional: z.record(zInputSpec).optional(),
+  // Frontend repo is not using it, but some custom nodes are using the
+  // hidden field to pass various values.
+  hidden: z.record(z.any()).optional()
+})
+
+const zComfyNodeDataType = z.string()
+const zComfyComboOutput = z.array(zComboOption)
+export const zComfyOutputTypesSpec = z.array(
+  z.union([zComfyNodeDataType, zComfyComboOutput])
+)
+
+/**
+ * Widget dependency with type information.
+ * Provides strong type enforcement for JSONata evaluation context.
+ */
+const zWidgetDependency = z.object({
+  name: z.string(),
+  type: z.string()
+})
+
+export type WidgetDependency = z.infer<typeof zWidgetDependency>
+
+/**
+ * Schema for price badge depends_on field.
+ * Specifies which widgets and inputs the pricing expression depends on.
+ * Widgets must be specified as objects with name and type.
+ */
+const zPriceBadgeDepends = z.object({
+  widgets: z.array(zWidgetDependency).optional().default([]),
+  inputs: z.array(z.string()).optional().default([]),
+  /**
+   * Autogrow input group names to track.
+   * For each group, the count of connected inputs will be available in the
+   * JSONata context as `g.<groupName>`.
+   * Example: `input_groups: ["reference_videos"]` makes `g.reference_videos`
+   * available with the count of connected inputs like `reference_videos.character1`, etc.
+   */
+  input_groups: z.array(z.string()).optional().default([])
+})
+
+/**
+ * Schema for price badge definition.
+ * Used to calculate and display pricing information for API nodes.
+ * The `expr` field contains a JSONata expression that returns a PricingResult.
+ */
+const zPriceBadge = z.object({
+  engine: z.literal('jsonata').optional().default('jsonata'),
+  depends_on: zPriceBadgeDepends
+    .optional()
+    .default({ widgets: [], inputs: [], input_groups: [] }),
+  expr: z.string()
+})
+
+export type PriceBadge = z.infer<typeof zPriceBadge>
+
+export const zComfyNodeDef = z.object({
+  input: zComfyInputsSpec.optional(),
+  output: zComfyOutputTypesSpec.optional(),
+  output_is_list: z.array(z.boolean()).optional(),
+  output_name: z.array(z.string()).optional(),
+  output_tooltips: z.array(z.string()).optional(),
+  output_matchtypes: z.array(z.string().optional()).optional(),
+  name: z.string(),
+  display_name: z.string(),
+  description: z.string(),
+  help: z.string().optional(),
+  category: z.string(),
+  main_category: z.string().optional(),
+  output_node: z.boolean(),
+  python_module: z.string(),
+  deprecated: z.boolean().optional(),
+  experimental: z.boolean().optional(),
+  dev_only: z.boolean().optional(),
+  /**
+   * Whether the node is an API node. Running API nodes requires login to
+   * Comfy Org account.
+   * https://docs.comfy.org/tutorials/api-nodes/overview
+   */
+  api_node: z.boolean().optional(),
+  /**
+   * Specifies the order of inputs for each input category.
+   * Used to ensure consistent widget ordering regardless of JSON serialization.
+   * Keys are 'required', 'optional', etc., values are arrays of input names.
+   */
+  input_order: z.record(z.array(z.string())).optional(),
+  /**
+   * Alternative names for search. Useful for synonyms, abbreviations,
+   * or old names after renaming a node.
+   */
+  search_aliases: z.array(z.string()).optional(),
+  /**
+   * Price badge definition for API nodes.
+   * Contains a JSONata expression to calculate pricing based on widget values
+   * and input connectivity.
+   */
+  price_badge: zPriceBadge.optional(),
+  /** Category for the Essentials tab. If set, the node appears in Essentials. */
+  essentials_category: z.string().optional(),
+  /** Whether the blueprint is a global/installed blueprint (not user-created). */
+  isGlobal: z.boolean().optional()
+})
+
+export const zAutogrowOptions = z.object({
+  ...zBaseInputOptions.shape,
+  template: z.object({
+    input: zComfyInputsSpec,
+    names: z.array(z.string()).optional(),
+    max: z.number().optional(),
+    //Backend defines as mandatory with min 1, Frontend is more forgiving
+    min: z.number().optional(),
+    prefix: z.string().optional()
+  })
+})
+
+export const zDynamicComboInputSpec = z.tuple([
+  z.literal('COMFY_DYNAMICCOMBO_V3'),
+  zBaseInputOptions.extend({
+    options: z.array(
+      z.object({
+        inputs: zComfyInputsSpec,
+        key: z.string()
+      })
+    )
+  })
+])
+
+export const zMatchTypeOptions = z.object({
+  ...zBaseInputOptions.shape,
+  type: z.literal('COMFY_MATCHTYPE_V3'),
+  template: z.object({
+    allowed_types: z.string(),
+    template_id: z.string()
+  })
+})
+
+// `/object_info`
+export type ComfyInputsSpec = z.infer<typeof zComfyInputsSpec>
+export type ComfyOutputTypesSpec = z.infer<typeof zComfyOutputTypesSpec>
+export type ComfyNodeDef = z.infer<typeof zComfyNodeDef>
+export type RemoteWidgetConfig = z.infer<typeof zRemoteWidgetConfig>
+
+export type ComboInputOptions = z.infer<typeof zComboInputOptions>
+export type NumericInputOptions = z.infer<typeof zNumericInputOptions>
+
+export type IntInputSpec = z.infer<typeof zIntInputSpec>
+export type FloatInputSpec = z.infer<typeof zFloatInputSpec>
+export type ComboInputSpec = z.infer<typeof zComboInputSpec>
+export type ComboInputSpecV2 = z.infer<typeof zComboInputSpecV2>
+export type InputSpec = z.infer<typeof zInputSpec>
+
+export function validateComfyNodeDef(
+  data: unknown,
+  onError: (error: string) => void = console.warn
+): ComfyNodeDef | null {
+  const result = zComfyNodeDef.safeParse(data)
+  if (!result.success) {
+    const zodError = fromZodError(result.error)
+    onError(
+      `Invalid ComfyNodeDef: ${JSON.stringify(data)}\n${zodError.message}`
+    )
+    return null
+  }
+  return result.data
+}
diff --git a/packages/object-info-parser/tsconfig.json b/packages/object-info-parser/tsconfig.json
new file mode 100644
index 0000000000..ea72a25788
--- /dev/null
+++ b/packages/object-info-parser/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist"
+  },
+  "include": ["src/**/*", "vitest.config.ts"]
+}
diff --git a/packages/object-info-parser/vitest.config.ts b/packages/object-info-parser/vitest.config.ts
new file mode 100644
index 0000000000..911cf80d50
--- /dev/null
+++ b/packages/object-info-parser/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+    include: ['src/__tests__/**/*.test.ts'],
+    globals: false
+  }
+})
diff --git a/packages/registry-types/src/comfyRegistryTypes.ts b/packages/registry-types/src/comfyRegistryTypes.ts
index b13ba80dfc..182adf6eea 100644
--- a/packages/registry-types/src/comfyRegistryTypes.ts
+++ b/packages/registry-types/src/comfyRegistryTypes.ts
@@ -2524,6 +2524,46 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/proxy/luma_2/generations": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Create a Luma Agents generation
+         * @description Submit an image generation or edit job. Returns immediately with an opaque job ID to poll via GET /proxy/luma_2/generations/{id}.
+         */
+        post: operations["lumaAgentsCreateGeneration"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/proxy/luma_2/generations/{generation_id}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Get a Luma Agents generation
+         * @description Poll for generation status and output. On completion, the response includes presigned URLs to download the generated images.
+         */
+        get: operations["lumaAgentsGetGeneration"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/proxy/pixverse/video/text/generate": {
         parameters: {
             query?: never;
@@ -10017,6 +10057,8 @@ export interface components {
             };
             progress: number;
             create_time: number;
+            /** @description Actual credits consumed by the task. Present once status is finalized; 0 for failed tasks. */
+            consumed_credit?: number;
         };
         TripoSuccessTask: {
             /** @enum {integer} */
@@ -10381,6 +10423,88 @@ export interface components {
             /** @description The request of the generation */
             request?: components["schemas"]["LumaGenerationRequest"] | components["schemas"]["LumaImageGenerationRequest"] | components["schemas"]["LumaUpscaleVideoGenerationRequest"] | components["schemas"]["LumaAudioGenerationRequest"];
         };
+        /**
+         * @description Output aspect ratio
+         * @enum {string}
+         */
+        LumaAgentsAspectRatio: "3:1" | "2:1" | "16:9" | "3:2" | "1:1" | "2:3" | "9:16" | "1:2" | "1:3";
+        /**
+         * @description Style preset
+         * @enum {string}
+         */
+        LumaAgentsStyle: "auto" | "manga";
+        /**
+         * @description Output image format
+         * @enum {string}
+         */
+        LumaAgentsOutputFormat: "png" | "jpeg";
+        /**
+         * @description The kind of generation to perform
+         * @enum {string}
+         */
+        LumaAgentsGenerationType: "image" | "image_edit";
+        /**
+         * @description Current state of the generation
+         * @enum {string}
+         */
+        LumaAgentsState: "queued" | "processing" | "completed" | "failed";
+        /**
+         * @description Machine-readable failure code for programmatic handling
+         * @enum {string}
+         */
+        LumaAgentsFailureCode: "content_moderated" | "generation_failed" | "budget_exhausted" | "output_not_found";
+        /** @description Reference image for style/content guidance or guided generation */
+        LumaAgentsImageRef: {
+            /** @description Base64-encoded image data */
+            data?: string;
+            /** @description MIME type (e.g. image/jpeg). Required with data. */
+            media_type?: string;
+            /** @description Publicly accessible image URL */
+            url?: string;
+        };
+        /** @description The Luma Agents generation request object */
+        LumaAgentsGenerationRequest: {
+            /** @description Text prompt */
+            prompt: string;
+            aspect_ratio?: components["schemas"]["LumaAgentsAspectRatio"];
+            /** @description Reference images for style/content guidance. Up to 9 for type 'image', up to 8 for type 'image_edit'. */
+            image_ref?: components["schemas"]["LumaAgentsImageRef"][];
+            /** @description Model to use */
+            model?: string;
+            output_format?: components["schemas"]["LumaAgentsOutputFormat"];
+            source?: components["schemas"]["LumaAgentsImageRef"];
+            style?: components["schemas"]["LumaAgentsStyle"];
+            type?: components["schemas"]["LumaAgentsGenerationType"];
+            /** @description Enable web search grounding */
+            web_search?: boolean;
+        };
+        /** @description A generated output entry */
+        LumaAgentsGenerationOutput: {
+            /** @description Media type (e.g. image) */
+            type?: string;
+            /** @description Presigned URL (1hr expiry) */
+            url?: string;
+        };
+        /** @description Generation status and output */
+        LumaAgentsGeneration: {
+            /** @description Generation identifier */
+            id?: string;
+            /** @description Creation timestamp */
+            created_at?: string;
+            /** @description Model used */
+            model?: string;
+            state?: components["schemas"]["LumaAgentsState"];
+            type?: components["schemas"]["LumaAgentsGenerationType"];
+            failure_code?: components["schemas"]["LumaAgentsFailureCode"];
+            /** @description Human-readable failure description */
+            failure_reason?: string;
+            output?: components["schemas"]["LumaAgentsGenerationOutput"][];
+        };
+        /** @description The error object */
+        LumaAgentsError: {
+            /** @description The error message */
+            detail?: string;
+        };
         PixverseTextVideoRequest: {
             /** @enum {string} */
             aspect_ratio: "16:9" | "4:3" | "1:1" | "3:4" | "9:16";
@@ -12453,12 +12577,16 @@ export interface components {
         Rodin3DGenerateRequest: {
             /** @description The reference images to generate 3D Assets. */
             images: string;
+            /** @description Text prompt used by the upstream Rodin API. Required by upstream for text-to-3D requests (no images uploaded); optional for image-to-3D requests where it acts as additional guidance. */
+            prompt?: string;
             /** @description Seed. */
             seed?: number;
             tier?: components["schemas"]["RodinTierType"];
             material?: components["schemas"]["RodinMaterialType"];
             quality?: components["schemas"]["RodinQualityType"];
             mesh_mode?: components["schemas"]["RodinMeshModeType"];
+            /** @description Optional list of upstream addon flags (e.g. "HighPack"). */
+            addons?: string[];
         };
         /**
          * @description Rodin Tier para options
@@ -26183,6 +26311,72 @@ export interface operations {
             };
         };
     };
+    lumaAgentsCreateGeneration: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** @description The generation request object */
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["LumaAgentsGenerationRequest"];
+            };
+        };
+        responses: {
+            /** @description Generation accepted */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["LumaAgentsGeneration"];
+                };
+            };
+            /** @description Error */
+            default: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["LumaAgentsError"];
+                };
+            };
+        };
+    };
+    lumaAgentsGetGeneration: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                /** @description The ID of the generation */
+                generation_id: string;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Generation found */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["LumaAgentsGeneration"];
+                };
+            };
+            /** @description Error */
+            default: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["LumaAgentsError"];
+                };
+            };
+        };
+    };
     PixverseGenerateTextVideo: {
         parameters: {
             query?: never;
diff --git a/packages/shared-frontend-utils/src/formatUtil.test.ts b/packages/shared-frontend-utils/src/formatUtil.test.ts
index 3a1e6c877d..cf64b26ec8 100644
--- a/packages/shared-frontend-utils/src/formatUtil.test.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.test.ts
@@ -3,12 +3,17 @@ import { describe, expect, it } from 'vitest'
 import {
   appendWorkflowJsonExt,
   ensureWorkflowSuffix,
+  formatLocalizedMediumDate,
+  formatLocalizedNumber,
+  getFilePathSeparatorVariants,
   getFilenameDetails,
   getMediaTypeFromFilename,
   getPathDetails,
   highlightQuery,
   isCivitaiModelUrl,
+  isCivitaiUrl,
   isPreviewableMediaType,
+  joinFilePath,
   truncateFilename
 } from './formatUtil'
 
@@ -83,9 +88,11 @@ describe('formatUtil', () => {
     describe('video files', () => {
       it('should identify video extensions correctly', () => {
         expect(getMediaTypeFromFilename('video.mp4')).toBe('video')
+        expect(getMediaTypeFromFilename('apple.m4v')).toBe('video')
         expect(getMediaTypeFromFilename('clip.webm')).toBe('video')
         expect(getMediaTypeFromFilename('movie.mov')).toBe('video')
         expect(getMediaTypeFromFilename('film.avi')).toBe('video')
+        expect(getMediaTypeFromFilename('episode.mkv')).toBe('video')
       })
     })
 
@@ -299,6 +306,42 @@ describe('formatUtil', () => {
     })
   })
 
+  describe('joinFilePath', () => {
+    it('joins subfolder and filename with normalized slash separators', () => {
+      expect(joinFilePath('nested\\folder', 'child\\file.png')).toBe(
+        'nested/folder/child/file.png'
+      )
+    })
+
+    it('trims boundary separators without changing the filename body', () => {
+      expect(joinFilePath('/nested/folder/', '/file.png')).toBe(
+        'nested/folder/file.png'
+      )
+    })
+
+    it('returns the normalized filename when no subfolder is provided', () => {
+      expect(joinFilePath('', 'nested\\file.png')).toBe('nested/file.png')
+    })
+
+    it('returns the normalized subfolder without a trailing slash when no filename is provided', () => {
+      expect(joinFilePath('nested\\folder', '')).toBe('nested/folder')
+      expect(joinFilePath('nested\\folder', null)).toBe('nested/folder')
+    })
+  })
+
+  describe('getFilePathSeparatorVariants', () => {
+    it('returns slash and backslash variants for nested paths', () => {
+      expect(getFilePathSeparatorVariants('nested\\folder/file.png')).toEqual([
+        'nested/folder/file.png',
+        'nested\\folder\\file.png'
+      ])
+    })
+
+    it('returns a single value when no separator is present', () => {
+      expect(getFilePathSeparatorVariants('file.png')).toEqual(['file.png'])
+    })
+  })
+
   describe('appendWorkflowJsonExt', () => {
     it('appends .app.json when isApp is true', () => {
       expect(appendWorkflowJsonExt('test', true)).toBe('test.app.json')
@@ -381,6 +424,19 @@ describe('formatUtil', () => {
     })
   })
 
+  describe('isCivitaiUrl', () => {
+    it.for([
+      { url: 'https://civitai.com/models/123', expected: true },
+      { url: 'https://civitai.red/models/123', expected: true },
+      { url: 'https://sub.civitai.com/models/123', expected: true },
+      { url: 'https://sub.civitai.red/models/123', expected: true },
+      { url: 'https://example.com/model', expected: false },
+      { url: 'not-a-url', expected: false }
+    ])('$url → $expected', ({ url, expected }) => {
+      expect(isCivitaiUrl(url)).toBe(expected)
+    })
+  })
+
   describe('isCivitaiModelUrl', () => {
     it('recognizes civitai.red model URLs', () => {
       expect(
@@ -388,4 +444,34 @@ describe('formatUtil', () => {
       ).toBe(true)
     })
   })
+
+  describe('formatLocalizedNumber', () => {
+    it('formats numbers using the given locale', () => {
+      expect(formatLocalizedNumber(2618646, 'en')).toBe('2,618,646')
+      expect(formatLocalizedNumber(2618646, 'de')).toBe('2.618.646')
+    })
+
+    it('returns an em-dash for undefined / NaN / Infinity', () => {
+      expect(formatLocalizedNumber(undefined, 'en')).toBe('—')
+      expect(formatLocalizedNumber(Number.NaN, 'en')).toBe('—')
+      expect(formatLocalizedNumber(Number.POSITIVE_INFINITY, 'en')).toBe('—')
+    })
+
+    it('formats zero as "0"', () => {
+      expect(formatLocalizedNumber(0, 'en')).toBe('0')
+    })
+  })
+
+  describe('formatLocalizedMediumDate', () => {
+    it('formats an ISO date with the medium style', () => {
+      expect(formatLocalizedMediumDate('2026-04-19T00:00:00Z', 'en')).toMatch(
+        /Apr \d{1,2}, 2026/
+      )
+    })
+
+    it('returns an em-dash for undefined or unparseable input', () => {
+      expect(formatLocalizedMediumDate(undefined, 'en')).toBe('—')
+      expect(formatLocalizedMediumDate('not a date', 'en')).toBe('—')
+    })
+  })
 })
diff --git a/packages/shared-frontend-utils/src/formatUtil.ts b/packages/shared-frontend-utils/src/formatUtil.ts
index 3e52190092..99b6bc79f5 100644
--- a/packages/shared-frontend-utils/src/formatUtil.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.ts
@@ -256,6 +256,31 @@ export function isValidUrl(url: string): boolean {
   }
 }
 
+export function joinFilePath(
+  subfolder: string | null | undefined,
+  filename: string | null | undefined
+): string {
+  const normalizedSubfolder = normalizeFilePathSeparators(
+    subfolder ?? ''
+  ).replace(/^\/+|\/+$/g, '')
+  const normalizedFilename = normalizeFilePathSeparators(
+    filename ?? ''
+  ).replace(/^\/+/g, '')
+  if (!normalizedSubfolder) return normalizedFilename
+  if (!normalizedFilename) return normalizedSubfolder
+  return `${normalizedSubfolder}/${normalizedFilename}`
+}
+
+export function getFilePathSeparatorVariants(filepath: string): string[] {
+  const slashPath = normalizeFilePathSeparators(filepath)
+  const backslashPath = slashPath.replace(/\//g, '\\')
+  return slashPath === backslashPath ? [slashPath] : [slashPath, backslashPath]
+}
+
+function normalizeFilePathSeparators(filepath: string): string {
+  return filepath.replace(/[\\/]+/g, '/')
+}
+
 /**
  * Parses a filepath into its filename and subfolder components.
  *
@@ -274,8 +299,7 @@ export function parseFilePath(filepath: string): {
 } {
   if (!filepath?.trim()) return { filename: '', subfolder: '' }
 
-  const normalizedPath = filepath
-    .replace(/[\\/]+/g, '/') // Normalize path separators
+  const normalizedPath = normalizeFilePathSeparators(filepath)
     .replace(/^\//, '') // Remove leading slash
     .replace(/\/$/, '') // Remove trailing slash
 
@@ -355,6 +379,22 @@ export const generateUUID = (): string => {
   })
 }
 
+const isCivitaiHost = (hostname: string): boolean =>
+  hostname === 'civitai.com' ||
+  hostname.endsWith('.civitai.com') ||
+  hostname === 'civitai.red' ||
+  hostname.endsWith('.civitai.red')
+
+/**
+ * Checks if a URL belongs to any Civitai domain (civitai.com or civitai.red).
+ * Use this for source-name detection; use `isCivitaiModelUrl` when the URL
+ * must also match a specific model API path format.
+ */
+export const isCivitaiUrl = (url: string): boolean => {
+  if (!isValidUrl(url)) return false
+  return isCivitaiHost(new URL(url).hostname.toLowerCase())
+}
+
 /**
  * Checks if a URL is a Civitai model URL
  * @example
@@ -367,17 +407,9 @@ export const isCivitaiModelUrl = (url: string): boolean => {
   if (!isValidUrl(url)) return false
 
   const urlObj = new URL(url)
-  const hostname = urlObj.hostname.toLowerCase()
-  const isCivitaiHost =
-    hostname === 'civitai.com' ||
-    hostname.endsWith('.civitai.com') ||
-    hostname === 'civitai.red' ||
-    hostname.endsWith('.civitai.red')
-  if (!isCivitaiHost) {
-    return false
-  }
-  const pathname = urlObj.pathname
+  if (!isCivitaiHost(urlObj.hostname.toLowerCase())) return false
 
+  const pathname = urlObj.pathname
   return (
     /^\/api\/download\/models\/(\d+)$/.test(pathname) ||
     /^\/api\/v1\/models\/(\d+)$/.test(pathname) ||
@@ -557,7 +589,7 @@ const IMAGE_EXTENSIONS = [
   'tiff',
   'svg'
 ] as const
-const VIDEO_EXTENSIONS = ['mp4', 'webm', 'mov', 'avi'] as const
+const VIDEO_EXTENSIONS = ['mp4', 'm4v', 'webm', 'mov', 'avi', 'mkv'] as const
 const AUDIO_EXTENSIONS = ['mp3', 'wav', 'ogg', 'flac'] as const
 const THREE_D_EXTENSIONS = ['obj', 'fbx', 'gltf', 'glb', 'usdz'] as const
 const TEXT_EXTENSIONS = [
@@ -651,3 +683,32 @@ export function formatTime(seconds: number): string {
   const secs = Math.floor(seconds % 60)
   return `${mins}:${secs.toString().padStart(2, '0')}`
 }
+
+/**
+ * Format a number with the given BCP-47 locale.
+ * Returns an em-dash for non-numeric, NaN, or infinite inputs.
+ */
+export function formatLocalizedNumber(
+  value: number | undefined,
+  locale: string
+): string {
+  if (typeof value !== 'number' || !Number.isFinite(value)) return '—'
+  return new Intl.NumberFormat(locale).format(value)
+}
+
+/**
+ * Format an ISO 8601 date string with the given BCP-47 locale using the
+ * `medium` date style (e.g. "Apr 19, 2026"). Returns an em-dash for missing
+ * or unparseable inputs.
+ */
+export function formatLocalizedMediumDate(
+  value: string | undefined,
+  locale: string
+): string {
+  if (!value) return '—'
+  const timestamp = Date.parse(value)
+  if (Number.isNaN(timestamp)) return '—'
+  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(
+    timestamp
+  )
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3bf369cc14..6ac5b0dca6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -160,8 +160,8 @@ catalogs:
       specifier: ^7.7.0
       version: 7.7.0
     '@types/three':
-      specifier: ^0.169.0
-      version: 0.169.0
+      specifier: ^0.170.0
+      version: 0.170.0
     '@vee-validate/zod':
       specifier: ^4.15.1
       version: 4.15.1
@@ -339,6 +339,9 @@ catalogs:
     tailwindcss-primeui:
       specifier: ^0.6.1
       version: 0.6.1
+    three:
+      specifier: ^0.170.0
+      version: 0.170.0
     tsx:
       specifier: ^4.15.6
       version: 4.19.4
@@ -434,6 +437,9 @@ importers:
       '@comfyorg/design-system':
         specifier: workspace:*
         version: link:packages/design-system
+      '@comfyorg/object-info-parser':
+        specifier: workspace:*
+        version: link:packages/object-info-parser
       '@comfyorg/registry-types':
         specifier: workspace:*
         version: link:packages/registry-types
@@ -698,7 +704,7 @@ importers:
         version: 7.7.0
       '@types/three':
         specifier: 'catalog:'
-        version: 0.169.0
+        version: 0.170.0
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
         version: 6.0.3(vite@8.0.0(@types/node@24.10.4)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
@@ -943,6 +949,12 @@ importers:
       '@comfyorg/design-system':
         specifier: workspace:*
         version: link:../../packages/design-system
+      '@comfyorg/object-info-parser':
+        specifier: workspace:*
+        version: link:../../packages/object-info-parser
+      '@comfyorg/shared-frontend-utils':
+        specifier: workspace:*
+        version: link:../../packages/shared-frontend-utils
       '@comfyorg/tailwind-utils':
         specifier: workspace:*
         version: link:../../packages/tailwind-utils
@@ -964,6 +976,9 @@ importers:
       posthog-js:
         specifier: 'catalog:'
         version: 1.358.1
+      three:
+        specifier: 'catalog:'
+        version: 0.170.0
       vue:
         specifier: 'catalog:'
         version: 3.5.13(typescript@5.9.3)
@@ -1034,6 +1049,22 @@ importers:
         specifier: 0.93.0
         version: 0.93.0(magicast@0.5.1)(typescript@5.9.3)
 
+  packages/object-info-parser:
+    dependencies:
+      zod:
+        specifier: 'catalog:'
+        version: 3.25.76
+      zod-validation-error:
+        specifier: 'catalog:'
+        version: 3.3.0(zod@3.25.76)
+    devDependencies:
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+      vitest:
+        specifier: 'catalog:'
+        version: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+
   packages/registry-types: {}
 
   packages/shared-frontend-utils:
@@ -4508,8 +4539,8 @@ packages:
   '@types/stats.js@0.17.3':
     resolution: {integrity: sha512-pXNfAD3KHOdif9EQXZ9deK82HVNaXP5ZIF5RP2QG6OQFNTaY2YIetfrE9t528vEreGQvEPRDDc8muaoYeK0SxQ==}
 
-  '@types/three@0.169.0':
-    resolution: {integrity: sha512-oan7qCgJBt03wIaK+4xPWclYRPG9wzcg7Z2f5T8xYTNEF95kh0t0lklxLLYBDo7gQiGLYzE6iF4ta7nXF2bcsw==}
+  '@types/three@0.170.0':
+    resolution: {integrity: sha512-CUm2uckq+zkCY7ZbFpviRttY+6f9fvwm6YqSqPfA5K22s9w7R4VnA3rzJse8kHVvuzLcTx+CjNCs2NYe0QFAyg==}
 
   '@types/tough-cookie@4.0.5':
     resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
@@ -9883,8 +9914,8 @@ packages:
   vue-component-type-helpers@3.2.6:
     resolution: {integrity: sha512-O02tnvIfOQVmnvoWwuSydwRoHjZVt8UEBR+2p4rT35p8GAy5VTlWP8o5qXfJR/GWCN0nVZoYWsVUvx2jwgdBmQ==}
 
-  vue-component-type-helpers@3.2.7:
-    resolution: {integrity: sha512-+gPp5YGmhfsj1IN+xUo7y0fb4clfnOiiUA39y07yW1VzCRjzVgwLbtmdWlghh7mXrPsEaYc7rrIir/HT6C8vYQ==}
+  vue-component-type-helpers@3.2.8:
+    resolution: {integrity: sha512-9689efAXhN/EV86plgkL/XFiJSXhGtWPG6JDboZ+QnjlUWUUQrQ0ILKQtw4iQsuwIwu5k6Aw+JnehDe7161e7A==}
 
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -13405,7 +13436,7 @@ snapshots:
       storybook: 10.2.10(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       type-fest: 2.19.0
       vue: 3.5.13(typescript@5.9.3)
-      vue-component-type-helpers: 3.2.7
+      vue-component-type-helpers: 3.2.8
 
   '@swc/helpers@0.5.17':
     dependencies:
@@ -13834,7 +13865,7 @@ snapshots:
 
   '@types/stats.js@0.17.3': {}
 
-  '@types/three@0.169.0':
+  '@types/three@0.170.0':
     dependencies:
       '@tweenjs/tween.js': 23.1.3
       '@types/stats.js': 0.17.3
@@ -14189,7 +14220,7 @@ snapshots:
       sirv: 3.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vitest: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@24.10.4)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vitest: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@25.0.3)(@vitest/ui@4.0.16)(esbuild@0.27.3)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -20530,7 +20561,7 @@ snapshots:
 
   vue-component-type-helpers@3.2.6: {}
 
-  vue-component-type-helpers@3.2.7: {}
+  vue-component-type-helpers@3.2.8: {}
 
   vue-demi@0.14.10(vue@3.5.13(typescript@5.9.3)):
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 2059d90ab8..7eb19d6d70 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -54,7 +54,7 @@ catalog:
   '@types/jsdom': ^21.1.7
   '@types/node': ^24.1.0
   '@types/semver': ^7.7.0
-  '@types/three': ^0.169.0
+  '@types/three': ^0.170.0
   '@vee-validate/zod': ^4.15.1
   '@vercel/analytics': ^2.0.1
   '@vitejs/plugin-vue': ^6.0.0
@@ -113,6 +113,7 @@ catalog:
   storybook: ^10.2.10
   stylelint: ^16.26.1
   tailwindcss: ^4.2.0
+  three: ^0.170.0
   tailwindcss-primeui: ^0.6.1
   tsx: ^4.15.6
   tw-animate-css: ^1.3.8
diff --git a/public/assets/sorted-custom-node-map.json b/public/assets/sorted-custom-node-map.json
index 3bd0889fe1..87cea332c8 100644
--- a/public/assets/sorted-custom-node-map.json
+++ b/public/assets/sorted-custom-node-map.json
@@ -3,6 +3,7 @@
   "LoadImage": 3474,
   "CLIPTextEncode": 2435,
   "SaveImage": 1762,
+  "SaveImageAdvanced": 1762,
   "VAEDecode": 1754,
   "KSampler": 1511,
   "CheckpointLoaderSimple": 1293,
diff --git a/scripts/generate-embedded-metadata-test-files.py b/scripts/generate-embedded-metadata-test-files.py
index 2b57e296d3..b66546ca28 100644
--- a/scripts/generate-embedded-metadata-test-files.py
+++ b/scripts/generate-embedded-metadata-test-files.py
@@ -19,6 +19,7 @@ import subprocess
 
 import av
 from PIL import Image
+from PIL.PngImagePlugin import PngInfo
 
 REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 FIXTURES_DIR = os.path.join(REPO_ROOT, 'src', 'scripts', 'metadata', '__fixtures__')
@@ -115,6 +116,15 @@ def generate_av_fixture(
     report(name)
 
 
+def generate_png():
+    img = make_1x1_image()
+    info = PngInfo()
+    info.add_text('workflow', WORKFLOW_JSON)
+    info.add_text('prompt', PROMPT_JSON)
+    img.save(out('with_metadata.png'), 'PNG', pnginfo=info)
+    report('with_metadata.png')
+
+
 def generate_webp():
     img = make_1x1_image()
     exif = build_exif_bytes()
@@ -167,6 +177,7 @@ def generate_webm():
 
 if __name__ == '__main__':
     print('Generating fixtures...')
+    generate_png()
     generate_webp()
     generate_avif()
     generate_flac()
diff --git a/src/base/webviewDetection.test.ts b/src/base/webviewDetection.test.ts
new file mode 100644
index 0000000000..c7faab6854
--- /dev/null
+++ b/src/base/webviewDetection.test.ts
@@ -0,0 +1,119 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { isEmbeddedWebView } from '@/base/webviewDetection'
+
+describe('isEmbeddedWebView', () => {
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  describe('Android WebView', () => {
+    it('detects Android WebView with wv token', () => {
+      const ua =
+        'Mozilla/5.0 (Linux; Android 13; SM-G991B; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/120.0.0.0 Mobile Safari/537.36'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('does not flag regular Chrome on Android', () => {
+      const ua =
+        'Mozilla/5.0 (Linux; Android 13; SM-G991B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+  })
+
+  describe('iOS WKWebView', () => {
+    it('detects iOS WKWebView (AppleWebKit without Safari/)', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('does not flag regular Safari on iOS', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+
+    it('does not flag Chrome on iOS (CriOS)', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/120.0.0.0 Mobile/15E148'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+
+    it('does not flag Firefox on iOS (FxiOS)', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/120.0 Mobile/15E148'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+  })
+
+  describe('social app in-app browsers', () => {
+    it('detects Facebook (FBAN)', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBAV/400.0]'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('detects Instagram', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 300.0'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('detects TikTok', () => {
+      const ua =
+        'Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36 TikTok/30.0'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('detects Line', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Line/13.0'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+
+    it('detects Snapchat', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Snapchat/12.0'
+      expect(isEmbeddedWebView(ua)).toBe(true)
+    })
+  })
+
+  describe('regular desktop browsers', () => {
+    it('does not flag Chrome desktop', () => {
+      const ua =
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+
+    it('does not flag Firefox desktop', () => {
+      const ua =
+        'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+
+    it('does not flag Safari desktop', () => {
+      const ua =
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15'
+      expect(isEmbeddedWebView(ua)).toBe(false)
+    })
+  })
+
+  describe('edge cases', () => {
+    it('handles empty string', () => {
+      expect(isEmbeddedWebView('')).toBe(false)
+    })
+  })
+
+  describe('JS bridge detection', () => {
+    it('detects webkit.messageHandlers bridge', () => {
+      vi.stubGlobal('webkit', { messageHandlers: {} })
+      expect(isEmbeddedWebView('')).toBe(true)
+    })
+
+    it('detects ReactNativeWebView bridge', () => {
+      vi.stubGlobal('ReactNativeWebView', { postMessage: vi.fn() })
+      expect(isEmbeddedWebView('')).toBe(true)
+    })
+  })
+})
diff --git a/src/base/webviewDetection.ts b/src/base/webviewDetection.ts
new file mode 100644
index 0000000000..4d56118409
--- /dev/null
+++ b/src/base/webviewDetection.ts
@@ -0,0 +1,72 @@
+/**
+ * Detects whether the app is running inside an embedded webview.
+ *
+ * Google blocks OAuth via `signInWithPopup` in embedded webviews,
+ * returning a 403 `disallowed_useragent` error (policy since 2021).
+ * This utility is used to hide the Google SSO button in those contexts.
+ *
+ * Detection covers:
+ *   • Android WebView (`wv` token in UA)
+ *   • iOS WKWebView (has `AppleWebKit` but lacks `Safari/`)
+ *   • Social app in-app browsers (Facebook, Instagram, TikTok, etc.)
+ *   • JS bridge objects (`window.webkit.messageHandlers`, `ReactNativeWebView`)
+ */
+
+const SOCIAL_APP_PATTERNS =
+  /FBAN|FBAV|Instagram|Line\/|Snapchat|TikTok|musical_ly/i
+
+function isAndroidWebView(ua: string): boolean {
+  return /\bwv\b/.test(ua) && /Android/.test(ua)
+}
+
+function isIOSWebView(ua: string): boolean {
+  if (!/AppleWebKit/i.test(ua)) return false
+  if (/Safari\//i.test(ua)) return false
+  if (/CriOS|FxiOS|OPiOS|EdgiOS/i.test(ua)) return false
+  return true
+}
+
+function isSocialAppBrowser(ua: string): boolean {
+  return SOCIAL_APP_PATTERNS.test(ua)
+}
+
+function hasWebViewBridge(): boolean {
+  try {
+    const win = globalThis as Record<string, unknown>
+    if (
+      typeof win.webkit === 'object' &&
+      win.webkit !== null &&
+      typeof (win.webkit as Record<string, unknown>).messageHandlers ===
+        'object'
+    ) {
+      return true
+    }
+    if (win.ReactNativeWebView != null) return true
+  } catch {
+    // Access to bridge objects may throw in sandboxed contexts
+  }
+  return false
+}
+
+export function isEmbeddedWebView(ua: string = navigator.userAgent): boolean {
+  if (isSocialAppBrowser(ua)) return true
+  if (isAndroidWebView(ua)) return true
+  if (isIOSWebView(ua)) return true
+  if (hasWebViewBridge()) return true
+  return false
+}
+
+/**
+ * Reason why Google SSO is blocked in the current environment, or `null` if it
+ * is available. Modeled as a discriminated string so call sites read as
+ * "if blocked, here's why" rather than an opaque boolean. Extend this union
+ * (e.g. `'unauthorized-host'`) as new blocking conditions are detected.
+ */
+type GoogleSsoBlockedReason = 'embedded-webview' | null
+
+export function getGoogleSsoBlockedReason(
+  ua: string = navigator.userAgent
+): GoogleSsoBlockedReason {
+  if (isEmbeddedWebView(ua)) return 'embedded-webview'
+  return null
+}
diff --git a/src/components/common/Badge.test.ts b/src/components/common/Badge.test.ts
index 86507cce53..a3804cc12e 100644
--- a/src/components/common/Badge.test.ts
+++ b/src/components/common/Badge.test.ts
@@ -42,7 +42,7 @@ describe('Badge', () => {
   })
 
   describe('twMerge preserves color alongside text-3xs font size', () => {
-    it.each([
+    it.for([
       ['default', 'text-white'],
       ['secondary', 'text-white'],
       ['warn', 'text-white'],
@@ -50,7 +50,7 @@ describe('Badge', () => {
       ['contrast', 'text-base-background']
     ] as const)(
       '%s severity retains its text color class',
-      (severity, expectedColor) => {
+      ([severity, expectedColor]) => {
         const classes = badgeVariants({ severity, variant: 'label' })
         expect(classes).toContain(expectedColor)
         expect(classes).toContain('text-3xs')
diff --git a/src/components/common/CustomizationDialog.test.ts b/src/components/common/CustomizationDialog.test.ts
new file mode 100644
index 0000000000..bb6f79fd1f
--- /dev/null
+++ b/src/components/common/CustomizationDialog.test.ts
@@ -0,0 +1,104 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import CustomizationDialog from './CustomizationDialog.vue'
+
+const DEFAULT_ICON = 'pi-bookmark-fill'
+const DEFAULT_COLOR = '#a1a1aa'
+
+vi.mock('@/stores/nodeBookmarkStore', () => ({
+  useNodeBookmarkStore: () => ({
+    defaultBookmarkIcon: DEFAULT_ICON,
+    defaultBookmarkColor: DEFAULT_COLOR,
+    bookmarksCustomization: {}
+  })
+}))
+
+vi.mock('primevue/dialog', () => ({
+  default: {
+    name: 'Dialog',
+    template: '<div v-if="visible"><slot /><slot name="footer" /></div>',
+    props: ['visible']
+  }
+}))
+
+vi.mock('primevue/selectbutton', () => ({
+  default: {
+    name: 'SelectButton',
+    template: '<div />',
+    props: ['modelValue', 'options']
+  }
+}))
+
+vi.mock('primevue/divider', () => ({
+  default: { name: 'Divider', template: '<hr />' }
+}))
+
+vi.mock('@/components/common/ColorCustomizationSelector.vue', () => ({
+  default: {
+    name: 'ColorCustomizationSelector',
+    template: '<div />',
+    props: ['modelValue', 'colorOptions']
+  }
+}))
+
+vi.mock('@/components/ui/button/Button.vue', () => ({
+  default: {
+    name: 'Button',
+    template: `<button @click="$emit('click')"><slot /></button>`,
+    emits: ['click']
+  }
+}))
+
+const i18n = createI18n({ legacy: false, locale: 'en', messages: { en: {} } })
+
+function renderDialog(extraProps: Record<string, unknown> = {}) {
+  const onConfirm = vi.fn()
+  render(CustomizationDialog, {
+    global: { plugins: [i18n] },
+    props: { modelValue: true, onConfirm, ...extraProps }
+  })
+  return { onConfirm }
+}
+
+describe('CustomizationDialog', () => {
+  describe('confirmCustomization', () => {
+    it('emits confirm with default icon and color when no initial values provided', async () => {
+      const user = userEvent.setup()
+      const { onConfirm } = renderDialog()
+
+      await user.click(screen.getByText('g.confirm'))
+
+      expect(onConfirm).toHaveBeenCalledWith(DEFAULT_ICON, DEFAULT_COLOR)
+    })
+
+    it('emits confirm with matching initialIcon when provided', async () => {
+      const user = userEvent.setup()
+      const { onConfirm } = renderDialog({ initialIcon: 'pi-star' })
+
+      await user.click(screen.getByText('g.confirm'))
+
+      expect(onConfirm).toHaveBeenCalledWith('pi-star', DEFAULT_COLOR)
+    })
+
+    it('falls back to default icon when initialIcon does not match any option', async () => {
+      const user = userEvent.setup()
+      const { onConfirm } = renderDialog({ initialIcon: 'pi-nonexistent' })
+
+      await user.click(screen.getByText('g.confirm'))
+
+      expect(onConfirm).toHaveBeenCalledWith(DEFAULT_ICON, DEFAULT_COLOR)
+    })
+
+    it('emits confirm with initialColor when provided', async () => {
+      const user = userEvent.setup()
+      const { onConfirm } = renderDialog({ initialColor: '#007bff' })
+
+      await user.click(screen.getByText('g.confirm'))
+
+      expect(onConfirm).toHaveBeenCalledWith(DEFAULT_ICON, '#007bff')
+    })
+  })
+})
diff --git a/src/components/common/CustomizationDialog.vue b/src/components/common/CustomizationDialog.vue
index f5df6d84d7..50b707be19 100644
--- a/src/components/common/CustomizationDialog.vue
+++ b/src/components/common/CustomizationDialog.vue
@@ -94,17 +94,15 @@ const defaultIcon = iconOptions.find(
   (option) => option.value === nodeBookmarkStore.defaultBookmarkIcon
 )
 
-// @ts-expect-error fixme ts strict error
-const selectedIcon = ref<{ name: string; value: string }>(defaultIcon)
+const selectedIcon = ref(defaultIcon ?? iconOptions[0])
 const finalColor = ref(
   props.initialColor || nodeBookmarkStore.defaultBookmarkColor
 )
 
 const resetCustomization = () => {
-  // @ts-expect-error fixme ts strict error
   selectedIcon.value =
-    iconOptions.find((option) => option.value === props.initialIcon) ||
-    defaultIcon
+    iconOptions.find((option) => option.value === props.initialIcon) ??
+    iconOptions[0]
   finalColor.value =
     props.initialColor || nodeBookmarkStore.defaultBookmarkColor
 }
diff --git a/src/components/common/FormItem.vue b/src/components/common/FormItem.vue
index c3c76afe84..3a5bb34020 100644
--- a/src/components/common/FormItem.vue
+++ b/src/components/common/FormItem.vue
@@ -1,10 +1,10 @@
 <!-- A generalized form item for rendering in a form. -->
 <template>
-  <div class="flex flex-row items-center gap-2">
+  <div class="flex min-h-8 flex-row items-center gap-2">
     <div class="form-label flex grow items-center">
       <span
         :id="`${props.id}-label`"
-        class="text-muted"
+        class="text-sm text-muted"
         :class="props.labelClass"
       >
         <slot name="name-prefix" />
diff --git a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
index 718505fba1..fb6d640793 100644
--- a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
+++ b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
@@ -14,10 +14,12 @@
     </template>
 
     <template #header>
-      <SearchInput
-        v-model="searchQuery"
-        size="lg"
-        class="max-w-96 flex-1"
+      <FormSearchInput
+        v-model="searchInput"
+        :searcher="applySearchQuery"
+        :debounce-ms="400"
+        :debounce-max-wait-ms="4000"
+        class="h-10 max-w-96 flex-1"
         autofocus
       />
     </template>
@@ -40,7 +42,10 @@
 
     <template #contentFilter>
       <div class="relative flex flex-wrap justify-between gap-2 px-6 pb-4">
-        <div class="flex flex-wrap gap-2">
+        <div
+          :ref="primeVueOverlay.overlayScopeRef"
+          class="flex flex-wrap gap-2"
+        >
           <!-- Model Filter -->
           <MultiSelect
             v-model="selectedModelObjects"
@@ -48,6 +53,7 @@
             class="w-[250px]"
             :label="modelFilterLabel"
             :options="modelOptions"
+            :content-style="selectContentStyle"
             :show-search-box="true"
             :show-selected-count="true"
             :show-clear-button="true"
@@ -62,6 +68,7 @@
             v-model="selectedUseCaseObjects"
             :label="useCaseFilterLabel"
             :options="useCaseOptions"
+            :content-style="selectContentStyle"
             :show-search-box="true"
             :show-selected-count="true"
             :show-clear-button="true"
@@ -76,6 +83,7 @@
             v-model="selectedRunsOnObjects"
             :label="runsOnFilterLabel"
             :options="runsOnOptions"
+            :content-style="selectContentStyle"
             :show-search-box="true"
             :show-selected-count="true"
             :show-clear-button="true"
@@ -92,6 +100,7 @@
             v-model="sortBy"
             :label="$t('templateWorkflows.sorting', 'Sort by')"
             :options="sortOptions"
+            :content-style="selectContentStyle"
             class="w-62.5"
           >
             <template #icon>
@@ -403,7 +412,7 @@ import CardBottom from '@/components/card/CardBottom.vue'
 import CardContainer from '@/components/card/CardContainer.vue'
 import CardTop from '@/components/card/CardTop.vue'
 import Tag from '@/components/chip/Tag.vue'
-import SearchInput from '@/components/ui/search-input/SearchInput.vue'
+import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
 import MultiSelect from '@/components/ui/multi-select/MultiSelect.vue'
 import SingleSelect from '@/components/ui/single-select/SingleSelect.vue'
 import AudioThumbnail from '@/components/templates/thumbnails/AudioThumbnail.vue'
@@ -416,6 +425,7 @@ import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
 import LeftSidePanel from '@/components/widget/panel/LeftSidePanel.vue'
 import { useIntersectionObserver } from '@/composables/useIntersectionObserver'
 import { useLazyPagination } from '@/composables/useLazyPagination'
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import { useTemplateFiltering } from '@/composables/useTemplateFiltering'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
@@ -562,6 +572,25 @@ const {
   loadFuseOptions
 } = useTemplateFiltering(navigationFilteredTemplates)
 
+/**
+ * Raw search input bound to the search box. The actual `searchQuery` consumed
+ * by the filtering composable is only updated via `applySearchQuery` after the
+ * debounce settles, keeping Fuse/grid re-renders off the keystroke critical path.
+ */
+const searchInput = ref(searchQuery.value)
+
+const applySearchQuery = async (query: string) => {
+  searchQuery.value = query
+}
+
+/**
+ * Sync the visible search input when `searchQuery` is reset externally
+ * (e.g. via the "Clear Filters" button).
+ */
+watch(searchQuery, (value) => {
+  if (value !== searchInput.value) searchInput.value = value
+})
+
 /**
  * Coordinates state between the selected navigation item and the sort order to
  * create deterministic, predictable behavior.
@@ -632,6 +661,8 @@ const selectedRunsOnObjects = computed({
 const loadingTemplate = ref<string | null>(null)
 const hoveredTemplate = ref<string | null>(null)
 const cardRefs = ref<HTMLElement[]>([])
+const primeVueOverlay = usePrimeVueOverlayChildStyle()
+const selectContentStyle = primeVueOverlay.contentStyle
 
 // Force re-render key for templates when sorting changes
 const templateListKey = ref(0)
diff --git a/src/components/dialog/GlobalDialog.test.ts b/src/components/dialog/GlobalDialog.test.ts
new file mode 100644
index 0000000000..1fa839772d
--- /dev/null
+++ b/src/components/dialog/GlobalDialog.test.ts
@@ -0,0 +1,192 @@
+import { createTestingPinia } from '@pinia/testing'
+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 } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: { g: { close: 'Close' } } },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+const Body = defineComponent({
+  name: 'Body',
+  setup: () => () => h('p', { 'data-testid': 'body' }, 'body content')
+})
+
+function mountDialog() {
+  return render(GlobalDialog, {
+    global: { plugins: [PrimeVue, i18n] }
+  })
+}
+
+describe('GlobalDialog renderer branching', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  afterEach(() => {
+    cleanup()
+  })
+
+  it('renders the PrimeVue branch when renderer is omitted', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'primevue-default',
+      title: 'PrimeVue dialog',
+      component: Body
+    })
+
+    const dialogs = await screen.findAllByRole('dialog')
+    expect(dialogs.some((el) => el.classList.contains('p-dialog'))).toBe(true)
+  })
+
+  it('renders the Reka branch when renderer is reka', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-opt-in',
+      title: 'Reka dialog',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka' }
+    })
+
+    const dialogs = await screen.findAllByRole('dialog')
+    expect(dialogs.length).toBeGreaterThan(0)
+    expect(dialogs.some((el) => el.classList.contains('p-dialog'))).toBe(false)
+  })
+
+  it('preserves the renderer flag on the dialog stack item', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-flag-check',
+      title: 'Reka',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka' }
+    })
+
+    await screen.findByRole('dialog')
+    const item = store.dialogStack.find((d) => d.key === 'reka-flag-check')
+    expect(item?.dialogComponentProps.renderer).toBe('reka')
+  })
+})
+
+describe('GlobalDialog Reka parity with PrimeVue', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  afterEach(() => {
+    cleanup()
+  })
+
+  it('omits the close button when closable is false', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-not-closable',
+      title: 'No close',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka', closable: false }
+    })
+
+    await screen.findByRole('dialog')
+    expect(screen.queryByRole('button', { name: 'Close' })).toBeNull()
+  })
+
+  it('renders the close button by default', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-closable',
+      title: 'Closable',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka' }
+    })
+
+    await screen.findByRole('dialog')
+    expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument()
+  })
+
+  it('omits the title when headless is true', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-headless',
+      title: 'Hidden title',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka', headless: true }
+    })
+
+    await screen.findByRole('dialog')
+    expect(screen.queryByText('Hidden title')).toBeNull()
+  })
+
+  it('renders the title when headless is omitted', async () => {
+    mountDialog()
+    const store = useDialogStore()
+
+    store.showDialog({
+      key: 'reka-titled',
+      title: 'Visible title',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka' }
+    })
+
+    await screen.findByRole('dialog')
+    expect(screen.getByText('Visible title')).toBeInTheDocument()
+  })
+
+  it('closes the dialog on Escape by default', async () => {
+    mountDialog()
+    const store = useDialogStore()
+    const user = userEvent.setup()
+
+    store.showDialog({
+      key: 'reka-esc-default',
+      title: 'Esc closes',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka' }
+    })
+
+    await screen.findByRole('dialog')
+    await user.keyboard('{Escape}')
+
+    expect(store.isDialogOpen('reka-esc-default')).toBe(false)
+  })
+
+  it('does not close on Escape when closable is false', async () => {
+    mountDialog()
+    const store = useDialogStore()
+    const user = userEvent.setup()
+
+    store.showDialog({
+      key: 'reka-esc-blocked',
+      title: 'Esc blocked',
+      component: Body,
+      dialogComponentProps: { renderer: 'reka', closable: false }
+    })
+
+    await screen.findByRole('dialog')
+    await user.keyboard('{Escape}')
+
+    expect(store.isDialogOpen('reka-esc-blocked')).toBe(true)
+  })
+})
diff --git a/src/components/dialog/GlobalDialog.vue b/src/components/dialog/GlobalDialog.vue
index 0e8c9a016d..67f21481d7 100644
--- a/src/components/dialog/GlobalDialog.vue
+++ b/src/components/dialog/GlobalDialog.vue
@@ -1,49 +1,107 @@
 <!-- The main global dialog to show various things -->
 <template>
-  <Dialog
-    v-for="item in dialogStore.dialogStack"
-    :key="item.key"
-    v-model:visible="item.visible"
-    class="global-dialog"
-    v-bind="item.dialogComponentProps"
-    :pt="getDialogPt(item)"
-    :aria-labelledby="item.key"
-  >
-    <template #header>
-      <div v-if="!item.dialogComponentProps?.headless">
-        <component
-          :is="item.headerComponent"
-          v-if="item.headerComponent"
-          v-bind="item.headerProps"
-          :id="item.key"
-        />
-        <h3 v-else :id="item.key">
-          {{ item.title || ' ' }}
-        </h3>
-      </div>
-    </template>
+  <template v-for="item in dialogStore.dialogStack" :key="item.key">
+    <Dialog
+      v-if="isRekaItem(item)"
+      :open="item.visible"
+      :modal="item.dialogComponentProps.modal ?? true"
+      @update:open="(open) => onRekaOpenChange(item.key, open)"
+    >
+      <DialogPortal>
+        <DialogOverlay />
+        <DialogContent
+          :size="item.dialogComponentProps.size ?? 'md'"
+          :class="item.dialogComponentProps.contentClass"
+          :aria-labelledby="item.key"
+          @escape-key-down="
+            (e) =>
+              item.dialogComponentProps.closeOnEscape === false &&
+              e.preventDefault()
+          "
+          @pointer-down-outside="
+            (e) =>
+              item.dialogComponentProps.dismissableMask === false &&
+              e.preventDefault()
+          "
+          @mousedown="() => dialogStore.riseDialog({ key: item.key })"
+        >
+          <DialogHeader v-if="!item.dialogComponentProps.headless">
+            <component
+              :is="item.headerComponent"
+              v-if="item.headerComponent"
+              v-bind="item.headerProps"
+              :id="item.key"
+            />
+            <DialogTitle v-else :id="item.key">
+              {{ item.title || ' ' }}
+            </DialogTitle>
+            <DialogClose v-if="item.dialogComponentProps.closable !== false" />
+          </DialogHeader>
+          <div class="flex-1 overflow-auto px-4 py-2">
+            <component
+              :is="item.component"
+              v-bind="item.contentProps"
+              :maximized="item.dialogComponentProps.maximized"
+            />
+          </div>
+          <DialogFooter v-if="item.footerComponent">
+            <component :is="item.footerComponent" v-bind="item.footerProps" />
+          </DialogFooter>
+        </DialogContent>
+      </DialogPortal>
+    </Dialog>
+    <PrimeDialog
+      v-else
+      v-model:visible="item.visible"
+      class="global-dialog"
+      v-bind="item.dialogComponentProps"
+      :pt="getDialogPt(item)"
+      :aria-labelledby="item.key"
+    >
+      <template #header>
+        <div v-if="!item.dialogComponentProps?.headless">
+          <component
+            :is="item.headerComponent"
+            v-if="item.headerComponent"
+            v-bind="item.headerProps"
+            :id="item.key"
+          />
+          <h3 v-else :id="item.key">
+            {{ item.title || ' ' }}
+          </h3>
+        </div>
+      </template>
 
-    <component
-      :is="item.component"
-      v-bind="item.contentProps"
-      :maximized="item.dialogComponentProps.maximized"
-    />
+      <component
+        :is="item.component"
+        v-bind="item.contentProps"
+        :maximized="item.dialogComponentProps.maximized"
+      />
 
-    <template v-if="item.footerComponent" #footer>
-      <component :is="item.footerComponent" v-bind="item.footerProps" />
-    </template>
-  </Dialog>
+      <template v-if="item.footerComponent" #footer>
+        <component :is="item.footerComponent" v-bind="item.footerProps" />
+      </template>
+    </PrimeDialog>
+  </template>
 </template>
 
 <script setup lang="ts">
 import { merge } from 'es-toolkit/compat'
-import Dialog from 'primevue/dialog'
+import PrimeDialog from 'primevue/dialog'
 import type { DialogPassThroughOptions } from 'primevue/dialog'
 import { computed } from 'vue'
 
+import Dialog from '@/components/ui/dialog/Dialog.vue'
+import DialogClose from '@/components/ui/dialog/DialogClose.vue'
+import DialogContent from '@/components/ui/dialog/DialogContent.vue'
+import DialogFooter from '@/components/ui/dialog/DialogFooter.vue'
+import DialogHeader from '@/components/ui/dialog/DialogHeader.vue'
+import DialogOverlay from '@/components/ui/dialog/DialogOverlay.vue'
+import DialogPortal from '@/components/ui/dialog/DialogPortal.vue'
+import DialogTitle from '@/components/ui/dialog/DialogTitle.vue'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { isCloud } from '@/platform/distribution/types'
-import type { DialogComponentProps } from '@/stores/dialogStore'
+import type { DialogComponentProps, DialogInstance } from '@/stores/dialogStore'
 import { useDialogStore } from '@/stores/dialogStore'
 
 const { flags } = useFeatureFlags()
@@ -53,6 +111,14 @@ const teamWorkspacesEnabled = computed(
 
 const dialogStore = useDialogStore()
 
+function isRekaItem(item: DialogInstance) {
+  return item.dialogComponentProps.renderer === 'reka'
+}
+
+function onRekaOpenChange(key: string, open: boolean) {
+  if (!open) dialogStore.closeDialog({ key })
+}
+
 function getDialogPt(item: {
   key: string
   dialogComponentProps: DialogComponentProps
diff --git a/src/components/dialog/content/ConfirmationDialogContent.test.ts b/src/components/dialog/content/ConfirmationDialogContent.test.ts
index fa6c75f4c8..2c3463e29f 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.test.ts
+++ b/src/components/dialog/content/ConfirmationDialogContent.test.ts
@@ -1,10 +1,11 @@
 import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
 import { createPinia, setActivePinia } from 'pinia'
-import PrimeVue from 'primevue/config'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { ComponentProps } from 'vue-component-type-helpers'
 import { createI18n } from 'vue-i18n'
 
+import { useDialogStore } from '@/stores/dialogStore'
 import ConfirmationDialogContent from './ConfirmationDialogContent.vue'
 
 type Props = ComponentProps<typeof ConfirmationDialogContent>
@@ -12,7 +13,23 @@ type Props = ComponentProps<typeof ConfirmationDialogContent>
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
-  messages: { en: {} },
+  messages: {
+    en: {
+      g: {
+        cancel: 'Cancel',
+        confirm: 'Confirm',
+        delete: 'Delete',
+        overwrite: 'Overwrite',
+        save: 'Save',
+        no: 'No',
+        ok: 'OK',
+        close: 'Close'
+      },
+      desktopMenu: {
+        reinstall: 'Reinstall'
+      }
+    }
+  },
   missingWarn: false,
   fallbackWarn: false
 })
@@ -23,10 +40,9 @@ describe('ConfirmationDialogContent', () => {
   })
 
   function renderComponent(props: Partial<Props> = {}) {
-    return render(ConfirmationDialogContent, {
-      global: {
-        plugins: [PrimeVue, i18n]
-      },
+    const user = userEvent.setup()
+    render(ConfirmationDialogContent, {
+      global: { plugins: [i18n] },
       props: {
         message: 'Test message',
         type: 'default',
@@ -34,6 +50,7 @@ describe('ConfirmationDialogContent', () => {
         ...props
       } as Props
     })
+    return { user }
   }
 
   it('renders long messages without breaking layout', () => {
@@ -42,4 +59,104 @@ describe('ConfirmationDialogContent', () => {
     renderComponent({ message: longFilename })
     expect(screen.getByText(longFilename)).toBeInTheDocument()
   })
+
+  it('renders the hint as a status alert when provided', () => {
+    renderComponent({ hint: 'This action cannot be undone.' })
+    const status = screen.getByRole('status')
+    expect(status).toHaveTextContent('This action cannot be undone.')
+  })
+
+  it('does not render a status alert when hint is omitted', () => {
+    renderComponent()
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+  })
+
+  describe('button surface per type', () => {
+    it("type='default' renders Cancel and Confirm", () => {
+      renderComponent({ type: 'default' })
+      expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument()
+      expect(
+        screen.getByRole('button', { name: 'Confirm' })
+      ).toBeInTheDocument()
+    })
+
+    it("type='delete' renders Cancel and Delete", () => {
+      renderComponent({ type: 'delete' })
+      expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument()
+    })
+
+    it("type='overwrite' renders Cancel and Overwrite", () => {
+      renderComponent({ type: 'overwrite' })
+      expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument()
+      expect(
+        screen.getByRole('button', { name: 'Overwrite' })
+      ).toBeInTheDocument()
+    })
+
+    it("type='dirtyClose' renders No and Save (no Cancel)", () => {
+      renderComponent({ type: 'dirtyClose' })
+      expect(
+        screen.queryByRole('button', { name: 'Cancel' })
+      ).not.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'No' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument()
+    })
+
+    it("type='info' renders only OK (no Cancel)", () => {
+      renderComponent({ type: 'info' })
+      expect(screen.getByRole('button', { name: 'OK' })).toBeInTheDocument()
+      expect(
+        screen.queryByRole('button', { name: 'Cancel' })
+      ).not.toBeInTheDocument()
+    })
+  })
+
+  it('confirm callback receives true and closes the dialog', async () => {
+    const onConfirm = vi.fn()
+    const { user } = renderComponent({ type: 'default', onConfirm })
+    const closeSpy = vi.spyOn(useDialogStore(), 'closeDialog')
+
+    await user.click(screen.getByRole('button', { name: 'Confirm' }))
+
+    expect(onConfirm).toHaveBeenCalledWith(true)
+    expect(closeSpy).toHaveBeenCalledOnce()
+  })
+
+  describe('dirtyClose deny label', () => {
+    it('uses the provided denyLabel for the deny button', () => {
+      renderComponent({ type: 'dirtyClose', denyLabel: 'Sign out anyway' })
+      expect(screen.getByText('Sign out anyway')).toBeInTheDocument()
+      expect(
+        screen.queryByRole('button', { name: 'No' })
+      ).not.toBeInTheDocument()
+    })
+
+    it('falls back to "No" when denyLabel is not provided', () => {
+      renderComponent({ type: 'dirtyClose' })
+      expect(screen.getByRole('button', { name: 'No' })).toBeInTheDocument()
+    })
+
+    it('calls onConfirm(false) when deny is clicked', async () => {
+      const onConfirm = vi.fn()
+      const { user } = renderComponent({
+        type: 'dirtyClose',
+        denyLabel: 'Close anyway',
+        onConfirm
+      })
+
+      await user.click(screen.getByRole('button', { name: 'Close anyway' }))
+
+      expect(onConfirm).toHaveBeenCalledWith(false)
+    })
+
+    it('calls onConfirm(true) when save is clicked', async () => {
+      const onConfirm = vi.fn()
+      const { user } = renderComponent({ type: 'dirtyClose', onConfirm })
+
+      await user.click(screen.getByRole('button', { name: 'Save' }))
+
+      expect(onConfirm).toHaveBeenCalledWith(true)
+    })
+  })
 })
diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index cc5c730142..683f0b9781 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -9,16 +9,14 @@
           {{ item }}
         </li>
       </ul>
-      <Message
+      <div
         v-if="hint"
-        class="mt-2"
-        icon="pi pi-info-circle"
-        severity="secondary"
-        size="small"
-        variant="simple"
+        role="status"
+        class="mt-2 flex items-start gap-2 text-sm text-muted-foreground"
       >
-        {{ hint }}
-      </Message>
+        <i class="pi pi-info-circle mt-0.5" aria-hidden="true" />
+        <span>{{ hint }}</span>
+      </div>
     </div>
     <div class="flex shrink-0 flex-wrap justify-end gap-4">
       <div
@@ -55,7 +53,7 @@
       </div>
 
       <Button
-        v-if="type !== 'info'"
+        v-if="type !== 'info' && type !== 'dirtyClose'"
         variant="secondary"
         autofocus
         @click="onCancel"
@@ -86,9 +84,9 @@
       <template v-else-if="type === 'dirtyClose'">
         <Button variant="secondary" @click="onDeny">
           <i class="pi pi-times" />
-          {{ $t('g.no') }}
+          {{ denyLabel ?? $t('g.no') }}
         </Button>
-        <Button @click="onConfirm">
+        <Button autofocus @click="onConfirm">
           <i class="pi pi-save" />
           {{ $t('g.save') }}
         </Button>
@@ -115,7 +113,6 @@
 </template>
 
 <script setup lang="ts">
-import Message from 'primevue/message'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -131,6 +128,7 @@ const props = defineProps<{
   onConfirm: (value?: boolean) => void
   itemList?: string[]
   hint?: string
+  denyLabel?: string
 }>()
 
 const { t } = useI18n()
diff --git a/src/components/dialog/content/SignInContent.vue b/src/components/dialog/content/SignInContent.vue
index 2592f34077..a6ac047e92 100644
--- a/src/components/dialog/content/SignInContent.vue
+++ b/src/components/dialog/content/SignInContent.vue
@@ -49,6 +49,7 @@
       <div class="flex flex-col gap-6">
         <template v-if="ssoAllowed">
           <Button
+            v-if="!googleSsoBlockedReason"
             type="button"
             class="h-10"
             variant="secondary"
@@ -157,6 +158,7 @@ import type { SignInData, SignUpData } from '@/schemas/signInSchema'
 import { isCloud } from '@/platform/distribution/types'
 import { isHostWhitelisted, normalizeHost } from '@/utils/hostWhitelist'
 import { isInChina } from '@/utils/networkUtil'
+import { getGoogleSsoBlockedReason } from '@/base/webviewDetection'
 
 import ApiKeyForm from './signin/ApiKeyForm.vue'
 import SignInForm from './signin/SignInForm.vue'
@@ -172,6 +174,7 @@ const isSecureContext = window.isSecureContext
 const isSignIn = ref(true)
 const showApiKeyForm = ref(false)
 const ssoAllowed = isHostWhitelisted(normalizeHost(window.location.hostname))
+const googleSsoBlockedReason = getGoogleSsoBlockedReason()
 const comfyPlatformBaseUrl = computed(() =>
   configValueOrDefault(
     remoteConfig.value,
diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue
index 9a47456b98..a66e1b5bfe 100644
--- a/src/components/dialog/content/setting/KeybindingPanel.vue
+++ b/src/components/dialog/content/setting/KeybindingPanel.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="keybinding-panel flex flex-col gap-2">
+  <div
+    :ref="primeVueOverlay.overlayScopeRef"
+    class="keybinding-panel flex flex-col gap-2"
+  >
     <Teleport defer to="#keybinding-panel-header">
       <SearchInput
         v-model="filters['global'].value"
@@ -15,10 +18,12 @@
       <div class="flex items-center gap-2">
         <KeybindingPresetToolbar
           :preset-names="presetNames"
+          :content-style="keybindingOverlayContentStyle"
           @presets-changed="refreshPresetList"
         />
         <DropdownMenu
           :entries="menuEntries"
+          :style="keybindingOverlayContentStyle"
           icon="icon-[lucide--ellipsis]"
           item-class="text-sm gap-2"
           button-size="unset"
@@ -193,11 +198,12 @@
               </template>
             </Column>
             <template #expansion="slotProps">
-              <div class="pl-4">
+              <div class="pl-4" data-testid="keybinding-expansion-content">
                 <div
                   v-for="(binding, idx) in (slotProps.data as ICommandData)
                     .keybindings"
                   :key="binding.combo.serialize()"
+                  data-testid="keybinding-expansion-binding"
                   class="flex items-center justify-between border-b border-border-subtle py-1.5 last:border-b-0"
                 >
                   <div class="flex items-center gap-4">
@@ -237,6 +243,7 @@
       </ContextMenuTrigger>
       <ContextMenuPortal>
         <ContextMenuContent
+          :style="keybindingOverlayContentStyle"
           class="z-1200 min-w-56 rounded-lg border border-border-subtle bg-base-background px-2 py-3 shadow-interface"
         >
           <ContextMenuItem
@@ -313,6 +320,7 @@ import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog'
 import Button from '@/components/ui/button/Button.vue'
 import SearchInput from '@/components/ui/search-input/SearchInput.vue'
 import { useEditKeybindingDialog } from '@/composables/useEditKeybindingDialog'
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import type { KeybindingImpl } from '@/platform/keybindings/keybinding'
 import { useKeybindingService } from '@/platform/keybindings/keybindingService'
 import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
@@ -336,6 +344,8 @@ const settingStore = useSettingStore()
 const commandStore = useCommandStore()
 const dialogStore = useDialogStore()
 const { t } = useI18n()
+const primeVueOverlay = usePrimeVueOverlayChildStyle()
+const keybindingOverlayContentStyle = primeVueOverlay.contentStyle
 
 const presetNames = ref<string[]>([])
 
diff --git a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
index 7fb0ee4ba3..9e5d81b52b 100644
--- a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
+++ b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
@@ -2,7 +2,7 @@
   <span class="flex flex-row gap-0.5">
     <template v-for="(sequence, index) in keySequences" :key="index">
       <Tag
-        class="min-w-6 justify-center gap-1 bg-interface-menu-keybind-surface-default text-center font-normal text-base-foreground uppercase"
+        class="min-w-6 justify-center gap-1 bg-interface-menu-keybind-surface-default text-center font-normal text-base-foreground capitalize"
         :severity="isModified ? 'info' : 'secondary'"
       >
         {{ sequence }}
diff --git a/src/components/dialog/content/setting/keybinding/KeybindingPresetToolbar.vue b/src/components/dialog/content/setting/keybinding/KeybindingPresetToolbar.vue
index 427df438d0..6950c98304 100644
--- a/src/components/dialog/content/setting/keybinding/KeybindingPresetToolbar.vue
+++ b/src/components/dialog/content/setting/keybinding/KeybindingPresetToolbar.vue
@@ -9,7 +9,10 @@
           {{ displayLabel }}
         </SelectValue>
       </SelectTrigger>
-      <SelectContent class="max-w-64 min-w-0 **:[[role=listbox]]:gap-1">
+      <SelectContent
+        :style="contentStyle"
+        class="max-w-64 min-w-0 **:[[role=listbox]]:gap-1"
+      >
         <div class="max-w-60">
           <SelectItem
             value="default"
@@ -46,6 +49,7 @@
 
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
+import type { StyleValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
@@ -57,8 +61,9 @@ import SelectValue from '@/components/ui/select/SelectValue.vue'
 import { useKeybindingPresetService } from '@/platform/keybindings/presetService'
 import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 
-const { presetNames } = defineProps<{
+const { presetNames, contentStyle } = defineProps<{
   presetNames: string[]
+  contentStyle?: StyleValue
 }>()
 
 const emit = defineEmits<{
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index cd4909417c..67ef64d744 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -6,6 +6,7 @@
     <template v-if="showUI" #workflow-tabs>
       <div
         v-if="workflowTabsPosition === 'Topbar'"
+        data-testid="topbar-workflow-tabs"
         class="workflow-tabs-container pointer-events-auto relative h-(--workflow-tabs-height) w-full"
       >
         <div
diff --git a/src/components/helpcenter/HelpCenterMenuContent.test.ts b/src/components/helpcenter/HelpCenterMenuContent.test.ts
new file mode 100644
index 0000000000..55819cf355
--- /dev/null
+++ b/src/components/helpcenter/HelpCenterMenuContent.test.ts
@@ -0,0 +1,164 @@
+import { cleanup, render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+
+import HelpCenterMenuContent from './HelpCenterMenuContent.vue'
+
+const distribution = vi.hoisted(() => ({
+  isCloud: false,
+  isDesktop: false,
+  isNightly: false
+}))
+
+const commandStoreExecute = vi.hoisted(() => vi.fn())
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return distribution.isCloud
+  },
+  get isDesktop() {
+    return distribution.isDesktop
+  },
+  get isNightly() {
+    return distribution.isNightly
+  }
+}))
+
+vi.mock('@/composables/useExternalLink', () => ({
+  useExternalLink: () => ({
+    staticUrls: { discord: '', github: '' },
+    buildDocsUrl: () => 'https://docs.comfy.org'
+  })
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: () => false
+  })
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => ({
+    trackHelpResourceClicked: vi.fn(),
+    trackHelpCenterOpened: vi.fn(),
+    trackHelpCenterClosed: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/updates/common/releaseStore', () => ({
+  useReleaseStore: () => ({
+    releases: [],
+    recentReleases: [],
+    isLoading: false,
+    fetchReleases: vi.fn().mockResolvedValue(undefined)
+  })
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({ execute: commandStoreExecute })
+}))
+
+vi.mock('@/utils/envUtil', () => ({
+  electronAPI: () => null
+}))
+
+vi.mock(
+  '@/workbench/extensions/manager/composables/useConflictAcknowledgment',
+  () => ({
+    useConflictAcknowledgment: () => ({ shouldShowRedDot: { value: false } })
+  })
+)
+
+vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
+  useManagerState: () => ({ isNewManagerUI: { value: false } })
+}))
+
+vi.mock('@/workbench/extensions/manager/services/comfyManagerService', () => ({
+  useComfyManagerService: () => ({})
+}))
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({ add: vi.fn() })
+}))
+
+vi.mock('@/components/icons/PuzzleIcon.vue', () => ({
+  default: defineComponent({
+    name: 'PuzzleIconStub',
+    render: () => h('div')
+  })
+}))
+
+function renderComponent() {
+  const user = userEvent.setup()
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: { en: enMessages }
+  })
+
+  const result = render(HelpCenterMenuContent, {
+    global: {
+      plugins: [i18n]
+    }
+  })
+
+  return { user, ...result }
+}
+
+describe('HelpCenterMenuContent feedback item', () => {
+  let openSpy: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    distribution.isCloud = false
+    distribution.isDesktop = false
+    distribution.isNightly = false
+    commandStoreExecute.mockReset()
+    openSpy = vi.spyOn(window, 'open').mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    openSpy.mockRestore()
+    cleanup()
+  })
+
+  it('opens the Typeform survey tagged with help-center source on Cloud', async () => {
+    distribution.isCloud = true
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('menuitem', { name: 'Give Feedback' }))
+
+    expect(openSpy).toHaveBeenCalledWith(
+      'https://form.typeform.com/to/q7azbWPi#distribution=ccloud&source=help-center',
+      '_blank',
+      'noopener,noreferrer'
+    )
+    expect(commandStoreExecute).not.toHaveBeenCalled()
+  })
+
+  it('opens the Typeform survey tagged with help-center source on Nightly', async () => {
+    distribution.isNightly = true
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('menuitem', { name: 'Give Feedback' }))
+
+    expect(openSpy).toHaveBeenCalledWith(
+      'https://form.typeform.com/to/q7azbWPi#distribution=oss-nightly&source=help-center',
+      '_blank',
+      'noopener,noreferrer'
+    )
+    expect(commandStoreExecute).not.toHaveBeenCalled()
+  })
+
+  it('falls back to Comfy.ContactSupport on OSS builds', async () => {
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('menuitem', { name: 'Give Feedback' }))
+
+    expect(openSpy).not.toHaveBeenCalled()
+    expect(commandStoreExecute).toHaveBeenCalledWith('Comfy.ContactSupport')
+  })
+})
diff --git a/src/components/helpcenter/HelpCenterMenuContent.vue b/src/components/helpcenter/HelpCenterMenuContent.vue
index 5773083340..7deab72887 100644
--- a/src/components/helpcenter/HelpCenterMenuContent.vue
+++ b/src/components/helpcenter/HelpCenterMenuContent.vue
@@ -163,6 +163,7 @@ import PuzzleIcon from '@/components/icons/PuzzleIcon.vue'
 import { useExternalLink } from '@/composables/useExternalLink'
 import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { buildFeedbackTypeformUrl } from '@/platform/support/config'
 import { useTelemetry } from '@/platform/telemetry'
 import type { ReleaseNote } from '@/platform/updates/common/releaseService'
 import { useReleaseStore } from '@/platform/updates/common/releaseStore'
@@ -306,7 +307,7 @@ const menuItems = computed<MenuItem[]>(() => {
         trackResourceClick('help_feedback', isCloud || isNightly)
         if (isCloud || isNightly) {
           window.open(
-            'https://form.typeform.com/to/q7azbWPi',
+            buildFeedbackTypeformUrl('help-center'),
             '_blank',
             'noopener,noreferrer'
           )
diff --git a/src/components/load3d/Load3DControls.test.ts b/src/components/load3d/Load3DControls.test.ts
index edb429bd38..8390cdc68a 100644
--- a/src/components/load3d/Load3DControls.test.ts
+++ b/src/components/load3d/Load3DControls.test.ts
@@ -251,10 +251,10 @@ describe('Load3DControls', () => {
       await user.click(screen.getByRole('button', { name: label }))
     }
 
-    it.each([
+    it.for([
       ['Model', 'model-controls'],
       ['Camera', 'camera-controls']
-    ])('%s category renders only %s', async (label, testId) => {
+    ])('%s category renders only %s', async ([label, testId]) => {
       const { user } = renderControls()
       await selectCategory(user, label)
 
@@ -315,12 +315,12 @@ describe('Load3DControls', () => {
       ).not.toBeInTheDocument()
     })
 
-    it.each([
+    it.for([
       ['Gizmo', 'gizmo-controls', 'canUseGizmo' as const],
       ['Export', 'export-controls', 'canExport' as const]
     ])(
       'hides the %s panel when its capability flips off at runtime',
-      async (label, testId, capabilityProp) => {
+      async ([label, testId, capabilityProp]) => {
         const { user, rerender } = renderControls()
 
         await openMenu(user)
diff --git a/src/components/load3d/controls/AnimationControls.vue b/src/components/load3d/controls/AnimationControls.vue
index 5cdfb7b345..0e676292da 100644
--- a/src/components/load3d/controls/AnimationControls.vue
+++ b/src/components/load3d/controls/AnimationControls.vue
@@ -21,20 +21,42 @@
       </Button>
 
       <Select
-        v-model="selectedSpeed"
-        :options="speedOptions"
-        option-label="name"
-        option-value="value"
-        class="w-24"
-      />
+        :model-value="selectedSpeed != null ? String(selectedSpeed) : undefined"
+        @update:model-value="(val) => (selectedSpeed = Number(val))"
+      >
+        <SelectTrigger size="md" class="w-24">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="opt in speedOptions"
+            :key="opt.value"
+            :value="String(opt.value)"
+          >
+            {{ opt.name }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
 
       <Select
-        v-model="selectedAnimation"
-        :options="animations"
-        option-label="name"
-        option-value="index"
-        class="w-32"
-      />
+        :model-value="
+          selectedAnimation != null ? String(selectedAnimation) : undefined
+        "
+        @update:model-value="(val) => (selectedAnimation = Number(val))"
+      >
+        <SelectTrigger size="md" class="w-32">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="anim in animations"
+            :key="anim.index"
+            :value="String(anim.index)"
+          >
+            {{ anim.name }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
     </div>
 
     <div class="flex w-full max-w-xs items-center gap-2 px-4">
@@ -54,10 +76,14 @@
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
 import { computed } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
+import Select from '@/components/ui/select/Select.vue'
+import SelectContent from '@/components/ui/select/SelectContent.vue'
+import SelectItem from '@/components/ui/select/SelectItem.vue'
+import SelectTrigger from '@/components/ui/select/SelectTrigger.vue'
+import SelectValue from '@/components/ui/select/SelectValue.vue'
 import Slider from '@/components/ui/slider/Slider.vue'
 
 type Animation = { name: string; index: number }
diff --git a/src/components/load3d/controls/GizmoControls.test.ts b/src/components/load3d/controls/GizmoControls.test.ts
index 83014aab94..23c714a7b1 100644
--- a/src/components/load3d/controls/GizmoControls.test.ts
+++ b/src/components/load3d/controls/GizmoControls.test.ts
@@ -97,13 +97,13 @@ describe('GizmoControls', () => {
     expect(emitted().toggleGizmo).toEqual([[false]])
   })
 
-  it.each([
+  it.for([
     ['Translate', 'translate'],
     ['Rotate', 'rotate'],
     ['Scale', 'scale']
   ] as const)(
     'sets mode to %s and emits setGizmoMode when clicked',
-    async (label, mode) => {
+    async ([label, mode]) => {
       const { user, gizmoConfig, emitted } = renderComponent({ enabled: true })
 
       await user.click(screen.getByRole('button', { name: label }))
diff --git a/src/components/load3d/controls/LightControls.test.ts b/src/components/load3d/controls/LightControls.test.ts
index bf1368656b..49ed4fc381 100644
--- a/src/components/load3d/controls/LightControls.test.ts
+++ b/src/components/load3d/controls/LightControls.test.ts
@@ -107,7 +107,7 @@ describe('LightControls', () => {
       ).toBeInTheDocument()
     })
 
-    it.each(['normal', 'wireframe'] as const)(
+    it.for(['normal', 'wireframe'] as const)(
       'hides the intensity control when materialMode is %s',
       (mode) => {
         renderComponent({ materialMode: mode })
diff --git a/src/components/load3d/controls/PopupSlider.test.ts b/src/components/load3d/controls/PopupSlider.test.ts
index 560895d33a..4a3dc3790d 100644
--- a/src/components/load3d/controls/PopupSlider.test.ts
+++ b/src/components/load3d/controls/PopupSlider.test.ts
@@ -5,20 +5,20 @@ import { ref } from 'vue'
 
 import PopupSlider from '@/components/load3d/controls/PopupSlider.vue'
 
-vi.mock('primevue/slider', () => ({
+vi.mock('@/components/ui/slider/Slider.vue', () => ({
   default: {
-    name: 'Slider',
+    name: 'UiSlider',
     props: ['modelValue', 'min', 'max', 'step'],
     emits: ['update:modelValue'],
     template: `
       <input
         type="range"
         role="slider"
-        :value="modelValue"
+        :value="Array.isArray(modelValue) ? modelValue[0] : modelValue"
         :min="min"
         :max="max"
         :step="step"
-        @input="$emit('update:modelValue', Number($event.target.value))"
+        @input="$emit('update:modelValue', [Number($event.target.value)])"
       />
     `
   }
diff --git a/src/components/load3d/controls/PopupSlider.vue b/src/components/load3d/controls/PopupSlider.vue
index b8e35b125d..1ebcf222dc 100644
--- a/src/components/load3d/controls/PopupSlider.vue
+++ b/src/components/load3d/controls/PopupSlider.vue
@@ -15,21 +15,22 @@
       class="absolute top-0 left-12 w-[150px] rounded-lg bg-interface-menu-surface p-4 shadow-lg"
     >
       <Slider
-        v-model="value"
+        :model-value="sliderValue"
         class="w-full"
         :min="min"
         :max="max"
         :step="step"
+        @update:model-value="onSliderUpdate"
       />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import Slider from 'primevue/slider'
-import { onMounted, onUnmounted, ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
+import Slider from '@/components/ui/slider/Slider.vue'
 
 const {
   icon = 'pi-expand',
@@ -47,6 +48,12 @@ const {
 const value = defineModel<number>()
 const showSlider = ref(false)
 
+const sliderValue = computed(() => [value.value ?? min])
+
+function onSliderUpdate(val: number[] | undefined) {
+  if (val?.length) value.value = val[0]
+}
+
 const toggleSlider = () => {
   showSlider.value = !showSlider.value
 }
diff --git a/src/components/load3d/controls/viewer/ViewerCameraControls.test.ts b/src/components/load3d/controls/viewer/ViewerCameraControls.test.ts
index fe668a91b2..8453d21d72 100644
--- a/src/components/load3d/controls/viewer/ViewerCameraControls.test.ts
+++ b/src/components/load3d/controls/viewer/ViewerCameraControls.test.ts
@@ -7,38 +7,81 @@ import { createI18n } from 'vue-i18n'
 import ViewerCameraControls from '@/components/load3d/controls/viewer/ViewerCameraControls.vue'
 import type { CameraType } from '@/extensions/core/load3d/interfaces'
 
-vi.mock('primevue/select', () => ({
+vi.mock('@/components/ui/select/Select.vue', async () => {
+  const { provide } = await import('vue')
+  return {
+    default: {
+      name: 'Select',
+      props: ['modelValue'],
+      emits: ['update:modelValue'],
+      setup(
+        props: { modelValue: string },
+        { emit }: { emit: (event: string, value: string) => void }
+      ) {
+        provide('selectModelValue', (): string => props.modelValue)
+        provide('selectUpdate', (v: string): void =>
+          emit('update:modelValue', v)
+        )
+      },
+      template: '<div><slot /></div>'
+    }
+  }
+})
+
+vi.mock('@/components/ui/select/SelectContent.vue', async () => {
+  const { inject, ref, onMounted } = await import('vue')
+  return {
+    default: {
+      name: 'SelectContent',
+      setup() {
+        const selectModelValue = inject<() => string>('selectModelValue')
+        const selectUpdate = inject<(v: string) => void>('selectUpdate')
+        const el = ref<HTMLSelectElement | null>(null)
+        onMounted(() => {
+          if (el.value) el.value.value = selectModelValue?.() ?? ''
+        })
+        return {
+          el,
+          onChange: (e: Event) => {
+            selectUpdate?.((e.target as HTMLSelectElement).value)
+          }
+        }
+      },
+      template: '<select ref="el" @change="onChange"><slot /></select>'
+    }
+  }
+})
+
+vi.mock('@/components/ui/select/SelectItem.vue', () => ({
   default: {
-    name: 'Select',
-    props: ['modelValue', 'options', 'optionLabel', 'optionValue'],
-    emits: ['update:modelValue'],
-    template: `
-      <select
-        :value="modelValue"
-        @change="$emit('update:modelValue', $event.target.value)"
-      >
-        <option v-for="opt in options" :key="opt[optionValue]" :value="opt[optionValue]">
-          {{ opt[optionLabel] }}
-        </option>
-      </select>
-    `
+    name: 'SelectItem',
+    props: ['value'],
+    template: '<option :value="value"><slot /></option>'
   }
 }))
 
-vi.mock('primevue/slider', () => ({
+vi.mock('@/components/ui/select/SelectTrigger.vue', () => ({
+  default: { name: 'SelectTrigger', template: '<span />' }
+}))
+
+vi.mock('@/components/ui/select/SelectValue.vue', () => ({
+  default: { name: 'SelectValue', template: '<span />' }
+}))
+
+vi.mock('@/components/ui/slider/Slider.vue', () => ({
   default: {
-    name: 'Slider',
-    props: ['modelValue', 'min', 'max', 'step', 'ariaLabel'],
+    name: 'UiSlider',
+    props: ['modelValue', 'min', 'max', 'step'],
     emits: ['update:modelValue'],
     template: `
       <input
         type="range"
-        :value="modelValue"
+        role="slider"
+        :value="Array.isArray(modelValue) ? modelValue[0] : modelValue"
         :min="min"
         :max="max"
         :step="step"
-        :aria-label="ariaLabel"
-        @input="$emit('update:modelValue', Number($event.target.value))"
+        @input="$emit('update:modelValue', [Number($event.target.value)])"
       />
     `
   }
diff --git a/src/components/load3d/controls/viewer/ViewerCameraControls.vue b/src/components/load3d/controls/viewer/ViewerCameraControls.vue
index f6712c7132..d0e9523fa4 100644
--- a/src/components/load3d/controls/viewer/ViewerCameraControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerCameraControls.vue
@@ -2,34 +2,46 @@
   <div class="space-y-4">
     <div class="flex flex-col gap-2">
       <label>{{ t('load3d.viewer.cameraType') }}</label>
-      <Select
-        v-model="cameraType"
-        :options="cameras"
-        option-label="title"
-        option-value="value"
-      >
+      <Select v-model="cameraType">
+        <SelectTrigger size="md">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="cam in cameras"
+            :key="cam.value"
+            :value="cam.value"
+          >
+            {{ cam.title }}
+          </SelectItem>
+        </SelectContent>
       </Select>
     </div>
 
     <div v-if="showFOVButton" class="flex flex-col gap-2">
       <label>{{ t('load3d.fov') }}</label>
       <Slider
-        v-model="fov"
+        :model-value="fovSliderValue"
         :min="10"
         :max="150"
         :step="1"
         :aria-label="t('load3d.fov')"
+        @update:model-value="onFovUpdate"
       />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
-import Slider from 'primevue/slider'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Select from '@/components/ui/select/Select.vue'
+import SelectContent from '@/components/ui/select/SelectContent.vue'
+import SelectItem from '@/components/ui/select/SelectItem.vue'
+import SelectTrigger from '@/components/ui/select/SelectTrigger.vue'
+import SelectValue from '@/components/ui/select/SelectValue.vue'
+import Slider from '@/components/ui/slider/Slider.vue'
 import type { CameraType } from '@/extensions/core/load3d/interfaces'
 
 const { t } = useI18n()
@@ -41,4 +53,10 @@ const cameras = [
 const cameraType = defineModel<CameraType>('cameraType')
 const fov = defineModel<number>('fov')
 const showFOVButton = computed(() => cameraType.value === 'perspective')
+
+const fovSliderValue = computed(() => [fov.value ?? 10])
+
+function onFovUpdate(val: number[] | undefined) {
+  if (val?.length) fov.value = val[0]
+}
 </script>
diff --git a/src/components/load3d/controls/viewer/ViewerExportControls.test.ts b/src/components/load3d/controls/viewer/ViewerExportControls.test.ts
index 800fd3d70b..131358860d 100644
--- a/src/components/load3d/controls/viewer/ViewerExportControls.test.ts
+++ b/src/components/load3d/controls/viewer/ViewerExportControls.test.ts
@@ -5,22 +5,65 @@ import { createI18n } from 'vue-i18n'
 
 import ViewerExportControls from '@/components/load3d/controls/viewer/ViewerExportControls.vue'
 
-vi.mock('primevue/select', () => ({
-  default: {
-    name: 'Select',
-    props: ['modelValue', 'options', 'optionLabel', 'optionValue'],
-    emits: ['update:modelValue'],
-    template: `
-      <select
-        :value="modelValue"
-        @change="$emit('update:modelValue', $event.target.value)"
-      >
-        <option v-for="opt in options" :key="opt[optionValue]" :value="opt[optionValue]">
-          {{ opt[optionLabel] }}
-        </option>
-      </select>
-    `
+vi.mock('@/components/ui/select/Select.vue', async () => {
+  const { provide } = await import('vue')
+  return {
+    default: {
+      name: 'Select',
+      props: ['modelValue'],
+      emits: ['update:modelValue'],
+      setup(
+        props: { modelValue: string },
+        { emit }: { emit: (event: string, value: string) => void }
+      ) {
+        provide('selectModelValue', (): string => props.modelValue)
+        provide('selectUpdate', (v: string): void =>
+          emit('update:modelValue', v)
+        )
+      },
+      template: '<div><slot /></div>'
+    }
   }
+})
+
+vi.mock('@/components/ui/select/SelectContent.vue', async () => {
+  const { inject, ref, onMounted } = await import('vue')
+  return {
+    default: {
+      name: 'SelectContent',
+      setup() {
+        const selectModelValue = inject<() => string>('selectModelValue')
+        const selectUpdate = inject<(v: string) => void>('selectUpdate')
+        const el = ref<HTMLSelectElement | null>(null)
+        onMounted(() => {
+          if (el.value) el.value.value = selectModelValue?.() ?? ''
+        })
+        return {
+          el,
+          onChange: (e: Event) => {
+            selectUpdate?.((e.target as HTMLSelectElement).value)
+          }
+        }
+      },
+      template: '<select ref="el" @change="onChange"><slot /></select>'
+    }
+  }
+})
+
+vi.mock('@/components/ui/select/SelectItem.vue', () => ({
+  default: {
+    name: 'SelectItem',
+    props: ['value'],
+    template: '<option :value="value"><slot /></option>'
+  }
+}))
+
+vi.mock('@/components/ui/select/SelectTrigger.vue', () => ({
+  default: { name: 'SelectTrigger', template: '<span />' }
+}))
+
+vi.mock('@/components/ui/select/SelectValue.vue', () => ({
+  default: { name: 'SelectValue', template: '<span />' }
 }))
 
 const i18n = createI18n({
diff --git a/src/components/load3d/controls/viewer/ViewerExportControls.vue b/src/components/load3d/controls/viewer/ViewerExportControls.vue
index 7c19710374..eb719ec962 100644
--- a/src/components/load3d/controls/viewer/ViewerExportControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerExportControls.vue
@@ -1,11 +1,18 @@
 <template>
   <div class="space-y-4">
-    <Select
-      v-model="exportFormat"
-      :options="exportFormats"
-      option-label="label"
-      option-value="value"
-    >
+    <Select v-model="exportFormat">
+      <SelectTrigger size="md">
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem
+          v-for="fmt in exportFormats"
+          :key="fmt.value"
+          :value="fmt.value"
+        >
+          {{ fmt.label }}
+        </SelectItem>
+      </SelectContent>
     </Select>
 
     <Button
@@ -19,10 +26,14 @@
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
 import { ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
+import Select from '@/components/ui/select/Select.vue'
+import SelectContent from '@/components/ui/select/SelectContent.vue'
+import SelectItem from '@/components/ui/select/SelectItem.vue'
+import SelectTrigger from '@/components/ui/select/SelectTrigger.vue'
+import SelectValue from '@/components/ui/select/SelectValue.vue'
 
 const emit = defineEmits<{
   (e: 'exportModel', format: string): void
diff --git a/src/components/load3d/controls/viewer/ViewerGizmoControls.test.ts b/src/components/load3d/controls/viewer/ViewerGizmoControls.test.ts
index 0adb09312d..319532dee9 100644
--- a/src/components/load3d/controls/viewer/ViewerGizmoControls.test.ts
+++ b/src/components/load3d/controls/viewer/ViewerGizmoControls.test.ts
@@ -94,13 +94,13 @@ describe('ViewerGizmoControls', () => {
     expect(enabled.value).toBe(false)
   })
 
-  it.each([
+  it.for([
     ['Translate', 'translate'],
     ['Rotate', 'rotate'],
     ['Scale', 'scale']
   ] as const)(
     'updates mode to %s when its toggle item is clicked',
-    async (label, expected) => {
+    async ([label, expected]) => {
       const { user, mode } = renderComponent({
         enabled: true,
         mode: 'translate'
diff --git a/src/components/load3d/controls/viewer/ViewerLightControls.test.ts b/src/components/load3d/controls/viewer/ViewerLightControls.test.ts
index 4f48f19c68..5802db30b9 100644
--- a/src/components/load3d/controls/viewer/ViewerLightControls.test.ts
+++ b/src/components/load3d/controls/viewer/ViewerLightControls.test.ts
@@ -17,19 +17,20 @@ vi.mock('@/platform/settings/settingStore', () => ({
   })
 }))
 
-vi.mock('primevue/slider', () => ({
+vi.mock('@/components/ui/slider/Slider.vue', () => ({
   default: {
-    name: 'Slider',
+    name: 'UiSlider',
     props: ['modelValue', 'min', 'max', 'step'],
     emits: ['update:modelValue'],
     template: `
       <input
         type="range"
-        :value="modelValue"
+        role="slider"
+        :value="Array.isArray(modelValue) ? modelValue[0] : modelValue"
         :min="min"
         :max="max"
         :step="step"
-        @input="$emit('update:modelValue', Number($event.target.value))"
+        @input="$emit('update:modelValue', [Number($event.target.value)])"
       />
     `
   }
diff --git a/src/components/load3d/controls/viewer/ViewerLightControls.vue b/src/components/load3d/controls/viewer/ViewerLightControls.vue
index 0df98f464f..4217ca20e3 100644
--- a/src/components/load3d/controls/viewer/ViewerLightControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerLightControls.vue
@@ -3,18 +3,20 @@
     <label>{{ $t('load3d.lightIntensity') }}</label>
 
     <Slider
-      v-model="lightIntensity"
+      :model-value="sliderValue"
       class="w-full"
       :min="lightIntensityMinimum"
       :max="lightIntensityMaximum"
       :step="lightAdjustmentIncrement"
+      @update:model-value="onSliderUpdate"
     />
   </div>
 </template>
 
 <script setup lang="ts">
-import Slider from 'primevue/slider'
+import { computed } from 'vue'
 
+import Slider from '@/components/ui/slider/Slider.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
 
 const lightIntensity = defineModel<number>('lightIntensity')
@@ -28,4 +30,12 @@ const lightIntensityMinimum = useSettingStore().get(
 const lightAdjustmentIncrement = useSettingStore().get(
   'Comfy.Load3D.LightAdjustmentIncrement'
 )
+
+const sliderValue = computed(() => [
+  lightIntensity.value ?? lightIntensityMinimum
+])
+
+function onSliderUpdate(val: number[] | undefined) {
+  if (val?.length) lightIntensity.value = val[0]
+}
 </script>
diff --git a/src/components/load3d/controls/viewer/ViewerModelControls.test.ts b/src/components/load3d/controls/viewer/ViewerModelControls.test.ts
index 787255638d..53453c844f 100644
--- a/src/components/load3d/controls/viewer/ViewerModelControls.test.ts
+++ b/src/components/load3d/controls/viewer/ViewerModelControls.test.ts
@@ -9,20 +9,65 @@ import type {
   UpDirection
 } from '@/extensions/core/load3d/interfaces'
 
-vi.mock('primevue/select', () => ({
-  default: {
-    name: 'Select',
-    props: ['modelValue', 'options', 'optionLabel', 'optionValue'],
-    emits: ['update:modelValue'],
-    template: `
-      <select
-        :value="modelValue"
-        @change="$emit('update:modelValue', $event.target.value)"
-      >
-        <option v-for="opt in options" :key="opt.value" :value="opt.value">{{ opt.label }}</option>
-      </select>
-    `
+vi.mock('@/components/ui/select/Select.vue', async () => {
+  const { provide } = await import('vue')
+  return {
+    default: {
+      name: 'Select',
+      props: ['modelValue'],
+      emits: ['update:modelValue'],
+      setup(
+        props: { modelValue: string },
+        { emit }: { emit: (event: string, value: string) => void }
+      ) {
+        provide('selectModelValue', (): string => props.modelValue)
+        provide('selectUpdate', (v: string): void =>
+          emit('update:modelValue', v)
+        )
+      },
+      template: '<div><slot /></div>'
+    }
   }
+})
+
+vi.mock('@/components/ui/select/SelectContent.vue', async () => {
+  const { inject, ref, onMounted } = await import('vue')
+  return {
+    default: {
+      name: 'SelectContent',
+      setup() {
+        const selectModelValue = inject<() => string>('selectModelValue')
+        const selectUpdate = inject<(v: string) => void>('selectUpdate')
+        const el = ref<HTMLSelectElement | null>(null)
+        onMounted(() => {
+          if (el.value) el.value.value = selectModelValue?.() ?? ''
+        })
+        return {
+          el,
+          onChange: (e: Event) => {
+            selectUpdate?.((e.target as HTMLSelectElement).value)
+          }
+        }
+      },
+      template: '<select ref="el" @change="onChange"><slot /></select>'
+    }
+  }
+})
+
+vi.mock('@/components/ui/select/SelectItem.vue', () => ({
+  default: {
+    name: 'SelectItem',
+    props: ['value'],
+    template: '<option :value="value"><slot /></option>'
+  }
+}))
+
+vi.mock('@/components/ui/select/SelectTrigger.vue', () => ({
+  default: { name: 'SelectTrigger', template: '<span />' }
+}))
+
+vi.mock('@/components/ui/select/SelectValue.vue', () => ({
+  default: { name: 'SelectValue', template: '<span />' }
 }))
 
 const i18n = createI18n({
diff --git a/src/components/load3d/controls/viewer/ViewerModelControls.vue b/src/components/load3d/controls/viewer/ViewerModelControls.vue
index e56310e8c8..8e4288f4da 100644
--- a/src/components/load3d/controls/viewer/ViewerModelControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerModelControls.vue
@@ -2,31 +2,51 @@
   <div class="space-y-4">
     <div class="flex flex-col gap-2">
       <label>{{ $t('load3d.upDirection') }}</label>
-      <Select
-        v-model="upDirection"
-        :options="upDirectionOptions"
-        option-label="label"
-        option-value="value"
-      />
+      <Select v-model="upDirection">
+        <SelectTrigger size="md">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="opt in upDirectionOptions"
+            :key="opt.value"
+            :value="opt.value"
+          >
+            {{ opt.label }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
     </div>
 
     <div v-if="materialModes.length > 0" class="flex flex-col gap-2">
       <label>{{ $t('load3d.materialMode') }}</label>
-      <Select
-        v-model="materialMode"
-        :options="materialModeOptions"
-        option-label="label"
-        option-value="value"
-      />
+      <Select v-model="materialMode">
+        <SelectTrigger size="md">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="opt in materialModeOptions"
+            :key="opt.value"
+            :value="opt.value"
+          >
+            {{ opt.label }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Select from '@/components/ui/select/Select.vue'
+import SelectContent from '@/components/ui/select/SelectContent.vue'
+import SelectItem from '@/components/ui/select/SelectItem.vue'
+import SelectTrigger from '@/components/ui/select/SelectTrigger.vue'
+import SelectValue from '@/components/ui/select/SelectValue.vue'
 import type {
   MaterialMode,
   UpDirection
diff --git a/src/components/load3d/controls/viewer/ViewerSceneControls.vue b/src/components/load3d/controls/viewer/ViewerSceneControls.vue
index 25f37be254..95445e8586 100644
--- a/src/components/load3d/controls/viewer/ViewerSceneControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerSceneControls.vue
@@ -7,9 +7,15 @@
       <input v-model="backgroundColor" type="color" class="h-8 w-full" />
     </div>
 
-    <div>
-      <Checkbox v-model="showGrid" input-id="showGrid" binary name="showGrid" />
-      <label for="showGrid" class="pl-2">
+    <div class="flex items-center gap-2">
+      <input
+        id="showGrid"
+        v-model="showGrid"
+        type="checkbox"
+        name="showGrid"
+        class="size-4 cursor-pointer accent-node-component-surface-highlight"
+      />
+      <label for="showGrid" class="cursor-pointer">
         {{ $t('load3d.showGrid') }}
       </label>
     </div>
@@ -58,7 +64,6 @@
 </template>
 
 <script setup lang="ts">
-import Checkbox from 'primevue/checkbox'
 import { ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
diff --git a/src/components/maskeditor/BrushSettingsPanel.vue b/src/components/maskeditor/BrushSettingsPanel.vue
index 99b9dd5412..31a4f476e0 100644
--- a/src/components/maskeditor/BrushSettingsPanel.vue
+++ b/src/components/maskeditor/BrushSettingsPanel.vue
@@ -64,6 +64,7 @@
         </span>
         <input
           v-model.number="brushSize"
+          data-testid="brush-thickness-input"
           type="number"
           class="border-p-form-field-border-color text-input-text w-16 rounded-md border bg-comfy-menu-bg px-2 py-1 text-center text-sm"
           :min="1"
diff --git a/src/components/maskeditor/ImageLayerSettingsPanel.test.ts b/src/components/maskeditor/ImageLayerSettingsPanel.test.ts
index 973f2138ef..3be8140a83 100644
--- a/src/components/maskeditor/ImageLayerSettingsPanel.test.ts
+++ b/src/components/maskeditor/ImageLayerSettingsPanel.test.ts
@@ -111,26 +111,29 @@ describe('ImageLayerSettingsPanel', () => {
   })
 
   describe('blend mode select', () => {
-    it.each([
+    it.for([
       ['black', MaskBlendMode.Black],
       ['white', MaskBlendMode.White],
       ['negative', MaskBlendMode.Negative],
       ['unknown-fallback', MaskBlendMode.Black]
-    ] as const)('should map %s to MaskBlendMode.%s', async (raw, expected) => {
-      const { container } = renderPanel()
-      const select = container.querySelector('select') as HTMLSelectElement
+    ] as const)(
+      'should map %s to MaskBlendMode.%s',
+      async ([raw, expected]) => {
+        const { container } = renderPanel()
+        const select = container.querySelector('select') as HTMLSelectElement
 
-      Object.defineProperty(select, 'value', {
-        value: raw,
-        configurable: true
-      })
-      select.dispatchEvent(new Event('change', { bubbles: true }))
+        Object.defineProperty(select, 'value', {
+          value: raw,
+          configurable: true
+        })
+        select.dispatchEvent(new Event('change', { bubbles: true }))
 
-      await new Promise((r) => setTimeout(r, 0))
+        await new Promise((r) => setTimeout(r, 0))
 
-      expect(mockStore.maskBlendMode).toBe(expected)
-      expect(mockUpdateMaskColor).toHaveBeenCalled()
-    })
+        expect(mockStore.maskBlendMode).toBe(expected)
+        expect(mockUpdateMaskColor).toHaveBeenCalled()
+      }
+    )
   })
 
   describe('layer visibility checkboxes', () => {
diff --git a/src/components/maskeditor/PointerZone.test.ts b/src/components/maskeditor/PointerZone.test.ts
index 7497bd5609..b34982acd8 100644
--- a/src/components/maskeditor/PointerZone.test.ts
+++ b/src/components/maskeditor/PointerZone.test.ts
@@ -63,13 +63,13 @@ describe('PointerZone', () => {
   })
 
   describe('pointer event forwarding', () => {
-    it.each([
+    it.for([
       ['pointerdown', 'handlePointerDown'],
       ['pointermove', 'handlePointerMove'],
       ['pointerup', 'handlePointerUp']
     ] as const)(
       'should forward %s to toolManager.%s',
-      async (eventName, handlerName) => {
+      async ([eventName, handlerName]) => {
         renderZone()
         const zone = getZone()
 
@@ -103,13 +103,13 @@ describe('PointerZone', () => {
   })
 
   describe('touch event forwarding', () => {
-    it.each([
+    it.for([
       ['touchstart', 'handleTouchStart'],
       ['touchmove', 'handleTouchMove'],
       ['touchend', 'handleTouchEnd']
     ] as const)(
       'should forward %s to panZoom.%s',
-      async (eventName, handlerName) => {
+      async ([eventName, handlerName]) => {
         renderZone()
         const zone = getZone()
 
diff --git a/src/components/maskeditor/ToolPanel.test.ts b/src/components/maskeditor/ToolPanel.test.ts
index afe92d720c..ed2e33adee 100644
--- a/src/components/maskeditor/ToolPanel.test.ts
+++ b/src/components/maskeditor/ToolPanel.test.ts
@@ -85,7 +85,7 @@ describe('ToolPanel', () => {
   })
 
   describe('current tool highlight', () => {
-    it.each([Tools.MaskPen, Tools.Eraser, Tools.PaintPen] as const)(
+    it.for([Tools.MaskPen, Tools.Eraser, Tools.PaintPen] as const)(
       'should mark the %s button as selected when it is the current tool',
       (tool) => {
         mockStore.currentTool = tool
diff --git a/src/components/maskeditor/dialog/TopBarHeader.test.ts b/src/components/maskeditor/dialog/TopBarHeader.test.ts
index 37b0a8839b..791068d270 100644
--- a/src/components/maskeditor/dialog/TopBarHeader.test.ts
+++ b/src/components/maskeditor/dialog/TopBarHeader.test.ts
@@ -130,14 +130,14 @@ describe('TopBarHeader', () => {
   })
 
   describe('canvas transform buttons', () => {
-    it.each([
+    it.for([
       ['Rotate Left', 'rotateCounterclockwise'],
       ['Rotate Right', 'rotateClockwise'],
       ['Mirror Horizontal', 'mirrorHorizontal'],
       ['Mirror Vertical', 'mirrorVertical']
     ] as const)(
       'should call canvasTransform.%s when %s button is clicked',
-      async (label, method) => {
+      async ([label, method]) => {
         const user = userEvent.setup()
         renderHeader()
 
@@ -147,14 +147,14 @@ describe('TopBarHeader', () => {
       }
     )
 
-    it.each([
+    it.for([
       ['Rotate Left', 'rotateCounterclockwise', 'Rotate left failed:'],
       ['Rotate Right', 'rotateClockwise', 'Rotate right failed:'],
       ['Mirror Horizontal', 'mirrorHorizontal', 'Mirror horizontal failed:'],
       ['Mirror Vertical', 'mirrorVertical', 'Mirror vertical failed:']
     ] as const)(
       'should swallow and log errors from %s',
-      async (label, method, expectedMsg) => {
+      async ([label, method, expectedMsg]) => {
         const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
         mockCanvasTransform[method].mockRejectedValueOnce(new Error('boom'))
         const user = userEvent.setup()
diff --git a/src/components/painter/WidgetPainter.test.ts b/src/components/painter/WidgetPainter.test.ts
new file mode 100644
index 0000000000..56627545b2
--- /dev/null
+++ b/src/components/painter/WidgetPainter.test.ts
@@ -0,0 +1,334 @@
+import { fireEvent, render, screen, within } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, ref } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+const sizeHolder = vi.hoisted(() => ({ width: 0, height: 0 }))
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const actual = await importOriginal()
+  return {
+    ...(actual as object),
+    useElementSize: () => ({
+      width: ref(sizeHolder.width),
+      height: ref(sizeHolder.height)
+    })
+  }
+})
+
+const painterHolder = vi.hoisted(() => ({
+  state: null as Record<string, unknown> | null
+}))
+
+function createDefaultPainterState() {
+  return {
+    tool: ref('brush'),
+    brushSize: ref(20),
+    brushColor: ref('#000000'),
+    brushOpacity: ref(1),
+    brushHardness: ref(1),
+    backgroundColor: ref('#ffffff'),
+    canvasWidth: ref(512),
+    canvasHeight: ref(512),
+    cursorVisible: ref(true),
+    displayBrushSize: ref(20),
+    inputImageUrl: ref<string | null>(null),
+    isImageInputConnected: ref(false),
+    handlePointerDown: vi.fn(),
+    handlePointerMove: vi.fn(),
+    handlePointerUp: vi.fn(),
+    handlePointerEnter: vi.fn(),
+    handlePointerLeave: vi.fn(),
+    handleInputImageLoad: vi.fn(),
+    handleClear: vi.fn()
+  }
+}
+
+vi.mock('@/composables/painter/usePainter', () => ({
+  PAINTER_TOOLS: { BRUSH: 'brush', ERASER: 'eraser' } as const,
+  usePainter: () => {
+    if (!painterHolder.state) painterHolder.state = createDefaultPainterState()
+    return painterHolder.state
+  }
+}))
+
+import WidgetPainter from './WidgetPainter.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      painter: {
+        tool: 'Tool',
+        brush: 'Brush',
+        eraser: 'Eraser',
+        size: 'Size',
+        color: 'Color',
+        hardness: 'Hardness',
+        width: 'Width',
+        height: 'Height',
+        background: 'Background',
+        clear: 'Clear'
+      }
+    }
+  }
+})
+
+const ButtonStub = defineComponent({
+  name: 'Button',
+  inheritAttrs: false,
+  template: '<button v-bind="$attrs" type="button"><slot /></button>'
+})
+
+const SliderStub = defineComponent({
+  name: 'Slider',
+  props: {
+    modelValue: { type: Array, default: () => [] },
+    min: Number,
+    max: Number,
+    step: Number
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<div data-testid="slider-stub" :data-min="min" @click="$emit(\'update:modelValue\', [Number(min) + Number(step ?? 1)])" />'
+})
+
+function primePainterState(overrides: Record<string, unknown> = {}) {
+  painterHolder.state = { ...createDefaultPainterState(), ...overrides }
+}
+
+function renderWidget(initialModel = '') {
+  const value = ref(initialModel)
+  const Harness = defineComponent({
+    components: { WidgetPainter },
+    setup: () => ({ value }),
+    template: '<WidgetPainter v-model="value" node-id="42" />'
+  })
+  return render(Harness, {
+    global: {
+      plugins: [i18n],
+      stubs: { Button: ButtonStub, Slider: SliderStub }
+    }
+  })
+}
+
+describe('WidgetPainter', () => {
+  beforeEach(() => {
+    sizeHolder.width = 0
+    sizeHolder.height = 0
+    painterHolder.state = null
+  })
+
+  describe('Label visibility', () => {
+    const allLabels = [
+      'Tool',
+      'Size',
+      'Color',
+      'Hardness',
+      'Width',
+      'Height',
+      'Background'
+    ]
+
+    it('renders every label in wide layout (width >= 350)', () => {
+      sizeHolder.width = 600
+      primePainterState()
+      renderWidget()
+      for (const label of allLabels) {
+        expect(screen.getByText(label)).toBeInTheDocument()
+      }
+    })
+
+    it('still renders every label in compact layout (width < 350)', () => {
+      sizeHolder.width = 200
+      primePainterState()
+      renderWidget()
+      for (const label of allLabels) {
+        expect(screen.getByText(label)).toBeInTheDocument()
+      }
+    })
+
+    it('keeps labels at the responsive boundary (width = 350)', () => {
+      sizeHolder.width = 350
+      primePainterState()
+      renderWidget()
+      for (const label of allLabels) {
+        expect(screen.getByText(label)).toBeInTheDocument()
+      }
+    })
+  })
+
+  describe('Image-input branch', () => {
+    it('hides canvas-size and background controls when an image is connected', () => {
+      primePainterState({
+        isImageInputConnected: ref(true),
+        inputImageUrl: ref('/img.png')
+      })
+      renderWidget()
+
+      expect(screen.queryByText('Width')).toBeNull()
+      expect(screen.queryByText('Height')).toBeNull()
+      expect(screen.queryByText('Background')).toBeNull()
+      expect(screen.getByTestId('painter-dimension-text')).toBeInTheDocument()
+    })
+
+    it('renders the input image inside the canvas container', () => {
+      primePainterState({
+        isImageInputConnected: ref(true),
+        inputImageUrl: ref('/img.png')
+      })
+      renderWidget()
+
+      const container = screen.getByTestId('painter-canvas-container')
+      expect(within(container).getByRole('img')).toBeInTheDocument()
+    })
+  })
+
+  describe('Tool selection', () => {
+    it('hides brush-only controls when the eraser tool is active', () => {
+      primePainterState({ tool: ref('eraser') })
+      renderWidget()
+
+      expect(screen.queryByText('Color')).toBeNull()
+      expect(screen.queryByText('Hardness')).toBeNull()
+    })
+
+    it('updates the active tool when clicking brush/eraser buttons', async () => {
+      const tool = ref<'brush' | 'eraser'>('brush')
+      primePainterState({ tool })
+      renderWidget()
+      const user = userEvent.setup()
+
+      await user.click(screen.getByText('Eraser'))
+      expect(tool.value).toBe('eraser')
+
+      await user.click(screen.getByText('Brush'))
+      expect(tool.value).toBe('brush')
+    })
+  })
+
+  describe('Canvas events', () => {
+    it('forwards pointerdown/up to the composable on click', async () => {
+      primePainterState()
+      renderWidget()
+      const user = userEvent.setup()
+
+      await user.click(screen.getByTestId('painter-canvas'))
+
+      const s = painterHolder.state!
+      expect(s.handlePointerDown).toHaveBeenCalled()
+      expect(s.handlePointerUp).toHaveBeenCalled()
+    })
+
+    it('forwards pointerenter/leave to the composable on hover', async () => {
+      primePainterState()
+      renderWidget()
+      const user = userEvent.setup()
+      const canvas = screen.getByTestId('painter-canvas')
+
+      await user.hover(canvas)
+      await user.unhover(canvas)
+
+      const s = painterHolder.state!
+      expect(s.handlePointerEnter).toHaveBeenCalled()
+      expect(s.handlePointerLeave).toHaveBeenCalled()
+    })
+
+    it('invokes handleInputImageLoad when the input image fires load', async () => {
+      primePainterState({
+        isImageInputConnected: ref(true),
+        inputImageUrl: ref('/img.png')
+      })
+      renderWidget()
+
+      const img = within(
+        screen.getByTestId('painter-canvas-container')
+      ).getByRole('img')
+      await fireEvent.load(img)
+      expect(painterHolder.state!.handleInputImageLoad).toHaveBeenCalled()
+    })
+  })
+
+  describe('Control bindings', () => {
+    it('invokes handleClear when the clear button is clicked', async () => {
+      primePainterState()
+      renderWidget()
+      const user = userEvent.setup()
+
+      await user.click(screen.getByTestId('painter-clear-button'))
+      expect(painterHolder.state!.handleClear).toHaveBeenCalled()
+    })
+
+    it('updates brushSize via the size slider', async () => {
+      const brushSize = ref(20)
+      primePainterState({ brushSize })
+      renderWidget()
+      const user = userEvent.setup()
+
+      const slider = within(screen.getByTestId('painter-size-row')).getByTestId(
+        'slider-stub'
+      )
+      await user.click(slider)
+      expect(brushSize.value).toBe(2) // min=1, step=1 -> emits 2
+    })
+
+    it('updates brushColor via the color picker', async () => {
+      const brushColor = ref('#000000')
+      primePainterState({ brushColor })
+      renderWidget()
+
+      const colorInput = within(
+        screen.getByTestId('painter-color-row')
+      ).getByDisplayValue('#000000')
+      // <input type="color"> has no userEvent equivalent — fire input directly
+      // eslint-disable-next-line testing-library/prefer-user-event
+      await fireEvent.input(colorInput, { target: { value: '#ff0000' } })
+      expect(brushColor.value.toLowerCase()).toBe('#ff0000')
+    })
+
+    it('updates brushOpacity via the percent input', async () => {
+      const brushOpacity = ref(1)
+      primePainterState({ brushOpacity })
+      renderWidget()
+      const user = userEvent.setup()
+
+      const percentInput = within(
+        screen.getByTestId('painter-color-row')
+      ).getByDisplayValue('100')
+      await user.clear(percentInput)
+      await user.type(percentInput, '50')
+      await user.tab() // blur to trigger @change
+      expect(brushOpacity.value).toBeCloseTo(0.5)
+    })
+
+    it('clamps opacity input to the 0-100 range', async () => {
+      const brushOpacity = ref(1)
+      primePainterState({ brushOpacity })
+      renderWidget()
+      const user = userEvent.setup()
+
+      const percentInput = within(
+        screen.getByTestId('painter-color-row')
+      ).getByDisplayValue('100')
+      await user.clear(percentInput)
+      await user.type(percentInput, '999')
+      await user.tab()
+      expect(brushOpacity.value).toBe(1) // clamped to 100% -> 1.0
+    })
+
+    it('updates background color via the bg color input', async () => {
+      const backgroundColor = ref('#ffffff')
+      primePainterState({ backgroundColor })
+      renderWidget()
+
+      const bgInput = within(
+        screen.getByTestId('painter-bg-color-row')
+      ).getByDisplayValue('#ffffff')
+      // eslint-disable-next-line testing-library/prefer-user-event
+      await fireEvent.input(bgInput, { target: { value: '#00ff00' } })
+      expect(backgroundColor.value.toLowerCase()).toBe('#00ff00')
+    })
+  })
+})
diff --git a/src/components/painter/WidgetPainter.vue b/src/components/painter/WidgetPainter.vue
index 6b3a23ef63..3569c5dce0 100644
--- a/src/components/painter/WidgetPainter.vue
+++ b/src/components/painter/WidgetPainter.vue
@@ -23,6 +23,7 @@
         />
         <canvas
           ref="canvasEl"
+          data-testid="painter-canvas"
           class="absolute inset-0 size-full cursor-none touch-none"
           @pointerdown="handlePointerDown"
           @pointermove="handlePointerMove"
@@ -58,7 +59,6 @@
       "
     >
       <div
-        v-if="!compact"
         class="flex w-28 items-center truncate text-sm text-muted-foreground"
       >
         {{ $t('painter.tool') }}
@@ -99,7 +99,6 @@
       </div>
 
       <div
-        v-if="!compact"
         class="flex w-28 items-center truncate text-sm text-muted-foreground"
       >
         {{ $t('painter.size') }}
@@ -126,7 +125,6 @@
 
       <template v-if="tool === PAINTER_TOOLS.BRUSH">
         <div
-          v-if="!compact"
           class="flex w-28 items-center truncate text-sm text-muted-foreground"
         >
           {{ $t('painter.color') }}
@@ -170,7 +168,6 @@
         </div>
 
         <div
-          v-if="!compact"
           class="flex w-28 items-center truncate text-sm text-muted-foreground"
         >
           {{ $t('painter.hardness') }}
@@ -199,7 +196,6 @@
 
       <template v-if="!isImageInputConnected">
         <div
-          v-if="!compact"
           class="flex w-28 items-center truncate text-sm text-muted-foreground"
         >
           {{ $t('painter.width') }}
@@ -222,7 +218,6 @@
         </div>
 
         <div
-          v-if="!compact"
           class="flex w-28 items-center truncate text-sm text-muted-foreground"
         >
           {{ $t('painter.height') }}
@@ -245,7 +240,6 @@
         </div>
 
         <div
-          v-if="!compact"
           class="flex w-28 items-center truncate text-sm text-muted-foreground"
         >
           {{ $t('painter.background') }}
diff --git a/src/components/queue/job/JobAssetsList.test.ts b/src/components/queue/job/JobAssetsList.test.ts
index d1f673ffb9..6ddff89c02 100644
--- a/src/components/queue/job/JobAssetsList.test.ts
+++ b/src/components/queue/job/JobAssetsList.test.ts
@@ -4,6 +4,7 @@ import { fireEvent, render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, nextTick } from 'vue'
+import type * as RekaUi from 'reka-ui'
 
 import './testUtils/mockTanstackVirtualizer'
 
@@ -27,6 +28,85 @@ vi.mock('@/components/queue/job/JobDetailsPopover.vue', () => ({
   default: hoisted.jobDetailsPopoverStub
 }))
 
+vi.mock('reka-ui', async (importOriginal) => {
+  const actual = await importOriginal<typeof RekaUi>()
+  const { computed, defineComponent, h, inject, provide } = await import('vue')
+  const popoverOpenKey = Symbol('popoverOpen')
+
+  return {
+    ...actual,
+    PopoverContent: defineComponent({
+      name: 'PopoverContent',
+      props: {
+        align: { type: String, default: undefined },
+        avoidCollisions: { type: Boolean, default: undefined },
+        collisionPadding: { type: Number, default: undefined },
+        hideWhenDetached: { type: Boolean, default: undefined },
+        positionStrategy: { type: String, default: undefined },
+        reference: { type: null, default: undefined },
+        side: { type: String, default: undefined },
+        sideFlip: { type: Boolean, default: undefined },
+        sideOffset: { type: Number, default: undefined },
+        sticky: { type: String, default: undefined }
+      },
+      emits: ['mouseenter', 'mouseleave'],
+      setup(props, { attrs, emit, slots }) {
+        const isOpen = inject(
+          popoverOpenKey,
+          computed(() => false)
+        )
+        return () =>
+          isOpen.value
+            ? h(
+                'div',
+                {
+                  class: attrs.class,
+                  'data-align': props.align,
+                  'data-avoid-collisions': props.avoidCollisions,
+                  'data-collision-padding': props.collisionPadding,
+                  'data-hide-when-detached': props.hideWhenDetached,
+                  'data-position-strategy': props.positionStrategy,
+                  'data-reference-bound': props.reference ? 'true' : 'false',
+                  'data-side': props.side,
+                  'data-side-flip': props.sideFlip,
+                  'data-side-offset': props.sideOffset,
+                  'data-sticky': props.sticky,
+                  onMouseenter: () => emit('mouseenter'),
+                  onMouseleave: () => emit('mouseleave')
+                },
+                slots.default?.()
+              )
+            : null
+      }
+    }),
+    PopoverPortal: {
+      name: 'PopoverPortal',
+      template: '<div><slot /></div>'
+    },
+    PopoverRoot: defineComponent({
+      name: 'PopoverRoot',
+      props: {
+        open: { type: Boolean, default: false }
+      },
+      setup(props, { slots }) {
+        provide(
+          popoverOpenKey,
+          computed(() => props.open)
+        )
+
+        return () =>
+          h(
+            'div',
+            {
+              'data-open': props.open
+            },
+            slots.default?.()
+          )
+      }
+    })
+  }
+})
+
 const AssetsListItemStub = defineComponent({
   name: 'AssetsListItem',
   props: {
@@ -72,6 +152,7 @@ vi.mock('vue-i18n', () => {
 
 type TestPreviewOutput = {
   url: string
+  previewUrl: string
   isImage: boolean
   isVideo: boolean
 }
@@ -96,6 +177,7 @@ const createPreviewOutput = (
   const url = `/api/view/${filename}`
   return {
     url,
+    previewUrl: mediaType === 'images' ? `${url}?res=512` : url,
     isImage: mediaType === 'images',
     isVideo: mediaType === 'video'
   }
@@ -153,30 +235,6 @@ function renderJobAssetsList({
   return { ...result, user }
 }
 
-function createDomRect({
-  top,
-  left,
-  width,
-  height
-}: {
-  top: number
-  left: number
-  width: number
-  height: number
-}): DOMRect {
-  return {
-    x: left,
-    y: top,
-    top,
-    left,
-    width,
-    height,
-    right: left + width,
-    bottom: top + height,
-    toJSON: () => ''
-  } as DOMRect
-}
-
 afterEach(() => {
   vi.useRealTimers()
   vi.restoreAllMocks()
@@ -240,6 +298,18 @@ describe('JobAssetsList', () => {
     expect(onViewItem).toHaveBeenCalledWith(job)
   })
 
+  it('uses thumbnail preview URLs for completed image rows', () => {
+    const preview = createPreviewOutput('job-1.png')
+    const job = buildJob({
+      taskRef: createTaskRef(preview)
+    })
+    const { container } = renderJobAssetsList({ jobs: [job] })
+
+    const stubRoot = container.querySelector('.assets-list-item-stub')!
+    expect(stubRoot.getAttribute('data-preview-url')).toBe(preview.previewUrl)
+    expect(stubRoot.getAttribute('data-preview-url')).not.toBe(preview.url)
+  })
+
   it('emits viewItem on double-click for completed jobs with preview', async () => {
     const job = buildJob()
     const onViewItem = vi.fn()
@@ -378,54 +448,24 @@ describe('JobAssetsList', () => {
     expect(container.querySelector('.job-details-popover-stub')).toBeNull()
   })
 
-  it('positions the popover to the right of rows near the left viewport edge', async () => {
+  it('anchors the popover to the active row through Reka', async () => {
     vi.useFakeTimers()
     const job = buildJob()
     const { container } = renderJobAssetsList({ jobs: [job] })
 
     const jobRow = container.querySelector(`[data-job-id="${job.id}"]`)!
 
-    vi.spyOn(window, 'innerWidth', 'get').mockReturnValue(1280)
-    vi.spyOn(jobRow, 'getBoundingClientRect').mockReturnValue(
-      createDomRect({
-        top: 100,
-        left: 40,
-        width: 200,
-        height: 48
-      })
-    )
-
     await fireEvent.mouseEnter(jobRow)
     await vi.advanceTimersByTimeAsync(200)
     await nextTick()
 
     const popover = container.querySelector('.job-details-popover')!
-    expect(popover.getAttribute('style')).toContain('left: 248px;')
-  })
-
-  it('positions the popover to the left of rows near the right viewport edge', async () => {
-    vi.useFakeTimers()
-    const job = buildJob()
-    const { container } = renderJobAssetsList({ jobs: [job] })
-
-    const jobRow = container.querySelector(`[data-job-id="${job.id}"]`)!
-
-    vi.spyOn(window, 'innerWidth', 'get').mockReturnValue(1280)
-    vi.spyOn(jobRow, 'getBoundingClientRect').mockReturnValue(
-      createDomRect({
-        top: 100,
-        left: 980,
-        width: 200,
-        height: 48
-      })
-    )
-
-    await fireEvent.mouseEnter(jobRow)
-    await vi.advanceTimersByTimeAsync(200)
-    await nextTick()
-
-    const popover = container.querySelector('.job-details-popover')!
-    expect(popover.getAttribute('style')).toContain('left: 672px;')
+    expect(popover.getAttribute('data-avoid-collisions')).toBe('true')
+    expect(popover.getAttribute('data-hide-when-detached')).toBe('true')
+    expect(popover.getAttribute('data-reference-bound')).toBe('true')
+    expect(popover.getAttribute('data-side')).toBe('right')
+    expect(popover.getAttribute('data-side-flip')).toBe('true')
+    expect(popover.getAttribute('data-position-strategy')).toBe('fixed')
   })
 
   it('clears the previous popover when hovering a new row briefly and leaving the list', async () => {
@@ -458,7 +498,7 @@ describe('JobAssetsList', () => {
     expect(container.querySelector('.job-details-popover-stub')).toBeNull()
   })
 
-  it('shows the new popover after the previous row hides while the next row stays hovered', async () => {
+  it('updates the visible popover without closing when hovering another row', async () => {
     vi.useFakeTimers()
     const firstJob = buildJob({ id: 'job-1' })
     const secondJob = buildJob({ id: 'job-2', title: 'Job 2' })
@@ -479,17 +519,21 @@ describe('JobAssetsList', () => {
 
     await fireEvent.mouseLeave(firstRow)
     await fireEvent.mouseEnter(secondRow)
-
-    await vi.advanceTimersByTimeAsync(150)
-    await nextTick()
-    expect(container.querySelector('.job-details-popover-stub')).toBeNull()
-
-    await vi.advanceTimersByTimeAsync(50)
     await nextTick()
 
-    const popoverStub = container.querySelector('.job-details-popover-stub')!
-    expect(popoverStub).not.toBeNull()
-    expect(popoverStub.getAttribute('data-job-id')).toBe('job-2')
+    expect(
+      container
+        .querySelector('.job-details-popover-stub')
+        ?.getAttribute('data-job-id')
+    ).toBe('job-2')
+
+    await vi.advanceTimersByTimeAsync(200)
+    await nextTick()
+    expect(
+      container
+        .querySelector('.job-details-popover-stub')
+        ?.getAttribute('data-job-id')
+    ).toBe('job-2')
   })
 
   it('does not show details if the hovered row disappears before the show delay ends', async () => {
diff --git a/src/components/queue/job/JobAssetsList.vue b/src/components/queue/job/JobAssetsList.vue
index 5e94fc5ddd..552b38084c 100644
--- a/src/components/queue/job/JobAssetsList.vue
+++ b/src/components/queue/job/JobAssetsList.vue
@@ -90,23 +90,15 @@
     </div>
   </div>
 
-  <Teleport to="body">
-    <div
-      v-if="activeDetails && popoverPosition"
-      class="job-details-popover fixed z-50"
-      :style="{
-        top: `${popoverPosition.top}px`,
-        left: `${popoverPosition.left}px`
-      }"
-      @mouseenter="onPopoverEnter"
-      @mouseleave="onPopoverLeave"
-    >
-      <JobDetailsPopover
-        :job-id="activeDetails.jobId"
-        :workflow-id="activeDetails.workflowId"
-      />
-    </div>
-  </Teleport>
+  <JobDetailsHoverPopover
+    :open="isDetailsOpen && !!activeDetails && !!activeRowElement"
+    :job-id="activeDetails?.jobId"
+    :workflow-id="activeDetails?.workflowId"
+    :reference-element="activeRowElement"
+    @content-enter="onPopoverEnter"
+    @content-leave="onPopoverLeave"
+    @update:open="onPopoverOpenChange"
+  />
 </template>
 
 <script setup lang="ts">
@@ -114,13 +106,11 @@ import type { VirtualItem } from '@tanstack/vue-virtual'
 import type { CSSProperties } from 'vue'
 import { useVirtualizer } from '@tanstack/vue-virtual'
 import { useI18n } from 'vue-i18n'
-import { computed, nextTick, ref } from 'vue'
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
 
-import JobDetailsPopover from '@/components/queue/job/JobDetailsPopover.vue'
-import { getHoverPopoverPosition } from '@/components/queue/job/getHoverPopoverPosition'
+import JobDetailsHoverPopover from '@/components/queue/job/JobDetailsHoverPopover.vue'
 import Button from '@/components/ui/button/Button.vue'
 import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
-import { useJobDetailsHover } from '@/composables/queue/useJobDetailsHover'
 import AssetsListItem from '@/platform/assets/components/AssetsListItem.vue'
 import { cn } from '@comfyorg/tailwind-utils'
 import { iconForJobState } from '@/utils/queueDisplay'
@@ -132,6 +122,8 @@ import type { VirtualJobRow } from './buildVirtualJobRows'
 const HEADER_ROW_HEIGHT = 20
 const GROUP_ROW_GAP = 16
 const JOB_ROW_HEIGHT = 48
+const DETAILS_SHOW_DELAY_MS = 200
+const DETAILS_HIDE_DELAY_MS = 150
 
 defineOptions({
   inheritAttrs: false
@@ -150,7 +142,11 @@ const { t } = useI18n()
 const scrollContainer = ref<HTMLElement | null>(null)
 const hoveredJobId = ref<string | null>(null)
 const activeRowElement = ref<HTMLElement | null>(null)
-const popoverPosition = ref<{ top: number; left: number } | null>(null)
+const activeDetails = ref<{ jobId: string; workflowId?: string } | null>(null)
+const isDetailsOpen = ref(false)
+const hideTimer = ref<number | null>(null)
+const hideTimerJobId = ref<string | null>(null)
+const showTimer = ref<number | null>(null)
 const flatRows = computed(() => buildVirtualJobRows(displayedJobGroups))
 const virtualizer = useVirtualizer({
   get count(): number {
@@ -184,18 +180,6 @@ const virtualWrapperStyle = computed<CSSProperties>(() => ({
     height: `${virtualizer.value.getTotalSize()}px`
   })
 }))
-const {
-  activeDetails,
-  clearHoverTimers,
-  resetActiveDetails,
-  scheduleDetailsHide,
-  scheduleDetailsShow
-} = useJobDetailsHover<{ jobId: string; workflowId?: string }>({
-  getActiveId: (details) => details.jobId,
-  getDisplayedJobGroups: () => displayedJobGroups,
-  onReset: clearPopoverAnchor
-})
-
 function getVirtualRowStyle(virtualItem: VirtualItem): CSSProperties {
   return {
     position: 'absolute',
@@ -229,22 +213,88 @@ function onListScroll() {
 
 function clearPopoverAnchor() {
   activeRowElement.value = null
-  popoverPosition.value = null
 }
 
-function updatePopoverPosition() {
-  const rowElement = activeRowElement.value
-  if (!rowElement) return
+function clearHideTimer() {
+  if (hideTimer.value !== null) {
+    clearTimeout(hideTimer.value)
+    hideTimer.value = null
+  }
+  hideTimerJobId.value = null
+}
 
-  const rect = rowElement.getBoundingClientRect()
-  popoverPosition.value = getHoverPopoverPosition(rect, window.innerWidth)
+function clearShowTimer() {
+  if (showTimer.value !== null) {
+    clearTimeout(showTimer.value)
+    showTimer.value = null
+  }
+}
+
+function clearHoverTimers() {
+  clearHideTimer()
+  clearShowTimer()
+}
+
+function resetActiveDetails() {
+  clearHoverTimers()
+  isDetailsOpen.value = false
+  activeDetails.value = null
+  clearPopoverAnchor()
+}
+
+function hasDisplayedJob(jobId: string) {
+  return displayedJobGroups.some((group) =>
+    group.items.some((item) => item.id === jobId)
+  )
+}
+
+function scheduleDetailsShow(nextActive: {
+  jobId: string
+  workflowId?: string
+}) {
+  clearShowTimer()
+  showTimer.value = window.setTimeout(() => {
+    showTimer.value = null
+    if (!hasDisplayedJob(nextActive.jobId)) return
+
+    activeDetails.value = nextActive
+    isDetailsOpen.value = true
+  }, DETAILS_SHOW_DELAY_MS)
+}
+
+function showDetailsNow(nextActive: { jobId: string; workflowId?: string }) {
+  clearHoverTimers()
+  if (!hasDisplayedJob(nextActive.jobId)) return
+
+  activeDetails.value = nextActive
+  isDetailsOpen.value = true
+}
+
+function scheduleDetailsHide(jobId?: string) {
+  if (!jobId) return
+
+  clearShowTimer()
+  if (hideTimerJobId.value && hideTimerJobId.value !== jobId) {
+    return
+  }
+
+  clearHideTimer()
+  hideTimerJobId.value = jobId
+  hideTimer.value = window.setTimeout(() => {
+    const currentActive = activeDetails.value
+    if (currentActive?.jobId === jobId) {
+      isDetailsOpen.value = false
+    }
+    hideTimer.value = null
+    hideTimerJobId.value = null
+  }, DETAILS_HIDE_DELAY_MS)
 }
 
 function onJobLeave(jobId: string) {
   if (hoveredJobId.value === jobId) {
     hoveredJobId.value = null
   }
-  scheduleDetailsHide(jobId, clearPopoverAnchor)
+  scheduleDetailsHide(jobId)
 }
 
 function onJobEnter(job: JobListItem, event: MouseEvent) {
@@ -254,22 +304,22 @@ function onJobEnter(job: JobListItem, event: MouseEvent) {
   if (!(rowElement instanceof HTMLElement)) return
 
   activeRowElement.value = rowElement
-  if (activeDetails.value?.jobId === job.id) {
+  const nextActive = {
+    jobId: job.id,
+    workflowId: job.taskRef?.workflowId
+  }
+
+  if (isDetailsOpen.value && activeDetails.value?.jobId === job.id) {
     clearHoverTimers()
-    void nextTick(updatePopoverPosition)
     return
   }
 
-  scheduleDetailsShow(
-    {
-      jobId: job.id,
-      workflowId: job.taskRef?.workflowId
-    },
-    () => {
-      activeRowElement.value = rowElement
-      void nextTick(updatePopoverPosition)
-    }
-  )
+  const isSwitchingVisibleDetails = isDetailsOpen.value
+  const showDetails = isSwitchingVisibleDetails
+    ? showDetailsNow
+    : scheduleDetailsShow
+
+  showDetails(nextActive)
 }
 
 function isCancelable(job: JobListItem) {
@@ -287,7 +337,7 @@ function getPreviewOutput(job: JobListItem) {
 function getJobPreviewUrl(job: JobListItem) {
   const preview = getPreviewOutput(job)
   if (preview?.isImage || preview?.isVideo) {
-    return preview.url
+    return preview.previewUrl
   }
   return job.iconImageUrl
 }
@@ -327,7 +377,13 @@ function onPopoverEnter() {
 }
 
 function onPopoverLeave() {
-  scheduleDetailsHide(activeDetails.value?.jobId, clearPopoverAnchor)
+  scheduleDetailsHide(activeDetails.value?.jobId)
+}
+
+function onPopoverOpenChange(open: boolean) {
+  if (!open) {
+    resetActiveDetails()
+  }
 }
 
 function getJobIconClass(job: JobListItem): string | undefined {
@@ -337,4 +393,18 @@ function getJobIconClass(job: JobListItem): string | undefined {
   }
   return undefined
 }
+
+watch(
+  () => displayedJobGroups,
+  () => {
+    const currentActive = activeDetails.value
+    if (!currentActive) return
+
+    if (!hasDisplayedJob(currentActive.jobId)) {
+      resetActiveDetails()
+    }
+  }
+)
+
+onBeforeUnmount(resetActiveDetails)
 </script>
diff --git a/src/components/queue/job/JobDetailsHoverPopover.vue b/src/components/queue/job/JobDetailsHoverPopover.vue
new file mode 100644
index 0000000000..41b2369848
--- /dev/null
+++ b/src/components/queue/job/JobDetailsHoverPopover.vue
@@ -0,0 +1,62 @@
+<template>
+  <Popover :open="isOpen" @update:open="onOpenChange">
+    <PopoverContent
+      v-if="hasReference"
+      :reference="referenceElement ?? undefined"
+      data-testid="queue-job-details-popover"
+      side="right"
+      align="start"
+      :side-offset="8"
+      :collision-padding="8"
+      :avoid-collisions="true"
+      :side-flip="true"
+      :hide-when-detached="true"
+      position-strategy="fixed"
+      sticky="always"
+      class="job-details-popover z-1700 max-h-(--reka-popover-content-available-height) w-auto overflow-y-auto border-0 bg-transparent p-0 shadow-none will-change-transform"
+      @mouseenter="$emit('content-enter')"
+      @mouseleave="$emit('content-leave')"
+      @open-auto-focus.prevent
+      @close-auto-focus.prevent
+    >
+      <JobDetailsPopover
+        v-if="jobId"
+        :job-id="jobId"
+        :workflow-id="workflowId"
+      />
+    </PopoverContent>
+  </Popover>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import JobDetailsPopover from '@/components/queue/job/JobDetailsPopover.vue'
+import Popover from '@/components/ui/popover/Popover.vue'
+import PopoverContent from '@/components/ui/popover/PopoverContent.vue'
+
+const {
+  open,
+  jobId = null,
+  workflowId,
+  referenceElement = null
+} = defineProps<{
+  open: boolean
+  jobId?: string | null
+  workflowId?: string
+  referenceElement?: HTMLElement | null
+}>()
+
+const emit = defineEmits<{
+  (e: 'content-enter'): void
+  (e: 'content-leave'): void
+  (e: 'update:open', open: boolean): void
+}>()
+
+const isOpen = computed(() => open && !!jobId)
+const hasReference = computed(() => !!jobId && !!referenceElement)
+
+function onOpenChange(nextOpen: boolean) {
+  emit('update:open', nextOpen)
+}
+</script>
diff --git a/src/components/queue/job/JobDetailsPopover.stories.ts b/src/components/queue/job/JobDetailsPopover.stories.ts
index 3e9d4781b2..6ee7ed1b5e 100644
--- a/src/components/queue/job/JobDetailsPopover.stories.ts
+++ b/src/components/queue/job/JobDetailsPopover.stories.ts
@@ -423,3 +423,44 @@ export const Failed: Story = {
     `
   })
 }
+
+export const FailedWithLongError: Story = {
+  render: (args) => ({
+    components: { JobDetailsPopover },
+    setup() {
+      resetStores()
+      const queue = useQueueStore()
+
+      const jobId = 'job-failed-long-1'
+      const priority = 411
+      const longError =
+        `Failed to send prompt request: request returned error status 400: ` +
+        `{"error": {"type": "prompt_outputs_failed_validation", "message": ` +
+        `"Prompt outputs failed validation", "details": "", "extra_info": {}}, ` +
+        `"node_errors": {"4": {"errors": [{"type": "value_not_in_list", ` +
+        `"message": "Value not in list", "details": "ckpt_name: ` +
+        `'__this_checkpoint_does_not_exist__.safetensors' not in ` +
+        `['JANKUTrainedChenkinNoobai_v777.safetensors', ` +
+        `'NetaYumevXX_pretrained_all_in_one.safetensors', ` +
+        `'animagineXL_v31Inpainting.safetensors', ` +
+        `'animayhemPaleRider_v30PlainsDrifter.safetensors', ` +
+        `'bananaSplitzXL_bananaSplitzXXL.safetensors', ` +
+        `'cyberrealistic_final.safetensors', ` +
+        `'dreamshaper_8.safetensors', ` +
+        `'intorealism_sdxlV4.safetensors', ` +
+        `'kleinova_10BF16.safetensors', 'ltx-2-19b-distilled-fp8.safetensors', ` +
+        `'ltx-2-3-22b-dev-fp8.safetensors', 'ltx-2-3-22b-distilled-fp8.safetensors', ` +
+        `'moodyDesireMix_v10.safetensors', 'perfectionSuperModelILXL_20.safetensors']"}]}}}`
+      queue.historyTasks = [
+        makeHistoryTask(jobId, priority, 12, false, longError)
+      ]
+
+      return { args: { ...args, jobId } }
+    },
+    template: `
+      <div style="padding: 12px; background: var(--color-charcoal-700); display:inline-block;">
+        <JobDetailsPopover v-bind="args" />
+      </div>
+    `
+  })
+}
diff --git a/src/components/queue/job/JobDetailsPopover.vue b/src/components/queue/job/JobDetailsPopover.vue
index 55a391c096..0e6ff9556a 100644
--- a/src/components/queue/job/JobDetailsPopover.vue
+++ b/src/components/queue/job/JobDetailsPopover.vue
@@ -78,7 +78,7 @@
           </Button>
         </div>
         <div
-          class="col-span-2 mt-2 rounded-sm bg-interface-panel-hover-surface px-4 py-2 text-xs/normal text-text-secondary"
+          class="col-span-2 mt-2 max-h-96 overflow-y-auto rounded-sm bg-interface-panel-hover-surface px-4 py-2 text-xs/normal wrap-break-word whitespace-pre-wrap text-text-secondary"
         >
           {{ errorMessageValue }}
         </div>
diff --git a/src/components/queue/job/getHoverPopoverPosition.test.ts b/src/components/queue/job/getHoverPopoverPosition.test.ts
deleted file mode 100644
index 9cd8595ccf..0000000000
--- a/src/components/queue/job/getHoverPopoverPosition.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { getHoverPopoverPosition } from './getHoverPopoverPosition'
-
-describe('getHoverPopoverPosition', () => {
-  it('places the popover to the right when space is available', () => {
-    const position = getHoverPopoverPosition(
-      { top: 100, left: 40, right: 240 },
-      1280
-    )
-    expect(position).toEqual({ top: 100, left: 248 })
-  })
-
-  it('places the popover to the left when right space is insufficient', () => {
-    const position = getHoverPopoverPosition(
-      { top: 100, left: 980, right: 1180 },
-      1280
-    )
-    expect(position).toEqual({ top: 100, left: 672 })
-  })
-
-  it('clamps the top to viewport padding when rect.top is near the top edge', () => {
-    const position = getHoverPopoverPosition(
-      { top: 2, left: 40, right: 240 },
-      1280
-    )
-    expect(position).toEqual({ top: 8, left: 248 })
-  })
-
-  it('clamps left to viewport padding when fallback would go off-screen', () => {
-    const position = getHoverPopoverPosition(
-      { top: 100, left: 100, right: 300 },
-      320
-    )
-    expect(position).toEqual({ top: 100, left: 8 })
-  })
-
-  it('prefers right when both sides have equal space', () => {
-    const position = getHoverPopoverPosition(
-      { top: 200, left: 340, right: 640 },
-      1280
-    )
-    expect(position).toEqual({ top: 200, left: 648 })
-  })
-
-  it('falls back to left when right space is less than popover width', () => {
-    const position = getHoverPopoverPosition(
-      { top: 100, left: 600, right: 1000 },
-      1280
-    )
-    expect(position).toEqual({ top: 100, left: 292 })
-  })
-
-  it('handles narrow viewport where popover barely fits', () => {
-    const position = getHoverPopoverPosition(
-      { top: 50, left: 8, right: 100 },
-      316
-    )
-    expect(position).toEqual({ top: 50, left: 8 })
-  })
-})
diff --git a/src/components/queue/job/getHoverPopoverPosition.ts b/src/components/queue/job/getHoverPopoverPosition.ts
deleted file mode 100644
index b339b78997..0000000000
--- a/src/components/queue/job/getHoverPopoverPosition.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-const POPOVER_GAP = 8
-const POPOVER_WIDTH = 300
-const VIEWPORT_PADDING = 8
-
-type AnchorRect = Pick<DOMRect, 'top' | 'left' | 'right'>
-
-type HoverPopoverPosition = {
-  top: number
-  left: number
-}
-
-export function getHoverPopoverPosition(
-  rect: AnchorRect,
-  viewportWidth: number
-): HoverPopoverPosition {
-  const availableLeft = rect.left - POPOVER_GAP
-  const availableRight = viewportWidth - rect.right - POPOVER_GAP
-  const preferredLeft = rect.right + POPOVER_GAP
-  const fallbackLeft = rect.left - POPOVER_WIDTH - POPOVER_GAP
-  const maxLeft = Math.max(
-    VIEWPORT_PADDING,
-    viewportWidth - POPOVER_WIDTH - VIEWPORT_PADDING
-  )
-
-  if (
-    availableRight >= POPOVER_WIDTH &&
-    (availableRight >= availableLeft || availableLeft < POPOVER_WIDTH)
-  ) {
-    return {
-      top: Math.max(VIEWPORT_PADDING, rect.top),
-      left: Math.min(maxLeft, preferredLeft)
-    }
-  }
-
-  return {
-    top: Math.max(VIEWPORT_PADDING, rect.top),
-    left: Math.max(VIEWPORT_PADDING, Math.min(maxLeft, fallbackLeft))
-  }
-}
diff --git a/src/components/rightSidePanel/parameters/TabNodes.vue b/src/components/rightSidePanel/parameters/TabNodes.vue
index da5da33d26..8f7da538fc 100644
--- a/src/components/rightSidePanel/parameters/TabNodes.vue
+++ b/src/components/rightSidePanel/parameters/TabNodes.vue
@@ -4,7 +4,7 @@ import { computed, reactive, ref, shallowRef, watch } from 'vue'
 
 import CollapseToggleButton from '@/components/rightSidePanel/layout/CollapseToggleButton.vue'
 
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
@@ -44,24 +44,24 @@ watch(
   }
 )
 
-function isSectionCollapsed(nodeId: string): boolean {
+function isSectionCollapsed(nodeId: NodeId): boolean {
   // Defaults to collapsed when not explicitly set by the user
   return collapseMap[nodeId] ?? true
 }
 
-function setSectionCollapsed(nodeId: string, collapsed: boolean) {
+function setSectionCollapsed(nodeId: NodeId, collapsed: boolean) {
   collapseMap[nodeId] = collapsed
 }
 
 const isAllCollapsed = computed({
   get() {
     return searchedWidgetsSectionDataList.value.every(({ node }) =>
-      isSectionCollapsed(String(node.id))
+      isSectionCollapsed(node.id)
     )
   },
   set(collapse: boolean) {
     for (const { node } of widgetsSectionDataList.value) {
-      setSectionCollapsed(String(node.id), collapse)
+      setSectionCollapsed(node.id, collapse)
     }
   }
 })
@@ -101,7 +101,7 @@ async function searcher(query: string) {
       :key="node.id"
       :node
       :widgets
-      :collapse="isSectionCollapsed(String(node.id)) && !isSearching"
+      :collapse="isSectionCollapsed(node.id) && !isSearching"
       :tooltip="
         isSearching || widgets.length
           ? ''
@@ -109,7 +109,7 @@ async function searcher(query: string) {
       "
       show-locate-button
       class="border-b border-interface-stroke"
-      @update:collapse="setSectionCollapsed(String(node.id), $event)"
+      @update:collapse="setSectionCollapsed(node.id, $event)"
     />
   </TransitionGroup>
 </template>
diff --git a/src/components/rightSidePanel/parameters/TabNormalInputs.vue b/src/components/rightSidePanel/parameters/TabNormalInputs.vue
index e104b98f4c..ba89698667 100644
--- a/src/components/rightSidePanel/parameters/TabNormalInputs.vue
+++ b/src/components/rightSidePanel/parameters/TabNormalInputs.vue
@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia'
 import { computed, reactive, ref, shallowRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/litegraph'
 import CollapseToggleButton from '@/components/rightSidePanel/layout/CollapseToggleButton.vue'
 import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
@@ -68,19 +68,19 @@ watch(
   }
 )
 
-function isSectionCollapsed(nodeId: string): boolean {
+function isSectionCollapsed(nodeId: NodeId): boolean {
   // When not explicitly set, sections are collapsed if multiple nodes are selected
   return collapseMap[nodeId] ?? isMultipleNodesSelected.value
 }
 
-function setSectionCollapsed(nodeId: string, collapsed: boolean) {
+function setSectionCollapsed(nodeId: NodeId, collapsed: boolean) {
   collapseMap[nodeId] = collapsed
 }
 
 const isAllCollapsed = computed({
   get() {
     const normalAllCollapsed = searchedWidgetsSectionDataList.value.every(
-      ({ node }) => isSectionCollapsed(String(node.id))
+      ({ node }) => isSectionCollapsed(node.id)
     )
     const hasAdvanced = advancedWidgetsSectionDataList.value.length > 0
     return hasAdvanced
@@ -89,7 +89,7 @@ const isAllCollapsed = computed({
   },
   set(collapse: boolean) {
     for (const { node } of widgetsSectionDataList.value) {
-      setSectionCollapsed(String(node.id), collapse)
+      setSectionCollapsed(node.id, collapse)
     }
     advancedCollapsed.value = collapse
   }
@@ -154,7 +154,7 @@ const advancedLabel = computed(() => {
       :node
       :label
       :widgets
-      :collapse="isSectionCollapsed(String(node.id)) && !isSearching"
+      :collapse="isSectionCollapsed(node.id) && !isSearching"
       :show-locate-button="isMultipleNodesSelected"
       :tooltip="
         isSearching || widgets.length
@@ -162,7 +162,7 @@ const advancedLabel = computed(() => {
           : t('rightSidePanel.inputsNoneTooltip')
       "
       class="border-b border-interface-stroke"
-      @update:collapse="setSectionCollapsed(String(node.id), $event)"
+      @update:collapse="setSectionCollapsed(node.id, $event)"
     />
   </TransitionGroup>
   <template v-if="advancedWidgetsSectionDataList.length > 0 && !isSearching">
diff --git a/src/components/searchbox/v2/NodeSearchFilterBar.test.ts b/src/components/searchbox/v2/NodeSearchFilterBar.test.ts
index 70f0b282a3..c71a936bb0 100644
--- a/src/components/searchbox/v2/NodeSearchFilterBar.test.ts
+++ b/src/components/searchbox/v2/NodeSearchFilterBar.test.ts
@@ -55,7 +55,7 @@ describe(NodeSearchFilterBar, () => {
   const buttonTexts = () =>
     screen.getAllByRole('button').map((b) => b.textContent?.trim())
 
-  it.each([
+  it.for([
     { prop: 'hasFavorites', label: 'Bookmarked' },
     { prop: 'hasBlueprintNodes', label: 'Blueprints' },
     { prop: 'hasEssentialNodes', label: 'Essentials' },
diff --git a/src/components/templates/thumbnails/CompareSliderThumbnail.test.ts b/src/components/templates/thumbnails/CompareSliderThumbnail.test.ts
index 372c3e1a93..e4b7bbb40e 100644
--- a/src/components/templates/thumbnails/CompareSliderThumbnail.test.ts
+++ b/src/components/templates/thumbnails/CompareSliderThumbnail.test.ts
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
 import { describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
 
 import CompareSliderThumbnail from '@/components/templates/thumbnails/CompareSliderThumbnail.vue'
 
@@ -21,13 +21,19 @@ vi.mock('@/components/common/LazyImage.vue', () => ({
   }
 }))
 
-vi.mock('@vueuse/core', () => ({
-  useMouseInElement: () => ({
-    elementX: ref(50),
-    elementWidth: ref(100),
-    isOutside: ref(false)
-  })
-}))
+const mockRect = (el: HTMLElement, width: number) => {
+  vi.spyOn(el, 'getBoundingClientRect').mockReturnValue({
+    left: 0,
+    top: 0,
+    right: width,
+    bottom: 100,
+    width,
+    height: 100,
+    x: 0,
+    y: 0,
+    toJSON: () => ({})
+  } as DOMRect)
+}
 
 describe('CompareSliderThumbnail', () => {
   const renderThumbnail = (props = {}) => {
@@ -74,4 +80,44 @@ describe('CompareSliderThumbnail', () => {
     const divider = screen.getByTestId('compare-slider-divider')
     expect(divider.style.left).toBe('50%')
   })
+
+  it('updates slider position on mousemove', async () => {
+    renderThumbnail()
+    const container = screen.getByTestId('compare-slider-container')
+    mockRect(container, 200)
+
+    const user = userEvent.setup()
+    await user.pointer({ target: container, coords: { clientX: 50 } })
+
+    const divider = screen.getByTestId('compare-slider-divider')
+    expect(divider.style.left).toBe('25%')
+  })
+
+  it('clamps slider position to [0, 100] when pointer overshoots', async () => {
+    renderThumbnail()
+    const container = screen.getByTestId('compare-slider-container')
+    mockRect(container, 200)
+
+    const user = userEvent.setup()
+
+    await user.pointer({ target: container, coords: { clientX: -10 } })
+    let divider = screen.getByTestId('compare-slider-divider')
+    expect(divider.style.left).toBe('0%')
+
+    await user.pointer({ target: container, coords: { clientX: 250 } })
+    divider = screen.getByTestId('compare-slider-divider')
+    expect(divider.style.left).toBe('100%')
+  })
+
+  it('ignores mousemove when container has zero width', async () => {
+    renderThumbnail()
+    const container = screen.getByTestId('compare-slider-container')
+    mockRect(container, 0)
+
+    const user = userEvent.setup()
+    await user.pointer({ target: container, coords: { clientX: 50 } })
+
+    const divider = screen.getByTestId('compare-slider-divider')
+    expect(divider.style.left).toBe('50%')
+  })
 })
diff --git a/src/components/templates/thumbnails/CompareSliderThumbnail.vue b/src/components/templates/thumbnails/CompareSliderThumbnail.vue
index 24c5a49d76..75341ea991 100644
--- a/src/components/templates/thumbnails/CompareSliderThumbnail.vue
+++ b/src/components/templates/thumbnails/CompareSliderThumbnail.vue
@@ -9,7 +9,11 @@
           : 'max-w-full max-h-64 object-contain'
       "
     />
-    <div ref="containerRef" class="absolute inset-0">
+    <div
+      data-testid="compare-slider-container"
+      class="absolute inset-0"
+      @mousemove="updateSliderPosition"
+    >
       <LazyImage
         :src="overlayImageSrc"
         :alt="alt"
@@ -34,8 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { useMouseInElement } from '@vueuse/core'
-import { ref, watch } from 'vue'
+import { ref } from 'vue'
 
 import LazyImage from '@/components/common/LazyImage.vue'
 import BaseThumbnail from '@/components/templates/thumbnails/BaseThumbnail.vue'
@@ -57,18 +60,20 @@ const isVideoType =
   false
 
 const sliderPosition = ref(SLIDER_START_POSITION)
-const containerRef = ref<HTMLElement | null>(null)
 
-const { elementX, elementWidth, isOutside } = useMouseInElement(containerRef)
-
-// Update slider position based on mouse position when hovered
-watch(
-  [() => isHovered, elementX, elementWidth, isOutside],
-  ([isHovered, x, width, outside]) => {
-    if (!isHovered) return
-    if (!outside) {
-      sliderPosition.value = (x / width) * 100
-    }
-  }
-)
+/**
+ * Update slider position from a local mousemove. Scoped to currentTarget so
+ * only the hovered card reads its rect — unlike useMouseInElement which
+ * attaches a global mousemove listener and fires for every mounted instance.
+ */
+function updateSliderPosition(event: MouseEvent) {
+  const el = event.currentTarget as HTMLElement
+  const rect = el.getBoundingClientRect()
+  if (rect.width === 0) return
+  // Clamp to [0, 100] — subpixel rounding or stale rects on hover-in can
+  // push the raw percentage slightly out of range, which would offset the
+  // divider past the container or invert the overlay's clipPath.
+  const raw = ((event.clientX - rect.left) / rect.width) * 100
+  sliderPosition.value = Math.max(0, Math.min(100, raw))
+}
 </script>
diff --git a/src/components/topbar/CurrentUserPopoverLegacy.test.ts b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
index b07d637788..0a4958b4b3 100644
--- a/src/components/topbar/CurrentUserPopoverLegacy.test.ts
+++ b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
@@ -252,6 +252,20 @@ describe('CurrentUserPopoverLegacy', () => {
     expect(screen.getByText('Log Out')).toBeInTheDocument()
   })
 
+  describe('credits help icon (FE-617)', () => {
+    it('renders the credits help icon as an interactive button with the unified-credits tooltip as its accessible name', () => {
+      renderComponent()
+
+      const helpButton = screen.getByTestId('credits-info-button')
+      expect(helpButton).toBeInTheDocument()
+      expect(helpButton.tagName).toBe('BUTTON')
+      expect(helpButton).toHaveAttribute(
+        'aria-label',
+        enMessages.credits.unified.tooltip
+      )
+    })
+  })
+
   it('opens user settings and emits close event when settings item is clicked', async () => {
     const { user, onClose } = renderComponent()
 
diff --git a/src/components/topbar/CurrentUserPopoverLegacy.vue b/src/components/topbar/CurrentUserPopoverLegacy.vue
index 083ba1948c..90f431ae86 100644
--- a/src/components/topbar/CurrentUserPopoverLegacy.vue
+++ b/src/components/topbar/CurrentUserPopoverLegacy.vue
@@ -41,10 +41,16 @@
       <span v-else class="text-base font-semibold text-base-foreground">{{
         formattedBalance
       }}</span>
-      <i
+      <Button
         v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
-        class="mr-auto icon-[lucide--circle-help] cursor-help text-base text-muted-foreground"
-      />
+        variant="muted-textonly"
+        size="icon-sm"
+        class="mr-auto"
+        :aria-label="$t('credits.unified.tooltip')"
+        data-testid="credits-info-button"
+      >
+        <i class="icon-[lucide--circle-help]" />
+      </Button>
       <Button
         v-if="isCloud && isFreeTier"
         variant="gradient"
diff --git a/src/components/topbar/WorkflowTab.vue b/src/components/topbar/WorkflowTab.vue
index c1036a9b90..a81fc3037a 100644
--- a/src/components/topbar/WorkflowTab.vue
+++ b/src/components/topbar/WorkflowTab.vue
@@ -23,6 +23,7 @@
         <div class="relative">
           <span
             v-if="shouldShowStatusIndicator"
+            data-testid="workflow-dirty-indicator"
             class="absolute top-1/2 left-1/2 z-10 w-4 -translate-1/2 bg-(--comfy-menu-bg) text-2xl font-bold group-hover:hidden"
             >•</span
           >
diff --git a/src/components/topbar/WorkflowTabs.test.ts b/src/components/topbar/WorkflowTabs.test.ts
new file mode 100644
index 0000000000..5914bd9b41
--- /dev/null
+++ b/src/components/topbar/WorkflowTabs.test.ts
@@ -0,0 +1,186 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h, reactive } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+
+import WorkflowTabs from './WorkflowTabs.vue'
+
+const distribution = vi.hoisted(() => ({
+  isCloud: false,
+  isDesktop: false,
+  isNightly: false
+}))
+
+const tabBarLayout = vi.hoisted(() => ({ value: 'Default' }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return distribution.isCloud
+  },
+  get isDesktop() {
+    return distribution.isDesktop
+  },
+  get isNightly() {
+    return distribution.isNightly
+  }
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: (key: string) =>
+      key === 'Comfy.UI.TabBarLayout' ? tabBarLayout.value : undefined
+  })
+}))
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({ isLoggedIn: { value: false } })
+}))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({ flags: { showSignInButton: false } })
+}))
+
+vi.mock('@/composables/element/useOverflowObserver', () => ({
+  useOverflowObserver: () => ({
+    isOverflowing: { value: false },
+    disposed: { value: false },
+    checkOverflow: vi.fn(),
+    dispose: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: () => ({
+    openWorkflow: vi.fn(),
+    closeWorkflow: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () =>
+    reactive({
+      openWorkflows: [],
+      activeWorkflow: null
+    })
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({ execute: vi.fn() })
+}))
+
+vi.mock('@/stores/workspaceStore', () => ({
+  useWorkspaceStore: () => ({ shiftDown: false })
+}))
+
+vi.mock('@/utils/mouseDownUtil', () => ({
+  whileMouseDown: vi.fn()
+}))
+
+vi.mock('./WorkflowOverflowMenu.vue', () => ({
+  default: defineComponent({
+    name: 'WorkflowOverflowMenuStub',
+    render: () => h('div')
+  })
+}))
+
+vi.mock('./WorkflowTab.vue', () => ({
+  default: defineComponent({
+    name: 'WorkflowTabStub',
+    render: () => h('div')
+  })
+}))
+
+vi.mock('./CurrentUserButton.vue', () => ({
+  default: defineComponent({
+    name: 'CurrentUserButtonStub',
+    render: () => h('div')
+  })
+}))
+
+vi.mock('./LoginButton.vue', () => ({
+  default: defineComponent({
+    name: 'LoginButtonStub',
+    render: () => h('div')
+  })
+}))
+
+function renderComponent() {
+  const user = userEvent.setup()
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: { en: enMessages }
+  })
+
+  const result = render(WorkflowTabs, {
+    global: {
+      plugins: [i18n],
+      directives: {
+        tooltip: {}
+      }
+    }
+  })
+
+  return { user, ...result }
+}
+
+describe('WorkflowTabs feedback button', () => {
+  let openSpy: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    distribution.isCloud = false
+    distribution.isDesktop = false
+    distribution.isNightly = false
+    tabBarLayout.value = 'Default'
+    openSpy = vi.spyOn(window, 'open').mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    openSpy.mockRestore()
+  })
+
+  it('opens the Typeform survey tagged with topbar source on Cloud', async () => {
+    distribution.isCloud = true
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('button', { name: 'Feedback' }))
+
+    expect(openSpy).toHaveBeenCalledWith(
+      'https://form.typeform.com/to/q7azbWPi#distribution=ccloud&source=topbar',
+      '_blank',
+      'noopener,noreferrer'
+    )
+  })
+
+  it('opens the Typeform survey tagged with topbar source on Nightly', async () => {
+    distribution.isNightly = true
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('button', { name: 'Feedback' }))
+
+    expect(openSpy).toHaveBeenCalledWith(
+      'https://form.typeform.com/to/q7azbWPi#distribution=oss-nightly&source=topbar',
+      '_blank',
+      'noopener,noreferrer'
+    )
+  })
+
+  it('does not render the feedback button on non-Cloud/non-Nightly builds', () => {
+    renderComponent()
+    expect(
+      screen.queryByRole('button', { name: 'Feedback' })
+    ).not.toBeInTheDocument()
+  })
+
+  it('does not render the feedback button when the legacy tab bar is active', () => {
+    distribution.isCloud = true
+    tabBarLayout.value = 'Legacy'
+    renderComponent()
+    expect(
+      screen.queryByRole('button', { name: 'Feedback' })
+    ).not.toBeInTheDocument()
+  })
+})
diff --git a/src/components/topbar/WorkflowTabs.vue b/src/components/topbar/WorkflowTabs.vue
index cb19dfe707..0bb86ce571 100644
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -81,6 +81,7 @@
     </Button>
     <div
       v-if="isIntegratedTabBar"
+      data-testid="integrated-tab-bar-actions"
       class="ml-auto flex shrink-0 items-center gap-2 px-2"
     >
       <Button
@@ -118,7 +119,7 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { useOverflowObserver } from '@/composables/element/useOverflowObserver'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { buildFeedbackUrl } from '@/platform/support/config'
+import { buildFeedbackTypeformUrl } from '@/platform/support/config'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
@@ -151,9 +152,12 @@ const isIntegratedTabBar = computed(
 )
 const showCurrentUser = computed(() => isCloud || isLoggedIn.value)
 
-const feedbackUrl = buildFeedbackUrl()
 function openFeedback() {
-  window.open(feedbackUrl, '_blank', 'noopener,noreferrer')
+  window.open(
+    buildFeedbackTypeformUrl('topbar'),
+    '_blank',
+    'noopener,noreferrer'
+  )
 }
 
 const containerRef = ref<HTMLElement | null>(null)
diff --git a/src/components/ui/color-picker/ColorPicker.vue b/src/components/ui/color-picker/ColorPicker.vue
index da27e0dfd9..c8837991da 100644
--- a/src/components/ui/color-picker/ColorPicker.vue
+++ b/src/components/ui/color-picker/ColorPicker.vue
@@ -68,7 +68,7 @@ const isOpen = ref(false)
         type="button"
         :class="
           cn(
-            'flex h-8 w-full items-center overflow-clip rounded-lg border border-transparent bg-node-component-surface pr-2 outline-none hover:bg-component-node-widget-background-hovered',
+            'flex h-8 w-full items-center overflow-clip rounded-lg border border-transparent bg-component-node-widget-background pr-2 outline-none hover:bg-component-node-widget-background-hovered',
             isOpen && 'border-node-stroke',
             $props.class
           )
@@ -91,7 +91,7 @@ const isOpen = ref(false)
           </div>
         </div>
         <div
-          class="flex flex-1 items-center justify-between pl-1 text-xs text-node-component-slot-text"
+          class="flex flex-1 items-center justify-between pl-1 text-xs text-component-node-foreground"
         >
           <template v-if="displayMode === 'hex'">
             <span>{{ displayHex }}</span>
diff --git a/src/components/ui/dialog/Dialog.stories.ts b/src/components/ui/dialog/Dialog.stories.ts
new file mode 100644
index 0000000000..5d4c5e1048
--- /dev/null
+++ b/src/components/ui/dialog/Dialog.stories.ts
@@ -0,0 +1,188 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import Dialog from '@/components/ui/dialog/Dialog.vue'
+import DialogClose from '@/components/ui/dialog/DialogClose.vue'
+import DialogContent from '@/components/ui/dialog/DialogContent.vue'
+import DialogDescription from '@/components/ui/dialog/DialogDescription.vue'
+import DialogFooter from '@/components/ui/dialog/DialogFooter.vue'
+import DialogHeader from '@/components/ui/dialog/DialogHeader.vue'
+import DialogOverlay from '@/components/ui/dialog/DialogOverlay.vue'
+import DialogPortal from '@/components/ui/dialog/DialogPortal.vue'
+import DialogTitle from '@/components/ui/dialog/DialogTitle.vue'
+import { FOR_STORIES } from '@/components/ui/dialog/dialog.variants'
+
+const { sizes } = FOR_STORIES
+
+const meta: Meta = {
+  title: 'Components/Dialog/Dialog',
+  tags: ['autodocs'],
+  argTypes: {
+    size: {
+      control: { type: 'select' },
+      options: sizes,
+      defaultValue: 'md'
+    }
+  },
+  args: {
+    size: 'md'
+  }
+}
+
+export default meta
+type Story = StoryObj
+
+export const Default: Story = {
+  render: (args) => ({
+    components: {
+      Button,
+      Dialog,
+      DialogPortal,
+      DialogOverlay,
+      DialogContent,
+      DialogHeader,
+      DialogFooter,
+      DialogTitle,
+      DialogDescription,
+      DialogClose
+    },
+    setup() {
+      const open = ref(false)
+      return { args, open }
+    },
+    template: `
+      <Button @click="open = true">Open dialog</Button>
+      <Dialog v-model:open="open">
+        <DialogPortal>
+          <DialogOverlay />
+          <DialogContent :size="args.size">
+            <DialogHeader>
+              <DialogTitle>Are you sure?</DialogTitle>
+              <DialogClose />
+            </DialogHeader>
+            <div class="px-4 py-2">
+              <DialogDescription>
+                This action cannot be undone. The selected items will be permanently removed.
+              </DialogDescription>
+            </div>
+            <DialogFooter>
+              <Button variant="textonly" @click="open = false">Cancel</Button>
+              <Button variant="destructive" @click="open = false">Delete</Button>
+            </DialogFooter>
+          </DialogContent>
+        </DialogPortal>
+      </Dialog>
+    `
+  })
+}
+
+export const LongContent: Story = {
+  render: (args) => ({
+    components: {
+      Button,
+      Dialog,
+      DialogPortal,
+      DialogOverlay,
+      DialogContent,
+      DialogHeader,
+      DialogTitle,
+      DialogClose
+    },
+    setup() {
+      const open = ref(false)
+      return { args, open }
+    },
+    template: `
+      <Button @click="open = true">Open long content</Button>
+      <Dialog v-model:open="open">
+        <DialogPortal>
+          <DialogOverlay />
+          <DialogContent :size="args.size">
+            <DialogHeader>
+              <DialogTitle>Long content scrolls</DialogTitle>
+              <DialogClose />
+            </DialogHeader>
+            <div class="px-4 py-2 space-y-2 overflow-auto">
+              <p v-for="n in 30" :key="n">
+                Paragraph {{ n }} — the dialog body should scroll independently
+                while the header and footer stay pinned.
+              </p>
+            </div>
+          </DialogContent>
+        </DialogPortal>
+      </Dialog>
+    `
+  })
+}
+
+export const Headless: Story = {
+  render: () => ({
+    components: {
+      Button,
+      Dialog,
+      DialogPortal,
+      DialogOverlay,
+      DialogContent
+    },
+    setup() {
+      const open = ref(false)
+      return { open }
+    },
+    template: `
+      <Button @click="open = true">Open headless</Button>
+      <Dialog v-model:open="open">
+        <DialogPortal>
+          <DialogOverlay />
+          <DialogContent size="sm" class="p-6">
+            <p class="text-sm">No header, no footer — fully custom content.</p>
+            <Button class="mt-4" @click="open = false">Close</Button>
+          </DialogContent>
+        </DialogPortal>
+      </Dialog>
+    `
+  })
+}
+
+export const AllSizes: Story = {
+  render: () => ({
+    components: {
+      Button,
+      Dialog,
+      DialogPortal,
+      DialogOverlay,
+      DialogContent,
+      DialogHeader,
+      DialogTitle,
+      DialogClose
+    },
+    setup() {
+      const openSize = ref<string | null>(null)
+      return { openSize, sizes }
+    },
+    template: `
+      <div class="flex gap-2 flex-wrap">
+        <Button v-for="s in sizes" :key="s" @click="openSize = s">{{ s }}</Button>
+      </div>
+      <Dialog
+        v-for="s in sizes"
+        :key="s"
+        :open="openSize === s"
+        @update:open="(o) => { if (!o) openSize = null }"
+      >
+        <DialogPortal>
+          <DialogOverlay />
+          <DialogContent :size="s">
+            <DialogHeader>
+              <DialogTitle>Size: {{ s }}</DialogTitle>
+              <DialogClose />
+            </DialogHeader>
+            <div class="px-4 py-2 text-sm">
+              The {{ s }} size variant.
+            </div>
+          </DialogContent>
+        </DialogPortal>
+      </Dialog>
+    `
+  })
+}
diff --git a/src/components/ui/dialog/Dialog.vue b/src/components/ui/dialog/Dialog.vue
new file mode 100644
index 0000000000..56e2b7076c
--- /dev/null
+++ b/src/components/ui/dialog/Dialog.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import type { DialogRootEmits, DialogRootProps } from 'reka-ui'
+import { DialogRoot } from 'reka-ui'
+
+const props = defineProps<DialogRootProps>()
+const emit = defineEmits<DialogRootEmits>()
+</script>
+
+<template>
+  <DialogRoot v-bind="props" @update:open="(open) => emit('update:open', open)">
+    <slot />
+  </DialogRoot>
+</template>
diff --git a/src/components/ui/dialog/DialogClose.vue b/src/components/ui/dialog/DialogClose.vue
new file mode 100644
index 0000000000..c11b5f7e65
--- /dev/null
+++ b/src/components/ui/dialog/DialogClose.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { DialogClose } from 'reka-ui'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <DialogClose as-child>
+    <slot>
+      <Button :aria-label="t('g.close')" size="icon" variant="muted-textonly">
+        <i class="icon-[lucide--x]" />
+      </Button>
+    </slot>
+  </DialogClose>
+</template>
diff --git a/src/components/ui/dialog/DialogContent.vue b/src/components/ui/dialog/DialogContent.vue
new file mode 100644
index 0000000000..4d89e5c0a2
--- /dev/null
+++ b/src/components/ui/dialog/DialogContent.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import type { DialogContentEmits, DialogContentProps } from 'reka-ui'
+import { DialogContent, useForwardPropsEmits } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { DialogContentSize } from './dialog.variants'
+import { dialogContentVariants } from './dialog.variants'
+
+const {
+  size,
+  class: customClass = '',
+  ...restProps
+} = defineProps<
+  DialogContentProps & {
+    size?: DialogContentSize
+    class?: HTMLAttributes['class']
+  }
+>()
+
+const emits = defineEmits<DialogContentEmits>()
+const forwarded = useForwardPropsEmits(restProps, emits)
+</script>
+
+<template>
+  <DialogContent
+    v-bind="forwarded"
+    :class="cn(dialogContentVariants({ size }), customClass)"
+  >
+    <slot />
+  </DialogContent>
+</template>
diff --git a/src/components/ui/dialog/DialogDescription.vue b/src/components/ui/dialog/DialogDescription.vue
new file mode 100644
index 0000000000..a213658286
--- /dev/null
+++ b/src/components/ui/dialog/DialogDescription.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import type { DialogDescriptionProps } from 'reka-ui'
+import { DialogDescription } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+const { class: customClass = '', ...delegated } = defineProps<
+  DialogDescriptionProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <DialogDescription
+    v-bind="delegated"
+    :class="cn('text-sm text-muted-foreground', customClass)"
+  >
+    <slot />
+  </DialogDescription>
+</template>
diff --git a/src/components/ui/dialog/DialogFooter.vue b/src/components/ui/dialog/DialogFooter.vue
new file mode 100644
index 0000000000..5c653a3a6f
--- /dev/null
+++ b/src/components/ui/dialog/DialogFooter.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+const { class: customClass = '' } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <div
+    :class="
+      cn(
+        'flex shrink-0 items-center justify-end gap-2 px-4 pt-2 pb-4',
+        customClass
+      )
+    "
+  >
+    <slot />
+  </div>
+</template>
diff --git a/src/components/ui/dialog/DialogHeader.vue b/src/components/ui/dialog/DialogHeader.vue
new file mode 100644
index 0000000000..6441d7adf7
--- /dev/null
+++ b/src/components/ui/dialog/DialogHeader.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+const { class: customClass = '' } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <div
+    :class="
+      cn(
+        'flex shrink-0 items-center justify-between gap-2 px-4 pt-4 pb-2',
+        customClass
+      )
+    "
+  >
+    <slot />
+  </div>
+</template>
diff --git a/src/components/ui/dialog/DialogOverlay.vue b/src/components/ui/dialog/DialogOverlay.vue
new file mode 100644
index 0000000000..7ddf333a98
--- /dev/null
+++ b/src/components/ui/dialog/DialogOverlay.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import type { DialogOverlayProps } from 'reka-ui'
+import { DialogOverlay } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+const { class: customClass = '', ...delegated } = defineProps<
+  DialogOverlayProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <DialogOverlay
+    v-bind="delegated"
+    :class="
+      cn(
+        'fixed inset-0 z-1700 bg-black/70 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0',
+        customClass
+      )
+    "
+  />
+</template>
diff --git a/src/components/ui/dialog/DialogPortal.vue b/src/components/ui/dialog/DialogPortal.vue
new file mode 100644
index 0000000000..b629e0ad44
--- /dev/null
+++ b/src/components/ui/dialog/DialogPortal.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import type { DialogPortalProps } from 'reka-ui'
+import { DialogPortal } from 'reka-ui'
+
+const props = defineProps<DialogPortalProps>()
+</script>
+
+<template>
+  <DialogPortal v-bind="props">
+    <slot />
+  </DialogPortal>
+</template>
diff --git a/src/components/ui/dialog/DialogTitle.vue b/src/components/ui/dialog/DialogTitle.vue
new file mode 100644
index 0000000000..9b4ae6bd03
--- /dev/null
+++ b/src/components/ui/dialog/DialogTitle.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import type { DialogTitleProps } from 'reka-ui'
+import { DialogTitle } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+const { class: customClass = '', ...delegated } = defineProps<
+  DialogTitleProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <DialogTitle
+    v-bind="delegated"
+    :class="cn('text-base font-semibold text-base-foreground', customClass)"
+  >
+    <slot />
+  </DialogTitle>
+</template>
diff --git a/src/components/ui/dialog/dialog.variants.ts b/src/components/ui/dialog/dialog.variants.ts
new file mode 100644
index 0000000000..f3b7d1b61e
--- /dev/null
+++ b/src/components/ui/dialog/dialog.variants.ts
@@ -0,0 +1,32 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const dialogContentVariants = cva({
+  base: 'fixed top-1/2 left-1/2 z-1700 flex max-h-[85vh] w-[calc(100vw-1rem)] -translate-x-1/2 -translate-y-1/2 flex-col rounded-lg border border-border-subtle bg-base-background shadow-lg outline-none data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+  variants: {
+    size: {
+      sm: 'sm:max-w-sm',
+      md: 'sm:max-w-xl',
+      lg: 'sm:max-w-3xl',
+      xl: 'sm:max-w-5xl',
+      full: 'sm:max-w-[calc(100vw-1rem)]'
+    }
+  },
+  defaultVariants: {
+    size: 'md'
+  }
+})
+
+export type DialogContentVariants = VariantProps<typeof dialogContentVariants>
+
+export type DialogContentSize = NonNullable<DialogContentVariants['size']>
+
+const sizes = [
+  'sm',
+  'md',
+  'lg',
+  'xl',
+  'full'
+] as const satisfies Array<DialogContentSize>
+
+export const FOR_STORIES = { sizes } as const
diff --git a/src/components/ui/multi-select/MultiSelect.vue b/src/components/ui/multi-select/MultiSelect.vue
index ad2a19f601..e6d562e76a 100644
--- a/src/components/ui/multi-select/MultiSelect.vue
+++ b/src/components/ui/multi-select/MultiSelect.vue
@@ -50,7 +50,7 @@
         position="popper"
         :side-offset="8"
         align="start"
-        :style="popoverStyle"
+        :style="[popoverStyle, contentStyle]"
         :class="selectContentClass"
         @keydown="onContentKeydown"
         @focus-outside="preventFocusDismiss"
@@ -152,6 +152,7 @@ import {
   ComboboxViewport
 } from 'reka-ui'
 import { computed, ref } from 'vue'
+import type { StyleValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
@@ -183,7 +184,8 @@ const {
   searchPlaceholder,
   listMaxHeight = '28rem',
   popoverMinWidth,
-  popoverMaxWidth
+  popoverMaxWidth,
+  contentStyle
 } = defineProps<{
   /** Input label shown on the trigger button */
   label?: string
@@ -207,6 +209,7 @@ const {
   popoverMinWidth?: string
   /** Maximum width of the popover (default: auto) */
   popoverMaxWidth?: string
+  contentStyle?: StyleValue
 }>()
 
 const selectedItems = defineModel<SelectOption[]>({
diff --git a/src/components/ui/popover/Popover.vue b/src/components/ui/popover/Popover.vue
new file mode 100644
index 0000000000..f1eed73eb9
--- /dev/null
+++ b/src/components/ui/popover/Popover.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import type { PopoverRootEmits, PopoverRootProps } from 'reka-ui'
+import { PopoverRoot, useForwardPropsEmits } from 'reka-ui'
+
+// eslint-disable-next-line vue/no-unused-properties -- forwarded to Reka via useForwardPropsEmits
+const props = defineProps<PopoverRootProps>()
+const emits = defineEmits<PopoverRootEmits>()
+
+const forwarded = useForwardPropsEmits(props, emits)
+</script>
+
+<template>
+  <PopoverRoot v-bind="forwarded">
+    <slot />
+  </PopoverRoot>
+</template>
diff --git a/src/components/ui/popover/PopoverContent.vue b/src/components/ui/popover/PopoverContent.vue
new file mode 100644
index 0000000000..62d1be247d
--- /dev/null
+++ b/src/components/ui/popover/PopoverContent.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import type { PopoverContentEmits, PopoverContentProps } from 'reka-ui'
+import { PopoverContent, PopoverPortal, useForwardPropsEmits } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+import { computed } from 'vue'
+
+import { cn } from '@comfyorg/tailwind-utils'
+
+defineOptions({
+  inheritAttrs: false
+})
+
+const {
+  align = 'center',
+  sideOffset = 4,
+  class: className,
+  ...restProps
+} = defineProps<PopoverContentProps & { class?: HTMLAttributes['class'] }>()
+const emits = defineEmits<PopoverContentEmits>()
+
+const delegatedProps = computed(() => ({
+  align,
+  sideOffset,
+  ...restProps
+}))
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits)
+</script>
+
+<template>
+  <PopoverPortal>
+    <PopoverContent
+      v-bind="{ ...forwarded, ...$attrs }"
+      :class="
+        cn(
+          'z-50 w-72 rounded-md border bg-base-background p-4 text-base-foreground shadow-md outline-none',
+          'data-[state=closed]:animate-out data-[state=open]:animate-in',
+          'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+          'data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
+          'data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2',
+          'data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+          className
+        )
+      "
+    >
+      <slot />
+    </PopoverContent>
+  </PopoverPortal>
+</template>
diff --git a/src/components/ui/search-input/SearchAutocomplete.vue b/src/components/ui/search-input/SearchAutocomplete.vue
index 56832e3305..629369cf60 100644
--- a/src/components/ui/search-input/SearchAutocomplete.vue
+++ b/src/components/ui/search-input/SearchAutocomplete.vue
@@ -70,6 +70,7 @@
         v-if="suggestions.length > 0"
         position="popper"
         :side-offset="4"
+        :style="contentStyle"
         :class="
           cn(
             'z-3000 max-h-60 w-(--reka-combobox-trigger-width) overflow-y-auto',
@@ -99,7 +100,7 @@
 </template>
 
 <script setup lang="ts" generic="T">
-import type { HTMLAttributes } from 'vue'
+import type { HTMLAttributes, StyleValue } from 'vue'
 
 import { cn } from '@comfyorg/tailwind-utils'
 import {
@@ -132,7 +133,8 @@ const {
   suggestions = [],
   optionLabel,
   optionKey,
-  class: className
+  class: className,
+  contentStyle
 } = defineProps<{
   placeholder?: string
   icon?: string
@@ -144,6 +146,7 @@ const {
   optionLabel?: keyof T & string
   optionKey?: keyof T & string
   class?: HTMLAttributes['class']
+  contentStyle?: StyleValue
 }>()
 
 const emit = defineEmits<{
diff --git a/src/components/ui/single-select/SingleSelect.vue b/src/components/ui/single-select/SingleSelect.vue
index ee2a4766b3..3f86970d8c 100644
--- a/src/components/ui/single-select/SingleSelect.vue
+++ b/src/components/ui/single-select/SingleSelect.vue
@@ -37,7 +37,7 @@
         position="popper"
         :side-offset="8"
         align="start"
-        :style="optionStyle"
+        :style="[optionStyle, contentStyle]"
         :class="cn(selectContentClass, 'min-w-(--reka-select-trigger-width)')"
         @keydown="onContentKeydown"
       >
@@ -82,6 +82,7 @@ import {
   SelectViewport
 } from 'reka-ui'
 import { ref } from 'vue'
+import type { StyleValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import {
@@ -108,7 +109,8 @@ const {
   disabled = false,
   listMaxHeight = '28rem',
   popoverMinWidth,
-  popoverMaxWidth
+  popoverMaxWidth,
+  contentStyle
 } = defineProps<{
   label?: string
   options?: SelectOption[]
@@ -126,6 +128,7 @@ const {
   popoverMinWidth?: string
   /** Maximum width of the popover (default: auto) */
   popoverMaxWidth?: string
+  contentStyle?: StyleValue
 }>()
 
 const selectedItem = defineModel<string | undefined>({ required: true })
diff --git a/src/composables/auth/useAuthActions.test.ts b/src/composables/auth/useAuthActions.test.ts
new file mode 100644
index 0000000000..4073434e5d
--- /dev/null
+++ b/src/composables/auth/useAuthActions.test.ts
@@ -0,0 +1,195 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useAuthActions } from '@/composables/auth/useAuthActions'
+import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
+
+type ModifiedWorkflow = Pick<ComfyWorkflow, 'path' | 'isModified'>
+
+const mockAuthStore = vi.hoisted(() => ({
+  logout: vi.fn().mockResolvedValue(undefined)
+}))
+
+const mockToastStore = vi.hoisted(() => ({
+  add: vi.fn()
+}))
+
+const mockWorkflowStore = vi.hoisted(() => ({
+  modifiedWorkflows: [] as ModifiedWorkflow[]
+}))
+
+const mockWorkflowService = vi.hoisted(() => ({
+  saveWorkflow: vi.fn().mockResolvedValue(true)
+}))
+
+const mockDialogService = vi.hoisted(() => ({
+  confirm: vi.fn()
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string, values?: { workflow?: string }) =>
+    values?.workflow ? `${key}:${values.workflow}` : key
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: vi.fn(() => undefined)
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: vi.fn(() => mockToastStore)
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => mockWorkflowStore)
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: vi.fn(() => mockWorkflowService)
+}))
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: vi.fn(() => mockDialogService)
+}))
+
+vi.mock('@/stores/authStore', () => ({
+  useAuthStore: vi.fn(() => mockAuthStore)
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: vi.fn(() => ({
+    isActiveSubscription: { value: false },
+    isFreeTier: { value: true },
+    type: { value: 'free' }
+  }))
+}))
+
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    wrapWithErrorHandlingAsync: <TArgs extends unknown[], TReturn>(
+      action: (...args: TArgs) => Promise<TReturn> | TReturn
+    ) => action,
+    toastErrorHandler: vi.fn()
+  })
+}))
+
+function makeWorkflow(path: string): ModifiedWorkflow {
+  return { path, isModified: true } satisfies ModifiedWorkflow
+}
+
+describe('useAuthActions.logout', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockWorkflowStore.modifiedWorkflows = []
+  })
+
+  it('logs out without prompting when no workflows are modified', async () => {
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockDialogService.confirm).not.toHaveBeenCalled()
+    expect(mockWorkflowService.saveWorkflow).not.toHaveBeenCalled()
+    expect(mockAuthStore.logout).toHaveBeenCalledTimes(1)
+  })
+
+  it('cancels sign-out when the dialog is dismissed (null)', async () => {
+    mockWorkflowStore.modifiedWorkflows = [makeWorkflow('a.json')]
+    mockDialogService.confirm.mockResolvedValueOnce(null)
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockDialogService.confirm).toHaveBeenCalledTimes(1)
+    expect(mockWorkflowService.saveWorkflow).not.toHaveBeenCalled()
+    expect(mockAuthStore.logout).not.toHaveBeenCalled()
+  })
+
+  it('signs out without saving when the user picks "Sign out anyway" (false)', async () => {
+    mockWorkflowStore.modifiedWorkflows = [makeWorkflow('a.json')]
+    mockDialogService.confirm.mockResolvedValueOnce(false)
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockDialogService.confirm).toHaveBeenCalledTimes(1)
+    expect(mockWorkflowService.saveWorkflow).not.toHaveBeenCalled()
+    expect(mockAuthStore.logout).toHaveBeenCalledTimes(1)
+  })
+
+  it('cancels sign-out when saving a workflow is cancelled', async () => {
+    mockWorkflowStore.modifiedWorkflows = [makeWorkflow('a.json')]
+    mockDialogService.confirm.mockResolvedValueOnce(true)
+    mockWorkflowService.saveWorkflow.mockResolvedValueOnce(false)
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockWorkflowService.saveWorkflow).toHaveBeenCalledTimes(1)
+    expect(mockAuthStore.logout).not.toHaveBeenCalled()
+  })
+
+  it('does not log out if a workflow save fails', async () => {
+    mockWorkflowStore.modifiedWorkflows = [
+      makeWorkflow('a.json'),
+      makeWorkflow('b.json')
+    ]
+    mockDialogService.confirm.mockResolvedValueOnce(true)
+    mockWorkflowService.saveWorkflow.mockRejectedValueOnce(
+      new Error('disk full')
+    )
+    const { logout } = useAuthActions()
+
+    await expect(logout()).rejects.toThrow('auth.signOut.saveFailed:a.json')
+
+    expect(mockWorkflowService.saveWorkflow).toHaveBeenCalledTimes(1)
+    expect(mockAuthStore.logout).not.toHaveBeenCalled()
+  })
+
+  it('saves every modified workflow before signing out when user picks Save (true)', async () => {
+    const workflows = [makeWorkflow('a.json'), makeWorkflow('b.json')]
+    mockWorkflowStore.modifiedWorkflows = workflows
+    mockDialogService.confirm.mockResolvedValueOnce(true)
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockWorkflowService.saveWorkflow).toHaveBeenCalledTimes(2)
+    expect(mockWorkflowService.saveWorkflow).toHaveBeenNthCalledWith(
+      1,
+      workflows[0]
+    )
+    expect(mockWorkflowService.saveWorkflow).toHaveBeenNthCalledWith(
+      2,
+      workflows[1]
+    )
+    expect(mockAuthStore.logout).toHaveBeenCalledTimes(1)
+    expect(
+      mockWorkflowService.saveWorkflow.mock.invocationCallOrder[1]
+    ).toBeLessThan(mockAuthStore.logout.mock.invocationCallOrder[0])
+    expect(
+      mockWorkflowService.saveWorkflow.mock.invocationCallOrder[0]
+    ).toBeLessThan(mockWorkflowService.saveWorkflow.mock.invocationCallOrder[1])
+  })
+
+  it('passes denyLabel "Sign out anyway" to the dialog', async () => {
+    mockWorkflowStore.modifiedWorkflows = [makeWorkflow('a.json')]
+    mockDialogService.confirm.mockResolvedValueOnce(null)
+    const { logout } = useAuthActions()
+
+    await logout()
+
+    expect(mockDialogService.confirm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'dirtyClose',
+        title: 'auth.signOut.unsavedChangesTitle',
+        message: 'auth.signOut.unsavedChangesMessage',
+        denyLabel: 'auth.signOut.signOutAnyway'
+      })
+    )
+  })
+})
diff --git a/src/composables/auth/useAuthActions.ts b/src/composables/auth/useAuthActions.ts
index 4064465a21..d9c9c62189 100644
--- a/src/composables/auth/useAuthActions.ts
+++ b/src/composables/auth/useAuthActions.ts
@@ -9,6 +9,7 @@ import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useDialogService } from '@/services/dialogService'
 import { useAuthStore } from '@/stores/authStore'
@@ -53,14 +54,30 @@ export const useAuthActions = () => {
 
   const logout = wrapWithErrorHandlingAsync(async () => {
     const workflowStore = useWorkflowStore()
-    if (workflowStore.modifiedWorkflows.length > 0) {
+    const modifiedWorkflows = workflowStore.modifiedWorkflows
+    if (modifiedWorkflows.length > 0) {
       const dialogService = useDialogService()
       const confirmed = await dialogService.confirm({
         title: t('auth.signOut.unsavedChangesTitle'),
         message: t('auth.signOut.unsavedChangesMessage'),
-        type: 'dirtyClose'
+        type: 'dirtyClose',
+        denyLabel: t('auth.signOut.signOutAnyway')
       })
-      if (!confirmed) return
+      if (confirmed === null) return
+
+      if (confirmed === true) {
+        const workflowService = useWorkflowService()
+        for (const workflow of modifiedWorkflows) {
+          try {
+            const saved = await workflowService.saveWorkflow(workflow)
+            if (!saved) return
+          } catch {
+            throw new Error(
+              t('auth.signOut.saveFailed', { workflow: workflow.path })
+            )
+          }
+        }
+      }
     }
 
     await authStore.logout()
diff --git a/src/composables/graph/useErrorClearingHooks.test.ts b/src/composables/graph/useErrorClearingHooks.test.ts
index 1c2329274d..0a4b351333 100644
--- a/src/composables/graph/useErrorClearingHooks.test.ts
+++ b/src/composables/graph/useErrorClearingHooks.test.ts
@@ -20,27 +20,12 @@ import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore'
 import { app } from '@/scripts/app'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { seedRequiredInputMissingNodeError } from '@/utils/__tests__/executionErrorTestUtils'
+import type { MissingModelCandidate } from '@/platform/missingModel/types'
 
-function seedSimpleError(
-  store: ReturnType<typeof useExecutionErrorStore>,
-  executionId: string,
-  inputName: string
-) {
-  store.lastNodeErrors = {
-    [executionId]: {
-      errors: [
-        {
-          type: 'required_input_missing',
-          message: 'Missing',
-          details: '',
-          extra_info: { input_name: inputName }
-        }
-      ],
-      dependent_outputs: [],
-      class_type: 'TestNode'
-    }
-  }
-}
+beforeEach(() => {
+  vi.restoreAllMocks()
+})
 
 describe('Connection error clearing via onConnectionsChange', () => {
   beforeEach(() => {
@@ -63,7 +48,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
 
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedSimpleError(store, String(node.id), 'clip')
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(NodeSlotType.INPUT, 0, true, null, node.inputs[0])
 
@@ -75,7 +60,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
     installErrorClearingHooks(graph)
 
     const store = useExecutionErrorStore()
-    seedSimpleError(store, String(node.id), 'clip')
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(
       NodeSlotType.INPUT,
@@ -94,7 +79,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
     installErrorClearingHooks(graph)
 
     const store = useExecutionErrorStore()
-    seedSimpleError(store, String(node.id), 'clip')
+    seedRequiredInputMissingNodeError(store, String(node.id), 'clip')
 
     node.onConnectionsChange!(
       NodeSlotType.OUTPUT,
@@ -116,7 +101,7 @@ describe('Connection error clearing via onConnectionsChange', () => {
 
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedSimpleError(store, String(node.id), 'model')
+    seedRequiredInputMissingNodeError(store, String(node.id), 'model')
 
     node.onConnectionsChange!(NodeSlotType.INPUT, 0, true, null, node.inputs[0])
 
@@ -261,7 +246,11 @@ describe('Widget change error clearing via onWidgetChanged', () => {
     // PromotedWidgetView.name returns displayName ("ckpt_input"), which is
     // passed as errorInputName to clearSimpleNodeErrors. Seed the error
     // with that name so the slot-name filter matches.
-    seedSimpleError(store, interiorExecId, promotedWidget!.name)
+    seedRequiredInputMissingNodeError(
+      store,
+      interiorExecId,
+      promotedWidget!.name
+    )
 
     subgraphNode.onWidgetChanged!.call(
       subgraphNode,
@@ -300,7 +289,7 @@ describe('installErrorClearingHooks lifecycle', () => {
     // Verify the hooks actually work
     const store = useExecutionErrorStore()
     vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
-    seedSimpleError(store, String(lateNode.id), 'value')
+    seedRequiredInputMissingNodeError(store, String(lateNode.id), 'value')
 
     lateNode.onConnectionsChange!(
       NodeSlotType.INPUT,
@@ -363,6 +352,90 @@ describe('installErrorClearingHooks lifecycle', () => {
     installErrorClearingHooks(graph)
     expect(node.onConnectionsChange).toBe(chainedAfterFirst)
   })
+
+  it('scans added-node missing models after widget values are restored', async () => {
+    const graph = new LGraph()
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
+    installErrorClearingHooks(graph)
+
+    const node = new LGraphNode('CheckpointLoaderSimple')
+    node.type = 'CheckpointLoaderSimple'
+    const widget = node.addWidget('combo', 'ckpt_name', '', () => undefined, {
+      values: []
+    })
+
+    graph.add(node)
+    widget.value = 'fake_model.safetensors'
+
+    await Promise.resolve()
+
+    expect(useMissingModelStore().missingModelCandidates).toEqual([
+      expect.objectContaining({ name: 'fake_model.safetensors' })
+    ])
+  })
+
+  it('scans added-node missing models before the deferred media scan', async () => {
+    const graph = new LGraph()
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
+    const modelScan = vi
+      .spyOn(missingModelScan, 'scanNodeModelCandidates')
+      .mockImplementation((_rootGraph, node) => [
+        {
+          nodeId: String(node.id),
+          nodeType: node.type,
+          widgetName: 'ckpt_name',
+          isAssetSupported: false,
+          name: 'fake_model.safetensors',
+          directory: 'checkpoints',
+          isMissing: true
+        } satisfies MissingModelCandidate
+      ])
+    const mediaScan = vi
+      .spyOn(missingMediaScan, 'scanNodeMediaCandidates')
+      .mockReturnValue([])
+    installErrorClearingHooks(graph)
+
+    const node = new LGraphNode('CheckpointLoaderSimple')
+    node.type = 'CheckpointLoaderSimple'
+    graph.add(node)
+
+    await Promise.resolve()
+
+    expect(modelScan).toHaveBeenCalledOnce()
+    expect(useMissingModelStore().missingModelCandidates).toEqual([
+      expect.objectContaining({ name: 'fake_model.safetensors' })
+    ])
+    expect(mediaScan).not.toHaveBeenCalled()
+
+    await Promise.resolve()
+
+    expect(mediaScan).toHaveBeenCalledTimes(1)
+    expect(modelScan.mock.invocationCallOrder[0]).toBeLessThan(
+      mediaScan.mock.invocationCallOrder[0]
+    )
+  })
+
+  it('does not surface added-node missing media when upload state is marked between deferred scans', async () => {
+    const graph = new LGraph()
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
+    vi.spyOn(missingModelScan, 'scanNodeModelCandidates').mockReturnValue([])
+    const mediaScan = vi.spyOn(missingMediaScan, 'scanNodeMediaCandidates')
+    installErrorClearingHooks(graph)
+
+    const node = new LGraphNode('LoadVideo')
+    node.type = 'LoadVideo'
+    node.addWidget('combo', 'file', 'uploading.mp4', () => undefined, {
+      values: []
+    })
+
+    graph.add(node)
+    await Promise.resolve()
+    node.isUploading = true
+    await Promise.resolve()
+
+    expect(useMissingMediaStore().missingMediaCandidates).toBeNull()
+    expect(mediaScan).toHaveBeenCalledOnce()
+  })
 })
 
 describe('onNodeRemoved clears missing asset errors by execution ID', () => {
@@ -559,7 +632,7 @@ describe('realtime scan verifies pending cloud candidates', () => {
       }
     ])
     const verifySpy = vi
-      .spyOn(missingMediaScan, 'verifyCloudMediaCandidates')
+      .spyOn(missingMediaScan, 'verifyMediaCandidates')
       .mockImplementation(async (candidates) => {
         for (const c of candidates) c.isMissing = true
       })
@@ -627,7 +700,6 @@ describe('realtime scan verifies pending cloud candidates', () => {
 
 describe('realtime verification staleness guards', () => {
   beforeEach(() => {
-    vi.restoreAllMocks()
     setActivePinia(createTestingPinia({ stubActions: false }))
     vi.spyOn(app, 'isGraphReady', 'get').mockReturnValue(false)
   })
@@ -702,7 +774,7 @@ describe('realtime verification staleness guards', () => {
     let resolveVerify: (() => void) | undefined
     const verifyPromise = new Promise<void>((r) => (resolveVerify = r))
     const verifySpy = vi
-      .spyOn(missingMediaScan, 'verifyCloudMediaCandidates')
+      .spyOn(missingMediaScan, 'verifyMediaCandidates')
       .mockImplementation(async (candidates) => {
         await verifyPromise
         for (const c of candidates) c.isMissing = true
@@ -787,7 +859,6 @@ describe('realtime verification staleness guards', () => {
 
 describe('scan skips interior of bypassed subgraph containers', () => {
   beforeEach(() => {
-    vi.restoreAllMocks()
     setActivePinia(createTestingPinia({ stubActions: false }))
     vi.spyOn(app, 'isGraphReady', 'get').mockReturnValue(false)
   })
@@ -831,6 +902,58 @@ describe('scan skips interior of bypassed subgraph containers', () => {
 
     expect(useMissingModelStore().missingModelCandidates).toBeNull()
   })
+
+  it('skips nested subgraph containers during parent subgraph replay scan', async () => {
+    const rootGraph = new LGraph()
+    const outerSubgraph = createTestSubgraph({ rootGraph })
+    const innerSubgraph = createTestSubgraph({ rootGraph })
+    const leafNode = new LGraphNode('UNETLoader')
+    innerSubgraph.add(leafNode)
+
+    const innerSubgraphNode = createTestSubgraphNode(innerSubgraph, {
+      parentGraph: outerSubgraph,
+      id: 76
+    })
+    outerSubgraph.add(innerSubgraphNode)
+
+    const outerSubgraphNode = createTestSubgraphNode(outerSubgraph, {
+      parentGraph: rootGraph,
+      id: 205
+    })
+    rootGraph.add(outerSubgraphNode)
+
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(rootGraph)
+    const modelScanSpy = vi
+      .spyOn(missingModelScan, 'scanNodeModelCandidates')
+      .mockReturnValue([])
+    const mediaScanSpy = vi
+      .spyOn(missingMediaScan, 'scanNodeMediaCandidates')
+      .mockReturnValue([])
+
+    installErrorClearingHooks(rootGraph)
+
+    rootGraph.onNodeAdded?.(outerSubgraphNode)
+    await new Promise((r) => setTimeout(r, 0))
+
+    expect(modelScanSpy).toHaveBeenCalledWith(
+      rootGraph,
+      leafNode,
+      expect.any(Function),
+      expect.any(Function)
+    )
+    expect(modelScanSpy).not.toHaveBeenCalledWith(
+      rootGraph,
+      innerSubgraphNode,
+      expect.any(Function),
+      expect.any(Function)
+    )
+    expect(mediaScanSpy).toHaveBeenCalledWith(rootGraph, leafNode, false)
+    expect(mediaScanSpy).not.toHaveBeenCalledWith(
+      rootGraph,
+      innerSubgraphNode,
+      false
+    )
+  })
 })
 
 describe('clearWidgetRelatedErrors parameter routing', () => {
diff --git a/src/composables/graph/useErrorClearingHooks.ts b/src/composables/graph/useErrorClearingHooks.ts
index 88b1fbc04d..2568643bd1 100644
--- a/src/composables/graph/useErrorClearingHooks.ts
+++ b/src/composables/graph/useErrorClearingHooks.ts
@@ -28,7 +28,7 @@ import {
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import {
   scanNodeMediaCandidates,
-  verifyCloudMediaCandidates
+  verifyMediaCandidates
 } from '@/platform/missingMedia/missingMediaScan'
 import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
 import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore'
@@ -155,24 +155,26 @@ function isNodeInactive(mode: number): boolean {
   return mode === LGraphEventMode.NEVER || mode === LGraphEventMode.BYPASS
 }
 
-/** Scan a single node and add confirmed missing model/media to stores.
- *  For subgraph containers, also scans all active interior nodes. */
-function scanAndAddNodeErrors(node: LGraphNode): void {
+function scanNodeErrorTargets(
+  node: LGraphNode,
+  scanNode: (node: LGraphNode) => void
+): void {
   if (!app.rootGraph) return
 
   if (node.isSubgraphNode?.() && node.subgraph) {
     for (const innerNode of collectAllNodes(node.subgraph)) {
+      if (innerNode.isSubgraphNode?.()) continue
       if (isNodeInactive(innerNode.mode)) continue
-      scanSingleNodeErrors(innerNode)
+      scanNode(innerNode)
     }
     return
   }
 
-  scanSingleNodeErrors(node)
+  scanNode(node)
 }
 
-function scanSingleNodeErrors(node: LGraphNode): void {
-  if (!app.rootGraph) return
+function getActiveExecutionId(node: LGraphNode): string | null {
+  if (!app.rootGraph) return null
   // Skip when any enclosing subgraph is muted/bypassed. Callers only
   // verify each node's own mode; entering a bypassed subgraph (via
   // useGraphNodeManager replaying onNodeAdded for existing interior
@@ -180,7 +182,25 @@ function scanSingleNodeErrors(node: LGraphNode): void {
   // execId means the node has no current graph (e.g. detached mid
   // lifecycle) — also skip, since we cannot verify its scope.
   const execId = getExecutionIdByNode(app.rootGraph, node)
-  if (!execId || !isAncestorPathActive(app.rootGraph, execId)) return
+  if (!execId || !isAncestorPathActive(app.rootGraph, execId)) return null
+  return execId
+}
+
+/** Scan a single node and add confirmed missing model/media to stores.
+ *  For subgraph containers, also scans all active interior nodes. */
+function scanAndAddNodeErrors(node: LGraphNode): void {
+  scanNodeErrorTargets(node, scanSingleNodeErrors)
+}
+
+function scanSingleNodeErrors(node: LGraphNode): void {
+  scanSingleNodeModelsAndTypes(node)
+  scanSingleNodeMedia(node)
+}
+
+function scanSingleNodeModelsAndTypes(node: LGraphNode): void {
+  if (!app.rootGraph) return
+  const execId = getActiveExecutionId(node)
+  if (!execId) return
 
   const modelCandidates = scanNodeModelCandidates(
     app.rootGraph,
@@ -203,39 +223,40 @@ function scanSingleNodeErrors(node: LGraphNode): void {
     void verifyAndAddPendingModels(pendingModels)
   }
 
+  const originalType = node.last_serialization?.type ?? node.type ?? 'Unknown'
+  if (!(originalType in LiteGraph.registered_node_types)) {
+    const nodeReplacementStore = useNodeReplacementStore()
+    const replacement = nodeReplacementStore.getReplacementFor(originalType)
+    const store = useMissingNodesErrorStore()
+    const existing = store.missingNodesError?.nodeTypes ?? []
+    store.surfaceMissingNodes([
+      ...existing,
+      {
+        type: originalType,
+        nodeId: execId,
+        cnrId: getCnrIdFromNode(node),
+        isReplaceable: replacement !== null,
+        replacement: replacement ?? undefined
+      }
+    ])
+  }
+}
+
+function scanSingleNodeMedia(node: LGraphNode): void {
+  if (!app.rootGraph) return
+  if (!getActiveExecutionId(node)) return
+
   const mediaCandidates = scanNodeMediaCandidates(app.rootGraph, node, isCloud)
   const confirmedMedia = mediaCandidates.filter((c) => c.isMissing === true)
   if (confirmedMedia.length) {
     useMissingMediaStore().addMissingMedia(confirmedMedia)
   }
-  // Cloud media scans always return isMissing: undefined pending
-  // verification against the input-assets list.
+  // Cloud media scans return pending for asset verification. OSS scans only
+  // return pending for generated output media.
   const pendingMedia = mediaCandidates.filter((c) => c.isMissing === undefined)
   if (pendingMedia.length) {
     void verifyAndAddPendingMedia(pendingMedia)
   }
-
-  // Check for missing node type
-  const originalType = node.last_serialization?.type ?? node.type ?? 'Unknown'
-  if (!(originalType in LiteGraph.registered_node_types)) {
-    const execId = getExecutionIdByNode(app.rootGraph, node)
-    if (execId) {
-      const nodeReplacementStore = useNodeReplacementStore()
-      const replacement = nodeReplacementStore.getReplacementFor(originalType)
-      const store = useMissingNodesErrorStore()
-      const existing = store.missingNodesError?.nodeTypes ?? []
-      store.surfaceMissingNodes([
-        ...existing,
-        {
-          type: originalType,
-          nodeId: execId,
-          cnrId: getCnrIdFromNode(node),
-          isReplaceable: replacement !== null,
-          replacement: replacement ?? undefined
-        }
-      ])
-    }
-  }
 }
 
 /**
@@ -281,7 +302,7 @@ async function verifyAndAddPendingMedia(
 ): Promise<void> {
   const rootGraphAtScan = app.rootGraph
   try {
-    await verifyCloudMediaCandidates(pending)
+    await verifyMediaCandidates(pending, { isCloud })
     if (app.rootGraph !== rootGraphAtScan) return
     const verified = pending.filter(
       (c) => c.isMissing === true && isCandidateStillActive(c.nodeId)
@@ -292,10 +313,23 @@ async function verifyAndAddPendingMedia(
   }
 }
 
-function scanAddedNode(node: LGraphNode): void {
+function scanAddedNode(
+  node: LGraphNode,
+  scanNode: (node: LGraphNode) => void
+): void {
   if (!app.rootGraph || ChangeTracker.isLoadingGraph) return
   if (isNodeInactive(node.mode)) return
-  scanAndAddNodeErrors(node)
+  scanNodeErrorTargets(node, scanNode)
+}
+
+function scheduleAddedNodeScan(node: LGraphNode): void {
+  queueMicrotask(() => {
+    scanAddedNode(node, scanSingleNodeModelsAndTypes)
+    // Paste/drop upload handlers run immediately after graph.add and must set
+    // node.isUploading synchronously before their first await. This second
+    // microtask lets that upload state settle before media widgets are scanned.
+    queueMicrotask(() => scanAddedNode(node, scanSingleNodeMedia))
+  })
 }
 
 function handleNodeModeChange(
@@ -367,10 +401,12 @@ export function installErrorClearingHooks(graph: LGraph): () => void {
     // Scan pasted/duplicated nodes for missing models/media.
     // Skip during loadGraphData (undo/redo/tab switch) — those are
     // handled by the full pipeline or cache restore.
-    // Deferred to microtask because onNodeAdded fires before
-    // node.configure() restores widget values.
+    // Model and node scans use the original one-microtask deferral so pasted
+    // missing-model errors appear before selection-scoped tabs recalculate.
+    // Media gets one extra microtask so drag/drop upload handlers can mark
+    // transient upload state before media detection reads the widget value.
     if (!ChangeTracker.isLoadingGraph) {
-      queueMicrotask(() => scanAddedNode(node))
+      scheduleAddedNodeScan(node)
     }
 
     originalOnNodeAdded?.call(this, node)
diff --git a/src/composables/maskeditor/gpuUtils.test.ts b/src/composables/maskeditor/gpuUtils.test.ts
new file mode 100644
index 0000000000..cba7fc9ca2
--- /dev/null
+++ b/src/composables/maskeditor/gpuUtils.test.ts
@@ -0,0 +1,124 @@
+import { describe, expect, it } from 'vitest'
+
+import { buildStrokePoints, clampDirtyRect } from './gpuUtils'
+
+const uninit = {
+  minX: Infinity,
+  minY: Infinity,
+  maxX: -Infinity,
+  maxY: -Infinity
+}
+
+describe('clampDirtyRect', () => {
+  it('returns full canvas when dirty rect is uninitialised', () => {
+    expect(clampDirtyRect(uninit, 100, 200)).toEqual({
+      dx: 0,
+      dy: 0,
+      dw: 100,
+      dh: 200
+    })
+  })
+
+  it('returns the clamped rect when fully inside canvas bounds', () => {
+    const rect = { minX: 10, minY: 20, maxX: 60, maxY: 90 }
+    expect(clampDirtyRect(rect, 100, 200)).toEqual({
+      dx: 10,
+      dy: 20,
+      dw: 50,
+      dh: 70
+    })
+  })
+
+  it('clamps rect that extends beyond canvas edges', () => {
+    const rect = { minX: -5, minY: -10, maxX: 120, maxY: 250 }
+    expect(clampDirtyRect(rect, 100, 200)).toEqual({
+      dx: 0,
+      dy: 0,
+      dw: 100,
+      dh: 200
+    })
+  })
+
+  it('returns full canvas when the clamped area has zero width', () => {
+    const rect = { minX: 50, minY: 10, maxX: 50, maxY: 80 }
+    expect(clampDirtyRect(rect, 100, 200)).toEqual({
+      dx: 0,
+      dy: 0,
+      dw: 100,
+      dh: 200
+    })
+  })
+
+  it('returns full canvas when the clamped area has zero height', () => {
+    const rect = { minX: 10, minY: 50, maxX: 80, maxY: 50 }
+    expect(clampDirtyRect(rect, 100, 200)).toEqual({
+      dx: 0,
+      dy: 0,
+      dw: 100,
+      dh: 200
+    })
+  })
+
+  it('floors dx/dy and ceils the far edges', () => {
+    const rect = { minX: 10.7, minY: 20.3, maxX: 59.2, maxY: 89.9 }
+    const result = clampDirtyRect(rect, 100, 200)
+    expect(result.dx).toBe(10)
+    expect(result.dy).toBe(20)
+    expect(result.dw).toBe(60 - 10) // ceil(59.2)=60, dx=10
+    expect(result.dh).toBe(90 - 20) // ceil(89.9)=90, dy=20
+  })
+})
+
+describe('buildStrokePoints', () => {
+  it('returns input points as-is when skipResampling is true', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 100, y: 100 }
+    ]
+    const result = buildStrokePoints(points, true, 10)
+    expect(result).toHaveLength(2)
+    expect(result[0]).toEqual({ x: 0, y: 0, pressure: 1.0 })
+    expect(result[1]).toEqual({ x: 100, y: 100, pressure: 1.0 })
+  })
+
+  it('returns empty array for empty input', () => {
+    expect(buildStrokePoints([], false, 10)).toHaveLength(0)
+    expect(buildStrokePoints([], true, 10)).toHaveLength(0)
+  })
+
+  it('returns empty array for a single point (no segments to interpolate)', () => {
+    expect(buildStrokePoints([{ x: 5, y: 5 }], false, 10)).toHaveLength(0)
+  })
+
+  it('interpolates a horizontal segment into multiple evenly-spaced points', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 30, y: 0 }
+    ]
+    const result = buildStrokePoints(points, false, 10)
+    // 30px distance / 10 stepSize = 3 steps → 4 points (s=0,1,2,3)
+    expect(result).toHaveLength(4)
+    expect(result[0]).toMatchObject({ x: 0, y: 0 })
+    expect(result[3]).toMatchObject({ x: 30, y: 0 })
+    result.forEach((p) => expect(p.pressure).toBe(1.0))
+  })
+
+  it('uses at least one step when points are very close together', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 0.1, y: 0 }
+    ]
+    // distance 0.1 < stepSize 10 → steps=1 → 2 points
+    const result = buildStrokePoints(points, false, 10)
+    expect(result).toHaveLength(2)
+  })
+
+  it('interpolates all pressure values to 1.0', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 50, y: 50 }
+    ]
+    const result = buildStrokePoints(points, false, 10)
+    result.forEach((p) => expect(p.pressure).toBe(1.0))
+  })
+})
diff --git a/src/composables/maskeditor/gpuUtils.ts b/src/composables/maskeditor/gpuUtils.ts
new file mode 100644
index 0000000000..e4a9ca5aa1
--- /dev/null
+++ b/src/composables/maskeditor/gpuUtils.ts
@@ -0,0 +1,60 @@
+import type { Point } from '@/extensions/core/maskeditor/types'
+
+import type { DirtyRect } from './brushDrawingUtils'
+
+/**
+ * Computes the clamped dirty-rect coordinates for a putImageData call.
+ *
+ * Returns the full canvas dimensions when the dirty rect is uninitialised
+ * (Infinity sentinels) or the resulting area has zero/negative size.
+ */
+export function clampDirtyRect(
+  rect: DirtyRect,
+  canvasWidth: number,
+  canvasHeight: number
+): { dx: number; dy: number; dw: number; dh: number } {
+  const full = { dx: 0, dy: 0, dw: canvasWidth, dh: canvasHeight }
+  if (rect.minX === Infinity || rect.maxX === -Infinity) return full
+
+  const dx = Math.floor(Math.max(0, rect.minX))
+  const dy = Math.floor(Math.max(0, rect.minY))
+  const dw = Math.ceil(Math.min(canvasWidth, rect.maxX)) - dx
+  const dh = Math.ceil(Math.min(canvasHeight, rect.maxY)) - dy
+
+  return dw > 0 && dh > 0 ? { dx, dy, dw, dh } : full
+}
+
+/**
+ * Linearly interpolates a sequence of points at a fixed step size,
+ * returning GPU-ready stroke points with pressure=1.
+ *
+ * When skipResampling is true the input points are returned as-is (used
+ * during live preview where the caller has already handled spacing).
+ */
+export function buildStrokePoints(
+  points: Point[],
+  skipResampling: boolean,
+  stepSize: number
+): { x: number; y: number; pressure: number }[] {
+  if (skipResampling) {
+    return points.map((p) => ({ x: p.x, y: p.y, pressure: 1.0 }))
+  }
+  const result: { x: number; y: number; pressure: number }[] = []
+  for (let i = 0; i < points.length - 1; i++) {
+    const p1 = points[i]
+    const p2 = points[i + 1]
+    const steps = Math.max(
+      1,
+      Math.ceil(Math.hypot(p2.x - p1.x, p2.y - p1.y) / stepSize)
+    )
+    for (let s = 0; s <= steps; s++) {
+      const t = s / steps
+      result.push({
+        x: p1.x + (p2.x - p1.x) * t,
+        y: p1.y + (p2.y - p1.y) * t,
+        pressure: 1.0
+      })
+    }
+  }
+  return result
+}
diff --git a/src/composables/maskeditor/useBrushDrawing.test.ts b/src/composables/maskeditor/useBrushDrawing.test.ts
new file mode 100644
index 0000000000..e5244c8dbb
--- /dev/null
+++ b/src/composables/maskeditor/useBrushDrawing.test.ts
@@ -0,0 +1,354 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { effectScope, ref } from 'vue'
+import type { EffectScope } from 'vue'
+
+// vi.hoisted runs before imports — only vi.fn() is safe here (no Vue)
+const saveStateSpy = vi.hoisted(() => vi.fn())
+
+const mockStoreDef = vi.hoisted(() => ({
+  brushSettings: {
+    size: 20,
+    hardness: 0.9,
+    opacity: 1,
+    stepSize: 5,
+    type: 'arc' as string
+  },
+  currentTool: 'pen' as string,
+  activeLayer: 'mask' as string,
+  maskCanvas: null as HTMLCanvasElement | null,
+  maskCtx: null as CanvasRenderingContext2D | null,
+  rgbCanvas: null as HTMLCanvasElement | null,
+  rgbCtx: null as CanvasRenderingContext2D | null,
+  maskBlendMode: 'black',
+  maskOpacity: 0.8,
+  maskColor: { r: 0, g: 0, b: 0 },
+  rgbColor: '#FF0000',
+  canvasHistory: { saveState: saveStateSpy }
+}))
+
+// vi.mock factory runs after hoisting — ref/computed from Vue are available
+vi.mock('./useGPUResources', () => {
+  // Singletons shared across all calls to useGPUResources() in this test file
+  const isSavingHistory = ref(false)
+  const dirtyRect = ref({
+    minX: Infinity,
+    minY: Infinity,
+    maxX: -Infinity,
+    maxY: -Infinity
+  })
+  const hasRenderer = ref(false)
+  const previewCanvas = ref<HTMLCanvasElement | null>(null)
+  const prepareStroke = vi.fn()
+  const clearPreview = vi.fn()
+  const compositeStroke = vi.fn()
+  const copyGpuToCanvas = vi
+    .fn()
+    .mockResolvedValue({ maskData: undefined, rgbData: undefined })
+  return {
+    useGPUResources: () => ({
+      isSavingHistory,
+      dirtyRect,
+      hasRenderer,
+      previewCanvas,
+      prepareStroke,
+      clearPreview,
+      compositeStroke,
+      copyGpuToCanvas,
+      gpuRender: vi.fn(),
+      gpuDrawPoint: vi.fn(),
+      clearGPU: vi.fn(),
+      destroy: vi.fn(),
+      initGPUResources: vi.fn().mockResolvedValue(undefined),
+      initPreviewCanvas: vi.fn()
+    })
+  }
+})
+
+vi.mock('./useCoordinateTransform', () => ({
+  useCoordinateTransform: () => ({
+    screenToCanvas: vi.fn(({ x, y }: { x: number; y: number }) => ({ x, y }))
+  })
+}))
+
+vi.mock('./useBrushPersistence', () => ({
+  useBrushPersistence: () => ({ loadAndApply: vi.fn(), save: vi.fn() })
+}))
+
+vi.mock('./useBrushAdjustment', () => ({
+  useBrushAdjustment: () => ({
+    startBrushAdjustment: vi.fn(),
+    handleBrushAdjustment: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: vi.fn(() => mockStoreDef)
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: { registerExtension: vi.fn() }
+}))
+
+import { useGPUResources } from './useGPUResources'
+import { useBrushDrawing } from './useBrushDrawing'
+
+function makePointerEvent(
+  x: number,
+  y: number,
+  opts: { buttons?: number; shiftKey?: boolean } = {}
+): PointerEvent {
+  return {
+    offsetX: x,
+    offsetY: y,
+    buttons: opts.buttons ?? 1,
+    shiftKey: opts.shiftKey ?? false,
+    preventDefault: vi.fn()
+  } as unknown as PointerEvent
+}
+
+function makeMockCtx(): CanvasRenderingContext2D {
+  const gradient = { addColorStop: vi.fn() }
+  return {
+    beginPath: vi.fn(),
+    fill: vi.fn(),
+    rect: vi.fn(),
+    arc: vi.fn(),
+    fillStyle: '',
+    drawImage: vi.fn(),
+    createRadialGradient: vi.fn(() => gradient),
+    globalCompositeOperation: 'source-over'
+  } as unknown as CanvasRenderingContext2D
+}
+
+let scope: EffectScope | null = null
+
+function setup() {
+  scope = effectScope()
+  return scope.run(() => useBrushDrawing())!
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+
+  const mockCtx = makeMockCtx()
+  const mockCanvas = {
+    width: 200,
+    height: 200,
+    style: { opacity: '' }
+  } as unknown as HTMLCanvasElement
+
+  mockStoreDef.maskCanvas = mockCanvas
+  mockStoreDef.maskCtx = mockCtx
+  mockStoreDef.rgbCanvas = mockCanvas
+  mockStoreDef.rgbCtx = mockCtx
+  mockStoreDef.currentTool = 'pen'
+  mockStoreDef.activeLayer = 'mask'
+
+  const gpu = useGPUResources()
+  gpu.isSavingHistory.value = false
+  gpu.hasRenderer.value = false
+  gpu.previewCanvas.value = null
+  gpu.dirtyRect.value = {
+    minX: Infinity,
+    minY: Infinity,
+    maxX: -Infinity,
+    maxY: -Infinity
+  }
+})
+
+afterEach(() => {
+  scope?.stop()
+  scope = null
+})
+
+describe('startDrawing', () => {
+  it('calls prepareStroke on the GPU resources', async () => {
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    expect(useGPUResources().prepareStroke).toHaveBeenCalledOnce()
+  })
+
+  it('sets DestinationOut composition when tool is eraser', async () => {
+    mockStoreDef.currentTool = 'eraser'
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    expect(mockStoreDef.maskCtx!.globalCompositeOperation).toBe(
+      'destination-out'
+    )
+  })
+
+  it('sets SourceOver composition when tool is mask pen', async () => {
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    expect(mockStoreDef.maskCtx!.globalCompositeOperation).toBe('source-over')
+  })
+
+  it('sets DestinationOut composition when right mouse button is used', async () => {
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50, { buttons: 2 }))
+    expect(mockStoreDef.maskCtx!.globalCompositeOperation).toBe(
+      'destination-out'
+    )
+  })
+})
+
+describe('startDrawing error handling', () => {
+  it('catches initShape errors and resets drawing state', async () => {
+    mockStoreDef.maskCtx = null
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    expect(consoleSpy).toHaveBeenCalledWith(
+      '[useBrushDrawing] Failed to start drawing:',
+      expect.any(Error)
+    )
+    expect(mockStoreDef.maskCtx).toBeNull()
+    consoleSpy.mockRestore()
+  })
+})
+
+describe('startDrawing shift+click', () => {
+  it('draws a line from the previous point when shift is held', async () => {
+    const { startDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await startDrawing(makePointerEvent(100, 50, { shiftKey: true }))
+    expect(
+      (mockStoreDef.maskCtx as unknown as ReturnType<typeof makeMockCtx>)
+        .beginPath
+    ).toHaveBeenCalled()
+  })
+})
+
+describe('handleDrawing', () => {
+  it('updates smoothingLastDrawTime after each move event', async () => {
+    const rafSpy = vi
+      .spyOn(window, 'requestAnimationFrame')
+      .mockImplementation((cb) => {
+        cb(0)
+        return 0
+      })
+    const { startDrawing, handleDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await handleDrawing(makePointerEvent(55, 55))
+    expect(rafSpy).toHaveBeenCalled()
+    rafSpy.mockRestore()
+  })
+
+  it('sets DestinationOut composition when tool is eraser during move', async () => {
+    mockStoreDef.currentTool = 'eraser'
+    vi.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
+      cb(0)
+      return 0
+    })
+    const { startDrawing, handleDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await handleDrawing(makePointerEvent(55, 55))
+    expect(mockStoreDef.maskCtx!.globalCompositeOperation).toBe(
+      'destination-out'
+    )
+    vi.restoreAllMocks()
+  })
+
+  it('sets DestinationOut composition when right mouse button held during move', async () => {
+    vi.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
+      cb(0)
+      return 0
+    })
+    const { startDrawing, handleDrawing } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await handleDrawing(makePointerEvent(55, 55, { buttons: 2 }))
+    expect(mockStoreDef.maskCtx!.globalCompositeOperation).toBe(
+      'destination-out'
+    )
+    vi.restoreAllMocks()
+  })
+})
+
+describe('drawEnd canvas visibility', () => {
+  it('restores rgb canvas opacity when activeLayer is rgb', async () => {
+    mockStoreDef.activeLayer = 'rgb'
+    const mockRgbCanvas = {
+      width: 200,
+      height: 200,
+      style: { opacity: '' }
+    } as unknown as HTMLCanvasElement
+    mockStoreDef.rgbCanvas = mockRgbCanvas
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(mockRgbCanvas.style.opacity).toBe('1')
+  })
+
+  it('restores preview canvas opacity to 1 after drawEnd', async () => {
+    const gpu = useGPUResources()
+    const mockPreviewCanvas = {
+      style: { opacity: '' }
+    } as unknown as HTMLCanvasElement
+    gpu.previewCanvas.value = mockPreviewCanvas
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(mockPreviewCanvas.style.opacity).toBe('1')
+  })
+})
+
+describe('drawEnd', () => {
+  it('calls compositeStroke indicating the active layer and erasing state', async () => {
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(useGPUResources().compositeStroke).toHaveBeenCalledOnce()
+    expect(useGPUResources().compositeStroke).toHaveBeenCalledWith(false, false)
+  })
+
+  it('passes isRgb=true to compositeStroke when active layer is rgb', async () => {
+    mockStoreDef.activeLayer = 'rgb'
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(useGPUResources().compositeStroke).toHaveBeenCalledWith(true, false)
+  })
+
+  it('passes isErasing=true to compositeStroke when tool is eraser', async () => {
+    mockStoreDef.currentTool = 'eraser'
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(useGPUResources().compositeStroke).toHaveBeenCalledWith(false, true)
+  })
+
+  it('restores mask canvas opacity after drawing on mask layer', async () => {
+    mockStoreDef.activeLayer = 'mask'
+    const mockMaskCanvas = {
+      width: 200,
+      height: 200,
+      style: { opacity: '' }
+    } as unknown as HTMLCanvasElement
+    mockStoreDef.maskCanvas = mockMaskCanvas
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(mockMaskCanvas.style.opacity).toBe(String(mockStoreDef.maskOpacity))
+  })
+
+  it('calls clearPreview to clean up the GPU overlay', async () => {
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(useGPUResources().clearPreview).toHaveBeenCalledOnce()
+  })
+
+  it('saves canvas history on stroke completion', async () => {
+    const { startDrawing, drawEnd } = setup()
+    await startDrawing(makePointerEvent(50, 50))
+    await drawEnd(makePointerEvent(60, 60))
+    expect(saveStateSpy).toHaveBeenCalledOnce()
+  })
+
+  it('is a no-op when drawing was never started', async () => {
+    const { drawEnd } = setup()
+    await drawEnd(makePointerEvent(60, 60))
+    expect(useGPUResources().compositeStroke).not.toHaveBeenCalled()
+    expect(saveStateSpy).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/maskeditor/useBrushDrawing.ts b/src/composables/maskeditor/useBrushDrawing.ts
index 5c8a43abbd..93a98327ce 100644
--- a/src/composables/maskeditor/useBrushDrawing.ts
+++ b/src/composables/maskeditor/useBrushDrawing.ts
@@ -1,58 +1,33 @@
-/// <reference types="@webgpu/types" />
-import { ref, watch, nextTick, onUnmounted } from 'vue'
-import { parseToRgb } from '@/utils/colorUtil'
-import {
-  Tools,
-  BrushShape,
-  CompositionOperation
-} from '@/extensions/core/maskeditor/types'
+import { nextTick, ref } from 'vue'
+
+import { CompositionOperation, Tools } from '@/extensions/core/maskeditor/types'
 import type { Point } from '@/extensions/core/maskeditor/types'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
-import { useCoordinateTransform } from './useCoordinateTransform'
-import { resampleSegment } from './splineUtils'
-import { tgpu } from 'typegpu'
-import { GPUBrushRenderer } from './gpu/GPUBrushRenderer'
-import { StrokeProcessor } from './StrokeProcessor'
-import { getEffectiveBrushSize, getEffectiveHardness } from './brushUtils'
-import { useBrushAdjustment } from './useBrushAdjustment'
+
 import {
-  resetDirtyRect,
-  updateDirtyRect,
-  premultiplyData,
+  drawMaskShape,
   drawRgbShape,
-  drawMaskShape
+  resetDirtyRect,
+  updateDirtyRect
 } from './brushDrawingUtils'
-import type { DirtyRect } from './brushDrawingUtils'
+import { getEffectiveBrushSize, getEffectiveHardness } from './brushUtils'
+import { resampleSegment } from './splineUtils'
+import { StrokeProcessor } from './StrokeProcessor'
+import { useBrushAdjustment } from './useBrushAdjustment'
+import { useGPUResources } from './useGPUResources'
 import { useBrushPersistence } from './useBrushPersistence'
+import { useCoordinateTransform } from './useCoordinateTransform'
 
 export function useBrushDrawing(initialSettings?: {
   useDominantAxis?: boolean
   brushAdjustmentSpeed?: number
 }) {
   const store = useMaskEditorStore()
+  const coordinateTransform = useCoordinateTransform()
   const persistence = useBrushPersistence()
   const { startBrushAdjustment, handleBrushAdjustment } =
     useBrushAdjustment(initialSettings)
-
-  const coordinateTransform = useCoordinateTransform()
-
-  // GPU Resources (Scoped to this composable instance)
-  let maskTexture: GPUTexture | null = null
-  let rgbTexture: GPUTexture | null = null
-  let device: GPUDevice | null = null
-  let renderer: GPUBrushRenderer | null = null
-  let previewContext: GPUCanvasContext | null = null
-  let previewCanvas: HTMLCanvasElement | null = null
-
-  // Readback buffers
-  let readbackStorageMask: GPUBuffer | null = null
-  let readbackStorageRgb: GPUBuffer | null = null
-  let readbackStagingMask: GPUBuffer | null = null
-  let readbackStagingRgb: GPUBuffer | null = null
-  let currentBufferSize = 0
-
-  // Flag to prevent redundant GPU updates
-  const isSavingHistory = ref(false)
+  const gpu = useGPUResources()
 
   const isDrawing = ref(false)
   const isDrawingLine = ref(false)
@@ -61,339 +36,19 @@ export function useBrushDrawing(initialSettings?: {
   const smoothingLastDrawTime = ref(new Date())
   const initialDraw = ref(true)
 
-  const dirtyRect = ref<DirtyRect>(resetDirtyRect())
-
-  // Stroke processor instance
   let strokeProcessor: StrokeProcessor | null = null
 
   persistence.loadAndApply()
 
-  // Handle external clear events
-  watch(
-    () => store.clearTrigger,
-    () => {
-      clearGPU()
-    }
-  )
-
-  // Sync GPU on Undo/Redo
-  watch(
-    () => store.canvasHistory.currentStateIndex,
-    async () => {
-      // Skip update if state was just saved
-      if (isSavingHistory.value) return
-
-      // Update GPU textures to match restored canvas state
-      await updateGPUFromCanvas()
-
-      // Clear preview to remove artifacts
-      if (renderer && previewContext) {
-        renderer.clearPreview(previewContext)
-      }
-    }
-  )
-
-  const isRecreatingTextures = ref(false)
-
-  watch(
-    () => store.gpuTexturesNeedRecreation,
-    async (needsRecreation) => {
-      if (
-        !needsRecreation ||
-        !device ||
-        !store.maskCanvas ||
-        isRecreatingTextures.value
-      )
-        return
-
-      isRecreatingTextures.value = true
-
-      const width = store.gpuTextureWidth
-      const height = store.gpuTextureHeight
-
-      try {
-        // Destroy old textures
-        if (maskTexture) {
-          maskTexture.destroy()
-          maskTexture = null
-        }
-        if (rgbTexture) {
-          rgbTexture.destroy()
-          rgbTexture = null
-        }
-
-        // Create new textures with updated dimensions
-        maskTexture = device.createTexture({
-          size: [width, height],
-          format: 'rgba8unorm',
-          usage:
-            GPUTextureUsage.TEXTURE_BINDING |
-            GPUTextureUsage.STORAGE_BINDING |
-            GPUTextureUsage.RENDER_ATTACHMENT |
-            GPUTextureUsage.COPY_DST |
-            GPUTextureUsage.COPY_SRC
-        })
-
-        rgbTexture = device.createTexture({
-          size: [width, height],
-          format: 'rgba8unorm',
-          usage:
-            GPUTextureUsage.TEXTURE_BINDING |
-            GPUTextureUsage.STORAGE_BINDING |
-            GPUTextureUsage.RENDER_ATTACHMENT |
-            GPUTextureUsage.COPY_DST |
-            GPUTextureUsage.COPY_SRC
-        })
-
-        // Upload pending data if available
-        if (store.pendingGPUMaskData && store.pendingGPURgbData) {
-          device.queue.writeTexture(
-            { texture: maskTexture },
-            store.pendingGPUMaskData,
-            { bytesPerRow: width * 4 },
-            { width, height }
-          )
-
-          device.queue.writeTexture(
-            { texture: rgbTexture },
-            store.pendingGPURgbData,
-            { bytesPerRow: width * 4 },
-            { width, height }
-          )
-        } else {
-          // Fallback: read from canvas
-          await updateGPUFromCanvas()
-        }
-
-        // Update preview canvas if it exists
-        if (previewCanvas && renderer) {
-          previewCanvas.width = width
-          previewCanvas.height = height
-        }
-
-        // Recreate readback buffers with new size
-        const bufferSize = width * height * 4
-        if (currentBufferSize !== bufferSize) {
-          readbackStorageMask?.destroy()
-          readbackStorageRgb?.destroy()
-          readbackStagingMask?.destroy()
-          readbackStagingRgb?.destroy()
-
-          readbackStorageMask = device.createBuffer({
-            size: bufferSize,
-            usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
-          })
-          readbackStorageRgb = device.createBuffer({
-            size: bufferSize,
-            usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
-          })
-          readbackStagingMask = device.createBuffer({
-            size: bufferSize,
-            usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
-          })
-          readbackStagingRgb = device.createBuffer({
-            size: bufferSize,
-            usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
-          })
-
-          currentBufferSize = bufferSize
-        }
-      } catch (error) {
-        console.error(
-          '[useBrushDrawing] Failed to recreate GPU textures:',
-          error
-        )
-      } finally {
-        // Clear the recreation flag and pending data
-        store.gpuTexturesNeedRecreation = false
-        store.gpuTextureWidth = 0
-        store.gpuTextureHeight = 0
-        store.pendingGPUMaskData = null
-        store.pendingGPURgbData = null
-        isRecreatingTextures.value = false
-      }
-    }
-  )
-
-  // Cleanup GPU resources on unmount
-  onUnmounted(() => {
-    if (renderer) {
-      renderer.destroy()
-      renderer = null
-    }
-    if (maskTexture) {
-      maskTexture.destroy()
-      maskTexture = null
-    }
-    if (rgbTexture) {
-      rgbTexture.destroy()
-      rgbTexture = null
-    }
-    if (readbackStorageMask) {
-      readbackStorageMask.destroy()
-      readbackStorageMask = null
-    }
-    if (readbackStorageRgb) {
-      readbackStorageRgb.destroy()
-      readbackStorageRgb = null
-    }
-    if (readbackStagingMask) {
-      readbackStagingMask.destroy()
-      readbackStagingMask = null
-    }
-    if (readbackStagingRgb) {
-      readbackStagingRgb.destroy()
-      readbackStagingRgb = null
-    }
-    // We do not destroy the device as it might be shared or managed by TGPU
-  })
-
-  /**
-   * Initializes the TypeGPU root and device if not already initialized.
-   */
-  async function initTypeGPU(): Promise<void> {
-    if (store.tgpuRoot) {
-      device = store.tgpuRoot.device
-      return
-    }
-
-    try {
-      const root = await tgpu.init()
-      store.tgpuRoot = root
-      device = root.device
-      console.warn('✅ TypeGPU initialized! Root:', root)
-      console.warn('Device info:', root.device.limits)
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      console.warn('Failed to initialize TypeGPU:', message)
-    }
-  }
-
-  /**
-   * Updates the GPU textures from the current canvas state.
-   */
-  async function updateGPUFromCanvas(): Promise<void> {
-    if (
-      !device ||
-      !maskTexture ||
-      !rgbTexture ||
-      !store.maskCanvas ||
-      !store.rgbCtx
-    )
-      return
-
-    const canvasWidth = store.maskCanvas.width
-    const canvasHeight = store.maskCanvas.height
-
-    // Upload canvas data to GPU
-    const maskImageData = store.maskCtx!.getImageData(
-      0,
-      0,
-      canvasWidth,
-      canvasHeight
-    )
-    premultiplyData(maskImageData.data)
-    device.queue.writeTexture(
-      { texture: maskTexture },
-      maskImageData.data,
-      { bytesPerRow: canvasWidth * 4 },
-      { width: canvasWidth, height: canvasHeight }
-    )
-
-    const rgbImageData = store.rgbCtx.getImageData(
-      0,
-      0,
-      canvasWidth,
-      canvasHeight
-    )
-    premultiplyData(rgbImageData.data)
-    device.queue.writeTexture(
-      { texture: rgbTexture },
-      rgbImageData.data,
-      { bytesPerRow: canvasWidth * 4 },
-      { width: canvasWidth, height: canvasHeight }
-    )
-  }
-
-  /**
-   * Initializes all GPU resources including textures and the brush renderer.
-   */
-  async function initGPUResources(): Promise<void> {
-    // Initialize TypeGPU
-    await initTypeGPU()
-
-    if (!store.tgpuRoot || !device) {
-      console.warn('TypeGPU not initialized, skipping GPU resource setup')
-      return
-    }
-
-    if (
-      !store.maskCanvas ||
-      !store.rgbCanvas ||
-      !store.maskCtx ||
-      !store.rgbCtx
-    ) {
-      console.warn('Canvas contexts not ready, skipping GPU resource setup')
-      return
-    }
-
-    const canvasWidth = store.maskCanvas!.width
-    const canvasHeight = store.maskCanvas!.height
-
-    try {
-      console.warn(
-        `🎨 Initializing GPU resources for ${canvasWidth}x${canvasHeight} canvas`
-      )
-
-      // Create read/write textures
-      maskTexture = device.createTexture({
-        size: [canvasWidth, canvasHeight],
-        format: 'rgba8unorm',
-        usage:
-          GPUTextureUsage.TEXTURE_BINDING |
-          GPUTextureUsage.STORAGE_BINDING |
-          GPUTextureUsage.RENDER_ATTACHMENT |
-          GPUTextureUsage.COPY_DST |
-          GPUTextureUsage.COPY_SRC
-      })
-
-      rgbTexture = device.createTexture({
-        size: [canvasWidth, canvasHeight],
-        format: 'rgba8unorm',
-        usage:
-          GPUTextureUsage.TEXTURE_BINDING |
-          GPUTextureUsage.STORAGE_BINDING |
-          GPUTextureUsage.RENDER_ATTACHMENT |
-          GPUTextureUsage.COPY_DST |
-          GPUTextureUsage.COPY_SRC
-      })
-
-      // Upload initial data
-      await updateGPUFromCanvas()
-
-      console.warn('✅ GPU resources initialized successfully')
-
-      const preferredFormat = navigator.gpu.getPreferredCanvasFormat()
-      renderer = new GPUBrushRenderer(device!, preferredFormat)
-      console.warn('✅ Brush renderer initialized')
-    } catch (error) {
-      console.error('Failed to initialize GPU resources:', error)
-      // Reset to null on failure
-      maskTexture = null
-      rgbTexture = null
-    }
-  }
+  // ── CPU drawing path ─────────────────────────────────────────────────────────
 
   function drawShape(point: Point, overrideOpacity?: number) {
     const brush = store.brushSettings
     const mask_ctx = store.maskCtx
     const rgb_ctx = store.rgbCtx
 
-    if (!mask_ctx || !rgb_ctx) {
-      throw new Error('Canvas contexts are required')
-    }
+    if (!mask_ctx || !rgb_ctx) throw new Error('Canvas contexts are required')
 
-    const brushType = brush.type
     const brushRadius = brush.size
     const hardness = brush.hardness
     const opacity = overrideOpacity ?? brush.opacity
@@ -416,7 +71,7 @@ export function useBrushDrawing(initialSettings?: {
       drawRgbShape(
         rgb_ctx,
         point,
-        brushType,
+        brush.type,
         effectiveRadius,
         effectiveHardness,
         opacity,
@@ -426,7 +81,7 @@ export function useBrushDrawing(initialSettings?: {
       drawMaskShape(
         mask_ctx,
         point,
-        brushType,
+        brush.type,
         effectiveRadius,
         effectiveHardness,
         opacity,
@@ -435,57 +90,22 @@ export function useBrushDrawing(initialSettings?: {
       )
     }
 
-    dirtyRect.value = updateDirtyRect(
-      dirtyRect.value,
+    gpu.dirtyRect.value = updateDirtyRect(
+      gpu.dirtyRect.value,
       point.x,
       point.y,
       effectiveRadius
     )
   }
 
-  /**
-   * Draws a point using the stroke processor for smoothing.
-   * @param point - The point to draw.
-   */
-  async function drawWithBetterSmoothing(point: Point): Promise<void> {
-    if (!strokeProcessor) return
+  // ── Drawing orchestration ────────────────────────────────────────────────────
 
-    // Process point to generate equidistant points
-    const newPoints = strokeProcessor.addPoint(point)
-
-    if (newPoints.length === 0) {
-      // Update preview even if no points generated to ensure background visibility
-      if (renderer && initialDraw.value) {
-        gpuRender([], true)
-      }
-      return
-    }
-
-    // Render points on GPU
-    if (renderer) {
-      gpuRender(newPoints, true) // Skip resampling
-    } else {
-      // CPU fallback
-      for (const p of newPoints) {
-        drawShape(p)
-      }
-    }
-
-    initialDraw.value = false
-  }
-
-  /**
-   * Initializes the canvas context for a new shape.
-   * @param compositionOperation - The composition operation to use.
-   */
   function initShape(compositionOperation: CompositionOperation) {
     const blendMode = store.maskBlendMode
     const mask_ctx = store.maskCtx
     const rgb_ctx = store.rgbCtx
 
-    if (!mask_ctx || !rgb_ctx) {
-      throw new Error('Canvas contexts are required')
-    }
+    if (!mask_ctx || !rgb_ctx) throw new Error('Canvas contexts are required')
 
     mask_ctx.beginPath()
     rgb_ctx.beginPath()
@@ -500,67 +120,67 @@ export function useBrushDrawing(initialSettings?: {
     }
   }
 
-  /**
-   * Draws a line between two points.
-   * @param p1 - Start point.
-   * @param p2 - End point.
-   * @param compositionOp - Composition operation.
-   * @param spacing - Spacing between points.
-   */
+  async function drawWithBetterSmoothing(point: Point): Promise<void> {
+    if (!strokeProcessor) return
+
+    const newPoints = strokeProcessor.addPoint(point)
+
+    if (newPoints.length === 0) {
+      if (gpu.hasRenderer.value && initialDraw.value) {
+        /* c8 ignore next */
+        gpu.gpuRender([], true)
+      }
+      return
+    }
+
+    if (gpu.hasRenderer.value) {
+      /* c8 ignore next */
+      gpu.gpuRender(newPoints, true)
+    } else {
+      for (const p of newPoints) drawShape(p)
+    }
+
+    initialDraw.value = false
+  }
+
   async function drawLine(
     p1: Point,
     p2: Point,
     compositionOp: CompositionOperation,
     spacing: number
   ): Promise<void> {
-    // Generate equidistant points using segment resampling
     const { points, remainder } = resampleSegment(
       [p1, p2],
       spacing,
       lineRemainder.value
     )
-
     lineRemainder.value = remainder
-
-    // Ensure context state is initialized (sets globalCompositeOperation for isErasing checks)
     initShape(compositionOp)
 
-    if (renderer) {
-      gpuRender(points)
+    if (gpu.hasRenderer.value) {
+      /* c8 ignore next */
+      gpu.gpuRender(points)
     } else {
-      // CPU fallback
-      for (const point of points) {
-        drawShape(point, 1) // Opacity handled by brush texture
-      }
+      for (const point of points) drawShape(point, 1)
     }
   }
 
-  /**
-   * Starts the drawing process.
-   * @param event - The pointer event.
-   */
   async function startDrawing(event: PointerEvent): Promise<void> {
     isDrawing.value = true
-    dirtyRect.value = resetDirtyRect()
+    gpu.dirtyRect.value = resetDirtyRect()
 
     try {
-      // Initialize stroke accumulator
-      if (renderer && store.maskCanvas) {
-        renderer.prepareStroke(store.maskCanvas.width, store.maskCanvas.height)
-      }
+      gpu.prepareStroke()
 
-      let compositionOp: CompositionOperation
       const currentTool = store.currentTool
       const coords = { x: event.offsetX, y: event.offsetY }
       const coords_canvas = coordinateTransform.screenToCanvas(coords)
 
-      if (currentTool === 'eraser' || event.buttons === 2) {
-        compositionOp = CompositionOperation.DestinationOut
-      } else {
-        compositionOp = CompositionOperation.SourceOver
-      }
+      const compositionOp =
+        currentTool === 'eraser' || event.buttons === 2
+          ? CompositionOperation.DestinationOut
+          : CompositionOperation.SourceOver
 
-      // Calculate target spacing based on step size percentage
       const stepPercentage =
         Math.pow(100, store.brushSettings.stepSize / 100) / 100
       const targetSpacing = Math.max(
@@ -579,44 +199,42 @@ export function useBrushDrawing(initialSettings?: {
       } else {
         isDrawingLine.value = false
         initShape(compositionOp)
-        // Reset remainder
         lineRemainder.value = targetSpacing
       }
 
       lineStartPoint.value = coords_canvas
 
-      // Hide main canvas to prevent double rendering
-      if (renderer) {
+      if (gpu.hasRenderer.value && gpu.previewCanvas.value) {
+        /* c8 ignore start */
         const isRgb = store.activeLayer === 'rgb'
         if (isRgb && store.rgbCanvas) {
           store.rgbCanvas.style.opacity = '0'
-          if (previewCanvas) previewCanvas.style.opacity = '1'
+          gpu.previewCanvas.value.style.opacity = '1'
         } else if (!isRgb && store.maskCanvas) {
           store.maskCanvas.style.opacity = '0'
-          if (previewCanvas)
-            previewCanvas.style.opacity = String(store.maskOpacity)
+          gpu.previewCanvas.value.style.opacity = String(store.maskOpacity)
         }
+        /* c8 ignore stop */
       }
 
-      // Initialize stroke processor
       strokeProcessor = new StrokeProcessor(targetSpacing)
-
-      // Process first point
       await drawWithBetterSmoothing(coords_canvas)
-
       smoothingLastDrawTime.value = new Date()
     } catch (error) {
+      /* c8 ignore start */
+      const isRgb = store.activeLayer === 'rgb'
+      if (isRgb && store.rgbCanvas) store.rgbCanvas.style.opacity = '1'
+      else if (!isRgb && store.maskCanvas)
+        store.maskCanvas.style.opacity = String(store.maskOpacity)
+      if (gpu.previewCanvas.value) gpu.previewCanvas.value.style.opacity = '1'
+      gpu.clearPreview()
+      /* c8 ignore stop */
       console.error('[useBrushDrawing] Failed to start drawing:', error)
-
       isDrawing.value = false
       isDrawingLine.value = false
     }
   }
 
-  /**
-   * Handles the drawing movement.
-   * @param event - The pointer event.
-   */
   async function handleDrawing(event: PointerEvent): Promise<void> {
     const diff = performance.now() - smoothingLastDrawTime.value.getTime()
     const coords = { x: event.offsetX, y: event.offsetY }
@@ -625,18 +243,21 @@ export function useBrushDrawing(initialSettings?: {
 
     if (diff > 20 && !isDrawing.value) {
       requestAnimationFrame(async () => {
-        if (!isDrawing.value) return // Fix: Prevent race condition
+        if (!isDrawing.value) return
         try {
           initShape(CompositionOperation.SourceOver)
-          await gpuDrawPoint(coords_canvas)
-          // smoothingCordsArray.value.push(coords_canvas) // Removed in favor of StrokeProcessor
+          if (gpu.hasRenderer.value) {
+            await gpu.gpuDrawPoint(coords_canvas)
+          } else {
+            drawShape(coords_canvas)
+          }
         } catch (error) {
           console.error('[useBrushDrawing] Drawing error:', error)
         }
       })
     } else {
       requestAnimationFrame(async () => {
-        if (!isDrawing.value) return // Fix: Prevent race condition
+        if (!isDrawing.value) return
         try {
           if (currentTool === 'eraser' || event.buttons === 2) {
             initShape(CompositionOperation.DestinationOut)
@@ -653,497 +274,72 @@ export function useBrushDrawing(initialSettings?: {
     smoothingLastDrawTime.value = new Date()
   }
 
-  /**
-   * Ends the drawing process.
-   * @param event - The pointer event.
-   */
   async function drawEnd(event: PointerEvent): Promise<void> {
     const coords = { x: event.offsetX, y: event.offsetY }
     const coords_canvas = coordinateTransform.screenToCanvas(coords)
 
-    if (isDrawing.value) {
-      isDrawing.value = false
+    if (!isDrawing.value) return
 
-      lineStartPoint.value = coords_canvas
-      initialDraw.value = true
+    isDrawing.value = false
+    lineStartPoint.value = coords_canvas
+    initialDraw.value = true
 
-      // Flush remaining points from StrokeProcessor
-      if (strokeProcessor) {
-        const finalPoints = strokeProcessor.endStroke()
-        if (finalPoints.length > 0) {
-          if (renderer) {
-            gpuRender(finalPoints, true)
-          } else {
-            for (const p of finalPoints) {
-              drawShape(p)
-            }
-          }
-        }
-        strokeProcessor = null
-      }
-
-      // Composite the stroke accumulator into the main texture
-      if (renderer && maskTexture && rgbTexture) {
-        const isRgb = store.activeLayer === 'rgb'
-        const targetTex = isRgb ? rgbTexture : maskTexture
-
-        // Use the actual brush opacity for the composite pass
-        const size = store.brushSettings.size
-        const hardness = store.brushSettings.hardness
-        const effectiveSize = getEffectiveBrushSize(size, hardness)
-        const effectiveHardness = getEffectiveHardness(
-          size,
-          hardness,
-          effectiveSize
-        )
-
-        const isErasing =
-          store.currentTool === 'eraser' ||
-          store.maskCtx?.globalCompositeOperation === 'destination-out'
-
-        const brushShape = store.brushSettings.type === BrushShape.Rect ? 1 : 0
-
-        renderer.compositeStroke(targetTex.createView(), {
-          opacity: store.brushSettings.opacity,
-          color: [0, 0, 0], // Color is handled by accumulator, this is just for uniforms if needed
-          hardness: effectiveHardness,
-          screenSize: [store.maskCanvas!.width, store.maskCanvas!.height],
-          brushShape,
-          isErasing
-        })
-      }
-
-      let maskData: ImageData | undefined
-      let rgbData: ImageData | undefined
-
-      if (renderer && maskTexture && rgbTexture) {
-        try {
-          const result = await copyGpuToCanvas()
-          maskData = result.maskData
-          rgbData = result.rgbData
-        } catch (error) {
-          console.warn('GPU readback failed, falling back to CPU:', error)
-        }
-      }
-
-      isSavingHistory.value = true
-      store.canvasHistory.saveState(maskData, rgbData)
-      // Wait for watcher to trigger (if any) before clearing flag
-      await nextTick()
-
-      isSavingHistory.value = false
-
-      // Fix: Clear the preview canvas when drawing ends
-      if (renderer && previewContext) {
-        renderer.clearPreview(previewContext)
-      }
-
-      // Restore main canvas visibility
-      if (store.activeLayer === 'rgb' && store.rgbCanvas) {
-        store.rgbCanvas.style.opacity = '1'
-      } else if (store.activeLayer === 'mask' && store.maskCanvas) {
-        store.maskCanvas.style.opacity = String(store.maskOpacity)
-      }
-
-      // Reset preview canvas opacity to 1 (for hover preview)
-      if (previewCanvas) {
-        previewCanvas.style.opacity = '1'
-      }
-    }
-  }
-
-  /**
-   * Reads back the GPU textures to CPU ImageDatas.
-   * @returns Object containing mask and rgb ImageDatas.
-   */
-  async function copyGpuToCanvas(): Promise<{
-    maskData: ImageData
-    rgbData: ImageData
-  }> {
-    if (
-      !device ||
-      !maskTexture ||
-      !rgbTexture ||
-      !store.maskCanvas ||
-      !store.rgbCanvas ||
-      !store.maskCtx ||
-      !store.rgbCtx ||
-      !renderer
-    )
-      throw new Error('GPU resources not ready')
-
-    const width = store.maskCanvas.width
-    const height = store.maskCanvas.height
-    const bufferSize = width * height * 4
-
-    // 1. Initialize/Resize Buffers if needed
-    if (
-      !readbackStorageMask ||
-      !readbackStorageRgb ||
-      !readbackStagingMask ||
-      !readbackStagingRgb ||
-      currentBufferSize !== bufferSize
-    ) {
-      // Destroy old buffers if they exist
-      readbackStorageMask?.destroy()
-      readbackStorageRgb?.destroy()
-      readbackStagingMask?.destroy()
-      readbackStagingRgb?.destroy()
-
-      // Create Storage Buffers (for compute shader output)
-      readbackStorageMask = device.createBuffer({
-        size: bufferSize,
-        usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
-      })
-      readbackStorageRgb = device.createBuffer({
-        size: bufferSize,
-        usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
-      })
-
-      // Create Staging Buffers (for reading back)
-      readbackStagingMask = device.createBuffer({
-        size: bufferSize,
-        usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
-      })
-      readbackStagingRgb = device.createBuffer({
-        size: bufferSize,
-        usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
-      })
-
-      currentBufferSize = bufferSize
-    }
-
-    // 2. Run Compute Shaders (Un-premultiply and pack)
-    renderer.prepareReadback(maskTexture, readbackStorageMask)
-    renderer.prepareReadback(rgbTexture, readbackStorageRgb)
-
-    // 3. Copy Storage -> Staging
-    const encoder = device.createCommandEncoder()
-    encoder.copyBufferToBuffer(
-      readbackStorageMask,
-      0,
-      readbackStagingMask,
-      0,
-      bufferSize
-    )
-    encoder.copyBufferToBuffer(
-      readbackStorageRgb,
-      0,
-      readbackStagingRgb,
-      0,
-      bufferSize
-    )
-    device.queue.submit([encoder.finish()])
-
-    // 4. Map Staging Buffers
-    await Promise.all([
-      readbackStagingMask.mapAsync(GPUMapMode.READ),
-      readbackStagingRgb.mapAsync(GPUMapMode.READ)
-    ])
-
-    // 5. Read Data & Update Canvas
-    // We use slice(0) to copy data because unmap() invalidates the array
-    const maskDataArr = new Uint8ClampedArray(
-      readbackStagingMask.getMappedRange().slice(0)
-    )
-    const rgbDataArr = new Uint8ClampedArray(
-      readbackStagingRgb.getMappedRange().slice(0)
-    )
-
-    // Unmap immediately after copying
-    readbackStagingMask.unmap()
-    readbackStagingRgb.unmap()
-
-    const maskImageData = new ImageData(maskDataArr, width, height)
-    const rgbImageData = new ImageData(rgbDataArr, width, height)
-
-    // Calculate Dirty Rect
-    let dx = 0
-    let dy = 0
-    let dw = width
-    let dh = height
-
-    if (
-      dirtyRect.value.minX !== Infinity &&
-      dirtyRect.value.maxX !== -Infinity
-    ) {
-      const r = dirtyRect.value
-      dx = Math.floor(Math.max(0, r.minX))
-      dy = Math.floor(Math.max(0, r.minY))
-      const max_x = Math.ceil(Math.min(width, r.maxX))
-      const max_y = Math.ceil(Math.min(height, r.maxY))
-      dw = max_x - dx
-      dh = max_y - dy
-    }
-
-    // Ensure valid dimensions
-    if (dw > 0 && dh > 0) {
-      store.maskCtx.putImageData(maskImageData, 0, 0, dx, dy, dw, dh)
-      store.rgbCtx.putImageData(rgbImageData, 0, 0, dx, dy, dw, dh)
-    } else {
-      // Fallback to full update if rect is invalid (shouldn't happen if drawn)
-      store.maskCtx.putImageData(maskImageData, 0, 0)
-      store.rgbCtx.putImageData(rgbImageData, 0, 0)
-    }
-
-    return { maskData: maskImageData, rgbData: rgbImageData }
-  }
-
-  /**
-   * Cleans up GPU resources and buffers.
-   */
-  function destroy(): void {
-    renderer?.destroy()
-    if (maskTexture) {
-      maskTexture.destroy()
-      maskTexture = null
-    }
-    if (rgbTexture) {
-      rgbTexture.destroy()
-      rgbTexture = null
-    }
-    // Cleanup Readback Buffers
-    readbackStorageMask?.destroy()
-    readbackStorageRgb?.destroy()
-    readbackStagingMask?.destroy()
-    readbackStagingRgb?.destroy()
-    readbackStorageMask = null
-    readbackStorageRgb = null
-    readbackStagingMask = null
-    readbackStagingRgb = null
-    currentBufferSize = 0
-
-    if (store.tgpuRoot) {
-      store.tgpuRoot.destroy()
-      store.tgpuRoot = null
-    }
-    device = null
-  }
-
-  /**
-   * Draws a single point using the GPU renderer.
-   * @param point - The point to draw.
-   * @param opacity - The opacity of the point.
-   */
-  async function gpuDrawPoint(point: Point, opacity: number = 1) {
-    if (renderer) {
-      const width = store.maskCanvas!.width
-      const height = store.maskCanvas!.height
-      const strokePoints = [{ x: point.x, y: point.y, pressure: opacity }]
-
-      const size = store.brushSettings.size
-      const hardness = store.brushSettings.hardness
-      const effectiveSize = getEffectiveBrushSize(size, hardness)
-      const effectiveHardness = getEffectiveHardness(
-        size,
-        hardness,
-        effectiveSize
-      )
-
-      const brushShape = store.brushSettings.type === BrushShape.Rect ? 1 : 0
-
-      // Use accumulator with fixed high opacity to build shape
-      renderer.renderStrokeToAccumulator(strokePoints, {
-        size: effectiveSize,
-        opacity: 0.5, // Fixed flow for smooth accumulation
-        hardness: effectiveHardness,
-        color: [1, 1, 1],
-        width,
-        height,
-        brushShape
-      })
-
-      // Update preview with correct settings
-      if (maskTexture && previewContext) {
-        const isRgb = store.activeLayer === 'rgb'
-        let color: [number, number, number] = [1, 1, 1]
-        if (isRgb) {
-          const c = parseToRgb(store.rgbColor)
-          color = [c.r / 255, c.g / 255, c.b / 255]
+    // Flush remaining stroke points
+    if (strokeProcessor) {
+      const finalPoints = strokeProcessor.endStroke()
+      if (finalPoints.length > 0) {
+        if (gpu.hasRenderer.value) {
+          /* c8 ignore next */
+          gpu.gpuRender(finalPoints, true)
         } else {
-          const c = store.maskColor as { r: number; g: number; b: number }
-          color = [c.r / 255, c.g / 255, c.b / 255]
+          for (const p of finalPoints) drawShape(p)
         }
-
-        const isErasing =
-          store.currentTool === 'eraser' ||
-          store.maskCtx?.globalCompositeOperation === 'destination-out'
-
-        renderer.blitToCanvas(
-          previewContext,
-          {
-            opacity: store.brushSettings.opacity,
-            color,
-            hardness: effectiveHardness,
-            screenSize: [width, height],
-            brushShape,
-            isErasing
-          },
-          undefined // Do not draw background texture for preview to avoid double rendering
-        )
       }
-    } else {
-      drawShape(point, opacity)
+      strokeProcessor = null
     }
-  }
-
-  /**
-   * Initializes the preview canvas context for WebGPU.
-   * @param canvas - The canvas element.
-   */
-  function initPreviewCanvas(canvas: HTMLCanvasElement) {
-    if (!device) return
-
-    const ctx = canvas.getContext('webgpu')
-    if (!ctx) return
-
-    ctx.configure({
-      device,
-      format: navigator.gpu.getPreferredCanvasFormat(),
-      alphaMode: 'premultiplied'
-    })
-    previewContext = ctx
-    previewCanvas = canvas
-    console.warn('✅ Preview Canvas Initialized')
-  }
-
-  /**
-   * Renders a set of points using the GPU.
-   * @param points - The points to render.
-   * @param skipResampling - Whether to skip resampling (if points are already spaced).
-   */
-  function gpuRender(points: Point[], skipResampling: boolean = false) {
-    if (!renderer || !maskTexture || !rgbTexture) return
 
+    // Composite GPU stroke into the main texture
     const isRgb = store.activeLayer === 'rgb'
+    const isErasing =
+      store.currentTool === 'eraser' ||
+      store.maskCtx?.globalCompositeOperation === 'destination-out'
+    gpu.compositeStroke(isRgb, isErasing)
 
-    // 1. Get Correct Color
-    let color: [number, number, number] = [1, 1, 1]
-    if (isRgb) {
-      const c = parseToRgb(store.rgbColor)
-      color = [c.r / 255, c.g / 255, c.b / 255]
-    } else {
-      // Mask color - properly typed
-      const c = store.maskColor as { r: number; g: number; b: number }
-      color = [c.r / 255, c.g / 255, c.b / 255]
-    }
-
-    // 2. Prepare stroke points
-    let strokePoints: { x: number; y: number; pressure: number }[] = []
-
-    if (skipResampling) {
-      // Points are already properly spaced from Catmull-Rom spline interpolation
-      strokePoints = points.map((p) => ({ x: p.x, y: p.y, pressure: 1.0 }))
-    } else {
-      // Legacy resampling for shift+click and other cases
-      for (let i = 0; i < points.length - 1; i++) {
-        const p1 = points[i]
-        const p2 = points[i + 1]
-        const dist = Math.hypot(p2.x - p1.x, p2.y - p1.y)
-
-        // Calculate target spacing based on stepSize
-        const stepPercentage =
-          Math.pow(100, store.brushSettings.stepSize / 100) / 100
-        const stepSize = Math.max(
-          1.0,
-          store.brushSettings.size * stepPercentage
-        )
-        const steps = Math.max(1, Math.ceil(dist / stepSize))
-
-        for (let step = 0; step <= steps; step++) {
-          const t = step / steps
-          const pressure = 1.0
-
-          const x = p1.x + (p2.x - p1.x) * t
-          const y = p1.y + (p2.y - p1.y) * t
-
-          strokePoints.push({ x, y, pressure })
-        }
+    // Read back GPU result
+    let maskData: ImageData | undefined
+    let rgbData: ImageData | undefined
+    if (gpu.hasRenderer.value) {
+      /* c8 ignore start */
+      try {
+        const result = await gpu.copyGpuToCanvas()
+        maskData = result.maskData
+        rgbData = result.rgbData
+      } catch (error) {
+        console.warn('GPU readback failed, falling back to CPU:', error)
       }
+      /* c8 ignore stop */
     }
 
-    // Render to Accumulator (SourceOver blending)
-    // Use fixed opacity (0.5) to build up the shape smoothly without creases.
-    // The final opacity is applied in the composite pass.
-    const size = store.brushSettings.size
-    const hardness = store.brushSettings.hardness
-    const effectiveSize = getEffectiveBrushSize(size, hardness)
-    const effectiveHardness = getEffectiveHardness(
-      size,
-      hardness,
-      effectiveSize
-    )
-
-    const brushShape = store.brushSettings.type === BrushShape.Rect ? 1 : 0
-
-    // Render to Accumulator (SourceOver blending)
-    // Use fixed opacity (0.5) to build up the shape smoothly without creases.
-    // The final opacity is applied in the composite pass.
-    renderer.renderStrokeToAccumulator(strokePoints, {
-      size: effectiveSize,
-      opacity: 0.5,
-      hardness: effectiveHardness,
-      color: color,
-      width: store.maskCanvas!.width,
-      height: store.maskCanvas!.height,
-      brushShape
-    })
-
-    for (const p of strokePoints) {
-      dirtyRect.value = updateDirtyRect(
-        dirtyRect.value,
-        p.x,
-        p.y,
-        effectiveSize
-      )
+    // Save to history
+    gpu.isSavingHistory.value = true
+    try {
+      store.canvasHistory.saveState(maskData, rgbData)
+      await nextTick()
+    } finally {
+      gpu.isSavingHistory.value = false
     }
 
-    // 3. Blit to Preview with correct settings
-    if (previewContext) {
-      const isErasing =
-        store.currentTool === 'eraser' ||
-        store.maskCtx?.globalCompositeOperation === 'destination-out'
+    gpu.clearPreview()
 
-      const targetTex = isRgb ? rgbTexture : maskTexture
-      renderer.blitToCanvas(
-        previewContext,
-        {
-          opacity: store.brushSettings.opacity,
-          color,
-          hardness: effectiveHardness,
-          screenSize: [store.maskCanvas!.width, store.maskCanvas!.height],
-          brushShape,
-          isErasing
-        },
-        targetTex ?? undefined
-      )
+    // Restore canvas visibility
+    if (isRgb && store.rgbCanvas) {
+      store.rgbCanvas.style.opacity = '1'
+    } else if (!isRgb && store.maskCanvas) {
+      store.maskCanvas.style.opacity = String(store.maskOpacity)
+    }
+    if (gpu.previewCanvas.value) {
+      gpu.previewCanvas.value.style.opacity = '1'
     }
-  }
-
-  /**
-   * Clears the GPU textures.
-   */
-  function clearGPU() {
-    if (!device || !maskTexture || !rgbTexture || !store.maskCanvas) return
-
-    const width = store.maskCanvas.width
-    const height = store.maskCanvas.height
-
-    // Clear Mask Texture
-    device.queue.writeTexture(
-      { texture: maskTexture },
-      new Uint8Array(width * height * 4), // Zeros
-      { bytesPerRow: width * 4 },
-      { width, height }
-    )
-
-    // Clear RGB Texture
-    device.queue.writeTexture(
-      { texture: rgbTexture },
-      new Uint8Array(width * height * 4), // Zeros
-      { bytesPerRow: width * 4 },
-      { width, height }
-    )
   }
 
   return {
@@ -1153,9 +349,9 @@ export function useBrushDrawing(initialSettings?: {
     startBrushAdjustment,
     handleBrushAdjustment,
     saveBrushSettings: persistence.save,
-    destroy,
-    initGPUResources,
-    initPreviewCanvas,
-    clearGPU // Export this
+    destroy: gpu.destroy,
+    initGPUResources: gpu.initGPUResources,
+    initPreviewCanvas: gpu.initPreviewCanvas,
+    clearGPU: gpu.clearGPU
   }
 }
diff --git a/src/composables/maskeditor/useGPUResources.test.ts b/src/composables/maskeditor/useGPUResources.test.ts
new file mode 100644
index 0000000000..ba9ea685a6
--- /dev/null
+++ b/src/composables/maskeditor/useGPUResources.test.ts
@@ -0,0 +1,192 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { effectScope, nextTick, reactive } from 'vue'
+import type { EffectScope } from 'vue'
+
+vi.mock('typegpu', () => ({
+  tgpu: {
+    init: vi.fn().mockRejectedValue(new Error('WebGPU not supported'))
+  }
+}))
+
+vi.mock('./gpu/GPUBrushRenderer', () => ({
+  GPUBrushRenderer: vi.fn()
+}))
+
+const mockStore = reactive({
+  tgpuRoot: null as unknown,
+  maskCanvas: null as HTMLCanvasElement | null,
+  rgbCanvas: null as HTMLCanvasElement | null,
+  maskCtx: null as CanvasRenderingContext2D | null,
+  rgbCtx: null as CanvasRenderingContext2D | null,
+  clearTrigger: 0,
+  canvasHistory: { currentStateIndex: 0 },
+  gpuTexturesNeedRecreation: false,
+  gpuTextureWidth: 0,
+  gpuTextureHeight: 0,
+  pendingGPUMaskData: null as null,
+  pendingGPURgbData: null as null,
+  brushSettings: {
+    size: 20,
+    hardness: 0.9,
+    opacity: 1,
+    stepSize: 5,
+    type: 'arc'
+  },
+  activeLayer: 'mask',
+  currentTool: 'pen',
+  maskColor: { r: 0, g: 0, b: 0 },
+  rgbColor: '#FF0000'
+})
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: vi.fn(() => mockStore)
+}))
+
+import { resetDirtyRect } from './brushDrawingUtils'
+import { useGPUResources } from './useGPUResources'
+
+let scope: EffectScope | null = null
+
+function setup() {
+  scope = effectScope()
+  return scope.run(() => useGPUResources())!
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockStore.tgpuRoot = null
+  mockStore.maskCanvas = null
+  mockStore.rgbCanvas = null
+  mockStore.maskCtx = null
+  mockStore.rgbCtx = null
+  mockStore.clearTrigger = 0
+  mockStore.canvasHistory.currentStateIndex = 0
+  mockStore.gpuTexturesNeedRecreation = false
+})
+
+afterEach(() => {
+  scope?.stop()
+  scope = null
+})
+
+describe('initial reactive state', () => {
+  it('hasRenderer is false when no renderer exists', () => {
+    const { hasRenderer } = setup()
+    expect(hasRenderer.value).toBe(false)
+  })
+
+  it('isSavingHistory is false initially', () => {
+    const { isSavingHistory } = setup()
+    expect(isSavingHistory.value).toBe(false)
+  })
+
+  it('previewCanvas is null initially', () => {
+    const { previewCanvas } = setup()
+    expect(previewCanvas.value).toBeNull()
+  })
+
+  it('dirtyRect starts with uninitialised sentinel values', () => {
+    const { dirtyRect } = setup()
+    expect(dirtyRect.value).toEqual(resetDirtyRect())
+  })
+})
+
+describe('no-op when GPU is not initialised', () => {
+  it('prepareStroke does not throw', () => {
+    const { prepareStroke } = setup()
+    expect(() => prepareStroke()).not.toThrow()
+  })
+
+  it('clearPreview does not throw', () => {
+    const { clearPreview } = setup()
+    expect(() => clearPreview()).not.toThrow()
+  })
+
+  it('clearGPU does not throw', () => {
+    const { clearGPU } = setup()
+    expect(() => clearGPU()).not.toThrow()
+  })
+
+  it('destroy does not throw', () => {
+    const { destroy } = setup()
+    expect(() => destroy()).not.toThrow()
+  })
+
+  it('gpuRender does not throw with empty or non-empty point arrays', () => {
+    const { gpuRender } = setup()
+    expect(() => gpuRender([])).not.toThrow()
+    expect(() => gpuRender([{ x: 10, y: 20 }])).not.toThrow()
+  })
+
+  it('compositeStroke does not throw for any combination of flags', () => {
+    const { compositeStroke } = setup()
+    expect(() => compositeStroke(false, false)).not.toThrow()
+    expect(() => compositeStroke(true, true)).not.toThrow()
+  })
+})
+
+describe('initGPUResources', () => {
+  it('leaves hasRenderer false when TypeGPU initialisation fails', async () => {
+    const { initGPUResources, hasRenderer } = setup()
+    await initGPUResources()
+    expect(hasRenderer.value).toBe(false)
+  })
+})
+
+describe('copyGpuToCanvas', () => {
+  it('rejects with a descriptive error when GPU resources are not ready', async () => {
+    const { copyGpuToCanvas } = setup()
+    await expect(copyGpuToCanvas()).rejects.toThrow('GPU resources not ready')
+  })
+})
+
+describe('watchers', () => {
+  it('clearTrigger watcher calls clearGPU without throwing', async () => {
+    setup()
+    mockStore.clearTrigger++
+    await nextTick()
+  })
+
+  it('currentStateIndex watcher short-circuits when isSavingHistory is true', async () => {
+    const { isSavingHistory } = setup()
+    isSavingHistory.value = true
+    mockStore.canvasHistory.currentStateIndex++
+    await nextTick()
+  })
+
+  it('currentStateIndex watcher calls updateGPUFromCanvas when not saving history', async () => {
+    setup()
+    mockStore.canvasHistory.currentStateIndex++
+    await nextTick()
+  })
+
+  it('gpuTexturesNeedRecreation watcher returns early when device is not initialised', async () => {
+    setup()
+    mockStore.gpuTexturesNeedRecreation = true
+    await nextTick()
+  })
+})
+
+describe('initGPUResources with pre-existing tgpuRoot', () => {
+  it('returns early with a warning when canvas contexts are not ready', async () => {
+    const { initGPUResources, hasRenderer } = setup()
+    mockStore.tgpuRoot = { device: {} } as unknown
+    await initGPUResources()
+    expect(hasRenderer.value).toBe(false)
+  })
+})
+
+describe('initPreviewCanvas', () => {
+  it('returns early when device is not initialised', () => {
+    const { initPreviewCanvas } = setup()
+    const canvas = document.createElement('canvas')
+    expect(() => initPreviewCanvas(canvas)).not.toThrow()
+  })
+})
+
+describe('gpuDrawPoint', () => {
+  it('resolves immediately when renderer is not initialised', async () => {
+    const { gpuDrawPoint } = setup()
+    await expect(gpuDrawPoint({ x: 10, y: 20 })).resolves.toBeUndefined()
+  })
+})
diff --git a/src/composables/maskeditor/useGPUResources.ts b/src/composables/maskeditor/useGPUResources.ts
new file mode 100644
index 0000000000..55367fbdf5
--- /dev/null
+++ b/src/composables/maskeditor/useGPUResources.ts
@@ -0,0 +1,624 @@
+/// <reference types="@webgpu/types" />
+import { onUnmounted, ref, watch } from 'vue'
+import { tgpu } from 'typegpu'
+
+import { BrushShape } from '@/extensions/core/maskeditor/types'
+import type { Point } from '@/extensions/core/maskeditor/types'
+import { useMaskEditorStore } from '@/stores/maskEditorStore'
+import { parseToRgb } from '@/utils/colorUtil'
+
+import type { DirtyRect } from './brushDrawingUtils'
+import {
+  premultiplyData,
+  resetDirtyRect,
+  updateDirtyRect
+} from './brushDrawingUtils'
+import { getEffectiveBrushSize, getEffectiveHardness } from './brushUtils'
+import { GPUBrushRenderer } from './gpu/GPUBrushRenderer'
+import { buildStrokePoints, clampDirtyRect } from './gpuUtils'
+
+export function useGPUResources() {
+  const store = useMaskEditorStore()
+
+  // GPU state — plain variables, not reactive, as Vue doesn't need to track them
+  let maskTexture: GPUTexture | null = null
+  let rgbTexture: GPUTexture | null = null
+  let device: GPUDevice | null = null
+  let renderer: GPUBrushRenderer | null = null
+  let previewContext: GPUCanvasContext | null = null
+
+  // Readback buffers
+  let readbackStorageMask: GPUBuffer | null = null
+  let readbackStorageRgb: GPUBuffer | null = null
+  let readbackStagingMask: GPUBuffer | null = null
+  let readbackStagingRgb: GPUBuffer | null = null
+  let currentBufferSize = 0
+
+  // Reactive state shared with useBrushDrawing
+  const previewCanvas = ref<HTMLCanvasElement | null>(null)
+  const isSavingHistory = ref(false)
+  const dirtyRect = ref<DirtyRect>(resetDirtyRect())
+
+  const hasRenderer = ref(false)
+
+  const isRecreatingTextures = ref(false)
+
+  // ── Watchers ────────────────────────────────────────────────────────────────
+
+  watch(
+    () => store.clearTrigger,
+    () => clearGPU()
+  )
+
+  watch(
+    () => store.canvasHistory.currentStateIndex,
+    async () => {
+      if (isSavingHistory.value) return
+      await updateGPUFromCanvas()
+      if (renderer && previewContext) renderer.clearPreview(previewContext)
+    }
+  )
+
+  watch(
+    () => store.gpuTexturesNeedRecreation,
+    async (needsRecreation) => {
+      if (
+        !needsRecreation ||
+        !device ||
+        !store.maskCanvas ||
+        isRecreatingTextures.value
+      )
+        return
+
+      /* c8 ignore start */
+      isRecreatingTextures.value = true
+
+      const width = store.gpuTextureWidth
+      const height = store.gpuTextureHeight
+
+      try {
+        maskTexture?.destroy()
+        maskTexture = null
+        rgbTexture?.destroy()
+        rgbTexture = null
+
+        maskTexture = createTexture(device, width, height)
+        rgbTexture = createTexture(device, width, height)
+
+        if (store.pendingGPUMaskData && store.pendingGPURgbData) {
+          device.queue.writeTexture(
+            { texture: maskTexture },
+            store.pendingGPUMaskData,
+            { bytesPerRow: width * 4 },
+            { width, height }
+          )
+          device.queue.writeTexture(
+            { texture: rgbTexture },
+            store.pendingGPURgbData,
+            { bytesPerRow: width * 4 },
+            { width, height }
+          )
+        } else {
+          await updateGPUFromCanvas()
+        }
+
+        if (previewCanvas.value && renderer) {
+          previewCanvas.value.width = width
+          previewCanvas.value.height = height
+        }
+
+        resizeReadbackBuffers(device, width, height)
+      } catch (error) {
+        console.error(
+          '[useGPUResources] Failed to recreate GPU textures:',
+          error
+        )
+      } finally {
+        store.gpuTexturesNeedRecreation = false
+        store.gpuTextureWidth = 0
+        store.gpuTextureHeight = 0
+        store.pendingGPUMaskData = null
+        store.pendingGPURgbData = null
+        isRecreatingTextures.value = false
+      }
+      /* c8 ignore stop */
+    }
+  )
+
+  onUnmounted(() => {
+    // c8 ignore start
+    renderer?.destroy()
+    renderer = null
+    hasRenderer.value = false
+    maskTexture?.destroy()
+    maskTexture = null
+    rgbTexture?.destroy()
+    rgbTexture = null
+    readbackStorageMask?.destroy()
+    readbackStorageMask = null
+    readbackStorageRgb?.destroy()
+    readbackStorageRgb = null
+    readbackStagingMask?.destroy()
+    readbackStagingMask = null
+    readbackStagingRgb?.destroy()
+    readbackStagingRgb = null
+    previewContext = null
+    previewCanvas.value = null
+    dirtyRect.value = resetDirtyRect()
+    // Device is managed by TGPU root; do not destroy it here
+    // c8 ignore stop
+  })
+
+  // ── Helpers ─────────────────────────────────────────────────────────────────
+
+  /* c8 ignore start — requires a live GPUDevice */
+  function createTexture(
+    gpuDevice: GPUDevice,
+    width: number,
+    height: number
+  ): GPUTexture {
+    return gpuDevice.createTexture({
+      size: [width, height],
+      format: 'rgba8unorm',
+      usage:
+        GPUTextureUsage.TEXTURE_BINDING |
+        GPUTextureUsage.STORAGE_BINDING |
+        GPUTextureUsage.RENDER_ATTACHMENT |
+        GPUTextureUsage.COPY_DST |
+        GPUTextureUsage.COPY_SRC
+    })
+  }
+
+  function resizeReadbackBuffers(
+    gpuDevice: GPUDevice,
+    width: number,
+    height: number
+  ): void {
+    const bufferSize = width * height * 4
+    if (currentBufferSize === bufferSize) return
+
+    readbackStorageMask?.destroy()
+    readbackStorageRgb?.destroy()
+    readbackStagingMask?.destroy()
+    readbackStagingRgb?.destroy()
+
+    readbackStorageMask = gpuDevice.createBuffer({
+      size: bufferSize,
+      usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
+    })
+    readbackStorageRgb = gpuDevice.createBuffer({
+      size: bufferSize,
+      usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC
+    })
+    readbackStagingMask = gpuDevice.createBuffer({
+      size: bufferSize,
+      usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
+    })
+    readbackStagingRgb = gpuDevice.createBuffer({
+      size: bufferSize,
+      usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
+    })
+    currentBufferSize = bufferSize
+  }
+  /* c8 ignore stop */
+
+  // ── Internal functions ───────────────────────────────────────────────────────
+
+  async function initTypeGPU(): Promise<void> {
+    if (store.tgpuRoot) {
+      /* c8 ignore start */
+      device = store.tgpuRoot.device
+      return
+      /* c8 ignore stop */
+    }
+    try {
+      /* c8 ignore start — requires functional WebGPU hardware */
+      const root = await tgpu.init()
+      store.tgpuRoot = root
+      device = root.device
+      console.warn('✅ TypeGPU initialized! Root:', root)
+      console.warn('Device info:', root.device.limits)
+      /* c8 ignore stop */
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      console.warn('Failed to initialize TypeGPU:', message)
+    }
+  }
+
+  async function updateGPUFromCanvas(): Promise<void> {
+    if (
+      !device ||
+      !maskTexture ||
+      !rgbTexture ||
+      !store.maskCanvas ||
+      !store.maskCtx ||
+      !store.rgbCtx
+    )
+      return
+
+    /* c8 ignore start — requires live GPU device and textures */
+    const w = store.maskCanvas.width
+    const h = store.maskCanvas.height
+
+    const maskData = store.maskCtx.getImageData(0, 0, w, h)
+    premultiplyData(maskData.data)
+    device.queue.writeTexture(
+      { texture: maskTexture },
+      maskData.data,
+      { bytesPerRow: w * 4 },
+      { width: w, height: h }
+    )
+
+    const rgbData = store.rgbCtx.getImageData(0, 0, w, h)
+    premultiplyData(rgbData.data)
+    device.queue.writeTexture(
+      { texture: rgbTexture },
+      rgbData.data,
+      { bytesPerRow: w * 4 },
+      { width: w, height: h }
+    )
+    /* c8 ignore stop */
+  }
+
+  // ── Public API ───────────────────────────────────────────────────────────────
+
+  async function initGPUResources(): Promise<void> {
+    await initTypeGPU()
+
+    if (!store.tgpuRoot || !device) {
+      console.warn('TypeGPU not initialized, skipping GPU resource setup')
+      return
+    }
+    if (
+      !store.maskCanvas ||
+      !store.rgbCanvas ||
+      !store.maskCtx ||
+      !store.rgbCtx
+    ) {
+      console.warn('Canvas contexts not ready, skipping GPU resource setup')
+      return
+    }
+
+    const w = store.maskCanvas.width
+    const h = store.maskCanvas.height
+
+    /* c8 ignore start — requires functional WebGPU hardware */
+    try {
+      console.warn(`🎨 Initializing GPU resources for ${w}x${h} canvas`)
+      maskTexture = createTexture(device, w, h)
+      rgbTexture = createTexture(device, w, h)
+      await updateGPUFromCanvas()
+      console.warn('✅ GPU resources initialized successfully')
+      renderer = new GPUBrushRenderer(
+        device,
+        navigator.gpu.getPreferredCanvasFormat()
+      )
+      hasRenderer.value = true
+      console.warn('✅ Brush renderer initialized')
+    } catch (error) {
+      console.error('Failed to initialize GPU resources:', error)
+      maskTexture = null
+      rgbTexture = null
+    }
+    /* c8 ignore stop */
+  }
+
+  function initPreviewCanvas(canvas: HTMLCanvasElement): void {
+    if (!device) return
+    /* c8 ignore start — requires live GPUDevice and WebGPU canvas context */
+    const ctx = canvas.getContext('webgpu')
+    if (!ctx) return
+    ctx.configure({
+      device,
+      format: navigator.gpu.getPreferredCanvasFormat(),
+      alphaMode: 'premultiplied'
+    })
+    previewContext = ctx
+    previewCanvas.value = canvas
+    console.warn('✅ Preview Canvas Initialized')
+    /* c8 ignore stop */
+  }
+
+  function clearGPU(): void {
+    if (!device || !maskTexture || !rgbTexture || !store.maskCanvas) return
+    /* c8 ignore start — requires live GPUDevice and textures */
+    const w = store.maskCanvas.width
+    const h = store.maskCanvas.height
+    const zeros = new Uint8Array(w * h * 4)
+    device.queue.writeTexture(
+      { texture: maskTexture },
+      zeros,
+      { bytesPerRow: w * 4 },
+      { width: w, height: h }
+    )
+    device.queue.writeTexture(
+      { texture: rgbTexture },
+      zeros,
+      { bytesPerRow: w * 4 },
+      { width: w, height: h }
+    )
+    /* c8 ignore stop */
+  }
+
+  function destroy(): void {
+    renderer?.destroy()
+    maskTexture?.destroy()
+    rgbTexture?.destroy()
+    readbackStorageMask?.destroy()
+    readbackStorageRgb?.destroy()
+    readbackStagingMask?.destroy()
+    readbackStagingRgb?.destroy()
+    renderer = null
+    hasRenderer.value = false
+    maskTexture = null
+    rgbTexture = null
+    readbackStorageMask = null
+    readbackStorageRgb = null
+    readbackStagingMask = null
+    readbackStagingRgb = null
+    currentBufferSize = 0
+    previewContext = null
+    previewCanvas.value = null
+    dirtyRect.value = resetDirtyRect()
+    /* c8 ignore next — tgpuRoot only exists after successful GPU init */
+    if (store.tgpuRoot) {
+      store.tgpuRoot.destroy()
+      store.tgpuRoot = null
+    }
+    device = null
+  }
+
+  // ── Wrappers called by useBrushDrawing ──────────────────────────────────────
+
+  function prepareStroke(): void {
+    if (!renderer || !store.maskCanvas) return
+    /* c8 ignore next */
+    renderer.prepareStroke(store.maskCanvas.width, store.maskCanvas.height)
+  }
+
+  function clearPreview(): void {
+    if (!renderer || !previewContext) return
+    /* c8 ignore next */
+    renderer.clearPreview(previewContext)
+  }
+
+  function compositeStroke(isRgb: boolean, isErasing: boolean): void {
+    if (!renderer || !maskTexture || !rgbTexture || !store.maskCanvas) return
+    /* c8 ignore start — requires live renderer */
+    const targetTex = isRgb ? rgbTexture : maskTexture
+    const { size, hardness, opacity, type } = store.brushSettings
+    const effectiveSize = getEffectiveBrushSize(size, hardness)
+    const effectiveHardness = getEffectiveHardness(
+      size,
+      hardness,
+      effectiveSize
+    )
+    const brushShape = type === BrushShape.Rect ? 1 : 0
+    renderer.compositeStroke(targetTex.createView(), {
+      opacity,
+      color: [0, 0, 0],
+      hardness: effectiveHardness,
+      screenSize: [store.maskCanvas.width, store.maskCanvas.height],
+      brushShape,
+      isErasing
+    })
+    /* c8 ignore stop */
+  }
+
+  async function copyGpuToCanvas(): Promise<{
+    maskData: ImageData
+    rgbData: ImageData
+  }> {
+    if (
+      !device ||
+      !maskTexture ||
+      !rgbTexture ||
+      !store.maskCanvas ||
+      !store.rgbCanvas ||
+      !store.maskCtx ||
+      !store.rgbCtx ||
+      !renderer
+    )
+      throw new Error('GPU resources not ready')
+
+    /* c8 ignore start — requires live GPU device, textures and renderer */
+    const width = store.maskCanvas.width
+    const height = store.maskCanvas.height
+
+    resizeReadbackBuffers(device, width, height)
+
+    renderer.prepareReadback(maskTexture, readbackStorageMask!)
+    renderer.prepareReadback(rgbTexture, readbackStorageRgb!)
+
+    const encoder = device.createCommandEncoder()
+    encoder.copyBufferToBuffer(
+      readbackStorageMask!,
+      0,
+      readbackStagingMask!,
+      0,
+      currentBufferSize
+    )
+    encoder.copyBufferToBuffer(
+      readbackStorageRgb!,
+      0,
+      readbackStagingRgb!,
+      0,
+      currentBufferSize
+    )
+    device.queue.submit([encoder.finish()])
+
+    await Promise.all([
+      readbackStagingMask!.mapAsync(GPUMapMode.READ),
+      readbackStagingRgb!.mapAsync(GPUMapMode.READ)
+    ])
+
+    const maskDataArr = new Uint8ClampedArray(
+      readbackStagingMask!.getMappedRange().slice(0)
+    )
+    const rgbDataArr = new Uint8ClampedArray(
+      readbackStagingRgb!.getMappedRange().slice(0)
+    )
+    readbackStagingMask!.unmap()
+    readbackStagingRgb!.unmap()
+
+    const maskImageData = new ImageData(maskDataArr, width, height)
+    const rgbImageData = new ImageData(rgbDataArr, width, height)
+
+    const { dx, dy, dw, dh } = clampDirtyRect(dirtyRect.value, width, height)
+    store.maskCtx.putImageData(maskImageData, 0, 0, dx, dy, dw, dh)
+    store.rgbCtx.putImageData(rgbImageData, 0, 0, dx, dy, dw, dh)
+
+    return { maskData: maskImageData, rgbData: rgbImageData }
+    /* c8 ignore stop */
+  }
+
+  function gpuRender(points: Point[], skipResampling = false): void {
+    if (!renderer || !maskTexture || !rgbTexture) return
+
+    /* c8 ignore start — requires live renderer */
+    const isRgb = store.activeLayer === 'rgb'
+    const color = resolveColor(isRgb)
+    const stepPercentage =
+      Math.pow(100, store.brushSettings.stepSize / 100) / 100
+    const gpuStepSize = Math.max(1.0, store.brushSettings.size * stepPercentage)
+    const strokePoints = buildStrokePoints(points, skipResampling, gpuStepSize)
+
+    const { size, hardness } = store.brushSettings
+    const effectiveSize = getEffectiveBrushSize(size, hardness)
+    const effectiveHardness = getEffectiveHardness(
+      size,
+      hardness,
+      effectiveSize
+    )
+    const brushShape = store.brushSettings.type === BrushShape.Rect ? 1 : 0
+
+    renderer.renderStrokeToAccumulator(strokePoints, {
+      size: effectiveSize,
+      opacity: 0.5,
+      hardness: effectiveHardness,
+      color,
+      width: store.maskCanvas!.width,
+      height: store.maskCanvas!.height,
+      brushShape
+    })
+
+    for (const p of strokePoints) {
+      dirtyRect.value = updateDirtyRect(
+        dirtyRect.value,
+        p.x,
+        p.y,
+        effectiveSize
+      )
+    }
+
+    if (previewContext) {
+      const isErasing =
+        store.currentTool === 'eraser' ||
+        store.maskCtx?.globalCompositeOperation === 'destination-out'
+      const targetTex = isRgb ? rgbTexture : maskTexture
+      renderer.blitToCanvas(
+        previewContext,
+        {
+          opacity: store.brushSettings.opacity,
+          color,
+          hardness: effectiveHardness,
+          screenSize: [store.maskCanvas!.width, store.maskCanvas!.height],
+          brushShape,
+          isErasing
+        },
+        targetTex ?? undefined
+      )
+    }
+    /* c8 ignore stop */
+  }
+
+  async function gpuDrawPoint(point: Point, opacity = 1): Promise<void> {
+    if (!renderer) return
+
+    /* c8 ignore start — requires live renderer */
+    const width = store.maskCanvas!.width
+    const height = store.maskCanvas!.height
+    const { size, hardness } = store.brushSettings
+    const effectiveSize = getEffectiveBrushSize(size, hardness)
+    const effectiveHardness = getEffectiveHardness(
+      size,
+      hardness,
+      effectiveSize
+    )
+    const brushShape = store.brushSettings.type === BrushShape.Rect ? 1 : 0
+
+    dirtyRect.value = updateDirtyRect(
+      dirtyRect.value,
+      point.x,
+      point.y,
+      effectiveSize
+    )
+
+    renderer.renderStrokeToAccumulator(
+      [{ x: point.x, y: point.y, pressure: opacity }],
+      {
+        size: effectiveSize,
+        opacity: 0.5,
+        hardness: effectiveHardness,
+        color: [1, 1, 1],
+        width,
+        height,
+        brushShape
+      }
+    )
+
+    if (maskTexture && previewContext) {
+      const isRgb = store.activeLayer === 'rgb'
+      const isErasing =
+        store.currentTool === 'eraser' ||
+        store.maskCtx?.globalCompositeOperation === 'destination-out'
+      renderer.blitToCanvas(
+        previewContext,
+        {
+          opacity: store.brushSettings.opacity,
+          color: resolveColor(isRgb),
+          hardness: effectiveHardness,
+          screenSize: [width, height],
+          brushShape,
+          isErasing
+        },
+        undefined
+      )
+    }
+    /* c8 ignore stop */
+  }
+
+  // ── Private helpers ─────────────────────────────────────────────────────────
+
+  /* c8 ignore start — only reachable after successful GPU init */
+  function resolveColor(isRgb: boolean): [number, number, number] {
+    if (isRgb) {
+      const c = parseToRgb(store.rgbColor)
+      return [c.r / 255, c.g / 255, c.b / 255]
+    }
+    const c = store.maskColor as { r: number; g: number; b: number }
+    return [c.r / 255, c.g / 255, c.b / 255]
+  }
+  /* c8 ignore stop */
+
+  return {
+    // Lifecycle — spread into useBrushDrawing's public return
+    initGPUResources,
+    initPreviewCanvas,
+    clearGPU,
+    destroy,
+    // Rendering — called internally by useBrushDrawing
+    gpuRender,
+    gpuDrawPoint,
+    copyGpuToCanvas,
+    // Renderer wrappers — called internally by useBrushDrawing
+    prepareStroke,
+    clearPreview,
+    compositeStroke,
+    // Shared reactive state
+    hasRenderer,
+    previewCanvas,
+    isSavingHistory,
+    dirtyRect
+  }
+}
diff --git a/src/composables/node/useNodeDragAndDrop.ts b/src/composables/node/useNodeDragAndDrop.ts
index dba6b9f672..da267e4e76 100644
--- a/src/composables/node/useNodeDragAndDrop.ts
+++ b/src/composables/node/useNodeDragAndDrop.ts
@@ -73,12 +73,14 @@ export const useNodeDragAndDrop = <T>(
       return true
     }
 
-    const uri = URL.parse(e?.dataTransfer?.getData('text/uri-list') ?? '')
+    const baseUri = e?.dataTransfer?.getData('text/uri-list') ?? ''
+    const uri = URL.parse(baseUri, location.href)
     if (!uri || uri.origin !== location.origin) return false
 
     try {
       const resp = await fetch(uri)
-      const fileName = uri?.searchParams?.get('filename')
+      const fileName =
+        uri?.searchParams?.get('filename') ?? baseUri.split('/').at(-1)
       if (!fileName || !resp.ok) return false
 
       const blob = await resp.blob()
diff --git a/src/composables/node/useNodeImageUpload.test.ts b/src/composables/node/useNodeImageUpload.test.ts
index 662d39c0b6..59a788c064 100644
--- a/src/composables/node/useNodeImageUpload.test.ts
+++ b/src/composables/node/useNodeImageUpload.test.ts
@@ -54,8 +54,8 @@ function createMockNode(): LGraphNode {
   })
 }
 
-function createFile(name = 'test.png'): File {
-  return new File(['data'], name, { type: 'image/png' })
+function createFile(name = 'test.png', type = 'image/png'): File {
+  return new File(['data'], name, { type })
 }
 
 function successResponse(name: string, subfolder?: string) {
@@ -95,15 +95,21 @@ describe('useNodeImageUpload', () => {
     })
   })
 
-  it('sets isUploading true during upload and false after', async () => {
-    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+  it.for([
+    { mediaType: 'image', filename: 'test.png', mimeType: 'image/png' },
+    { mediaType: 'video', filename: 'clip.mp4', mimeType: 'video/mp4' }
+  ])(
+    'sets isUploading true during $mediaType upload and false after',
+    async ({ filename, mimeType }) => {
+      mockFetchApi.mockResolvedValueOnce(successResponse(filename))
 
-    const promise = capturedDragOnDrop([createFile()])
-    expect(node.isUploading).toBe(true)
+      const promise = capturedDragOnDrop([createFile(filename, mimeType)])
+      expect(node.isUploading).toBe(true)
 
-    await promise
-    expect(node.isUploading).toBe(false)
-  })
+      await promise
+      expect(node.isUploading).toBe(false)
+    }
+  )
 
   it('clears node.imgs on upload start', async () => {
     mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
diff --git a/src/composables/painter/usePainter.test.ts b/src/composables/painter/usePainter.test.ts
index 80a64fef2d..ef70fc7410 100644
--- a/src/composables/painter/usePainter.test.ts
+++ b/src/composables/painter/usePainter.test.ts
@@ -349,25 +349,75 @@ describe('usePainter', () => {
   })
 
   describe('serializeValue', () => {
-    it('returns empty string when canvas has no strokes', async () => {
+    it('returns existing modelValue when not dirty (preserves workflow-restored mask reference across WidgetPainter remount)', async () => {
       const maskWidget = makeWidget('mask', '')
       mockWidgets.push(maskWidget)
 
-      mountPainter()
+      mountPainter('test-node', 'painter/existing.png [temp]')
 
       const result = await maskWidget.serializeValue!({} as LGraphNode, 0)
-      expect(result).toBe('')
+      expect(result).toBe('painter/existing.png [temp]')
     })
 
-    it('returns empty string when canvas has no strokes even if modelValue is set', async () => {
+    it('uploads the current canvas when no cached modelValue is present, even if nothing has been painted yet', async () => {
       const maskWidget = makeWidget('mask', '')
       mockWidgets.push(maskWidget)
 
-      const { modelValue } = mountPainter()
-      modelValue.value = 'painter/existing.png [temp]'
+      const fetchApiMock = vi.mocked(api.fetchApi)
+      fetchApiMock.mockResolvedValueOnce({
+        status: 200,
+        json: async () => ({ name: 'uploaded.png' })
+      } as Response)
+
+      const fakeCanvas = {
+        width: 4,
+        height: 4,
+        toBlob: (cb: BlobCallback) => cb(new Blob(['x']))
+      } as unknown as HTMLCanvasElement
+
+      const { canvasEl } = mountPainter('test-node', '')
+      canvasEl.value = fakeCanvas
+      await nextTick()
 
       const result = await maskWidget.serializeValue!({} as LGraphNode, 0)
-      expect(result).toBe('')
+      expect(fetchApiMock).toHaveBeenCalledWith(
+        '/upload/image',
+        expect.objectContaining({ method: 'POST' })
+      )
+      expect(result).toBe('painter/uploaded.png [temp]')
+    })
+
+    it('returns existing modelValue when canvas element is unmounted at serialize time', async () => {
+      const maskWidget = makeWidget('mask', '')
+      mockWidgets.push(maskWidget)
+
+      mountPainter('test-node', 'painter/cached.png [temp]')
+
+      const result = await maskWidget.serializeValue!({} as LGraphNode, 0)
+      expect(result).toBe('painter/cached.png [temp]')
+    })
+
+    it('clears the cached upload reference when the user clears the canvas', () => {
+      const maskWidget = makeWidget('mask', '')
+      mockWidgets.push(maskWidget)
+
+      const fakeCanvas = {
+        width: 4,
+        height: 4,
+        getContext: vi.fn(() => ({
+          clearRect: vi.fn()
+        }))
+      } as unknown as HTMLCanvasElement
+
+      const { painter, canvasEl, modelValue } = mountPainter(
+        'test-node',
+        'painter/old-upload.png [temp]'
+      )
+      canvasEl.value = fakeCanvas
+
+      painter.handleClear()
+
+      expect(modelValue.value).toBe('')
     })
   })
 
diff --git a/src/composables/painter/usePainter.ts b/src/composables/painter/usePainter.ts
index 3c60ddfbf7..4fa623c331 100644
--- a/src/composables/painter/usePainter.ts
+++ b/src/composables/painter/usePainter.ts
@@ -61,7 +61,6 @@ export function usePainter(nodeId: string, options: UsePainterOptions) {
   let baseCanvas: HTMLCanvasElement | null = null
   let baseCtx: CanvasRenderingContext2D | null = null
   let hasBaseSnapshot = false
-  let hasStrokes = false
 
   let dirtyX0 = 0
   let dirtyY0 = 0
@@ -413,7 +412,6 @@ export function usePainter(nodeId: string, options: UsePainterOptions) {
 
     isDrawing = true
     isDirty.value = true
-    hasStrokes = true
     snapshotBrush()
     strokeProcessor = new StrokeProcessor(Math.max(1, strokeBrush!.radius / 2))
     strokeProcessor.addPoint(point)
@@ -513,7 +511,7 @@ export function usePainter(nodeId: string, options: UsePainterOptions) {
     if (!el || !ctx) return
     ctx.clearRect(0, 0, el.width, el.height)
     isDirty.value = true
-    hasStrokes = false
+    modelValue.value = ''
   }
 
   function updateCursorPos(e: PointerEvent) {
@@ -619,17 +617,11 @@ export function usePainter(nodeId: string, options: UsePainterOptions) {
     return { filename, subfolder, type }
   }
 
-  function isCanvasEmpty(): boolean {
-    return !hasStrokes
-  }
-
   async function serializeValue(): Promise<string> {
     const el = canvasEl.value
-    if (!el) return ''
+    if (!el) return modelValue.value
 
-    if (isCanvasEmpty()) return ''
-
-    if (!isDirty.value) return modelValue.value
+    if (!isDirty.value && modelValue.value) return modelValue.value
 
     const blob = await new Promise<Blob | null>((resolve) =>
       el.toBlob(resolve, 'image/png')
@@ -717,7 +709,6 @@ export function usePainter(nodeId: string, options: UsePainterOptions) {
       mainCtx = null
       getCtx()?.drawImage(img, 0, 0)
       isDirty.value = false
-      hasStrokes = true
     }
     img.onerror = () => {
       modelValue.value = ''
diff --git a/src/composables/queue/useJobDetailsHover.ts b/src/composables/queue/useJobDetailsHover.ts
deleted file mode 100644
index 8efd98fc43..0000000000
--- a/src/composables/queue/useJobDetailsHover.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { onBeforeUnmount, ref, watch } from 'vue'
-
-import type { JobGroup } from '@/composables/queue/useJobList'
-
-const DETAILS_SHOW_DELAY_MS = 200
-const DETAILS_HIDE_DELAY_MS = 150
-
-interface UseJobDetailsHoverOptions<TActive> {
-  getActiveId: (active: TActive) => string
-  getDisplayedJobGroups: () => JobGroup[]
-  onReset?: () => void
-}
-
-export function useJobDetailsHover<TActive>({
-  getActiveId,
-  getDisplayedJobGroups,
-  onReset
-}: UseJobDetailsHoverOptions<TActive>) {
-  const activeDetails = ref<TActive | null>(null)
-  const hideTimer = ref<number | null>(null)
-  const hideTimerJobId = ref<string | null>(null)
-  const showTimer = ref<number | null>(null)
-
-  function clearHideTimer() {
-    if (hideTimer.value !== null) {
-      clearTimeout(hideTimer.value)
-      hideTimer.value = null
-    }
-    hideTimerJobId.value = null
-  }
-
-  function clearShowTimer() {
-    if (showTimer.value !== null) {
-      clearTimeout(showTimer.value)
-      showTimer.value = null
-    }
-  }
-
-  function clearHoverTimers() {
-    clearHideTimer()
-    clearShowTimer()
-  }
-
-  function resetActiveDetails() {
-    clearHoverTimers()
-    activeDetails.value = null
-    onReset?.()
-  }
-
-  function hasDisplayedJob(jobId: string) {
-    return getDisplayedJobGroups().some((group) =>
-      group.items.some((item) => item.id === jobId)
-    )
-  }
-
-  function scheduleDetailsShow(nextActive: TActive, onShow?: () => void) {
-    const nextActiveId = getActiveId(nextActive)
-    clearShowTimer()
-    showTimer.value = window.setTimeout(() => {
-      showTimer.value = null
-      if (!hasDisplayedJob(nextActiveId)) return
-
-      activeDetails.value = nextActive
-      onShow?.()
-    }, DETAILS_SHOW_DELAY_MS)
-  }
-
-  function scheduleDetailsHide(jobId?: string, onHide?: () => void) {
-    if (!jobId) return
-
-    clearShowTimer()
-    if (hideTimerJobId.value && hideTimerJobId.value !== jobId) {
-      return
-    }
-
-    clearHideTimer()
-    hideTimerJobId.value = jobId
-    hideTimer.value = window.setTimeout(() => {
-      const currentActive = activeDetails.value
-      if (currentActive && getActiveId(currentActive) === jobId) {
-        activeDetails.value = null
-        onHide?.()
-      }
-      hideTimer.value = null
-      hideTimerJobId.value = null
-    }, DETAILS_HIDE_DELAY_MS)
-  }
-
-  watch(getDisplayedJobGroups, () => {
-    const currentActive = activeDetails.value
-    if (!currentActive) return
-
-    if (!hasDisplayedJob(getActiveId(currentActive))) {
-      resetActiveDetails()
-    }
-  })
-
-  onBeforeUnmount(resetActiveDetails)
-
-  return {
-    activeDetails,
-    clearHoverTimers,
-    resetActiveDetails,
-    scheduleDetailsHide,
-    scheduleDetailsShow
-  }
-}
diff --git a/src/composables/queue/useJobMenu.test.ts b/src/composables/queue/useJobMenu.test.ts
index 3b64ce4b6c..e06d97f2a4 100644
--- a/src/composables/queue/useJobMenu.test.ts
+++ b/src/composables/queue/useJobMenu.test.ts
@@ -263,10 +263,10 @@ describe('useJobMenu', () => {
     expect(copyToClipboardMock).not.toHaveBeenCalled()
   })
 
-  it.each([
+  it.for([
     ['running', interruptMock, deleteItemMock],
     ['initialization', interruptMock, deleteItemMock]
-  ])('cancels %s job via interrupt', async (state) => {
+  ])('cancels %s job via interrupt', async ([state]) => {
     const { cancelJob } = mountJobMenu()
     setCurrentItem(createJobItem({ state: state as JobListItem['state'] }))
 
@@ -417,7 +417,7 @@ describe('useJobMenu', () => {
     }
   ] as const
 
-  it.each(previewCases)(
+  it.for(previewCases)(
     'adds loader node for %s preview output',
     async ({ flags, expectedNode, widget }) => {
       const widgetCallback = vi.fn()
diff --git a/src/composables/queue/useQueueProgress.test.ts b/src/composables/queue/useQueueProgress.test.ts
index a0d7231828..bc81d2ac3a 100644
--- a/src/composables/queue/useQueueProgress.test.ts
+++ b/src/composables/queue/useQueueProgress.test.ts
@@ -58,7 +58,7 @@ describe('useQueueProgress', () => {
     setExecutingNodeProgress(null)
   })
 
-  it.each([
+  it.for([
     {
       description: 'defaults to 0% when execution store values are missing',
       execution: undefined,
diff --git a/src/composables/useErrorHandling.test.ts b/src/composables/useErrorHandling.test.ts
index 5c7c8212bd..122c9528eb 100644
--- a/src/composables/useErrorHandling.test.ts
+++ b/src/composables/useErrorHandling.test.ts
@@ -324,11 +324,11 @@ describe('useErrorHandling', () => {
     })
 
     describe('network error detection', () => {
-      it.each([
+      it.for([
         ['Failed to fetch', 'Chrome/Edge'],
         ['NetworkError when attempting to fetch resource.', 'Firefox'],
         ['Load failed', 'Safari']
-      ])('should show disconnected toast for "%s" (%s)', async (message) => {
+      ])('should show disconnected toast for "%s" (%s)', async ([message]) => {
         const action = vi.fn(async () => {
           throw new TypeError(message)
         })
diff --git a/src/composables/useImageCrop.test.ts b/src/composables/useImageCrop.test.ts
index e7ccd65b32..9132344e3b 100644
--- a/src/composables/useImageCrop.test.ts
+++ b/src/composables/useImageCrop.test.ts
@@ -481,6 +481,30 @@ describe('useImageCrop', () => {
     expect(vm.modelValue.x).toBe(50)
   })
 
+  it('resizes from the top edge, moving y and shrinking height', async () => {
+    const vm = await mountHarness()
+    setupImageLayout(vm, 500, 500)
+    vm.modelValue = { x: 50, y: 100, width: 120, height: 200 }
+
+    const captureEl = document.createElement('div')
+    captureEl.setPointerCapture = vi.fn()
+    captureEl.releasePointerCapture = vi.fn()
+
+    const resizeStart = vm.handleResizeStart as (
+      e: PointerEvent,
+      dir: string
+    ) => void
+    const resizeMove = vm.handleResizeMove as (e: PointerEvent) => void
+    const resizeEnd = vm.handleResizeEnd as (e: PointerEvent) => void
+
+    resizeStart(makePointerEvent('pointerdown', captureEl, 100, 100), 'top')
+    resizeMove(makePointerEvent('pointermove', captureEl, 100, 150))
+    resizeEnd(makePointerEvent('pointerup', captureEl, 100, 150))
+
+    expect(vm.modelValue.y).toBeGreaterThan(100)
+    expect(vm.modelValue.height).toBeLessThan(200)
+  })
+
   it('applies a preset aspect ratio and clamps height to the image', async () => {
     const vm = await mountHarness()
     setupImageLayout(vm, 800, 500)
diff --git a/src/composables/useLoad3d.test.ts b/src/composables/useLoad3d.test.ts
index 9c0027d21b..c6ea3bb2e0 100644
--- a/src/composables/useLoad3d.test.ts
+++ b/src/composables/useLoad3d.test.ts
@@ -1,5 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref, shallowRef } from 'vue'
+import { nextTick, reactive, ref, shallowRef } from 'vue'
+import type { Pinia } from 'pinia'
+import { getActivePinia } from 'pinia'
 
 import { nodeToLoad3dMap, useLoad3d } from '@/composables/useLoad3d'
 import Load3d from '@/extensions/core/load3d/Load3d'
@@ -9,6 +11,7 @@ import type { Size } from '@/lib/litegraph/src/interfaces'
 import type { LGraph } from '@/lib/litegraph/src/LGraph'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IWidget } from '@/lib/litegraph/src/types/widgets'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { api } from '@/scripts/api'
 import {
@@ -59,6 +62,23 @@ vi.mock('@/i18n', () => ({
   t: vi.fn((key) => key)
 }))
 
+vi.mock('pinia', async (importOriginal) => {
+  const actual = await importOriginal()
+  return {
+    ...(actual as Record<string, unknown>),
+    getActivePinia: vi.fn(() => null)
+  }
+})
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn()
+}))
+
+vi.mock('@/platform/assets/utils/assetPreviewUtil', () => ({
+  isAssetPreviewSupported: vi.fn(() => false),
+  persistThumbnail: vi.fn().mockResolvedValue(undefined)
+}))
+
 describe('useLoad3d', () => {
   let mockLoad3d: Partial<Load3d>
   let mockNode: LGraphNode
@@ -67,6 +87,7 @@ describe('useLoad3d', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     nodeToLoad3dMap.clear()
+    vi.mocked(getActivePinia).mockReturnValue(null as unknown as Pinia)
 
     mockNode = createMockLGraphNode({
       properties: {
@@ -165,6 +186,12 @@ describe('useLoad3d', () => {
       resetGizmoTransform: vi.fn(),
       applyGizmoTransform: vi.fn(),
       fitToViewer: vi.fn(),
+      getGizmoTransform: vi.fn().mockReturnValue({
+        position: { x: 0, y: 0, z: 0 },
+        rotation: { x: 0, y: 0, z: 0 },
+        scale: { x: 1, y: 1, z: 1 }
+      }),
+      captureThumbnail: vi.fn().mockResolvedValue('data:image/png;base64,test'),
       setAnimationTime: vi.fn(),
       renderer: {
         domElement: mockCanvas
@@ -334,6 +361,73 @@ describe('useLoad3d', () => {
 
       expect(composable.sceneConfig.value.backgroundColor).toBe('#000000')
     })
+
+    it('passes getZoomScale callback to createLoad3d', async () => {
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+
+      await composable.initializeLoad3d(containerRef)
+
+      expect(createLoad3d).toHaveBeenCalledWith(
+        containerRef,
+        expect.objectContaining({ getZoomScale: expect.any(Function) })
+      )
+    })
+  })
+
+  describe('zoom watcher', () => {
+    it('calls load3d.handleResize after debounce when canvas appScalePercentage changes', async () => {
+      vi.useFakeTimers()
+
+      const canvasStore = reactive({ appScalePercentage: 100 })
+      vi.mocked(getActivePinia).mockReturnValue({} as unknown as Pinia)
+      vi.mocked(useCanvasStore).mockReturnValue(
+        canvasStore as unknown as ReturnType<typeof useCanvasStore>
+      )
+
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+
+      vi.mocked(mockLoad3d.handleResize!).mockClear()
+
+      canvasStore.appScalePercentage = 200
+      await nextTick()
+      expect(mockLoad3d.handleResize).not.toHaveBeenCalled()
+
+      vi.advanceTimersByTime(150)
+      expect(mockLoad3d.handleResize).toHaveBeenCalledOnce()
+
+      vi.useRealTimers()
+    })
+
+    it('debounces rapid zoom changes into a single handleResize call', async () => {
+      vi.useFakeTimers()
+
+      const canvasStore = reactive({ appScalePercentage: 100 })
+      vi.mocked(getActivePinia).mockReturnValue({} as unknown as Pinia)
+      vi.mocked(useCanvasStore).mockReturnValue(
+        canvasStore as unknown as ReturnType<typeof useCanvasStore>
+      )
+
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+
+      vi.mocked(mockLoad3d.handleResize!).mockClear()
+
+      canvasStore.appScalePercentage = 150
+      await nextTick()
+      canvasStore.appScalePercentage = 200
+      await nextTick()
+      canvasStore.appScalePercentage = 250
+      await nextTick()
+
+      vi.advanceTimersByTime(150)
+      expect(mockLoad3d.handleResize).toHaveBeenCalledOnce()
+
+      vi.useRealTimers()
+    })
   })
 
   describe('preserves existing node callbacks through initializeLoad3d', () => {
@@ -749,6 +843,7 @@ describe('useLoad3d', () => {
         'backgroundImageLoadingEnd',
         'modelLoadingStart',
         'modelLoadingEnd',
+        'modelReady',
         'skeletonVisibilityChange',
         'exportLoadingStart',
         'exportLoadingEnd',
@@ -1299,4 +1394,169 @@ describe('useLoad3d', () => {
       expect(mockLoad3d.resetGizmoTransform).not.toHaveBeenCalled()
     })
   })
+
+  describe('handleFitToViewer', () => {
+    it('persists post-fit position and scale into modelConfig.gizmo so reload reapplies the transform via applyGizmoConfigToLoad3d', async () => {
+      const fitTransform = {
+        position: { x: 0, y: -1.25, z: 0 },
+        rotation: { x: 0, y: 0, z: 0 },
+        scale: { x: 0.42, y: 0.42, z: 0.42 }
+      }
+      vi.mocked(mockLoad3d.getGizmoTransform!).mockReturnValue(fitTransform)
+
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+
+      composable.handleFitToViewer()
+
+      expect(mockLoad3d.fitToViewer).toHaveBeenCalledOnce()
+      expect(composable.modelConfig.value.gizmo!.position).toEqual(
+        fitTransform.position
+      )
+      expect(composable.modelConfig.value.gizmo!.scale).toEqual(
+        fitTransform.scale
+      )
+      // Rotation is owned by upDirection — fit must not overwrite it.
+      expect(composable.modelConfig.value.gizmo!.rotation).toEqual({
+        x: 0,
+        y: 0,
+        z: 0
+      })
+    })
+
+    it('is a no-op when load3d is not initialized', () => {
+      const composable = useLoad3d(mockNode)
+      // No initializeLoad3d() call.
+      composable.handleFitToViewer()
+      expect(mockLoad3d.fitToViewer).not.toHaveBeenCalled()
+    })
+
+    it('does not throw when modelConfig.gizmo is missing', async () => {
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+      composable.modelConfig.value.gizmo = undefined
+
+      expect(() => composable.handleFitToViewer()).not.toThrow()
+      expect(mockLoad3d.fitToViewer).toHaveBeenCalledOnce()
+      // Without a gizmo slot we silently skip persistence — getGizmoTransform
+      // is not called because the early-return saves the read.
+      expect(mockLoad3d.getGizmoTransform).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('modelReady event handler (thumbnail capture)', () => {
+    let originalFetch: typeof globalThis.fetch
+
+    beforeEach(() => {
+      originalFetch = globalThis.fetch
+      globalThis.fetch = vi.fn().mockResolvedValue({
+        blob: () => Promise.resolve(new Blob(['x'], { type: 'image/png' }))
+      } as unknown as Response)
+    })
+
+    afterEach(() => {
+      globalThis.fetch = originalFetch
+    })
+
+    async function getModelReadyHandler() {
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+      const call = vi
+        .mocked(mockLoad3d.addEventListener!)
+        .mock.calls.find(([event]) => event === 'modelReady')
+      return { composable, handler: call![1] as () => void }
+    }
+
+    it('registers a modelReady listener separate from modelLoadingEnd', async () => {
+      const composable = useLoad3d(mockNode)
+      const containerRef = document.createElement('div')
+      await composable.initializeLoad3d(containerRef)
+
+      const events = vi
+        .mocked(mockLoad3d.addEventListener!)
+        .mock.calls.map(([event]) => event)
+      expect(events).toContain('modelReady')
+      expect(events).toContain('modelLoadingEnd')
+      expect(composable).toBeDefined()
+    })
+
+    it('does not call captureThumbnail when asset preview is unsupported', async () => {
+      const { isAssetPreviewSupported } =
+        await import('@/platform/assets/utils/assetPreviewUtil')
+      vi.mocked(isAssetPreviewSupported).mockReturnValue(false)
+
+      const { handler } = await getModelReadyHandler()
+      handler()
+      await Promise.resolve()
+
+      expect(mockLoad3d.captureThumbnail).not.toHaveBeenCalled()
+    })
+
+    it('captures thumbnail and persists it when asset preview is supported and a model_file widget has a value', async () => {
+      const { isAssetPreviewSupported, persistThumbnail } =
+        await import('@/platform/assets/utils/assetPreviewUtil')
+      vi.mocked(isAssetPreviewSupported).mockReturnValue(true)
+      vi.mocked(Load3dUtils.splitFilePath).mockReturnValue([
+        '',
+        'cube.glb'
+      ] as unknown as ReturnType<typeof Load3dUtils.splitFilePath>)
+
+      const modelWidget = {
+        name: 'model_file',
+        value: 'cube.glb [output]'
+      } as unknown as IWidget
+      mockNode.widgets = [modelWidget]
+
+      const { handler } = await getModelReadyHandler()
+      handler()
+      // Two awaits: one for captureThumbnail, one for fetch().blob() chain.
+      await new Promise((r) => setTimeout(r, 0))
+
+      expect(mockLoad3d.captureThumbnail).toHaveBeenCalledWith(256, 256)
+      expect(persistThumbnail).toHaveBeenCalledWith(
+        'cube.glb',
+        expect.any(Blob)
+      )
+    })
+
+    it('skips persistence when the model widget has no value', async () => {
+      const { isAssetPreviewSupported, persistThumbnail } =
+        await import('@/platform/assets/utils/assetPreviewUtil')
+      vi.mocked(isAssetPreviewSupported).mockReturnValue(true)
+      mockNode.widgets = [
+        { name: 'model_file', value: '' } as unknown as IWidget
+      ]
+
+      const { handler } = await getModelReadyHandler()
+      handler()
+      await new Promise((r) => setTimeout(r, 0))
+
+      expect(mockLoad3d.captureThumbnail).not.toHaveBeenCalled()
+      expect(persistThumbnail).not.toHaveBeenCalled()
+    })
+
+    it('swallows captureThumbnail rejections silently', async () => {
+      const { isAssetPreviewSupported, persistThumbnail } =
+        await import('@/platform/assets/utils/assetPreviewUtil')
+      vi.mocked(isAssetPreviewSupported).mockReturnValue(true)
+      vi.mocked(Load3dUtils.splitFilePath).mockReturnValue([
+        '',
+        'broken.glb'
+      ] as unknown as ReturnType<typeof Load3dUtils.splitFilePath>)
+      vi.mocked(mockLoad3d.captureThumbnail!).mockRejectedValue(
+        new Error('webgl context lost')
+      )
+      mockNode.widgets = [
+        { name: 'model_file', value: 'broken.glb' } as unknown as IWidget
+      ]
+
+      const { handler } = await getModelReadyHandler()
+      expect(() => handler()).not.toThrow()
+      await new Promise((r) => setTimeout(r, 0))
+      expect(persistThumbnail).not.toHaveBeenCalled()
+    })
+  })
 })
diff --git a/src/composables/useLoad3d.ts b/src/composables/useLoad3d.ts
index 619aa89f41..bad8d77f38 100644
--- a/src/composables/useLoad3d.ts
+++ b/src/composables/useLoad3d.ts
@@ -1,6 +1,6 @@
 import type { MaybeRef } from 'vue'
 
-import { toRef } from '@vueuse/core'
+import { toRef, useDebounceFn } from '@vueuse/core'
 import { getActivePinia } from 'pinia'
 import { ref, toRaw, watch } from 'vue'
 
@@ -31,6 +31,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useLoad3dService } from '@/services/load3dService'
@@ -44,6 +45,15 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
   let load3d: Load3d | null = null
   let isFirstModelLoad = true
 
+  const debouncedHandleResize = useDebounceFn(() => {
+    load3d?.handleResize()
+  }, 150)
+
+  watch(
+    () => (getActivePinia() ? useCanvasStore().appScalePercentage : 0),
+    debouncedHandleResize
+  )
+
   const sceneConfig = ref<SceneConfig>({
     showGrid: true,
     backgroundColor: '#000000',
@@ -132,6 +142,7 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
                 height: heightWidget.value as number
               })
             : undefined,
+        getZoomScale: () => app.canvas?.ds?.scale ?? 1,
         onContextMenu: (event) => {
           const menuOptions = app.canvas.getNodeMenuOptions(node)
           new LiteGraph.ContextMenu(menuOptions, {
@@ -807,24 +818,24 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
       hasSkeleton.value = load3d?.hasSkeleton() ?? false
       applyGizmoConfigToLoad3d()
       isFirstModelLoad = false
+    },
+    modelReady: () => {
+      if (!load3d || !isAssetPreviewSupported()) return
 
-      if (load3d && isAssetPreviewSupported()) {
-        const node = nodeRef.value
+      const node = nodeRef.value
+      const modelWidget = node?.widgets?.find(
+        (w) => w.name === 'model_file' || w.name === 'image'
+      )
+      const value = modelWidget?.value
+      if (typeof value !== 'string' || !value) return
 
-        const modelWidget = node?.widgets?.find(
-          (w) => w.name === 'model_file' || w.name === 'image'
-        )
-        const value = modelWidget?.value
-        if (typeof value === 'string' && value) {
-          const filename = value.trim().replace(/\s*\[output\]$/, '')
-          const modelName = Load3dUtils.splitFilePath(filename)[1]
-          load3d
-            .captureThumbnail(256, 256)
-            .then((dataUrl) => fetch(dataUrl).then((r) => r.blob()))
-            .then((blob) => persistThumbnail(modelName, blob))
-            .catch(() => {})
-        }
-      }
+      const filename = value.trim().replace(/\s*\[output\]$/, '')
+      const modelName = Load3dUtils.splitFilePath(filename)[1]
+      load3d
+        .captureThumbnail(256, 256)
+        .then((dataUrl) => fetch(dataUrl).then((r) => r.blob()))
+        .then((blob) => persistThumbnail(modelName, blob))
+        .catch(() => {})
     },
     skeletonVisibilityChange: (value: boolean) => {
       modelConfig.value.showSkeleton = value
@@ -900,9 +911,13 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
   }
 
   const handleFitToViewer = () => {
-    if (load3d) {
-      load3d.fitToViewer()
-    }
+    if (!load3d) return
+    load3d.fitToViewer()
+
+    if (!modelConfig.value.gizmo) return
+    const transform = load3d.getGizmoTransform()
+    modelConfig.value.gizmo.position = transform.position
+    modelConfig.value.gizmo.scale = transform.scale
   }
 
   const handleResetGizmoTransform = () => {
diff --git a/src/composables/useLoad3dViewer.test.ts b/src/composables/useLoad3dViewer.test.ts
index a692871a3f..9b05e1b983 100644
--- a/src/composables/useLoad3dViewer.test.ts
+++ b/src/composables/useLoad3dViewer.test.ts
@@ -404,6 +404,23 @@ describe('useLoad3dViewer', () => {
           .intensity
       ).toBe(1)
     })
+
+    it('should preserve unknown fields on Model Config when restoring', async () => {
+      const viewer = useLoad3dViewer(mockNode)
+      const containerRef = document.createElement('div')
+
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
+      ;(
+        mockNode.properties!['Model Config'] as Record<string, unknown>
+      ).futureField = 'preserve-me'
+
+      viewer.restoreInitialState()
+
+      expect(
+        (mockNode.properties!['Model Config'] as Record<string, unknown>)
+          .futureField
+      ).toBe('preserve-me')
+    })
   })
 
   describe('applyChanges', () => {
@@ -457,6 +474,23 @@ describe('useLoad3dViewer', () => {
 
       expect(result).toBe(false)
     })
+
+    it('should preserve unknown fields on Model Config when applying', async () => {
+      const viewer = useLoad3dViewer(mockNode)
+      const containerRef = document.createElement('div')
+
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
+      ;(
+        mockNode.properties!['Model Config'] as Record<string, unknown>
+      ).futureField = 'preserve-me'
+
+      await viewer.applyChanges()
+
+      expect(
+        (mockNode.properties!['Model Config'] as Record<string, unknown>)
+          .futureField
+      ).toBe('preserve-me')
+    })
   })
 
   describe('refreshViewport', () => {
diff --git a/src/composables/useLoad3dViewer.ts b/src/composables/useLoad3dViewer.ts
index 4de6ea8a54..b048c17bb4 100644
--- a/src/composables/useLoad3dViewer.ts
+++ b/src/composables/useLoad3dViewer.ts
@@ -619,7 +619,11 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
         intensity: initialState.value.lightIntensity
       }
 
+      const existingModelConfig = nodeValue.properties['Model Config'] as
+        | ModelConfig
+        | undefined
       nodeValue.properties['Model Config'] = {
+        ...existingModelConfig,
         upDirection: initialState.value.upDirection,
         materialMode: initialState.value.materialMode,
         gizmo: {
@@ -671,10 +675,13 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
       }
 
       const gizmoTransform = load3d.getGizmoTransform()
+      const existingModelConfig = nodeValue.properties['Model Config'] as
+        | ModelConfig
+        | undefined
       nodeValue.properties['Model Config'] = {
+        ...existingModelConfig,
         upDirection: upDirection.value,
         materialMode: materialMode.value,
-        showSkeleton: false,
         gizmo: {
           enabled: gizmoEnabled.value,
           mode: gizmoMode.value,
diff --git a/src/composables/usePopoverSizing.test.ts b/src/composables/usePopoverSizing.test.ts
new file mode 100644
index 0000000000..407c5ac9bc
--- /dev/null
+++ b/src/composables/usePopoverSizing.test.ts
@@ -0,0 +1,91 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { effectScope } from 'vue'
+import type { EffectScope } from 'vue'
+
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
+
+describe('usePrimeVueOverlayChildStyle', () => {
+  let scope: EffectScope | undefined
+
+  function mountComposable() {
+    scope = effectScope()
+    let composable: ReturnType<typeof usePrimeVueOverlayChildStyle> | undefined
+
+    scope.run(() => {
+      composable = usePrimeVueOverlayChildStyle()
+    })
+
+    if (!composable) {
+      throw new Error('Failed to mount composable')
+    }
+
+    return composable
+  }
+
+  beforeEach(() => {
+    document.body.innerHTML = ''
+  })
+
+  afterEach(() => {
+    scope?.stop()
+    scope = undefined
+    document.body.innerHTML = ''
+  })
+
+  it('preserves existing stacking when there is no PrimeVue parent overlay', () => {
+    const { overlayScopeRef, contentStyle } = mountComposable()
+
+    overlayScopeRef.value = document.createElement('div')
+
+    expect(contentStyle.value).toEqual({})
+  })
+
+  it('renders above the closest PrimeVue dialog mask', () => {
+    const { overlayScopeRef, contentStyle } = mountComposable()
+
+    overlayScopeRef.value = appendPrimeVueOverlay('p-dialog-mask', 5000)
+
+    expect(contentStyle.value).toEqual({ zIndex: 5001 })
+  })
+
+  it('renders above the closest PrimeVue overlay mask', () => {
+    const { overlayScopeRef, contentStyle } = mountComposable()
+
+    overlayScopeRef.value = appendPrimeVueOverlay('p-overlay-mask', 4200)
+
+    expect(contentStyle.value).toEqual({ zIndex: 4201 })
+  })
+
+  it('does not drop below the Reka select overlay z-index floor', () => {
+    const { overlayScopeRef, contentStyle } = mountComposable()
+
+    overlayScopeRef.value = appendPrimeVueOverlay('p-dialog-mask', 1200)
+
+    expect(contentStyle.value).toEqual({ zIndex: 3000 })
+  })
+
+  it('preserves existing stacking when the PrimeVue overlay z-index is not numeric', () => {
+    const { overlayScopeRef, contentStyle } = mountComposable()
+
+    overlayScopeRef.value = appendPrimeVueOverlay('p-dialog-mask')
+
+    expect(contentStyle.value).toEqual({})
+  })
+})
+
+function appendPrimeVueOverlay(
+  className: string,
+  zIndex?: number
+): HTMLElement {
+  const overlay = document.createElement('div')
+  overlay.className = className
+  if (zIndex !== undefined) {
+    overlay.style.zIndex = String(zIndex)
+  }
+
+  const anchor = document.createElement('div')
+  overlay.append(anchor)
+  document.body.append(overlay)
+
+  return anchor
+}
diff --git a/src/composables/usePopoverSizing.ts b/src/composables/usePopoverSizing.ts
index 9ab2b41579..a83f7fe5cb 100644
--- a/src/composables/usePopoverSizing.ts
+++ b/src/composables/usePopoverSizing.ts
@@ -1,11 +1,14 @@
-import { computed } from 'vue'
-import type { CSSProperties, ComputedRef } from 'vue'
+import { computed, ref } from 'vue'
+import type { CSSProperties, ComputedRef, Ref } from 'vue'
 
 interface PopoverSizeOptions {
   minWidth?: string
   maxWidth?: string
 }
 
+// Matches the highest existing Reka popover z-index (e.g. z-3000 on SearchAutocomplete).
+const PRIMEVUE_DIALOG_CHILD_Z_INDEX_FLOOR = 3000
+
 /**
  * Composable for managing popover sizing styles
  * @param options Popover size configuration
@@ -29,3 +32,30 @@ export function usePopoverSizing(
     return style
   })
 }
+
+/**
+ * Keeps portaled Reka popovers above their containing PrimeVue dialog.
+ *
+ * This is a temporary bridge while PrimeVue dialogs and controls are
+ * incrementally migrated to Reka UI. Once the affected PrimeVue parents are
+ * migrated, this helper should be removed with the compatibility patch.
+ */
+export function usePrimeVueOverlayChildStyle(): {
+  overlayScopeRef: Ref<HTMLElement | null>
+  contentStyle: ComputedRef<CSSProperties>
+} {
+  const overlayScopeRef = ref<HTMLElement | null>(null)
+  const contentStyle = computed<CSSProperties>(() => {
+    const overlay = overlayScopeRef.value?.closest(
+      '.p-dialog-mask, .p-overlay-mask'
+    )
+    if (!overlay) return {}
+
+    const zIndex = Number.parseInt(getComputedStyle(overlay).zIndex, 10)
+    if (!Number.isFinite(zIndex)) return {}
+
+    return { zIndex: Math.max(PRIMEVUE_DIALOG_CHILD_Z_INDEX_FLOOR, zIndex + 1) }
+  })
+
+  return { overlayScopeRef, contentStyle }
+}
diff --git a/src/composables/useReconnectQueueRefresh.test.ts b/src/composables/useReconnectQueueRefresh.test.ts
new file mode 100644
index 0000000000..dc21ff7b47
--- /dev/null
+++ b/src/composables/useReconnectQueueRefresh.test.ts
@@ -0,0 +1,88 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useReconnectQueueRefresh } from '@/composables/useReconnectQueueRefresh'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { api } from '@/scripts/api'
+import { useExecutionStore } from '@/stores/executionStore'
+
+function makeJob(id: string, status: JobListItem['status']): JobListItem {
+  return {
+    id,
+    status,
+    create_time: 0,
+    update_time: 0,
+    last_state_update: 0,
+    priority: 0
+  }
+}
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getQueue: vi.fn(),
+    getHistory: vi.fn(),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    apiURL: vi.fn((p: string) => `/api${p}`)
+  }
+}))
+
+describe('useReconnectQueueRefresh', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.restoreAllMocks()
+    vi.mocked(api.getQueue).mockResolvedValue({ Running: [], Pending: [] })
+    vi.mocked(api.getHistory).mockResolvedValue([])
+  })
+
+  it('forwards running+pending job ids to clearActiveJobIfStale', async () => {
+    vi.mocked(api.getQueue).mockResolvedValue({
+      Running: [makeJob('run-1', 'in_progress')],
+      Pending: [makeJob('pend-1', 'pending'), makeJob('pend-2', 'pending')]
+    })
+    const executionStore = useExecutionStore()
+    const clearSpy = vi
+      .spyOn(executionStore, 'clearActiveJobIfStale')
+      .mockImplementation(() => {})
+
+    const refresh = useReconnectQueueRefresh()
+    await refresh()
+
+    expect(clearSpy).toHaveBeenCalledTimes(1)
+    expect(clearSpy).toHaveBeenCalledWith(
+      new Set(['run-1', 'pend-1', 'pend-2'])
+    )
+  })
+
+  it('passes an empty set when the queue is genuinely empty', async () => {
+    const executionStore = useExecutionStore()
+    const clearSpy = vi
+      .spyOn(executionStore, 'clearActiveJobIfStale')
+      .mockImplementation(() => {})
+
+    const refresh = useReconnectQueueRefresh()
+    await refresh()
+
+    expect(clearSpy).toHaveBeenCalledWith(new Set())
+  })
+
+  it('reuses the prior queue snapshot when the fetch fails, so a still-running job is not falsely cleared', async () => {
+    vi.mocked(api.getQueue)
+      .mockResolvedValueOnce({
+        Running: [makeJob('run-1', 'in_progress')],
+        Pending: []
+      })
+      .mockRejectedValueOnce(new Error('network down'))
+    const executionStore = useExecutionStore()
+    const clearSpy = vi
+      .spyOn(executionStore, 'clearActiveJobIfStale')
+      .mockImplementation(() => {})
+
+    const refresh = useReconnectQueueRefresh()
+    await refresh() // primes the store with run-1
+    await refresh() // network failure here — store must not go empty
+
+    expect(clearSpy).toHaveBeenLastCalledWith(new Set(['run-1']))
+  })
+})
diff --git a/src/composables/useReconnectQueueRefresh.ts b/src/composables/useReconnectQueueRefresh.ts
new file mode 100644
index 0000000000..267ade9850
--- /dev/null
+++ b/src/composables/useReconnectQueueRefresh.ts
@@ -0,0 +1,25 @@
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+
+/**
+ * After a WebSocket reconnect, refresh the queue from the server and clear
+ * any active job that finished during the disconnect window. Returns the
+ * handler so the caller can wire it to the `reconnected` api event.
+ *
+ * `update()` preserves the previous queue snapshot when the fetch fails, so
+ * if the network is still flaky we reconcile against the last known good
+ * state rather than an empty (and falsely "stale") set.
+ */
+export function useReconnectQueueRefresh() {
+  const queueStore = useQueueStore()
+  const executionStore = useExecutionStore()
+
+  return async function refreshOnReconnect() {
+    await queueStore.update()
+    const activeJobIds = new Set([
+      ...queueStore.runningTasks.map((t) => t.jobId),
+      ...queueStore.pendingTasks.map((t) => t.jobId)
+    ])
+    executionStore.clearActiveJobIfStale(activeJobIds)
+  }
+}
diff --git a/src/constants/essentialsDisplayNames.test.ts b/src/constants/essentialsDisplayNames.test.ts
index 57967510f3..18b6dfd375 100644
--- a/src/constants/essentialsDisplayNames.test.ts
+++ b/src/constants/essentialsDisplayNames.test.ts
@@ -8,7 +8,7 @@ import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames
 
 describe('resolveEssentialsDisplayName', () => {
   describe('exact name matches', () => {
-    it.each([
+    it.for([
       ['LoadImage', 'essentials.loadImage'],
       ['SaveImage', 'essentials.saveImage'],
       ['PrimitiveStringMultiline', 'essentials.text'],
@@ -22,26 +22,26 @@ describe('resolveEssentialsDisplayName', () => {
       ['Video Slice', 'essentials.extractFrame'],
       ['KlingLipSyncAudioToVideoNode', 'essentials.lipsync'],
       ['KlingLipSyncTextToVideoNode', 'essentials.lipsync']
-    ])('%s -> %s', (name, expected) => {
+    ])('%s -> %s', ([name, expected]) => {
       expect(resolveEssentialsDisplayName({ name })).toBe(expected)
     })
   })
 
   describe('3D API node alternatives', () => {
-    it.each([
+    it.for([
       ['TencentTextToModelNode', 'essentials.textTo3DModel'],
       ['MeshyTextToModelNode', 'essentials.textTo3DModel'],
       ['TripoTextToModelNode', 'essentials.textTo3DModel'],
       ['TencentImageToModelNode', 'essentials.imageTo3DModel'],
       ['MeshyImageToModelNode', 'essentials.imageTo3DModel'],
       ['TripoImageToModelNode', 'essentials.imageTo3DModel']
-    ])('%s -> %s', (name, expected) => {
+    ])('%s -> %s', ([name, expected]) => {
       expect(resolveEssentialsDisplayName({ name })).toBe(expected)
     })
   })
 
   describe('blueprint prefix matches', () => {
-    it.each([
+    it.for([
       [
         'SubgraphBlueprint.text_to_image_flux_schnell.json',
         'essentials.textToImage'
@@ -82,7 +82,7 @@ describe('resolveEssentialsDisplayName', () => {
         'SubgraphBlueprint.image_outpainting_qwen_image_instantx.json',
         'essentials.outpaintImage'
       ]
-    ])('%s -> %s', (name, expected) => {
+    ])('%s -> %s', ([name, expected]) => {
       expect(resolveEssentialsDisplayName({ name })).toBe(expected)
     })
   })
diff --git a/src/extensions/core/cloudFeedbackTopbarButton.test.ts b/src/extensions/core/cloudFeedbackTopbarButton.test.ts
new file mode 100644
index 0000000000..346613583d
--- /dev/null
+++ b/src/extensions/core/cloudFeedbackTopbarButton.test.ts
@@ -0,0 +1,83 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ActionBarButton } from '@/types/comfy'
+
+const distribution = vi.hoisted(() => ({ isCloud: false, isNightly: false }))
+
+const tabBarLayout = vi.hoisted(() => ({ value: 'Default' }))
+const registerExtension = vi.hoisted(() => vi.fn())
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: (key: string) =>
+      key === 'Comfy.UI.TabBarLayout' ? tabBarLayout.value : undefined
+  })
+}))
+
+vi.mock('@/services/extensionService', () => ({
+  useExtensionService: () => ({
+    registerExtension
+  })
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return distribution.isCloud
+  },
+  get isNightly() {
+    return distribution.isNightly
+  }
+}))
+
+describe('cloudFeedbackTopbarButton', () => {
+  let openSpy: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    vi.resetModules()
+    registerExtension.mockReset()
+    distribution.isCloud = false
+    distribution.isNightly = false
+    openSpy = vi.spyOn(window, 'open').mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    openSpy.mockRestore()
+  })
+
+  function getRegisteredButtons(): ActionBarButton[] {
+    expect(registerExtension).toHaveBeenCalledTimes(1)
+    const extension = registerExtension.mock.calls[0]?.[0] as {
+      actionBarButtons: ActionBarButton[]
+    }
+    return extension.actionBarButtons
+  }
+
+  it('opens the Typeform survey tagged with action-bar source on Cloud', async () => {
+    tabBarLayout.value = 'Legacy'
+    distribution.isCloud = true
+    await import('./cloudFeedbackTopbarButton')
+
+    const buttons = getRegisteredButtons()
+    expect(buttons).toHaveLength(1)
+    buttons[0].onClick?.()
+
+    expect(openSpy).toHaveBeenCalledTimes(1)
+    const [url, target, features] = openSpy.mock.calls[0]
+    expect(url).toBe(
+      'https://form.typeform.com/to/q7azbWPi#distribution=ccloud&source=action-bar'
+    )
+    expect(target).toBe('_blank')
+    expect(features).toBe('noopener,noreferrer')
+  })
+
+  it('only registers the action bar button when the tab bar is Legacy', async () => {
+    tabBarLayout.value = 'Default'
+    await import('./cloudFeedbackTopbarButton')
+
+    expect(getRegisteredButtons()).toEqual([])
+  })
+})
diff --git a/src/extensions/core/cloudFeedbackTopbarButton.ts b/src/extensions/core/cloudFeedbackTopbarButton.ts
index f435946b5d..31fad71dae 100644
--- a/src/extensions/core/cloudFeedbackTopbarButton.ts
+++ b/src/extensions/core/cloudFeedbackTopbarButton.ts
@@ -1,17 +1,20 @@
 import { t } from '@/i18n'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { buildFeedbackTypeformUrl } from '@/platform/support/config'
 import { useExtensionService } from '@/services/extensionService'
 import type { ActionBarButton } from '@/types/comfy'
 
-const TYPEFORM_SURVEY_URL = 'https://form.typeform.com/to/q7azbWPi'
-
 const buttons: ActionBarButton[] = [
   {
     icon: 'icon-[lucide--message-square-text]',
     label: t('actionbar.feedback'),
     tooltip: t('actionbar.feedbackTooltip'),
     onClick: () => {
-      window.open(TYPEFORM_SURVEY_URL, '_blank', 'noopener,noreferrer')
+      window.open(
+        buildFeedbackTypeformUrl('action-bar'),
+        '_blank',
+        'noopener,noreferrer'
+      )
     }
   }
 ]
diff --git a/src/extensions/core/editAttention.test.ts b/src/extensions/core/editAttention.test.ts
new file mode 100644
index 0000000000..1f3ec40b86
--- /dev/null
+++ b/src/extensions/core/editAttention.test.ts
@@ -0,0 +1,134 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    registerExtension: vi.fn(),
+    ui: { settings: { addSetting: vi.fn() } }
+  }
+}))
+
+import {
+  addWeightToParentheses,
+  findNearestEnclosure,
+  incrementWeight
+} from './editAttention'
+
+describe('incrementWeight', () => {
+  it('increments a weight by the given delta', () => {
+    expect(incrementWeight('1.0', 0.05)).toBe('1.05')
+  })
+
+  it('decrements a weight by the given delta', () => {
+    expect(incrementWeight('1.05', -0.05)).toBe('1')
+  })
+
+  it('returns the original string when weight is not a number', () => {
+    expect(incrementWeight('abc', 0.05)).toBe('abc')
+  })
+
+  it('rounds correctly and avoids floating point accumulation', () => {
+    expect(incrementWeight('1.1', 0.1)).toBe('1.2')
+  })
+
+  it('can produce a weight of zero', () => {
+    expect(incrementWeight('0.05', -0.05)).toBe('0')
+  })
+
+  it('produces negative weights', () => {
+    expect(incrementWeight('0.0', -0.05)).toBe('-0.05')
+  })
+})
+
+type Enclosure = { start: number; end: number } | null
+type EnclosureCase = [
+  name: string,
+  text: string,
+  cursor: number,
+  expected: Enclosure
+]
+
+describe('findNearestEnclosure', () => {
+  it.for<EnclosureCase>([
+    [
+      'returns start and end of a simple parenthesized expression',
+      '(cat)',
+      2,
+      { start: 1, end: 4 }
+    ],
+    [
+      'finds enclosure when cursor is on opening paren',
+      '(cat)',
+      0,
+      { start: 1, end: 4 }
+    ],
+    ['returns null when there are no parentheses', 'cat dog', 3, null],
+    ['returns null when cursor is outside any enclosure', '(cat) dog', 7, null],
+    [
+      'finds the inner enclosure when cursor is on nested content',
+      '(outer (inner) end)',
+      9,
+      { start: 8, end: 13 }
+    ],
+    [
+      'finds the outer enclosure when cursor is on outer content',
+      '(outer (inner) end)',
+      2,
+      { start: 1, end: 18 }
+    ],
+    ['returns null for empty string', '', 0, null],
+    [
+      'returns null when opening paren has no matching closing paren',
+      '(cat',
+      2,
+      null
+    ]
+  ])('%s', ([, text, cursor, expected]) => {
+    expect(findNearestEnclosure(text, cursor)).toEqual(expected)
+  })
+})
+
+type WeightCase = [name: string, input: string, expected: string]
+
+describe('addWeightToParentheses', () => {
+  it.for<WeightCase>([
+    ['adds weight 1.0 to a bare parenthesized token', '(cat)', '(cat:1.0)'],
+    [
+      'leaves a token that already has a weight unchanged',
+      '(cat:1.5)',
+      '(cat:1.5)'
+    ],
+    ['leaves a token without parentheses unchanged', 'cat', 'cat'],
+    [
+      'leaves a token with scientific notation weight unchanged',
+      '(cat:1e-3)',
+      '(cat:1e-3)'
+    ],
+    [
+      'leaves a token with a negative weight unchanged',
+      '(cat:-0.5)',
+      '(cat:-0.5)'
+    ],
+    [
+      'adds weight to a multi-word parenthesized token',
+      '(cat dog)',
+      '(cat dog:1.0)'
+    ],
+    [
+      'adds weight when colon-number appears in content but no trailing weight exists',
+      '(time 12:30)',
+      '(time 12:30:1.0)'
+    ],
+    [
+      'preserves existing weight on a digit-ending token name',
+      '(v2:1.5)',
+      '(v2:1.5)'
+    ],
+    [
+      'preserves existing weight on a LoRA name ending in a digit',
+      '(sdxl1:0.8)',
+      '(sdxl1:0.8)'
+    ]
+  ])('%s', ([, input, expected]) => {
+    expect(addWeightToParentheses(input)).toBe(expected)
+  })
+})
diff --git a/src/extensions/core/editAttention.ts b/src/extensions/core/editAttention.ts
index 119b277587..0920b78a71 100644
--- a/src/extensions/core/editAttention.ts
+++ b/src/extensions/core/editAttention.ts
@@ -1,6 +1,62 @@
 import { app } from '../../scripts/app'
 
-// Allows you to edit the attention weight by holding ctrl (or cmd) and using the up/down arrow keys
+type Enclosure = {
+  start: number
+  end: number
+}
+
+export function incrementWeight(weight: string, delta: number): string {
+  const floatWeight = parseFloat(weight)
+  if (isNaN(floatWeight)) return weight
+  const newWeight = floatWeight + delta
+  return String(Number(newWeight.toFixed(10)))
+}
+
+export function findNearestEnclosure(
+  text: string,
+  cursorPos: number
+): Enclosure | null {
+  let start = cursorPos
+  let end = cursorPos
+  let openCount = 0
+  let closeCount = 0
+
+  if (text[cursorPos] === '(') {
+    end = cursorPos + 1
+  } else {
+    while (start >= 0) {
+      start--
+      if (text[start] === '(' && openCount === closeCount) break
+      if (text[start] === '(') openCount++
+      if (text[start] === ')') closeCount++
+    }
+    if (start < 0) return null
+    openCount = 0
+    closeCount = 0
+  }
+
+  while (end < text.length) {
+    if (text[end] === ')' && openCount === closeCount) break
+    if (text[end] === '(') openCount++
+    if (text[end] === ')') closeCount++
+    end++
+  }
+  if (end === text.length) return null
+
+  return { start: start + 1, end: end }
+}
+
+export function addWeightToParentheses(text: string): string {
+  const parenMatch = text.match(/^\((.*)\)$/)
+  if (!parenMatch) return text
+  const innerText = parenMatch[1]
+  // A time-like pattern (e.g. "12:30") is preceded by whitespace or string-start;
+  // everything else ending in ":number" is a weight, including digit-ending names like "v2:1.5".
+  const looksLikeTime = /(?:^|\s)\d{1,2}:\d{2}$/.test(innerText)
+  const hasTrailingWeight =
+    !looksLikeTime && /:[+-]?(?:\d*\.)?\d+(?:[eE][+-]?\d+)?$/.test(innerText)
+  return hasTrailingWeight ? text : `(${innerText}:1.0)`
+}
 
 app.registerExtension({
   name: 'Comfy.EditAttention',
@@ -18,65 +74,6 @@ app.registerExtension({
       defaultValue: 0.05
     })
 
-    function incrementWeight(weight: string, delta: number): string {
-      const floatWeight = parseFloat(weight)
-      if (isNaN(floatWeight)) return weight
-      const newWeight = floatWeight + delta
-      return String(Number(newWeight.toFixed(10)))
-    }
-
-    type Enclosure = {
-      start: number
-      end: number
-    }
-
-    function findNearestEnclosure(
-      text: string,
-      cursorPos: number
-    ): Enclosure | null {
-      let start = cursorPos,
-        end = cursorPos
-      let openCount = 0,
-        closeCount = 0
-
-      // Find opening parenthesis before cursor
-      while (start >= 0) {
-        start--
-        if (text[start] === '(' && openCount === closeCount) break
-        if (text[start] === '(') openCount++
-        if (text[start] === ')') closeCount++
-      }
-      if (start < 0) return null
-
-      openCount = 0
-      closeCount = 0
-
-      // Find closing parenthesis after cursor
-      while (end < text.length) {
-        if (text[end] === ')' && openCount === closeCount) break
-        if (text[end] === '(') openCount++
-        if (text[end] === ')') closeCount++
-        end++
-      }
-      if (end === text.length) return null
-
-      return { start: start + 1, end: end }
-    }
-
-    function addWeightToParentheses(text: string): string {
-      const parenRegex = /^\((.*)\)$/
-      const parenMatch = text.match(parenRegex)
-
-      const floatRegex = /:([+-]?(\d*\.)?\d+([eE][+-]?\d+)?)/
-      const floatMatch = text.match(floatRegex)
-
-      if (parenMatch && !floatMatch) {
-        return `(${parenMatch[1]}:1.0)`
-      } else {
-        return text
-      }
-    }
-
     function editAttention(event: KeyboardEvent) {
       // @ts-expect-error Runtime narrowing not impl.
       const inputField: HTMLTextAreaElement = event.composedPath()[0]
@@ -92,7 +89,6 @@ app.registerExtension({
       let end = inputField.selectionEnd
       let selectedText = inputField.value.substring(start, end)
 
-      // If there is no selection, attempt to find the nearest enclosure, or select the current word
       if (!selectedText) {
         const nearestEnclosure = findNearestEnclosure(inputField.value, start)
         if (nearestEnclosure) {
@@ -100,7 +96,6 @@ app.registerExtension({
           end = nearestEnclosure.end
           selectedText = inputField.value.substring(start, end)
         } else {
-          // Select the current word, find the start and end of the word
           const delimiters = ' .,\\/!?%^*;:{}=-_`~()\r\n\t'
 
           while (
@@ -122,37 +117,30 @@ app.registerExtension({
         }
       }
 
-      // If the selection ends with a space, remove it
-      if (selectedText[selectedText.length - 1] === ' ') {
+      const selectionEndsWithSpace =
+        selectedText[selectedText.length - 1] === ' '
+      if (selectionEndsWithSpace) {
         selectedText = selectedText.substring(0, selectedText.length - 1)
         end -= 1
       }
 
-      // If there are parentheses left and right of the selection, select them
-      if (
-        inputField.value[start - 1] === '(' &&
-        inputField.value[end] === ')'
-      ) {
+      const selectionIsSurroundedByParens =
+        inputField.value[start - 1] === '(' && inputField.value[end] === ')'
+      if (selectionIsSurroundedByParens) {
         start -= 1
         end += 1
         selectedText = inputField.value.substring(start, end)
       }
 
-      // If the selection is not enclosed in parentheses, add them
-      if (
-        selectedText[0] !== '(' ||
-        selectedText[selectedText.length - 1] !== ')'
-      ) {
-        selectedText = `(${selectedText})`
-      }
+      const selectionIsNotEnclosedInParens =
+        selectedText[0] !== '(' || selectedText[selectedText.length - 1] !== ')'
+      if (selectionIsNotEnclosedInParens) selectedText = `(${selectedText})`
 
-      // If the selection does not have a weight, add a weight of 1.0
       selectedText = addWeightToParentheses(selectedText)
 
-      // Increment the weight
       const weightDelta = event.key === 'ArrowUp' ? delta : -delta
       const updatedText = selectedText.replace(
-        /\((.*):([+-]?\d+(?:\.\d+)?)\)/,
+        /\((.*):([+-]?(?:\d*\.)?\d+(?:[eE][+-]?\d+)?)\)/,
         (_, text, weight) => {
           weight = incrementWeight(weight, weightDelta)
           if (weight == 1) {
diff --git a/src/extensions/core/load3d.test.ts b/src/extensions/core/load3d.test.ts
new file mode 100644
index 0000000000..563594b845
--- /dev/null
+++ b/src/extensions/core/load3d.test.ts
@@ -0,0 +1,487 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import type { ComfyExtension } from '@/types/comfy'
+
+const {
+  registerExtensionMock,
+  waitForLoad3dMock,
+  configureMock,
+  getLoad3dMock,
+  toastAddAlertMock
+} = vi.hoisted(() => ({
+  registerExtensionMock: vi.fn(),
+  waitForLoad3dMock: vi.fn(),
+  configureMock: vi.fn(),
+  getLoad3dMock: vi.fn(),
+  toastAddAlertMock: vi.fn()
+}))
+
+vi.mock('@/services/extensionService', () => ({
+  useExtensionService: () => ({ registerExtension: registerExtensionMock })
+}))
+
+vi.mock('@/services/load3dService', () => ({
+  useLoad3dService: () => ({
+    getLoad3d: getLoad3dMock,
+    handleViewerClose: vi.fn()
+  })
+}))
+
+vi.mock('@/composables/useLoad3d', () => ({
+  useLoad3d: () => ({ waitForLoad3d: waitForLoad3dMock }),
+  nodeToLoad3dMap: new Map()
+}))
+
+vi.mock('@/extensions/core/load3d/Load3DConfiguration', () => ({
+  default: class {
+    configure = configureMock
+  }
+}))
+
+vi.mock('@/extensions/core/load3d/exportMenuHelper', () => ({
+  createExportMenuItems: vi.fn(() => [{ content: 'Export' }])
+}))
+
+vi.mock('@/extensions/core/load3d/Load3dUtils', () => ({
+  default: {
+    splitFilePath: vi.fn((p: string) => ['', p]),
+    getResourceURL: vi.fn(() => '/view'),
+    uploadFile: vi.fn(),
+    uploadMultipleFiles: vi.fn(),
+    uploadTempImage: vi.fn()
+  }
+}))
+
+vi.mock('@/extensions/core/load3d/constants', () => ({
+  SUPPORTED_EXTENSIONS_ACCEPT: '.glb,.gltf'
+}))
+
+vi.mock('@/components/load3d/Load3D.vue', () => ({ default: {} }))
+vi.mock('@/components/load3d/Load3dViewerContent.vue', () => ({ default: {} }))
+
+vi.mock('@/scripts/domWidget', () => ({
+  ComponentWidgetImpl: vi.fn(),
+  addWidget: vi.fn()
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: { apiURL: (p: string) => p }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: { canvas: { selected_nodes: {} } },
+  ComfyApp: { copyToClipspace: vi.fn(), clipspace_return_node: null }
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({ addAlert: toastAddAlertMock })
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({ showDialog: vi.fn() })
+}))
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  isLoad3dNode: vi.fn(() => true)
+}))
+
+vi.mock('@/lib/litegraph/src/litegraph', () => ({
+  LiteGraph: { ContextMenu: vi.fn() }
+}))
+
+type ExtCreated = ComfyExtension & {
+  nodeCreated: (node: LGraphNode) => Promise<void>
+  beforeRegisterNodeDef: (
+    nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) => Promise<void>
+  getNodeMenuItems: (node: LGraphNode) => unknown[]
+}
+
+async function loadExtensionsFresh(): Promise<{
+  load3DExt: ExtCreated
+  preview3DExt: ExtCreated
+}> {
+  vi.resetModules()
+  registerExtensionMock.mockClear()
+  await import('@/extensions/core/load3d')
+  return {
+    load3DExt: registerExtensionMock.mock.calls[0][0] as ExtCreated,
+    preview3DExt: registerExtensionMock.mock.calls[1][0] as ExtCreated
+  }
+}
+
+interface FakeWidget {
+  name: string
+  value: unknown
+  serializeValue?: () => Promise<unknown>
+}
+
+function makePreview3DNode(
+  overrides: Partial<{
+    comfyClass: string
+    properties: Record<string, unknown>
+    widgets: FakeWidget[]
+  }> = {}
+): LGraphNode {
+  return {
+    constructor: { comfyClass: overrides.comfyClass ?? 'Preview3D' },
+    size: [400, 550],
+    setSize: vi.fn(),
+    widgets: overrides.widgets ?? [{ name: 'model_file', value: '' }],
+    properties: overrides.properties ?? {}
+  } as unknown as LGraphNode
+}
+
+function makeLoad3DNode(
+  overrides: Partial<{
+    comfyClass: string
+    properties: Record<string, unknown>
+    widgets: FakeWidget[]
+  }> = {}
+): LGraphNode {
+  return {
+    constructor: { comfyClass: overrides.comfyClass ?? 'Load3D' },
+    size: [300, 600],
+    setSize: vi.fn(),
+    widgets: overrides.widgets ?? [
+      { name: 'model_file', value: '' },
+      { name: 'width', value: 512 },
+      { name: 'height', value: 512 },
+      { name: 'image', value: '' }
+    ],
+    properties: overrides.properties ?? {}
+  } as unknown as LGraphNode
+}
+
+interface FakeLoad3d {
+  whenLoadIdle: () => Promise<void>
+  setCameraFromMatrices: ReturnType<typeof vi.fn>
+  setBackgroundImage: ReturnType<typeof vi.fn>
+  isSplatModel: ReturnType<typeof vi.fn>
+  currentLoadGeneration: number
+}
+
+function makeLoad3dMock(): FakeLoad3d {
+  return {
+    whenLoadIdle: vi.fn().mockResolvedValue(undefined),
+    setCameraFromMatrices: vi.fn(),
+    setBackgroundImage: vi.fn(),
+    isSplatModel: vi.fn(() => false),
+    currentLoadGeneration: 0
+  }
+}
+
+async function flush() {
+  await new Promise<void>((resolve) => setTimeout(resolve, 0))
+}
+
+function setupBaseMocks() {
+  vi.clearAllMocks()
+  waitForLoad3dMock.mockImplementation((cb: (load3d: FakeLoad3d) => void) => {
+    cb(makeLoad3dMock())
+  })
+}
+
+describe('load3d module registration', () => {
+  beforeEach(setupBaseMocks)
+
+  it('registers Comfy.Load3D and Comfy.Preview3D extensions on import', async () => {
+    const { load3DExt, preview3DExt } = await loadExtensionsFresh()
+
+    expect(registerExtensionMock).toHaveBeenCalledTimes(2)
+    expect(load3DExt.name).toBe('Comfy.Load3D')
+    expect(preview3DExt.name).toBe('Comfy.Preview3D')
+  })
+})
+
+describe('Comfy.Preview3D.beforeRegisterNodeDef', () => {
+  beforeEach(setupBaseMocks)
+
+  it('rewrites the image input spec for Preview3D nodes', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const nodeData = {
+      name: 'Preview3D',
+      input: { required: { image: ['STRING', {}] } }
+    } as unknown as ComfyNodeDef
+
+    await preview3DExt.beforeRegisterNodeDef({} as typeof LGraphNode, nodeData)
+
+    expect(nodeData.input!.required!.image).toEqual(['PREVIEW_3D'])
+  })
+
+  it('leaves non-Preview3D node defs unchanged', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const nodeData = {
+      name: 'Load3D',
+      input: { required: { image: ['STRING', {}] } }
+    } as unknown as ComfyNodeDef
+
+    await preview3DExt.beforeRegisterNodeDef({} as typeof LGraphNode, nodeData)
+
+    expect(nodeData.input!.required!.image).toEqual(['STRING', {}])
+  })
+})
+
+describe('Comfy.Preview3D.nodeCreated', () => {
+  beforeEach(setupBaseMocks)
+
+  it('skips nodes whose comfyClass is not Preview3D', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const node = makePreview3DNode({ comfyClass: 'OtherNode' })
+
+    await preview3DExt.nodeCreated(node)
+
+    expect(waitForLoad3dMock).not.toHaveBeenCalled()
+    expect(configureMock).not.toHaveBeenCalled()
+  })
+
+  it('does not configure on creation when no Last Time Model File is persisted', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const node = makePreview3DNode()
+
+    await preview3DExt.nodeCreated(node)
+
+    expect(configureMock).not.toHaveBeenCalled()
+  })
+
+  it('restores via configure with persisted cameraState when Last Time Model File is set', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const cameraState = { position: [1, 2, 3] }
+    const node = makePreview3DNode({
+      properties: {
+        'Last Time Model File': 'prev/model.glb',
+        'Camera Config': { cameraType: 'perspective', state: cameraState }
+      }
+    })
+
+    await preview3DExt.nodeCreated(node)
+
+    expect(configureMock).toHaveBeenCalledWith({
+      loadFolder: 'output',
+      modelWidget: expect.objectContaining({ value: 'prev/model.glb' }),
+      cameraState,
+      silentOnNotFound: true
+    })
+  })
+
+  it('persists Last Time Model File and normalizes backslashes after onExecuted', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const node = makePreview3DNode()
+
+    await preview3DExt.nodeCreated(node)
+    node.onExecuted!({ result: ['sub\\nested\\mesh.glb'] })
+
+    expect(node.properties['Last Time Model File']).toBe('sub/nested/mesh.glb')
+    expect(configureMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        loadFolder: 'output',
+        silentOnNotFound: true
+      })
+    )
+  })
+
+  it('forwards bgImagePath to load3d.setBackgroundImage on execute', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const load3d = makeLoad3dMock()
+    waitForLoad3dMock.mockImplementation((cb: (l: FakeLoad3d) => void) =>
+      cb(load3d)
+    )
+    const node = makePreview3DNode()
+
+    await preview3DExt.nodeCreated(node)
+    node.onExecuted!({ result: ['mesh.glb', undefined, 'bg.png'] })
+
+    expect(load3d.setBackgroundImage).toHaveBeenCalledWith('bg.png')
+  })
+
+  it('applies camera matrices when load3d generation is unchanged', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const load3d = makeLoad3dMock()
+    load3d.currentLoadGeneration = 5
+    waitForLoad3dMock.mockImplementation((cb: (l: FakeLoad3d) => void) =>
+      cb(load3d)
+    )
+    const extrinsics = [
+      [1, 0, 0, 0],
+      [0, 1, 0, 0],
+      [0, 0, 1, 0],
+      [0, 0, 0, 1]
+    ]
+    const intrinsics = [
+      [1, 0, 0],
+      [0, 1, 0],
+      [0, 0, 1]
+    ]
+
+    const node = makePreview3DNode()
+    await preview3DExt.nodeCreated(node)
+    node.onExecuted!({
+      result: ['mesh.glb', undefined, undefined, extrinsics, intrinsics]
+    })
+    await flush()
+
+    expect(load3d.setCameraFromMatrices).toHaveBeenCalledWith(
+      extrinsics,
+      intrinsics
+    )
+  })
+
+  it('skips camera matrix application when load3d generation changes before whenLoadIdle resolves', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const load3d = makeLoad3dMock()
+    load3d.currentLoadGeneration = 5
+    let resolveIdle: () => void = () => {}
+    load3d.whenLoadIdle = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveIdle = resolve
+        })
+    )
+    waitForLoad3dMock.mockImplementation((cb: (l: FakeLoad3d) => void) =>
+      cb(load3d)
+    )
+
+    const node = makePreview3DNode()
+    await preview3DExt.nodeCreated(node)
+    node.onExecuted!({
+      result: ['mesh.glb', undefined, undefined, [[1]], [[1]]]
+    })
+
+    load3d.currentLoadGeneration = 6
+    resolveIdle()
+    await flush()
+
+    expect(load3d.setCameraFromMatrices).not.toHaveBeenCalled()
+  })
+
+  it('shows an error toast when onExecuted has no file path', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const node = makePreview3DNode()
+
+    await preview3DExt.nodeCreated(node)
+    node.onExecuted!({ result: [] })
+
+    expect(toastAddAlertMock).toHaveBeenCalledWith(
+      'toastMessages.unableToGetModelFilePath'
+    )
+  })
+})
+
+describe('Comfy.Load3D.nodeCreated', () => {
+  beforeEach(setupBaseMocks)
+
+  it('skips nodes whose comfyClass is not Load3D', async () => {
+    const { load3DExt } = await loadExtensionsFresh()
+    const node = makeLoad3DNode({ comfyClass: 'OtherNode' })
+
+    await load3DExt.nodeCreated(node)
+
+    expect(waitForLoad3dMock).not.toHaveBeenCalled()
+  })
+
+  it('configures with the input folder and width/height widgets', async () => {
+    const { load3DExt } = await loadExtensionsFresh()
+    const widgets: FakeWidget[] = [
+      { name: 'model_file', value: 'model.glb' },
+      { name: 'width', value: 1024 },
+      { name: 'height', value: 768 },
+      { name: 'image', value: '' }
+    ]
+    const node = makeLoad3DNode({ widgets })
+
+    await load3DExt.nodeCreated(node)
+
+    expect(configureMock).toHaveBeenCalledWith({
+      loadFolder: 'input',
+      modelWidget: widgets[0],
+      cameraState: undefined,
+      width: widgets[1],
+      height: widgets[2]
+    })
+  })
+
+  it('attaches a serializeValue function to the scene widget', async () => {
+    const { load3DExt } = await loadExtensionsFresh()
+    const widgets: FakeWidget[] = [
+      { name: 'model_file', value: '' },
+      { name: 'width', value: 512 },
+      { name: 'height', value: 512 },
+      { name: 'image', value: '' }
+    ]
+    const node = makeLoad3DNode({ widgets })
+
+    await load3DExt.nodeCreated(node)
+
+    expect(typeof widgets[3].serializeValue).toBe('function')
+  })
+
+  it('skips configure when required widgets are missing', async () => {
+    const { load3DExt } = await loadExtensionsFresh()
+    const node = makeLoad3DNode({
+      widgets: [{ name: 'model_file', value: '' }]
+    })
+
+    await load3DExt.nodeCreated(node)
+
+    expect(configureMock).not.toHaveBeenCalled()
+  })
+})
+
+describe('getNodeMenuItems', () => {
+  beforeEach(setupBaseMocks)
+
+  it('Comfy.Load3D returns [] for non-Load3D nodes', async () => {
+    const { load3DExt } = await loadExtensionsFresh()
+    const node = {
+      constructor: { comfyClass: 'OtherNode' }
+    } as unknown as LGraphNode
+
+    expect(load3DExt.getNodeMenuItems(node)).toEqual([])
+  })
+
+  it('Comfy.Preview3D returns [] for non-Preview3D nodes', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    const node = {
+      constructor: { comfyClass: 'OtherNode' }
+    } as unknown as LGraphNode
+
+    expect(preview3DExt.getNodeMenuItems(node)).toEqual([])
+  })
+
+  it('returns [] when no load3d instance exists for the node', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    getLoad3dMock.mockReturnValue(null)
+    const node = {
+      constructor: { comfyClass: 'Preview3D' }
+    } as unknown as LGraphNode
+
+    expect(preview3DExt.getNodeMenuItems(node)).toEqual([])
+  })
+
+  it('returns [] for splat models', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    getLoad3dMock.mockReturnValue({ isSplatModel: () => true })
+    const node = {
+      constructor: { comfyClass: 'Preview3D' }
+    } as unknown as LGraphNode
+
+    expect(preview3DExt.getNodeMenuItems(node)).toEqual([])
+  })
+
+  it('returns export menu items for non-splat 3D nodes', async () => {
+    const { preview3DExt } = await loadExtensionsFresh()
+    getLoad3dMock.mockReturnValue({ isSplatModel: () => false })
+    const node = {
+      constructor: { comfyClass: 'Preview3D' }
+    } as unknown as LGraphNode
+
+    expect(preview3DExt.getNodeMenuItems(node)).toEqual([{ content: 'Export' }])
+  })
+})
diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts
index 0a0fe143a2..4626587523 100644
--- a/src/extensions/core/load3d.ts
+++ b/src/extensions/core/load3d.ts
@@ -9,7 +9,10 @@ import type {
   CameraState
 } from '@/extensions/core/load3d/interfaces'
 import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
-import { SUPPORTED_EXTENSIONS_ACCEPT } from '@/extensions/core/load3d/constants'
+import {
+  LOAD3D_NONE_MODEL,
+  SUPPORTED_EXTENSIONS_ACCEPT
+} from '@/extensions/core/load3d/constants'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
@@ -290,13 +293,9 @@ useExtensionService().registerExtension({
         )
 
         node.addWidget('button', 'clear', 'clear', () => {
-          useLoad3d(node).waitForLoad3d((load3d) => {
-            load3d.clearModel()
-          })
-
           const modelWidget = node.widgets?.find((w) => w.name === 'model_file')
           if (modelWidget) {
-            modelWidget.value = ''
+            modelWidget.value = LOAD3D_NONE_MODEL
           }
         })
 
diff --git a/src/extensions/core/load3d/Load3DConfiguration.test.ts b/src/extensions/core/load3d/Load3DConfiguration.test.ts
index 0aa445673f..3f9638cca9 100644
--- a/src/extensions/core/load3d/Load3DConfiguration.test.ts
+++ b/src/extensions/core/load3d/Load3DConfiguration.test.ts
@@ -1,20 +1,27 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type Load3d from '@/extensions/core/load3d/Load3d'
-import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
+import Load3DConfiguration, {
+  parseAnnotatedFilename
+} from '@/extensions/core/load3d/Load3DConfiguration'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import type {
+  CameraConfig,
   GizmoConfig,
-  ModelConfig
+  LightConfig,
+  ModelConfig,
+  SceneConfig
 } from '@/extensions/core/load3d/interfaces'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import type { Dictionary } from '@/lib/litegraph/src/interfaces'
 import type { NodeProperty } from '@/lib/litegraph/src/LGraphNode'
 
+const { settingsGetMock } = vi.hoisted(() => ({
+  settingsGetMock: vi.fn()
+}))
+
 vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: () => ({
-    get: vi.fn()
-  })
+  useSettingStore: () => ({ get: settingsGetMock })
 }))
 
 vi.mock('@/scripts/api', () => ({
@@ -41,13 +48,22 @@ vi.mock('@/extensions/core/load3d/Load3dUtils', () => ({
   }
 }))
 
-type WithPrivate = { loadModelConfig(): ModelConfig }
+type WithPrivate = {
+  loadModelConfig(): ModelConfig
+  loadSceneConfig(): SceneConfig
+  loadCameraConfig(): CameraConfig
+  loadLightConfig(): LightConfig
+}
 
 function createConfig(properties?: Dictionary<NodeProperty | undefined>) {
   const load3d = {} as Load3d
   return new Load3DConfiguration(load3d, properties) as unknown as WithPrivate
 }
 
+function stubSettings(values: Record<string, unknown>) {
+  settingsGetMock.mockImplementation((key: string) => values[key])
+}
+
 const defaultGizmo: GizmoConfig = {
   enabled: false,
   mode: 'translate',
@@ -56,6 +72,13 @@ const defaultGizmo: GizmoConfig = {
   scale: { x: 1, y: 1, z: 1 }
 }
 
+const hdriDefaults = {
+  enabled: false,
+  hdriPath: '',
+  showAsBackground: false,
+  intensity: 1
+} as const
+
 describe('Load3DConfiguration.loadModelConfig', () => {
   afterEach(() => {
     vi.restoreAllMocks()
@@ -185,7 +208,8 @@ describe('Load3DConfiguration.silentOnNotFound propagation', () => {
       setLightIntensity: vi.fn(),
       setHDRIIntensity: vi.fn(),
       setHDRIAsBackground: vi.fn(),
-      setHDRIEnabled: vi.fn()
+      setHDRIEnabled: vi.fn(),
+      emitModelReady: vi.fn()
     } as unknown as Load3d
   }
 
@@ -248,4 +272,413 @@ describe('Load3DConfiguration.silentOnNotFound propagation', () => {
       silentOnNotFound: false
     })
   })
+
+  it('emits modelReady AFTER setCameraState so thumbnail capture sees the restored view', async () => {
+    const load3d = makeLoad3dMock()
+    const config = new Load3DConfiguration(load3d)
+    const cameraState = {
+      position: { x: 1, y: 2, z: 3 },
+      target: { x: 0, y: 0, z: 0 },
+      zoom: 1,
+      cameraType: 'perspective' as const
+    }
+    config.configure({
+      modelWidget: { value: 'model.glb' } as unknown as IBaseWidget,
+      loadFolder: 'output',
+      cameraState: cameraState as unknown as Parameters<
+        Load3DConfiguration['configure']
+      >[0]['cameraState']
+    })
+    await flush()
+
+    const setCameraStateMock = vi.mocked(load3d.setCameraState)
+    const emitModelReadyMock = vi.mocked(load3d.emitModelReady)
+    expect(setCameraStateMock).toHaveBeenCalledWith(cameraState)
+    expect(emitModelReadyMock).toHaveBeenCalledTimes(1)
+    expect(setCameraStateMock.mock.invocationCallOrder[0]).toBeLessThan(
+      emitModelReadyMock.mock.invocationCallOrder[0]
+    )
+  })
+
+  it('emits modelReady even when no saved cameraState is provided', async () => {
+    const load3d = makeLoad3dMock()
+    const config = new Load3DConfiguration(load3d)
+    config.configure({
+      modelWidget: { value: 'model.glb' } as unknown as IBaseWidget,
+      loadFolder: 'output'
+    })
+    await flush()
+    expect(vi.mocked(load3d.emitModelReady)).toHaveBeenCalledTimes(1)
+  })
+
+  it('configureForSaveMesh also emits modelReady once the load resolves', async () => {
+    const load3d = makeLoad3dMock()
+    const config = new Load3DConfiguration(load3d)
+    config.configureForSaveMesh('output', 'model.glb')
+    await flush()
+    expect(vi.mocked(load3d.emitModelReady)).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe('parseAnnotatedFilename', () => {
+  it('strips a [output] suffix and switches to the output folder', () => {
+    expect(parseAnnotatedFilename('foo.glb [output]', 'input')).toEqual({
+      filename: 'foo.glb',
+      folder: 'output'
+    })
+  })
+
+  it('strips a [input] suffix and switches to the input folder', () => {
+    expect(parseAnnotatedFilename('sub/foo.glb [input]', 'output')).toEqual({
+      filename: 'sub/foo.glb',
+      folder: 'input'
+    })
+  })
+
+  it('strips a [temp] suffix and switches to the temp folder', () => {
+    expect(parseAnnotatedFilename('foo.glb [temp]', 'input')).toEqual({
+      filename: 'foo.glb',
+      folder: 'temp'
+    })
+  })
+
+  it('returns the value unchanged with the fallback folder when unannotated', () => {
+    expect(parseAnnotatedFilename('foo.glb', 'input')).toEqual({
+      filename: 'foo.glb',
+      folder: 'input'
+    })
+  })
+
+  it('does not strip a non-folder annotation', () => {
+    expect(parseAnnotatedFilename('foo.glb [draft]', 'input')).toEqual({
+      filename: 'foo.glb [draft]',
+      folder: 'input'
+    })
+  })
+
+  it('only matches a trailing annotation, not one in the middle', () => {
+    expect(parseAnnotatedFilename('foo [output] bar.glb', 'input')).toEqual({
+      filename: 'foo [output] bar.glb',
+      folder: 'input'
+    })
+  })
+})
+
+describe('Load3DConfiguration.loadSceneConfig', () => {
+  beforeEach(() => {
+    settingsGetMock.mockReset()
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('returns the persisted Scene Config when present, ignoring settings', () => {
+    const stored: SceneConfig = {
+      showGrid: false,
+      backgroundColor: '#123456',
+      backgroundImage: 'bg.png'
+    }
+    const properties = { 'Scene Config': stored } as Dictionary<
+      NodeProperty | undefined
+    >
+    stubSettings({
+      'Comfy.Load3D.ShowGrid': true,
+      'Comfy.Load3D.BackgroundColor': 'aaaaaa'
+    })
+
+    expect(createConfig(properties).loadSceneConfig()).toEqual(stored)
+    expect(settingsGetMock).not.toHaveBeenCalled()
+  })
+
+  it('falls back to settings and prepends # to the background color', () => {
+    stubSettings({
+      'Comfy.Load3D.ShowGrid': false,
+      'Comfy.Load3D.BackgroundColor': 'abcdef'
+    })
+
+    expect(createConfig().loadSceneConfig()).toEqual({
+      showGrid: false,
+      backgroundColor: '#abcdef',
+      backgroundImage: ''
+    })
+  })
+})
+
+describe('Load3DConfiguration.loadCameraConfig', () => {
+  beforeEach(() => {
+    settingsGetMock.mockReset()
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('returns the persisted Camera Config when present', () => {
+    const stored: CameraConfig = {
+      cameraType: 'orthographic',
+      fov: 50
+    }
+    const properties = { 'Camera Config': stored } as Dictionary<
+      NodeProperty | undefined
+    >
+    stubSettings({ 'Comfy.Load3D.CameraType': 'perspective' })
+
+    expect(createConfig(properties).loadCameraConfig()).toEqual(stored)
+    expect(settingsGetMock).not.toHaveBeenCalled()
+  })
+
+  it('falls back to settings and a default fov of 35', () => {
+    stubSettings({ 'Comfy.Load3D.CameraType': 'perspective' })
+
+    expect(createConfig().loadCameraConfig()).toEqual({
+      cameraType: 'perspective',
+      fov: 35
+    })
+  })
+})
+
+describe('Load3DConfiguration.loadLightConfig', () => {
+  beforeEach(() => {
+    settingsGetMock.mockReset()
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('falls back to settings with default hdri when nothing is persisted', () => {
+    stubSettings({ 'Comfy.Load3D.LightIntensity': 4 })
+
+    expect(createConfig().loadLightConfig()).toEqual({
+      intensity: 4,
+      hdri: hdriDefaults
+    })
+  })
+
+  it('uses the persisted intensity over the setting when present', () => {
+    const stored: Partial<LightConfig> = { intensity: 7 }
+    const properties = { 'Light Config': stored } as Dictionary<
+      NodeProperty | undefined
+    >
+    stubSettings({ 'Comfy.Load3D.LightIntensity': 4 })
+
+    expect(createConfig(properties).loadLightConfig()).toEqual({
+      intensity: 7,
+      hdri: hdriDefaults
+    })
+  })
+
+  it('falls back to the setting intensity when persisted intensity is missing', () => {
+    const properties = { 'Light Config': {} } as Dictionary<
+      NodeProperty | undefined
+    >
+    stubSettings({ 'Comfy.Load3D.LightIntensity': 4 })
+
+    expect(createConfig(properties).loadLightConfig()).toEqual({
+      intensity: 4,
+      hdri: hdriDefaults
+    })
+  })
+
+  it('merges persisted hdri partial over hdri defaults', () => {
+    const stored: Partial<LightConfig> = {
+      intensity: 2,
+      hdri: { hdriPath: 'env.hdr', enabled: true } as LightConfig['hdri']
+    }
+    const properties = { 'Light Config': stored } as Dictionary<
+      NodeProperty | undefined
+    >
+
+    expect(createConfig(properties).loadLightConfig()).toEqual({
+      intensity: 2,
+      hdri: {
+        enabled: true,
+        hdriPath: 'env.hdr',
+        showAsBackground: false,
+        intensity: 1
+      }
+    })
+  })
+})
+
+describe('Load3DConfiguration.configure forwards persisted + settings to load3d', () => {
+  let load3d: Load3d
+
+  function makeLoad3dMock(): Load3d {
+    return {
+      loadModel: vi.fn().mockResolvedValue(undefined),
+      setUpDirection: vi.fn(),
+      setMaterialMode: vi.fn(),
+      setTargetSize: vi.fn(),
+      setCameraState: vi.fn(),
+      toggleGrid: vi.fn(),
+      setBackgroundColor: vi.fn(),
+      setBackgroundImage: vi.fn().mockResolvedValue(undefined),
+      setBackgroundRenderMode: vi.fn(),
+      toggleCamera: vi.fn(),
+      setFOV: vi.fn(),
+      setLightIntensity: vi.fn(),
+      setHDRIIntensity: vi.fn(),
+      setHDRIAsBackground: vi.fn(),
+      setHDRIEnabled: vi.fn(),
+      emitModelReady: vi.fn()
+    } as unknown as Load3d
+  }
+
+  async function flush() {
+    await new Promise<void>((resolve) => setTimeout(resolve, 0))
+  }
+
+  beforeEach(() => {
+    settingsGetMock.mockReset()
+    load3d = makeLoad3dMock()
+    vi.mocked(Load3dUtils.splitFilePath).mockReturnValue(['', 'model.glb'])
+    vi.mocked(Load3dUtils.getResourceURL).mockReturnValue('/view')
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('uses settings defaults when no Scene/Camera/Light Config is persisted', async () => {
+    stubSettings({
+      'Comfy.Load3D.ShowGrid': true,
+      'Comfy.Load3D.BackgroundColor': '282828',
+      'Comfy.Load3D.CameraType': 'orthographic',
+      'Comfy.Load3D.LightIntensity': 6
+    })
+
+    const config = new Load3DConfiguration(load3d)
+    config.configure({
+      modelWidget: { value: 'model.glb' } as unknown as IBaseWidget,
+      loadFolder: 'output'
+    })
+    await flush()
+
+    expect(load3d.toggleGrid).toHaveBeenCalledWith(true)
+    expect(load3d.setBackgroundColor).toHaveBeenCalledWith('#282828')
+    expect(load3d.toggleCamera).toHaveBeenCalledWith('orthographic')
+    expect(load3d.setFOV).toHaveBeenCalledWith(35)
+    expect(load3d.setLightIntensity).toHaveBeenCalledWith(6)
+  })
+
+  it('prefers persisted Scene/Camera/Light Config over settings', async () => {
+    const properties = {
+      'Scene Config': {
+        showGrid: false,
+        backgroundColor: '#101010',
+        backgroundImage: ''
+      },
+      'Camera Config': { cameraType: 'perspective', fov: 60 },
+      'Light Config': { intensity: 9 }
+    } as unknown as Dictionary<NodeProperty | undefined>
+    stubSettings({
+      'Comfy.Load3D.ShowGrid': true,
+      'Comfy.Load3D.BackgroundColor': '282828',
+      'Comfy.Load3D.CameraType': 'orthographic',
+      'Comfy.Load3D.LightIntensity': 1
+    })
+
+    const config = new Load3DConfiguration(load3d, properties)
+    config.configure({
+      modelWidget: { value: 'model.glb' } as unknown as IBaseWidget,
+      loadFolder: 'output'
+    })
+    await flush()
+
+    expect(load3d.toggleGrid).toHaveBeenCalledWith(false)
+    expect(load3d.setBackgroundColor).toHaveBeenCalledWith('#101010')
+    expect(load3d.toggleCamera).toHaveBeenCalledWith('perspective')
+    expect(load3d.setFOV).toHaveBeenCalledWith(60)
+    expect(load3d.setLightIntensity).toHaveBeenCalledWith(9)
+  })
+})
+
+describe('Load3DConfiguration "none" model handling', () => {
+  let load3d: Load3d
+  let loadModelSpy: ReturnType<typeof vi.fn>
+  let clearModelSpy: ReturnType<typeof vi.fn>
+
+  function makeLoad3dMock(): Load3d {
+    loadModelSpy = vi.fn().mockResolvedValue(undefined)
+    clearModelSpy = vi.fn()
+    return {
+      loadModel: loadModelSpy,
+      clearModel: clearModelSpy,
+      setUpDirection: vi.fn(),
+      setMaterialMode: vi.fn(),
+      setTargetSize: vi.fn(),
+      setCameraState: vi.fn(),
+      toggleGrid: vi.fn(),
+      setBackgroundColor: vi.fn(),
+      setBackgroundImage: vi.fn().mockResolvedValue(undefined),
+      setBackgroundRenderMode: vi.fn(),
+      toggleCamera: vi.fn(),
+      setFOV: vi.fn(),
+      setLightIntensity: vi.fn(),
+      setHDRIIntensity: vi.fn(),
+      setHDRIAsBackground: vi.fn(),
+      setHDRIEnabled: vi.fn(),
+      emitModelReady: vi.fn()
+    } as unknown as Load3d
+  }
+
+  async function flush() {
+    await new Promise<void>((resolve) => setTimeout(resolve, 0))
+  }
+
+  beforeEach(() => {
+    load3d = makeLoad3dMock()
+    vi.mocked(Load3dUtils.splitFilePath).mockReturnValue(['', 'model.glb'])
+    vi.mocked(Load3dUtils.getResourceURL).mockReturnValue('/view')
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('does not load or clear a model when the initial widget value is "none"', async () => {
+    const config = new Load3DConfiguration(load3d)
+    config.configure({
+      modelWidget: { value: 'none' } as unknown as IBaseWidget,
+      loadFolder: 'input'
+    })
+    await flush()
+
+    expect(loadModelSpy).not.toHaveBeenCalled()
+    expect(clearModelSpy).not.toHaveBeenCalled()
+  })
+
+  it('clears the model (and skips loadModel) when the widget value changes to "none"', async () => {
+    const config = new Load3DConfiguration(load3d)
+    const widget = { value: 'model.glb' } as unknown as IBaseWidget
+    config.configure({ modelWidget: widget, loadFolder: 'input' })
+    await flush()
+
+    loadModelSpy.mockClear()
+    clearModelSpy.mockClear()
+
+    widget.value = 'none'
+    await flush()
+
+    expect(clearModelSpy).toHaveBeenCalledTimes(1)
+    expect(loadModelSpy).not.toHaveBeenCalled()
+  })
+
+  it('loads a model when the widget value transitions from "none" to a real path', async () => {
+    const config = new Load3DConfiguration(load3d)
+    const widget = { value: 'none' } as unknown as IBaseWidget
+    config.configure({ modelWidget: widget, loadFolder: 'input' })
+    await flush()
+
+    expect(loadModelSpy).not.toHaveBeenCalled()
+
+    widget.value = 'model.glb'
+    await flush()
+
+    expect(loadModelSpy).toHaveBeenCalledWith(expect.any(String), 'model.glb', {
+      silentOnNotFound: false
+    })
+  })
 })
diff --git a/src/extensions/core/load3d/Load3DConfiguration.ts b/src/extensions/core/load3d/Load3DConfiguration.ts
index 2486e8472a..57e3da6453 100644
--- a/src/extensions/core/load3d/Load3DConfiguration.ts
+++ b/src/extensions/core/load3d/Load3DConfiguration.ts
@@ -1,3 +1,4 @@
+import { LOAD3D_NONE_MODEL } from '@/extensions/core/load3d/constants'
 import Load3d from '@/extensions/core/load3d/Load3d'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import type {
@@ -24,6 +25,20 @@ type Load3DConfigurationSettings = {
   silentOnNotFound?: boolean
 }
 
+const ANNOTATED_FILENAME_PATTERN = / \[(input|output|temp)\]$/
+
+export function parseAnnotatedFilename(
+  rawValue: string,
+  fallbackFolder: string
+): { filename: string; folder: string } {
+  const match = ANNOTATED_FILENAME_PATTERN.exec(rawValue)
+  if (!match) return { filename: rawValue, folder: fallbackFolder }
+  return {
+    filename: rawValue.slice(0, match.index),
+    folder: match[1]
+  }
+}
+
 class Load3DConfiguration {
   constructor(
     private load3d: Load3d,
@@ -80,7 +95,7 @@ class Load3DConfiguration {
     )
 
     if (filePath) {
-      onModelWidgetUpdate(filePath)
+      void onModelWidgetUpdate(filePath)
     }
   }
 
@@ -95,8 +110,8 @@ class Load3DConfiguration {
       cameraState,
       silentOnNotFound
     )
-    if (modelWidget.value) {
-      onModelWidgetUpdate(modelWidget.value)
+    if (modelWidget.value && modelWidget.value !== LOAD3D_NONE_MODEL) {
+      void onModelWidgetUpdate(modelWidget.value)
     }
 
     const originalCallback = modelWidget.callback
@@ -117,7 +132,7 @@ class Load3DConfiguration {
     })
 
     modelWidget.callback = (value: string | number | boolean | object) => {
-      onModelWidgetUpdate(value)
+      void onModelWidgetUpdate(value)
 
       if (originalCallback) {
         originalCallback(value)
@@ -266,16 +281,22 @@ class Load3DConfiguration {
   ) {
     let isFirstLoad = true
     return async (value: string | number | boolean | object) => {
-      if (!value) return
+      if (!value || value === LOAD3D_NONE_MODEL) {
+        this.load3d.clearModel()
+        return
+      }
 
-      const filename = value as string
+      const { filename, folder } = parseAnnotatedFilename(
+        value as string,
+        loadFolder
+      )
 
       this.setResourceFolder(filename)
 
       const modelUrl = api.apiURL(
         Load3dUtils.getResourceURL(
           ...Load3dUtils.splitFilePath(filename),
-          loadFolder
+          folder
         )
       )
 
@@ -292,6 +313,8 @@ class Load3DConfiguration {
         }
         isFirstLoad = false
       }
+
+      this.load3d.emitModelReady()
     }
   }
 
diff --git a/src/extensions/core/load3d/Load3d.test.ts b/src/extensions/core/load3d/Load3d.test.ts
index 7cf76122e0..dd0d2bb1a3 100644
--- a/src/extensions/core/load3d/Load3d.test.ts
+++ b/src/extensions/core/load3d/Load3d.test.ts
@@ -83,6 +83,7 @@ function makeInstance() {
   // and ViewHelper, none of which are available in happy-dom. Skip it and
   // inject stubs directly onto the prototype instance so delegation methods
   // can be exercised in isolation.
+  const eventManager = { emitEvent: vi.fn() }
   const load3d = Object.create(Load3d.prototype) as Load3d
   Object.assign(load3d, {
     gizmoManager: gizmo,
@@ -92,6 +93,7 @@ function makeInstance() {
     controlsManager,
     viewHelperManager,
     animationManager,
+    eventManager,
     adapterRef: { current: null },
     forceRender: vi.fn(),
     handleResize: vi.fn()
@@ -106,6 +108,7 @@ function makeInstance() {
     controlsManager,
     viewHelperManager,
     animationManager,
+    eventManager,
     forceRender: load3d.forceRender as ReturnType<typeof vi.fn>
   }
 }
@@ -133,7 +136,7 @@ describe('Load3d', () => {
       expect(ctx.forceRender).toHaveBeenCalledOnce()
     })
 
-    it.each(['translate', 'rotate', 'scale'] as const)(
+    it.for(['translate', 'rotate', 'scale'] as const)(
       'setGizmoMode delegates "%s" and forces a render',
       (mode: GizmoMode) => {
         ctx.load3d.setGizmoMode(mode)
@@ -280,7 +283,7 @@ describe('Load3d', () => {
       const sceneResize = vi.fn()
 
       Object.assign(ctx.load3d, {
-        renderer: { domElement: canvas, setSize },
+        renderer: { domElement: canvas, setSize, setPixelRatio: vi.fn() },
         targetWidth: 400,
         targetHeight: 200,
         targetAspectRatio: 2,
@@ -383,6 +386,70 @@ describe('Load3d', () => {
       expect(args[2]).toBe(800)
       expect(args[3]).toBe(400)
     })
+
+    it('handleResize calls setPixelRatio with the value returned by getZoomScaleCallback', () => {
+      delete (ctx.load3d as { handleResize?: unknown }).handleResize
+
+      const parent = document.createElement('div')
+      Object.defineProperty(parent, 'clientWidth', {
+        value: 400,
+        configurable: true
+      })
+      Object.defineProperty(parent, 'clientHeight', {
+        value: 400,
+        configurable: true
+      })
+      const canvas = document.createElement('canvas')
+      parent.appendChild(canvas)
+
+      const setPixelRatio = vi.fn()
+
+      Object.assign(ctx.load3d, {
+        renderer: { domElement: canvas, setSize: vi.fn(), setPixelRatio },
+        getZoomScaleCallback: () => 2.5,
+        targetWidth: 0,
+        targetHeight: 0,
+        isViewerMode: false,
+        cameraManager: { ...ctx.cameraManager, handleResize: vi.fn() },
+        sceneManager: { ...ctx.sceneManager, handleResize: vi.fn() }
+      })
+
+      ctx.load3d.handleResize()
+
+      expect(setPixelRatio).toHaveBeenCalledWith(2.5)
+    })
+
+    it('handleResize defaults to pixelRatio 1 when no getZoomScaleCallback is provided', () => {
+      delete (ctx.load3d as { handleResize?: unknown }).handleResize
+
+      const parent = document.createElement('div')
+      Object.defineProperty(parent, 'clientWidth', {
+        value: 400,
+        configurable: true
+      })
+      Object.defineProperty(parent, 'clientHeight', {
+        value: 400,
+        configurable: true
+      })
+      const canvas = document.createElement('canvas')
+      parent.appendChild(canvas)
+
+      const setPixelRatio = vi.fn()
+
+      Object.assign(ctx.load3d, {
+        renderer: { domElement: canvas, setSize: vi.fn(), setPixelRatio },
+        getZoomScaleCallback: undefined,
+        targetWidth: 0,
+        targetHeight: 0,
+        isViewerMode: false,
+        cameraManager: { ...ctx.cameraManager, handleResize: vi.fn() },
+        sceneManager: { ...ctx.sceneManager, handleResize: vi.fn() }
+      })
+
+      ctx.load3d.handleResize()
+
+      expect(setPixelRatio).toHaveBeenCalledWith(1)
+    })
   })
 
   describe('render loop wiring', () => {
@@ -700,4 +767,86 @@ describe('Load3d', () => {
       expect(ctx.gizmo.ensureHelperInScene).toHaveBeenCalledOnce()
     })
   })
+
+  describe('emitModelReady', () => {
+    it('emits a modelReady event on the eventManager', () => {
+      ctx.load3d.emitModelReady()
+      expect(ctx.eventManager.emitEvent).toHaveBeenCalledWith(
+        'modelReady',
+        null
+      )
+    })
+  })
+
+  describe('captureThumbnail', () => {
+    function setupForCapture() {
+      const cameraStub = {
+        toggleCamera: vi.fn(),
+        getCurrentCameraType: vi.fn().mockReturnValue('perspective'),
+        getCameraState: vi.fn().mockReturnValue({
+          position: { x: 1, y: 2, z: 3 },
+          target: { x: 0, y: 0, z: 0 },
+          zoom: 1,
+          cameraType: 'perspective'
+        }),
+        setCameraState: vi.fn(),
+        perspectiveCamera: new THREE.PerspectiveCamera()
+      }
+      const controlsStub = {
+        controls: { target: { copy: vi.fn() }, update: vi.fn() }
+      }
+      const sceneCaptureMock = vi.fn().mockResolvedValue({
+        scene: 'data:image/png;base64,scene',
+        mask: 'm',
+        normal: 'n'
+      })
+      const modelGroup = new THREE.Group()
+      modelGroup.add(new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1)))
+      Object.assign(ctx.load3d, {
+        cameraManager: cameraStub,
+        controlsManager: controlsStub,
+        sceneManager: {
+          ...ctx.sceneManager,
+          gridHelper: { visible: true },
+          captureScene: sceneCaptureMock
+        },
+        modelManager: {
+          ...ctx.modelManager,
+          currentModel: modelGroup
+        }
+      })
+      return { cameraStub, sceneCaptureMock }
+    }
+
+    it('throws when no model is loaded', async () => {
+      Object.assign(ctx.load3d, {
+        modelManager: { ...ctx.modelManager, currentModel: null }
+      })
+
+      await expect(ctx.load3d.captureThumbnail()).rejects.toThrow(
+        'No model loaded for thumbnail capture'
+      )
+    })
+
+    it('forces a render after restoring camera state so the visible canvas reflects the live scene, not the offscreen capture', async () => {
+      const { cameraStub } = setupForCapture()
+
+      const result = await ctx.load3d.captureThumbnail(64, 64)
+
+      expect(result).toBe('data:image/png;base64,scene')
+      expect(cameraStub.setCameraState).toHaveBeenCalled()
+      // forceRender must be called AFTER the live state has been restored.
+      const setCameraOrder = cameraStub.setCameraState.mock.invocationCallOrder
+      const forceRenderOrder = ctx.forceRender.mock.invocationCallOrder
+      expect(forceRenderOrder.at(-1)).toBeGreaterThan(setCameraOrder.at(-1)!)
+    })
+
+    it('still forces a render in finally when captureScene rejects', async () => {
+      const { sceneCaptureMock } = setupForCapture()
+      sceneCaptureMock.mockRejectedValueOnce(new Error('boom'))
+
+      await expect(ctx.load3d.captureThumbnail(64, 64)).rejects.toThrow('boom')
+      expect(ctx.forceRender).toHaveBeenCalled()
+    })
+  })
 })
diff --git a/src/extensions/core/load3d/Load3d.ts b/src/extensions/core/load3d/Load3d.ts
index 28579297ed..7915a798ae 100644
--- a/src/extensions/core/load3d/Load3d.ts
+++ b/src/extensions/core/load3d/Load3d.ts
@@ -102,6 +102,7 @@ class Load3d {
 
   private disposeContextMenuGuard: (() => void) | null = null
   private resizeObserver: ResizeObserver | null = null
+  private getZoomScaleCallback: (() => number) | undefined
 
   constructor(
     container: Element | HTMLElement,
@@ -112,6 +113,7 @@ class Load3d {
     this.isViewerMode = options.isViewerMode || false
     this.onContextMenuCallback = options.onContextMenu
     this.getDimensionsCallback = options.getDimensions
+    this.getZoomScaleCallback = options.getZoomScale
 
     if (options.width && options.height) {
       this.targetWidth = options.width
@@ -630,6 +632,10 @@ class Load3d {
     this.eventManager.removeEventListener(event, callback)
   }
 
+  emitModelReady(): void {
+    this.eventManager.emitEvent('modelReady', null)
+  }
+
   refreshViewport(): void {
     this.handleResize()
   }
@@ -645,6 +651,11 @@ class Load3d {
     const containerWidth = parentElement.clientWidth
     const containerHeight = parentElement.clientHeight
 
+    // Scale pixel density to match the graph zoom level so the 3D scene
+    // renders at the correct resolution when the canvas is zoomed in or out.
+    const zoomScale = this.getZoomScaleCallback?.() ?? 1
+    this.renderer.setPixelRatio(Math.min(zoomScale, 3))
+
     if (this.getDimensionsCallback) {
       const dims = this.getDimensionsCallback()
       if (dims) {
@@ -805,6 +816,8 @@ class Load3d {
       }
       this.cameraManager.setCameraState(savedState)
       this.controlsManager.controls?.update()
+
+      this.forceRender()
     }
   }
 
diff --git a/src/extensions/core/load3d/LoaderManager.test.ts b/src/extensions/core/load3d/LoaderManager.test.ts
index ca4b636f9d..79a0f504d1 100644
--- a/src/extensions/core/load3d/LoaderManager.test.ts
+++ b/src/extensions/core/load3d/LoaderManager.test.ts
@@ -241,7 +241,7 @@ describe('LoaderManager', () => {
   })
 
   describe('pickAdapter', () => {
-    it.each(['stl', 'fbx', 'obj', 'gltf', 'glb'])(
+    it.for(['stl', 'fbx', 'obj', 'gltf', 'glb'])(
       'routes %s to the mesh adapter',
       (ext) => {
         const { pick } = makeLoaderManager()
@@ -249,7 +249,7 @@ describe('LoaderManager', () => {
       }
     )
 
-    it.each(['spz', 'splat', 'ksplat'])(
+    it.for(['spz', 'splat', 'ksplat'])(
       'routes %s to the splat adapter',
       (ext) => {
         const { pick } = makeLoaderManager()
diff --git a/src/extensions/core/load3d/SceneManager.test.ts b/src/extensions/core/load3d/SceneManager.test.ts
index c087f27681..6a70c49025 100644
--- a/src/extensions/core/load3d/SceneManager.test.ts
+++ b/src/extensions/core/load3d/SceneManager.test.ts
@@ -25,6 +25,37 @@ vi.mock('three', async (importOriginal) => {
   return { ...actual, TextureLoader: StubTextureLoader }
 })
 
+vi.mock('three/examples/jsm/controls/OrbitControls', () => {
+  class OrbitControls {}
+  return { OrbitControls }
+})
+
+function makeMockRenderer(pixelRatio = 1): THREE.WebGLRenderer {
+  const domElement = {
+    toDataURL: vi.fn().mockReturnValue('data:image/png;base64,abc'),
+    clientWidth: 400,
+    clientHeight: 300
+  }
+  return {
+    domElement,
+    outputColorSpace: THREE.SRGBColorSpace,
+    toneMapping: THREE.ACESFilmicToneMapping,
+    toneMappingExposure: 1,
+    getSize: vi.fn((v: THREE.Vector2) => {
+      v.set(400, 300)
+      return v
+    }),
+    getPixelRatio: vi.fn().mockReturnValue(pixelRatio),
+    getClearColor: vi.fn((c: THREE.Color) => c),
+    getClearAlpha: vi.fn().mockReturnValue(0),
+    setPixelRatio: vi.fn(),
+    setSize: vi.fn(),
+    setClearColor: vi.fn(),
+    clear: vi.fn(),
+    render: vi.fn()
+  } as unknown as THREE.WebGLRenderer
+}
+
 function makeMockEventManager() {
   return {
     addEventListener: vi.fn(),
@@ -50,6 +81,12 @@ function makeRenderer() {
     domElement: canvas,
     setClearColor: vi.fn(),
     setSize: vi.fn(),
+    getSize: vi.fn((v: THREE.Vector2) => {
+      v.set(800, 600)
+      return v
+    }),
+    getPixelRatio: vi.fn().mockReturnValue(1),
+    setPixelRatio: vi.fn(),
     render: vi.fn(),
     clear: vi.fn(),
     getClearColor: vi.fn().mockReturnValue(new THREE.Color(0xffffff)),
@@ -544,3 +581,90 @@ describe('SceneManager', () => {
     })
   })
 })
+
+function makeSceneManager(
+  pixelRatio = 1,
+  cameraOverride?: THREE.PerspectiveCamera | THREE.OrthographicCamera
+) {
+  const renderer = makeMockRenderer(pixelRatio)
+  const camera = cameraOverride ?? new THREE.PerspectiveCamera()
+  const eventManager = makeMockEventManager()
+  const manager = new SceneManager(
+    renderer,
+    () => camera,
+    vi.fn() as unknown as () => InstanceType<
+      typeof import('three/examples/jsm/controls/OrbitControls').OrbitControls
+    >,
+    eventManager
+  )
+  return { manager, renderer, camera, eventManager }
+}
+
+describe('SceneManager.captureScene', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('resolves with scene, mask, and normal data URLs', async () => {
+    const { manager } = makeSceneManager()
+    const result = await manager.captureScene(800, 600)
+    expect(result.scene).toContain('data:image/png')
+    expect(result.mask).toContain('data:image/png')
+    expect(result.normal).toContain('data:image/png')
+  })
+
+  it('forces pixel ratio to 1 before rendering regardless of original value', async () => {
+    const { manager, renderer } = makeSceneManager(2)
+    await manager.captureScene(800, 600)
+    expect(vi.mocked(renderer.setPixelRatio).mock.calls[0]).toEqual([1])
+  })
+
+  it('restores original pixel ratio after capture completes', async () => {
+    const originalPixelRatio = 3
+    const { manager, renderer } = makeSceneManager(originalPixelRatio)
+    await manager.captureScene(800, 600)
+    const calls = vi.mocked(renderer.setPixelRatio).mock.calls
+    expect(calls.at(-1)).toEqual([originalPixelRatio])
+  })
+
+  it('renders at requested capture dimensions', async () => {
+    const { manager, renderer } = makeSceneManager()
+    await manager.captureScene(1920, 1080)
+    expect(vi.mocked(renderer.setSize).mock.calls[0]).toEqual([1920, 1080])
+  })
+
+  it('restores original renderer size after capture', async () => {
+    const { manager, renderer } = makeSceneManager()
+    await manager.captureScene(1920, 1080)
+    const calls = vi.mocked(renderer.setSize).mock.calls
+    expect(calls.at(-1)).toEqual([400, 300])
+  })
+
+  it('restores perspective camera aspect after capture', async () => {
+    const camera = new THREE.PerspectiveCamera(75, 1, 0.1, 1000)
+    const { manager } = makeSceneManager(1, camera)
+    const originalAspect = camera.aspect
+    await manager.captureScene(800, 600)
+    expect(camera.aspect).toBe(originalAspect)
+  })
+
+  it('restores orthographic camera bounds after capture', async () => {
+    const camera = new THREE.OrthographicCamera(-5, 5, 5, -5, 0.1, 1000)
+    const { manager } = makeSceneManager(1, camera)
+    await manager.captureScene(800, 600)
+    expect(camera.left).toBe(-5)
+    expect(camera.right).toBe(5)
+    expect(camera.top).toBe(5)
+    expect(camera.bottom).toBe(-5)
+  })
+
+  it('disposes each temporary MeshNormalMaterial after the normal pass', async () => {
+    const { manager } = makeSceneManager()
+    manager.scene.add(
+      new THREE.Mesh(new THREE.BoxGeometry(), new THREE.MeshBasicMaterial())
+    )
+    const disposeSpy = vi.spyOn(THREE.MeshNormalMaterial.prototype, 'dispose')
+    await manager.captureScene(800, 600)
+    expect(disposeSpy).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/extensions/core/load3d/SceneManager.ts b/src/extensions/core/load3d/SceneManager.ts
index a9600b1f86..86c30200d2 100644
--- a/src/extensions/core/load3d/SceneManager.ts
+++ b/src/extensions/core/load3d/SceneManager.ts
@@ -332,120 +332,138 @@ export class SceneManager implements SceneManagerInterface {
     }
   }
 
-  captureScene(
+  async captureScene(
     width: number,
     height: number
   ): Promise<{ scene: string; mask: string; normal: string }> {
-    return new Promise(async (resolve, reject) => {
-      try {
-        const originalWidth = this.renderer.domElement.width
-        const originalHeight = this.renderer.domElement.height
-        const originalClearColor = this.renderer.getClearColor(
-          new THREE.Color()
-        )
-        const originalClearAlpha = this.renderer.getClearAlpha()
-        const originalOutputColorSpace = this.renderer.outputColorSpace
+    const originalSize = new THREE.Vector2()
+    this.renderer.getSize(originalSize)
+    const originalPixelRatio = this.renderer.getPixelRatio()
+    const originalClearColor = this.renderer.getClearColor(new THREE.Color())
+    const originalClearAlpha = this.renderer.getClearAlpha()
+    const originalOutputColorSpace = this.renderer.outputColorSpace
 
-        this.renderer.setSize(width, height)
-
-        if (this.getActiveCamera() instanceof THREE.PerspectiveCamera) {
-          const perspectiveCamera =
-            this.getActiveCamera() as THREE.PerspectiveCamera
-
-          perspectiveCamera.aspect = width / height
-          perspectiveCamera.updateProjectionMatrix()
-        } else {
-          const orthographicCamera =
-            this.getActiveCamera() as THREE.OrthographicCamera
-
-          const frustumSize = 10
-          const aspect = width / height
-
-          orthographicCamera.left = (-frustumSize * aspect) / 2
-          orthographicCamera.right = (frustumSize * aspect) / 2
-          orthographicCamera.top = frustumSize / 2
-          orthographicCamera.bottom = -frustumSize / 2
-
-          orthographicCamera.updateProjectionMatrix()
-        }
-
-        if (
-          this.backgroundTexture &&
-          this.backgroundMesh &&
-          this.currentBackgroundType === 'image'
-        ) {
-          this.updateBackgroundSize(
-            this.backgroundTexture,
-            this.backgroundMesh,
-            width,
-            height
-          )
-        }
-
-        const originalMaterials = new Map<
-          THREE.Mesh,
-          THREE.Material | THREE.Material[]
-        >()
-
-        this.renderer.clear()
-        this.renderBackground()
-        this.renderer.render(this.scene, this.getActiveCamera())
-        const sceneData = this.renderer.domElement.toDataURL('image/png')
-
-        this.renderer.setClearColor(0x000000, 0)
-        this.renderer.clear()
-        this.renderer.render(this.scene, this.getActiveCamera())
-        const maskData = this.renderer.domElement.toDataURL('image/png')
-
-        this.scene.traverse((child) => {
-          if (child instanceof THREE.Mesh) {
-            originalMaterials.set(child, child.material)
-
-            child.material = new THREE.MeshNormalMaterial({
-              flatShading: false,
-              side: THREE.DoubleSide,
-              normalScale: new THREE.Vector2(1, 1)
-            })
+    const activeCamera = this.getActiveCamera()
+    const savedCameraParams =
+      activeCamera instanceof THREE.PerspectiveCamera
+        ? { type: 'perspective' as const, aspect: activeCamera.aspect }
+        : {
+            type: 'orthographic' as const,
+            left: (activeCamera as THREE.OrthographicCamera).left,
+            right: (activeCamera as THREE.OrthographicCamera).right,
+            top: (activeCamera as THREE.OrthographicCamera).top,
+            bottom: (activeCamera as THREE.OrthographicCamera).bottom
           }
-        })
 
-        const gridVisible = this.gridHelper.visible
-        this.gridHelper.visible = false
+    const originalMaterials = new Map<
+      THREE.Mesh,
+      THREE.Material | THREE.Material[]
+    >()
+    const tempMaterials: THREE.MeshNormalMaterial[] = []
+    const gridVisible = this.gridHelper.visible
 
-        this.renderer.setClearColor(0x000000, 1)
-        this.renderer.clear()
-        this.renderer.render(this.scene, this.getActiveCamera())
-        const normalData = this.renderer.domElement.toDataURL('image/png')
+    try {
+      // Capture at exactly the requested pixel dimensions, independent of
+      // the current zoom-driven pixel ratio.
+      this.renderer.setPixelRatio(1)
+      this.renderer.setSize(width, height)
 
-        this.scene.traverse((child) => {
-          if (child instanceof THREE.Mesh) {
-            const originalMaterial = originalMaterials.get(child)
-            if (originalMaterial) {
-              child.material = originalMaterial
-            }
-          }
-        })
+      if (activeCamera instanceof THREE.PerspectiveCamera) {
+        activeCamera.aspect = width / height
+        activeCamera.updateProjectionMatrix()
+      } else {
+        const orthographicCamera = activeCamera as THREE.OrthographicCamera
 
-        this.renderer.setClearColor(0xffffff, 1)
-        this.renderer.clear()
+        const frustumSize = 10
+        const aspect = width / height
 
-        this.gridHelper.visible = gridVisible
+        orthographicCamera.left = (-frustumSize * aspect) / 2
+        orthographicCamera.right = (frustumSize * aspect) / 2
+        orthographicCamera.top = frustumSize / 2
+        orthographicCamera.bottom = -frustumSize / 2
 
-        this.renderer.setClearColor(originalClearColor, originalClearAlpha)
-        this.renderer.setSize(originalWidth, originalHeight)
-        this.renderer.outputColorSpace = originalOutputColorSpace
-
-        this.handleResize(originalWidth, originalHeight)
-
-        resolve({
-          scene: sceneData,
-          mask: maskData,
-          normal: normalData
-        })
-      } catch (error) {
-        reject(error)
+        orthographicCamera.updateProjectionMatrix()
       }
-    })
+
+      if (
+        this.backgroundTexture &&
+        this.backgroundMesh &&
+        this.currentBackgroundType === 'image'
+      ) {
+        this.updateBackgroundSize(
+          this.backgroundTexture,
+          this.backgroundMesh,
+          width,
+          height
+        )
+      }
+
+      this.renderer.clear()
+      this.renderBackground()
+      this.renderer.render(this.scene, activeCamera)
+      const sceneData = this.renderer.domElement.toDataURL('image/png')
+
+      this.renderer.setClearColor(0x000000, 0)
+      this.renderer.clear()
+      this.renderer.render(this.scene, activeCamera)
+      const maskData = this.renderer.domElement.toDataURL('image/png')
+
+      this.scene.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          originalMaterials.set(child, child.material)
+
+          const tempMaterial = new THREE.MeshNormalMaterial({
+            flatShading: false,
+            side: THREE.DoubleSide,
+            normalScale: new THREE.Vector2(1, 1)
+          })
+          tempMaterials.push(tempMaterial)
+          child.material = tempMaterial
+        }
+      })
+
+      this.gridHelper.visible = false
+
+      this.renderer.setClearColor(0x000000, 1)
+      this.renderer.clear()
+      this.renderer.render(this.scene, activeCamera)
+      const normalData = this.renderer.domElement.toDataURL('image/png')
+
+      this.renderer.setClearColor(0xffffff, 1)
+      this.renderer.clear()
+
+      return { scene: sceneData, mask: maskData, normal: normalData }
+    } finally {
+      this.scene.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          const originalMaterial = originalMaterials.get(child)
+          if (originalMaterial) {
+            child.material = originalMaterial
+          }
+        }
+      })
+      for (const mat of tempMaterials) {
+        mat.dispose()
+      }
+      this.gridHelper.visible = gridVisible
+      if (savedCameraParams.type === 'perspective') {
+        const persp = activeCamera as THREE.PerspectiveCamera
+        persp.aspect = savedCameraParams.aspect
+        persp.updateProjectionMatrix()
+      } else {
+        const ortho = activeCamera as THREE.OrthographicCamera
+        ortho.left = savedCameraParams.left
+        ortho.right = savedCameraParams.right
+        ortho.top = savedCameraParams.top
+        ortho.bottom = savedCameraParams.bottom
+        ortho.updateProjectionMatrix()
+      }
+      this.renderer.setClearColor(originalClearColor, originalClearAlpha)
+      this.renderer.setPixelRatio(originalPixelRatio)
+      this.renderer.setSize(originalSize.x, originalSize.y)
+      this.renderer.outputColorSpace = originalOutputColorSpace
+      this.handleResize(originalSize.x, originalSize.y)
+    }
   }
 
   reset(): void {}
diff --git a/src/extensions/core/load3d/SceneModelManager.test.ts b/src/extensions/core/load3d/SceneModelManager.test.ts
index cc9e122980..8db052d23f 100644
--- a/src/extensions/core/load3d/SceneModelManager.test.ts
+++ b/src/extensions/core/load3d/SceneModelManager.test.ts
@@ -211,20 +211,40 @@ describe('SceneModelManager', () => {
       expect(setupCamera).toHaveBeenCalled()
     })
 
-    it('does not skip materialMode when it differs from original', async () => {
+    it('reapplies non-original materialMode after snapshotting', async () => {
       const { manager } = createManager()
       const model = createMeshModel()
 
-      // setupModel checks materialMode !== 'original' and calls
-      // setMaterialMode, but the guard `mode === this.materialMode`
-      // causes it to no-op. Then setupModelMaterials resets to 'original'.
+      // setupModel calls setupModelMaterials first (which internally calls
+      // setMaterialMode('original') to reset), then reapplies the stored mode.
       manager.materialMode = 'wireframe'
       const spy = vi.spyOn(manager, 'setMaterialMode')
       await manager.setupModel(model)
 
-      // setMaterialMode is called with the stored mode and then 'original'
-      expect(spy).toHaveBeenCalledWith('wireframe')
       expect(spy).toHaveBeenCalledWith('original')
+      expect(spy).toHaveBeenCalledWith('wireframe')
+      // The final material mode visible on the mesh should be wireframe.
+      const mesh = model.children[0] as THREE.Mesh
+      expect((mesh.material as THREE.MeshBasicMaterial).wireframe).toBe(true)
+    })
+
+    it('snapshots original materials before applying materialMode so restore is correct', async () => {
+      const { manager } = createManager()
+      const model = createMeshModel()
+      const mesh = model.children[0] as THREE.Mesh
+      const originalMat = mesh.material
+
+      // Set a non-original mode before loading — this was the bug:
+      // originalMaterials would capture the wireframe material instead of the real one.
+      manager.materialMode = 'wireframe'
+      await manager.setupModel(model)
+
+      // The snapshot must hold the *pre-mutation* material.
+      expect(manager.originalMaterials.get(mesh)).toBe(originalMat)
+
+      // Restoring to 'original' must give back the true original, not wireframe.
+      manager.setMaterialMode('original')
+      expect(mesh.material).toBe(originalMat)
     })
 
     it('applies current up direction if not original', async () => {
@@ -679,6 +699,80 @@ describe('SceneModelManager', () => {
     })
   })
 
+  describe('fitToViewer', () => {
+    it('does nothing when no current model', () => {
+      const { manager, setupCamera, setupGizmo } = createManager()
+
+      manager.fitToViewer()
+
+      expect(setupCamera).not.toHaveBeenCalled()
+      expect(setupGizmo).not.toHaveBeenCalled()
+    })
+
+    it('reapplies currentUpDirection after fitting', async () => {
+      const { manager, eventManager } = createManager()
+      const model = createMeshModel()
+      await manager.setupModel(model)
+
+      manager.setUpDirection('+z')
+      vi.mocked(eventManager.emitEvent).mockClear()
+
+      manager.fitToViewer()
+
+      // rotation.x should reflect +z direction (-PI/2) applied to the post-fit base (0,0,0)
+      expect(model.rotation.x).toBeCloseTo(-Math.PI / 2)
+      expect(eventManager.emitEvent).toHaveBeenCalledWith(
+        'upDirectionChange',
+        '+z'
+      )
+    })
+
+    it('does not compound rotations when fitToViewer is called multiple times', async () => {
+      const { manager } = createManager()
+      const model = createMeshModel()
+      await manager.setupModel(model)
+
+      manager.setUpDirection('-x')
+
+      manager.fitToViewer()
+      const rotationAfterFirst = model.rotation.z
+
+      manager.fitToViewer()
+      expect(model.rotation.z).toBeCloseTo(rotationAfterFirst)
+    })
+
+    it('leaves rotation at zero when currentUpDirection is original', async () => {
+      const { manager } = createManager()
+      const model = createMeshModel()
+      await manager.setupModel(model)
+
+      manager.fitToViewer()
+
+      expect(model.rotation.x).toBeCloseTo(0)
+      expect(model.rotation.y).toBeCloseTo(0)
+      expect(model.rotation.z).toBeCloseTo(0)
+    })
+
+    it('does not compound rotation when fitToViewer is called after manual rotation override', async () => {
+      const { manager } = createManager()
+      const model = createMeshModel()
+      await manager.setupModel(model)
+
+      // Set an up direction, then manually override originalRotation to simulate
+      // a prior state where the base rotation was non-zero before fit
+      manager.setUpDirection('+x')
+      // Simulate that originalRotation was captured at a non-zero rotation
+      manager.originalRotation = new THREE.Euler(0.5, 0.3, 0.1)
+
+      manager.fitToViewer()
+
+      // After fit, the rotation should be correct for +x direction applied to (0,0,0) base
+      // Not compounded with the stale originalRotation
+      expect(model.rotation.x).toBeCloseTo(0)
+      expect(model.rotation.z).toBeCloseTo(-Math.PI / 2)
+    })
+  })
+
   describe('PLY mode switching', () => {
     function createPLYManager() {
       const ctx = createManager({
diff --git a/src/extensions/core/load3d/SceneModelManager.ts b/src/extensions/core/load3d/SceneModelManager.ts
index 5743a4e609..766fd0b243 100644
--- a/src/extensions/core/load3d/SceneModelManager.ts
+++ b/src/extensions/core/load3d/SceneModelManager.ts
@@ -447,15 +447,16 @@ export class SceneModelManager implements ModelManagerInterface {
     }
 
     this.scene.add(model)
+    const pendingMaterialMode = this.materialMode
+    this.setupModelMaterials(model)
 
-    if (this.materialMode !== 'original') {
-      this.setMaterialMode(this.materialMode)
+    if (pendingMaterialMode !== 'original') {
+      this.setMaterialMode(pendingMaterialMode)
     }
 
     if (this.currentUpDirection !== 'original') {
       this.setUpDirection(this.currentUpDirection)
     }
-    this.setupModelMaterials(model)
 
     const box = this.computeWorldBounds(model)
     const size = box.getSize(new THREE.Vector3())
@@ -491,6 +492,13 @@ export class SceneModelManager implements ModelManagerInterface {
 
     model.position.set(-center.x, -scaledBox.min.y, -center.z)
 
+    // fitToViewer resets rotation to (0,0,0), so originalRotation must be cleared
+    // before reapplying currentUpDirection to avoid compounding rotations.
+    this.originalRotation = null
+    if (this.currentUpDirection !== 'original') {
+      this.setUpDirection(this.currentUpDirection)
+    }
+
     const newBox = this.computeWorldBounds(model)
     const newSize = newBox.getSize(new THREE.Vector3())
     const newCenter = newBox.getCenter(new THREE.Vector3())
diff --git a/src/extensions/core/load3d/cameraFromMatrices.test.ts b/src/extensions/core/load3d/cameraFromMatrices.test.ts
index 0b71520b5a..0d6a50047d 100644
--- a/src/extensions/core/load3d/cameraFromMatrices.test.ts
+++ b/src/extensions/core/load3d/cameraFromMatrices.test.ts
@@ -132,13 +132,13 @@ describe('computeCameraFromMatrices', () => {
     ).toThrow(/intrinsics/)
   })
 
-  it.each([
+  it.for<[label: string, fy: number]>([
     ['zero', 0],
     ['NaN', Number.NaN],
     ['Infinity', Number.POSITIVE_INFINITY]
   ])(
     'throws when fy is %s rather than producing a NaN/Infinite FOV',
-    (_label, fy) => {
+    ([, fy]) => {
       expect(() =>
         computeCameraFromMatrices(
           extrinsics(IDENTITY_R, [0, 0, 0]),
diff --git a/src/extensions/core/load3d/constants.ts b/src/extensions/core/load3d/constants.ts
index fb9cc0d985..08898e1860 100644
--- a/src/extensions/core/load3d/constants.ts
+++ b/src/extensions/core/load3d/constants.ts
@@ -22,3 +22,5 @@ export const SUPPORTED_HDRI_EXTENSIONS = new Set(['.hdr', '.exr'])
 export const SUPPORTED_HDRI_EXTENSIONS_ACCEPT = [
   ...SUPPORTED_HDRI_EXTENSIONS
 ].join(',')
+
+export const LOAD3D_NONE_MODEL = 'none'
diff --git a/src/extensions/core/load3d/exportMenuHelper.test.ts b/src/extensions/core/load3d/exportMenuHelper.test.ts
index 8d40e7c4bf..2b0722d2ba 100644
--- a/src/extensions/core/load3d/exportMenuHelper.test.ts
+++ b/src/extensions/core/load3d/exportMenuHelper.test.ts
@@ -98,13 +98,13 @@ describe('createExportMenuItems', () => {
     )
   })
 
-  it.each([
+  it.for<[label: string, value: string]>([
     ['GLB', 'glb'],
     ['OBJ', 'obj'],
     ['STL', 'stl']
   ])(
     'invokes load3d.exportModel(%s) and shows a success toast when the %s submenu item is clicked',
-    async (label, value) => {
+    async ([label, value]) => {
       const exportModel = vi.fn().mockResolvedValue(undefined)
       const items = createExportMenuItems(makeLoad3d(exportModel))
       ;(items[1]!.callback as (...args: unknown[]) => void)(
diff --git a/src/extensions/core/load3d/interfaces.ts b/src/extensions/core/load3d/interfaces.ts
index a5dc7c3b08..679e4fd7ee 100644
--- a/src/extensions/core/load3d/interfaces.ts
+++ b/src/extensions/core/load3d/interfaces.ts
@@ -77,6 +77,11 @@ export interface Load3DOptions {
   // Use this for reactive dimensions that change over time
   getDimensions?: () => { width: number; height: number } | null
 
+  // Returns the current canvas zoom scale (e.g. ds.scale from LiteGraph).
+  // Used to scale the renderer pixel ratio so the 3D scene renders at the
+  // correct resolution when the graph is zoomed in or out.
+  getZoomScale?: () => number
+
   // Viewer mode flag (affects aspect ratio behavior)
   isViewerMode?: boolean
 
diff --git a/src/extensions/core/load3d/load3dViewport.test.ts b/src/extensions/core/load3d/load3dViewport.test.ts
index 55f2492216..6dc55e622e 100644
--- a/src/extensions/core/load3d/load3dViewport.test.ts
+++ b/src/extensions/core/load3d/load3dViewport.test.ts
@@ -96,13 +96,13 @@ describe('isLoad3dActive', () => {
     expect(isLoad3dActive({ ...idle, initialRenderDone: false })).toBe(true)
   })
 
-  it.each([
+  it.for([
     ['mouseOnNode'],
     ['mouseOnScene'],
     ['mouseOnViewer'],
     ['recording'],
     ['animationPlaying']
-  ] as const)('is active when %s is true', (flag) => {
+  ] as const)('is active when %s is true', ([flag]) => {
     expect(isLoad3dActive({ ...idle, [flag]: true })).toBe(true)
   })
 })
diff --git a/src/extensions/core/load3dLazy.test.ts b/src/extensions/core/load3dLazy.test.ts
index 289b38b9e9..b5c721fdec 100644
--- a/src/extensions/core/load3dLazy.test.ts
+++ b/src/extensions/core/load3dLazy.test.ts
@@ -83,7 +83,7 @@ describe('load3dLazy', () => {
     expect(enabledExtensionsGetter).not.toHaveBeenCalled()
   })
 
-  it.each(['Load3D', 'Preview3D', 'SaveGLB'])(
+  it.for(['Load3D', 'Preview3D', 'SaveGLB'])(
     'recognizes %s as a 3D node type and triggers the lazy-load path',
     async (nodeType) => {
       const { hook } = await loadLazyExtensionFresh()
diff --git a/src/extensions/core/previewAny.test.ts b/src/extensions/core/previewAny.test.ts
new file mode 100644
index 0000000000..a8a2f14c1b
--- /dev/null
+++ b/src/extensions/core/previewAny.test.ts
@@ -0,0 +1,114 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyExtension } from '@/types/comfy'
+
+const capturedExtensions: ComfyExtension[] = []
+
+vi.mock('@/services/extensionService', () => ({
+  useExtensionService: () => ({
+    registerExtension: (ext: ComfyExtension) => {
+      capturedExtensions.push(ext)
+    }
+  })
+}))
+
+vi.mock('@/scripts/app', () => ({ app: {} }))
+
+interface MockWidget {
+  name: string
+  options: Record<string, unknown>
+  element: { readOnly: boolean }
+  callback?: (value: unknown) => void
+  value: unknown
+  hidden: boolean
+  label: string
+  serialize?: boolean
+}
+
+const createdWidgets: MockWidget[] = []
+
+vi.mock('@/scripts/widgets', () => {
+  const create =
+    (kind: string) =>
+    (
+      node: { widgets?: MockWidget[] },
+      name: string,
+      _info: unknown,
+      _app: unknown
+    ) => {
+      const widget: MockWidget = {
+        name,
+        options: {},
+        element: { readOnly: false },
+        value: kind === 'BOOLEAN' ? false : '',
+        hidden: false,
+        label: ''
+      }
+      node.widgets = node.widgets ?? []
+      node.widgets.push(widget)
+      createdWidgets.push(widget)
+      return { widget }
+    }
+  return {
+    ComfyWidgets: {
+      MARKDOWN: create('MARKDOWN'),
+      STRING: create('STRING'),
+      BOOLEAN: create('BOOLEAN')
+    }
+  }
+})
+
+describe('PreviewAny extension', () => {
+  beforeEach(async () => {
+    capturedExtensions.length = 0
+    createdWidgets.length = 0
+    vi.resetModules()
+    await import('./previewAny')
+  })
+
+  async function setupNode() {
+    const ext = capturedExtensions.find((e) => e.name === 'Comfy.PreviewAny')
+    expect(ext).toBeDefined()
+
+    const nodeType = { prototype: {} } as unknown as Parameters<
+      NonNullable<ComfyExtension['beforeRegisterNodeDef']>
+    >[0]
+    const nodeData = { name: 'PreviewAny' } as Parameters<
+      NonNullable<ComfyExtension['beforeRegisterNodeDef']>
+    >[1]
+
+    await ext!.beforeRegisterNodeDef!(
+      nodeType,
+      nodeData,
+      {} as Parameters<NonNullable<ComfyExtension['beforeRegisterNodeDef']>>[2]
+    )
+
+    const node: { widgets?: MockWidget[] } = {}
+    const proto = nodeType.prototype as { onNodeCreated?: () => void }
+    proto.onNodeCreated!.call(node)
+    return node
+  }
+
+  it('excludes preview widgets from the API prompt to prevent re-execution', async () => {
+    await setupNode()
+
+    const previewMarkdown = createdWidgets.find(
+      (w) => w.name === 'preview_markdown'
+    )
+    const previewText = createdWidgets.find((w) => w.name === 'preview_text')
+    const previewMode = createdWidgets.find((w) => w.name === 'previewMode')
+
+    expect(previewMarkdown).toBeDefined()
+    expect(previewText).toBeDefined()
+    expect(previewMode).toBeDefined()
+
+    // widget.options.serialize === false is what executionUtil.graphToPrompt
+    // checks to exclude a widget from the API prompt sent to the backend.
+    // Without this, post-execution widget value updates (the rendered preview
+    // text) get serialized as inputs, change the cache signature, and cause
+    // the node to re-execute on the next prompt.
+    expect(previewMarkdown!.options.serialize).toBe(false)
+    expect(previewText!.options.serialize).toBe(false)
+    expect(previewMode!.options.serialize).toBe(false)
+  })
+})
diff --git a/src/extensions/core/previewAny.ts b/src/extensions/core/previewAny.ts
index 02d07ae4bf..5fc2ac98dc 100644
--- a/src/extensions/core/previewAny.ts
+++ b/src/extensions/core/previewAny.ts
@@ -57,6 +57,7 @@ useExtensionService().registerExtension({
         showValueWidget.hidden = true
         showValueWidget.options.hidden = true
         showValueWidget.options.read_only = true
+        showValueWidget.options.serialize = false
         showValueWidget.element.readOnly = true
         showValueWidget.serialize = false
 
@@ -64,8 +65,14 @@ useExtensionService().registerExtension({
         showValueWidgetPlain.hidden = false
         showValueWidgetPlain.options.hidden = false
         showValueWidgetPlain.options.read_only = true
+        showValueWidgetPlain.options.serialize = false
         showValueWidgetPlain.element.readOnly = true
         showValueWidgetPlain.serialize = false
+
+        // The previewMode toggle is a frontend-only display preference and
+        // is not declared in the backend INPUT_TYPES, so it must not be
+        // serialized into the API prompt (would alter the cache signature).
+        showAsPlaintextWidget.widget.options.serialize = false
       }
 
       const onExecuted = nodeType.prototype.onExecuted
diff --git a/src/extensions/core/saveMesh.test.ts b/src/extensions/core/saveMesh.test.ts
new file mode 100644
index 0000000000..eb29fcc560
--- /dev/null
+++ b/src/extensions/core/saveMesh.test.ts
@@ -0,0 +1,197 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { ComfyExtension } from '@/types/comfy'
+
+const { registerExtensionMock, waitForLoad3dMock, configureForSaveMeshMock } =
+  vi.hoisted(() => ({
+    registerExtensionMock: vi.fn(),
+    waitForLoad3dMock: vi.fn(),
+    configureForSaveMeshMock: vi.fn()
+  }))
+
+vi.mock('@/services/extensionService', () => ({
+  useExtensionService: () => ({ registerExtension: registerExtensionMock })
+}))
+
+vi.mock('@/services/load3dService', () => ({
+  useLoad3dService: () => ({ getLoad3d: vi.fn() })
+}))
+
+vi.mock('@/composables/useLoad3d', () => ({
+  useLoad3d: () => ({ waitForLoad3d: waitForLoad3dMock })
+}))
+
+vi.mock('@/extensions/core/load3d/Load3DConfiguration', () => ({
+  default: class {
+    configureForSaveMesh = configureForSaveMeshMock
+  }
+}))
+
+vi.mock('@/extensions/core/load3d/exportMenuHelper', () => ({
+  createExportMenuItems: vi.fn(() => [])
+}))
+
+vi.mock('@/components/load3d/Load3D.vue', () => ({ default: {} }))
+
+vi.mock('@/scripts/domWidget', () => ({
+  ComponentWidgetImpl: vi.fn(),
+  addWidget: vi.fn()
+}))
+
+vi.mock('@/platform/assets/utils/assetPreviewUtil', () => ({
+  isAssetPreviewSupported: vi.fn(() => false),
+  persistThumbnail: vi.fn()
+}))
+
+type SaveMeshExtension = ComfyExtension & {
+  nodeCreated: (node: LGraphNode) => Promise<void>
+}
+
+async function loadSaveMeshExtensionFresh(): Promise<SaveMeshExtension> {
+  vi.resetModules()
+  registerExtensionMock.mockClear()
+  await import('@/extensions/core/saveMesh')
+  return registerExtensionMock.mock.calls[0][0] as SaveMeshExtension
+}
+
+function makeNode(
+  overrides: Partial<{
+    comfyClass: string
+    properties: Record<string, unknown>
+  }> = {}
+): LGraphNode {
+  const { comfyClass = 'SaveGLB', properties = {} } = overrides
+  return {
+    constructor: { comfyClass },
+    size: [400, 550],
+    setSize: vi.fn(),
+    widgets: [{ name: 'image', value: '' }],
+    properties
+  } as unknown as LGraphNode
+}
+
+describe('saveMesh', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    waitForLoad3dMock.mockImplementation((cb: (load3d: unknown) => void) => {
+      cb({
+        whenLoadIdle: () => Promise.resolve(),
+        captureThumbnail: vi.fn()
+      })
+    })
+  })
+
+  it('registers a single Comfy.SaveGLB extension on import', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+
+    expect(registerExtensionMock).toHaveBeenCalledOnce()
+    expect(ext.name).toBe('Comfy.SaveGLB')
+    expect(typeof ext.nodeCreated).toBe('function')
+  })
+
+  it('skips nodes whose comfyClass is not SaveGLB', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode({ comfyClass: 'OtherNode' })
+
+    await ext.nodeCreated(node)
+
+    expect(waitForLoad3dMock).not.toHaveBeenCalled()
+    expect(configureForSaveMeshMock).not.toHaveBeenCalled()
+  })
+
+  it('does not load a model on creation when no Last Time Model File is persisted', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode()
+
+    await ext.nodeCreated(node)
+
+    expect(configureForSaveMeshMock).not.toHaveBeenCalled()
+  })
+
+  it('restores the persisted model on creation using the persisted folder', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode({
+      properties: {
+        'Last Time Model File': 'sub/model.glb',
+        'Last Time Model Folder': 'output'
+      }
+    })
+
+    await ext.nodeCreated(node)
+
+    expect(configureForSaveMeshMock).toHaveBeenCalledWith(
+      'output',
+      'sub/model.glb',
+      { silentOnNotFound: true }
+    )
+    expect(node.widgets?.find((w) => w.name === 'image')?.value).toBe(
+      'sub/model.glb'
+    )
+  })
+
+  it('defaults the load folder to output when only the file path is persisted', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode({
+      properties: { 'Last Time Model File': 'model.glb' }
+    })
+
+    await ext.nodeCreated(node)
+
+    expect(configureForSaveMeshMock).toHaveBeenCalledWith(
+      'output',
+      'model.glb',
+      { silentOnNotFound: true }
+    )
+  })
+
+  it('persists Last Time Model File and Folder after onExecuted', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode()
+
+    await ext.nodeCreated(node)
+    node.onExecuted!({
+      '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }]
+    })
+
+    expect(node.properties['Last Time Model File']).toBe('sub/mesh.glb')
+    expect(node.properties['Last Time Model Folder']).toBe('output')
+    expect(configureForSaveMeshMock).toHaveBeenCalledWith(
+      'output',
+      'sub/mesh.glb',
+      { silentOnNotFound: true }
+    )
+  })
+
+  it('does not persist anything when onExecuted has no 3d output', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+    const node = makeNode()
+
+    await ext.nodeCreated(node)
+    node.onExecuted!({})
+
+    expect(node.properties['Last Time Model File']).toBeUndefined()
+    expect(node.properties['Last Time Model Folder']).toBeUndefined()
+    expect(configureForSaveMeshMock).not.toHaveBeenCalled()
+  })
+
+  it('uses the persisted state from a prior run when the node is recreated', async () => {
+    const ext = await loadSaveMeshExtensionFresh()
+
+    const firstNode = makeNode()
+    await ext.nodeCreated(firstNode)
+    firstNode.onExecuted!({
+      '3d': [{ filename: 'mesh.glb', subfolder: 'sub', type: 'output' }]
+    })
+
+    configureForSaveMeshMock.mockClear()
+    const recreated = makeNode({ properties: { ...firstNode.properties } })
+    await ext.nodeCreated(recreated)
+
+    expect(configureForSaveMeshMock).toHaveBeenCalledWith(
+      'output',
+      'sub/mesh.glb',
+      { silentOnNotFound: true }
+    )
+  })
+})
diff --git a/src/extensions/core/saveMesh.ts b/src/extensions/core/saveMesh.ts
index 09b1e9a80b..a9998282bd 100644
--- a/src/extensions/core/saveMesh.ts
+++ b/src/extensions/core/saveMesh.ts
@@ -81,6 +81,32 @@ useExtensionService().registerExtension({
 
     await nextTick()
 
+    useLoad3d(node).waitForLoad3d((load3d) => {
+      if (!load3d) return
+
+      const modelWidget = node.widgets?.find((w) => w.name === 'image')
+      if (!modelWidget) return
+
+      const lastTimeModelFile = node.properties['Last Time Model File'] as
+        | string
+        | undefined
+      const lastTimeModelFolder =
+        (node.properties['Last Time Model Folder'] as
+          | 'input'
+          | 'output'
+          | undefined) ?? 'output'
+
+      if (lastTimeModelFile) {
+        modelWidget.value = lastTimeModelFile
+
+        const config = new Load3DConfiguration(load3d, node.properties)
+
+        config.configureForSaveMesh(lastTimeModelFolder, lastTimeModelFile, {
+          silentOnNotFound: true
+        })
+      }
+    })
+
     const onExecuted = node.onExecuted
 
     node.onExecuted = function (output: SaveMeshOutput) {
@@ -103,6 +129,9 @@ useExtensionService().registerExtension({
 
           const loadFolder = fileInfo.type as 'input' | 'output'
 
+          node.properties['Last Time Model File'] = filePath
+          node.properties['Last Time Model Folder'] = loadFolder
+
           config.configureForSaveMesh(loadFolder, filePath, {
             silentOnNotFound: true
           })
diff --git a/src/extensions/core/uploadAudio.test.ts b/src/extensions/core/uploadAudio.test.ts
new file mode 100644
index 0000000000..d123ae1ea3
--- /dev/null
+++ b/src/extensions/core/uploadAudio.test.ts
@@ -0,0 +1,241 @@
+import { fromAny } from '@total-typescript/shoehorn'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { ComfyExtension } from '@/types/comfy'
+
+const { mockAddAlert, mockApiURL, mockFetchApi, mockRegisterExtension } =
+  vi.hoisted(() => ({
+    mockAddAlert: vi.fn(),
+    mockApiURL: vi.fn((url: string) => `api:${url}`),
+    mockFetchApi: vi.fn(),
+    mockRegisterExtension: vi.fn()
+  }))
+
+let capturedDragDrop: ((files: File[]) => Promise<File[] | never[]>) | undefined
+let capturedFileSelect:
+  | ((files: File[]) => Promise<File[] | never[]>)
+  | undefined
+let capturedPaste: ((files: File[]) => Promise<File[] | never[]>) | undefined
+
+type AudioUploadWidget = (node: LGraphNode, inputName: string) => unknown
+
+vi.mock('extendable-media-recorder', () => ({
+  MediaRecorder: class MockMediaRecorder {}
+}))
+
+vi.mock('@/composables/node/useNodeDragAndDrop', () => ({
+  useNodeDragAndDrop: (
+    _node: LGraphNode,
+    options: { onDrop: typeof capturedDragDrop }
+  ) => {
+    capturedDragDrop = options.onDrop
+  }
+}))
+
+vi.mock('@/composables/node/useNodeFileInput', () => ({
+  useNodeFileInput: (
+    _node: LGraphNode,
+    options: { onSelect: typeof capturedFileSelect }
+  ) => {
+    capturedFileSelect = options.onSelect
+    return { openFileSelection: vi.fn() }
+  }
+}))
+
+vi.mock('@/composables/node/useNodePaste', () => ({
+  useNodePaste: (
+    _node: LGraphNode,
+    options: { onPaste: typeof capturedPaste }
+  ) => {
+    capturedPaste = options.onPaste
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({ addAlert: mockAddAlert })
+}))
+
+vi.mock('@/renderer/extensions/vueNodes/widgets/utils/audioUtils', () => ({
+  getResourceURL: (subfolder = '', filename = '', type = 'input') =>
+    `/view?filename=${filename}&subfolder=${subfolder}&type=${type}`,
+  splitFilePath: (path: string) => ['', path, 'input']
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    apiURL: mockApiURL,
+    fetchApi: mockFetchApi
+  }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    registerExtension: mockRegisterExtension,
+    rootGraph: { id: 'root' }
+  }
+}))
+
+vi.mock('@/stores/widgetValueStore', () => ({
+  useWidgetValueStore: () => ({
+    getWidget: vi.fn()
+  })
+}))
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  getNodeByLocatorId: vi.fn()
+}))
+
+vi.mock('@/services/audioService', () => ({
+  useAudioService: () => ({})
+}))
+
+function createFile(name = 'clip.mp3'): File {
+  return new File(['audio'], name, { type: 'audio/mpeg' })
+}
+
+function successResponse(name: string, subfolder?: string) {
+  return {
+    status: 200,
+    json: () => Promise.resolve({ name, subfolder })
+  }
+}
+
+function failResponse(status = 500) {
+  return {
+    status,
+    statusText: 'Server Error'
+  }
+}
+
+function createAudioNode() {
+  const audioWidget = {
+    name: 'audio',
+    value: 'previous.mp3',
+    options: { values: ['previous.mp3'] },
+    callback: vi.fn()
+  }
+  const audioUIWidget = {
+    name: 'audioUI',
+    element: document.createElement('audio'),
+    value: '',
+    callback: vi.fn()
+  }
+  const uploadWidget = { label: '', serialize: true, canvasOnly: false }
+  const node = fromAny<LGraphNode, unknown>({
+    widgets: [audioWidget, audioUIWidget],
+    isUploading: false,
+    graph: { setDirtyCanvas: vi.fn() },
+    addWidget: vi.fn(() => uploadWidget)
+  })
+
+  return { audioUIWidget, audioWidget, node, uploadWidget }
+}
+
+async function loadAudioUploadWidget() {
+  vi.resetModules()
+  mockRegisterExtension.mockClear()
+  await import('./uploadAudio')
+  const extension = mockRegisterExtension.mock.calls
+    .map(([extension]) => extension as ComfyExtension)
+    .find((extension) => extension.name === 'Comfy.UploadAudio')
+  if (!extension)
+    throw new Error('Comfy.UploadAudio extension was not registered')
+  const widgets = await extension.getCustomWidgets!(fromAny({}))
+  return (widgets as Record<string, AudioUploadWidget>).AUDIOUPLOAD
+}
+
+describe('Comfy.UploadAudio AUDIOUPLOAD widget', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    capturedDragDrop = undefined
+    capturedFileSelect = undefined
+    capturedPaste = undefined
+  })
+
+  it('sets isUploading while upload is in progress and clears it after success', async () => {
+    const AUDIOUPLOAD = await loadAudioUploadWidget()
+    const { audioWidget, node } = createAudioNode()
+    AUDIOUPLOAD(node, 'upload')
+
+    let resolveUpload: (response: ReturnType<typeof successResponse>) => void
+    mockFetchApi.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveUpload = resolve
+      })
+    )
+
+    const upload = capturedDragDrop!([createFile()])
+
+    expect(node.isUploading).toBe(true)
+    expect(audioWidget.value).toBe('clip.mp3')
+
+    resolveUpload!(successResponse('uploaded.mp3', 'pasted'))
+    await upload
+
+    expect(node.isUploading).toBe(false)
+    expect(audioWidget.value).toBe('pasted/uploaded.mp3')
+    expect(audioWidget.options.values).toContain('pasted/uploaded.mp3')
+    expect(node.graph?.setDirtyCanvas).toHaveBeenCalledWith(true)
+  })
+
+  it('rejects concurrent audio uploads without starting another request', async () => {
+    const AUDIOUPLOAD = await loadAudioUploadWidget()
+    const { node } = createAudioNode()
+    AUDIOUPLOAD(node, 'upload')
+    node.isUploading = true
+
+    const result = await capturedDragDrop!([createFile()])
+
+    expect(result).toEqual([])
+    expect(mockAddAlert).toHaveBeenCalledWith('g.uploadAlreadyInProgress')
+    expect(mockFetchApi).not.toHaveBeenCalled()
+  })
+
+  it('rolls back the widget value and clears isUploading when upload fails', async () => {
+    const AUDIOUPLOAD = await loadAudioUploadWidget()
+    const { audioWidget, node } = createAudioNode()
+    AUDIOUPLOAD(node, 'upload')
+    mockFetchApi.mockResolvedValueOnce(failResponse())
+
+    await capturedPaste!([createFile()])
+
+    expect(node.isUploading).toBe(false)
+    expect(audioWidget.value).toBe('previous.mp3')
+    expect(mockAddAlert).toHaveBeenCalledWith('500 - Server Error')
+    expect(node.graph?.setDirtyCanvas).toHaveBeenCalledWith(true)
+  })
+
+  it('rolls back the widget value and clears isUploading when upload throws synchronously', async () => {
+    const AUDIOUPLOAD = await loadAudioUploadWidget()
+    const { audioWidget, node } = createAudioNode()
+    AUDIOUPLOAD(node, 'upload')
+    const error = new Error('Upload failed before request promise')
+    mockFetchApi.mockImplementationOnce(() => {
+      throw error
+    })
+
+    await capturedDragDrop!([createFile()])
+
+    expect(node.isUploading).toBe(false)
+    expect(audioWidget.value).toBe('previous.mp3')
+    expect(mockAddAlert).toHaveBeenCalledWith(error)
+    expect(node.graph?.setDirtyCanvas).toHaveBeenCalledWith(true)
+  })
+
+  it('returns early when no files are provided', async () => {
+    const AUDIOUPLOAD = await loadAudioUploadWidget()
+    const { node } = createAudioNode()
+    AUDIOUPLOAD(node, 'upload')
+
+    const result = await capturedFileSelect!([])
+
+    expect(result).toEqual([])
+    expect(node.isUploading).toBe(false)
+    expect(mockFetchApi).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts
index 8b6f65ab26..34229d8c60 100644
--- a/src/extensions/core/uploadAudio.ts
+++ b/src/extensions/core/uploadAudio.ts
@@ -234,9 +234,17 @@ app.registerExtension({
         }
 
         const handleUpload = async (files: File[]) => {
-          if (files?.length) {
-            const previousValue = audioWidget.value
-            audioWidget.value = files[0].name
+          if (!files?.length) return files
+
+          if (node.isUploading) {
+            useToastStore().addAlert(t('g.uploadAlreadyInProgress'))
+            return []
+          }
+
+          node.isUploading = true
+          const previousValue = audioWidget.value
+          audioWidget.value = files[0].name
+          try {
             const success = await uploadFile(
               audioWidget,
               audioUIWidget,
@@ -246,6 +254,9 @@ app.registerExtension({
             if (!success) {
               audioWidget.value = previousValue
             }
+          } finally {
+            node.isUploading = false
+            node.graph?.setDirtyCanvas(true)
           }
           return files
         }
diff --git a/src/i18n.test.ts b/src/i18n.test.ts
index 1cb2b673b0..282a1ed936 100644
--- a/src/i18n.test.ts
+++ b/src/i18n.test.ts
@@ -1,5 +1,21 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-const { i18n, loadLocale, mergeCustomNodesI18n } = await import('./i18n')
+
+import type * as I18nModule from './i18n'
+
+let i18n: typeof I18nModule.i18n
+let loadLocale: typeof I18nModule.loadLocale
+let mergeCustomNodesI18n: typeof I18nModule.mergeCustomNodesI18n
+let resolveSupportedLocale: typeof I18nModule.resolveSupportedLocale
+let setActiveLocale: typeof I18nModule.setActiveLocale
+
+async function importI18nModule() {
+  const i18nModule = await import('./i18n')
+  i18n = i18nModule.i18n
+  loadLocale = i18nModule.loadLocale
+  mergeCustomNodesI18n = i18nModule.mergeCustomNodesI18n
+  resolveSupportedLocale = i18nModule.resolveSupportedLocale
+  setActiveLocale = i18nModule.setActiveLocale
+}
 
 // Mock the JSON imports before importing i18n module
 vi.mock('./locales/en/main.json', () => ({ default: { welcome: 'Welcome' } }))
@@ -24,6 +40,7 @@ vi.mock('./locales/zh/settings.json', () => ({ default: { theme: '主题' } }))
 describe('i18n', () => {
   beforeEach(async () => {
     vi.resetModules()
+    await importI18nModule()
   })
 
   describe('mergeCustomNodesI18n', () => {
@@ -46,8 +63,6 @@ describe('i18n', () => {
     })
 
     it('should store data for not-yet-loaded locales', async () => {
-      const { i18n, mergeCustomNodesI18n } = await import('./i18n')
-
       // Chinese is not pre-loaded, data should be stored but not merged yet
       mergeCustomNodesI18n({
         zh: {
@@ -148,7 +163,7 @@ describe('i18n', () => {
     it('should handle calling mergeCustomNodesI18n multiple times', async () => {
       // Use fresh module instance to ensure clean state
       vi.resetModules()
-      const { i18n, loadLocale, mergeCustomNodesI18n } = await import('./i18n')
+      await importI18nModule()
 
       mergeCustomNodesI18n({
         zh: { plugin1: { name: '插件1' } }
@@ -175,26 +190,88 @@ describe('i18n', () => {
     it('should not reload already loaded locale', async () => {
       await loadLocale('zh')
       await loadLocale('zh')
-
-      // Should complete without error (second call returns early)
     })
 
-    it('should warn for unsupported locale', async () => {
-      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-      await loadLocale('unsupported-locale')
-
-      expect(consoleSpy).toHaveBeenCalledWith(
-        'Locale "unsupported-locale" is not supported'
+    it('should load shipped BCP-47 variants', async () => {
+      await loadLocale('zh-TW')
+      expect(i18n.global.getLocaleMessage('zh-TW')).toEqual(
+        expect.objectContaining({
+          commands: expect.any(Object),
+          nodeDefs: expect.any(Object),
+          settings: expect.any(Object)
+        })
       )
-      consoleSpy.mockRestore()
     })
 
     it('should handle concurrent load requests for same locale', async () => {
-      // Start multiple loads concurrently
       const promises = [loadLocale('zh'), loadLocale('zh'), loadLocale('zh')]
-
       await Promise.all(promises)
     })
   })
+
+  describe('setActiveLocale', () => {
+    it('clamps unsupported input to en', async () => {
+      expect(await setActiveLocale('de')).toBe('en')
+      expect(i18n.global.locale.value).toBe('en')
+    })
+
+    it('resolves shipped variants and sets the active locale', async () => {
+      expect(await setActiveLocale('pt-BR')).toBe('pt-BR')
+      expect(i18n.global.locale.value).toBe('pt-BR')
+      // pt is not shipped — pt-BR must not be promoted as a base match
+      expect(await setActiveLocale('pt')).toBe('en')
+    })
+
+    it('honors prioritized navigator.languages', async () => {
+      // First preference unsupported, second shipped — should land on French.
+      expect(await setActiveLocale(['de-DE', 'fr-CA', 'en'])).toBe('fr')
+    })
+  })
+
+  describe('resolveSupportedLocale', () => {
+    it('returns the canonical tag when the input is shipped', () => {
+      expect(resolveSupportedLocale('en')).toBe('en')
+      expect(resolveSupportedLocale('ja')).toBe('ja')
+      expect(resolveSupportedLocale('zh-TW')).toBe('zh-TW')
+      expect(resolveSupportedLocale('pt-BR')).toBe('pt-BR')
+    })
+
+    it('matches case-insensitively per BCP-47 and returns canonical casing', () => {
+      // Older browsers / OS configs may emit lowercase region tags.
+      expect(resolveSupportedLocale('pt-br')).toBe('pt-BR')
+      expect(resolveSupportedLocale('PT-BR')).toBe('pt-BR')
+      expect(resolveSupportedLocale('zh-tw')).toBe('zh-TW')
+      expect(resolveSupportedLocale('ZH-TW')).toBe('zh-TW')
+      expect(resolveSupportedLocale('EN')).toBe('en')
+    })
+
+    it('falls back to the base tag when the full tag is unshipped', () => {
+      // de-DE → de (unshipped) → en
+      expect(resolveSupportedLocale('de-DE')).toBe('en')
+      // fr-CA → fr (shipped) → fr
+      expect(resolveSupportedLocale('fr-CA')).toBe('fr')
+      // ko-KR → ko (shipped) → ko
+      expect(resolveSupportedLocale('ko-KR')).toBe('ko')
+      // zh-CN → zh (shipped) → zh (Simplified is the base)
+      expect(resolveSupportedLocale('zh-CN')).toBe('zh')
+    })
+
+    it('falls back to en for unsupported and missing inputs', () => {
+      expect(resolveSupportedLocale('de')).toBe('en')
+      expect(resolveSupportedLocale('it')).toBe('en')
+      expect(resolveSupportedLocale('nl')).toBe('en')
+      expect(resolveSupportedLocale('xx-YY')).toBe('en')
+      expect(resolveSupportedLocale('')).toBe('en')
+      expect(resolveSupportedLocale(undefined)).toBe('en')
+      expect(resolveSupportedLocale(null)).toBe('en')
+    })
+
+    it('walks a prioritized array per RFC 4647 lookup order', () => {
+      // First shipped match wins (de unshipped → fr shipped → fr).
+      expect(resolveSupportedLocale(['de-DE', 'fr-CA', 'en'])).toBe('fr')
+      // Empty / all-unshipped arrays fall back to en.
+      expect(resolveSupportedLocale([])).toBe('en')
+      expect(resolveSupportedLocale(['de', 'it'])).toBe('en')
+    })
+  })
 })
diff --git a/src/i18n.ts b/src/i18n.ts
index 13f25b0ba7..c3fc651820 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1,7 +1,11 @@
 import { createI18n } from 'vue-i18n'
 
-// ESLint cannot statically resolve dynamic imports with relative paths in template strings,
-// but these are valid ES module imports that Vite processes correctly at build time.
+import {
+  getDefaultLocale,
+  localeDefinitions,
+  resolveSupportedLocale
+} from '@/locales/localeConfig'
+import type { SupportedLocale } from '@/locales/localeConfig'
 
 // Import only English locale eagerly as the default/fallback
 import enCommands from './locales/en/commands.json' with { type: 'json' }
@@ -9,6 +13,8 @@ import en from './locales/en/main.json' with { type: 'json' }
 import enNodes from './locales/en/nodeDefs.json' with { type: 'json' }
 import enSettings from './locales/en/settings.json' with { type: 'json' }
 
+export { resolveSupportedLocale }
+
 function buildLocale<
   M extends Record<string, unknown>,
   N extends Record<string, unknown>,
@@ -23,75 +29,6 @@ function buildLocale<
   } as M & { nodeDefs: N; commands: C; settings: S }
 }
 
-// Locale loader map - dynamically import locales only when needed
-const localeLoaders: Record<
-  string,
-  () => Promise<{ default: Record<string, unknown> }>
-> = {
-  ar: () => import('./locales/ar/main.json'),
-  es: () => import('./locales/es/main.json'),
-  fa: () => import('./locales/fa/main.json'),
-  fr: () => import('./locales/fr/main.json'),
-  ja: () => import('./locales/ja/main.json'),
-  ko: () => import('./locales/ko/main.json'),
-  ru: () => import('./locales/ru/main.json'),
-  tr: () => import('./locales/tr/main.json'),
-  zh: () => import('./locales/zh/main.json'),
-  'zh-TW': () => import('./locales/zh-TW/main.json'),
-  'pt-BR': () => import('./locales/pt-BR/main.json')
-}
-
-const nodeDefsLoaders: Record<
-  string,
-  () => Promise<{ default: Record<string, unknown> }>
-> = {
-  ar: () => import('./locales/ar/nodeDefs.json'),
-  es: () => import('./locales/es/nodeDefs.json'),
-  fa: () => import('./locales/fa/nodeDefs.json'),
-  fr: () => import('./locales/fr/nodeDefs.json'),
-  ja: () => import('./locales/ja/nodeDefs.json'),
-  ko: () => import('./locales/ko/nodeDefs.json'),
-  ru: () => import('./locales/ru/nodeDefs.json'),
-  tr: () => import('./locales/tr/nodeDefs.json'),
-  zh: () => import('./locales/zh/nodeDefs.json'),
-  'zh-TW': () => import('./locales/zh-TW/nodeDefs.json'),
-  'pt-BR': () => import('./locales/pt-BR/nodeDefs.json')
-}
-
-const commandsLoaders: Record<
-  string,
-  () => Promise<{ default: Record<string, unknown> }>
-> = {
-  ar: () => import('./locales/ar/commands.json'),
-  es: () => import('./locales/es/commands.json'),
-  fa: () => import('./locales/fa/commands.json'),
-  fr: () => import('./locales/fr/commands.json'),
-  ja: () => import('./locales/ja/commands.json'),
-  ko: () => import('./locales/ko/commands.json'),
-  ru: () => import('./locales/ru/commands.json'),
-  tr: () => import('./locales/tr/commands.json'),
-  zh: () => import('./locales/zh/commands.json'),
-  'zh-TW': () => import('./locales/zh-TW/commands.json'),
-  'pt-BR': () => import('./locales/pt-BR/commands.json')
-}
-
-const settingsLoaders: Record<
-  string,
-  () => Promise<{ default: Record<string, unknown> }>
-> = {
-  ar: () => import('./locales/ar/settings.json'),
-  es: () => import('./locales/es/settings.json'),
-  fa: () => import('./locales/fa/settings.json'),
-  fr: () => import('./locales/fr/settings.json'),
-  ja: () => import('./locales/ja/settings.json'),
-  ko: () => import('./locales/ko/settings.json'),
-  ru: () => import('./locales/ru/settings.json'),
-  tr: () => import('./locales/tr/settings.json'),
-  zh: () => import('./locales/zh/settings.json'),
-  'zh-TW': () => import('./locales/zh-TW/settings.json'),
-  'pt-BR': () => import('./locales/pt-BR/settings.json')
-}
-
 // Track which locales have been loaded
 const loadedLocales = new Set<string>(['en'])
 
@@ -102,37 +39,33 @@ const loadingLocales = new Map<string, Promise<void>>()
 const customNodesI18nData: Record<string, unknown> = {}
 
 /**
- * Dynamically load a locale and its associated files (nodeDefs, commands, settings)
+ * Dynamically load a shipped locale's bundles (nodeDefs, commands, settings).
+ * Callers must pre-resolve untrusted input via `resolveSupportedLocale` or
+ * `setActiveLocale`, which is the boundary helper for arbitrary input.
  */
-export async function loadLocale(locale: string): Promise<void> {
+export async function loadLocale(locale: SupportedLocale): Promise<void> {
   if (loadedLocales.has(locale)) {
     return
   }
 
-  // If already loading, return the existing promise to prevent duplicate loads
   const existingLoad = loadingLocales.get(locale)
   if (existingLoad) {
-    return existingLoad
-  }
-
-  const loader = localeLoaders[locale]
-  const nodeDefsLoader = nodeDefsLoaders[locale]
-  const commandsLoader = commandsLoaders[locale]
-  const settingsLoader = settingsLoaders[locale]
-
-  if (!loader || !nodeDefsLoader || !commandsLoader || !settingsLoader) {
-    console.warn(`Locale "${locale}" is not supported`)
+    await existingLoad
+    return
+  }
+
+  const loaders = localeDefinitions[locale].loaders
+  if (!loaders) {
     return
   }
 
-  // Create and track the loading promise
   const loadPromise = (async () => {
     try {
       const [main, nodes, commands, settings] = await Promise.all([
-        loader(),
-        nodeDefsLoader(),
-        commandsLoader(),
-        settingsLoader()
+        loaders.main(),
+        loaders.nodeDefs(),
+        loaders.commands(),
+        loaders.settings()
       ])
 
       const messages = buildLocale(
@@ -152,13 +85,33 @@ export async function loadLocale(locale: string): Promise<void> {
       console.error(`Failed to load locale "${locale}":`, error)
       throw error
     } finally {
-      // Clean up the loading promise once complete
       loadingLocales.delete(locale)
     }
   })()
 
   loadingLocales.set(locale, loadPromise)
-  return loadPromise
+  await loadPromise
+}
+
+/**
+ * Boundary helper for arbitrary locale input (settings, browser preferences):
+ * resolves to a shipped tag, loads it, and updates the active locale.
+ *
+ * Returns the resolved tag so callers can detect a clamp (e.g. a stale stored
+ * `Comfy.Locale` from an older build) and self-heal persisted state.
+ */
+export async function setActiveLocale(
+  input: string | readonly string[] | null | undefined
+): Promise<SupportedLocale> {
+  const resolved = resolveSupportedLocale(input)
+  if (typeof input === 'string' && input && input !== resolved) {
+    // Single warn — gated on a real clamp event, never per missing key — so
+    // stale stored locales surface in logs without re-introducing #1867's spam.
+    console.warn(`Locale "${input}" not shipped; using "${resolved}"`)
+  }
+  await loadLocale(resolved)
+  i18n.global.locale.value = resolved
+  return resolved
 }
 
 /**
@@ -179,18 +132,18 @@ export function mergeCustomNodesI18n(i18nData: Record<string, unknown>): void {
   }
 }
 
-// Only include English in the initial bundle
-const messages = {
-  en: buildLocale(en, enNodes, enCommands, enSettings)
-}
+// Only include English in the initial bundle; other locales lazy-load.
+const enMessages = buildLocale(en, enNodes, enCommands, enSettings)
+type LocaleMessages = typeof enMessages
 
-// Type for locale messages - inferred from the English locale structure
-type LocaleMessages = typeof messages.en
+const messages: Partial<Record<SupportedLocale, LocaleMessages>> = {
+  en: enMessages
+}
 
 export const i18n = createI18n({
   // Must set `false`, as Vue I18n Legacy API is for Vue 2
   legacy: false,
-  locale: navigator.language.split('-')[0] || 'en',
+  locale: getDefaultLocale(),
   fallbackLocale: 'en',
   escapeParameter: true,
   messages,
diff --git a/src/lib/litegraph/src/LGraphCanvas.onMenuAdd.test.ts b/src/lib/litegraph/src/LGraphCanvas.onMenuAdd.test.ts
new file mode 100644
index 0000000000..f774267491
--- /dev/null
+++ b/src/lib/litegraph/src/LGraphCanvas.onMenuAdd.test.ts
@@ -0,0 +1,173 @@
+import { fromPartial } from '@total-typescript/shoehorn'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { IContextMenuValue } from '@/lib/litegraph/src/litegraph'
+import {
+  LGraph,
+  LGraphCanvas,
+  LGraphNode,
+  LiteGraph
+} from '@/lib/litegraph/src/litegraph'
+
+class TestNode extends LGraphNode {
+  static override type = 'TestNode'
+
+  constructor(title?: string) {
+    super(title ?? 'TestNode')
+  }
+}
+
+function makeNodeClass(title: string) {
+  class N extends TestNode {
+    static override title = title
+
+    constructor() {
+      super(title)
+    }
+  }
+  return N
+}
+
+function createCanvas(graph: LGraph): LGraphCanvas {
+  const el = document.createElement('canvas')
+  el.width = 800
+  el.height = 600
+  const ctx = fromPartial<CanvasRenderingContext2D>({
+    measureText: vi.fn().mockReturnValue({ width: 50 }),
+    getTransform: vi
+      .fn()
+      .mockReturnValue({ a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 })
+  })
+
+  el.getContext = vi.fn().mockReturnValue(ctx)
+  el.getBoundingClientRect = vi.fn().mockReturnValue({
+    left: 0,
+    top: 0,
+    width: 800,
+    height: 600
+  })
+
+  return new LGraphCanvas(el, graph, { skip_render: true })
+}
+
+type MenuEntry = IContextMenuValue<string>
+
+describe('LGraphCanvas.onMenuAdd category sorting', () => {
+  let graph: LGraph
+  let canvas: LGraphCanvas
+  const registeredTypes: string[] = []
+  let originalContextMenu: typeof LiteGraph.ContextMenu
+  const capturedEntries: MenuEntry[][] = []
+
+  beforeEach(() => {
+    graph = new LGraph()
+    canvas = createCanvas(graph)
+    LGraphCanvas.active_canvas = canvas
+
+    capturedEntries.length = 0
+    originalContextMenu = LiteGraph.ContextMenu
+    const MockContextMenu = vi.fn(function (
+      this: unknown,
+      values: MenuEntry[]
+    ) {
+      capturedEntries.push(values)
+    }) as unknown as typeof LiteGraph.ContextMenu
+    LiteGraph.ContextMenu = MockContextMenu
+  })
+
+  afterEach(() => {
+    LiteGraph.ContextMenu = originalContextMenu
+    for (const type of registeredTypes) {
+      delete LiteGraph.registered_node_types[type]
+    }
+    registeredTypes.length = 0
+  })
+
+  function register(type: string, title: string) {
+    LiteGraph.registerNodeType(type, makeNodeClass(title))
+    registeredTypes.push(type)
+  }
+
+  function openTopLevelMenu() {
+    const event = new MouseEvent('contextmenu', { clientX: 10, clientY: 10 })
+    LGraphCanvas.onMenuAdd(undefined, undefined, event)
+    return event
+  }
+
+  function drillInto(label: string, sourceEvent: MouseEvent) {
+    const top = capturedEntries[capturedEntries.length - 1]
+    const entry = top.find((e) => e.content === label)
+    expect(entry, `submenu entry "${label}" should exist`).toBeDefined()
+    expect(entry!.callback).toBeDefined()
+    expect(typeof entry!.value).toBe('string')
+    const callback = entry!.callback!
+    const menuThis = document.createElement('div') as ThisParameterType<
+      typeof callback
+    >
+    void callback.call(menuThis, entry, undefined, sourceEvent, undefined)
+  }
+
+  it('sorts top-level category submenus alphabetically (case-insensitive)', () => {
+    register('zebra/zNode', 'Zebra Node')
+    register('Apple/aNode', 'Apple Node')
+    register('middle/mNode', 'Middle Node')
+
+    openTopLevelMenu()
+
+    const submenuLabels = capturedEntries[0]
+      .filter((e) => e.has_submenu)
+      .map((e) => e.content)
+    const ours = submenuLabels.filter((label) =>
+      ['Apple', 'middle', 'zebra'].includes(label ?? '')
+    )
+    expect(ours).toEqual(['Apple', 'middle', 'zebra'])
+  })
+
+  it('uses natural numeric ordering for numbered category names', () => {
+    register('Cat10/n10', 'Item10')
+    register('Cat2/n2', 'Item2')
+    register('Cat1/n1', 'Item1')
+
+    openTopLevelMenu()
+
+    const ours = capturedEntries[0]
+      .filter(
+        (e) =>
+          e.has_submenu && ['Cat1', 'Cat2', 'Cat10'].includes(e.content ?? '')
+      )
+      .map((e) => e.content)
+    expect(ours).toEqual(['Cat1', 'Cat2', 'Cat10'])
+  })
+
+  it('sorts leaf nodes inside a category alphabetically', () => {
+    register('leafsort/Zeta', 'Zeta')
+    register('leafsort/Alpha', 'Alpha')
+    register('leafsort/Mike', 'Mike')
+
+    const event = openTopLevelMenu()
+    drillInto('leafsort', event)
+
+    const leafLabels = capturedEntries[1]
+      .filter((e) => !e.has_submenu)
+      .map((e) => e.content)
+    expect(leafLabels).toEqual(['Alpha', 'Mike', 'Zeta'])
+  })
+
+  it('places category submenus before leaf entries within a category level', () => {
+    register('mixed/leafA', 'A Leaf')
+    register('mixed/leafZ', 'Z Leaf')
+    register('mixed/inner/deep', 'Deep')
+
+    const event = openTopLevelMenu()
+    drillInto('mixed', event)
+
+    const inside = capturedEntries[1]
+    const ours = inside.filter((e) =>
+      ['inner', 'A Leaf', 'Z Leaf'].includes(e.content ?? '')
+    )
+    expect(ours[0].content).toBe('inner')
+    expect(ours[0].has_submenu).toBe(true)
+    expect(ours[1].content).toBe('A Leaf')
+    expect(ours[2].content).toBe('Z Leaf')
+  })
+})
diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts
index 26accd0e8d..b3159f5cc5 100644
--- a/src/lib/litegraph/src/LGraphCanvas.ts
+++ b/src/lib/litegraph/src/LGraphCanvas.ts
@@ -1179,7 +1179,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       const categories = LiteGraph.getNodeTypesCategories(
         canvas.filter || graph.filter
       ).filter((category) => category.startsWith(base_category))
-      const entries: AddNodeMenu[] = []
+      const categoryEntries: AddNodeMenu[] = []
 
       for (const category of categories) {
         if (!category) continue
@@ -1197,11 +1197,11 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         // in case it has a namespace like "shader::math/rand" it hides the namespace
         if (name.includes('::')) name = name.split('::', 2)[1]
 
-        const index = entries.findIndex(
+        const index = categoryEntries.findIndex(
           (entry) => entry.value === category_path
         )
         if (index === -1) {
-          entries.push({
+          categoryEntries.push({
             value: category_path,
             content: name,
             has_submenu: true,
@@ -1212,11 +1212,19 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         }
       }
 
+      const compareByContent = (a: AddNodeMenu, b: AddNodeMenu) =>
+        (a.content ?? '').localeCompare(b.content ?? '', undefined, {
+          numeric: true,
+          sensitivity: 'base'
+        })
+      categoryEntries.sort(compareByContent)
+
       const nodes = LiteGraph.getNodeTypesInCategory(
         base_category.slice(0, -1),
         canvas.filter || graph.filter
       )
 
+      const nodeEntries: AddNodeMenu[] = []
       for (const node of nodes) {
         if (node.skip_list) continue
 
@@ -1246,9 +1254,13 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           }
         }
 
-        entries.push(entry)
+        nodeEntries.push(entry)
       }
 
+      nodeEntries.sort(compareByContent)
+
+      const entries: AddNodeMenu[] = [...categoryEntries, ...nodeEntries]
+
       new LiteGraph.ContextMenu(entries, { event: e, parentMenu: prev_menu })
     }
   }
diff --git a/src/lib/litegraph/src/infrastructure/Rectangle.test.ts b/src/lib/litegraph/src/infrastructure/Rectangle.test.ts
index cb4245e265..786bdb142f 100644
--- a/src/lib/litegraph/src/infrastructure/Rectangle.test.ts
+++ b/src/lib/litegraph/src/infrastructure/Rectangle.test.ts
@@ -301,7 +301,7 @@ describe('Rectangle', () => {
   describe('containment and overlap', () => {
     const rect = new Rectangle(10, 10, 20, 20) // x: 10, y: 10, right: 30, bottom: 30
 
-    test.each([
+    test.for([
       [10, 10, true], // top-left corner
       [29, 29, true], // bottom-right corner
       [15, 15, true], // inside
@@ -311,14 +311,14 @@ describe('Rectangle', () => {
       [15, 30, false], // outside bottom
       [10, 29, true], // on bottom edge
       [29, 10, true] // on right edge
-    ])(
+    ] as const)(
       'when checking if (%s, %s) is inside, should return %s',
-      (x, y, expected) => {
+      ([x, y, expected]) => {
         expect(rect.containsXy(x, y)).toBe(expected)
       }
     )
 
-    test.each([
+    test.for([
       [[0, 0] as Point, true],
       [[9, 9] as Point, true],
       [[5, 5] as Point, true],
@@ -326,12 +326,15 @@ describe('Rectangle', () => {
       [[11, 5] as Point, false],
       [[5, -1] as Point, false],
       [[5, 11] as Point, false]
-    ])('should return %s for point %j', (point: Point, expected: boolean) => {
-      rect.updateTo([0, 0, 10, 10])
-      expect(rect.containsPoint(point)).toBe(expected)
-    })
+    ] as const)(
+      'should return %s for point %j',
+      ([point, expected]: readonly [Point, boolean]) => {
+        rect.updateTo([0, 0, 10, 10])
+        expect(rect.containsPoint(point)).toBe(expected)
+      }
+    )
 
-    test.each([
+    test.for([
       // Completely inside
       [new Rectangle(10, 10, 10, 10), true],
       // Touching edges
@@ -348,13 +351,13 @@ describe('Rectangle', () => {
       [new Rectangle(0, 0, 5, 5), new Rectangle(0, 0, 10, 10), true],
       // Same size
       [new Rectangle(0, 0, 99, 99), true]
-    ])(
+    ] as const)(
       'should return %s when checking if %s is inside outer rect',
-      (
-        inner: Rectangle,
-        expectedOrOuter: boolean | Rectangle,
-        expectedIfThreeArgs?: boolean
-      ) => {
+      ([inner, expectedOrOuter, expectedIfThreeArgs]: readonly [
+        Rectangle,
+        boolean | Rectangle,
+        boolean?
+      ]) => {
         let testOuter = rect
         rect.updateTo([0, 0, 100, 100])
 
@@ -367,7 +370,7 @@ describe('Rectangle', () => {
       }
     )
 
-    test.each([
+    test.for([
       // Completely overlapping
       [new Rectangle(15, 15, 10, 10), true], // r2 inside r1
       // Partially overlapping
@@ -387,7 +390,7 @@ describe('Rectangle', () => {
       [new Rectangle(0, 0, 5, 5), false], // r2 outside top-left
       // rect1 inside rect2
       [new Rectangle(0, 0, 100, 100), true]
-    ])('should return %s for overlap with %s', (rect2, expected) => {
+    ] as const)('should return %s for overlap with %s', ([rect2, expected]) => {
       const rect = new Rectangle(10, 10, 20, 20) // 10,10 to 30,30
 
       expect(rect.overlaps(rect2)).toBe(expected)
diff --git a/src/lib/litegraph/src/subgraph/SubgraphNode.ts b/src/lib/litegraph/src/subgraph/SubgraphNode.ts
index ea2bf3af93..f31f5a0528 100644
--- a/src/lib/litegraph/src/subgraph/SubgraphNode.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphNode.ts
@@ -450,6 +450,7 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     const hasFallbackToKeep = fallbackStoredEntries.some((entry) => {
       const sourceNode = this.subgraph.getNodeById(entry.sourceNodeId)
       if (!sourceNode) return linkedWidgetNames.has(entry.sourceWidgetName)
+      if (sourceNode.type === 'PrimitiveNode') return true
 
       const hasSourceWidget =
         sourceNode.widgets?.some(
diff --git a/src/lib/litegraph/src/utils/mathParser.test.ts b/src/lib/litegraph/src/utils/mathParser.test.ts
index 377c71d85c..09a7b985e7 100644
--- a/src/lib/litegraph/src/utils/mathParser.test.ts
+++ b/src/lib/litegraph/src/utils/mathParser.test.ts
@@ -3,52 +3,52 @@ import { describe, expect, test } from 'vitest'
 import { evaluateMathExpression } from '@/lib/litegraph/src/utils/mathParser'
 
 describe('evaluateMathExpression', () => {
-  test.each([
+  test.for<[string, number]>([
     ['2+3', 5],
     ['10-4', 6],
     ['3*7', 21],
     ['15/3', 5]
-  ])('basic arithmetic: %s = %d', (input, expected) => {
+  ])('basic arithmetic: %s = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['2+3*4', 14],
     ['(2+3)*4', 20],
     ['10-2*3', 4],
     ['10/2+3', 8]
-  ])('operator precedence: %s = %d', (input, expected) => {
+  ])('operator precedence: %s = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['3.14*2', 6.28],
     ['.5+.5', 1],
     ['1.5+2.5', 4],
     ['0.1+0.2', 0.1 + 0.2],
     ['123.', 123],
     ['123.+3', 126]
-  ])('decimals: %s', (input, expected) => {
+  ])('decimals: %s', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     [' 2 + 3 ', 5],
     ['  10  -  4  ', 6],
     [' ( 2 + 3 ) * 4 ', 20]
-  ])('whitespace handling: "%s" = %d', (input, expected) => {
+  ])('whitespace handling: "%s" = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['((2+3))', 5],
     ['(1+(2*(3+4)))', 15],
     ['((1+2)*(3+4))', 21]
-  ])('nested parentheses: %s = %d', (input, expected) => {
+  ])('nested parentheses: %s = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['-5', -5],
     ['-(3+2)', -5],
     ['--5', 5],
@@ -59,11 +59,11 @@ describe('evaluateMathExpression', () => {
     ['2--3', 5],
     ['-2*-3', 6],
     ['-(2+3)*-(4+5)', 45]
-  ])('unary operators: %s = %d', (input, expected) => {
+  ])('unary operators: %s = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['2 /2+3 * 4.75- -6', 21.25],
     ['2 / (2 + 3) * 4.33 - -6', 7.732],
     ['12* 123/-(-5 + 2)', 492],
@@ -78,11 +78,11 @@ describe('evaluateMathExpression', () => {
       '(123.45*(678.90 / (-2.5+ 11.5)-(((80 -(19))) *33.25)) / 20) - (123.45*(678.90 / (-2.5+ 11.5)-(((80 -(19))) *33.25)) / 20) + (13 - 2)/ -(-11) ',
       1
     ]
-  ])('complex expression: %s', (input, expected) => {
+  ])('complex expression: %s', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBeCloseTo(expected as number)
   })
 
-  test.each(['', 'abc', '2+', '(2+3', '2+3)', '()', '*3', '2 3', '.', '123..'])(
+  test.for(['', 'abc', '2+', '(2+3', '2+3)', '()', '*3', '2 3', '.', '123..'])(
     'invalid input returns undefined: "%s"',
     (input) => {
       expect(evaluateMathExpression(input)).toBeUndefined()
@@ -97,11 +97,11 @@ describe('evaluateMathExpression', () => {
     expect(evaluateMathExpression('0/0')).toBeNaN()
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['10%3', 1],
     ['10%3+1', 2],
     ['7%2', 1]
-  ])('modulo: %s = %d', (input, expected) => {
+  ])('modulo: %s = %d', ([input, expected]) => {
     expect(evaluateMathExpression(input)).toBe(expected)
   })
 
diff --git a/src/lib/litegraph/src/utils/widget.test.ts b/src/lib/litegraph/src/utils/widget.test.ts
index 6eb9707dd2..48543c7897 100644
--- a/src/lib/litegraph/src/utils/widget.test.ts
+++ b/src/lib/litegraph/src/utils/widget.test.ts
@@ -73,21 +73,21 @@ describe('resolveNodeRootGraphId', () => {
 })
 
 describe('evaluateInput', () => {
-  test.each([
+  test.for<[string, number]>([
     ['42', 42],
     ['3.14', 3.14],
     ['-7', -7],
     ['0', 0]
-  ])('plain number: "%s" = %d', (input, expected) => {
+  ])('plain number: "%s" = %d', ([input, expected]) => {
     expect(evaluateInput(input)).toBe(expected)
   })
 
-  test.each([
+  test.for<[string, number]>([
     ['2+3', 5],
     ['(4+2)*3', 18],
     ['3.14*2', 6.28],
     ['10/2+3', 8]
-  ])('expression: "%s" = %d', (input, expected) => {
+  ])('expression: "%s" = %d', ([input, expected]) => {
     expect(evaluateInput(input)).toBe(expected)
   })
 
@@ -95,7 +95,7 @@ describe('evaluateInput', () => {
     expect(evaluateInput('')).toBe(0)
   })
 
-  test.each(['abc', 'hello world'])(
+  test.for(['abc', 'hello world'])(
     'invalid input returns undefined: "%s"',
     (input) => {
       expect(evaluateInput(input)).toBeUndefined()
@@ -118,7 +118,7 @@ describe('evaluateInput', () => {
     expect(evaluateInput('0xff')).toBe(255)
   })
 
-  test.each(['Infinity', '-Infinity'])(
+  test.for(['Infinity', '-Infinity'])(
     '"%s" returns undefined (non-finite rejected)',
     (input) => {
       expect(evaluateInput(input)).toBeUndefined()
diff --git a/src/locales/CONTRIBUTING.md b/src/locales/CONTRIBUTING.md
index 530f7dc9de..56fd4c1c59 100644
--- a/src/locales/CONTRIBUTING.md
+++ b/src/locales/CONTRIBUTING.md
@@ -35,47 +35,13 @@ module.exports = defineConfig({
 })
 ```
 
-#### 1.2 Update `src/platform/settings/constants/coreSettings.ts`
+#### 1.2 Update `src/locales/localeConfig.ts`
 
-Add your language to the dropdown options:
+Add your language to the shared runtime locale definition. This feeds the
+settings dropdown, supported-locale resolution, and lazy locale loading:
 
 ```typescript
-{
-  id: 'Comfy.Locale',
-  name: 'Language',
-  type: 'combo',
-  options: [
-    { value: 'en', text: 'English' },
-    { value: 'zh', text: '中文' },
-    { value: 'zh-TW', text: '繁體中文 (台灣)' }, // Add your language here
-    { value: 'ru', text: 'Русский' },
-    { value: 'ja', text: '日本語' },
-    { value: 'ko', text: '한국어' },
-    { value: 'fr', text: 'Français' },
-    { value: 'es', text: 'Español' }
-  ],
-  defaultValue: () => navigator.language.split('-')[0] || 'en'
-},
-```
-
-#### 1.3 Update `src/i18n.ts`
-
-Add imports for your new language files:
-
-```typescript
-// Add these imports (replace zh-TW with your language code)
-import zhTWCommands from './locales/zh-TW/commands.json'
-import zhTW from './locales/zh-TW/main.json'
-import zhTWNodes from './locales/zh-TW/nodeDefs.json'
-import zhTWSettings from './locales/zh-TW/settings.json'
-
-// Add to the messages object
-const messages = {
-  en: buildLocale(en, enNodes, enCommands, enSettings),
-  zh: buildLocale(zh, zhNodes, zhCommands, zhSettings),
-  'zh-TW': buildLocale(zhTW, zhTWNodes, zhTWCommands, zhTWSettings) // Add this line
-  // ... other languages
-}
+'zh-TW': { text: '繁體中文', loaders: loadersFor('zh-TW') }
 ```
 
 ### Step 2: Generate Translation Files
@@ -168,7 +134,7 @@ Each language has 4 translation files:
 
 ### Issue: Language not appearing in dropdown
 
-**Solution**: Check that the language code in `coreSettings.ts` matches your other files exactly
+**Solution**: Check that the language code in `src/locales/localeConfig.ts` matches your other files exactly
 
 ### Issue: Rate limits during local translation
 
diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json
index 098c7ef76d..948f2818ba 100644
--- a/src/locales/ar/main.json
+++ b/src/locales/ar/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "و",
+      "backToGithubLogin": "سجّل باستخدام Github بدلاً من ذلك",
       "backToLogin": "العودة إلى تسجيل الدخول",
       "backToSocialLogin": "سجّل باستخدام Google أو Github بدلاً من ذلك",
       "confirmPasswordLabel": "تأكيد كلمة المرور",
@@ -292,7 +293,9 @@
       "title": "إعادة المصادقة مطلوبة"
     },
     "signOut": {
+      "saveFailed": "تم إلغاء تسجيل الخروج بسبب فشل حفظ \"{workflow}\".",
       "signOut": "تسجيل الخروج",
+      "signOutAnyway": "تسجيل الخروج على أي حال",
       "success": "تم تسجيل الخروج بنجاح",
       "successDetail": "لقد تم تسجيل خروجك من حسابك.",
       "unsavedChangesMessage": "لديك تغييرات غير محفوظة ستفقد عند تسجيل الخروج. هل ترغب في المتابعة؟",
@@ -461,6 +464,12 @@
       "wantToRun": "هل تريد تشغيل ComfyUI محليًا بدلاً من ذلك؟"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "يرجى اختيار خيار.",
+        "describeAnswer": "يرجى وصف إجابتك.",
+        "selectAtLeastOne": "يرجى اختيار خيار واحد على الأقل."
+      },
+      "intro": "ساعدنا في تخصيص تجربتك مع ComfyUI.",
       "options": {
         "familiarity": {
           "advanced": "مستخدم متقدم (سير عمل مخصصة)",
@@ -469,45 +478,43 @@
           "new": "جديد في ComfyUI (لم أستخدمه من قبل)",
           "starting": "في البداية فقط (أتابع الدروس التعليمية)"
         },
-        "industry": {
-          "architecture": "الهندسة المعمارية",
-          "education": "التعليم",
-          "film_tv_animation": "الأفلام والتلفزيون والرسوم المتحركة",
-          "fine_art": "الفنون الجميلة والرسوم التوضيحية",
-          "gaming": "الألعاب",
-          "marketing": "التسويق والإعلان",
+        "intent": {
+          "3d_game": "أصول ثلاثية الأبعاد / أصول ألعاب",
+          "api": "نقاط نهاية API لتشغيل مسارات العمل",
+          "apps": "تطبيقات مبسطة من مسارات العمل",
+          "audio": "صوت / موسيقى",
+          "custom_nodes": "عُقد مخصصة",
+          "images": "صور",
+          "not_sure": "لست متأكداً",
+          "videos": "فيديوهات",
+          "workflows": "مسارات عمل أو خطوط معالجة مخصصة"
+        },
+        "source": {
+          "conference": "مؤتمر أو فعالية",
+          "discord": "ديسكورد / مجتمع",
+          "friend": "صديق أو زميل",
+          "github": "GitHub",
+          "instagram": "إنستغرام",
+          "linkedin": "لينكدإن",
+          "newsletter": "النشرة البريدية أو مدونة",
           "other": "أخرى",
-          "otherPlaceholder": "يرجى التحديد",
-          "product_design": "تصميم المنتجات والرسوم",
-          "software": "البرمجيات والتكنولوجيا"
+          "reddit": "ريديت",
+          "search": "جوجل / بحث",
+          "twitter": "تويتر / X",
+          "youtube": "يوتيوب"
         },
-        "making": {
-          "3d": "الأصول ثلاثية الأبعاد",
-          "audio": "الصوت / الموسيقى",
-          "custom_nodes": "العُقد وسير العمل المخصصة",
-          "images": "الصور",
-          "video": "الفيديو والرسوم المتحركة"
-        },
-        "purpose": {
-          "client": "العمل للعملاء (العمل الحر)",
-          "community": "مساهمات مجتمعية (عُقد، سير عمل، إلخ)",
-          "inhouse": "مكان عملي الخاص (داخلي)",
-          "personal": "مشاريع شخصية / هواية",
-          "research": "البحث الأكاديمي"
+        "usage": {
+          "education": "تعليمي (طالب أو معلم)",
+          "personal": "استخدام شخصي",
+          "work": "عمل"
         }
       },
       "placeholder": "نص بديل لأسئلة الاستبيان",
-      "questions": {
-        "familiarity": "ما مدى معرفتك بـ ComfyUI؟",
-        "industry": "ما هي صناعتك الأساسية؟",
-        "making": "ماذا تخطط لصنعه؟",
-        "purpose": "ما الاستخدام الأساسي الذي تخطط لـ ComfyUI من أجله؟"
-      },
       "steps": {
         "familiarity": "ما مدى معرفتك بـ ComfyUI؟",
-        "industry": "ما هي صناعتك الأساسية؟",
-        "making": "ماذا تخطط لصنعه؟",
-        "purpose": "ما الاستخدام الأساسي الذي ستستخدم ComfyUI من أجله؟"
+        "intent": "ما الذي ترغب في إنشائه باستخدام ComfyUI؟",
+        "source": "من أين سمعت عن ComfyUI؟",
+        "usage": "كيف تخطط لاستخدام ComfyUI؟"
       },
       "title": "استبيان السحابة"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "ابدأ الإبداع في ثوانٍ",
   "cloudStart_wantToRun": "هل تريد تشغيل ComfyUI محليًا بدلاً من ذلك؟",
   "cloudSurvey_steps_familiarity": "ما مدى معرفتك بـ ComfyUI؟",
-  "cloudSurvey_steps_industry": "ما مجال عملك الأساسي؟",
-  "cloudSurvey_steps_making": "ماذا تخطط لصنعه؟",
-  "cloudSurvey_steps_purpose": "ما الاستخدام الأساسي الذي تخطط لـ ComfyUI من أجله؟",
+  "cloudSurvey_steps_intent": "ما الذي ترغب في إنشائه باستخدام ComfyUI؟",
+  "cloudSurvey_steps_source": "من أين سمعت عن ComfyUI؟",
+  "cloudSurvey_steps_usage": "كيف تخطط لاستخدام ComfyUI؟",
   "cloudWaitlist_contactLink": "هنا",
   "cloudWaitlist_questionsText": "أسئلة؟ اتصل بنا",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "مُشَفِّر الصوت",
     "AUDIO_ENCODER_OUTPUT": "مخرجات مُشَفِّر الصوت",
     "AUDIO_RECORD": "تسجيل صوتي",
+    "BACKGROUND_REMOVAL": "إزالة الخلفية",
     "BOOLEAN": "منطقي",
     "BOUNDING_BOX": "مربع التحديد",
     "CAMERA_CONTROL": "تحكم الكاميرا",
@@ -831,6 +839,7 @@
     "NOISE": "ضجيج",
     "OPENAI_CHAT_CONFIG": "إعدادات محادثة أوبن إيه آي",
     "OPENAI_INPUT_FILES": "ملفات إدخال أوبن إيه آي",
+    "OPTICAL_FLOW": "التدفق البصري",
     "PHOTOMAKER": "صانع الصور",
     "PIXVERSE_TEMPLATE": "قالب PixVerse",
     "POSE_KEYPOINT": "نقطة مفتاحية للوضعية",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "مون فالي ماري",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "فيدو",
     "Wan": "وان",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_للاختبار",
     "advanced": "متقدم",
     "animation": "الرسوم المتحركة",
-    "api": "API",
     "api node": "عقدة API",
     "attention_experiments": "تجارب الانتباه",
     "audio": "صوت",
+    "background removal": "إزالة الخلفية",
     "batch": "دفعة",
-    "camera": "كاميرا",
     "chroma_radiance": "تألق اللون",
     "clip": "clip",
+    "color": "لون",
     "combine": "دمج",
     "compositing": "التركيب",
     "cond pair": "زوج شرطي",
     "cond single": "شرط فردي",
     "conditioning": "التكييف",
-    "context": "سياق",
     "controlnet": "كونترول نت",
     "create": "إنشاء",
     "custom_sampling": "تجميع مخصص",
@@ -2302,6 +2308,7 @@
     "deprecated": "مهمل",
     "detection": "الكشف",
     "edit_models": "تحرير النماذج",
+    "experimental": "تجريبي",
     "flux": "تدفق",
     "gligen": "gligen",
     "guidance": "التوجيه",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "قناع",
-    "math": "رياضيات",
     "model": "نموذج",
     "model_merging": "دمج النماذج",
     "model_patches": "تصحيحات النموذج",
@@ -2334,16 +2340,13 @@
     "save": "حفظ",
     "schedulers": "الجدولة",
     "scheduling": "الجدولة",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "سيجمات",
     "stable_cascade": "سلسلة ثابتة",
-    "string": "سلسلة نصية",
     "style_model": "نموذج النمط",
     "supir": "supir",
     "text": "نص",
-    "textgen": "textgen",
     "training": "تدريب",
     "transform": "تحويل",
     "unet": "unet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "فشل الحذف",
       "deleted": "تم حذف سير العمل",
       "dirtyClose": "تم تعديل الملفات أدناه. هل تريد حفظها قبل الإغلاق؟",
+      "dirtyCloseAnyway": "إغلاق على أي حال",
       "dirtyCloseHint": "اضغط Shift للإغلاق بدون تنبيه",
       "dirtyCloseTitle": "حفظ التغييرات؟",
       "workflowTreeType": {
diff --git a/src/locales/ar/nodeDefs.json b/src/locales/ar/nodeDefs.json
index 5fdca65655..5b0eb2dfe6 100644
--- a/src/locales/ar/nodeDefs.json
+++ b/src/locales/ar/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "الصورة_البدء"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "إضافة ضجيج",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "توليد موحد من النص إلى الصورة وتحرير دقيق لجملة واحدة بدقة تصل إلى 4K.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_fail_on_partial": {
+        "name": "فشل عند التوليد الجزئي"
+      },
+      "model_height": {
+        "name": "الارتفاع"
+      },
+      "model_max_images": {
+        "name": "أقصى عدد للصور"
+      },
+      "model_size_preset": {
+        "name": "إعداد الحجم"
+      },
+      "model_width": {
+        "name": "العرض"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه نصي لإنشاء أو تعديل صورة."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة المستخدمة للتوليد."
+      },
+      "watermark": {
+        "name": "علامة مائية",
+        "tooltip": "هل تريد إضافة علامة \"تم الإنشاء بواسطة الذكاء الاصطناعي\" على الصورة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "توليد فيديو باستخدام نماذج ByteDance عبر API استنادًا إلى النص الموجه",
     "display_name": "ByteDance نص إلى فيديو",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "قيمة منطقية",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "تعيين نوافذ السياق يدويًا.",
     "display_name": "Context Windows (Manual)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "ما إذا كان يجب إضافة إطار تصحيح سببي لنوافذ السياق غير المفهرسة بالصفر."
+      },
       "closed_loop": {
         "name": "closed_loop",
         "tooltip": "ما إذا كان سيتم إغلاق حلقة نافذة السياق؛ تنطبق فقط على الجداول الحلقية."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "فضاء كامِن بكسل فارغ لـ HiDream-O1-Image. تم تدريب النموذج على دقة تقارب ٤ ميغابكسل؛ الدقات الأقل تخرج عن التوزيع وتنخفض الجودة بشكل ملحوظ. الدقات المدعومة: ٢٠٤٨×٢٠٤٨، ٢٣٠٤×١٧٢٨، ١٧٢٨×٢٣٠٤، ٢٥٦٠×١٤٤٠، ١٤٤٠×٢٥٦٠، ٢٤٩٦×١٦٦٤، ١٦٦٤×٢٤٩٦، ٣١٠٤×١٣١٢، ١٣١٢×٣١٠٤، ٢٣٠٤×١٧٩٢، ١٧٩٢×٢٣٠٤.",
+    "display_name": "صورة HiDream-O1 كامنة فارغة",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "توليد الصور عبر Flux.2 [pro] أو Flux.2 [max] من موجه وصور مرجعية اختيارية.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_height": {
+        "name": "الارتفاع"
+      },
+      "model_width": {
+        "name": "العرض"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه لتوليد أو تعديل الصورة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة العشوائية المستخدمة لإنشاء الضوضاء."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "ينشئ الصور بشكل متزامن بناءً على النص والوَضوح.",
     "display_name": "Flux.2 [max] صورة",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "توليد أو تعديل الصور بشكل متزامن عبر Google Vertex API.",
+    "display_name": "نانا موز 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "model_thinking_level": {
+        "name": "مستوى التفكير"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "وصف نصي للصورة المراد توليدها أو التعديلات التي يجب تطبيقها. أدرج أي قيود أو أنماط أو تفاصيل يجب على النموذج اتباعها."
+      },
+      "response_modalities": {
+        "name": "أنماط الاستجابة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "عند تثبيت البذرة على قيمة محددة، يبذل النموذج قصارى جهده لتقديم نفس الاستجابة للطلبات المتكررة. لا يتم ضمان إخراج حتمي. أيضًا، تغيير النموذج أو إعدادات المعلمات مثل درجة الحرارة قد يؤدي إلى اختلافات في الاستجابة حتى عند استخدام نفس قيمة البذرة. بشكل افتراضي، يتم استخدام قيمة بذرة عشوائية."
+      },
+      "system_prompt": {
+        "name": "موجه النظام",
+        "tooltip": "تعليمات أساسية تحدد سلوك الذكاء الاصطناعي."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "صورة التفكير",
+        "tooltip": "أول صورة من عملية تفكير النموذج. متوفرة فقط عند مستوى التفكير العالي ونمط الاستجابة صورة+نص."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "إنشاء استجابات نصية باستخدام نموذج الذكاء الاصطناعي Gemini من Google. يمكنك تقديم أنواع متعددة من المدخلات (نص، صور، صوت، فيديو) كسياق لإنشاء استجابات أكثر صلة ومعنى.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "تعديل صورة موجودة بناءً على موجه نصي",
+    "display_name": "تعديل صورة Grok",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "model_number_of_images": {
+        "name": "عدد الصور"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "الموجه النصي المستخدم لتوليد الصورة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "توليد صور باستخدام Grok بناءً على مطالبة نصية",
     "display_name": "صورة Grok",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "يتم حساب متوسط مخرجات النموذج عبر عدة مواضع لشبكة الباتشات المحوّلة خلال الجزء الأخير من عملية التوليد. يلغي الحواف.",
+    "display_name": "تنعيم حواف الباتش HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "المزج",
+        "tooltip": "average: متوسط بوزن متساوٍ. window: وزن نافذة هان يفضل كل تمريرة بعيداً عن حدود الباتش الخاصة بها. median: الوسيط لكل بكسل، يرفض التمريرات الشاذة."
+      },
+      "end_percent": {
+        "name": "نسبة النهاية",
+        "tooltip": "تقدم التوليد عند إيقاف المزج."
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "passes": {
+        "name": "عدد التمريرات",
+        "tooltip": "عدد التمريرات لكل خطوة مفعلة. ٢/٤ = ثابت. ramp_*: يزداد عدد التمريرات مع اقتراب التوليد من النهاية (مزيد من التنعيم حيث الحواف أكثر وضوحاً)."
+      },
+      "pattern": {
+        "name": "النمط",
+        "tooltip": "تخطيط التحويل. single_shift: تمريرة واحدة على شبكة الباتش الطبيعية + أخرى محوّلة. symmetric: جميع التمريرات خارج الشبكة، التحويلات موزعة حول الأصل."
+      },
+      "start_percent": {
+        "name": "نسبة البداية",
+        "tooltip": "تقدم التوليد (٠=بداية، ١=نهاية) عند تفعيل المزج."
+      },
+      "strength": {
+        "name": "القوة",
+        "tooltip": "تداخل بين التنبؤ الطبيعي (٠) والنتيجة الممزوجة (١)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "إرفاق ١-١٠ صور مرجعية للتهيئة، صورة واحدة لتعليمات التحرير أو عدة صور لتخصيص قائم على الموضوع.",
+    "display_name": "صور مرجعية HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "الصور",
+        "tooltip": "صور مرجعية. صورة واحدة = تحرير بالتعليمات؛ ٢-١٠ صور = مرجع متعدد."
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "تكبير الصور منخفضة الدقة إلى دقة فائقة، إزالة الشوائب والضوضاء. الحد الأقصى للإخراج: ٣٢ ميغابيكسل.",
     "display_name": "تحسين الصورة العام من HitPaw",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "تحميل نموذج إزالة الخلفية",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "اسم_إزالة_الخلفية",
+        "tooltip": "النموذج المستخدم لإزالة الخلفيات من الصور"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "نموذج_الخلفية",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "تحميل صورة",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "حرر صورة موجودة باستخدام مطالبة نصية عبر نموذج Luma UNI-1.",
+    "display_name": "تحرير صورة Luma UNI-1",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم للتحرير."
+      },
+      "model_style": {
+        "name": "النمط"
+      },
+      "model_web_search": {
+        "name": "بحث ويب"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "وصف التعديل المطلوب. من 1 إلى 6000 حرف."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "source": {
+        "name": "المصدر",
+        "tooltip": "الصورة المصدرية للتحرير."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "تعديل الصور بشكل متزامن بناءً على النص المطلوب ونسبة العرض إلى الارتفاع.",
     "display_name": "Luma صورة إلى صورة",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "توليد صور من نص باستخدام نموذج Luma UNI-1.",
+    "display_name": "صورة Luma UNI-1",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم للتوليد."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "model_style": {
+        "name": "النمط"
+      },
+      "model_web_search": {
+        "name": "بحث ويب"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "وصف نصي للصورة المطلوبة. من 1 إلى 6000 حرف."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "توليد الفيديوهات بشكل متزامن بناءً على النص المطلوب، الصور المدخلة، وحجم الإخراج.",
     "display_name": "Luma صورة إلى فيديو",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "مقياس ضوضاء النموذج",
+    "inputs": {
+      "model": {
+        "name": "النموذج"
+      },
+      "noise_scale": {
+        "name": "مقياس الضوضاء",
+        "tooltip": "مقياس الضوضاء المطلق أثناء التدريب. مثال HiDream-O1 base: ٨٫٠، dev: ٧٫٥."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "عقدة Moonvalley Marey صورة إلى فيديو",
-    "display_name": "Moonvalley Marey صورة إلى فيديو",
-    "inputs": {
-      "control_after_generate": {
-        "name": "التحكم بعد التوليد"
-      },
-      "image": {
-        "name": "الصورة",
-        "tooltip": "الصورة المرجعية المستخدمة لتوليد الفيديو"
-      },
-      "negative_prompt": {
-        "name": "النص التوجيهي السلبي",
-        "tooltip": "نص التوجيه السلبي"
-      },
-      "prompt": {
-        "name": "النص التوجيهي"
-      },
-      "prompt_adherence": {
-        "name": "الالتزام بالنص التوجيهي",
-        "tooltip": "مقياس التوجيه للتحكم في التوليد"
-      },
-      "resolution": {
-        "name": "الدقة",
-        "tooltip": "دقة الفيديو الناتج"
-      },
-      "seed": {
-        "name": "البذرة",
-        "tooltip": "قيمة البذرة العشوائية"
-      },
-      "steps": {
-        "name": "الخطوات",
-        "tooltip": "عدد خطوات إزالة الضوضاء"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey نص إلى فيديو",
-    "inputs": {
-      "control_after_generate": {
-        "name": "التحكم بعد التوليد"
-      },
-      "negative_prompt": {
-        "name": "النص التوجيهي السلبي",
-        "tooltip": "نص التوجيه السلبي"
-      },
-      "prompt": {
-        "name": "النص التوجيهي"
-      },
-      "prompt_adherence": {
-        "name": "الالتزام بالنص التوجيهي",
-        "tooltip": "مقياس التوجيه للتحكم في التوليد"
-      },
-      "resolution": {
-        "name": "الدقة",
-        "tooltip": "دقة الفيديو الناتج"
-      },
-      "seed": {
-        "name": "البذرة",
-        "tooltip": "قيمة البذرة العشوائية"
-      },
-      "steps": {
-        "name": "الخطوات",
-        "tooltip": "خطوات الاستدلال"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey من فيديو إلى فيديو",
-    "inputs": {
-      "control_type": {
-        "name": "نوع التحكم"
-      },
-      "motion_intensity": {
-        "name": "شدة الحركة",
-        "tooltip": "يستخدم فقط إذا كان نوع التحكم هو 'نقل الحركة'"
-      },
-      "negative_prompt": {
-        "name": "النص التوجيهي السلبي",
-        "tooltip": "نص النص التوجيهي السلبي"
-      },
-      "prompt": {
-        "name": "النص التوجيهي",
-        "tooltip": "يصف الفيديو المراد توليده"
-      },
-      "seed": {
-        "name": "البذرة",
-        "tooltip": "قيمة البذرة العشوائية"
-      },
-      "steps": {
-        "name": "الخطوات",
-        "tooltip": "عدد خطوات الاستدلال"
-      },
-      "video": {
-        "name": "الفيديو",
-        "tooltip": "الفيديو المرجعي المستخدم لتوليد الفيديو الناتج. يجب أن يكون طوله 5 ثوانٍ على الأقل. سيتم اقتصاص مقاطع الفيديو الأطول من 5 ثوانٍ تلقائيًا. يدعم فقط تنسيق MP4."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "مورفولوجيا الصورة",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "ينشئ صورًا بشكل متزامن عبر نقطة نهاية GPT Image 1 من OpenAI.",
-    "display_name": "OpenAI GPT صورة 1",
+    "description": "ينشئ صورًا بشكل متزامن عبر نقطة نهاية GPT Image 2 من OpenAI.",
+    "display_name": "OpenAI GPT صورة 2",
     "inputs": {
       "background": {
         "name": "الخلفية",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "النص الوصفي",
-        "tooltip": "النص الوصفي لـ GPT Image 1"
+        "tooltip": "النص الوصفي لـ GPT Image 2"
       },
       "quality": {
         "name": "الجودة",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "توليد الصور عبر نقطة نهاية GPT Image من OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_background": {
+        "name": "الخلفية"
+      },
+      "model_custom_height": {
+        "name": "ارتفاع مخصص"
+      },
+      "model_custom_width": {
+        "name": "عرض مخصص"
+      },
+      "model_quality": {
+        "name": "الجودة"
+      },
+      "model_size": {
+        "name": "الحجم"
+      },
+      "n": {
+        "name": "عدد الصور",
+        "tooltip": "كم عدد الصور التي سيتم توليدها"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه نصي لـ GPT Image"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "لم يتم تطبيقها بعد في الخلفية"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "يقوم بتحميل وإعداد ملفات الإدخال (نص، pdf، إلخ) لتضمينها كمدخلات لعقدة OpenAI Chat. سيتم قراءة الملفات بواسطة نموذج OpenAI عند إنشاء الرد. 🛈 تلميح: يمكن ربطها مع عقد OpenAI Input File الأخرى.",
     "display_name": "OpenAI ChatGPT Input Files",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "تحميل نموذج التدفق البصري",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "نموذج التدفق البصري المراد تحميله. يجب وضع الملفات في مجلد 'optical_flow'. حالياً، فقط raft_large.pth من torchvision مدعوم."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "مجدول الخطوات الأمثل",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "عدد صحيح",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "التحكم بعد التوليد"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "إزالة الخلفية",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "نموذج_إزالة_الخلفية",
+        "tooltip": "نموذج إزالة الخلفية المستخدم لتوليد القناع"
+      },
+      "image": {
+        "name": "الصورة",
+        "tooltip": "صورة الإدخال لإزالة الخلفية منها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "القناع",
+        "tooltip": "قناع المقدمة المُنتج"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "إعادة تهيئة CFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "عدد الإطارات لكل كتلة",
+        "tooltip": "عدد الإطارات في كل كتلة توليد تلقائي. ١ = إطار واحد، ٣ = مجموعة إطارات. يجب أن يتطابق مع وضع تدريب نقطة التحقق."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "المُعين المخصص",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "مُعين LCM مع ضوضاء قابلة للتعديل في كل خطوة. s_noise هو معامل لمقياس ضوضاء التدريب للنموذج",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "تقييد الضوضاء في كل خطوة إلى ±N*الانحراف المعياري. ٠ لتعطيل ذلك."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "معامل الضوضاء في كل خطوة عند الخطوة الأولى (١.٠ = يطابق التدريب)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "معامل الضوضاء في كل خطوة عند الخطوة الأخيرة. اجعله مساوياً لـ s_noise لجدول زمني ثابت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "المُعين LCM للتكبير",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "توليد نص",
     "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "استخدام القالب الافتراضي",
         "tooltip": "استخدم القالب/الوصف المدمج في النظام إذا كان النموذج يحتوي عليه."
+      },
+      "video": {
+        "name": "فيديو",
+        "tooltip": "إطارات الفيديو كمجموعة صور. يُفترض أن يكون بمعدل ٢٤ إطارًا في الثانية؛ يتم أخذ عينة فرعية إلى ١ إطار في الثانية داخليًا."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "استخدام القالب الافتراضي",
         "tooltip": "استخدم القالب/الوصف المدمج في النظام إذا كان النموذج يحتوي عليه."
+      },
+      "video": {
+        "name": "فيديو",
+        "tooltip": "إطارات الفيديو كمجموعة صور. يُفترض أن يكون بمعدل ٢٤ إطارًا في الثانية؛ يتم أخذ عينة فرعية إلى ١ إطار في الثانية داخليًا."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "أضف حياة جديدة للفيديو باستخدام تقنيات التكبير والاستعادة القوية.",
+    "display_name": "تحسين الفيديو Topaz",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "مستوى الضغط الديناميكي",
+        "tooltip": "مستوى CQP."
+      },
+      "interpolation_model": {
+        "name": "نموذج الاستيفاء"
+      },
+      "upscaler_model": {
+        "name": "نموذج التكبير"
+      },
+      "upscaler_model_creativity": {
+        "name": "الإبداع"
+      },
+      "upscaler_model_prompt": {
+        "name": "الموجه"
+      },
+      "upscaler_model_realism": {
+        "name": "الواقعية"
+      },
+      "upscaler_model_sharp": {
+        "name": "الحدة"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "دقة التكبير"
+      },
+      "video": {
+        "name": "فيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "نموذج TorchCompile",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "PBR"
       },
       "quad": {
-        "name": "رباعي"
+        "name": "رباعي",
+        "tooltip": "هذا المعامل قديم ولم يعد له أي تأثير."
       },
       "texture": {
         "name": "الملمس"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "عدد إطارات البكسل للمعالجة. بالنسبة لـ CogVideoX-Fun-V1.5 (patch_size_t=2)، يجب أن يكون latent_t عدداً زوجياً — الأطوال التي تنتج latent_t فردياً يتم تقريبها للأسفل (مثال: 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "قناع رباعي معالج مسبقاً من VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "إطارات الفيديو المصدر [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "نصف قطر التوسيع لمنطقة القناع الأساسية (٠ = بدون توسيع)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "عدد إطارات البكسل. يتم التقريب للأسفل لجعل latent_t عدداً زوجياً (متطلب patch_size_t=2)، مثال: 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "نموذج التدفق البصري من OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "إطارات الفيديو الناتجة من المرحلة الأولى [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "الضجيج المشوه (latent) من VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "مجدول VP",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "الصوت"
+      },
+      "audio_inject_scale": {
+        "name": "مقياس حقن الصوت",
+        "tooltip": "المقياس لميزات الصوت عند حقنها في نموذج الفيديو."
+      },
+      "video_frames": {
+        "name": "إطارات الفيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مخرجات مشفر الصوت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلسلة معدل الإطارات (fps)",
+        "tooltip": "معدل الإطارات المحسوب بناءً على طول الصوت وعدد إطارات الفيديو. يُستخدم في الموجه."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "الصوت المستخدم لحساب إجمالي إطارات الإخراج واستخراج صوت المقطع."
+      },
+      "images": {
+        "name": "الصور"
+      },
+      "segment_index": {
+        "name": "فهرس المقطع",
+        "tooltip": "أي مقطع هذا (٠ للأول، ١ للثاني، إلخ.)"
+      },
+      "segment_length": {
+        "name": "طول المقطع",
+        "tooltip": "طول هذا المقطع (عادةً ١٤٩ إطاراً)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تسلسل الإطارات الرئيسية المبطنة",
+        "tooltip": "تسلسل الإطارات الرئيسية بعد التبطين"
+      },
+      "1": {
+        "name": "قناع الإطارات الرئيسية",
+        "tooltip": "قناع يحدد الإطارات الصالحة"
+      },
+      "2": {
+        "name": "مقطع الصوت",
+        "tooltip": "مقطع الصوت لهذا الجزء من الفيديو"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "الصوت الذي سيتم تقطيعه لكل مقطع صادر."
+      },
+      "images": {
+        "name": "الصور"
+      },
+      "num_segments": {
+        "name": "عدد المقاطع",
+        "tooltip": "عدد المقاطع المبطنة التي سيتم إصدارها كقوائم."
+      },
+      "segment_length": {
+        "name": "طول المقطع",
+        "tooltip": "طول كل مقطع (عادةً ١٤٩ إطاراً)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تسلسلات الإطارات الرئيسية المبطنة",
+        "tooltip": "تسلسلات الإطارات الرئيسية بعد التبطين"
+      },
+      "1": {
+        "name": "أقنعة الإطارات الرئيسية",
+        "tooltip": "أقنعة تحدد الإطارات الصالحة"
+      },
+      "2": {
+        "name": "مقطع الصوت",
+        "tooltip": "مقطع الصوت لكل جزء من الفيديو"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "مخرجات ترميز الصوت"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "تضمينات CLIP للرؤية للإطار الأول."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "تضمينات CLIP للرؤية لصورة المرجع."
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول",
+        "tooltip": "عدد الإطارات في الفيديو المُنتج. يجب أن يبقى ١٤٩ لـ WanDancer."
+      },
+      "mask": {
+        "name": "قناع",
+        "tooltip": "قناع معالجة الصورة للصورة/الصور الابتدائية. الأبيض يبقى، الأسود يُولّد. يُستخدم للتوليد المحلي."
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "start_image": {
+        "name": "الصورة الابتدائية",
+        "tooltip": "الصورة أو الصور الأولية التي سيتم ترميزها، يمكن أن تكون أي عدد من الإطارات."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كامِن",
+        "tooltip": "كامِن فارغ."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "وان إطار أول وآخر إلى فيديو",
     "inputs": {
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 882b61245c..85d6009b5f 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -979,6 +979,7 @@
       "dirtyCloseTitle": "Save Changes?",
       "dirtyClose": "The files below have been changed.  Would you like to save them before closing?",
       "dirtyCloseHint": "Hold Shift to close without prompt",
+      "dirtyCloseAnyway": "Close anyway",
       "confirmOverwriteTitle": "Overwrite existing file?",
       "confirmOverwrite": "The file below already exists. Would you like to overwrite it?",
       "workflowTreeType": {
@@ -1649,7 +1650,7 @@
     "Directories": "Directories"
   },
   "nodeCategories": {
-    "_for_testing": "_for_testing",
+    "experimental": "experimental",
     "custom_sampling": "custom_sampling",
     "noise": "noise",
     "dataset": "dataset",
@@ -1657,10 +1658,12 @@
     "image": "image",
     "sampling": "sampling",
     "schedulers": "schedulers",
-    "audio": "audio",
     "conditioning": "conditioning",
+    "video_models": "video_models",
+    "audio": "audio",
     "loaders": "loaders",
     "guiders": "guiders",
+    "batch": "batch",
     "latent": "latent",
     "mask": "mask",
     "api node": "api node",
@@ -1668,8 +1671,6 @@
     "video": "video",
     "ByteDance": "ByteDance",
     "preprocessors": "preprocessors",
-    "utils": "utils",
-    "string": "string",
     "advanced": "advanced",
     "guidance": "guidance",
     "model_merging": "model_merging",
@@ -1678,20 +1679,18 @@
     "attention_experiments": "attention_experiments",
     "flux": "flux",
     "kandinsky5": "kandinsky5",
+    "utils": "utils",
     "postprocessing": "postprocessing",
     "hooks": "hooks",
     "combine": "combine",
-    "math": "math",
     "logic": "logic",
     "cond single": "cond single",
-    "context": "context",
     "controlnet": "controlnet",
     "inpaint": "inpaint",
     "scheduling": "scheduling",
     "create": "create",
     "deprecated": "deprecated",
     "detection": "detection",
-    "": "",
     "debug": "debug",
     "model": "model",
     "ElevenLabs": "ElevenLabs",
@@ -1702,17 +1701,17 @@
     "unet": "unet",
     "sigmas": "sigmas",
     "BFL": "BFL",
+    "": "",
     "Gemini": "Gemini",
-    "video_models": "video_models",
     "gligen": "gligen",
     "shader": "shader",
     "Grok": "Grok",
     "Wan": "Wan",
     "HitPaw": "HitPaw",
-    "sd": "sd",
+    "3d_models": "3d_models",
     "Ideogram": "Ideogram",
     "transform": "transform",
-    "batch": "batch",
+    "color": "color",
     "upscaling": "upscaling",
     "instructpix2pix": "instructpix2pix",
     "compositing": "compositing",
@@ -1727,7 +1726,6 @@
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "model_specific": "model_specific",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "Sora": "Sora",
     "cond pair": "cond pair",
@@ -1737,27 +1735,24 @@
     "Quiver": "Quiver",
     "Recraft": "Recraft",
     "edit_models": "edit_models",
+    "background removal": "background removal",
     "Reve": "Reve",
     "Rodin": "Rodin",
     "Runway": "Runway",
     "animation": "animation",
-    "api": "api",
     "save": "save",
     "upscale_diffusion": "upscale_diffusion",
     "clip": "clip",
     "Sonilo": "Sonilo",
     "Stability AI": "Stability AI",
     "stable_cascade": "stable_cascade",
-    "3d_models": "3d_models",
     "style_model": "style_model",
     "supir": "supir",
     "Tencent": "Tencent",
-    "textgen": "textgen",
     "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
-    "camera": "camera",
     "WaveSpeed": "WaveSpeed",
     "zimage": "zimage"
   },
@@ -1767,6 +1762,7 @@
     "AUDIO_ENCODER": "AUDIO_ENCODER",
     "AUDIO_ENCODER_OUTPUT": "AUDIO_ENCODER_OUTPUT",
     "AUDIO_RECORD": "AUDIO_RECORD",
+    "BACKGROUND_REMOVAL": "BACKGROUND_REMOVAL",
     "BOOLEAN": "BOOLEAN",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "CAMERA_CONTROL",
@@ -1820,6 +1816,7 @@
     "NOISE": "NOISE",
     "OPENAI_CHAT_CONFIG": "OPENAI_CHAT_CONFIG",
     "OPENAI_INPUT_FILES": "OPENAI_INPUT_FILES",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PIXVERSE_TEMPLATE",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2188,7 +2185,8 @@
       "freeTierBadge": "Eligible for Free Tier",
       "freeTierDescription": "Sign up with Google to get {credits} free credits every month. No card needed.",
       "freeTierDescriptionGeneric": "Sign up with Google to get free credits every month. No card needed.",
-      "backToSocialLogin": "Sign up with Google or Github instead"
+      "backToSocialLogin": "Sign up with Google or Github instead",
+      "backToGithubLogin": "Sign up with Github instead"
     },
     "signup": {
       "title": "Create an account",
@@ -2210,7 +2208,9 @@
       "success": "Signed out successfully",
       "successDetail": "You have been signed out of your account.",
       "unsavedChangesTitle": "Unsaved Changes",
-      "unsavedChangesMessage": "You have unsaved changes that will be lost when you sign out. Do you want to continue?"
+      "unsavedChangesMessage": "You have unsaved changes that will be lost when you sign out. Do you want to continue?",
+      "signOutAnyway": "Sign out anyway",
+      "saveFailed": "Sign-out cancelled because saving \"{workflow}\" failed."
     },
     "passwordUpdate": {
       "success": "Password Updated",
diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json
index 9efaf1cd17..f093995736 100644
--- a/src/locales/en/nodeDefs.json
+++ b/src/locales/en/nodeDefs.json
@@ -141,6 +141,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioAdjustVolume": {
     "display_name": "Audio Adjust Volume",
     "inputs": {
@@ -196,7 +230,7 @@
     }
   },
   "AudioEncoderLoader": {
-    "display_name": "AudioEncoderLoader",
+    "display_name": "Load Audio Encoder",
     "inputs": {
       "audio_encoder_name": {
         "name": "audio_encoder_name"
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "description": "Unified text-to-image generation and precise single-sentence editing at up to 4K resolution.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text prompt for creating or editing an image."
+      },
+      "model": {
+        "name": "model"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to use for generation."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Whether to add an \"AI generated\" watermark to the image."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_fail_on_partial": {
+        "name": "fail_on_partial"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_max_images": {
+        "name": "max_images"
+      },
+      "model_size_preset": {
+        "name": "size_preset"
+      },
+      "model_width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "display_name": "ByteDance Text to Video",
     "description": "Generate video using ByteDance models via api based on prompt",
@@ -988,7 +1066,7 @@
     }
   },
   "CaseConverter": {
-    "display_name": "Text Case Converter",
+    "display_name": "Convert Text Case",
     "inputs": {
       "string": {
         "name": "string"
@@ -1185,7 +1263,7 @@
   },
   "CLIPLoader": {
     "display_name": "Load CLIP",
-    "description": "[Recipes]\n\nstable_diffusion: clip-l\nstable_cascade: clip-g\nsd3: t5 xxl/ clip-g / clip-l\nstable_audio: t5 base\nmochi: t5 xxl\ncosmos: old t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\n hidream: llama-3.1 (Recommend) or t5\nomnigen2: qwen vl 2.5 3B",
+    "description": "[Recipes]\n\nstable_diffusion: clip-l\nstable_cascade: clip-g\nsd3: t5 xxl/ clip-g / clip-l\nstable_audio: t5 base\nmochi: t5 xxl\ncogvideox: t5 xxl (226-token padding)\ncosmos: old t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\n hidream: llama-3.1 (Recommend) or t5\nomnigen2: qwen vl 2.5 3B",
     "inputs": {
       "clip_name": {
         "name": "clip_name"
@@ -1553,13 +1631,17 @@
     }
   },
   "ColorTransfer": {
-    "display_name": "ColorTransfer",
+    "display_name": "Color Transfer",
     "description": "Match the colors of one image to another using various algorithms.",
     "inputs": {
       "image_target": {
         "name": "image_target",
         "tooltip": "Image(s) to apply the color transform to."
       },
+      "image_ref": {
+        "name": "image_ref",
+        "tooltip": "Reference image(s) to match colors to."
+      },
       "method": {
         "name": "method"
       },
@@ -1569,10 +1651,6 @@
       },
       "strength": {
         "name": "strength"
-      },
-      "image_ref": {
-        "name": "image_ref",
-        "tooltip": "Reference image(s) to match colors to. If not provided, processing is skipped"
       }
     },
     "outputs": {
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -2011,6 +2093,10 @@
       "split_conds_to_windows": {
         "name": "split_conds_to_windows",
         "tooltip": "Whether to split multiple conditionings (created by ConditionCombine) to each window based on region index."
+      },
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Whether to add a causal fix frame to non-0-indexed context windows."
       }
     },
     "outputs": {
@@ -2020,7 +2106,7 @@
     }
   },
   "ControlNetApply": {
-    "display_name": "Apply ControlNet (OLD)",
+    "display_name": "Apply ControlNet (DEPRECATED)",
     "inputs": {
       "conditioning": {
         "name": "conditioning"
@@ -2434,7 +2520,7 @@
     }
   },
   "CropMask": {
-    "display_name": "CropMask",
+    "display_name": "Crop Mask",
     "inputs": {
       "mask": {
         "name": "mask"
@@ -2966,6 +3052,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAudio": {
     "display_name": "Empty Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "display_name": "Empty HiDream-O1 Latent Image",
+    "description": "Empty pixel-space latent for HiDream-O1-Image. The model was trained at ~4 megapixels; lower resolutions go off-distribution and quality regresses noticeably. Trained resolutions: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "inputs": {
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3112,7 +3240,7 @@
     }
   },
   "EmptyImage": {
-    "display_name": "EmptyImage",
+    "display_name": "Empty Image",
     "inputs": {
       "width": {
         "name": "width"
@@ -3331,7 +3459,7 @@
     }
   },
   "FeatherMask": {
-    "display_name": "FeatherMask",
+    "display_name": "Feather Mask",
     "inputs": {
       "mask": {
         "name": "mask"
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "display_name": "Flux.2 Image",
+    "description": "Generate images via Flux.2 [pro] or Flux.2 [max] from a prompt and optional reference images.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt for the image generation or edit"
+      },
+      "model": {
+        "name": "model"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "The random seed used for creating the noise."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "display_name": "Flux.2 [max] Image",
     "description": "Generates images synchronously based on prompt and resolution.",
@@ -4037,6 +4196,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "display_name": "Nano Banana 2",
+    "description": "Generate or edit images synchronously via Google Vertex API.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text prompt describing the image to generate or the edits to apply. Include any constraints, styles, or details the model should follow."
+      },
+      "model": {
+        "name": "model"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "When the seed is fixed to a specific value, the model makes a best effort to provide the same response for repeated requests. Deterministic output isn't guaranteed. Also, changing the model or parameter settings, such as the temperature, can cause variations in the response even when you use the same seed value. By default, a random seed value is used."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Foundational instructions that dictate an AI's behavior."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "First image from the model's thinking process. Only available with thinking_level HIGH and IMAGE+TEXT modality."
+      }
+    }
+  },
   "GeminiNode": {
     "display_name": "Google Gemini",
     "description": "Generate text responses with Google's Gemini AI model. You can provide multiple types of inputs (text, images, audio, video) as context for generating more relevant and meaningful responses.",
@@ -4216,7 +4423,7 @@
     }
   },
   "GLIGENLoader": {
-    "display_name": "GLIGENLoader",
+    "display_name": "Load GLIGEN Model",
     "inputs": {
       "gligen_name": {
         "name": "gligen_name"
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "display_name": "Grok Image Edit",
+    "description": "Modify an existing image based on a text prompt",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "The text prompt used to generate the image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_number_of_images": {
+        "name": "number_of_images"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "display_name": "Grok Image",
     "description": "Generate images using Grok based on a text prompt",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "display_name": "HiDream-O1 Patch Seam Smoothing",
+    "description": "Average the model output across multiple shifted patch-grid positions during the late portion of sampling. Cancels seams.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "start_percent": {
+        "name": "start_percent",
+        "tooltip": "Sampling progress (0=start, 1=end) at which the blend turns ON."
+      },
+      "end_percent": {
+        "name": "end_percent",
+        "tooltip": "Sampling progress at which the blend turns OFF."
+      },
+      "pattern": {
+        "name": "pattern",
+        "tooltip": "Shift layout. single_shift: one pass at the natural patch grid + others offset. symmetric: all passes off-grid, shifts split around origin."
+      },
+      "passes": {
+        "name": "passes",
+        "tooltip": "Number of passes per gated step. 2/4 = fixed. ramp_*: pass count increases as sampling approaches end (more smoothing where seams are most visible)."
+      },
+      "blend": {
+        "name": "blend",
+        "tooltip": "average: equal-weight mean. window: Hann-windowed weighting favoring each pass away from its patch boundaries. median: per-pixel median, rejects wraparound-outlier passes."
+      },
+      "strength": {
+        "name": "strength",
+        "tooltip": "Interpolation between the natural-grid pred (0) and the averaged result (1)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "display_name": "HiDream-O1 Reference Images",
+    "description": "Attach 1-10 reference images to conditioning, one for edit instructionor multiple for subject-driven personalization.",
+    "inputs": {
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Reference images. 1 image = instruction edit; 2-10 images = multi reference."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "display_name": "HitPaw General Image Enhance",
     "description": "Upscale low-resolution images to super-resolution, eliminate artifacts and noise. Maximum output: 32 megapixels.",
@@ -4813,7 +5118,7 @@
     }
   },
   "HunyuanRefinerLatent": {
-    "display_name": "HunyuanRefinerLatent",
+    "display_name": "Hunyuan Latent Refiner",
     "inputs": {
       "positive": {
         "name": "positive"
@@ -4918,7 +5223,7 @@
     }
   },
   "HunyuanVideo15SuperResolution": {
-    "display_name": "HunyuanVideo15SuperResolution",
+    "display_name": "Hunyuan Video 1.5 Super Resolution",
     "inputs": {
       "positive": {
         "name": "positive"
@@ -4958,7 +5263,7 @@
     }
   },
   "HypernetworkLoader": {
-    "display_name": "HypernetworkLoader",
+    "display_name": "Load Hypernetwork",
     "inputs": {
       "model": {
         "name": "model"
@@ -5146,7 +5451,7 @@
     }
   },
   "ImageAddNoise": {
-    "display_name": "ImageAddNoise",
+    "display_name": "Add Noise to Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5169,7 +5474,7 @@
     }
   },
   "ImageBatch": {
-    "display_name": "Batch Images",
+    "display_name": "Batch Images (DEPRECATED)",
     "inputs": {
       "image1": {
         "name": "image1"
@@ -5180,7 +5485,7 @@
     }
   },
   "ImageBlend": {
-    "display_name": "Image Blend",
+    "display_name": "Blend Images",
     "inputs": {
       "image1": {
         "name": "image1"
@@ -5237,7 +5542,7 @@
     }
   },
   "ImageCompare": {
-    "display_name": "Image Compare",
+    "display_name": "Compare Images",
     "description": "Compares two images side by side with a slider.",
     "inputs": {
       "compare_view": {
@@ -5252,7 +5557,7 @@
     }
   },
   "ImageCompositeMasked": {
-    "display_name": "ImageCompositeMasked",
+    "display_name": "Image Composite Masked",
     "inputs": {
       "destination": {
         "name": "destination"
@@ -5280,7 +5585,7 @@
     }
   },
   "ImageCrop": {
-    "display_name": "Image Crop (Deprecated)",
+    "display_name": "Crop Image (DEPRECATED)",
     "inputs": {
       "image": {
         "name": "image"
@@ -5305,7 +5610,7 @@
     }
   },
   "ImageCropV2": {
-    "display_name": "Image Crop",
+    "display_name": "Crop Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5344,7 +5649,7 @@
     }
   },
   "ImageFlip": {
-    "display_name": "ImageFlip",
+    "display_name": "Flip Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5360,7 +5665,7 @@
     }
   },
   "ImageFromBatch": {
-    "display_name": "ImageFromBatch",
+    "display_name": "Get Image from Batch",
     "inputs": {
       "image": {
         "name": "image"
@@ -5440,7 +5745,7 @@
     }
   },
   "ImageInvert": {
-    "display_name": "Invert Image",
+    "display_name": "Invert Image Colors",
     "inputs": {
       "image": {
         "name": "image"
@@ -5518,7 +5823,7 @@
     }
   },
   "ImageQuantize": {
-    "display_name": "ImageQuantize",
+    "display_name": "Quantize Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5537,7 +5842,7 @@
     }
   },
   "ImageRGBToYUV": {
-    "display_name": "ImageRGBToYUV",
+    "display_name": "Image RGB to YUV",
     "inputs": {
       "image": {
         "name": "image"
@@ -5559,7 +5864,7 @@
     }
   },
   "ImageRotate": {
-    "display_name": "Image Rotate",
+    "display_name": "Rotate Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5609,7 +5914,7 @@
     }
   },
   "ImageScaleToMaxDimension": {
-    "display_name": "ImageScaleToMaxDimension",
+    "display_name": "Scale Image to Max Dimension",
     "inputs": {
       "image": {
         "name": "image"
@@ -5628,7 +5933,7 @@
     }
   },
   "ImageScaleToTotalPixels": {
-    "display_name": "ImageScaleToTotalPixels",
+    "display_name": "Scale Image to Total Pixels",
     "inputs": {
       "image": {
         "name": "image"
@@ -5650,7 +5955,7 @@
     }
   },
   "ImageSharpen": {
-    "display_name": "ImageSharpen",
+    "display_name": "Sharpen Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -5672,7 +5977,7 @@
     }
   },
   "ImageStitch": {
-    "display_name": "Image Stitch",
+    "display_name": "Stitch Images",
     "description": "Stitches image2 to image1 in the specified direction.\nIf image2 is not provided, returns image1 unchanged.\nOptional spacing can be added between images.",
     "inputs": {
       "image1": {
@@ -5733,7 +6038,7 @@
     }
   },
   "ImageYUVToRGB": {
-    "display_name": "ImageYUVToRGB",
+    "display_name": "Image YUV to RGB",
     "inputs": {
       "Y": {
         "name": "Y"
@@ -5818,7 +6123,7 @@
     }
   },
   "InvertMask": {
-    "display_name": "InvertMask",
+    "display_name": "Invert Mask",
     "inputs": {
       "mask": {
         "name": "mask"
@@ -5865,7 +6170,7 @@
     }
   },
   "JsonExtractString": {
-    "display_name": "Extract String from JSON",
+    "display_name": "Extract Text from JSON",
     "inputs": {
       "json_string": {
         "name": "json_string"
@@ -7524,6 +7829,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Load Background Removal Model",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "bg_removal_name",
+        "tooltip": "The model used to remove backgrounds from images"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Load Image",
     "inputs": {
@@ -8185,7 +8505,7 @@
     }
   },
   "LTXVPreprocess": {
-    "display_name": "LTXVPreprocess",
+    "display_name": "LTXV Preprocess",
     "inputs": {
       "image": {
         "name": "image"
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "display_name": "Luma UNI-1 Image Edit",
+    "description": "Edit an existing image with a text prompt using the Luma UNI-1 model.",
+    "inputs": {
+      "source": {
+        "name": "source",
+        "tooltip": "Source image to edit."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Description of the desired edit. 1–6000 characters."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for editing."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed controls whether the node should re-run; results are non-deterministic regardless of seed."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "display_name": "Luma Image to Image",
     "description": "Modifies images synchronously based on prompt and aspect ratio.",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "display_name": "Luma UNI-1 Image",
+    "description": "Generate images from text using the Luma UNI-1 model.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text description of the desired image. 1–6000 characters."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for generation."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed controls whether the node should re-run; results are non-deterministic regardless of seed."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "display_name": "Luma Image to Video",
     "description": "Generates videos synchronously based on prompt, input images, and output_size.",
@@ -8775,7 +9166,7 @@
     }
   },
   "MaskComposite": {
-    "display_name": "MaskComposite",
+    "display_name": "Combine Masks",
     "inputs": {
       "destination": {
         "name": "destination"
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "ModelNoiseScale",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "noise_scale": {
+        "name": "noise_scale",
+        "tooltip": "Absolute training noise scale. For example HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "display_name": "Moonvalley Marey Image to Video",
-    "description": "Moonvalley Marey Image to Video Node",
-    "inputs": {
-      "image": {
-        "name": "image",
-        "tooltip": "The reference image used to generate the video"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Negative prompt text"
-      },
-      "resolution": {
-        "name": "resolution",
-        "tooltip": "Resolution of the output video"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Guidance scale for generation control"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Random seed value"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Number of denoising steps"
-      },
-      "control_after_generate": {
-        "name": "control after generate"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey Text to Video",
-    "inputs": {
-      "prompt": {
-        "name": "prompt"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Negative prompt text"
-      },
-      "resolution": {
-        "name": "resolution",
-        "tooltip": "Resolution of the output video"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Guidance scale for generation control"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Random seed value"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Inference steps"
-      },
-      "control_after_generate": {
-        "name": "control after generate"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Video to Video",
-    "inputs": {
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Describes the video to generate"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Negative prompt text"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Random seed value"
-      },
-      "video": {
-        "name": "video",
-        "tooltip": "The reference video used to generate the output video. Must be at least 5 seconds long. Videos longer than 5s will be automatically trimmed. Only MP4 format supported."
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Number of inference steps"
-      },
-      "control_type": {
-        "name": "control_type"
-      },
-      "motion_intensity": {
-        "name": "motion_intensity",
-        "tooltip": "Only used if control_type is 'Motion Transfer'"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "ImageMorphology",
     "inputs": {
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "display_name": "OpenAI GPT Image 2",
+    "description": "Generates images via OpenAI's GPT Image endpoint.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text prompt for GPT Image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "How many images to generate"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "not implemented yet in backend"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_background": {
+        "name": "background"
+      },
+      "model_custom_height": {
+        "name": "custom_height"
+      },
+      "model_custom_width": {
+        "name": "custom_width"
+      },
+      "model_quality": {
+        "name": "quality"
+      },
+      "model_size": {
+        "name": "size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "display_name": "OpenAI ChatGPT Input Files",
     "description": "Loads and prepares input files (text, pdf, etc.) to include as inputs for the OpenAI Chat Node. The files will be read by the OpenAI model when generating a response. 🛈 TIP: Can be chained together with other OpenAI Input File nodes.",
@@ -11901,7 +12234,7 @@
     }
   },
   "OpenAIVideoSora2": {
-    "display_name": "OpenAI Sora - Video (Deprecated)",
+    "display_name": "OpenAI Sora - Video (DEPRECATED)",
     "description": "OpenAI video and audio generation.\n\nDEPRECATION NOTICE: OpenAI will stop serving the Sora v2 API in September 2026. This node will be removed from ComfyUI at that time.",
     "inputs": {
       "model": {
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Load Optical Flow Model",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Optical flow model to load.  Files must be placed in the 'optical_flow' folder.  Today only torchvision's raft_large.pth is supported."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12144,7 +12491,7 @@
     }
   },
   "PerpNeg": {
-    "display_name": "Perp-Neg (DEPRECATED by PerpNegGuider)",
+    "display_name": "Perp-Neg (DEPRECATED by Perp-Neg Guider)",
     "inputs": {
       "model": {
         "name": "model"
@@ -12163,7 +12510,7 @@
     }
   },
   "PerpNegGuider": {
-    "display_name": "PerpNegGuider",
+    "display_name": "Perp-Neg Guider",
     "inputs": {
       "model": {
         "name": "model"
@@ -12537,7 +12884,7 @@
       "value": {
         "name": "value"
       },
-      "control_after_generate": {
+      "fixed": {
         "name": "control after generate"
       }
     },
@@ -12548,7 +12895,7 @@
     }
   },
   "PrimitiveString": {
-    "display_name": "String",
+    "display_name": "Text String",
     "inputs": {
       "value": {
         "name": "value"
@@ -12561,7 +12908,7 @@
     }
   },
   "PrimitiveStringMultiline": {
-    "display_name": "String (Multiline)",
+    "display_name": "Text String (Multiline)",
     "inputs": {
       "value": {
         "name": "value"
@@ -13297,7 +13644,7 @@
     }
   },
   "RegexExtract": {
-    "display_name": "Text Extract Substring",
+    "display_name": "Extract Text",
     "inputs": {
       "string": {
         "name": "string"
@@ -13328,7 +13675,7 @@
     }
   },
   "RegexMatch": {
-    "display_name": "Text Match",
+    "display_name": "Match Text",
     "inputs": {
       "string": {
         "name": "string"
@@ -13354,7 +13701,7 @@
     }
   },
   "RegexReplace": {
-    "display_name": "Text Replace (Regex)",
+    "display_name": "Replace Text (Regex)",
     "description": "Find and replace text using regex patterns.",
     "inputs": {
       "string": {
@@ -13387,6 +13734,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Remove Background",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "Input image to remove the background from"
+      },
+      "bg_removal_model": {
+        "name": "bg_removal_model",
+        "tooltip": "Background removal model used to generate the mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "Generated foreground mask"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -13407,7 +13773,7 @@
     }
   },
   "RepeatImageBatch": {
-    "display_name": "RepeatImageBatch",
+    "display_name": "Repeat Image Batch",
     "inputs": {
       "image": {
         "name": "image"
@@ -13490,7 +13856,7 @@
     }
   },
   "ResizeAndPadImage": {
-    "display_name": "ResizeAndPadImage",
+    "display_name": "Resize And Pad Image",
     "inputs": {
       "image": {
         "name": "image"
@@ -14140,11 +14506,11 @@
       },
       "detection_threshold": {
         "name": "detection_threshold",
-        "tooltip": "Score threshold for text-prompted detection"
+        "tooltip": "Score threshold for text-prompted detection."
       },
       "max_objects": {
         "name": "max_objects",
-        "tooltip": "Max tracked objects (0=unlimited). Initial masks count toward this limit."
+        "tooltip": "Max tracked objects. Initial masks count toward this limit. 0 uses the internal cap of 64."
       },
       "detect_interval": {
         "name": "detect_interval",
@@ -14166,6 +14532,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "Frames per autoregressive block. 1 = framewise, 3 = chunkwise. Must match the checkpoint's training mode."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "SamplerCustom",
     "inputs": {
@@ -14428,6 +14808,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "display_name": "SamplerLCM",
+    "description": "LCM sampler with tunable per-step noise. s_noise is a multiplier on the model's training noise scale",
+    "inputs": {
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Per-step noise multiplier at the first step (1.0 = match training)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Per-step noise multiplier at the last step. Set equal to s_noise for a constant schedule."
+      },
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Clamp per-step noise to +/- N*std. 0 disables."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -14700,7 +15103,7 @@
     }
   },
   "SaveImageWebsocket": {
-    "display_name": "SaveImageWebsocket",
+    "display_name": "Save Image (Websocket)",
     "inputs": {
       "images": {
         "name": "images"
@@ -14736,7 +15139,7 @@
     }
   },
   "SaveSVGNode": {
-    "display_name": "SaveSVGNode",
+    "display_name": "Save SVG",
     "description": "Save SVG files on disk.",
     "inputs": {
       "svg": {
@@ -14792,7 +15195,7 @@
     }
   },
   "SaveWEBM": {
-    "display_name": "SaveWEBM",
+    "display_name": "Save WEBM",
     "inputs": {
       "images": {
         "name": "images"
@@ -15850,7 +16253,7 @@
     }
   },
   "StringCompare": {
-    "display_name": "Text Compare",
+    "display_name": "Compare Text",
     "inputs": {
       "string_a": {
         "name": "string_a"
@@ -15872,7 +16275,7 @@
     }
   },
   "StringConcatenate": {
-    "display_name": "Text Concatenate",
+    "display_name": "Concatenate Text",
     "inputs": {
       "string_a": {
         "name": "string_a"
@@ -15891,7 +16294,7 @@
     }
   },
   "StringContains": {
-    "display_name": "Text Contains",
+    "display_name": "Contains Text",
     "inputs": {
       "string": {
         "name": "string"
@@ -15925,7 +16328,7 @@
     }
   },
   "StringReplace": {
-    "display_name": "Text Replace",
+    "display_name": "Replace Text",
     "inputs": {
       "string": {
         "name": "string"
@@ -15944,7 +16347,7 @@
     }
   },
   "StringSubstring": {
-    "display_name": "Text Substring",
+    "display_name": "Substring",
     "inputs": {
       "string": {
         "name": "string"
@@ -15963,7 +16366,7 @@
     }
   },
   "StringTrim": {
-    "display_name": "Text Trim",
+    "display_name": "Trim Text",
     "inputs": {
       "string": {
         "name": "string"
@@ -16622,7 +17025,7 @@
     }
   },
   "TextGenerate": {
-    "display_name": "TextGenerate",
+    "display_name": "Generate Text",
     "inputs": {
       "clip": {
         "name": "clip"
@@ -16639,6 +17042,13 @@
       "image": {
         "name": "image"
       },
+      "video": {
+        "name": "video",
+        "tooltip": "Video frames as image batch. Assumed to be 24 FPS; subsampled to 1 FPS internally."
+      },
+      "audio": {
+        "name": "audio"
+      },
       "thinking": {
         "name": "thinking",
         "tooltip": "Operate in thinking mode if the model supports it."
@@ -16677,7 +17087,7 @@
     }
   },
   "TextGenerateLTX2Prompt": {
-    "display_name": "TextGenerateLTX2Prompt",
+    "display_name": "Generate LTX2 Prompt",
     "inputs": {
       "clip": {
         "name": "clip"
@@ -16694,6 +17104,13 @@
       "image": {
         "name": "image"
       },
+      "video": {
+        "name": "video",
+        "tooltip": "Video frames as image batch. Assumed to be 24 FPS; subsampled to 1 FPS internally."
+      },
+      "audio": {
+        "name": "audio"
+      },
       "thinking": {
         "name": "thinking",
         "tooltip": "Operate in thinking mode if the model supports it."
@@ -16853,7 +17270,7 @@
     }
   },
   "TopazVideoEnhance": {
-    "display_name": "Topaz Video Enhance",
+    "display_name": "Topaz Video Enhance (Legacy)",
     "description": "Breathe new life into video with powerful upscaling and recovery technology.",
     "inputs": {
       "video": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "display_name": "Topaz Video Enhance",
+    "description": "Breathe new life into video with powerful upscaling and recovery technology.",
+    "inputs": {
+      "video": {
+        "name": "video"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "CQP level."
+      },
+      "upscaler_model_creativity": {
+        "name": "creativity"
+      },
+      "upscaler_model_prompt": {
+        "name": "prompt"
+      },
+      "upscaler_model_realism": {
+        "name": "realism"
+      },
+      "upscaler_model_sharp": {
+        "name": "sharp"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "upscaler_resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "TorchCompileModel",
     "inputs": {
@@ -17250,7 +17706,8 @@
         "name": "face_limit"
       },
       "quad": {
-        "name": "quad"
+        "name": "quad",
+        "tooltip": "This parameter is deprecated and does nothing."
       },
       "geometry_quality": {
         "name": "geometry_quality"
@@ -17457,7 +17914,7 @@
     }
   },
   "unCLIPCheckpointLoader": {
-    "display_name": "unCLIPCheckpointLoader",
+    "display_name": "Load unCLIP Checkpoint",
     "inputs": {
       "ckpt_name": {
         "name": "ckpt_name"
@@ -18525,8 +18982,129 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Source video frames [T, H, W, 3]"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "Preprocessed quadmask from VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Number of pixel frames to process. For CogVideoX-Fun-V1.5 (patch_size_t=2), latent_t must be even — lengths that produce odd latent_t are rounded down (e.g. 49 → 45)."
+      },
+      "batch_size": {
+        "name": "batch_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "mask": {
+        "name": "mask"
+      },
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Dilation radius for the primary mask region (0 = no dilation)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "Optical flow model from OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Pass 1 output video frames [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Number of pixel frames. Rounded down to make latent_t even (patch_size_t=2 requirement), e.g. 49 → 45."
+      },
+      "batch_size": {
+        "name": "batch_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "Warped noise latent from VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VoxelToMesh": {
-    "display_name": "VoxelToMesh",
+    "display_name": "Voxel to Mesh",
     "inputs": {
       "voxel": {
         "name": "voxel"
@@ -18545,7 +19123,7 @@
     }
   },
   "VoxelToMeshBasic": {
-    "display_name": "VoxelToMeshBasic",
+    "display_name": "Voxel to Mesh (Basic)",
     "inputs": {
       "voxel": {
         "name": "voxel"
@@ -19127,6 +19705,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "video_frames": {
+        "name": "video_frames"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "The scale for the audio features when injected into the video model."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "The calculated fps based on the audio length and the number of video frames. Used in the prompt."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "images": {
+        "name": "images"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Length of this segment (usually 149 frames)"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "Which segment this is (0 for first, 1 for second, etc.)"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio to calculate total output frames from and extract segment audio."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Padded keyframe sequence"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Mask indicating valid frames"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Audio segment for this video segment"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "images": {
+        "name": "images"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Length of each segment (usually 149 frames)"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "How many padded segments to emit as lists."
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio to slice for each emitted segment."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Padded keyframe sequences"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Masks indicating valid frames"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Audio segment for each video segment"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "The number of frames in the generated video. Should stay 149 for WanDancer."
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "The CLIP vision embeds for the first frame."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "The CLIP vision embeds for the reference image."
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "The initial image(s) to be encoded, can be any number of frames."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "Image conditioning mask for the start image(s). White is kept, black is generated. Used for the local generations."
+      },
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Empty latent."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/es/main.json b/src/locales/es/main.json
index 2a09f0b637..5362f01042 100644
--- a/src/locales/es/main.json
+++ b/src/locales/es/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "y",
+      "backToGithubLogin": "Regístrate con Github en su lugar",
       "backToLogin": "Volver al inicio de sesión",
       "backToSocialLogin": "Regístrate con Google o Github en su lugar",
       "confirmPasswordLabel": "Confirmar contraseña",
@@ -292,7 +293,9 @@
       "title": "Reautenticación requerida"
     },
     "signOut": {
+      "saveFailed": "Cierre de sesión cancelado porque falló el guardado de \"{workflow}\".",
       "signOut": "Cerrar sesión",
+      "signOutAnyway": "Cerrar sesión de todos modos",
       "success": "Sesión cerrada correctamente",
       "successDetail": "Has cerrado sesión en tu cuenta.",
       "unsavedChangesMessage": "Tienes cambios no guardados que se perderán al cerrar sesión. ¿Quieres continuar?",
@@ -461,6 +464,12 @@
       "wantToRun": "¿Prefieres ejecutar ComfyUI localmente?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "Por favor, elige una opción.",
+        "describeAnswer": "Por favor, describe tu respuesta.",
+        "selectAtLeastOne": "Por favor, selecciona al menos una opción."
+      },
+      "intro": "Ayúdanos a personalizar tu experiencia con ComfyUI.",
       "options": {
         "familiarity": {
           "advanced": "Usuario avanzado (flujos de trabajo personalizados)",
@@ -469,45 +478,43 @@
           "new": "Nuevo en ComfyUI (nunca lo he usado antes)",
           "starting": "Recién comenzando (siguiendo tutoriales)"
         },
-        "industry": {
-          "architecture": "Arquitectura",
-          "education": "Educación",
-          "film_tv_animation": "Cine, TV y animación",
-          "fine_art": "Bellas artes e ilustración",
-          "gaming": "Juegos",
-          "marketing": "Marketing y publicidad",
-          "other": "Otro",
-          "otherPlaceholder": "Por favor, especifica",
-          "product_design": "Diseño de productos y gráfico",
-          "software": "Software y tecnología"
-        },
-        "making": {
-          "3d": "Recursos 3D",
+        "intent": {
+          "3d_game": "Recursos 3D / recursos para juegos",
+          "api": "Endpoints de API para ejecutar flujos de trabajo",
+          "apps": "Apps simplificadas a partir de flujos de trabajo",
           "audio": "Audio / música",
-          "custom_nodes": "Nodos y flujos de trabajo personalizados",
+          "custom_nodes": "Nodos personalizados",
           "images": "Imágenes",
-          "video": "Video y animación"
+          "not_sure": "No estoy seguro",
+          "videos": "Videos",
+          "workflows": "Flujos de trabajo o pipelines personalizados"
         },
-        "purpose": {
-          "client": "Trabajo para clientes (freelance)",
-          "community": "Contribuciones a la comunidad (nodos, flujos de trabajo, etc.)",
-          "inhouse": "Mi propio lugar de trabajo (interno)",
-          "personal": "Proyectos personales / hobby",
-          "research": "Investigación académica"
+        "source": {
+          "conference": "Conferencia o evento",
+          "discord": "Discord / comunidad",
+          "friend": "Amigo o colega",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "Newsletter o blog",
+          "other": "Otro",
+          "reddit": "Reddit",
+          "search": "Google / búsqueda",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "Educación (estudiante o docente)",
+          "personal": "Uso personal",
+          "work": "Trabajo"
         }
       },
       "placeholder": "Marcador de posición para preguntas de la encuesta",
-      "questions": {
-        "familiarity": "¿Qué tan familiarizado estás con ComfyUI?",
-        "industry": "¿Cuál es tu industria principal?",
-        "making": "¿Qué planeas crear?",
-        "purpose": "¿Para qué usarás principalmente ComfyUI?"
-      },
       "steps": {
         "familiarity": "¿Qué tan familiarizado estás con ComfyUI?",
-        "industry": "¿Cuál es tu industria principal?",
-        "making": "¿Qué planeas crear?",
-        "purpose": "¿Para qué usarás principalmente ComfyUI?"
+        "intent": "¿Qué quieres crear con ComfyUI?",
+        "source": "¿Dónde escuchaste sobre ComfyUI?",
+        "usage": "¿Cómo planeas usar ComfyUI?"
       },
       "title": "Encuesta en la Nube"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "comienza a crear en segundos",
   "cloudStart_wantToRun": "¿Prefieres ejecutar ComfyUI localmente?",
   "cloudSurvey_steps_familiarity": "¿Qué tan familiarizado estás con ComfyUI?",
-  "cloudSurvey_steps_industry": "¿Cuál es tu industria principal?",
-  "cloudSurvey_steps_making": "¿Qué planeas crear?",
-  "cloudSurvey_steps_purpose": "¿Para qué usarás principalmente ComfyUI?",
+  "cloudSurvey_steps_intent": "¿Qué quieres crear con ComfyUI?",
+  "cloudSurvey_steps_source": "¿Dónde escuchaste sobre ComfyUI?",
+  "cloudSurvey_steps_usage": "¿Cómo planeas usar ComfyUI?",
   "cloudWaitlist_contactLink": "aquí",
   "cloudWaitlist_questionsText": "¿Preguntas? Contáctanos",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "CODIFICADOR_AUDIO",
     "AUDIO_ENCODER_OUTPUT": "SALIDA_CODIFICADOR_AUDIO",
     "AUDIO_RECORD": "GRABACIÓN_AUDIO",
+    "BACKGROUND_REMOVAL": "ELIMINACIÓN_DE_FONDO",
     "BOOLEAN": "BOOLEANO",
     "BOUNDING_BOX": "CUADRO DELIMITADOR",
     "CAMERA_CONTROL": "CONTROL DE CÁMARA",
@@ -831,6 +839,7 @@
     "NOISE": "RUIDO",
     "OPENAI_CHAT_CONFIG": "CONFIGURACIÓN_CHAT_OPENAI",
     "OPENAI_INPUT_FILES": "ARCHIVOS_ENTRADA_OPENAI",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PLANTILLA PIXVERSE",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_para_pruebas",
     "advanced": "avanzado",
     "animation": "animación",
-    "api": "api",
     "api node": "nodo api",
     "attention_experiments": "experimentos_de_atención",
     "audio": "audio",
+    "background removal": "eliminación de fondo",
     "batch": "lote",
-    "camera": "cámara",
     "chroma_radiance": "chroma_radiance",
     "clip": "clip",
+    "color": "color",
     "combine": "combinar",
     "compositing": "composición",
     "cond pair": "par_cond",
     "cond single": "cond único",
     "conditioning": "acondicionamiento",
-    "context": "contexto",
     "controlnet": "controlnet",
     "create": "crear",
     "custom_sampling": "muestreo_personalizado",
@@ -2302,6 +2308,7 @@
     "deprecated": "obsoleto",
     "detection": "detección",
     "edit_models": "editar_modelos",
+    "experimental": "experimental",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "orientación",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "mask",
-    "math": "matemáticas",
     "model": "modelo",
     "model_merging": "fusión_de_modelos",
     "model_patches": "parches_de_modelo",
@@ -2334,16 +2340,13 @@
     "save": "guardar",
     "schedulers": "programadores",
     "scheduling": "programación",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "sigmas",
     "stable_cascade": "stable_cascade",
-    "string": "cadena",
     "style_model": "modelo_de_estilo",
     "supir": "supir",
     "text": "texto",
-    "textgen": "textgen",
     "training": "entrenamiento",
     "transform": "transformar",
     "unet": "unet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "Eliminación fallida",
       "deleted": "Flujo de trabajo eliminado",
       "dirtyClose": "Los archivos a continuación han sido modificados. ¿Te gustaría guardarlos antes de cerrar?",
+      "dirtyCloseAnyway": "Cerrar de todos modos",
       "dirtyCloseHint": "Mantén presionada la tecla Shift para cerrar sin preguntar",
       "dirtyCloseTitle": "¿Guardar cambios?",
       "workflowTreeType": {
diff --git a/src/locales/es/nodeDefs.json b/src/locales/es/nodeDefs.json
index 5049ead7be..e2aee655f4 100644
--- a/src/locales/es/nodeDefs.json
+++ b/src/locales/es/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_de_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "start_image": {
+        "name": "imagen_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "AñadirRuido",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "Generación unificada de texto a imagen y edición precisa de una sola frase hasta una resolución de 4K.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_fail_on_partial": {
+        "name": "fallar_en_parcial"
+      },
+      "model_height": {
+        "name": "altura"
+      },
+      "model_max_images": {
+        "name": "imágenes_máximas"
+      },
+      "model_size_preset": {
+        "name": "preajuste_de_tamaño"
+      },
+      "model_width": {
+        "name": "ancho"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Indicador de texto para crear o editar una imagen."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla a utilizar para la generación."
+      },
+      "watermark": {
+        "name": "marca de agua",
+        "tooltip": "Indica si se añade una marca de agua de \"Generado por IA\" a la imagen."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "Generar video usando modelos de ByteDance mediante API basado en prompt",
     "display_name": "ByteDance Texto a Video",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "Establecer manualmente las ventanas de contexto.",
     "display_name": "Ventanas de Contexto (Manual)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Indica si se debe añadir un fotograma de corrección causal a las ventanas de contexto que no estén indexadas en 0."
+      },
       "closed_loop": {
         "name": "bucle_cerrado",
         "tooltip": "Si se debe cerrar el bucle de la ventana de contexto; solo aplicable a programaciones en bucle."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "Latente en espacio de píxeles vacío para HiDream-O1-Image. El modelo fue entrenado a ~4 megapíxeles; resoluciones más bajas salen de la distribución y la calidad disminuye notablemente. Resoluciones entrenadas: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Imagen Latente Vacía HiDream-O1",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "ImagenLatenteHunyuanVacía",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Genera imágenes mediante Flux.2 [pro] o Flux.2 [max] a partir de un prompt y, opcionalmente, imágenes de referencia.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_height": {
+        "name": "altura"
+      },
+      "model_width": {
+        "name": "ancho"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para la generación o edición de la imagen"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla aleatoria utilizada para crear el ruido."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "Genera imágenes de forma sincrónica según el prompt y la resolución.",
     "display_name": "Flux.2 [max] Imagen",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Genera o edita imágenes de forma síncrona a través de la API de Google Vertex.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Texto descriptivo de la imagen a generar o de las ediciones a aplicar. Incluye cualquier restricción, estilo o detalle que el modelo deba seguir."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Cuando la semilla se fija a un valor específico, el modelo intenta proporcionar la misma respuesta en solicitudes repetidas. No se garantiza una salida determinista. Además, cambiar el modelo o los parámetros, como la temperatura, puede causar variaciones en la respuesta incluso usando la misma semilla. Por defecto, se utiliza una semilla aleatoria."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instrucciones fundamentales que dictan el comportamiento de la IA."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "Primera imagen del proceso de pensamiento del modelo. Solo disponible con thinking_level ALTO y modalidad IMAGEN+TEXTO."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Genera respuestas de texto con el modelo de IA Gemini de Google. Puede proporcionar múltiples tipos de entradas (texto, imágenes, audio, video) como contexto para generar respuestas más relevantes y significativas.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "Modifica una imagen existente en base a un prompt de texto",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_aspect_ratio": {
+        "name": "relación_de_aspecto"
+      },
+      "model_number_of_images": {
+        "name": "número_de_imágenes"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "El prompt de texto utilizado para generar la imagen"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe volver a ejecutarse; los resultados reales son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "Genera imágenes usando Grok a partir de una indicación de texto",
     "display_name": "Imagen Grok",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "Promedia la salida del modelo a través de múltiples posiciones desplazadas de la cuadrícula de parches durante la parte final del muestreo. Elimina costuras.",
+    "display_name": "Suavizado de Costuras de Parches HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "mezcla",
+        "tooltip": "average: media de igual peso. window: ponderación con ventana de Hann favoreciendo cada pasada lejos de los bordes de su parche. median: mediana por píxel, rechaza pasadas atípicas por envoltura."
+      },
+      "end_percent": {
+        "name": "porcentaje_fin",
+        "tooltip": "Progreso del muestreo en el que se desactiva la mezcla."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "passes": {
+        "name": "pasadas",
+        "tooltip": "Número de pasadas por paso controlado. 2/4 = fijo. ramp_*: el número de pasadas aumenta a medida que el muestreo se acerca al final (más suavizado donde las costuras son más visibles)."
+      },
+      "pattern": {
+        "name": "patrón",
+        "tooltip": "Disposición del desplazamiento. single_shift: una pasada en la cuadrícula natural de parches + otras desplazadas. symmetric: todas las pasadas fuera de la cuadrícula, desplazamientos repartidos alrededor del origen."
+      },
+      "start_percent": {
+        "name": "porcentaje_inicio",
+        "tooltip": "Progreso del muestreo (0=inicio, 1=fin) en el que se activa la mezcla."
+      },
+      "strength": {
+        "name": "fuerza",
+        "tooltip": "Interpolación entre la predicción de la cuadrícula natural (0) y el resultado promediado (1)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "Adjunta de 1 a 10 imágenes de referencia para el condicionamiento, una para instrucción de edición o varias para personalización basada en el sujeto.",
+    "display_name": "Imágenes de Referencia HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imágenes de referencia. 1 imagen = edición por instrucción; 2-10 imágenes = referencia múltiple."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "Aumenta la resolución de imágenes de baja calidad a superresolución, elimina artefactos y ruido. Salida máxima: 32 megapíxeles.",
     "display_name": "HitPaw General Image Enhance",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Cargar modelo de eliminación de fondo",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "nombre_del_modelo_de_eliminación_de_fondo",
+        "tooltip": "El modelo utilizado para eliminar fondos de imágenes"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo_de_fondo",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Cargar Imagen",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Edita una imagen existente con un prompt de texto usando el modelo Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo a utilizar para la edición."
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descripción de la edición deseada. 1–6000 caracteres."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Imagen de origen a editar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "Modifica imágenes de forma sincrónica según el prompt y la relación de aspecto.",
     "display_name": "Luma Imagen a Imagen",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Genera imágenes a partir de texto usando el modelo Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo a utilizar para la generación."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descripción en texto de la imagen deseada. 1–6000 caracteres."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "Genera videos de forma sincrónica basados en el prompt, imágenes de entrada y output_size.",
     "display_name": "Luma Image to Video",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "Escala de Ruido del Modelo",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "noise_scale": {
+        "name": "escala_ruido",
+        "tooltip": "Escala absoluta de ruido de entrenamiento. Por ejemplo HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "Cargador de Parches de Modelo",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Nodo Moonvalley Marey Imagen a Video",
-    "display_name": "Moonvalley Marey Imagen a Video",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control después de generar"
-      },
-      "image": {
-        "name": "imagen",
-        "tooltip": "La imagen de referencia utilizada para generar el video"
-      },
-      "negative_prompt": {
-        "name": "prompt_negativo",
-        "tooltip": "Texto del prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "adherencia_al_prompt",
-        "tooltip": "Escala de guía para control de generación"
-      },
-      "resolution": {
-        "name": "resolución",
-        "tooltip": "Resolución del video de salida"
-      },
-      "seed": {
-        "name": "semilla",
-        "tooltip": "Valor de semilla aleatoria"
-      },
-      "steps": {
-        "name": "pasos",
-        "tooltip": "Número de pasos de eliminación de ruido"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey Texto a Video",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control después de generar"
-      },
-      "negative_prompt": {
-        "name": "prompt_negativo",
-        "tooltip": "Texto del prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "adherencia_al_prompt",
-        "tooltip": "Escala de guía para control de generación"
-      },
-      "resolution": {
-        "name": "resolución",
-        "tooltip": "Resolución del video de salida"
-      },
-      "seed": {
-        "name": "semilla",
-        "tooltip": "Valor de semilla aleatoria"
-      },
-      "steps": {
-        "name": "pasos",
-        "tooltip": "Pasos de inferencia"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Video a Video",
-    "inputs": {
-      "control_type": {
-        "name": "tipo_control"
-      },
-      "motion_intensity": {
-        "name": "intensidad_movimiento",
-        "tooltip": "Solo se usa si el tipo_control es 'Transferencia de Movimiento'"
-      },
-      "negative_prompt": {
-        "name": "prompt_negativo",
-        "tooltip": "Texto del prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Describe el video a generar"
-      },
-      "seed": {
-        "name": "semilla",
-        "tooltip": "Valor de semilla aleatoria"
-      },
-      "steps": {
-        "name": "pasos",
-        "tooltip": "Número de pasos de inferencia"
-      },
-      "video": {
-        "name": "video",
-        "tooltip": "El video de referencia utilizado para generar el video de salida. Debe tener al menos 5 segundos de duración. Los videos más largos de 5s se recortarán automáticamente. Solo se admite formato MP4."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "MorfologiaDeImagen",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "Genera imágenes de forma síncrona a través del endpoint GPT Image 1 de OpenAI.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "Genera imágenes de forma síncrona a través del endpoint GPT Image 2 de OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "background",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "Texto de entrada para GPT Image 1"
+        "tooltip": "Texto de entrada para GPT Image 2"
       },
       "quality": {
         "name": "quality",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "Genera imágenes a través del endpoint GPT Image de OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_background": {
+        "name": "fondo"
+      },
+      "model_custom_height": {
+        "name": "altura_personalizada"
+      },
+      "model_custom_width": {
+        "name": "ancho_personalizado"
+      },
+      "model_quality": {
+        "name": "calidad"
+      },
+      "model_size": {
+        "name": "tamaño"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Cuántas imágenes generar"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para GPT Image"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "aún no implementado en el backend"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "Carga y prepara archivos de entrada (texto, pdf, etc.) para incluirlos como entradas para el Nodo de Chat de OpenAI. Los archivos serán leídos por el modelo de OpenAI al generar una respuesta. 🛈 CONSEJO: Se puede encadenar con otros nodos de Archivos de Entrada de OpenAI.",
     "display_name": "Archivos de Entrada de OpenAI ChatGPT",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Cargar modelo de flujo óptico",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Modelo de flujo óptico a cargar. Los archivos deben colocarse en la carpeta 'optical_flow'. Actualmente solo se admite raft_large.pth de torchvision."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,8 +12881,8 @@
   "PrimitiveInt": {
     "display_name": "Int",
     "inputs": {
-      "control_after_generate": {
-        "name": "controlar después de generar"
+      "fixed": {
+        "name": "control after generate"
       },
       "value": {
         "name": "valor"
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Eliminar fondo",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "modelo_de_eliminación_de_fondo",
+        "tooltip": "Modelo de eliminación de fondo utilizado para generar la máscara"
+      },
+      "image": {
+        "name": "imagen",
+        "tooltip": "Imagen de entrada para eliminar el fondo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "máscara",
+        "tooltip": "Máscara de primer plano generada"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "Fotogramas por bloque autorregresivo. 1 = por fotograma, 3 = por fragmento. Debe coincidir con el modo de entrenamiento del checkpoint."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "Muestreador personalizado",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "Muestreador LCM con ruido ajustable por paso. s_noise es un multiplicador en la escala de ruido de entrenamiento del modelo",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Limita el ruido por paso a +/- N*std. 0 desactiva."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicador de ruido por paso en el primer paso (1.0 = igual que el entrenamiento)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Multiplicador de ruido por paso en el último paso. Igualar a s_noise para un programa constante."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "audio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Usar la plantilla/sistema incorporado si el modelo dispone de uno."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Fotogramas de video como lote de imágenes. Se asume a 24 FPS; se reduce internamente a 1 FPS."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "audio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Usar la plantilla/sistema incorporado si el modelo dispone de uno."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Fotogramas de video como lote de imágenes. Se asume a 24 FPS; se reduce internamente a 1 FPS."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "Da nueva vida a tus videos con tecnología avanzada de escalado y recuperación.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "Nivel CQP."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_model_creativity": {
+        "name": "creativity"
+      },
+      "upscaler_model_prompt": {
+        "name": "prompt"
+      },
+      "upscaler_model_realism": {
+        "name": "realism"
+      },
+      "upscaler_model_sharp": {
+        "name": "sharp"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Modelo de Compilación Torch",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "cuadrilátero"
+        "name": "cuadrilátero",
+        "tooltip": "Este parámetro está obsoleto y no hace nada."
       },
       "texture": {
         "name": "textura"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Número de fotogramas de píxeles a procesar. Para CogVideoX-Fun-V1.5 (patch_size_t=2), latent_t debe ser par — las longitudes que produzcan latent_t impar se redondean hacia abajo (por ejemplo, 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "Quadmask preprocesada de VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Fotogramas de video de origen [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Radio de dilatación para la región principal de la máscara (0 = sin dilatación)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Número de fotogramas de píxeles. Se redondea hacia abajo para que latent_t sea par (requisito de patch_size_t=2), por ejemplo, 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "Modelo de flujo óptico de OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Salida de fotogramas de video de la pasada 1 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "Latente de ruido deformado de VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPScheduler",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "La escala para las características de audio cuando se inyectan en el modelo de video."
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "Los fps calculados en base a la duración del audio y el número de fotogramas de video. Se usa en el prompt."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio para calcular el total de fotogramas de salida y extraer el audio del segmento."
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "Qué segmento es este (0 para el primero, 1 para el segundo, etc.)"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Longitud de este segmento (usualmente 149 fotogramas)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Secuencia de keyframes rellenada"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Máscara que indica los fotogramas válidos"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Segmento de audio para este segmento de video"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio para dividir para cada segmento emitido."
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "Cuántos segmentos rellenados emitir como listas."
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Longitud de cada segmento (usualmente 149 fotogramas)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Secuencias de keyframes rellenadas"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Máscaras que indican los fotogramas válidos"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Segmento de audio para cada segmento de video"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "Las incrustaciones de visión de CLIP para el primer fotograma."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "Las incrustaciones de visión de CLIP para la imagen de referencia."
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud",
+        "tooltip": "El número de fotogramas en el video generado. Debe mantenerse en 149 para WanDancer."
+      },
+      "mask": {
+        "name": "máscara",
+        "tooltip": "Máscara de acondicionamiento de imagen para la(s) imagen(es) inicial(es). El blanco se mantiene, el negro se genera. Se utiliza para las generaciones locales."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagen_inicial",
+        "tooltip": "La(s) imagen(es) inicial(es) a codificar, puede ser cualquier cantidad de fotogramas."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Latente vacío."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/fa/main.json b/src/locales/fa/main.json
index 38d85f5162..a78c38b643 100644
--- a/src/locales/fa/main.json
+++ b/src/locales/fa/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "و",
+      "backToGithubLogin": "ثبت‌نام با گیت‌هاب",
       "backToLogin": "بازگشت به ورود",
       "backToSocialLogin": "ثبت‌نام با Google یا Github",
       "confirmPasswordLabel": "تأیید رمز عبور",
@@ -292,7 +293,9 @@
       "title": "احراز هویت مجدد لازم است"
     },
     "signOut": {
+      "saveFailed": "خروج لغو شد زیرا ذخیره «{workflow}» با شکست مواجه شد.",
       "signOut": "خروج",
+      "signOutAnyway": "خروج به هر حال",
       "success": "خروج با موفقیت انجام شد",
       "successDetail": "شما با موفقیت از حساب کاربری خود خارج شدید.",
       "unsavedChangesMessage": "شما تغییرات ذخیره‌نشده‌ای دارید که با خروج از حساب از بین خواهند رفت. آیا مایل به ادامه هستید؟",
@@ -461,6 +464,12 @@
       "wantToRun": "می‌خواهید ComfyUI را به صورت محلی اجرا کنید؟"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "لطفاً یک گزینه را انتخاب کنید.",
+        "describeAnswer": "لطفاً پاسخ خود را توضیح دهید.",
+        "selectAtLeastOne": "لطفاً حداقل یک گزینه را انتخاب کنید."
+      },
+      "intro": "به ما کمک کنید تا تجربه شما از ComfyUI را متناسب‌سازی کنیم.",
       "options": {
         "familiarity": {
           "advanced": "کاربر پیشرفته (جریان‌کارهای سفارشی)",
@@ -469,45 +478,43 @@
           "new": "جدید در ComfyUI (تا کنون استفاده نکرده‌ام)",
           "starting": "تازه شروع کرده‌ام (در حال دنبال کردن آموزش‌ها)"
         },
-        "industry": {
-          "architecture": "معماری",
-          "education": "آموزش",
-          "film_tv_animation": "فیلم، تلویزیون و انیمیشن",
-          "fine_art": "هنرهای زیبا و تصویرسازی",
-          "gaming": "بازی‌سازی",
-          "marketing": "بازاریابی و تبلیغات",
-          "other": "سایر",
-          "otherPlaceholder": "لطفاً مشخص کنید",
-          "product_design": "طراحی محصول و گرافیک",
-          "software": "نرم‌افزار و فناوری"
-        },
-        "making": {
-          "3d": "دارایی‌های سه‌بعدی",
+        "intent": {
+          "3d_game": "دارایی سه‌بعدی / دارایی بازی",
+          "api": "API endpoint برای اجرای workflow",
+          "apps": "اپلیکیشن ساده‌شده از workflow",
           "audio": "صدا / موسیقی",
-          "custom_nodes": "nodeها و workflowهای سفارشی",
-          "images": "تصاویر",
-          "video": "ویدیو و انیمیشن"
+          "custom_nodes": "node سفارشی",
+          "images": "تصویر",
+          "not_sure": "مطمئن نیستم",
+          "videos": "ویدیو",
+          "workflows": "workflow یا pipeline سفارشی"
         },
-        "purpose": {
-          "client": "کار برای مشتری (فریلنس)",
-          "community": "مشارکت در جامعه (nodeها، workflowها و غیره)",
-          "inhouse": "محل کار خودم (درون‌سازمانی)",
-          "personal": "پروژه‌های شخصی / سرگرمی",
-          "research": "پژوهش دانشگاهی"
+        "source": {
+          "conference": "کنفرانس یا رویداد",
+          "discord": "Discord / انجمن",
+          "friend": "دوست یا همکار",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "خبرنامه یا وبلاگ",
+          "other": "سایر",
+          "reddit": "Reddit",
+          "search": "Google / جستجو",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "آموزشی (دانشجو یا مدرس)",
+          "personal": "استفاده شخصی",
+          "work": "کاری"
         }
       },
       "placeholder": "جای‌نگهدار سوالات نظرسنجی",
-      "questions": {
-        "familiarity": "تا چه حد با ComfyUI آشنایی دارید؟",
-        "industry": "صنعت اصلی شما چیست؟",
-        "making": "قصد دارید چه چیزی بسازید؟",
-        "purpose": "هدف اصلی شما از استفاده از ComfyUI چیست؟"
-      },
       "steps": {
         "familiarity": "تا چه حد با ComfyUI آشنایی دارید؟",
-        "industry": "صنعت اصلی شما چیست؟",
-        "making": "قصد دارید چه چیزی بسازید؟",
-        "purpose": "هدف اصلی شما از استفاده از ComfyUI چیست؟"
+        "intent": "مایل هستید با ComfyUI چه چیزی ایجاد کنید؟",
+        "source": "از کجا با ComfyUI آشنا شدید؟",
+        "usage": "برنامه شما برای استفاده از ComfyUI چیست؟"
       },
       "title": "نظرسنجی ابری"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "در چند ثانیه شروع به خلق کنید",
   "cloudStart_wantToRun": "مایلید ComfyUI را به صورت محلی اجرا کنید؟",
   "cloudSurvey_steps_familiarity": "تا چه اندازه با ComfyUI آشنایی دارید؟",
-  "cloudSurvey_steps_industry": "صنعت اصلی شما چیست؟",
-  "cloudSurvey_steps_making": "برنامه دارید چه چیزی بسازید؟",
-  "cloudSurvey_steps_purpose": "عمدتاً قصد دارید از ComfyUI برای چه کاری استفاده کنید؟",
+  "cloudSurvey_steps_intent": "مایل هستید با ComfyUI چه چیزی ایجاد کنید؟",
+  "cloudSurvey_steps_source": "از کجا با ComfyUI آشنا شدید؟",
+  "cloudSurvey_steps_usage": "برنامه شما برای استفاده از ComfyUI چیست؟",
   "cloudWaitlist_contactLink": "اینجا",
   "cloudWaitlist_questionsText": "سؤالی دارید؟ با ما تماس بگیرید",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "رمزگذار صوت",
     "AUDIO_ENCODER_OUTPUT": "خروجی رمزگذار صوت",
     "AUDIO_RECORD": "ضبط صوت",
+    "BACKGROUND_REMOVAL": "حذف پس‌زمینه",
     "BOOLEAN": "بولی",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "کنترل دوربین",
@@ -831,6 +839,7 @@
     "NOISE": "نویز",
     "OPENAI_CHAT_CONFIG": "پیکربندی گفتگوی OpenAI",
     "OPENAI_INPUT_FILES": "فایل‌های ورودی OpenAI",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "photomaker",
     "PIXVERSE_TEMPLATE": "قالب Pixverse",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_for_testing",
     "advanced": "پیشرفته",
     "animation": "انیمیشن",
-    "api": "API",
     "api node": "گره API",
     "attention_experiments": "آزمایش‌های توجه",
     "audio": "صدا",
+    "background removal": "حذف پس‌زمینه",
     "batch": "دسته‌ای",
-    "camera": "دوربین",
     "chroma_radiance": "درخشندگی رنگی",
     "clip": "clip",
+    "color": "رنگ",
     "combine": "ترکیب",
     "compositing": "ترکیب‌بندی",
     "cond pair": "جفت شرط",
     "cond single": "شرط تکی",
     "conditioning": "شرط‌گذاری",
-    "context": "زمینه",
     "controlnet": "controlnet",
     "create": "ایجاد",
     "custom_sampling": "نمونه‌گیری سفارشی",
@@ -2302,6 +2308,7 @@
     "deprecated": "منسوخ",
     "detection": "شناسایی",
     "edit_models": "ویرایش مدل‌ها",
+    "experimental": "آزمایشی",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "راهنمایی",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "ماسک",
-    "math": "ریاضی",
     "model": "مدل",
     "model_merging": "ادغام مدل",
     "model_patches": "وصله‌های مدل",
@@ -2334,16 +2340,13 @@
     "save": "ذخیره",
     "schedulers": "زمان‌بندی‌ها",
     "scheduling": "زمان‌بندی",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "سیگماها",
     "stable_cascade": "stable cascade",
-    "string": "رشته",
     "style_model": "مدل سبک",
     "supir": "supir",
     "text": "متن",
-    "textgen": "textgen",
     "training": "آموزش",
     "transform": "تبدیل",
     "unet": "unet",
@@ -3159,6 +3162,7 @@
       "deleteFailedTitle": "حذف ناموفق بود",
       "deleted": "Workflow حذف شد",
       "dirtyClose": "فایل‌های زیر تغییر کرده‌اند. آیا مایل به ذخیره آن‌ها قبل از بستن هستید؟",
+      "dirtyCloseAnyway": "بستن به هر حال",
       "dirtyCloseHint": "برای بستن بدون پیام، Shift را نگه دارید",
       "dirtyCloseTitle": "ذخیره تغییرات؟",
       "workflowTreeType": {
diff --git a/src/locales/fa/nodeDefs.json b/src/locales/fa/nodeDefs.json
index ca0356a046..8629f77603 100644
--- a/src/locales/fa/nodeDefs.json
+++ b/src/locales/fa/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "start_image": {
+        "name": "تصویر اولیه"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "AddNoise",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "تولید تصویر از متن و ویرایش دقیق جمله‌ای با وضوح تا ۴K به صورت یکپارچه.",
+    "display_name": "ByteDance Seedream ۴.۵ و ۵.۰",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_fail_on_partial": {
+        "name": "fail_on_partial"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_max_images": {
+        "name": "max_images"
+      },
+      "model_size_preset": {
+        "name": "size_preset"
+      },
+      "model_width": {
+        "name": "width"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی برای ایجاد یا ویرایش تصویر."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed مورد استفاده برای تولید."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به تصویر اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "تولید ویدیو با استفاده از مدل‌های ByteDance از طریق API بر اساس پرامپت",
     "display_name": "تبدیل متن به ویدیو ByteDance",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "بولین",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "تنظیم دستی پنجره‌های زمینه.",
     "display_name": "پنجره‌های زمینه (دستی)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "آیا یک فریم اصلاح علّی به پنجره‌های زمینه‌ای که با شاخص ۰ شروع نمی‌شوند اضافه شود یا خیر."
+      },
       "closed_loop": {
         "name": "حلقه بسته",
         "tooltip": "آیا حلقه پنجره زمینه بسته شود؛ فقط برای برنامه‌ریزی حلقه‌ای قابل استفاده است."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "فضای پیکسلی نهفته خالی برای HiDream-O1-Image. مدل در حدود ۴ مگاپیکسل آموزش دیده است؛ رزولوشن‌های پایین‌تر از توزیع خارج می‌شوند و کیفیت به طور محسوسی کاهش می‌یابد. رزولوشن‌های آموزش‌دیده: ۲۰۴۸×۲۰۴۸، ۲۳۰۴×۱۷۲۸، ۱۷۲۸×۲۳۰۴، ۲۵۶۰×۱۴۴۰، ۱۴۴۰×۲۵۶۰، ۲۴۹۶×۱۶۶۴، ۱۶۶۴×۲۴۹۶، ۳۱۰۴×۱۳۱۲، ۱۳۱۲×۳۱۰۴، ۲۳۰۴×۱۷۹۲، ۱۷۹۲×۲۳۰۴.",
+    "display_name": "تصویر نهفته خالی HiDream-O1",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "تصویر نهفته Hunyuan خالی",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "تولید تصویر با استفاده از Flux.2 [pro] یا Flux.2 [max] از طریق پرامپت و تصاویر مرجع اختیاری.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_width": {
+        "name": "width"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت برای تولید یا ویرایش تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed تصادفی برای ایجاد نویز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "تولید تصویر به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
     "display_name": "Flux.2 [max] Image",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "تولید یا ویرایش تصاویر به صورت همزمان از طریق Google Vertex API.",
+    "display_name": "نانو بنانا ۲",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "model_aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "model_thinking_level": {
+        "name": "سطح تفکر مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "متن پرامپت برای توصیف تصویری که باید تولید شود یا ویرایش‌هایی که باید اعمال شوند. هرگونه محدودیت، سبک یا جزئیاتی که مدل باید رعایت کند را وارد کنید."
+      },
+      "response_modalities": {
+        "name": "حالت‌های پاسخ"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "وقتی مقدار بذر روی یک عدد خاص تنظیم شود، مدل تلاش می‌کند تا برای درخواست‌های تکراری، پاسخ مشابهی ارائه دهد. خروجی قطعی تضمین نمی‌شود. همچنین تغییر مدل یا تنظیمات پارامترها مانند دما می‌تواند حتی با همان مقدار بذر، باعث تغییر در پاسخ شود. به طور پیش‌فرض، مقدار بذر به صورت تصادفی انتخاب می‌شود."
+      },
+      "system_prompt": {
+        "name": "پرامپت سیستمی",
+        "tooltip": "دستورالعمل‌های پایه‌ای که رفتار هوش مصنوعی را تعیین می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "تصویر تفکر",
+        "tooltip": "اولین تصویر از فرایند تفکر مدل. فقط در صورت انتخاب سطح تفکر HIGH و حالت پاسخ IMAGE+TEXT در دسترس است."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "تولید پاسخ متنی با مدل هوش مصنوعی Gemini گوگل. می‌توانید انواع مختلفی از ورودی‌ها (متن، تصویر، صوت، ویدئو) را به عنوان زمینه برای تولید پاسخ‌های مرتبط‌تر و معنادارتر ارائه دهید.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "ویرایش یک تصویر موجود بر اساس پرامپت متنی",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_number_of_images": {
+        "name": "number_of_images"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی برای تولید تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed برای تعیین اجرای مجدد node؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "تولید تصویر با استفاده از Grok بر اساس یک متن راهنما",
     "display_name": "تصویر Grok",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "میانگین‌گیری خروجی مدل در چندین موقعیت شبکه پچ جابجا شده در بخش پایانی نمونه‌گیری. درزها را حذف می‌کند.",
+    "display_name": "هموارسازی درز پچ HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "ترکیب",
+        "tooltip": "average: میانگین با وزن برابر. window: وزن‌دهی پنجره Hann که هر عبور را از مرز پچ خود دور می‌کند. median: میانه هر پیکسل، عبورهای پرت را حذف می‌کند."
+      },
+      "end_percent": {
+        "name": "درصد پایان",
+        "tooltip": "پیشرفت نمونه‌گیری که در آن ترکیب غیرفعال می‌شود."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "passes": {
+        "name": "تعداد عبور",
+        "tooltip": "تعداد عبور در هر مرحله. ۲/۴ = ثابت. ramp_*: تعداد عبور با نزدیک شدن نمونه‌گیری به پایان افزایش می‌یابد (هموارسازی بیشتر در جایی که درزها بیشتر دیده می‌شوند)."
+      },
+      "pattern": {
+        "name": "الگو",
+        "tooltip": "طرح جابجایی. single_shift: یک بار در شبکه پچ طبیعی + سایرین با افست. symmetric: همه عبورها خارج از شبکه، جابجایی‌ها حول مبدأ تقسیم می‌شوند."
+      },
+      "start_percent": {
+        "name": "درصد شروع",
+        "tooltip": "پیشرفت نمونه‌گیری (۰=شروع، ۱=پایان) که در آن ترکیب فعال می‌شود."
+      },
+      "strength": {
+        "name": "شدت",
+        "tooltip": "درون‌یابی بین پیش‌بینی شبکه طبیعی (۰) و نتیجه میانگین‌گیری شده (۱)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "ضمیمه کردن ۱ تا ۱۰ تصویر مرجع به شرط‌دهی؛ یک تصویر برای ویرایش دستور یا چند تصویر برای شخصی‌سازی مبتنی بر سوژه.",
+    "display_name": "تصاویر مرجع HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر مرجع. ۱ تصویر = ویرایش دستور؛ ۲ تا ۱۰ تصویر = مرجع چندگانه."
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "ارتقاء تصاویر با وضوح پایین به وضوح بسیار بالا، حذف نویز و آرتیفکت‌ها. حداکثر خروجی: ۳۲ مگاپیکسل.",
     "display_name": "افزایش کیفیت تصویر عمومی HitPaw",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "بارگذاری مدل حذف پس‌زمینه",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "نام مدل حذف پس‌زمینه",
+        "tooltip": "مدلی که برای حذف پس‌زمینه از تصاویر استفاده می‌شود"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل حذف پس‌زمینه",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "بارگذاری تصویر",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "ویرایش یک تصویر موجود با استفاده از متن راهنما و مدل Luma UNI-1.",
+    "display_name": "ویرایش تصویر Luma UNI-1",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل مورد استفاده برای ویرایش."
+      },
+      "model_style": {
+        "name": "سبک"
+      },
+      "model_web_search": {
+        "name": "جستجوی وب"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "توضیح ویرایش مورد نظر. ۱ تا ۶۰۰۰ نویسه."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "source": {
+        "name": "منبع",
+        "tooltip": "تصویر منبع برای ویرایش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "تغییر تصاویر به صورت همزمان بر اساس پرامپت و نسبت تصویر.",
     "display_name": "Luma Image to Image",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "تولید تصویر از متن با استفاده از مدل Luma UNI-1.",
+    "display_name": "تصویر Luma UNI-1",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل مورد استفاده برای تولید."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "model_style": {
+        "name": "سبک"
+      },
+      "model_web_search": {
+        "name": "جستجوی وب"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "توضیح متنی تصویر مورد نظر. ۱ تا ۶۰۰۰ نویسه."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "ویدیوها را به صورت همزمان بر اساس پرامپت، تصاویر ورودی و اندازه خروجی تولید می‌کند.",
     "display_name": "تبدیل تصویر به ویدیو لاما",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "ModelNoiseScale",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "noise_scale": {
+        "name": "مقیاس نویز",
+        "tooltip": "مقیاس نویز آموزش مطلق. برای مثال HiDream-O1 base: ۸.۰، dev: ۷.۵."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "گره تبدیل تصویر به ویدیو Moonvalley Marey",
-    "display_name": "Moonvalley Marey Image to Video",
-    "inputs": {
-      "control_after_generate": {
-        "name": "کنترل پس از تولید"
-      },
-      "image": {
-        "name": "تصویر",
-        "tooltip": "تصویر مرجع برای تولید ویدیو استفاده می‌شود"
-      },
-      "negative_prompt": {
-        "name": "پرامپت منفی",
-        "tooltip": "متن پرامپت منفی"
-      },
-      "prompt": {
-        "name": "پرامپت"
-      },
-      "prompt_adherence": {
-        "name": "پایبندی به پرامپت",
-        "tooltip": "مقیاس راهنمایی برای کنترل تولید"
-      },
-      "resolution": {
-        "name": "وضوح",
-        "tooltip": "وضوح ویدیوی خروجی"
-      },
-      "seed": {
-        "name": "بذر",
-        "tooltip": "مقدار بذر تصادفی"
-      },
-      "steps": {
-        "name": "گام‌ها",
-        "tooltip": "تعداد گام‌های حذف نویز"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey تبدیل متن به ویدیو",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "متن پرامپت منفی"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "مقیاس راهنمایی برای کنترل تولید"
-      },
-      "resolution": {
-        "name": "resolution",
-        "tooltip": "وضوح ویدیوی خروجی"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "مقدار seed تصادفی"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "گام‌های استنتاج"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey تبدیل ویدیو به ویدیو",
-    "inputs": {
-      "control_type": {
-        "name": "control_type"
-      },
-      "motion_intensity": {
-        "name": "motion_intensity",
-        "tooltip": "فقط در صورتی استفاده می‌شود که control_type برابر با 'Motion Transfer' باشد"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "متن پرامپت منفی"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "توضیح ویدیوی مورد نظر برای تولید"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "مقدار seed تصادفی"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "تعداد گام‌های استنتاج"
-      },
-      "video": {
-        "name": "video",
-        "tooltip": "ویدیوی مرجع برای تولید ویدیوی خروجی. باید حداقل ۵ ثانیه باشد. ویدیوهای طولانی‌تر از ۵ ثانیه به‌صورت خودکار کوتاه می‌شوند. فقط فرمت MP4 پشتیبانی می‌شود."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "ImageMorphology",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "تولید تصویر به صورت همزمان از طریق نقطه پایانی GPT Image 1 شرکت OpenAI.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "تولید تصویر به صورت همزمان از طریق نقطه پایانی GPT Image 2 شرکت OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "background",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "تولید تصویر از طریق سرویس GPT Image شرکت OpenAI.",
+    "display_name": "OpenAI GPT Image ۲",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_background": {
+        "name": "background"
+      },
+      "model_custom_height": {
+        "name": "custom_height"
+      },
+      "model_custom_width": {
+        "name": "custom_width"
+      },
+      "model_quality": {
+        "name": "quality"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "تعداد تصاویری که باید تولید شود"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی برای GPT Image"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "در backend هنوز پیاده‌سازی نشده است"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "بارگذاری و آماده‌سازی فایل‌های ورودی (متن، PDF و غیره) برای استفاده به عنوان ورودی در Node چت OpenAI. این فایل‌ها هنگام تولید پاسخ توسط مدل OpenAI خوانده می‌شوند. 🛈 نکته: می‌توان این node را با سایر nodeهای فایل ورودی OpenAI زنجیره کرد.",
     "display_name": "فایل‌های ورودی OpenAI ChatGPT",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "بارگذاری مدل Optical Flow",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "مدل optical flow برای بارگذاری. فایل‌ها باید در پوشه 'optical_flow' قرار گیرند. در حال حاضر فقط raft_large.pth از torchvision پشتیبانی می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "عدد صحیح",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "کنترل پس از تولید"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "حذف پس‌زمینه",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "مدل حذف پس‌زمینه",
+        "tooltip": "مدل حذف پس‌زمینه که برای تولید ماسک استفاده می‌شود"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر ورودی برای حذف پس‌زمینه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ماسک",
+        "tooltip": "ماسک پیش‌زمینه تولید شده"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "نمونه‌بردار ویدئوی AR",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "تعداد فریم در هر بلوک",
+        "tooltip": "تعداد فریم در هر بلوک خودبازگشتی. ۱ = فریم به فریم، ۳ = به صورت تکه‌ای. باید با حالت آموزش checkpoint مطابقت داشته باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "SamplerCustom",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "نمونه‌گیر LCM با نویز قابل تنظیم در هر گام. s_noise ضریب مقیاس نویز آموزش مدل است.",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "محدود کردن نویز هر گام به ±N*std. مقدار ۰ غیرفعال می‌کند."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "ضریب نویز در هر گام در اولین مرحله (۱.۰ = مطابق آموزش)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "ضریب نویز در هر گام در آخرین مرحله. برای برنامه زمانی ثابت، مقدار را برابر با s_noise قرار دهید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "تولید متن",
     "inputs": {
+      "audio": {
+        "name": "صدا"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "در صورت وجود، از پرامپت/قالب سیستمی داخلی مدل استفاده شود."
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "فریم‌های ویدیو به صورت دسته‌ای از تصاویر. فرض بر ۲۴ فریم بر ثانیه است؛ به صورت داخلی به ۱ فریم بر ثانیه نمونه‌برداری می‌شود."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "تولید متن LTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "صدا"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "در صورت وجود، از پرامپت/قالب سیستمی داخلی مدل استفاده شود."
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "فریم‌های ویدیو به صورت دسته‌ای از تصاویر. فرض بر ۲۴ فریم بر ثانیه است؛ به صورت داخلی به ۱ فریم بر ثانیه نمونه‌برداری می‌شود."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "با فناوری قدرتمند بزرگ‌نمایی و بازیابی، به ویدیو جان تازه ببخشید.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "سطح فشرده‌سازی پویا",
+        "tooltip": "سطح CQP."
+      },
+      "interpolation_model": {
+        "name": "مدل درون‌یابی"
+      },
+      "upscaler_model": {
+        "name": "مدل بزرگ‌نمایی"
+      },
+      "upscaler_model_creativity": {
+        "name": "خلاقیت"
+      },
+      "upscaler_model_prompt": {
+        "name": "پرامپت"
+      },
+      "upscaler_model_realism": {
+        "name": "واقع‌گرایی"
+      },
+      "upscaler_model_sharp": {
+        "name": "وضوح"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "وضوح بزرگ‌نمایی"
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "TorchCompileModel",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "PBR"
       },
       "quad": {
-        "name": "چهارضلعی"
+        "name": "چهارضلعی",
+        "tooltip": "این پارامتر منسوخ شده است و هیچ تأثیری ندارد."
       },
       "texture": {
         "name": "تکسچر"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "تعداد فریم‌های پیکسلی برای پردازش. برای CogVideoX-Fun-V1.5 (patch_size_t=۲)، latent_t باید زوج باشد — طول‌هایی که latent_t فرد تولید می‌کنند گرد به پایین می‌شوند (مثلاً ۴۹ → ۴۵)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "quadmask پیش‌پردازش‌شده از VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "فریم‌های ویدیوی منبع [T, H, W, ۳]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "شعاع گسترش برای ناحیه اصلی mask (۰ = بدون گسترش)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "تعداد فریم‌های پیکسلی. برای زوج بودن latent_t گرد به پایین می‌شود (نیاز patch_size_t=۲)، مثلاً ۴۹ → ۴۵."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "مدل optical flow از OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "خروجی فریم‌های ویدیو از مرحله ۱ [T, H, W, ۳]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "latent نویز تغییرشکل‌یافته از VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPScheduler",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "مقیاس ویژگی‌های صوتی هنگام تزریق به مدل ویدیو."
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "نرخ فریم بر ثانیه (fps) محاسبه‌شده بر اساس طول صوت و تعداد فریم‌های ویدیو. در prompt استفاده می‌شود."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "صوت برای محاسبه تعداد کل فریم‌های خروجی و استخراج صوت بخش."
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "این بخش کدام است (۰ برای اول، ۱ برای دوم و ...)"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "طول این بخش (معمولاً ۱۴۹ فریم)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "دنباله keyframe با padding"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "ماسک نشان‌دهنده فریم‌های معتبر"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "بخش صوتی برای این بخش ویدیو"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "صوت برای برش هر بخش خروجی."
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "تعداد بخش‌های padding که به صورت لیست خروجی داده می‌شود."
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "طول هر بخش (معمولاً ۱۴۹ فریم)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "دنباله‌های keyframe با padding"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "ماسک‌ها برای نشان دادن فریم‌های معتبر"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "بخش صوتی برای هر بخش ویدیو"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "خروجی رمزگذار صوتی"
+      },
+      "clip_vision_output": {
+        "name": "خروجی بینایی clip",
+        "tooltip": "بردارهای بینایی CLIP برای اولین فریم."
+      },
+      "clip_vision_output_ref": {
+        "name": "خروجی مرجع بینایی clip",
+        "tooltip": "بردارهای بینایی CLIP برای تصویر مرجع."
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول",
+        "tooltip": "تعداد فریم‌های ویدئوی تولیدشده. برای WanDancer باید ۱۴۹ باقی بماند."
+      },
+      "mask": {
+        "name": "ماسک",
+        "tooltip": "ماسک شرطی‌سازی تصویر برای تصویر(ها)ی شروع. سفید حفظ می‌شود، سیاه تولید می‌شود. برای تولیدات محلی استفاده می‌شود."
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع",
+        "tooltip": "تصویر(ها)ی اولیه برای رمزگذاری؛ می‌تواند هر تعداد فریم باشد."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "لاتنت",
+        "tooltip": "لاتنت خالی."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json
index 8eca375116..c0a6ca2ee9 100644
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "et",
+      "backToGithubLogin": "S'inscrire avec Github à la place",
       "backToLogin": "Retour à la connexion",
       "backToSocialLogin": "Inscrivez-vous avec Google ou Github à la place",
       "confirmPasswordLabel": "Confirmer le mot de passe",
@@ -292,7 +293,9 @@
       "title": "Réauthentification requise"
     },
     "signOut": {
+      "saveFailed": "Déconnexion annulée car l’enregistrement de « {workflow} » a échoué.",
       "signOut": "Se déconnecter",
+      "signOutAnyway": "Se déconnecter quand même",
       "success": "Déconnexion réussie",
       "successDetail": "Vous avez été déconnecté de votre compte.",
       "unsavedChangesMessage": "Vous avez des modifications non enregistrées qui seront perdues si vous vous déconnectez. Voulez-vous continuer ?",
@@ -461,6 +464,12 @@
       "wantToRun": "Vous préférez exécuter ComfyUI localement ?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "Veuillez choisir une option.",
+        "describeAnswer": "Veuillez décrire votre réponse.",
+        "selectAtLeastOne": "Veuillez sélectionner au moins une option."
+      },
+      "intro": "Aidez-nous à personnaliser votre expérience ComfyUI.",
       "options": {
         "familiarity": {
           "advanced": "Utilisateur avancé (workflows personnalisés)",
@@ -469,45 +478,43 @@
           "new": "Nouveau sur ComfyUI (jamais utilisé auparavant)",
           "starting": "Je débute (je suis des tutoriels)"
         },
-        "industry": {
-          "architecture": "Architecture",
-          "education": "Éducation",
-          "film_tv_animation": "Cinéma, télévision et animation",
-          "fine_art": "Art et illustration",
-          "gaming": "Jeux vidéo",
-          "marketing": "Marketing et publicité",
-          "other": "Autre",
-          "otherPlaceholder": "Veuillez préciser",
-          "product_design": "Design de produits et graphisme",
-          "software": "Logiciels et technologie"
-        },
-        "making": {
-          "3d": "Assets 3D",
+        "intent": {
+          "3d_game": "Assets 3D / assets de jeu",
+          "api": "Points de terminaison API pour exécuter des workflows",
+          "apps": "Applications simplifiées à partir de workflows",
           "audio": "Audio / musique",
-          "custom_nodes": "Nœuds et workflows personnalisés",
+          "custom_nodes": "Nœuds personnalisés",
           "images": "Images",
-          "video": "Vidéo et animation"
+          "not_sure": "Pas sûr",
+          "videos": "Vidéos",
+          "workflows": "Workflows ou pipelines personnalisés"
         },
-        "purpose": {
-          "client": "Travail pour clients (freelance)",
-          "community": "Contributions communautaires (nœuds, workflows, etc.)",
-          "inhouse": "Mon propre lieu de travail (interne)",
-          "personal": "Projets personnels / loisir",
-          "research": "Recherche académique"
+        "source": {
+          "conference": "Conférence ou événement",
+          "discord": "Discord / communauté",
+          "friend": "Ami ou collègue",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "Newsletter ou blog",
+          "other": "Autre",
+          "reddit": "Reddit",
+          "search": "Google / recherche",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "Éducation (étudiant ou enseignant)",
+          "personal": "Usage personnel",
+          "work": "Travail"
         }
       },
       "placeholder": "Texte indicatif des questions de l'enquête",
-      "questions": {
-        "familiarity": "Quelle est votre familiarité avec ComfyUI ?",
-        "industry": "Quel est votre secteur d'activité principal ?",
-        "making": "Que prévoyez-vous de créer ?",
-        "purpose": "À quoi utiliserez-vous principalement ComfyUI ?"
-      },
       "steps": {
         "familiarity": "Quelle est votre familiarité avec ComfyUI ?",
-        "industry": "Quel est votre secteur d'activité principal ?",
-        "making": "Que prévoyez-vous de créer ?",
-        "purpose": "À quoi utiliserez-vous principalement ComfyUI ?"
+        "intent": "Que souhaitez-vous créer avec ComfyUI ?",
+        "source": "Où avez-vous entendu parler de ComfyUI ?",
+        "usage": "Comment prévoyez-vous d'utiliser ComfyUI ?"
       },
       "title": "Enquête Cloud"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "créez en quelques secondes",
   "cloudStart_wantToRun": "Vous préférez exécuter ComfyUI localement ?",
   "cloudSurvey_steps_familiarity": "Quelle est votre familiarité avec ComfyUI ?",
-  "cloudSurvey_steps_industry": "Quel est votre secteur d'activité principal ?",
-  "cloudSurvey_steps_making": "Que prévoyez-vous de créer ?",
-  "cloudSurvey_steps_purpose": "À quoi utiliserez-vous principalement ComfyUI ?",
+  "cloudSurvey_steps_intent": "Que souhaitez-vous créer avec ComfyUI ?",
+  "cloudSurvey_steps_source": "Où avez-vous entendu parler de ComfyUI ?",
+  "cloudSurvey_steps_usage": "Comment prévoyez-vous d'utiliser ComfyUI ?",
   "cloudWaitlist_contactLink": "ici",
   "cloudWaitlist_questionsText": "Des questions ? Contactez-nous",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "ENCODEUR_AUDIO",
     "AUDIO_ENCODER_OUTPUT": "SORTIE_ENCODEUR_AUDIO",
     "AUDIO_RECORD": "ENREGISTREMENT_AUDIO",
+    "BACKGROUND_REMOVAL": "SUPPRESSION_ARRIÈRE-PLAN",
     "BOOLEAN": "BOOLEAN",
     "BOUNDING_BOX": "BOÎTE ENGLOBANTE",
     "CAMERA_CONTROL": "Contrôle de la caméra",
@@ -831,6 +839,7 @@
     "NOISE": "BRUIT",
     "OPENAI_CHAT_CONFIG": "CONFIG_CHAT_OPENAI",
     "OPENAI_INPUT_FILES": "FICHIERS_ENTRÉE_OPENAI",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Modèle Pixverse",
     "POSE_KEYPOINT": "POINT CLÉ DE POSE",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_pour_test",
     "advanced": "avancé",
     "animation": "animation",
-    "api": "api",
     "api node": "nœud api",
     "attention_experiments": "expériences_d'attention",
     "audio": "audio",
+    "background removal": "suppression de l’arrière-plan",
     "batch": "lot",
-    "camera": "caméra",
     "chroma_radiance": "chroma_radiance",
     "clip": "clip",
+    "color": "couleur",
     "combine": "combiner",
     "compositing": "composition",
     "cond pair": "cond pair",
     "cond single": "cond unique",
     "conditioning": "conditionnement",
-    "context": "contexte",
     "controlnet": "controlnet",
     "create": "créer",
     "custom_sampling": "échantillonnage_personnalisé",
@@ -2302,6 +2308,7 @@
     "deprecated": "déprécié",
     "detection": "détection",
     "edit_models": "edit_models",
+    "experimental": "expérimental",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "guidance",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "masque",
-    "math": "math",
     "model": "modèle",
     "model_merging": "fusion_de_modèles",
     "model_patches": "patches_de_modèle",
@@ -2334,16 +2340,13 @@
     "save": "enregistrer",
     "schedulers": "planificateurs",
     "scheduling": "planification",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "sigmas",
     "stable_cascade": "stable_cascade",
-    "string": "chaîne",
     "style_model": "modèle_de_style",
     "supir": "supir",
     "text": "texte",
-    "textgen": "textgen",
     "training": "entraînement",
     "transform": "transformer",
     "unet": "unet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "Échec de la suppression",
       "deleted": "Flux de travail supprimé",
       "dirtyClose": "Les fichiers ci-dessous ont été modifiés. Souhaitez-vous les enregistrer avant de fermer ?",
+      "dirtyCloseAnyway": "Fermer quand même",
       "dirtyCloseHint": "Maintenez Shift pour fermer sans invite",
       "dirtyCloseTitle": "Enregistrer les modifications ?",
       "workflowTreeType": {
diff --git a/src/locales/fr/nodeDefs.json b/src/locales/fr/nodeDefs.json
index 52c097c8bd..92cb7c4b3b 100644
--- a/src/locales/fr/nodeDefs.json
+++ b/src/locales/fr/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "start_image": {
+        "name": "image_de_départ"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "AjouterBruit",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "Génération d'image à partir de texte unifiée et édition précise d'une seule phrase jusqu'à une résolution 4K.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_fail_on_partial": {
+        "name": "échec_sur_partiel"
+      },
+      "model_height": {
+        "name": "hauteur"
+      },
+      "model_max_images": {
+        "name": "images_max"
+      },
+      "model_size_preset": {
+        "name": "préréglage_taille"
+      },
+      "model_width": {
+        "name": "largeur"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite textuelle pour créer ou éditer une image."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine à utiliser pour la génération."
+      },
+      "watermark": {
+        "name": "filigrane",
+        "tooltip": "Ajouter ou non un filigrane « Généré par IA » à l’image."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "Générer une vidéo en utilisant les modèles ByteDance via l'API basée sur l'invite",
     "display_name": "ByteDance Texte vers Vidéo",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "Définir manuellement les fenêtres de contexte.",
     "display_name": "Fenêtres de contexte (Manuel)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Ajouter ou non une image de correction causale aux fenêtres de contexte non indexées à 0."
+      },
       "closed_loop": {
         "name": "boucle_fermée",
         "tooltip": "Indique s'il faut fermer la boucle de la fenêtre de contexte ; applicable uniquement aux planifications en boucle."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "Latent d’espace pixel vide pour HiDream-O1-Image. Le modèle a été entraîné à environ 4 mégapixels ; des résolutions plus basses sortent de la distribution et la qualité régresse nettement. Résolutions d’entraînement : 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Image latente HiDream-O1 vide",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Générez des images via Flux.2 [pro] ou Flux.2 [max] à partir d’un prompt et d’images de référence optionnelles.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_height": {
+        "name": "hauteur"
+      },
+      "model_width": {
+        "name": "largeur"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt pour la génération ou l’édition d’image"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine aléatoire utilisée pour créer le bruit."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "Génère des images de manière synchrone à partir d'une invite et d'une résolution.",
     "display_name": "Flux.2 [max] Image",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Générez ou modifiez des images de manière synchrone via l'API Google Vertex.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_aspect_ratio": {
+        "name": "rapport d'aspect"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "model_thinking_level": {
+        "name": "niveau de réflexion"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite textuelle décrivant l'image à générer ou les modifications à appliquer. Incluez toutes contraintes, styles ou détails que le modèle doit respecter."
+      },
+      "response_modalities": {
+        "name": "modalités de réponse"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Lorsque la graine est fixée à une valeur spécifique, le modèle s'efforce de fournir la même réponse pour des requêtes répétées. Un résultat déterministe n'est pas garanti. De plus, changer le modèle ou les paramètres, comme la température, peut entraîner des variations de la réponse même avec la même valeur de graine. Par défaut, une valeur de graine aléatoire est utilisée."
+      },
+      "system_prompt": {
+        "name": "invite système",
+        "tooltip": "Instructions fondamentales qui dictent le comportement de l'IA."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "image de réflexion",
+        "tooltip": "Première image issue du processus de réflexion du modèle. Disponible uniquement avec le niveau de réflexion ÉLEVÉ et la modalité IMAGE+TEXTE."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Génère des réponses textuelles avec le modèle d'IA Gemini de Google. Vous pouvez fournir plusieurs types d'entrées (texte, images, audio, vidéo) comme contexte pour générer des réponses plus pertinentes et significatives.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "Modifiez une image existante à partir d’un prompt textuel",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_aspect_ratio": {
+        "name": "ratio_d’aspect"
+      },
+      "model_number_of_images": {
+        "name": "nombre_d’images"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Le prompt textuel utilisé pour générer l’image"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels sont non déterministes quel que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "Générez des images avec Grok à partir d'une invite textuelle",
     "display_name": "Grok Image",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "Moyenne la sortie du modèle sur plusieurs positions de grille de patch décalées pendant la phase finale de l’échantillonnage. Annule les coutures.",
+    "display_name": "Lissage des coutures de patch HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "mélange",
+        "tooltip": "average : moyenne à poids égal. window : pondération fenêtrée de Hann favorisant chaque passage loin de ses bords de patch. median : médiane par pixel, rejette les passages aberrants."
+      },
+      "end_percent": {
+        "name": "pourcentage_fin",
+        "tooltip": "Progression de l’échantillonnage à laquelle le mélange se désactive."
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "passes": {
+        "name": "passes",
+        "tooltip": "Nombre de passages par étape contrôlée. 2/4 = fixe. ramp_* : le nombre de passages augmente à mesure que l’échantillonnage approche de la fin (plus de lissage là où les coutures sont les plus visibles)."
+      },
+      "pattern": {
+        "name": "motif",
+        "tooltip": "Disposition du décalage. single_shift : un passage sur la grille de patch naturelle + autres décalés. symmetric : tous les passages hors grille, décalages répartis autour de l’origine."
+      },
+      "start_percent": {
+        "name": "pourcentage_début",
+        "tooltip": "Progression de l’échantillonnage (0=début, 1=fin) à laquelle le mélange s’active."
+      },
+      "strength": {
+        "name": "force",
+        "tooltip": "Interpolation entre la prédiction sur la grille naturelle (0) et le résultat moyenné (1)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "Ajoutez 1 à 10 images de référence au conditionnement, une pour une instruction d’édition ou plusieurs pour une personnalisation orientée sujet.",
+    "display_name": "Images de référence HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Images de référence. 1 image = édition par instruction ; 2-10 images = multi-référence."
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "Agrandissez les images basse résolution en super-résolution, éliminez les artefacts et le bruit. Sortie maximale : 32 mégapixels.",
     "display_name": "HitPaw Amélioration Générale d’Image",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Charger le modèle de suppression d’arrière-plan",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "nom_du_modèle_de_suppression_arrière-plan",
+        "tooltip": "Le modèle utilisé pour supprimer les arrière-plans des images"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modèle_bg",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Charger Image",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Modifiez une image existante avec une invite textuelle en utilisant le modèle Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la modification."
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "recherche_web"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description de la modification souhaitée. 1 à 6000 caractères."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit la graine."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Image source à modifier."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "Modifie les images de manière synchrone en fonction du prompt et du format d'image.",
     "display_name": "Luma Image vers Image",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Générez des images à partir de texte en utilisant le modèle Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la génération."
+      },
+      "model_aspect_ratio": {
+        "name": "rapport_d’aspect"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "recherche_web"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description textuelle de l’image souhaitée. 1 à 6000 caractères."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "Génère des vidéos de manière synchrone à partir d'un prompt, d'images d'entrée et de la taille de sortie.",
     "display_name": "Luma Image to Video",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "Échelle de bruit du modèle",
+    "inputs": {
+      "model": {
+        "name": "modèle"
+      },
+      "noise_scale": {
+        "name": "échelle_bruit",
+        "tooltip": "Échelle absolue du bruit d’entraînement. Par exemple HiDream-O1 base : 8.0, dev : 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Nœud Moonvalley Marey Image vers Vidéo",
-    "display_name": "Moonvalley Marey Image vers Vidéo",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "image": {
-        "name": "image",
-        "tooltip": "L'image de référence utilisée pour générer la vidéo"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Texte de prompt négatif"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Échelle de guidage pour le contrôle de la génération"
-      },
-      "resolution": {
-        "name": "résolution",
-        "tooltip": "Résolution de la vidéo de sortie"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Valeur de seed aléatoire"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Nombre d'étapes de débruitage"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey Texte vers Vidéo",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Texte de prompt négatif"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Échelle de guidage pour le contrôle de la génération"
-      },
-      "resolution": {
-        "name": "résolution",
-        "tooltip": "Résolution de la vidéo de sortie"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Valeur de seed aléatoire"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Étapes d'inférence"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Vidéo vers Vidéo",
-    "inputs": {
-      "control_type": {
-        "name": "type_contrôle"
-      },
-      "motion_intensity": {
-        "name": "intensité_mouvement",
-        "tooltip": "Utilisé uniquement si le type de contrôle est 'Transfert de mouvement'"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Texte de prompt négatif"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Décrit la vidéo à générer"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Valeur de seed aléatoire"
-      },
-      "steps": {
-        "name": "étapes",
-        "tooltip": "Nombre d'étapes d'inférence"
-      },
-      "video": {
-        "name": "vidéo",
-        "tooltip": "La vidéo de référence utilisée pour générer la vidéo de sortie. Doit durer au moins 5 secondes. Les vidéos plus longues que 5s seront automatiquement tronquées. Seul le format MP4 est pris en charge."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "ImageMorphologie",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "Génère des images de manière synchrone via l'endpoint GPT Image 1 d'OpenAI.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "Génère des images de manière synchrone via l'endpoint GPT Image 2 d'OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "arrière-plan",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "Invite textuelle pour GPT Image 1"
+        "tooltip": "Invite textuelle pour GPT Image 2"
       },
       "quality": {
         "name": "qualité",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "Génère des images via l’API GPT Image d’OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_background": {
+        "name": "arrière-plan"
+      },
+      "model_custom_height": {
+        "name": "hauteur_personnalisée"
+      },
+      "model_custom_width": {
+        "name": "largeur_personnalisée"
+      },
+      "model_quality": {
+        "name": "qualité"
+      },
+      "model_size": {
+        "name": "taille"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Combien d’images générer"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt textuel pour GPT Image"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "non implémenté côté serveur pour le moment"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "Charge et prépare les fichiers d'entrée (texte, pdf, etc.) à inclure comme entrées pour le nœud de chat OpenAI. Les fichiers seront lus par le modèle OpenAI lors de la génération d'une réponse. 🛈 ASTUCE : Peut être chaîné avec d'autres nœuds de fichiers d'entrée OpenAI.",
     "display_name": "Fichiers d'entrée OpenAI ChatGPT",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Charger le modèle de flux optique",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Modèle de flux optique à charger. Les fichiers doivent être placés dans le dossier 'optical_flow'. Actuellement, seul raft_large.pth de torchvision est pris en charge."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,8 +12881,8 @@
   "PrimitiveInt": {
     "display_name": "Int",
     "inputs": {
-      "control_after_generate": {
-        "name": "contrôler après génération"
+      "fixed": {
+        "name": "contrôle après génération"
       },
       "value": {
         "name": "valeur"
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Supprimer l’arrière-plan",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "modèle_de_suppression_arrière-plan",
+        "tooltip": "Modèle de suppression d’arrière-plan utilisé pour générer le masque"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Image d’entrée dont l’arrière-plan doit être supprimé"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "masque",
+        "tooltip": "Masque de premier plan généré"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "nombre_d’images_par_bloc",
+        "tooltip": "Images par bloc autorégressif. 1 = image par image, 3 = par lot. Doit correspondre au mode d’entraînement du checkpoint."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "ÉchantillonneurPersonnalisé",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "Échantillonneur LCM avec bruit ajustable à chaque étape. s_noise est un multiplicateur de l'échelle de bruit d'entraînement du modèle.",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Limite le bruit par étape à +/- N*écart-type. 0 pour désactiver."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicateur de bruit par étape à la première étape (1.0 = correspond à l'entraînement)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Multiplicateur de bruit par étape à la dernière étape. Identique à s_noise pour un planning constant."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "audio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "utiliser le modèle par défaut",
         "tooltip": "Utiliser l'invite/le modèle système intégré si le modèle en possède un."
+      },
+      "video": {
+        "name": "vidéo",
+        "tooltip": "Images extraites de la vidéo en lot. Supposé à 24 FPS ; sous-échantillonné à 1 FPS en interne."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "audio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "utiliser le modèle par défaut",
         "tooltip": "Utiliser l'invite/le modèle système intégré si le modèle en possède un."
+      },
+      "video": {
+        "name": "vidéo",
+        "tooltip": "Images extraites de la vidéo en lot. Supposé à 24 FPS ; sous-échantillonné à 1 FPS en interne."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "Redonnez vie à vos vidéos grâce à une technologie puissante d’agrandissement et de restauration.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "niveau de compression dynamique",
+        "tooltip": "Niveau CQP."
+      },
+      "interpolation_model": {
+        "name": "modèle d’interpolation"
+      },
+      "upscaler_model": {
+        "name": "modèle d’agrandissement"
+      },
+      "upscaler_model_creativity": {
+        "name": "créativité"
+      },
+      "upscaler_model_prompt": {
+        "name": "invite"
+      },
+      "upscaler_model_realism": {
+        "name": "réalisme"
+      },
+      "upscaler_model_sharp": {
+        "name": "netteté"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "résolution d’agrandissement"
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "ModèleCompilationTorch",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "quad"
+        "name": "quad",
+        "tooltip": "Ce paramètre est obsolète et n'a aucun effet."
       },
       "texture": {
         "name": "texture"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Nombre d’images pixels à traiter. Pour CogVideoX-Fun-V1.5 (patch_size_t=2), latent_t doit être pair — les longueurs produisant un latent_t impair sont arrondies à l’inférieur (ex. 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "Quadmask prétraité depuis VOIDQuadmaskPreprocess [T, H, L]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Images vidéo source [T, H, L, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Rayon de dilatation pour la région principale du masque (0 = pas de dilatation)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Nombre d’images pixels. Arrondi à l’inférieur pour rendre latent_t pair (exigence patch_size_t=2), ex. 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "Modèle de flux optique depuis OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Images vidéo de sortie du passage 1 [T, H, L, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "Latent de bruit déformé depuis VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "PlanificateurVP",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "L'échelle des caractéristiques audio lors de leur injection dans le modèle vidéo."
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "Le nombre d'images par seconde calculé en fonction de la durée de l'audio et du nombre d'images vidéo. Utilisé dans l'invite."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio pour calculer le nombre total d'images de sortie et extraire l'audio du segment."
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "Quel segment est-ce (0 pour le premier, 1 pour le second, etc.)"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Longueur de ce segment (généralement 149 images)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Séquence de keyframes complétée"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Masque indiquant les images valides"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Segment audio pour ce segment vidéo"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio à découper pour chaque segment émis."
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "Combien de segments complétés à émettre sous forme de listes."
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Longueur de chaque segment (généralement 149 images)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Séquences de keyframes complétées"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Masques indiquant les images valides"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Segment audio pour chaque segment vidéo"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "Les embeddings CLIP vision pour la première image."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "Les embeddings CLIP vision pour l’image de référence."
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur",
+        "tooltip": "Le nombre d’images dans la vidéo générée. Doit rester à 149 pour WanDancer."
+      },
+      "mask": {
+        "name": "masque",
+        "tooltip": "Masque de conditionnement d’image pour l’image ou les images de départ. Le blanc est conservé, le noir est généré. Utilisé pour les générations locales."
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "start_image": {
+        "name": "image_de_départ",
+        "tooltip": "L’image ou les images initiales à encoder, peut contenir n’importe quel nombre d’images."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Latent vide."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json
index 1488f73a35..a9eb05adea 100644
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "および",
+      "backToGithubLogin": "代わりにGithubでサインアップ",
       "backToLogin": "ログインに戻る",
       "backToSocialLogin": "GoogleまたはGithubでサインアップする",
       "confirmPasswordLabel": "パスワードの確認",
@@ -292,7 +293,9 @@
       "title": "再認証が必要です"
     },
     "signOut": {
+      "saveFailed": "「{workflow}」の保存に失敗したため、サインアウトがキャンセルされました。",
       "signOut": "ログアウト",
+      "signOutAnyway": "とにかくサインアウト",
       "success": "正常にサインアウトしました",
       "successDetail": "アカウントからサインアウトしました。",
       "unsavedChangesMessage": "サインアウトすると未保存の変更が失われます。続行しますか？",
@@ -461,6 +464,12 @@
       "wantToRun": "代わりにローカルでComfyUIを実行したいですか？"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "オプションを選択してください。",
+        "describeAnswer": "回答を記述してください。",
+        "selectAtLeastOne": "少なくとも1つ選択してください。"
+      },
+      "intro": "ComfyUIの体験をより最適化するためにご協力ください。",
       "options": {
         "familiarity": {
           "advanced": "上級ユーザー（カスタムワークフロー）",
@@ -469,45 +478,43 @@
           "new": "ComfyUI初心者（使用経験なし）",
           "starting": "使い始め（チュートリアルをフォロー中）"
         },
-        "industry": {
-          "architecture": "建築",
-          "education": "教育",
-          "film_tv_animation": "映画、テレビ、アニメーション",
-          "fine_art": "ファインアート & イラストレーション",
-          "gaming": "ゲーミング",
-          "marketing": "マーケティング & 広告",
-          "other": "その他",
-          "otherPlaceholder": "詳細を入力してください",
-          "product_design": "プロダクト & グラフィックデザイン",
-          "software": "ソフトウェア & テクノロジー"
-        },
-        "making": {
-          "3d": "3Dアセット",
-          "audio": "オーディオ / 音楽",
-          "custom_nodes": "カスタムノード & ワークフロー",
+        "intent": {
+          "3d_game": "3Dアセット／ゲームアセット",
+          "api": "ワークフロー実行用APIエンドポイント",
+          "apps": "ワークフローから簡易アプリ作成",
+          "audio": "音声／音楽",
+          "custom_nodes": "カスタムノード",
           "images": "画像",
-          "video": "ビデオ & アニメーション"
+          "not_sure": "まだ分からない",
+          "videos": "動画",
+          "workflows": "カスタムワークフローやパイプライン"
         },
-        "purpose": {
-          "client": "クライアントワーク（フリーランス）",
-          "community": "コミュニティ貢献（ノード、ワークフローなど）",
-          "inhouse": "自社での利用（社内）",
-          "personal": "個人プロジェクト／趣味",
-          "research": "学術研究"
+        "source": {
+          "conference": "カンファレンスやイベント",
+          "discord": "Discord／コミュニティ",
+          "friend": "友人または同僚",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "ニュースレターやブログ",
+          "other": "その他",
+          "reddit": "Reddit",
+          "search": "Google／検索",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "教育（学生または教育者）",
+          "personal": "個人利用",
+          "work": "仕事"
         }
       },
       "placeholder": "アンケート質問のプレースホルダー",
-      "questions": {
-        "familiarity": "ComfyUIの使用経験はどの程度ですか？",
-        "industry": "あなたの主な業界は何ですか？",
-        "making": "何を作成する予定ですか？",
-        "purpose": "ComfyUIを主に何に使用しますか？"
-      },
       "steps": {
         "familiarity": "ComfyUIの使用経験はどの程度ですか？",
-        "industry": "あなたの主な業界は何ですか？",
-        "making": "何を作成する予定ですか？",
-        "purpose": "ComfyUIを主に何に使用しますか？"
+        "intent": "ComfyUIで何を作成したいですか？",
+        "source": "ComfyUIをどこで知りましたか？",
+        "usage": "ComfyUIをどのように利用する予定ですか？"
       },
       "title": "クラウドアンケート"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "数秒で作成を開始",
   "cloudStart_wantToRun": "代わりにローカルでComfyUIを実行したいですか？",
   "cloudSurvey_steps_familiarity": "ComfyUIにどの程度精通していますか？",
-  "cloudSurvey_steps_industry": "あなたの主な業界は何ですか？",
-  "cloudSurvey_steps_making": "何を作成する予定ですか？",
-  "cloudSurvey_steps_purpose": "ComfyUIを主に何に使用しますか？",
+  "cloudSurvey_steps_intent": "ComfyUIで何を作成したいですか？",
+  "cloudSurvey_steps_source": "ComfyUIをどこで知りましたか？",
+  "cloudSurvey_steps_usage": "ComfyUIをどのように利用する予定ですか？",
   "cloudWaitlist_contactLink": "こちら",
   "cloudWaitlist_questionsText": "質問がありますか？お問い合わせください",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "オーディオエンコーダ",
     "AUDIO_ENCODER_OUTPUT": "オーディオエンコーダ出力",
     "AUDIO_RECORD": "オーディオ録音",
+    "BACKGROUND_REMOVAL": "背景除去",
     "BOOLEAN": "ブール",
     "BOUNDING_BOX": "バウンディングボックス",
     "CAMERA_CONTROL": "カメラコントロール",
@@ -831,6 +839,7 @@
     "NOISE": "ノイズ",
     "OPENAI_CHAT_CONFIG": "OpenAIチャット設定",
     "OPENAI_INPUT_FILES": "OpenAI入力ファイル",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Pixverseテンプレート",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_テスト用",
     "advanced": "高度な機能",
     "animation": "アニメーション",
-    "api": "API",
     "api node": "apiノード",
     "attention_experiments": "アテンション実験",
     "audio": "オーディオ",
+    "background removal": "背景除去",
     "batch": "バッチ",
-    "camera": "カメラ",
     "chroma_radiance": "chroma_radiance",
     "clip": "クリップ",
+    "color": "カラー",
     "combine": "結合",
     "compositing": "合成",
     "cond pair": "条件ペア",
     "cond single": "条件単体",
     "conditioning": "条件付け",
-    "context": "コンテキスト",
     "controlnet": "コントロールネット",
     "create": "作成",
     "custom_sampling": "カスタムサンプリング",
@@ -2302,6 +2308,7 @@
     "deprecated": "非推奨",
     "detection": "検出",
     "edit_models": "モデル編集",
+    "experimental": "実験的",
     "flux": "flux",
     "gligen": "グライジェン",
     "guidance": "ガイダンス",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "LTXV",
     "mask": "マスク",
-    "math": "数学",
     "model": "モデル",
     "model_merging": "モデルマージ",
     "model_patches": "モデルパッチ",
@@ -2334,16 +2340,13 @@
     "save": "保存",
     "schedulers": "スケジューラー",
     "scheduling": "スケジューリング",
-    "sd": "sd",
     "sd3": "SD3",
     "shader": "shader",
     "sigmas": "シグマ",
     "stable_cascade": "安定したカスケード",
-    "string": "文字列",
     "style_model": "スタイルモデル",
     "supir": "supir",
     "text": "テキスト",
-    "textgen": "textgen",
     "training": "トレーニング",
     "transform": "変換",
     "unet": "U-Net",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "削除に失敗しました",
       "deleted": "ワークフローが削除されました",
       "dirtyClose": "以下のファイルが変更されました。閉じる前に保存しますか？",
+      "dirtyCloseAnyway": "とにかく閉じる",
       "dirtyCloseHint": "Shiftキーを押しながら閉じると、プロンプトなしで閉じます",
       "dirtyCloseTitle": "変更を保存しますか？",
       "workflowTreeType": {
diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json
index 6d1035ebc1..ff2b777f8a 100644
--- a/src/locales/ja/nodeDefs.json
+++ b/src/locales/ja/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "ノイズを追加",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "統合されたテキストから画像生成と、最大4K解像度での正確な単一文編集。",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_fail_on_partial": {
+        "name": "部分的な失敗時に停止"
+      },
+      "model_height": {
+        "name": "高さ"
+      },
+      "model_max_images": {
+        "name": "最大画像数"
+      },
+      "model_size_preset": {
+        "name": "サイズプリセット"
+      },
+      "model_width": {
+        "name": "幅"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像の作成または編集のためのテキストプロンプト。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "生成に使用するシード。"
+      },
+      "watermark": {
+        "name": "ウォーターマーク",
+        "tooltip": "画像に「AI生成」のウォーターマークを追加するかどうか。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "プロンプトに基づきAPI経由でByteDanceモデルを使用して動画を生成",
     "display_name": "ByteDance テキストから動画へ",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "コンテキストウィンドウを手動で設定します。",
     "display_name": "コンテキストウィンドウ（手動）",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "非0インデックスのコンテキストウィンドウに因果修正フレームを追加するかどうか。"
+      },
       "closed_loop": {
         "name": "closed_loop",
         "tooltip": "コンテキストウィンドウのループを閉じるかどうか。ループスケジュールにのみ適用されます。"
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "HiDream-O1-Image 用の空のピクセル空間潜在。モデルは約4メガピクセルでトレーニングされています。解像度が低いと分布外となり、品質が著しく低下します。トレーニング解像度：2048x2048、2304x1728、1728x2304、2560x1440、1440x2560、2496x1664、1664x2496、3104x1312、1312x3104、2304x1792、1792x2304。",
+    "display_name": "Empty HiDream-O1 潜在画像",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Flux.2 [pro] または Flux.2 [max] を使い、プロンプトとオプションの参照画像から画像を生成します。",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_height": {
+        "name": "高さ"
+      },
+      "model_width": {
+        "name": "幅"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成または編集のためのプロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "ノイズ生成に使用されるランダムシード。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "プロンプトと解像度に基づいて同期的に画像を生成します。",
     "display_name": "Flux.2 [max] 画像",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Google Vertex API を使用して画像を同期的に生成または編集します。",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "model_thinking_level": {
+        "name": "思考レベル"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "生成する画像や適用する編集内容を説明するテキストプロンプト。モデルが従うべき制約、スタイル、詳細も含めてください。"
+      },
+      "response_modalities": {
+        "name": "応答モダリティ"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シード値を特定の値に固定すると、モデルは繰り返しリクエストに対して同じ応答を返すよう最善を尽くしますが、完全な決定的出力は保証されません。また、モデルやパラメータ設定（例：temperature）を変更すると、同じシード値でも応答が変化する場合があります。デフォルトではランダムなシード値が使用されます。"
+      },
+      "system_prompt": {
+        "name": "システムプロンプト",
+        "tooltip": "AI の挙動を指示する基本的な指示文。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "思考画像",
+        "tooltip": "モデルの思考過程から得られる最初の画像。思考レベルがHIGHかつモダリティがIMAGE+TEXTの場合のみ利用可能です。"
+      }
+    }
+  },
   "GeminiNode": {
     "description": "GoogleのGemini AIモデルでテキスト応答を生成します。テキスト、画像、音声、動画など複数の種類の入力をコンテキストとして提供し、より関連性の高い意味のある応答を生成できます。",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "既存の画像をテキストプロンプトに基づいて編集します",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "model_number_of_images": {
+        "name": "画像数"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成に使用されるテキストプロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "ノードを再実行するかどうかを決定するシード；実際の結果はシードに関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "テキストプロンプトに基づいてGrokで画像を生成します",
     "display_name": "Grok画像生成",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "サンプリングの後半で、複数のシフトしたパッチグリッド位置にわたってモデル出力を平均化します。継ぎ目を除去します。",
+    "display_name": "HiDream-O1 パッチ継ぎ目スムージング",
+    "inputs": {
+      "blend": {
+        "name": "ブレンド",
+        "tooltip": "average：等重み平均。window：各パスがパッチ境界から離れるほど重み付けするHannウィンドウ。median：ピクセルごとの中央値、ラップアラウンド外れ値パスを除外。"
+      },
+      "end_percent": {
+        "name": "終了パーセント",
+        "tooltip": "ブレンドがOFFになるサンプリング進行度。"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "passes": {
+        "name": "パス数",
+        "tooltip": "ゲートステップごとのパス数。2/4＝固定。ramp_*：サンプリング終了に近づくほどパス数が増加（継ぎ目が目立つ部分でよりスムージング）。"
+      },
+      "pattern": {
+        "name": "パターン",
+        "tooltip": "シフトレイアウト。single_shift：自然なパッチグリッドで1回＋他はオフセット。symmetric：全てのパスがグリッド外、シフトは原点を中心に分割。"
+      },
+      "start_percent": {
+        "name": "開始パーセント",
+        "tooltip": "ブレンドがONになるサンプリング進行度（0=開始、1=終了）。"
+      },
+      "strength": {
+        "name": "強度",
+        "tooltip": "自然グリッド予測（0）と平均化結果（1）の間で補間。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "1～10枚の参照画像をコンディショニングに添付します。1枚は編集指示用、複数枚は被写体パーソナライズ用。",
+    "display_name": "HiDream-O1 参照画像",
+    "inputs": {
+      "images": {
+        "name": "画像",
+        "tooltip": "参照画像。1枚＝編集指示、2～10枚＝マルチ参照。"
+      },
+      "negative": {
+        "name": "ネガティブ"
+      },
+      "positive": {
+        "name": "ポジティブ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ポジティブ",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ネガティブ",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "低解像度画像を超解像度にアップスケールし、アーティファクトやノイズを除去します。最大出力：32メガピクセル。",
     "display_name": "HitPaw 一般画像強化",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "背景除去モデルの読み込み",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "bg_removal_name",
+        "tooltip": "画像から背景を除去するために使用するモデル"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "画像を読み込む",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Luma UNI-1モデルを使用して、テキストプロンプトで既存の画像を編集します。",
+    "display_name": "Luma UNI-1 画像編集",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "編集に使用するモデル。"
+      },
+      "model_style": {
+        "name": "スタイル"
+      },
+      "model_web_search": {
+        "name": "ウェブ検索"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "希望する編集内容の説明。1～6000文字。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関係なく結果は非決定的です。"
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "編集する元画像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "プロンプトとアスペクト比に基づいて画像を同期的に変更します。",
     "display_name": "Luma 画像から画像へ",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Luma UNI-1モデルを使用してテキストから画像を生成します。",
+    "display_name": "Luma UNI-1 画像生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "生成に使用するモデル。"
+      },
+      "model_aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "model_style": {
+        "name": "スタイル"
+      },
+      "model_web_search": {
+        "name": "ウェブ検索"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "希望する画像のテキスト説明。1～6000文字。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関係なく結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "プロンプト、入力画像、およびoutput_sizeに基づいて同期的に動画を生成します。",
     "display_name": "Luma画像から動画へ",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "ModelNoiseScale",
+    "inputs": {
+      "model": {
+        "name": "モデル"
+      },
+      "noise_scale": {
+        "name": "ノイズスケール",
+        "tooltip": "絶対トレーニングノイズスケール。例：HiDream-O1 base：8.0、dev：7.5。"
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "モデルパッチローダー",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Moonvalley Marey 画像から動画ノード",
-    "display_name": "Moonvalley Marey 画像から動画",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成後の制御"
-      },
-      "image": {
-        "name": "画像",
-        "tooltip": "動画生成に使用する参照画像"
-      },
-      "negative_prompt": {
-        "name": "ネガティブプロンプト",
-        "tooltip": "ネガティブプロンプトテキスト"
-      },
-      "prompt": {
-        "name": "プロンプト"
-      },
-      "prompt_adherence": {
-        "name": "プロンプト遵守度",
-        "tooltip": "生成制御のためのガイダンススケール"
-      },
-      "resolution": {
-        "name": "解像度",
-        "tooltip": "出力動画の解像度"
-      },
-      "seed": {
-        "name": "シード",
-        "tooltip": "ランダムシード値"
-      },
-      "steps": {
-        "name": "ステップ数",
-        "tooltip": "ノイズ除去ステップ数"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey テキストから動画",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成後の制御"
-      },
-      "negative_prompt": {
-        "name": "ネガティブプロンプト",
-        "tooltip": "ネガティブプロンプトテキスト"
-      },
-      "prompt": {
-        "name": "プロンプト"
-      },
-      "prompt_adherence": {
-        "name": "プロンプト遵守度",
-        "tooltip": "生成制御のためのガイダンススケール"
-      },
-      "resolution": {
-        "name": "解像度",
-        "tooltip": "出力動画の解像度"
-      },
-      "seed": {
-        "name": "シード",
-        "tooltip": "ランダムシード値"
-      },
-      "steps": {
-        "name": "ステップ数",
-        "tooltip": "推論ステップ数"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey 動画から動画",
-    "inputs": {
-      "control_type": {
-        "name": "制御タイプ"
-      },
-      "motion_intensity": {
-        "name": "モーション強度",
-        "tooltip": "control_typeが「モーション転送」の場合のみ使用"
-      },
-      "negative_prompt": {
-        "name": "ネガティブプロンプト",
-        "tooltip": "ネガティブプロンプトテキスト"
-      },
-      "prompt": {
-        "name": "プロンプト",
-        "tooltip": "生成する動画の説明"
-      },
-      "seed": {
-        "name": "シード",
-        "tooltip": "ランダムシード値"
-      },
-      "steps": {
-        "name": "ステップ数",
-        "tooltip": "推論ステップ数"
-      },
-      "video": {
-        "name": "動画",
-        "tooltip": "出力動画の生成に使用する参照動画。最低5秒以上である必要があります。5秒を超える動画は自動的にトリミングされます。MP4形式のみ対応。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "画像形態学",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "OpenAIのGPT Image 1エンドポイントを通じて同期的に画像を生成します。",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "OpenAIのGPT Image 2エンドポイントを通じて同期的に画像を生成します。",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "背景",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "プロンプト",
-        "tooltip": "GPT Image 1用のテキストプロンプト"
+        "tooltip": "GPT Image 2用のテキストプロンプト"
       },
       "quality": {
         "name": "品質",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "OpenAIのGPT Imageエンドポイントを使って画像を生成します。",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_background": {
+        "name": "背景"
+      },
+      "model_custom_height": {
+        "name": "カスタム高さ"
+      },
+      "model_custom_width": {
+        "name": "カスタム幅"
+      },
+      "model_quality": {
+        "name": "品質"
+      },
+      "model_size": {
+        "name": "サイズ"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "生成する画像の数"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "GPT Image用のテキストプロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "バックエンドではまだ未実装"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "OpenAIチャットノードの入力として含める入力ファイル（テキスト、PDFなど）を読み込み、準備します。ファイルはOpenAIモデルによって応答生成時に読み込まれます。🛈 ヒント: 他のOpenAI入力ファイルノードと連結できます。",
     "display_name": "OpenAI ChatGPT 入力ファイル",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "オプティカルフローモデルの読み込み",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "読み込むオプティカルフローモデル。ファイルは「optical_flow」フォルダに配置してください。現在はtorchvisionのraft_large.pthのみ対応しています。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "整数",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "生成後に制御"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "背景を除去",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "bg_removal_model",
+        "tooltip": "マスクを生成するために使用する背景除去モデル"
+      },
+      "image": {
+        "name": "画像",
+        "tooltip": "背景を除去する入力画像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "マスク",
+        "tooltip": "生成された前景マスク"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "自己回帰ブロックごとのフレーム数。1＝フレーム単位、3＝チャンク単位。チェックポイントのトレーニングモードと一致する必要があります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "カスタムサンプラー",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "調整可能なステップごとのノイズを持つLCMサンプラー。s_noiseはモデルの学習ノイズスケールに対する乗数です。",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "ステップごとのノイズを±N×標準偏差に制限します。0で無効化。"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "最初のステップでのステップごとのノイズ乗数（1.0 = 学習時と同じ）。"
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "最後のステップでのステップごとのノイズ乗数。一定スケジュールにするにはs_noiseと同じ値に設定してください。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "サンプラーLCM拡大",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "オーディオ"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "モデルに組み込まれているシステムプロンプト／テンプレートを使用します（ある場合）。"
+      },
+      "video": {
+        "name": "ビデオ",
+        "tooltip": "ビデオフレームを画像バッチとして扱います。24 FPSと仮定し、内部的に1 FPSにサブサンプリングされます。"
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "オーディオ"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "モデルに組み込まれているシステムプロンプト／テンプレートを使用します（ある場合）。"
+      },
+      "video": {
+        "name": "ビデオ",
+        "tooltip": "ビデオフレームを画像バッチとして扱います。24 FPSと仮定し、内部的に1 FPSにサブサンプリングされます。"
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "強力なアップスケーリングと復元技術でビデオに新たな命を吹き込みます。",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "ダイナミック圧縮レベル",
+        "tooltip": "CQPレベル。"
+      },
+      "interpolation_model": {
+        "name": "補間モデル"
+      },
+      "upscaler_model": {
+        "name": "アップスケーラーモデル"
+      },
+      "upscaler_model_creativity": {
+        "name": "創造性"
+      },
+      "upscaler_model_prompt": {
+        "name": "プロンプト"
+      },
+      "upscaler_model_realism": {
+        "name": "リアリズム"
+      },
+      "upscaler_model_sharp": {
+        "name": "シャープ"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "アップスケーラー解像度"
+      },
+      "video": {
+        "name": "ビデオ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torchコンパイルモデル",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "quad"
+        "name": "quad",
+        "tooltip": "このパラメータは非推奨であり、何も行いません。"
       },
       "texture": {
         "name": "texture"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "処理するピクセルフレーム数。CogVideoX-Fun-V1.5（patch_size_t=2）の場合、latent_tは偶数でなければなりません — 奇数のlatent_tになる長さは切り捨てられます（例：49 → 45）。"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "VOIDQuadmaskPreprocessからの前処理済みquadmask [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "元動画フレーム [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "主マスク領域の膨張半径（0＝膨張なし）"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "ピクセルフレーム数。latent_tを偶数にするため切り捨てられます（patch_size_t=2の要件、例：49 → 45）。"
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "OpticalFlowLoader（RAFT-large）からのオプティカルフローモデル。"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "パス1の出力動画フレーム [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "VOIDWarpedNoiseからのワープノイズlatent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPスケジューラー",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "オーディオ特徴量をビデオモデルに注入する際のスケール。"
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "オーディオの長さとビデオフレーム数から計算されたfps。プロンプトで使用されます。"
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "出力フレーム総数の計算やセグメントオーディオの抽出に使用するオーディオ。"
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "このセグメントがどれか（最初は0、次は1など）"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "このセグメントの長さ（通常は149フレーム）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "パディングされたキーフレームシーケンス"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "有効なフレームを示すマスク"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "このビデオセグメント用のオーディオセグメント"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "各出力セグメント用にスライスするオーディオ。"
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "リストとして出力するパディング済みセグメントの数。"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "各セグメントの長さ（通常は149フレーム）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "パディングされたキーフレームシーケンス"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "有効なフレームを示すマスク"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "各ビデオセグメント用のオーディオセグメント"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "最初のフレームのCLIP vision埋め込み。"
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "参照画像のCLIP vision埋め込み。"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ",
+        "tooltip": "生成される動画のフレーム数。WanDancerの場合は149のままにしてください。"
+      },
+      "mask": {
+        "name": "マスク",
+        "tooltip": "開始画像の画像処理用マスク。白は保持、黒は生成されます。ローカル生成に使用されます。"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "開始画像",
+        "tooltip": "エンコードする初期画像。任意のフレーム数を指定できます。"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "空のlatent。"
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json
index 76f76bbbab..c21959d27e 100644
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "및",
+      "backToGithubLogin": "대신 Github로 가입하기",
       "backToLogin": "로그인으로 돌아가기",
       "backToSocialLogin": "Google 또는 Github로 가입하기",
       "confirmPasswordLabel": "비밀번호 확인",
@@ -292,7 +293,9 @@
       "title": "재인증 필요"
     },
     "signOut": {
+      "saveFailed": "\"{workflow}\" 저장에 실패하여 로그아웃이 취소되었습니다.",
       "signOut": "로그아웃",
+      "signOutAnyway": "그래도 로그아웃하기",
       "success": "성공적으로 로그아웃되었습니다",
       "successDetail": "계정에서 로그아웃되었습니다.",
       "unsavedChangesMessage": "저장되지 않은 변경 사항이 있습니다. 로그아웃하면 변경 사항이 사라집니다. 계속하시겠습니까?",
@@ -461,6 +464,12 @@
       "wantToRun": "로컬에서 ComfyUI를 실행하고 싶으신가요?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "옵션을 선택해 주세요.",
+        "describeAnswer": "답변을 설명해 주세요.",
+        "selectAtLeastOne": "최소 한 가지 옵션을 선택해 주세요."
+      },
+      "intro": "ComfyUI 경험을 맞춤화할 수 있도록 도와주세요.",
       "options": {
         "familiarity": {
           "advanced": "고급 사용자 (커스텀 워크플로우 사용)",
@@ -469,45 +478,43 @@
           "new": "ComfyUI 처음 사용 (이전에 사용한 적 없음)",
           "starting": "막 시작한 단계 (튜토리얼 따라하는 중)"
         },
-        "industry": {
-          "architecture": "건축",
-          "education": "교육",
-          "film_tv_animation": "영화, TV 및 애니메이션",
-          "fine_art": "순수 미술 및 일러스트레이션",
-          "gaming": "게임",
-          "marketing": "마케팅 및 광고",
-          "other": "기타",
-          "otherPlaceholder": "구체적으로 입력",
-          "product_design": "제품 및 그래픽 디자인",
-          "software": "소프트웨어 및 기술"
-        },
-        "making": {
-          "3d": "3D 에셋",
+        "intent": {
+          "3d_game": "3D 에셋 / 게임 에셋",
+          "api": "워크플로우 실행용 API 엔드포인트",
+          "apps": "워크플로우 기반 간소화 앱",
           "audio": "오디오 / 음악",
-          "custom_nodes": "사용자 정의 노드 및 워크플로우",
+          "custom_nodes": "커스텀 노드",
           "images": "이미지",
-          "video": "비디오 및 애니메이션"
+          "not_sure": "잘 모르겠음",
+          "videos": "비디오",
+          "workflows": "맞춤형 워크플로우 또는 파이프라인"
         },
-        "purpose": {
-          "client": "클라이언트 작업 (프리랜서)",
-          "community": "커뮤니티 기여 (노드, 워크플로우 등)",
-          "inhouse": "자사 업무 (내부 사용)",
-          "personal": "개인 프로젝트 / 취미",
-          "research": "학술 연구"
+        "source": {
+          "conference": "컨퍼런스 또는 이벤트",
+          "discord": "Discord / 커뮤니티",
+          "friend": "친구 또는 동료",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "뉴스레터 또는 블로그",
+          "other": "기타",
+          "reddit": "Reddit",
+          "search": "Google / 검색",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "교육용(학생 또는 교육자)",
+          "personal": "개인용",
+          "work": "업무용"
         }
       },
       "placeholder": "설문 질문 자리표시자",
-      "questions": {
-        "familiarity": "ComfyUI에 얼마나 익숙하신가요?",
-        "industry": "주로 어떤 업계에서 일하시나요?",
-        "making": "무엇을 만들 계획이신가요?",
-        "purpose": "주로 ComfyUI를 어떤 용도로 사용하실 계획이신가요?"
-      },
       "steps": {
         "familiarity": "ComfyUI에 얼마나 익숙하신가요?",
-        "industry": "주로 어떤 업계에서 일하시나요?",
-        "making": "무엇을 만들 계획이신가요?",
-        "purpose": "주로 ComfyUI를 어떤 용도로 사용하실 계획이신가요?"
+        "intent": "ComfyUI로 무엇을 만들고 싶으신가요?",
+        "source": "ComfyUI를 어디에서 알게 되셨나요?",
+        "usage": "ComfyUI를 어떻게 사용하실 계획인가요?"
       },
       "title": "클라우드 설문"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "몇 초 만에 제작 시작",
   "cloudStart_wantToRun": "로컬에서 ComfyUI를 실행하고 싶으신가요?",
   "cloudSurvey_steps_familiarity": "ComfyUI에 얼마나 익숙하신가요?",
-  "cloudSurvey_steps_industry": "주요 업계는 무엇인가요?",
-  "cloudSurvey_steps_making": "무엇을 만들 계획인가요?",
-  "cloudSurvey_steps_purpose": "주로 ComfyUI를 어떤 용도로 사용하실 계획인가요?",
+  "cloudSurvey_steps_intent": "ComfyUI로 무엇을 만들고 싶으신가요?",
+  "cloudSurvey_steps_source": "ComfyUI를 어디에서 알게 되셨나요?",
+  "cloudSurvey_steps_usage": "ComfyUI를 어떻게 사용하실 계획인가요?",
   "cloudWaitlist_contactLink": "여기",
   "cloudWaitlist_questionsText": "질문이 있으신가요? 문의하기",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "AUDIO_ENCODER",
     "AUDIO_ENCODER_OUTPUT": "AUDIO_ENCODER_OUTPUT",
     "AUDIO_RECORD": "AUDIO_RECORD",
+    "BACKGROUND_REMOVAL": "배경 제거",
     "BOOLEAN": "논리값",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "카메라 제어",
@@ -831,6 +839,7 @@
     "NOISE": "노이즈",
     "OPENAI_CHAT_CONFIG": "OpenAI 채팅 설정",
     "OPENAI_INPUT_FILES": "OpenAI 입력 파일",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Pixverse 템플릿",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_테스트용",
     "advanced": "고급",
     "animation": "애니메이션",
-    "api": "API",
     "api node": "api 노드",
     "attention_experiments": "어텐션 실험",
     "audio": "오디오",
+    "background removal": "배경 제거",
     "batch": "배치",
-    "camera": "카메라",
     "chroma_radiance": "chroma_radiance",
     "clip": "클립",
+    "color": "색상",
     "combine": "결합",
     "compositing": "합성",
     "cond pair": "조건 쌍",
     "cond single": "단일 조건",
     "conditioning": "조건화",
-    "context": "컨텍스트",
     "controlnet": "컨트롤넷",
     "create": "생성",
     "custom_sampling": "사용자 정의 샘플링",
@@ -2302,6 +2308,7 @@
     "deprecated": "지원 중단",
     "detection": "감지",
     "edit_models": "edit_models",
+    "experimental": "실험적",
     "flux": "flux",
     "gligen": "글리젠",
     "guidance": "가이드",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "마스크",
-    "math": "수학",
     "model": "모델",
     "model_merging": "모델 병합",
     "model_patches": "모델 패치",
@@ -2334,16 +2340,13 @@
     "save": "저장",
     "schedulers": "스케줄러",
     "scheduling": "스케줄링",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "시그마",
     "stable_cascade": "Stable Cascade",
-    "string": "문자열",
     "style_model": "스타일 모델",
     "supir": "supir",
     "text": "텍스트",
-    "textgen": "textgen",
     "training": "학습",
     "transform": "변환",
     "unet": "UNet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "삭제 실패",
       "deleted": "워크플로가 삭제되었습니다.",
       "dirtyClose": "아래 파일들이 변경되었습니다. 닫기 전에 저장하시겠습니까?",
+      "dirtyCloseAnyway": "그래도 닫기",
       "dirtyCloseHint": "프롬프트 없이 닫으려면 Shift를 누르세요",
       "dirtyCloseTitle": "변경 사항 저장",
       "workflowTreeType": {
diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json
index 636fe5e88f..a74b0a21c7 100644
--- a/src/locales/ko/nodeDefs.json
+++ b/src/locales/ko/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "노이즈 추가",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "최대 4K 해상도에서 통합 텍스트-이미지 생성 및 정밀한 단일 문장 편집.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_fail_on_partial": {
+        "name": "부분 실패 시 중단"
+      },
+      "model_height": {
+        "name": "높이"
+      },
+      "model_max_images": {
+        "name": "최대 이미지 수"
+      },
+      "model_size_preset": {
+        "name": "사이즈 프리셋"
+      },
+      "model_width": {
+        "name": "너비"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지를 생성하거나 편집하기 위한 텍스트 프롬프트입니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "생성에 사용할 시드입니다."
+      },
+      "watermark": {
+        "name": "워터마크",
+        "tooltip": "이미지에 \"AI 생성됨\" 워터마크를 추가할지 여부입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "프롬프트를 기반으로 API를 통해 ByteDance 모델을 사용하여 비디오 생성",
     "display_name": "ByteDance 텍스트-비디오",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "컨텍스트 윈도우를 수동으로 설정합니다.",
     "display_name": "컨텍스트 윈도우 (수동)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "0이 아닌 인덱스의 컨텍스트 윈도우에 인과적 수정 프레임을 추가할지 여부입니다."
+      },
       "closed_loop": {
         "name": "closed_loop",
         "tooltip": "컨텍스트 윈도우 루프를 닫을지 여부입니다. 루프 스케줄에만 적용됩니다."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "HiDream-O1-Image용 빈 픽셀 공간 latent입니다. 모델은 약 4메가픽셀에서 학습되었습니다. 더 낮은 해상도에서는 분포를 벗어나 품질이 눈에 띄게 저하됩니다. 학습된 해상도: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Empty HiDream-O1 Latent Image",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "빈 훈위안 이미지 잠재",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "프롬프트와 선택적 참조 이미지를 통해 Flux.2 [pro] 또는 Flux.2 [max]로 이미지 생성.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_height": {
+        "name": "높이"
+      },
+      "model_width": {
+        "name": "너비"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성 또는 편집을 위한 프롬프트"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노이즈 생성을 위한 랜덤 시드입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "프롬프트와 해상도에 따라 이미지를 동기적으로 생성합니다.",
     "display_name": "Flux.2 [max] 이미지",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Google Vertex API를 통해 이미지를 동기적으로 생성하거나 편집합니다.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_aspect_ratio": {
+        "name": "종횡비"
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "model_thinking_level": {
+        "name": "사고 수준"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "생성할 이미지 또는 적용할 편집을 설명하는 텍스트 프롬프트입니다. 모델이 따라야 할 제약, 스타일, 세부사항을 포함하세요."
+      },
+      "response_modalities": {
+        "name": "응답 모달리티"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드를 특정 값으로 고정하면, 모델은 반복 요청에 대해 동일한 응답을 제공하려고 최선을 다합니다. 결정적 결과는 보장되지 않습니다. 또한, 모델이나 파라미터(예: temperature)를 변경하면 동일한 시드 값을 사용해도 응답이 달라질 수 있습니다. 기본적으로 무작위 시드 값이 사용됩니다."
+      },
+      "system_prompt": {
+        "name": "시스템 프롬프트",
+        "tooltip": "AI의 동작을 지시하는 기본 지침입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "사고 이미지",
+        "tooltip": "모델의 사고 과정에서 생성된 첫 번째 이미지입니다. 사고 수준이 HIGH이고, 모달리티가 IMAGE+TEXT일 때만 제공됩니다."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Google의 Gemini AI 모델로 텍스트 응답을 생성합니다. 더 관련성 있고 의미 있는 응답을 생성하기 위해 컨텍스트로 여러 유형의 입력(텍스트, 이미지, 오디오, 비디오)을 제공할 수 있습니다.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "텍스트 프롬프트를 기반으로 기존 이미지를 수정합니다.",
+    "display_name": "Grok 이미지 편집",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_aspect_ratio": {
+        "name": "종횡비"
+      },
+      "model_number_of_images": {
+        "name": "이미지 개수"
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성을 위해 사용되는 텍스트 프롬프트입니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "텍스트 프롬프트를 기반으로 Grok을 사용해 이미지를 생성합니다",
     "display_name": "Grok 이미지",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "샘플링 후반부에 여러 번 이동된 패치 그리드 위치에서 모델 출력을 평균화합니다. 이음새를 제거합니다.",
+    "display_name": "HiDream-O1 Patch Seam Smoothing",
+    "inputs": {
+      "blend": {
+        "name": "blend",
+        "tooltip": "average: 동일 가중치 평균. window: 각 패스가 패치 경계에서 멀어질수록 가중치를 주는 Hann 윈도우 가중치. median: 픽셀별 중앙값, wraparound-outlier 패스는 제외."
+      },
+      "end_percent": {
+        "name": "end_percent",
+        "tooltip": "블렌드가 꺼지는 샘플링 진행도."
+      },
+      "model": {
+        "name": "model"
+      },
+      "passes": {
+        "name": "passes",
+        "tooltip": "게이트 단계별 패스 수. 2/4 = 고정. ramp_*: 샘플링이 끝에 가까워질수록 패스 수 증가(이음새가 가장 잘 보이는 곳에서 더 부드럽게 처리)."
+      },
+      "pattern": {
+        "name": "pattern",
+        "tooltip": "이동 레이아웃. single_shift: 자연스러운 패치 그리드에서 한 번, 나머지는 오프셋. symmetric: 모든 패스가 그리드에서 벗어나며, 이동이 원점을 중심으로 분할됨."
+      },
+      "start_percent": {
+        "name": "start_percent",
+        "tooltip": "블렌드가 켜지는 샘플링 진행도 (0=시작, 1=끝)."
+      },
+      "strength": {
+        "name": "strength",
+        "tooltip": "자연스러운 그리드 예측(0)과 평균 결과(1) 사이의 보간."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "컨디셔닝에 1~10개의 참조 이미지를 첨부합니다. 1개는 편집 지시, 여러 개는 주제 기반 개인화에 사용됩니다.",
+    "display_name": "HiDream-O1 Reference Images",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "참조 이미지. 1개 = 편집 지시; 2~10개 = 다중 참조."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "저해상도 이미지를 초고해상도로 업스케일하고, 아티팩트와 노이즈를 제거합니다. 최대 출력: 32 메가픽셀.",
     "display_name": "HitPaw 일반 이미지 향상",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "배경 제거 모델 불러오기",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "bg_removal_name",
+        "tooltip": "이미지에서 배경을 제거하는 데 사용되는 모델"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "이미지 로드",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Luma UNI-1 모델을 사용하여 텍스트 프롬프트로 기존 이미지를 편집합니다.",
+    "display_name": "Luma UNI-1 이미지 편집",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "편집에 사용할 모델입니다."
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "원하는 편집에 대한 설명입니다. 1~6000자."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드 값은 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "편집할 원본 이미지입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "프롬프트와 종횡비에 따라 이미지를 동기적으로 수정합니다.",
     "display_name": "Luma 이미지 생성 (이미지 → 이미지)",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Luma UNI-1 모델을 사용하여 텍스트로부터 이미지를 생성합니다.",
+    "display_name": "Luma UNI-1 이미지",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "생성에 사용할 모델입니다."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "원하는 이미지에 대한 텍스트 설명입니다. 1~6000자."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드 값은 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "프롬프트, 입력 이미지, output_size를 기반으로 동기적으로 비디오를 생성합니다.",
     "display_name": "Luma 이미지 → 비디오",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "ModelNoiseScale",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "noise_scale": {
+        "name": "noise_scale",
+        "tooltip": "절대 학습 노이즈 스케일. 예시 HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "모델 패치 로더",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "문밸리 마레이 이미지 투 비디오 노드",
-    "display_name": "문밸리 마레이 이미지 투 비디오",
-    "inputs": {
-      "control_after_generate": {
-        "name": "생성 후 제어"
-      },
-      "image": {
-        "name": "이미지",
-        "tooltip": "비디오 생성에 사용되는 참조 이미지"
-      },
-      "negative_prompt": {
-        "name": "네거티브 프롬프트",
-        "tooltip": "네거티브 프롬프트 텍스트"
-      },
-      "prompt": {
-        "name": "프롬프트"
-      },
-      "prompt_adherence": {
-        "name": "프롬프트 준수도",
-        "tooltip": "생성 제어를 위한 가이던스 스케일"
-      },
-      "resolution": {
-        "name": "해상도",
-        "tooltip": "출력 비디오의 해상도"
-      },
-      "seed": {
-        "name": "시드",
-        "tooltip": "랜덤 시드 값"
-      },
-      "steps": {
-        "name": "스텝",
-        "tooltip": "노이즈 제거 스텝 수"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "문밸리 마레이 텍스트 투 비디오",
-    "inputs": {
-      "control_after_generate": {
-        "name": "생성 후 제어"
-      },
-      "negative_prompt": {
-        "name": "네거티브 프롬프트",
-        "tooltip": "네거티브 프롬프트 텍스트"
-      },
-      "prompt": {
-        "name": "프롬프트"
-      },
-      "prompt_adherence": {
-        "name": "프롬프트 준수도",
-        "tooltip": "생성 제어를 위한 가이던스 스케일"
-      },
-      "resolution": {
-        "name": "해상도",
-        "tooltip": "출력 비디오의 해상도"
-      },
-      "seed": {
-        "name": "시드",
-        "tooltip": "랜덤 시드 값"
-      },
-      "steps": {
-        "name": "스텝",
-        "tooltip": "추론 단계"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey 비디오 투 비디오",
-    "inputs": {
-      "control_type": {
-        "name": "제어 유형"
-      },
-      "motion_intensity": {
-        "name": "모션 강도",
-        "tooltip": "'모션 전송' 제어 유형일 때만 사용됩니다"
-      },
-      "negative_prompt": {
-        "name": "네거티브 프롬프트",
-        "tooltip": "네거티브 프롬프트 텍스트"
-      },
-      "prompt": {
-        "name": "프롬프트",
-        "tooltip": "생성할 비디오를 설명합니다"
-      },
-      "seed": {
-        "name": "시드",
-        "tooltip": "랜덤 시드 값"
-      },
-      "steps": {
-        "name": "단계",
-        "tooltip": "추론 단계 수"
-      },
-      "video": {
-        "name": "비디오",
-        "tooltip": "출력 비디오를 생성하는 데 사용되는 참조 비디오. 최소 5초 이상이어야 합니다. 5초보다 긴 비디오는 자동으로 잘립니다. MP4 형식만 지원됩니다."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "이미지 형태 변환",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "OpenAI의 GPT Image 1 엔드포인트를 통해 동기적으로 이미지를 생성합니다.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "OpenAI의 GPT Image 2 엔드포인트를 통해 동기적으로 이미지를 생성합니다.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "배경",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "프롬프트",
-        "tooltip": "GPT Image 1을 위한 텍스트 프롬프트"
+        "tooltip": "GPT Image 2를 위한 텍스트 프롬프트"
       },
       "quality": {
         "name": "품질",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "OpenAI의 GPT 이미지 엔드포인트를 통해 이미지를 생성합니다.",
+    "display_name": "OpenAI GPT 이미지 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_background": {
+        "name": "배경"
+      },
+      "model_custom_height": {
+        "name": "사용자 지정 높이"
+      },
+      "model_custom_width": {
+        "name": "사용자 지정 너비"
+      },
+      "model_quality": {
+        "name": "품질"
+      },
+      "model_size": {
+        "name": "사이즈"
+      },
+      "n": {
+        "name": "개수",
+        "tooltip": "생성할 이미지 수"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "GPT 이미지용 텍스트 프롬프트"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "백엔드에서 아직 구현되지 않음"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "OpenAI 채팅 노드에 대한 입력으로 포함할 입력 파일(텍스트, PDF 등)을 로드하고 준비합니다. 파일은 OpenAI 모델이 응답을 생성할 때 읽힙니다. 🛈 팁: 다른 OpenAI 입력 파일 노드와 함께 연결하여 사용할 수 있습니다.",
     "display_name": "OpenAI ChatGPT 입력 파일",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "광학 흐름 모델 불러오기",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "불러올 광학 흐름 모델입니다. 파일은 반드시 'optical_flow' 폴더에 위치해야 합니다. 현재는 torchvision의 raft_large.pth만 지원됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "정수",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "생성 후 제어"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "배경 제거",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "bg_removal_model",
+        "tooltip": "마스크 생성을 위해 사용되는 배경 제거 모델"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "배경을 제거할 입력 이미지"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "생성된 전경 마스크"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "오토리그레시브 블록당 프레임 수입니다. 1 = 프레임 단위, 3 = 청크 단위. 체크포인트의 학습 모드와 일치해야 합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "사용자 정의 샘플러",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "조정 가능한 단계별 노이즈를 가진 LCM 샘플러입니다. s_noise는 모델의 학습 노이즈 스케일에 곱해지는 값입니다.",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "단계별 노이즈를 +/- N*표준편차로 제한합니다. 0은 비활성화입니다."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "첫 번째 단계에서의 단계별 노이즈 배수 (1.0 = 학습과 동일)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "마지막 단계에서의 단계별 노이즈 배수. 일정한 스케줄을 원하면 s_noise와 동일하게 설정하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "LCM 확대 샘플러",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "텍스트 생성",
     "inputs": {
+      "audio": {
+        "name": "오디오"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "모델에 내장된 시스템 프롬프트/템플릿이 있으면 사용합니다."
+      },
+      "video": {
+        "name": "비디오",
+        "tooltip": "비디오 프레임을 이미지 배치로 처리합니다. 24 FPS로 가정하며, 내부적으로 1 FPS로 샘플링됩니다."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "오디오"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "모델에 내장된 시스템 프롬프트/템플릿이 있으면 사용합니다."
+      },
+      "video": {
+        "name": "비디오",
+        "tooltip": "비디오 프레임을 이미지 배치로 처리합니다. 24 FPS로 가정하며, 내부적으로 1 FPS로 샘플링됩니다."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "강력한 업스케일링 및 복원 기술로 비디오에 새 생명을 불어넣으세요.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "동적 압축 레벨",
+        "tooltip": "CQP 레벨."
+      },
+      "interpolation_model": {
+        "name": "보간 모델"
+      },
+      "upscaler_model": {
+        "name": "업스케일러 모델"
+      },
+      "upscaler_model_creativity": {
+        "name": "창의성"
+      },
+      "upscaler_model_prompt": {
+        "name": "프롬프트"
+      },
+      "upscaler_model_realism": {
+        "name": "사실감"
+      },
+      "upscaler_model_sharp": {
+        "name": "선명도"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "업스케일러 해상도"
+      },
+      "video": {
+        "name": "비디오"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "모델 토치 컴파일",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "PBR"
       },
       "quad": {
-        "name": "쿼드"
+        "name": "쿼드",
+        "tooltip": "이 매개변수는 더 이상 사용되지 않으며 아무런 동작도 하지 않습니다."
       },
       "texture": {
         "name": "텍스처"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "처리할 픽셀 프레임 수입니다. CogVideoX-Fun-V1.5 (patch_size_t=2)에서는 latent_t가 짝수여야 하며, 홀수 latent_t가 생성되는 길이는 내림 처리됩니다 (예: 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "VOIDQuadmaskPreprocess에서 전처리된 쿼드마스크 [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "원본 비디오 프레임 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "주 마스크 영역의 팽창 반경 (0 = 팽창 없음)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "픽셀 프레임 수입니다. latent_t가 짝수가 되도록 내림 처리됩니다 (patch_size_t=2 필요), 예: 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "OpticalFlowLoader에서 가져온 광학 흐름 모델 (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "1차 출력 비디오 프레임 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "VOIDWarpedNoise에서 생성된 워프드 노이즈 latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VP 스케줄러",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "오디오 특징을 비디오 모델에 주입할 때의 스케일입니다."
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "오디오 길이와 비디오 프레임 수를 기반으로 계산된 fps입니다. 프롬프트에 사용됩니다."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "총 출력 프레임 계산 및 구간 오디오 추출에 사용할 오디오입니다."
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "이 구간이 몇 번째인지 (첫 번째는 0, 두 번째는 1 등)"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "이 구간의 길이 (보통 149 프레임)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "패딩된 키프레임 시퀀스"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "유효한 프레임을 나타내는 마스크"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "이 비디오 구간에 해당하는 오디오 구간"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "각 출력 구간에 맞게 오디오를 분할합니다."
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "리스트로 출력할 패딩된 구간의 개수"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "각 구간의 길이 (보통 149 프레임)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "패딩된 키프레임 시퀀스들"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "유효한 프레임을 나타내는 마스크들"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "각 비디오 구간에 해당하는 오디오 구간"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "첫 번째 프레임의 CLIP 비전 임베딩입니다."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "참조 이미지의 CLIP 비전 임베딩입니다."
+      },
+      "height": {
+        "name": "높이"
+      },
+      "length": {
+        "name": "길이",
+        "tooltip": "생성된 비디오의 프레임 수입니다. WanDancer의 경우 149로 유지해야 합니다."
+      },
+      "mask": {
+        "name": "마스크",
+        "tooltip": "시작 이미지(들)에 대한 이미지 조건 마스크입니다. 흰색은 유지되고, 검은색은 생성됩니다. 로컬 생성에 사용됩니다."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "시작 이미지",
+        "tooltip": "인코딩할 초기 이미지(들)입니다. 프레임 수는 자유롭게 설정할 수 있습니다."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "비어 있는 latent."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WAN 비디오 생성 (시작-끝 프레임)",
     "inputs": {
diff --git a/src/locales/localeConfig.ts b/src/locales/localeConfig.ts
new file mode 100644
index 0000000000..72359835c5
--- /dev/null
+++ b/src/locales/localeConfig.ts
@@ -0,0 +1,82 @@
+type LocaleJsonLoader = () => Promise<{
+  default: Record<string, unknown>
+}>
+
+type LocaleLoaderBundle = {
+  main: LocaleJsonLoader
+  nodeDefs: LocaleJsonLoader
+  commands: LocaleJsonLoader
+  settings: LocaleJsonLoader
+}
+
+type LocaleDefinition = {
+  text: string
+  loaders: LocaleLoaderBundle | null
+}
+
+// Vite code-splits each matched module into its own async chunk; only the
+// resolved locale's bundle is fetched at runtime.
+const localeFiles = import.meta.glob<{ default: Record<string, unknown> }>(
+  './*/{main,nodeDefs,commands,settings}.json'
+)
+
+function loadersFor(locale: string): LocaleLoaderBundle {
+  return {
+    main: localeFiles[`./${locale}/main.json`],
+    nodeDefs: localeFiles[`./${locale}/nodeDefs.json`],
+    commands: localeFiles[`./${locale}/commands.json`],
+    settings: localeFiles[`./${locale}/settings.json`]
+  }
+}
+
+export const localeDefinitions = {
+  en: { text: 'English', loaders: null },
+  zh: { text: '中文', loaders: loadersFor('zh') },
+  'zh-TW': { text: '繁體中文', loaders: loadersFor('zh-TW') },
+  ru: { text: 'Русский', loaders: loadersFor('ru') },
+  ja: { text: '日本語', loaders: loadersFor('ja') },
+  ko: { text: '한국어', loaders: loadersFor('ko') },
+  fr: { text: 'Français', loaders: loadersFor('fr') },
+  es: { text: 'Español', loaders: loadersFor('es') },
+  ar: { text: 'عربي', loaders: loadersFor('ar') },
+  tr: { text: 'Türkçe', loaders: loadersFor('tr') },
+  'pt-BR': { text: 'Português (BR)', loaders: loadersFor('pt-BR') },
+  fa: { text: 'فارسی', loaders: loadersFor('fa') }
+} as const satisfies Record<string, LocaleDefinition>
+
+export type SupportedLocale = keyof typeof localeDefinitions
+
+const SUPPORTED_LOCALES = Object.keys(localeDefinitions) as SupportedLocale[]
+
+export const SUPPORTED_LOCALE_OPTIONS = SUPPORTED_LOCALES.map((value) => ({
+  value,
+  text: localeDefinitions[value].text
+}))
+
+const supportedLocaleByLower = new Map<string, SupportedLocale>(
+  SUPPORTED_LOCALES.map((locale) => [locale.toLowerCase(), locale])
+)
+
+function matchSingle(candidate: string): SupportedLocale | undefined {
+  const normalized = candidate.toLowerCase()
+  return (
+    supportedLocaleByLower.get(normalized) ??
+    supportedLocaleByLower.get(normalized.split('-')[0])
+  )
+}
+
+export function resolveSupportedLocale(
+  input?: string | readonly string[] | null
+): SupportedLocale {
+  const candidates = Array.isArray(input) ? input : input ? [input] : []
+  for (const candidate of candidates) {
+    if (!candidate) continue
+    const matched = matchSingle(candidate)
+    if (matched) return matched
+  }
+  return 'en'
+}
+
+export function getDefaultLocale(): SupportedLocale {
+  return resolveSupportedLocale(navigator.languages)
+}
diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json
index b95122665c..a6b50bcb04 100644
--- a/src/locales/pt-BR/main.json
+++ b/src/locales/pt-BR/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "e",
+      "backToGithubLogin": "Cadastre-se com o Github",
       "backToLogin": "Voltar para login",
       "backToSocialLogin": "Cadastre-se com Google ou Github em vez disso",
       "confirmPasswordLabel": "Confirmar senha",
@@ -292,7 +293,9 @@
       "title": "Reautenticação necessária"
     },
     "signOut": {
+      "saveFailed": "Saída cancelada porque salvar \"{workflow}\" falhou.",
       "signOut": "Sair",
+      "signOutAnyway": "Sair mesmo assim",
       "success": "Logout realizado com sucesso",
       "successDetail": "Você saiu da sua conta.",
       "unsavedChangesMessage": "Você tem alterações não salvas que serão perdidas ao sair. Deseja continuar?",
@@ -461,6 +464,12 @@
       "wantToRun": "Prefere rodar o ComfyUI localmente?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "Por favor, escolha uma opção.",
+        "describeAnswer": "Por favor, descreva sua resposta.",
+        "selectAtLeastOne": "Por favor, selecione pelo menos uma opção."
+      },
+      "intro": "Ajude-nos a personalizar sua experiência no ComfyUI.",
       "options": {
         "familiarity": {
           "advanced": "Usuário avançado (fluxos de trabalho personalizados)",
@@ -469,45 +478,43 @@
           "new": "Novo no ComfyUI (nunca usei antes)",
           "starting": "Começando agora (seguindo tutoriais)"
         },
-        "industry": {
-          "architecture": "Arquitetura",
-          "education": "Educação",
-          "film_tv_animation": "Filmes, TV e animação",
-          "fine_art": "Belas artes e ilustração",
-          "gaming": "Jogos",
-          "marketing": "Marketing e publicidade",
-          "other": "Outro",
-          "otherPlaceholder": "Por favor, especifique",
-          "product_design": "Design de produto e gráfico",
-          "software": "Software e tecnologia"
-        },
-        "making": {
-          "3d": "Assets 3D",
+        "intent": {
+          "3d_game": "Assets 3D / assets para jogos",
+          "api": "Endpoints de API para executar workflows",
+          "apps": "Apps simplificados a partir de workflows",
           "audio": "Áudio / música",
-          "custom_nodes": "Nós e fluxos de trabalho personalizados",
+          "custom_nodes": "Nodes personalizados",
           "images": "Imagens",
-          "video": "Vídeo e animação"
+          "not_sure": "Não tenho certeza",
+          "videos": "Vídeos",
+          "workflows": "Workflows ou pipelines personalizados"
         },
-        "purpose": {
-          "client": "Trabalho para clientes (freelancer)",
-          "community": "Contribuições para a comunidade (nós, fluxos de trabalho, etc.)",
-          "inhouse": "No meu próprio local de trabalho (interno)",
-          "personal": "Projetos pessoais / hobby",
-          "research": "Pesquisa acadêmica"
+        "source": {
+          "conference": "Conferência ou evento",
+          "discord": "Discord / comunidade",
+          "friend": "Amigo ou colega",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "Newsletter ou blog",
+          "other": "Outro",
+          "reddit": "Reddit",
+          "search": "Google / busca",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "Educação (estudante ou educador)",
+          "personal": "Uso pessoal",
+          "work": "Trabalho"
         }
       },
       "placeholder": "Espaço reservado para perguntas da pesquisa",
-      "questions": {
-        "familiarity": "Qual o seu nível de familiaridade com o ComfyUI?",
-        "industry": "Qual é o seu setor principal?",
-        "making": "O que você planeja criar?",
-        "purpose": "Para que você pretende usar principalmente o ComfyUI?"
-      },
       "steps": {
         "familiarity": "Qual o seu nível de familiaridade com o ComfyUI?",
-        "industry": "Qual é o seu setor principal?",
-        "making": "O que você planeja criar?",
-        "purpose": "Para que você pretende usar principalmente o ComfyUI?"
+        "intent": "O que você deseja criar com o ComfyUI?",
+        "source": "Onde você ouviu falar do ComfyUI?",
+        "usage": "Como você pretende usar o ComfyUI?"
       },
       "title": "Pesquisa da Nuvem"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "comece a criar em segundos",
   "cloudStart_wantToRun": "Prefere rodar o ComfyUI localmente?",
   "cloudSurvey_steps_familiarity": "Qual o seu nível de familiaridade com o ComfyUI?",
-  "cloudSurvey_steps_industry": "Qual é o seu setor principal?",
-  "cloudSurvey_steps_making": "O que você planeja criar?",
-  "cloudSurvey_steps_purpose": "Para que você pretende usar principalmente o ComfyUI?",
+  "cloudSurvey_steps_intent": "O que você deseja criar com o ComfyUI?",
+  "cloudSurvey_steps_source": "Onde você ouviu falar do ComfyUI?",
+  "cloudSurvey_steps_usage": "Como você pretende usar o ComfyUI?",
   "cloudWaitlist_contactLink": "aqui",
   "cloudWaitlist_questionsText": "Dúvidas? Entre em contato conosco",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "CODIFICADOR DE ÁUDIO",
     "AUDIO_ENCODER_OUTPUT": "SAÍDA DO CODIFICADOR DE ÁUDIO",
     "AUDIO_RECORD": "GRAVAÇÃO DE ÁUDIO",
+    "BACKGROUND_REMOVAL": "REMOÇÃO_DE_FUNDO",
     "BOOLEAN": "BOOLEANO",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "CONTROLE DE CÂMERA",
@@ -831,6 +839,7 @@
     "NOISE": "RUÍDO",
     "OPENAI_CHAT_CONFIG": "CONFIGURAÇÃO DE CHAT OPENAI",
     "OPENAI_INPUT_FILES": "ARQUIVOS DE ENTRADA OPENAI",
+    "OPTICAL_FLOW": "FLUX ÓPTICO",
     "PHOTOMAKER": "photomaker",
     "PIXVERSE_TEMPLATE": "MODELO PIXVERSE",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_for_testing",
     "advanced": "avançado",
     "animation": "animação",
-    "api": "api",
     "api node": "nó da API",
     "attention_experiments": "experimentos_de_atenção",
     "audio": "áudio",
+    "background removal": "remoção de fundo",
     "batch": "lote",
-    "camera": "câmera",
     "chroma_radiance": "radiância_de_croma",
     "clip": "clip",
+    "color": "cor",
     "combine": "combinar",
     "compositing": "composição",
     "cond pair": "par_de_condições",
     "cond single": "condição_simples",
     "conditioning": "condicionamento",
-    "context": "contexto",
     "controlnet": "controlnet",
     "create": "criar",
     "custom_sampling": "amostragem_personalizada",
@@ -2302,6 +2308,7 @@
     "deprecated": "obsoleto",
     "detection": "detecção",
     "edit_models": "editar_modelos",
+    "experimental": "experimental",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "orientação",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "máscara",
-    "math": "matemática",
     "model": "modelo",
     "model_merging": "mesclagem_de_modelos",
     "model_patches": "correções_de_modelo",
@@ -2334,16 +2340,13 @@
     "save": "salvar",
     "schedulers": "agendadores",
     "scheduling": "agendamento",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "sigmas",
     "stable_cascade": "stable_cascade",
-    "string": "string",
     "style_model": "modelo_de_estilo",
     "supir": "supir",
     "text": "texto",
-    "textgen": "textgen",
     "training": "treinamento",
     "transform": "transformar",
     "unet": "unet",
@@ -3159,6 +3162,7 @@
       "deleteFailedTitle": "Falha ao excluir",
       "deleted": "Workflow excluído",
       "dirtyClose": "Os arquivos abaixo foram alterados. Deseja salvá-los antes de fechar?",
+      "dirtyCloseAnyway": "Fechar mesmo assim",
       "dirtyCloseHint": "Segure Shift para fechar sem perguntar",
       "dirtyCloseTitle": "Salvar alterações?",
       "workflowTreeType": {
diff --git a/src/locales/pt-BR/nodeDefs.json b/src/locales/pt-BR/nodeDefs.json
index 404bc672b3..5a0e027249 100644
--- a/src/locales/pt-BR/nodeDefs.json
+++ b/src/locales/pt-BR/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "AddNoise",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "Geração unificada de texto para imagem e edição precisa de frases únicas em até 4K de resolução.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_fail_on_partial": {
+        "name": "falhar_em_parcial"
+      },
+      "model_height": {
+        "name": "altura"
+      },
+      "model_max_images": {
+        "name": "máx_imagens"
+      },
+      "model_size_preset": {
+        "name": "predefinição_de_tamanho"
+      },
+      "model_width": {
+        "name": "largura"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para criar ou editar uma imagem."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente utilizada para a geração."
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" à imagem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "Gere vídeo usando modelos ByteDance via API com base no prompt",
     "display_name": "ByteDance Texto para Vídeo",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "Defina manualmente as janelas de contexto.",
     "display_name": "Janelas de Contexto (Manual)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Adicionar ou não um quadro de correção causal para janelas de contexto com índice diferente de 0."
+      },
       "closed_loop": {
         "name": "ciclo_fechado",
         "tooltip": "Se deve fechar o ciclo da janela de contexto; aplicável apenas para agendamentos em loop."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "Latente no espaço de pixels vazia para HiDream-O1-Image. O modelo foi treinado em ~4 megapixels; resoluções menores saem da distribuição e a qualidade regrede visivelmente. Resoluções treinadas: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Imagem Latente Vazia HiDream-O1",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Gere imagens via Flux.2 [pro] ou Flux.2 [max] a partir de um prompt e imagens de referência opcionais.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_height": {
+        "name": "altura"
+      },
+      "model_width": {
+        "name": "largura"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração ou edição da imagem"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "Gera imagens de forma síncrona com base no prompt e na resolução.",
     "display_name": "Flux.2 [max] Imagem",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Gere ou edite imagens de forma síncrona via Google Vertex API.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto descrevendo a imagem a ser gerada ou as edições a serem aplicadas. Inclua quaisquer restrições, estilos ou detalhes que o modelo deve seguir."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Quando a seed é fixada em um valor específico, o modelo faz o melhor esforço para fornecer a mesma resposta em solicitações repetidas. A saída determinística não é garantida. Além disso, alterar o modelo ou configurações de parâmetros, como a temperatura, pode causar variações na resposta mesmo usando o mesmo valor de seed. Por padrão, um valor de seed aleatório é usado."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instruções fundamentais que ditam o comportamento da IA."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "Primeira imagem do processo de pensamento do modelo. Disponível apenas com thinking_level ALTO e modalidade IMAGE+TEXT."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Gere respostas em texto com o modelo Gemini AI do Google. Você pode fornecer múltiplos tipos de entrada (texto, imagens, áudio, vídeo) como contexto para gerar respostas mais relevantes e significativas.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "Modifique uma imagem existente com base em um prompt de texto",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_aspect_ratio": {
+        "name": "proporção"
+      },
+      "model_number_of_images": {
+        "name": "número_de_imagens"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar a imagem"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "Gere imagens usando Grok com base em um prompt de texto",
     "display_name": "Grok Image",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "Média da saída do modelo em várias posições de grade de patch deslocadas durante a fase final da amostragem. Cancela as emendas.",
+    "display_name": "Suavização de Emendas de Patches HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "mesclagem",
+        "tooltip": "average: média com pesos iguais. window: ponderação com janela de Hann favorecendo cada passagem longe dos limites do patch. median: mediana por pixel, rejeita passagens fora do padrão."
+      },
+      "end_percent": {
+        "name": "percentual_final",
+        "tooltip": "Progresso da amostragem em que a mesclagem é desativada."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "passes": {
+        "name": "passagens",
+        "tooltip": "Número de passagens por etapa controlada. 2/4 = fixo. ramp_*: a contagem de passagens aumenta conforme a amostragem se aproxima do fim (mais suavização onde as emendas são mais visíveis)."
+      },
+      "pattern": {
+        "name": "padrão",
+        "tooltip": "Layout do deslocamento. single_shift: uma passagem na grade de patch natural + outras deslocadas. symmetric: todas as passagens fora da grade, deslocamentos divididos ao redor da origem."
+      },
+      "start_percent": {
+        "name": "percentual_inicial",
+        "tooltip": "Progresso da amostragem (0=início, 1=fim) em que a mesclagem é ativada."
+      },
+      "strength": {
+        "name": "força",
+        "tooltip": "Interpolação entre a predição da grade natural (0) e o resultado médio (1)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "Anexe de 1 a 10 imagens de referência ao condicionamento, uma para instrução de edição ou múltiplas para personalização orientada por sujeito.",
+    "display_name": "Imagens de Referência HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagens de referência. 1 imagem = edição por instrução; 2-10 imagens = múltiplas referências."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "Aumente imagens de baixa resolução para super-resolução, eliminando artefatos e ruídos. Saída máxima: 32 megapixels.",
     "display_name": "HitPaw General Image Enhance",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Carregar Modelo de Remoção de Fundo",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "nome_remoção_fundo",
+        "tooltip": "O modelo usado para remover fundos de imagens"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo_fundo",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Carregar Imagem",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Edite uma imagem existente com um prompt de texto usando o modelo Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo a ser usado para edição."
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição da edição desejada. 1–6000 caracteres."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "O seed controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente do seed."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Imagem de origem para editar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "Modifica imagens de forma síncrona com base no prompt e na proporção.",
     "display_name": "Luma Imagem para Imagem",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Gere imagens a partir de texto usando o modelo Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo a ser usado para geração."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto da imagem desejada. 1–6000 caracteres."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "O seed controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente do seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "Gera vídeos de forma síncrona com base no prompt, imagens de entrada e output_size.",
     "display_name": "Luma Imagem para Vídeo",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "Escala de Ruído do Modelo",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "noise_scale": {
+        "name": "escala_de_ruído",
+        "tooltip": "Escala absoluta de ruído de treinamento. Por exemplo HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Nó de Imagem para Vídeo Moonvalley Marey",
-    "display_name": "Moonvalley Marey Imagem para Vídeo",
-    "inputs": {
-      "control_after_generate": {
-        "name": "controle_após_gerar"
-      },
-      "image": {
-        "name": "imagem",
-        "tooltip": "A imagem de referência usada para gerar o vídeo"
-      },
-      "negative_prompt": {
-        "name": "prompt_negativo",
-        "tooltip": "Texto do prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "aderência_ao_prompt",
-        "tooltip": "Escala de orientação para controle da geração"
-      },
-      "resolution": {
-        "name": "resolução",
-        "tooltip": "Resolução do vídeo de saída"
-      },
-      "seed": {
-        "name": "semente",
-        "tooltip": "Valor da semente aleatória"
-      },
-      "steps": {
-        "name": "passos",
-        "tooltip": "Número de passos de remoção de ruído"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey Texto para Vídeo",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Texto de prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Escala de orientação para controle da geração"
-      },
-      "resolution": {
-        "name": "resolution",
-        "tooltip": "Resolução do vídeo de saída"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Valor da semente aleatória"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Etapas de inferência"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Vídeo para Vídeo",
-    "inputs": {
-      "control_type": {
-        "name": "control_type"
-      },
-      "motion_intensity": {
-        "name": "motion_intensity",
-        "tooltip": "Usado apenas se o control_type for 'Motion Transfer'"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Texto de prompt negativo"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Descreve o vídeo a ser gerado"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Valor da semente aleatória"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Número de etapas de inferência"
-      },
-      "video": {
-        "name": "video",
-        "tooltip": "O vídeo de referência usado para gerar o vídeo de saída. Deve ter pelo menos 5 segundos de duração. Vídeos com mais de 5s serão automaticamente cortados. Apenas o formato MP4 é suportado."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "ImageMorphology",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "Gera imagens de forma síncrona via endpoint GPT Image 1 da OpenAI.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "Gera imagens de forma síncrona via endpoint GPT Image 2 da OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "fundo",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "Gera imagens via endpoint GPT Image da OpenAI.",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_background": {
+        "name": "fundo"
+      },
+      "model_custom_height": {
+        "name": "altura_personalizada"
+      },
+      "model_custom_width": {
+        "name": "largura_personalizada"
+      },
+      "model_quality": {
+        "name": "qualidade"
+      },
+      "model_size": {
+        "name": "tamanho"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Quantas imagens gerar"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para o GPT Image"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "ainda não implementado no backend"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "Carrega e prepara arquivos de entrada (texto, pdf, etc.) para incluir como entradas no Nó de Chat da OpenAI. Os arquivos serão lidos pelo modelo OpenAI ao gerar uma resposta. 🛈 DICA: Pode ser encadeado com outros nós de Arquivo de Entrada OpenAI.",
     "display_name": "Arquivos de Entrada do OpenAI ChatGPT",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Carregar Modelo de Optical Flow",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Modelo de optical flow para carregar. Os arquivos devem ser colocados na pasta 'optical_flow'. Atualmente, apenas o raft_large.pth do torchvision é suportado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "Agendador de Passos Ótimos",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "Inteiro",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "controle após gerar"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Remover Fundo",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "modelo_remoção_fundo",
+        "tooltip": "Modelo de remoção de fundo usado para gerar a máscara"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem de entrada para remover o fundo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "máscara",
+        "tooltip": "Máscara de primeiro plano gerada"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "Quadros por bloco autorregressivo. 1 = quadro a quadro, 3 = em blocos. Deve corresponder ao modo de treinamento do checkpoint."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "SamplerCustom",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "Amostrador LCM com ruído ajustável por etapa. s_noise é um multiplicador na escala de ruído de treinamento do modelo",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Limita o ruído por etapa a +/- N*desvio padrão. 0 desativa."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicador de ruído por etapa no primeiro passo (1.0 = igual ao treinamento)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Multiplicador de ruído por etapa no último passo. Defina igual ao s_noise para um agendamento constante."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Use o prompt/modelo de sistema padrão se o modelo possuir um."
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "Quadros de vídeo como lote de imagens. Considera-se 24 FPS; amostrado internamente para 1 FPS."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Use o prompt/modelo de sistema padrão se o modelo possuir um."
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "Quadros de vídeo como lote de imagens. Considera-se 24 FPS; amostrado internamente para 1 FPS."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "Dê nova vida aos vídeos com tecnologia poderosa de upscaling e recuperação.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "nível de compressão dinâmica",
+        "tooltip": "Nível CQP."
+      },
+      "interpolation_model": {
+        "name": "modelo de interpolação"
+      },
+      "upscaler_model": {
+        "name": "modelo de upscaling"
+      },
+      "upscaler_model_creativity": {
+        "name": "criatividade"
+      },
+      "upscaler_model_prompt": {
+        "name": "prompt"
+      },
+      "upscaler_model_realism": {
+        "name": "realismo"
+      },
+      "upscaler_model_sharp": {
+        "name": "nitidez"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "resolução do upscaler"
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "TorchCompileModel",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "quad"
+        "name": "quad",
+        "tooltip": "Este parâmetro está obsoleto e não faz nada."
       },
       "texture": {
         "name": "textura"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Número de quadros de pixels a processar. Para CogVideoX-Fun-V1.5 (patch_size_t=2), latent_t deve ser par — comprimentos que produzem latent_t ímpar são arredondados para baixo (ex.: 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "Quadmask pré-processada do VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Quadros de vídeo de origem [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Raio de dilatação para a região principal da máscara (0 = sem dilatação)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Número de quadros de pixels. Arredondado para baixo para tornar latent_t par (requisito patch_size_t=2), ex.: 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "Modelo de optical flow do OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Quadros de vídeo de saída da Passagem 1 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "Latente de ruído distorcido do VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPScheduler",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audio_inject_scale": {
+        "name": "escala_de_injeção_de_áudio",
+        "tooltip": "A escala para as características do áudio ao serem injetadas no modelo de vídeo."
+      },
+      "video_frames": {
+        "name": "quadros_de_vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "saída_do_codificador_de_áudio",
+        "tooltip": null
+      },
+      "1": {
+        "name": "string_fps",
+        "tooltip": "O fps calculado com base na duração do áudio e no número de quadros de vídeo. Usado no prompt."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio para calcular o total de quadros de saída e extrair o áudio do segmento."
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "segment_index": {
+        "name": "índice_do_segmento",
+        "tooltip": "Qual segmento é este (0 para o primeiro, 1 para o segundo, etc.)"
+      },
+      "segment_length": {
+        "name": "comprimento_do_segmento",
+        "tooltip": "Comprimento deste segmento (geralmente 149 quadros)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sequência_de_keyframes",
+        "tooltip": "Sequência de keyframes preenchida"
+      },
+      "1": {
+        "name": "máscara_de_keyframes",
+        "tooltip": "Máscara indicando quadros válidos"
+      },
+      "2": {
+        "name": "segmento_de_áudio",
+        "tooltip": "Segmento de áudio para este segmento de vídeo"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio a ser dividido para cada segmento emitido."
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "num_segments": {
+        "name": "número_de_segmentos",
+        "tooltip": "Quantos segmentos preenchidos emitir como listas."
+      },
+      "segment_length": {
+        "name": "comprimento_do_segmento",
+        "tooltip": "Comprimento de cada segmento (geralmente 149 quadros)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sequências_de_keyframes",
+        "tooltip": "Sequências de keyframes preenchidas"
+      },
+      "1": {
+        "name": "máscaras_de_keyframes",
+        "tooltip": "Máscaras indicando quadros válidos"
+      },
+      "2": {
+        "name": "segmento_de_áudio",
+        "tooltip": "Segmento de áudio para cada segmento de vídeo"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "Os embeddings de visão do CLIP para o primeiro quadro."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "Os embeddings de visão do CLIP para a imagem de referência."
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração",
+        "tooltip": "O número de quadros no vídeo gerado. Deve permanecer 149 para WanDancer."
+      },
+      "mask": {
+        "name": "máscara",
+        "tooltip": "Máscara de condicionamento de imagem para a(s) imagem(ns) inicial(is). Branco é mantido, preto é gerado. Usado para as gerações locais."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial",
+        "tooltip": "A(s) imagem(ns) inicial(is) a serem codificadas, pode ser qualquer quantidade de quadros."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Latente vazio."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json
index b987dfe806..cd220e8a9f 100644
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "и",
+      "backToGithubLogin": "Зарегистрироваться через Github",
       "backToLogin": "Вернуться к входу",
       "backToSocialLogin": "Зарегистрируйтесь через Google или Github",
       "confirmPasswordLabel": "Подтвердите пароль",
@@ -292,7 +293,9 @@
       "title": "Требуется повторная аутентификация"
     },
     "signOut": {
+      "saveFailed": "Выход отменён, так как не удалось сохранить «{workflow}».",
       "signOut": "Выйти",
+      "signOutAnyway": "Выйти всё равно",
       "success": "Вы успешно вышли из системы",
       "successDetail": "Вы вышли из своей учетной записи.",
       "unsavedChangesMessage": "У вас есть несохранённые изменения, которые будут потеряны при выходе из системы. Вы хотите продолжить?",
@@ -461,6 +464,12 @@
       "wantToRun": "Хотите запустить ComfyUI локально?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "Пожалуйста, выберите вариант.",
+        "describeAnswer": "Пожалуйста, опишите ваш ответ.",
+        "selectAtLeastOne": "Пожалуйста, выберите хотя бы один вариант."
+      },
+      "intro": "Помогите нам адаптировать ваш опыт работы с ComfyUI.",
       "options": {
         "familiarity": {
           "advanced": "Продвинутый пользователь (пользовательские рабочие процессы)",
@@ -469,45 +478,43 @@
           "new": "Новичок в ComfyUI (никогда не использовал)",
           "starting": "Только начинаю (следую руководствам)"
         },
-        "industry": {
-          "architecture": "Архитектура",
-          "education": "Образование",
-          "film_tv_animation": "Кино, ТВ и анимация",
-          "fine_art": "Изобразительное искусство и иллюстрация",
-          "gaming": "Игровая индустрия",
-          "marketing": "Маркетинг и реклама",
-          "other": "Другое",
-          "otherPlaceholder": "Пожалуйста, уточните",
-          "product_design": "Продуктовый и графический дизайн",
-          "software": "Программное обеспечение и технологии"
-        },
-        "making": {
-          "3d": "3D-ресурсы",
+        "intent": {
+          "3d_game": "3D-ассеты / игровые ассеты",
+          "api": "API endpoints для запуска workflow",
+          "apps": "Упрощённые приложения из workflow",
           "audio": "Аудио / музыка",
-          "custom_nodes": "Пользовательские узлы и рабочие процессы",
+          "custom_nodes": "Пользовательские node",
           "images": "Изображения",
-          "video": "Видео и анимация"
+          "not_sure": "Не уверен",
+          "videos": "Видео",
+          "workflows": "Пользовательские workflow или pipeline"
         },
-        "purpose": {
-          "client": "Работа с клиентами (фриланс)",
-          "community": "Вклад в сообщество (узлы, рабочие процессы и т.д.)",
-          "inhouse": "Моё рабочее место (внутреннее использование)",
-          "personal": "Личные проекты / хобби",
-          "research": "Академические исследования"
+        "source": {
+          "conference": "Конференция или мероприятие",
+          "discord": "Discord / сообщество",
+          "friend": "Друг или коллега",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "Новостная рассылка или блог",
+          "other": "Другое",
+          "reddit": "Reddit",
+          "search": "Google / поиск",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "Образование (студент или преподаватель)",
+          "personal": "Личное использование",
+          "work": "Работа"
         }
       },
       "placeholder": "Вопросы для опроса",
-      "questions": {
-        "familiarity": "Насколько вы знакомы с ComfyUI?",
-        "industry": "В какой отрасли вы работаете?",
-        "making": "Что вы планируете создавать?",
-        "purpose": "Для чего вы в основном будетете использовать ComfyUI?"
-      },
       "steps": {
         "familiarity": "Насколько вы знакомы с ComfyUI?",
-        "industry": "В какой отрасли вы работаете?",
-        "making": "Что вы планируете создавать?",
-        "purpose": "Для чего вы в основном будете использовать ComfyUI?"
+        "intent": "Что вы хотите создавать с помощью ComfyUI?",
+        "source": "Где вы узнали о ComfyUI?",
+        "usage": "Как вы планируете использовать ComfyUI?"
       },
       "title": "Облачный опрос"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "начать создавать за секунды",
   "cloudStart_wantToRun": "Хотите запустить ComfyUI локально?",
   "cloudSurvey_steps_familiarity": "Насколько вы знакомы с ComfyUI?",
-  "cloudSurvey_steps_industry": "В какой отрасли вы работаете?",
-  "cloudSurvey_steps_making": "Что вы планируете создавать?",
-  "cloudSurvey_steps_purpose": "Для чего вы в основном будете использовать ComfyUI?",
+  "cloudSurvey_steps_intent": "Что вы хотите создавать с помощью ComfyUI?",
+  "cloudSurvey_steps_source": "Где вы узнали о ComfyUI?",
+  "cloudSurvey_steps_usage": "Как вы планируете использовать ComfyUI?",
   "cloudWaitlist_contactLink": "здесь",
   "cloudWaitlist_questionsText": "Есть вопросы? Свяжитесь с нами",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "АУДИО_КОДЕР",
     "AUDIO_ENCODER_OUTPUT": "ВЫХОД_АУДИО_КОДЕРА",
     "AUDIO_RECORD": "АУДИО_ЗАПИСЬ",
+    "BACKGROUND_REMOVAL": "УДАЛЕНИЕ_ФОНА",
     "BOOLEAN": "БУЛЕВО",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "УПРАВЛЕНИЕ_КАМЕРОЙ",
@@ -831,6 +839,7 @@
     "NOISE": "ШУМ",
     "OPENAI_CHAT_CONFIG": "КОНФИГУРАЦИЯ_ЧАТА_OPENAI",
     "OPENAI_INPUT_FILES": "ВХОДНЫЕ_ФАЙЛЫ_OPENAI",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "ШАБЛОН_PIXVERSE",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_для_тестирования",
     "advanced": "расширенный",
     "animation": "анимация",
-    "api": "api",
     "api node": "api-узел",
     "attention_experiments": "эксперименты_внимания",
     "audio": "аудио",
+    "background removal": "удаление фона",
     "batch": "пакет",
-    "camera": "камера",
     "chroma_radiance": "chroma_radiance",
     "clip": "clip",
+    "color": "цвет",
     "combine": "объединить",
     "compositing": "композиционирование",
     "cond pair": "условие_пара",
     "cond single": "условие_одиночное",
     "conditioning": "условие",
-    "context": "контекст",
     "controlnet": "controlnet",
     "create": "создать",
     "custom_sampling": "пользовательский_семплинг",
@@ -2302,6 +2308,7 @@
     "deprecated": "устаревший",
     "detection": "детекция",
     "edit_models": "редактировать_модели",
+    "experimental": "экспериментальное",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "направление",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "маска",
-    "math": "математика",
     "model": "модель",
     "model_merging": "слияние_моделей",
     "model_patches": "патчи_моделей",
@@ -2334,16 +2340,13 @@
     "save": "сохранить",
     "schedulers": "schedulers",
     "scheduling": "scheduling",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "шейдер",
     "sigmas": "сигмы",
     "stable_cascade": "стабильная_каскадная",
-    "string": "строка",
     "style_model": "модель_стиля",
     "supir": "supir",
     "text": "текст",
-    "textgen": "textgen",
     "training": "обучение",
     "transform": "преобразование",
     "unet": "unet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "Не удалось удалить",
       "deleted": "Рабочий процесс удалён",
       "dirtyClose": "Файлы ниже были изменены. Вы хотите сохранить их перед закрытием?",
+      "dirtyCloseAnyway": "Закрыть всё равно",
       "dirtyCloseHint": "Удерживайте Shift, чтобы закрыть без подсказки",
       "dirtyCloseTitle": "Сохранить изменения?",
       "workflowTreeType": {
diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json
index a1422f3430..f4d5310e1b 100644
--- a/src/locales/ru/nodeDefs.json
+++ b/src/locales/ru/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "Добавить шум",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "Унифицированная генерация изображений по тексту и точное редактирование по одному предложению с разрешением до 4K.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_fail_on_partial": {
+        "name": "fail_on_partial"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_max_images": {
+        "name": "max_images"
+      },
+      "model_size_preset": {
+        "name": "size_preset"
+      },
+      "model_width": {
+        "name": "width"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос для создания или редактирования изображения."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для генерации."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Добавлять ли водяной знак «AI generated» на изображение."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "Создать видео с использованием моделей ByteDance через API на основе промпта",
     "display_name": "ByteDance Текст в Видео",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "Ручная установка контекстных окон.",
     "display_name": "Контекстные окна (Ручная настройка)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Добавлять ли причинно-следственный корректирующий кадр к окнам контекста с индексом, отличным от 0."
+      },
       "closed_loop": {
         "name": "замкнутый_цикл",
         "tooltip": "Замыкать ли цикл контекстного окна; применимо только к циклическим расписаниям."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "Пустое латентное пространство пикселей для HiDream-O1-Image. Модель обучалась на разрешении около 4 мегапикселей; при меньших разрешениях качество заметно ухудшается и выходит за пределы распределения. Обученные разрешения: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Пустое HiDream-O1 латентное изображение",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Генерация изображений с помощью Flux.2 [pro] или Flux.2 [max] по текстовому запросу и, при необходимости, референсным изображениям.",
+    "display_name": "Flux.2 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_height": {
+        "name": "height"
+      },
+      "model_width": {
+        "name": "width"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Запрос для генерации или редактирования изображения"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайный сид, используемый для создания шума."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "Генерирует изображения синхронно на основе запроса и разрешения.",
     "display_name": "Flux.2 [max] Image",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Генерируйте или редактируйте изображения синхронно через Google Vertex API.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий изображение для генерации или редактирования. Укажите любые ограничения, стили или детали, которым должна следовать модель."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Когда seed фиксирован на определённом значении, модель старается выдавать одинаковый результат при повторных запросах. Детерминированный результат не гарантируется. Также изменение модели или параметров, таких как temperature, может привести к различиям в ответе даже при одинаковом seed. По умолчанию используется случайное значение seed."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Базовые инструкции, определяющие поведение ИИ."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "Первое изображение из процесса мышления модели. Доступно только при thinking_level HIGH и модальности IMAGE+TEXT."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Генерируйте текстовые ответы с помощью модели ИИ Google Gemini. Вы можете предоставить несколько типов входных данных (текст, изображения, аудио, видео) в качестве контекста для генерации более релевантных и осмысленных ответов.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "Изменение существующего изображения на основе текстового запроса",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_number_of_images": {
+        "name": "number_of_images"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, используемый для генерации изображения"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты не детерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "Генерировать изображения с помощью Grok на основе текстового запроса",
     "display_name": "Grok Image",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "Усредняет выход модели по нескольким смещённым позициям сетки патчей на поздних этапах сэмплирования. Устраняет швы.",
+    "display_name": "Сглаживание швов патчей HiDream-O1",
+    "inputs": {
+      "blend": {
+        "name": "смешивание",
+        "tooltip": "average: среднее арифметическое. window: взвешивание по окну Ханна, отдавая предпочтение проходам вдали от границ патчей. median: медиана по каждому пикселю, отбрасывает выбросы на границах."
+      },
+      "end_percent": {
+        "name": "конечный_процент",
+        "tooltip": "Прогресс сэмплирования, при котором смешивание выключается."
+      },
+      "model": {
+        "name": "модель"
+      },
+      "passes": {
+        "name": "проходы",
+        "tooltip": "Количество проходов на каждом этапе. 2/4 = фиксировано. ramp_*: количество проходов увеличивается к концу сэмплирования (больше сглаживания там, где швы заметнее)."
+      },
+      "pattern": {
+        "name": "шаблон",
+        "tooltip": "Схема смещения. single_shift: один проход по естественной сетке патчей + другие со смещением. symmetric: все проходы вне сетки, смещения симметричны относительно центра."
+      },
+      "start_percent": {
+        "name": "начальный_процент",
+        "tooltip": "Прогресс сэмплирования (0=начало, 1=конец), при котором включается смешивание."
+      },
+      "strength": {
+        "name": "интенсивность",
+        "tooltip": "Интерполяция между предсказанием по естественной сетке (0) и усреднённым результатом (1)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "Прикрепите 1-10 референсных изображений для кондиционирования: одно для редактирования по инструкции или несколько для персонализации по объекту.",
+    "display_name": "Референсные изображения HiDream-O1",
+    "inputs": {
+      "images": {
+        "name": "изображения",
+        "tooltip": "Референсные изображения. 1 изображение = редактирование по инструкции; 2-10 изображений = мульти-референс."
+      },
+      "negative": {
+        "name": "отрицательный"
+      },
+      "positive": {
+        "name": "положительный"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "положительный",
+        "tooltip": null
+      },
+      "1": {
+        "name": "отрицательный",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "Увеличение разрешения низкокачественных изображений до сверхвысокого, устранение артефактов и шума. Максимальный выход: 32 мегапикселя.",
     "display_name": "HitPaw General Image Enhance",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Загрузить модель удаления фона",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "bg_removal_name",
+        "tooltip": "Модель, используемая для удаления фона с изображений"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Загрузить изображение",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Редактирование существующего изображения с помощью текстового запроса, используя модель Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель, используемая для редактирования."
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Описание желаемого редактирования. 1–6000 символов."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Исходное изображение для редактирования."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "Синхронно изменяет изображения на основе запроса и соотношения сторон.",
     "display_name": "Luma Image to Image",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Генерация изображений по текстовому описанию с помощью модели Luma UNI-1.",
+    "display_name": "Luma UNI-1 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель, используемая для генерации."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание желаемого изображения. 1–6000 символов."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "Генерирует видео синхронно на основе запроса, входных изображений и output_size.",
     "display_name": "Luma Image to Video",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "Масштаб шума модели",
+    "inputs": {
+      "model": {
+        "name": "модель"
+      },
+      "noise_scale": {
+        "name": "масштаб_шума",
+        "tooltip": "Абсолютный масштаб шума обучения. Например, HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Узел Moonvalley Marey: Изображение в видео",
-    "display_name": "Moonvalley Marey: Изображение в видео",
-    "inputs": {
-      "control_after_generate": {
-        "name": "управление после генерации"
-      },
-      "image": {
-        "name": "изображение",
-        "tooltip": "Эталонное изображение, используемое для генерации видео"
-      },
-      "negative_prompt": {
-        "name": "негативный_промпт",
-        "tooltip": "Текст негативного промпта"
-      },
-      "prompt": {
-        "name": "промпт"
-      },
-      "prompt_adherence": {
-        "name": "следование_промпту",
-        "tooltip": "Коэффициент управления генерацией"
-      },
-      "resolution": {
-        "name": "разрешение",
-        "tooltip": "Разрешение выходного видео"
-      },
-      "seed": {
-        "name": "сид",
-        "tooltip": "Значение случайного сида"
-      },
-      "steps": {
-        "name": "шаги",
-        "tooltip": "Количество шагов денизинга"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey: Текст в видео",
-    "inputs": {
-      "control_after_generate": {
-        "name": "управление после генерации"
-      },
-      "negative_prompt": {
-        "name": "негативный_промпт",
-        "tooltip": "Текст негативного промпта"
-      },
-      "prompt": {
-        "name": "промпт"
-      },
-      "prompt_adherence": {
-        "name": "следование_запросу",
-        "tooltip": "Коэффициент управления генерацией"
-      },
-      "resolution": {
-        "name": "разрешение",
-        "tooltip": "Разрешение выходного видео"
-      },
-      "seed": {
-        "name": "сид",
-        "tooltip": "Случайное значение сида"
-      },
-      "steps": {
-        "name": "шаги",
-        "tooltip": "Шаги вывода"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Video to Video",
-    "inputs": {
-      "control_type": {
-        "name": "тип_управления"
-      },
-      "motion_intensity": {
-        "name": "интенсивность_движения",
-        "tooltip": "Используется только если тип_управления 'Передача движения'"
-      },
-      "negative_prompt": {
-        "name": "негативный_запрос",
-        "tooltip": "Текст негативного запроса"
-      },
-      "prompt": {
-        "name": "запрос",
-        "tooltip": "Описывает видео для генерации"
-      },
-      "seed": {
-        "name": "сид",
-        "tooltip": "Случайное значение сида"
-      },
-      "steps": {
-        "name": "шаги",
-        "tooltip": "Количество шагов вывода"
-      },
-      "video": {
-        "name": "видео",
-        "tooltip": "Эталонное видео, используемое для генерации выходного видео. Должно быть длиной не менее 5 секунд. Видео длиннее 5 секунд будут автоматически обрезаны. Поддерживается только формат MP4."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "Морфология изображения",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "Генерирует изображения синхронно через конечную точку OpenAI GPT Image 1.",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "Генерирует изображения синхронно через конечную точку OpenAI GPT Image 2.",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "background",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "Текстовый запрос для GPT Image 1"
+        "tooltip": "Текстовый запрос для GPT Image 2"
       },
       "quality": {
         "name": "quality",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "Генерирует изображения через конечную точку OpenAI GPT Image.",
+    "display_name": "OpenAI GPT Image 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_background": {
+        "name": "background"
+      },
+      "model_custom_height": {
+        "name": "custom_height"
+      },
+      "model_custom_width": {
+        "name": "custom_width"
+      },
+      "model_quality": {
+        "name": "quality"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Сколько изображений сгенерировать"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос для GPT Image"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "еще не реализовано на сервере"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "Загружает и подготавливает входные файлы (текст, pdf и т.д.) для включения в качестве входных данных для узла Чат OpenAI. Файлы будут прочитаны моделью OpenAI при генерации ответа. 🛈 СОВЕТ: Может быть объединен в цепочку с другими узлами Входных файлов OpenAI.",
     "display_name": "Файлы ввода OpenAI ChatGPT",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Загрузка модели оптического потока",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Модель оптического потока для загрузки. Файлы должны быть размещены в папке 'optical_flow'. В настоящее время поддерживается только raft_large.pth из torchvision."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalStepsScheduler",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "Int",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "контроль после генерации"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Удалить фон",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "bg_removal_model",
+        "tooltip": "Модель удаления фона, используемая для создания маски"
+      },
+      "image": {
+        "name": "изображение",
+        "tooltip": "Входное изображение для удаления фона"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "Сгенерированная маска переднего плана"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "Кадров в каждом авторегрессионном блоке. 1 = покадрово, 3 = блоками. Должно соответствовать режиму обучения контрольной точки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "Пользовательский выборщик",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "LCM-семплер с настраиваемым уровнем шума на каждом шаге. s_noise — это множитель масштаба шума обучения модели",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Ограничить шум на каждом шаге до +/- N*std. 0 — отключить."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Множитель шума на первом шаге (1.0 = соответствует обучению)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Множитель шума на последнем шаге. Установите равным s_noise для постоянного расписания."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "Сэмплер LCM Upscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "аудио"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Использовать встроенный системный шаблон/подсказку, если он есть у модели."
+      },
+      "video": {
+        "name": "видео",
+        "tooltip": "Кадры видео как пакет изображений. Предполагается 24 кадра в секунду; внутренне дискретизируется до 1 кадра в секунду."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "аудио"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Использовать встроенный системный шаблон/подсказку, если он есть у модели."
+      },
+      "video": {
+        "name": "видео",
+        "tooltip": "Кадры видео как пакет изображений. Предполагается 24 кадра в секунду; внутренне дискретизируется до 1 кадра в секунду."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "Оживите видео с помощью мощных технологий увеличения разрешения и восстановления.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "уровень динамического сжатия",
+        "tooltip": "Уровень CQP."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_model_creativity": {
+        "name": "креативность"
+      },
+      "upscaler_model_prompt": {
+        "name": "промпт"
+      },
+      "upscaler_model_realism": {
+        "name": "реализм"
+      },
+      "upscaler_model_sharp": {
+        "name": "резкость"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "разрешение увеличения"
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Скомпилировать модель Torch",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "PBR"
       },
       "quad": {
-        "name": "квад"
+        "name": "квад",
+        "tooltip": "Этот параметр устарел и больше не используется."
       },
       "texture": {
         "name": "текстура"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Количество пиксельных кадров для обработки. Для CogVideoX-Fun-V1.5 (patch_size_t=2) latent_t должен быть чётным — длины, дающие нечётный latent_t, округляются вниз (например, 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "Предварительно обработанная quadmask из VOIDQuadmaskPreprocess [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Кадры исходного видео [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Радиус дилатации для основной области маски (0 = без дилатации)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Количество пиксельных кадров. Округляется вниз для чётного latent_t (требование patch_size_t=2), например, 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "Модель оптического потока из OpticalFlowLoader (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Кадры видео из первого прохода [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "Латент искажённого шума из VOIDWarpedNoise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPScheduler",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "Масштаб аудиофич при внедрении в видеомодель."
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "Вычисленный fps на основе длины аудио и количества видеокадров. Используется в prompt."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Аудио для расчёта общего количества выходных кадров и извлечения сегмента аудио."
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "Какой это сегмент (0 — первый, 1 — второй и т.д.)"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Длина этого сегмента (обычно 149 кадров)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Дополненная последовательность ключевых кадров"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Маска, указывающая валидные кадры"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Аудиосегмент для этого видеосегмента"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Аудио для нарезки для каждого выдаваемого сегмента."
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "Сколько дополненных сегментов выдавать в виде списков."
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "Длина каждого сегмента (обычно 149 кадров)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "Дополненные последовательности ключевых кадров"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "Маски, указывающие валидные кадры"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "Аудиосегмент для каждого видеосегмента"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "Визуальные эмбеддинги CLIP для первого кадра."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "Визуальные эмбеддинги CLIP для референсного изображения."
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина",
+        "tooltip": "Количество кадров в сгенерированном видео. Для WanDancer должно оставаться 149."
+      },
+      "mask": {
+        "name": "маска",
+        "tooltip": "Маска для обработки изображения начального кадра(ов). Белое сохраняется, черное генерируется. Используется для локальной генерации."
+      },
+      "negative": {
+        "name": "негативный"
+      },
+      "positive": {
+        "name": "позитивный"
+      },
+      "start_image": {
+        "name": "начальное изображение",
+        "tooltip": "Исходное изображение(я) для кодирования, может быть любое количество кадров."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "позитивный",
+        "tooltip": null
+      },
+      "1": {
+        "name": "негативный",
+        "tooltip": null
+      },
+      "2": {
+        "name": "латентный",
+        "tooltip": "Пустое латентное пространство."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanFirstLastFrameToVideo",
     "inputs": {
diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json
index 4d7c5ebb07..64c60916e0 100644
--- a/src/locales/tr/main.json
+++ b/src/locales/tr/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "ve",
+      "backToGithubLogin": "Bunun yerine Github ile kaydol",
       "backToLogin": "Girişe dön",
       "backToSocialLogin": "Bunun yerine Google veya Github ile kaydolun",
       "confirmPasswordLabel": "Şifreyi Onayla",
@@ -292,7 +293,9 @@
       "title": "Yeniden Kimlik Doğrulama Gerekli"
     },
     "signOut": {
+      "saveFailed": "\"{workflow}\" kaydedilemediği için çıkış iptal edildi.",
       "signOut": "Çıkış Yap",
+      "signOutAnyway": "Yine de çıkış yap",
       "success": "Başarıyla çıkış yapıldı",
       "successDetail": "Hesabınızdan başarıyla çıkış yaptınız.",
       "unsavedChangesMessage": "Oturumu kapattığınızda kaydedilmemiş değişiklikleriniz kaybolacak. Devam etmek istiyor musunuz?",
@@ -461,6 +464,12 @@
       "wantToRun": "ComfyUI'ı yerel olarak çalıştırmak mı istiyorsunuz?"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "Lütfen bir seçenek seçin.",
+        "describeAnswer": "Lütfen cevabınızı açıklayın.",
+        "selectAtLeastOne": "Lütfen en az bir seçenek seçin."
+      },
+      "intro": "ComfyUI deneyiminizi size özel hale getirmemize yardımcı olun.",
       "options": {
         "familiarity": {
           "advanced": "İleri seviye kullanıcı (özel iş akışları)",
@@ -469,45 +478,43 @@
           "new": "ComfyUI'a yeni (daha önce hiç kullanmadım)",
           "starting": "Yeni başlıyorum (eğitimleri takip ediyorum)"
         },
-        "industry": {
-          "architecture": "Mimarlık",
-          "education": "Eğitim",
-          "film_tv_animation": "Film, TV ve animasyon",
-          "fine_art": "Güzel sanatlar ve illüstrasyon",
-          "gaming": "Oyun",
-          "marketing": "Pazarlama ve reklamcılık",
-          "other": "Diğer",
-          "otherPlaceholder": "Lütfen belirtin",
-          "product_design": "Ürün ve grafik tasarımı",
-          "software": "Yazılım ve teknoloji"
-        },
-        "making": {
-          "3d": "3D varlıklar",
+        "intent": {
+          "3d_game": "3D varlıklar / oyun varlıkları",
+          "api": "İş akışlarını çalıştırmak için API uç noktaları",
+          "apps": "İş akışlarından basitleştirilmiş uygulamalar",
           "audio": "Ses / müzik",
-          "custom_nodes": "Özel düğümler ve iş akışları",
+          "custom_nodes": "Özel node'lar",
           "images": "Görseller",
-          "video": "Video ve animasyon"
+          "not_sure": "Emin değilim",
+          "videos": "Videolar",
+          "workflows": "Özel iş akışları veya boru hatları"
         },
-        "purpose": {
-          "client": "Müşteri işleri (serbest çalışma)",
-          "community": "Topluluk katkıları (düğümler, iş akışları vb.)",
-          "inhouse": "Kendi işyerim (şirket içi)",
-          "personal": "Kişisel projeler / hobi",
-          "research": "Akademik araştırma"
+        "source": {
+          "conference": "Konferans veya etkinlik",
+          "discord": "Discord / topluluk",
+          "friend": "Arkadaş veya iş arkadaşı",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "Bülten veya blog",
+          "other": "Diğer",
+          "reddit": "Reddit",
+          "search": "Google / arama",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "Eğitim (öğrenci veya eğitmen)",
+          "personal": "Kişisel kullanım",
+          "work": "İş"
         }
       },
       "placeholder": "Anket soruları yer tutucusu",
-      "questions": {
-        "familiarity": "ComfyUI'a ne kadar aşinasınız?",
-        "industry": "Birincil sektörünüz nedir?",
-        "making": "Ne yapmayı planlıyorsunuz?",
-        "purpose": "ComfyUI'ı öncelikle ne için kullanacaksınız?"
-      },
       "steps": {
         "familiarity": "ComfyUI'a ne kadar aşinasınız?",
-        "industry": "Birincil sektörünüz nedir?",
-        "making": "Ne yapmayı planlıyorsunuz?",
-        "purpose": "ComfyUI'ı öncelikle ne için kullanacaksınız?"
+        "intent": "ComfyUI ile ne oluşturmak istiyorsunuz?",
+        "source": "ComfyUI'yi nereden duydunuz?",
+        "usage": "ComfyUI'yi nasıl kullanmayı planlıyorsunuz?"
       },
       "title": "Bulut Anketi"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "saniyeler içinde oluşturmaya başlayın",
   "cloudStart_wantToRun": "ComfyUI'ı yerel olarak çalıştırmak mı istiyorsunuz?",
   "cloudSurvey_steps_familiarity": "ComfyUI'ya ne kadar aşinasınız?",
-  "cloudSurvey_steps_industry": "Birincil sektörünüz nedir?",
-  "cloudSurvey_steps_making": "Ne yapmayı planlıyorsunuz?",
-  "cloudSurvey_steps_purpose": "ComfyUI'yı öncelikle ne için kullanacaksınız?",
+  "cloudSurvey_steps_intent": "ComfyUI ile ne oluşturmak istiyorsunuz?",
+  "cloudSurvey_steps_source": "ComfyUI'yi nereden duydunuz?",
+  "cloudSurvey_steps_usage": "ComfyUI'yi nasıl kullanmayı planlıyorsunuz?",
   "cloudWaitlist_contactLink": "burada",
   "cloudWaitlist_questionsText": "Sorularınız mı var? Bize ulaşın",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "SES_KODLAYICI",
     "AUDIO_ENCODER_OUTPUT": "SES_KODLAYICI_ÇIKIŞI",
     "AUDIO_RECORD": "SES_KAYDI",
+    "BACKGROUND_REMOVAL": "ARKA_PLAN_KALDIRMA",
     "BOOLEAN": "BOOLEAN",
     "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "KAMERA_KONTROL",
@@ -831,6 +839,7 @@
     "NOISE": "GÜRÜLTÜ",
     "OPENAI_CHAT_CONFIG": "OPENAI_SOHBET_YAPILANDIRMASI",
     "OPENAI_INPUT_FILES": "OPENAI_GİRİŞ_DOSYALARI",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PIXVERSE_ŞABLONU",
     "POSE_KEYPOINT": "POZ ANAHTAR NOKTASI",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_test_için",
     "advanced": "gelişmiş",
     "animation": "animasyon",
-    "api": "api",
     "api node": "api düğümü",
     "attention_experiments": "dikkat_deneyleri",
     "audio": "ses",
+    "background removal": "arka plan kaldırma",
     "batch": "toplu",
-    "camera": "kamera",
     "chroma_radiance": "chroma_radiance",
     "clip": "klip",
+    "color": "renk",
     "combine": "birleştir",
     "compositing": "birleştirme",
     "cond pair": "çift koşul",
     "cond single": "tek koşul",
     "conditioning": "koşullandırma",
-    "context": "bağlam",
     "controlnet": "controlnet",
     "create": "oluştur",
     "custom_sampling": "özel_örnekleme",
@@ -2302,6 +2308,7 @@
     "deprecated": "kullanımdan kaldırılmış",
     "detection": "tespit",
     "edit_models": "modelleri_düzenle",
+    "experimental": "deneysel",
     "flux": "flux",
     "gligen": "gligen",
     "guidance": "rehberlik",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "maske",
-    "math": "matematik",
     "model": "model",
     "model_merging": "model_birleştirme",
     "model_patches": "model_yamaları",
@@ -2334,16 +2340,13 @@
     "save": "kaydet",
     "schedulers": "zamanlayıcılar",
     "scheduling": "zamanlama",
-    "sd": "sd",
     "sd3": "sd3",
     "shader": "shader",
     "sigmas": "sigmalar",
     "stable_cascade": "stabil_çağlayan",
-    "string": "dize",
     "style_model": "stil_modeli",
     "supir": "supir",
     "text": "metin",
-    "textgen": "textgen",
     "training": "eğitim",
     "transform": "dönüştür",
     "unet": "unet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "Silme başarısız oldu",
       "deleted": "İş akışı silindi",
       "dirtyClose": "Aşağıdaki dosyalar değiştirildi. Kapatmadan önce bunları kaydetmek ister misiniz?",
+      "dirtyCloseAnyway": "Yine de kapat",
       "dirtyCloseHint": "Sormadan kapatmak için Shift tuşunu basılı tutun",
       "dirtyCloseTitle": "Değişiklikler Kaydedilsin mi?",
       "workflowTreeType": {
diff --git a/src/locales/tr/nodeDefs.json b/src/locales/tr/nodeDefs.json
index d684eab4bd..837d7f3ec4 100644
--- a/src/locales/tr/nodeDefs.json
+++ b/src/locales/tr/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyut"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "Gürültü Ekle",
     "inputs": {
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "Birleştirilmiş metinden-görüntüye üretim ve 4K çözünürlüğe kadar hassas tek cümle düzenleme.",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_fail_on_partial": {
+        "name": "kısmi başarısızlıkta dur"
+      },
+      "model_height": {
+        "name": "yükseklik"
+      },
+      "model_max_images": {
+        "name": "maksimum_görüntü"
+      },
+      "model_size_preset": {
+        "name": "boyut_önayarı"
+      },
+      "model_width": {
+        "name": "genişlik"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Bir görüntü oluşturmak veya düzenlemek için metin istemi."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Üretim için kullanılacak tohum."
+      },
+      "watermark": {
+        "name": "filigran",
+        "tooltip": "Görüntüye \"Yapay Zeka ile oluşturuldu\" filigranı eklenip eklenmeyeceği."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "Prompt'a dayalı olarak api üzerinden ByteDance modellerini kullanarak video oluştur",
     "display_name": "ByteDance Metinden Videoya",
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "Bağlam pencerelerini manuel olarak ayarlayın.",
     "display_name": "Bağlam Pencereleri (Manuel)",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "Sıfırdan farklı indeksli context pencerelerine nedensel düzeltme karesi eklenip eklenmeyeceği."
+      },
       "closed_loop": {
         "name": "kapalı döngü",
         "tooltip": "Bağlam penceresi döngüsünün kapatılıp kapatılmayacağı; sadece döngülü çizelgeler için geçerlidir."
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "HiDream-O1-Image için boş piksel-uzayı latent. Model yaklaşık 4 megapikselde eğitildi; daha düşük çözünürlüklerde dağılım dışına çıkar ve kalite belirgin şekilde düşer. Eğitildiği çözünürlükler: 2048x2048, 2304x1728, 1728x2304, 2560x1440, 1440x2560, 2496x1664, 1664x2496, 3104x1312, 1312x3104, 2304x1792, 1792x2304.",
+    "display_name": "Boş HiDream-O1 Latent Görüntü",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "Boş Hunyuan Görüntü Gizli",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "Bir istem ve isteğe bağlı referans görüntülerden Flux.2 [pro] veya Flux.2 [max] ile görüntüler oluşturun.",
+    "display_name": "Flux.2 Görüntü",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_height": {
+        "name": "yükseklik"
+      },
+      "model_width": {
+        "name": "genişlik"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görüntü oluşturma veya düzenleme için istem"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Gürültü oluşturmak için kullanılan rastgele tohum."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "İstem ve çözünürlüğe göre senkron bir şekilde görseller üretir.",
     "display_name": "Flux.2 [max] Görsel",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "Google Vertex API aracılığıyla senkron bir şekilde görseller oluşturun veya düzenleyin.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Oluşturulacak görseli veya uygulanacak düzenlemeleri tanımlayan metin istemi. Modelin uyması gereken kısıtlamaları, stilleri veya detayları ekleyin."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed belirli bir değere sabitlendiğinde, model tekrarlanan isteklerde aynı yanıtı vermeye çalışır. Ancak deterministik çıktı garanti edilmez. Ayrıca, model veya parametre ayarlarını (örneğin sıcaklık) değiştirmek, aynı seed değeriyle bile yanıtın farklılaşmasına neden olabilir. Varsayılan olarak rastgele bir seed değeri kullanılır."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Bir yapay zekanın davranışını belirleyen temel talimatlar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "Modelin düşünme sürecinden ilk görsel. Sadece thinking_level YÜKSEK ve IMAGE+TEXT modality ile kullanılabilir."
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Google'ın Gemini AI modeli ile metin yanıtları oluşturun. Daha alakalı ve anlamlı yanıtlar oluşturmak için bağlam olarak birden fazla girdi türü (metin, görseller, ses, video) sağlayabilirsiniz.",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "Mevcut bir görüntüyü bir metin istemine göre değiştirin",
+    "display_name": "Grok Görüntü Düzenleme",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "en-boy_oranı"
+      },
+      "model_number_of_images": {
+        "name": "görüntü_sayısı"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görüntü oluşturmak için kullanılan metin istemi"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirlemek için tohum; gerçek sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "Bir metin istemine göre Grok ile görüntüler oluştur",
     "display_name": "Grok Görüntü",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "Örneklemenin son kısmında model çıktısını birden fazla kaydırılmış yama-ızgara pozisyonunda ortalar. Dikişleri yok eder.",
+    "display_name": "HiDream-O1 Yama Dikiş Yumuşatma",
+    "inputs": {
+      "blend": {
+        "name": "karıştırma",
+        "tooltip": "average: eşit ağırlıklı ortalama. window: her geçişi yama sınırlarından uzaklaştıran Hann-pencereli ağırlıklandırma. median: piksel başına medyan, sarmalayan-aşırı geçişleri reddeder."
+      },
+      "end_percent": {
+        "name": "bitiş_yüzdesi",
+        "tooltip": "Karışımın KAPANDIĞI örnekleme ilerlemesi."
+      },
+      "model": {
+        "name": "model"
+      },
+      "passes": {
+        "name": "geçişler",
+        "tooltip": "Her adımda geçiş sayısı. 2/4 = sabit. ramp_*: örnekleme sona yaklaştıkça geçiş sayısı artar (dikişlerin en görünür olduğu yerde daha fazla yumuşatma)."
+      },
+      "pattern": {
+        "name": "desen",
+        "tooltip": "Kaydırma düzeni. single_shift: doğal yama ızgarasında bir geçiş + diğerleri kaydırılmış. symmetric: tüm geçişler ızgara dışında, kaydırmalar orijin etrafında bölünmüş."
+      },
+      "start_percent": {
+        "name": "başlangıç_yüzdesi",
+        "tooltip": "Karışımın AÇILDIĞI örnekleme ilerlemesi (0=başlangıç, 1=bitiş)."
+      },
+      "strength": {
+        "name": "güç",
+        "tooltip": "Doğal ızgara tahmini (0) ile ortalanmış sonuç (1) arasında enterpolasyon."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "Koşullandırmaya 1-10 referans görseli ekleyin; biri düzenleme talimatı, birden fazlası ise konuya özel kişiselleştirme için.",
+    "display_name": "HiDream-O1 Referans Görselleri",
+    "inputs": {
+      "images": {
+        "name": "görseller",
+        "tooltip": "Referans görselleri. 1 görsel = düzenleme talimatı; 2-10 görsel = çoklu referans."
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "Düşük çözünürlüklü görüntüleri süper çözünürlüğe yükseltin, bozulmaları ve gürültüyü ortadan kaldırın. Maksimum çıktı: 32 megapiksel.",
     "display_name": "HitPaw Genel Görüntü İyileştirme",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "Arka Plan Kaldırma Modelini Yükle",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "arka_plan_kaldırma_adı",
+        "tooltip": "Görsellerden arka planı kaldırmak için kullanılan model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "Görüntü Yükle",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "Luma UNI-1 modeliyle bir metin istemi kullanarak mevcut bir görseli düzenleyin.",
+    "display_name": "Luma UNI-1 Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Düzenleme için kullanılacak model."
+      },
+      "model_style": {
+        "name": "stil"
+      },
+      "model_web_search": {
+        "name": "web_arama"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "İstenilen düzenlemenin açıklaması. 1–6000 karakter."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, nodun tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Düzenlenecek kaynak görsel."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "İstem ve en boy oranına göre görüntüleri eşzamanlı olarak değiştirir.",
     "display_name": "Luma Görüntüden Görüntüye",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "Luma UNI-1 modeliyle metinden görseller oluşturun.",
+    "display_name": "Luma UNI-1 Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Oluşturma için kullanılacak model."
+      },
+      "model_aspect_ratio": {
+        "name": "en-boy_oranı"
+      },
+      "model_style": {
+        "name": "stil"
+      },
+      "model_web_search": {
+        "name": "web_arama"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "İstenilen görselin metin açıklaması. 1–6000 karakter."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, nodun tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "İstem, giriş görüntüleri ve çıktı_boyutuna göre videoları eşzamanlı olarak oluşturur.",
     "display_name": "Luma Görüntüden Videoya",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "ModelNoiseScale",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "noise_scale": {
+        "name": "gürültü_ölçeği",
+        "tooltip": "Mutlak eğitim gürültü ölçeği. Örneğin HiDream-O1 base: 8.0, dev: 7.5."
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "ModelPatchLoader",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Moonvalley Marey Görüntüden Videoya Düğümü",
-    "display_name": "Moonvalley Marey Görüntüden Videoya",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "image": {
-        "name": "görüntü",
-        "tooltip": "Videoyu oluşturmak için kullanılan referans görüntü"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Negatif prompt metni"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "prompt_adherence",
-        "tooltip": "Üretim kontrolü için rehberlik ölçeği"
-      },
-      "resolution": {
-        "name": "çözünürlük",
-        "tooltip": "Çıktı videosunun çözünürlüğü"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Rastgele seed değeri"
-      },
-      "steps": {
-        "name": "steps",
-        "tooltip": "Gürültü giderme adımlarının sayısı"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey Metinden Videoya",
-    "inputs": {
-      "control_after_generate": {
-        "name": "üretim sonrası kontrol"
-      },
-      "negative_prompt": {
-        "name": "negative_prompt",
-        "tooltip": "Negatif prompt metni"
-      },
-      "prompt": {
-        "name": "prompt"
-      },
-      "prompt_adherence": {
-        "name": "komut uyumu",
-        "tooltip": "Üretim kontrolü için rehberlik ölçeği"
-      },
-      "resolution": {
-        "name": "çözünürlük",
-        "tooltip": "Çıktı videosunun çözünürlüğü"
-      },
-      "seed": {
-        "name": "tohum",
-        "tooltip": "Rastgele tohum değeri"
-      },
-      "steps": {
-        "name": "adımlar",
-        "tooltip": "Çıkarım adımları"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey Video'dan Video'ya",
-    "inputs": {
-      "control_type": {
-        "name": "kontrol_tipi"
-      },
-      "motion_intensity": {
-        "name": "hareket_yoğunluğu",
-        "tooltip": "Sadece kontrol_tipi 'Hareket Transferi' ise kullanılır"
-      },
-      "negative_prompt": {
-        "name": "negatif_komut",
-        "tooltip": "Negatif komut metni"
-      },
-      "prompt": {
-        "name": "komut",
-        "tooltip": "Oluşturulacak videoyu tanımlar"
-      },
-      "seed": {
-        "name": "tohum",
-        "tooltip": "Rastgele tohum değeri"
-      },
-      "steps": {
-        "name": "adımlar",
-        "tooltip": "Çıkarım adım sayısı"
-      },
-      "video": {
-        "name": "video",
-        "tooltip": "Çıktı videosunu oluşturmak için kullanılan referans video. En az 5 saniye uzunluğunda olmalıdır. 5 saniyeden uzun videolar otomatik olarak kırpılacaktır. Sadece MP4 formatı desteklenir."
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "GörüntüMorfolojisi",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "OpenAI'nin GPT Görüntü 1 uç noktası aracılığıyla eşzamanlı olarak görüntüler oluşturur.",
-    "display_name": "OpenAI GPT Görüntü 1",
+    "description": "OpenAI'nin GPT Görüntü 2 uç noktası aracılığıyla eşzamanlı olarak görüntüler oluşturur.",
+    "display_name": "OpenAI GPT Görüntü 2",
     "inputs": {
       "background": {
         "name": "arka_plan",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "istem",
-        "tooltip": "GPT Görüntü 1 için metin istemi"
+        "tooltip": "GPT Görüntü 2 için metin istemi"
       },
       "quality": {
         "name": "kalite",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "OpenAI'nin GPT Görüntü uç noktası ile görüntüler oluşturur.",
+    "display_name": "OpenAI GPT Görüntü 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_background": {
+        "name": "arka_plan"
+      },
+      "model_custom_height": {
+        "name": "özel_yükseklik"
+      },
+      "model_custom_width": {
+        "name": "özel_genişlik"
+      },
+      "model_quality": {
+        "name": "kalite"
+      },
+      "model_size": {
+        "name": "boyut"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Kaç görüntü oluşturulacak"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "GPT Görüntü için metin istemi"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Henüz arka uçta uygulanmadı"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "OpenAI Sohbet Düğümü için girdi olarak eklemek üzere girdi dosyalarını (metin, pdf vb.) yükler ve hazırlar. Dosyalar, yanıt oluşturulurken OpenAI modeli tarafından okunacaktır. 🛈 İPUCU: Diğer OpenAI Girdi Dosyası düğümleriyle zincirlenebilir.",
     "display_name": "OpenAI ChatGPT Girdi Dosyaları",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "Optik Akış Modelini Yükle",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "Yüklenecek optik akış modeli. Dosyalar 'optical_flow' klasörüne yerleştirilmelidir. Şu anda yalnızca torchvision'un raft_large.pth dosyası desteklenmektedir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalAdımlarZamanlayıcı",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "Int",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "oluşturduktan sonra kontrol et"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "Arka Planı Kaldır",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "arka_plan_kaldırma_modeli",
+        "tooltip": "Maskeyi oluşturmak için kullanılan arka plan kaldırma modeli"
+      },
+      "image": {
+        "name": "görsel",
+        "tooltip": "Arka planı kaldırılacak giriş görseli"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "Oluşturulan ön plan maskesi"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "YenidenNormalleştirCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR Video",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "Her bir otoregresif blok başına kare sayısı. 1 = kare bazında, 3 = blok bazında. Kontrol noktası eğitim modu ile eşleşmelidir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "ÖzelÖrnekleyici",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "Ayarlanabilir adım başı gürültüye sahip LCM örnekleyici. s_noise, modelin eğitim gürültüsü ölçeğinde bir çarpandır.",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "Adım başı gürültüyü +/- N*std ile sınırla. 0 devre dışı bırakır."
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "İlk adımda adım başı gürültü çarpanı (1.0 = eğitimle aynı)."
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "Son adımda adım başı gürültü çarpanı. Sabit bir zaman çizelgesi için s_noise ile aynı değeri girin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "LCM Büyütme Örnekleyici",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "ses"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Modelde yerleşik bir sistem istemi/şablonu varsa bunu kullan."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Video kareleri, bir görüntü grubu olarak. 24 FPS varsayılır; dahili olarak 1 FPS'ye örneklenir."
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "ses"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "Modelde yerleşik bir sistem istemi/şablonu varsa bunu kullan."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Video kareleri, bir görüntü grubu olarak. 24 FPS varsayılır; dahili olarak 1 FPS'ye örneklenir."
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "Güçlü yükseltme ve iyileştirme teknolojisiyle videolarınıza yeni bir soluk kazandırın.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dinamik_sıkıştırma_seviyesi",
+        "tooltip": "CQP seviyesi."
+      },
+      "interpolation_model": {
+        "name": "enterpolasyon_modeli"
+      },
+      "upscaler_model": {
+        "name": "yükseltici_model"
+      },
+      "upscaler_model_creativity": {
+        "name": "yaratıcılık"
+      },
+      "upscaler_model_prompt": {
+        "name": "istem"
+      },
+      "upscaler_model_realism": {
+        "name": "gerçekçilik"
+      },
+      "upscaler_model_sharp": {
+        "name": "keskin"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "yükseltici_çözünürlüğü"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torch Model Derleme",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "dörtgen"
+        "name": "dörtgen",
+        "tooltip": "Bu parametre kullanımdan kaldırılmıştır ve hiçbir şey yapmaz."
       },
       "texture": {
         "name": "doku"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "İşlenecek piksel kare sayısı. CogVideoX-Fun-V1.5 (patch_size_t=2) için, latent_t çift olmalıdır — tek latent_t üreten uzunluklar aşağıya yuvarlanır (ör. 49 → 45)."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "VOIDQuadmaskPreprocess'ten ön işlenmiş quadmask [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Kaynak video kareleri [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "Birincil maske bölgesi için genişletme yarıçapı (0 = genişletme yok)"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "Piksel kare sayısı. latent_t çift yapmak için aşağıya yuvarlanır (patch_size_t=2 gereksinimi), ör. 49 → 45."
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "OpticalFlowLoader'dan optik akış modeli (RAFT-large)."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "1. geçiş çıktı video kareleri [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "VOIDWarpedNoise'dan bozulmuş gürültü latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPZamanlayıcı",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "ses"
+      },
+      "audio_inject_scale": {
+        "name": "ses_enjeksiyon_ölçeği",
+        "tooltip": "Ses özelliklerinin video modeline enjekte edilirken kullanılacak ölçek."
+      },
+      "video_frames": {
+        "name": "video_kareleri"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ses_kodlayıcı_çıktısı",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_dizgesi",
+        "tooltip": "Ses uzunluğu ve video kare sayısına göre hesaplanan fps. İstem içinde kullanılır."
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "ses",
+        "tooltip": "Toplam çıktı karelerini hesaplamak ve segment sesini çıkarmak için ses."
+      },
+      "images": {
+        "name": "görseller"
+      },
+      "segment_index": {
+        "name": "segment_indeksi",
+        "tooltip": "Bu hangi segment (ilk için 0, ikinci için 1, vb.)"
+      },
+      "segment_length": {
+        "name": "segment_uzunluğu",
+        "tooltip": "Bu segmentin uzunluğu (genellikle 149 kare)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "anahtar_kare_dizisi",
+        "tooltip": "Doldurulmuş anahtar kare dizisi"
+      },
+      "1": {
+        "name": "anahtar_kare_maskesi",
+        "tooltip": "Geçerli kareleri gösteren maske"
+      },
+      "2": {
+        "name": "ses_segmenti",
+        "tooltip": "Bu video segmenti için ses segmenti"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "ses",
+        "tooltip": "Her üretilen segment için bölünecek ses."
+      },
+      "images": {
+        "name": "görseller"
+      },
+      "num_segments": {
+        "name": "segment_sayısı",
+        "tooltip": "Liste olarak kaç doldurulmuş segment üretileceği."
+      },
+      "segment_length": {
+        "name": "segment_uzunluğu",
+        "tooltip": "Her segmentin uzunluğu (genellikle 149 kare)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "anahtar_kare_dizileri",
+        "tooltip": "Doldurulmuş anahtar kare dizileri"
+      },
+      "1": {
+        "name": "anahtar_kare_maskeleri",
+        "tooltip": "Geçerli kareleri gösteren maskeler"
+      },
+      "2": {
+        "name": "ses_segmenti",
+        "tooltip": "Her video segmenti için ses segmenti"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "İlk kare için CLIP vision gömüleri."
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "Referans görsel için CLIP vision gömüleri."
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk",
+        "tooltip": "Oluşturulan videodaki kare sayısı. WanDancer için 149 olarak kalmalıdır."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "Başlangıç görsel(ler)i için görsel koşullandırma maskesi. Beyaz korunur, siyah üretilir. Yerel üretimler için kullanılır."
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "start_image": {
+        "name": "başlangıç görseli",
+        "tooltip": "Kodlanacak ilk görsel(ler), herhangi bir kare sayısı olabilir."
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Boş latent."
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "WanİlkSonKaredenVideoya",
     "inputs": {
diff --git a/src/locales/zh-TW/commands.json b/src/locales/zh-TW/commands.json
index 8e7f9a8dad..0ccb227fba 100644
--- a/src/locales/zh-TW/commands.json
+++ b/src/locales/zh-TW/commands.json
@@ -294,7 +294,7 @@
     "label": "說明中心"
   },
   "Comfy_ToggleLinear": {
-    "label": "切換線性模式"
+    "label": "切換應用模式"
   },
   "Comfy_ToggleQPOV2": {
     "label": "切換佇列面板 V2"
@@ -312,7 +312,7 @@
     "label": "登出"
   },
   "Experimental_ToggleVueNodes": {
-    "label": "實驗性：啟用 Vue 節點"
+    "label": "啟用 Nodes 2.0"
   },
   "Workspace_CloseWorkflow": {
     "label": "關閉當前工作流程"
diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json
index c1fa7c826f..41a741b3ba 100644
--- a/src/locales/zh-TW/main.json
+++ b/src/locales/zh-TW/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "以及",
+      "backToGithubLogin": "改用 Github 註冊",
       "backToLogin": "返回登入",
       "backToSocialLogin": "改用 Google 或 Github 註冊",
       "confirmPasswordLabel": "確認密碼",
@@ -292,7 +293,9 @@
       "title": "需要重新驗證"
     },
     "signOut": {
+      "saveFailed": "由於儲存「{workflow}」失敗，已取消登出。",
       "signOut": "登出",
+      "signOutAnyway": "仍要登出",
       "success": "成功登出",
       "successDetail": "您已成功登出您的帳戶。",
       "unsavedChangesMessage": "您有尚未儲存的變更，登出後這些變更將會遺失。您確定要繼續嗎？",
@@ -461,6 +464,12 @@
       "wantToRun": "想要在本機運行 ComfyUI？"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "請選擇一個選項。",
+        "describeAnswer": "請描述您的答案。",
+        "selectAtLeastOne": "請至少選擇一個選項。"
+      },
+      "intro": "協助我們為您量身打造 ComfyUI 體驗。",
       "options": {
         "familiarity": {
           "advanced": "進階使用者（自訂工作流程）",
@@ -469,45 +478,43 @@
           "new": "ComfyUI 新手（從未使用過）",
           "starting": "剛開始（正在跟隨教學）"
         },
-        "industry": {
-          "architecture": "建築",
-          "education": "教育",
-          "film_tv_animation": "電影、電視與動畫",
-          "fine_art": "美術與插畫",
-          "gaming": "遊戲",
-          "marketing": "行銷與廣告",
+        "intent": {
+          "3d_game": "3D 素材／遊戲素材",
+          "api": "執行工作流程的 API 端點",
+          "apps": "由工作流程簡化的應用程式",
+          "audio": "音訊／音樂",
+          "custom_nodes": "自訂節點",
+          "images": "圖像",
+          "not_sure": "尚未確定",
+          "videos": "影片",
+          "workflows": "自訂工作流程或管線"
+        },
+        "source": {
+          "conference": "研討會或活動",
+          "discord": "Discord／社群",
+          "friend": "朋友或同事",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "電子報或部落格",
           "other": "其他",
-          "otherPlaceholder": "請具體說明",
-          "product_design": "產品與平面設計",
-          "software": "軟體與科技"
+          "reddit": "Reddit",
+          "search": "Google／搜尋引擎",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
         },
-        "making": {
-          "3d": "3D 資產",
-          "audio": "音訊 / 音樂",
-          "custom_nodes": "自訂節點與工作流程",
-          "images": "圖片",
-          "video": "影片與動畫"
-        },
-        "purpose": {
-          "client": "客戶工作（自由接案）",
-          "community": "社群貢獻（節點、工作流程等）",
-          "inhouse": "我的工作場所（公司內部）",
-          "personal": "個人專案／興趣",
-          "research": "學術研究"
+        "usage": {
+          "education": "教育用途（學生或教育者）",
+          "personal": "個人用途",
+          "work": "工作用途"
         }
       },
       "placeholder": "問卷問題佔位符",
-      "questions": {
-        "familiarity": "您對 ComfyUI 的熟悉程度如何？",
-        "industry": "您的主要行業是什麼？",
-        "making": "您計劃製作什麼？",
-        "purpose": "您主要會使用 ComfyUI 來做什麼？"
-      },
       "steps": {
         "familiarity": "您對 ComfyUI 的熟悉程度如何？",
-        "industry": "您的主要行業是什麼？",
-        "making": "您計劃製作什麼內容？",
-        "purpose": "您主要會使用 ComfyUI 來做什麼？"
+        "intent": "您想用 ComfyUI 創作什麼？",
+        "source": "您是從哪裡得知 ComfyUI 的？",
+        "usage": "您打算如何使用 ComfyUI？"
       },
       "title": "雲端問卷"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "數秒內開始創作",
   "cloudStart_wantToRun": "想要在本機運行 ComfyUI？",
   "cloudSurvey_steps_familiarity": "您對 ComfyUI 的熟悉程度如何？",
-  "cloudSurvey_steps_industry": "您的主要行業是什麼？",
-  "cloudSurvey_steps_making": "您計劃製作什麼？",
-  "cloudSurvey_steps_purpose": "您主要會使用 ComfyUI 做什麼？",
+  "cloudSurvey_steps_intent": "您想用 ComfyUI 創作什麼？",
+  "cloudSurvey_steps_source": "您是從哪裡得知 ComfyUI 的？",
+  "cloudSurvey_steps_usage": "您打算如何使用 ComfyUI？",
   "cloudWaitlist_contactLink": "此處",
   "cloudWaitlist_questionsText": "有問題？聯絡我們",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "音訊編碼器",
     "AUDIO_ENCODER_OUTPUT": "音訊編碼器輸出",
     "AUDIO_RECORD": "音訊錄製",
+    "BACKGROUND_REMOVAL": "去背",
     "BOOLEAN": "布林值",
     "BOUNDING_BOX": "邊界框",
     "CAMERA_CONTROL": "攝影機控制",
@@ -831,6 +839,7 @@
     "NOISE": "雜訊",
     "OPENAI_CHAT_CONFIG": "OpenAI聊天配置",
     "OPENAI_INPUT_FILES": "OpenAI輸入檔案",
+    "OPTICAL_FLOW": "OPTICAL_FLOW",
     "PHOTOMAKER": "PhotoMaker",
     "PIXVERSE_TEMPLATE": "PIXVERSE 範本",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -899,8 +908,8 @@
     "resume": "繼續下載"
   },
   "errorDialog": {
-    "accessRestrictedMessage": "Your account is not authorized for this feature.",
-    "accessRestrictedTitle": "Access Restricted",
+    "accessRestrictedMessage": "您的帳戶無權使用此功能。",
+    "accessRestrictedTitle": "存取受限",
     "defaultTitle": "發生錯誤",
     "extensionFileHint": "這可能是由於以下指令碼所致",
     "loadWorkflowTitle": "由於重新載入工作流程資料時發生錯誤，已中止載入",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "月谷馬雷",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "維度",
     "Wan": "Wan",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_for_testing",
     "advanced": "進階",
     "animation": "動畫",
-    "api": "API",
     "api node": "API 節點",
     "attention_experiments": "注意力實驗",
     "audio": "音訊",
+    "background removal": "去背",
     "batch": "批次",
-    "camera": "相機",
     "chroma_radiance": "色度光輝",
     "clip": "CLIP",
+    "color": "顏色",
     "combine": "合併",
     "compositing": "合成",
     "cond pair": "條件配對",
     "cond single": "單一條件",
     "conditioning": "條件設定",
-    "context": "上下文",
     "controlnet": "ControlNet",
     "create": "建立",
     "custom_sampling": "自訂取樣",
@@ -2302,6 +2308,7 @@
     "deprecated": "已棄用",
     "detection": "偵測",
     "edit_models": "編輯模型",
+    "experimental": "實驗性",
     "flux": "Flux",
     "gligen": "GLIGEN",
     "guidance": "引導",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "遮罩",
-    "math": "數學",
     "model": "模型",
     "model_merging": "模型合併",
     "model_patches": "模型修補",
@@ -2334,16 +2340,13 @@
     "save": "儲存",
     "schedulers": "排程器",
     "scheduling": "排程",
-    "sd": "SD",
     "sd3": "sd3",
     "shader": "著色器",
     "sigmas": "西格瑪值",
     "stable_cascade": "stable_cascade",
-    "string": "字串",
     "style_model": "風格模型",
     "supir": "supir",
     "text": "文字",
-    "textgen": "文字生成",
     "training": "訓練",
     "transform": "轉換",
     "unet": "UNet",
@@ -3147,6 +3150,7 @@
       "deleteFailedTitle": "刪除失敗",
       "deleted": "工作流程已刪除",
       "dirtyClose": "下列檔案已被修改。您要在關閉前儲存它們嗎？",
+      "dirtyCloseAnyway": "仍要關閉",
       "dirtyCloseHint": "按住 Shift 可直接關閉不提示",
       "dirtyCloseTitle": "儲存變更？",
       "workflowTreeType": {
diff --git a/src/locales/zh-TW/nodeDefs.json b/src/locales/zh-TW/nodeDefs.json
index 6ee4c1cf39..950995d469 100644
--- a/src/locales/zh-TW/nodeDefs.json
+++ b/src/locales/zh-TW/nodeDefs.json
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "起始圖像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "新增雜訊",
     "inputs": {
@@ -371,7 +405,7 @@
   },
   "BriaImageEditNode": {
     "description": "使用 Bria 最新模型編輯圖像",
-    "display_name": "Bria 圖像編輯",
+    "display_name": "Bria FIBO 圖像編輯",
     "inputs": {
       "control_after_generate": {
         "name": "生成後控制"
@@ -864,7 +898,7 @@
   },
   "ByteDanceSeedreamNode": {
     "description": "統一文字生成圖片和精確單句編輯，最高支援 4K 解析度。",
-    "display_name": "字節跳動 Seedream 4",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
     "inputs": {
       "control_after_generate": {
         "name": "生成後控制"
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "統一的文字轉圖與精確單句編輯，最高支援 4K 解析度。",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_fail_on_partial": {
+        "name": "部分失敗時終止"
+      },
+      "model_height": {
+        "name": "高度"
+      },
+      "model_max_images": {
+        "name": "最大圖像數"
+      },
+      "model_size_preset": {
+        "name": "尺寸預設"
+      },
+      "model_width": {
+        "name": "寬度"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "用於創建或編輯圖像的文字提示。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "用於生成的隨機種子。"
+      },
+      "watermark": {
+        "name": "浮水印",
+        "tooltip": "是否在圖像上添加「AI 生成」浮水印。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "透過 API 使用字節跳動模型根據提示生成影片",
     "display_name": "字節跳動文字轉影片",
@@ -1047,7 +1125,7 @@
     }
   },
   "CLIPLoader": {
-    "description": "[配方]\n\nstable_diffusion: clip-l\nstable_cascade: clip-g\nsd3: t5 xxl/ clip-g / clip-l\nstable_audio: t5 base\nmochi: t5 xxl\ncosmos: 舊 t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\nhidream: llama-3.1（推薦）或 t5",
+    "description": "[配方]\n\nstable_diffusion: clip-l\nstable_cascade: clip-g\nsd3: t5 xxl/ clip-g / clip-l\nstable_audio: t5 base\nmochi: t5 xxl\ncosmos: 舊 t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\nhidream: llama-3.1（推薦）或 t5\nomnigen2: qwen vl 2.5 3B",
     "display_name": "載入 CLIP",
     "inputs": {
       "clip_name": {
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "BOOL",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "手動設定上下文視窗。",
     "display_name": "上下文視窗（手動）",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "是否為非0索引的 context window 添加因果修正框架。"
+      },
       "closed_loop": {
         "name": "閉環",
         "tooltip": "是否關閉上下文窗口循環；僅適用於循環排程。"
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 Latent Audio",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "HiDream-O1-Image 的空像素潛空間。該模型於約 4 百萬像素下訓練；較低解析度會偏離分布且品質明顯下降。訓練解析度：2048x2048、2304x1728、1728x2304、2560x1440、1440x2560、2496x1664、1664x2496、3104x1312、1312x3104、2304x1792、1792x2304。",
+    "display_name": "Empty HiDream-O1 潛空間圖像",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "透過 Flux.2 [pro] 或 Flux.2 [max]，根據提示詞與可選參考圖像生成圖像。",
+    "display_name": "Flux.2 圖像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_height": {
+        "name": "高度"
+      },
+      "model_width": {
+        "name": "寬度"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "用於圖像生成或編輯的提示詞"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "用於產生雜訊的隨機種子。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "根據提示詞與解析度同步生成圖像。",
     "display_name": "Flux.2 [max] 圖像",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "透過 Google Vertex API 同步生成或編輯影像。",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_aspect_ratio": {
+        "name": "長寬比"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "model_thinking_level": {
+        "name": "思考層級"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述要生成影像或要套用編輯的文字提示。請包含模型應遵循的任何限制、風格或細節。"
+      },
+      "response_modalities": {
+        "name": "回應型態"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "當種子值固定時，模型會盡力在重複請求時提供相同的回應，但不保證完全一致。更改模型或參數（如溫度）即使使用相同種子值，也可能導致回應有所不同。預設情況下會使用隨機種子值。"
+      },
+      "system_prompt": {
+        "name": "系統提示",
+        "tooltip": "決定 AI 行為的基礎指令。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "思考影像",
+        "tooltip": "模型思考過程中的第一張影像。僅於思考層級為 HIGH 且回應型態為 IMAGE+TEXT 時提供。"
+      }
+    }
+  },
   "GeminiNode": {
     "description": "使用 Google 的 Gemini AI 模型生成文字回應。您可以提供多種類型的輸入（文字、圖片、音訊、影片）作為上下文，以生成更相關且有意義的回應。",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "根據文字提示修改現有圖像",
+    "display_name": "Grok 圖像編輯",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_aspect_ratio": {
+        "name": "長寬比"
+      },
+      "model_number_of_images": {
+        "name": "圖像數量"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "用於生成圖像的文字提示"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "決定節點是否重新執行的種子；實際結果無論種子如何皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "根據文字提示使用 Grok 生成圖像",
     "display_name": "Grok 圖像",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "在取樣後期，於多個偏移的區塊網格位置平均模型輸出。可消除接縫。",
+    "display_name": "HiDream-O1 區塊接縫平滑",
+    "inputs": {
+      "blend": {
+        "name": "混合方式",
+        "tooltip": "average：等權重平均。window：Hann 窗加權，偏重遠離區塊邊界。median：逐像素中位數，排除環繞異常通過。"
+      },
+      "end_percent": {
+        "name": "結束百分比",
+        "tooltip": "混合關閉時的取樣進度。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "passes": {
+        "name": "通過次數",
+        "tooltip": "每個閘控步驟的通過次數。2/4 = 固定。ramp_*：通過次數隨取樣接近結束而增加（接縫最明顯處加強平滑）。"
+      },
+      "pattern": {
+        "name": "模式",
+        "tooltip": "偏移佈局。single_shift：一次自然區塊網格 + 其他偏移。symmetric：全部偏移，對稱分布於原點。"
+      },
+      "start_percent": {
+        "name": "起始百分比",
+        "tooltip": "混合啟動時的取樣進度（0=開始，1=結束）。"
+      },
+      "strength": {
+        "name": "強度",
+        "tooltip": "在自然網格預測（0）與平均結果（1）間插值。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "附加 1-10 張參考圖像於條件設定，一張用於編輯指令，多張用於主題個人化。",
+    "display_name": "HiDream-O1 參考圖像",
+    "inputs": {
+      "images": {
+        "name": "參考圖像",
+        "tooltip": "參考圖像。1 張 = 編輯指令；2-10 張 = 多重參考。"
+      },
+      "negative": {
+        "name": "負向"
+      },
+      "positive": {
+        "name": "正向"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "負向",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "將低解析度影像升級為超高解析度，消除雜訊與失真。最大輸出：32 百萬像素。",
     "display_name": "HitPaw 通用影像增強",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "載入背景移除模型",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "bg_removal_name",
+        "tooltip": "用於從圖像中移除背景的模型"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "載入圖片",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "使用 Luma UNI-1 模型，透過文字提示編輯現有圖像。",
+    "display_name": "Luma UNI-1 圖像編輯",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於編輯的模型。"
+      },
+      "model_style": {
+        "name": "風格"
+      },
+      "model_web_search": {
+        "name": "網路搜尋"
+      },
+      "prompt": {
+        "name": "提示",
+        "tooltip": "期望編輯的描述。1–6000 字元。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制此節點是否重新執行；無論種子如何，結果皆為非確定性。"
+      },
+      "source": {
+        "name": "來源",
+        "tooltip": "要編輯的來源圖像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "根據提示詞與長寬比同步修改影像。",
     "display_name": "Luma 影像轉換",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "使用 Luma UNI-1 模型，根據文字生成圖像。",
+    "display_name": "Luma UNI-1 圖像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於生成的模型。"
+      },
+      "model_aspect_ratio": {
+        "name": "長寬比"
+      },
+      "model_style": {
+        "name": "風格"
+      },
+      "model_web_search": {
+        "name": "網路搜尋"
+      },
+      "prompt": {
+        "name": "提示",
+        "tooltip": "期望圖像的文字描述。1–6000 字元。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制此節點是否重新執行；無論種子如何，結果皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "根據提示詞、輸入圖片與輸出尺寸同步產生影片。",
     "display_name": "Luma 圖像轉影片",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "模型雜訊尺度",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      },
+      "noise_scale": {
+        "name": "雜訊尺度",
+        "tooltip": "絕對訓練雜訊尺度。例如 HiDream-O1 base：8.0，dev：7.5。"
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "模型修補載入器",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Moonvalley Marey 圖像轉影片節點",
-    "display_name": "Moonvalley Marey 圖像轉影片",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成後控制"
-      },
-      "image": {
-        "name": "圖像",
-        "tooltip": "用於生成影片的參考圖像"
-      },
-      "negative_prompt": {
-        "name": "負向提示詞",
-        "tooltip": "負向提示詞文字"
-      },
-      "prompt": {
-        "name": "提示詞"
-      },
-      "prompt_adherence": {
-        "name": "提示詞遵循度",
-        "tooltip": "生成控制的引導尺度"
-      },
-      "resolution": {
-        "name": "解析度",
-        "tooltip": "輸出影片的解析度"
-      },
-      "seed": {
-        "name": "種子值",
-        "tooltip": "隨機種子值"
-      },
-      "steps": {
-        "name": "步數",
-        "tooltip": "去噪步數"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey 文字轉影片",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成後控制"
-      },
-      "negative_prompt": {
-        "name": "負向提示詞",
-        "tooltip": "負向提示詞文字"
-      },
-      "prompt": {
-        "name": "提示詞"
-      },
-      "prompt_adherence": {
-        "name": "提示詞遵循度",
-        "tooltip": "生成控制的引導尺度"
-      },
-      "resolution": {
-        "name": "解析度",
-        "tooltip": "輸出影片的解析度"
-      },
-      "seed": {
-        "name": "種子值",
-        "tooltip": "隨機種子值"
-      },
-      "steps": {
-        "name": "步數",
-        "tooltip": "推理步數"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey 影片轉影片",
-    "inputs": {
-      "control_type": {
-        "name": "控制類型"
-      },
-      "motion_intensity": {
-        "name": "motion_intensity",
-        "tooltip": "僅在 control_type 為 'Motion Transfer' 時使用"
-      },
-      "negative_prompt": {
-        "name": "負向提示詞",
-        "tooltip": "負向提示詞文字"
-      },
-      "prompt": {
-        "name": "提示詞",
-        "tooltip": "描述要生成的影片"
-      },
-      "seed": {
-        "name": "種子值",
-        "tooltip": "隨機種子值"
-      },
-      "steps": {
-        "name": "步數",
-        "tooltip": "推理步數"
-      },
-      "video": {
-        "name": "影片",
-        "tooltip": "用於生成輸出影片的參考影片。必須至少5秒長。超過5秒的影片將自動修剪。僅支援MP4格式。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "ImageMorphology",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "透過 OpenAI 的 GPT Image 1 端點同步產生影像。",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "透過 OpenAI 的 GPT Image 2 端點同步產生影像。",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "背景",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "提示詞",
-        "tooltip": "用於 GPT Image 1 的文字提示"
+        "tooltip": "用於 GPT Image 2 的文字提示"
       },
       "quality": {
         "name": "品質",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "透過 OpenAI 的 GPT Image 端點生成圖像。",
+    "display_name": "OpenAI GPT 圖像 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_background": {
+        "name": "背景"
+      },
+      "model_custom_height": {
+        "name": "自訂高度"
+      },
+      "model_custom_width": {
+        "name": "自訂寬度"
+      },
+      "model_quality": {
+        "name": "品質"
+      },
+      "model_size": {
+        "name": "尺寸"
+      },
+      "n": {
+        "name": "數量",
+        "tooltip": "要生成多少張圖像"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "GPT Image 的文字提示"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "後端尚未實作"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "載入並準備輸入文件（文字、pdf 等）以作為 OpenAI 聊天節點的輸入。生成回應時，OpenAI 模型將讀取這些文件。🛈 提示：可以與其他 OpenAI 輸入文件節點鏈接使用。",
     "display_name": "OpenAI ChatGPT 輸入文件",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "載入光流模型",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "要載入的光流模型。檔案必須放在 'optical_flow' 資料夾。目前僅支援 torchvision 的 raft_large.pth。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "最佳步數排程器",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "整數",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "生成後控制"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "移除背景",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "bg_removal_model",
+        "tooltip": "用於產生 mask 的背景移除模型"
+      },
+      "image": {
+        "name": "圖像",
+        "tooltip": "要移除背景的輸入圖像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "產生的前景 mask"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "Sampler AR 視訊",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "每區塊影格數",
+        "tooltip": "每個自回歸區塊的影格數。1 = 逐影格，3 = 區塊方式。必須與 checkpoint 的訓練模式相符。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "SamplerCustom",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "具有可調整每步雜訊的 LCM 取樣器。s_noise 是模型訓練雜訊尺度的乘數",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "將每步雜訊限制在 ±N*std。設為 0 則停用。"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "第一步的每步雜訊乘數（1.0 = 與訓練相符）。"
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "最後一步的每步雜訊乘數。若與 s_noise 相同則為固定排程。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "SamplerLCMUpscale",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "音訊"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "若模型有內建系統提示/模板則使用。"
+      },
+      "video": {
+        "name": "影片",
+        "tooltip": "影片幀作為圖像批次。預設為 24 FPS；內部會降採樣為 1 FPS。"
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "音訊"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "若模型有內建系統提示/模板則使用。"
+      },
+      "video": {
+        "name": "影片",
+        "tooltip": "影片幀作為圖像批次。預設為 24 FPS；內部會降採樣為 1 FPS。"
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "以強大的升頻與修復技術為影片注入新生命。",
+    "display_name": "Topaz 影片增強",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "動態壓縮等級",
+        "tooltip": "CQP 等級。"
+      },
+      "interpolation_model": {
+        "name": "插值模型"
+      },
+      "upscaler_model": {
+        "name": "升頻模型"
+      },
+      "upscaler_model_creativity": {
+        "name": "創意"
+      },
+      "upscaler_model_prompt": {
+        "name": "提示詞"
+      },
+      "upscaler_model_realism": {
+        "name": "寫實度"
+      },
+      "upscaler_model_sharp": {
+        "name": "銳利度"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "升頻解析度"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torch 編譯模型",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "pbr"
       },
       "quad": {
-        "name": "quad"
+        "name": "quad",
+        "tooltip": "此參數已棄用，無任何作用。"
       },
       "texture": {
         "name": "texture"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "要處理的像素影格數量。對於 CogVideoX-Fun-V1.5（patch_size_t=2），latent_t 必須為偶數——產生奇數 latent_t 的長度會向下取整（例如 49 → 45）。"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "來自 VOIDQuadmaskPreprocess 的預處理 quadmask [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "來源影片影格 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "主要遮罩區域的膨脹半徑（0 = 不膨脹）"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "像素影格數量。為符合 patch_size_t=2 的需求，會向下取整使 latent_t 為偶數，例如 49 → 45。"
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "來自 OpticalFlowLoader（RAFT-large）的光流模型。"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Pass 1 輸出影片影格 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "來自 VOIDWarpedNoise 的扭曲雜訊 latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VP 調度器",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_inject_scale": {
+        "name": "audio_inject_scale",
+        "tooltip": "將音訊特徵注入到影片模型時的縮放比例。"
+      },
+      "video_frames": {
+        "name": "video_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio_encoder_output",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps_string",
+        "tooltip": "根據音訊長度與影片影格數計算出的 fps，會用於提示詞中。"
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "用於計算總輸出影格數並擷取片段音訊的音訊。"
+      },
+      "images": {
+        "name": "images"
+      },
+      "segment_index": {
+        "name": "segment_index",
+        "tooltip": "這是第幾個片段（第一個為 0，第二個為 1，以此類推）"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "此片段的長度（通常為 149 影格）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "已補齊的關鍵影格序列"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "標示有效影格的 mask"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "此影片片段對應的音訊片段"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "要為每個輸出片段切割的音訊。"
+      },
+      "images": {
+        "name": "images"
+      },
+      "num_segments": {
+        "name": "num_segments",
+        "tooltip": "要以清單形式輸出的補齊片段數量。"
+      },
+      "segment_length": {
+        "name": "segment_length",
+        "tooltip": "每個片段的長度（通常為 149 影格）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keyframes_sequence",
+        "tooltip": "已補齊的關鍵影格序列"
+      },
+      "1": {
+        "name": "keyframes_mask",
+        "tooltip": "標示有效影格的 mask"
+      },
+      "2": {
+        "name": "audio_segment",
+        "tooltip": "每個影片片段對應的音訊片段"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "audio_encoder_output"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output",
+        "tooltip": "第一幀的 CLIP 視覺嵌入。"
+      },
+      "clip_vision_output_ref": {
+        "name": "clip_vision_output_ref",
+        "tooltip": "參考圖像的 CLIP 視覺嵌入。"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度",
+        "tooltip": "生成影片的幀數。對於 WanDancer，應保持 149。"
+      },
+      "mask": {
+        "name": "遮罩",
+        "tooltip": "起始圖像的圖像處理遮罩。白色保留，黑色生成。用於局部生成。"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "起始圖像",
+        "tooltip": "要編碼的初始圖像，可為任意幀數。"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "空的 latent。"
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "Wan 首尾影格轉影片",
     "inputs": {
diff --git a/src/locales/zh-TW/settings.json b/src/locales/zh-TW/settings.json
index eb734abe60..21b4567f2f 100644
--- a/src/locales/zh-TW/settings.json
+++ b/src/locales/zh-TW/settings.json
@@ -428,11 +428,11 @@
     "name": "驗證工作流程"
   },
   "Comfy_VueNodes_AutoScaleLayout": {
-    "name": "自動縮放佈局 (Vue 節點)",
+    "name": "自動縮放佈局 (Nodes 2.0)",
     "tooltip": "切換至 Vue 渲染時自動縮放節點位置以防止重疊"
   },
   "Comfy_VueNodes_Enabled": {
-    "name": "現代節點設計 (Vue 節點)",
+    "name": "現代節點設計 (Nodes 2.0)",
     "tooltip": "現代：基於 DOM 的渲染，具備增強的互動性、原生瀏覽器功能和更新的視覺設計。經典：傳統畫布渲染。"
   },
   "Comfy_WidgetControlMode": {
diff --git a/src/locales/zh/commands.json b/src/locales/zh/commands.json
index 2b35705ed6..d9e71ed898 100644
--- a/src/locales/zh/commands.json
+++ b/src/locales/zh/commands.json
@@ -294,7 +294,7 @@
     "label": "说明中心"
   },
   "Comfy_ToggleLinear": {
-    "label": "切换线性模式"
+    "label": "切换应用模式"
   },
   "Comfy_ToggleQPOV2": {
     "label": "切换队列面板V2"
@@ -312,7 +312,7 @@
     "label": "退出登录"
   },
   "Experimental_ToggleVueNodes": {
-    "label": "实验性：启用 Vue 节点"
+    "label": "启用 Nodes 2.0"
   },
   "Workspace_CloseWorkflow": {
     "label": "关闭当前工作流"
diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json
index c3cc54282d..6a580f0ee2 100644
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -237,6 +237,7 @@
     },
     "login": {
       "andText": "和",
+      "backToGithubLogin": "改用 Github 注册",
       "backToLogin": "返回登录",
       "backToSocialLogin": "改用 Google 或 Github 注册",
       "confirmPasswordLabel": "确认密码",
@@ -292,7 +293,9 @@
       "title": "需要重新认证"
     },
     "signOut": {
+      "saveFailed": "由于保存“{workflow}”失败，已取消退出登录。",
       "signOut": "退出登录",
+      "signOutAnyway": "仍然退出登录",
       "success": "成功退出登录",
       "successDetail": "您已成功退出账户。",
       "unsavedChangesMessage": "您有未保存的更改，注销后这些更改将会丢失。是否继续？",
@@ -461,6 +464,12 @@
       "wantToRun": "想在本机运行 ComfyUI 吗？"
     },
     "survey": {
+      "errors": {
+        "chooseAnOption": "请选择一个选项。",
+        "describeAnswer": "请描述您的答案。",
+        "selectAtLeastOne": "请至少选择一个选项。"
+      },
+      "intro": "帮助我们为您定制 ComfyUI 体验。",
       "options": {
         "familiarity": {
           "advanced": "高级用户（自定义工作流）",
@@ -469,45 +478,43 @@
           "new": "ComfyUI 新手（从未使用过）",
           "starting": "刚刚开始（正在学习教程）"
         },
-        "industry": {
-          "architecture": "架构",
-          "education": "教育",
-          "film_tv_animation": "电影、电视与动画",
-          "fine_art": "美术与插画",
-          "gaming": "游戏",
-          "marketing": "营销与广告",
-          "other": "其他",
-          "otherPlaceholder": "请指定",
-          "product_design": "产品与平面设计",
-          "software": "软件与技术"
-        },
-        "making": {
-          "3d": "3D 资产",
+        "intent": {
+          "3d_game": "3D 资产 / 游戏资产",
+          "api": "运行工作流的 API 端点",
+          "apps": "基于工作流的简化应用",
           "audio": "音频 / 音乐",
-          "custom_nodes": "自定义节点和工作流",
-          "images": "图片",
-          "video": "视频与动画"
+          "custom_nodes": "自定义节点",
+          "images": "图像",
+          "not_sure": "不确定",
+          "videos": "视频",
+          "workflows": "自定义工作流或流程"
         },
-        "purpose": {
-          "client": "客户工作（自由职业）",
-          "community": "社区贡献（节点、工作流等）",
-          "inhouse": "我自己的工作场所（内部）",
-          "personal": "个人项目 / 爱好",
-          "research": "学术研究"
+        "source": {
+          "conference": "会议或活动",
+          "discord": "Discord / 社区",
+          "friend": "朋友或同事",
+          "github": "GitHub",
+          "instagram": "Instagram",
+          "linkedin": "LinkedIn",
+          "newsletter": "新闻通讯或博客",
+          "other": "其他",
+          "reddit": "Reddit",
+          "search": "Google / 搜索",
+          "twitter": "Twitter / X",
+          "youtube": "YouTube"
+        },
+        "usage": {
+          "education": "教育（学生或教师）",
+          "personal": "个人使用",
+          "work": "工作"
         }
       },
       "placeholder": "调查问题占位符",
-      "questions": {
-        "familiarity": "你对 ComfyUI 有多熟悉？",
-        "industry": "您的主要行业是什么？",
-        "making": "你打算做什么？",
-        "purpose": "您主要将使用 ComfyUI 做什么？"
-      },
       "steps": {
         "familiarity": "你对 ComfyUI 有多熟悉？",
-        "industry": "您的主要行业是什么？",
-        "making": "你打算做什么？",
-        "purpose": "您将主要使用 ComfyUI 做什么？"
+        "intent": "您希望用 ComfyUI 创作什么？",
+        "source": "您是从哪里了解到 ComfyUI 的？",
+        "usage": "您打算如何使用 ComfyUI？"
       },
       "title": "云调研"
     }
@@ -522,9 +529,9 @@
   "cloudStart_title": "几秒钟内开始创作",
   "cloudStart_wantToRun": "想在本地运行 ComfyUI 吗？",
   "cloudSurvey_steps_familiarity": "你对 ComfyUI 有多熟悉？",
-  "cloudSurvey_steps_industry": "您的主要行业是什么？",
-  "cloudSurvey_steps_making": "你打算做什么？",
-  "cloudSurvey_steps_purpose": "您将主要使用 ComfyUI 做什么？",
+  "cloudSurvey_steps_intent": "您希望用 ComfyUI 创作什么？",
+  "cloudSurvey_steps_source": "您是从哪里了解到 ComfyUI 的？",
+  "cloudSurvey_steps_usage": "您打算如何使用 ComfyUI？",
   "cloudWaitlist_contactLink": "这里",
   "cloudWaitlist_questionsText": "有问题？联系我们",
   "color": {
@@ -778,6 +785,7 @@
     "AUDIO_ENCODER": "音频编码器",
     "AUDIO_ENCODER_OUTPUT": "音频编码器输出",
     "AUDIO_RECORD": "音频录制",
+    "BACKGROUND_REMOVAL": "背景移除",
     "BOOLEAN": "布尔",
     "BOUNDING_BOX": "边界框",
     "CAMERA_CONTROL": "相机控制",
@@ -831,6 +839,7 @@
     "NOISE": "噪波",
     "OPENAI_CHAT_CONFIG": "OpenAI对话文件",
     "OPENAI_INPUT_FILES": "OpenAI输入文件",
+    "OPTICAL_FLOW": "光流",
     "PHOTOMAKER": "PhotoMaker",
     "PIXVERSE_TEMPLATE": "Pixverse 模板",
     "POSE_KEYPOINT": "POSE_KEYPOINT",
@@ -899,8 +908,8 @@
     "resume": "恢复下载"
   },
   "errorDialog": {
-    "accessRestrictedMessage": "Your account is not authorized for this feature.",
-    "accessRestrictedTitle": "Access Restricted",
+    "accessRestrictedMessage": "您的账户无权使用此功能。",
+    "accessRestrictedTitle": "访问受限",
     "defaultTitle": "发生错误",
     "extensionFileHint": "这可能是由于以下脚本",
     "loadWorkflowTitle": "由于重新加载工作流数据出错，加载被中止",
@@ -2259,7 +2268,6 @@
     "Magnific": "Magnific",
     "Meshy": "Meshy",
     "MiniMax": "MiniMax",
-    "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
     "PixVerse": "PixVerse",
     "Quiver": "Quiver",
@@ -2277,23 +2285,21 @@
     "Vidu": "Vidu",
     "Wan": "Wan万相",
     "WaveSpeed": "WaveSpeed",
-    "_for_testing": "_用于测试",
     "advanced": "高级",
     "animation": "动画",
-    "api": "API",
     "api node": "api 节点",
     "attention_experiments": "注意力实验",
     "audio": "音频",
+    "background removal": "背景移除",
     "batch": "批处理",
-    "camera": "相机",
     "chroma_radiance": "chroma_radiance",
     "clip": "CLIP",
+    "color": "颜色",
     "combine": "组合",
     "compositing": "合成",
     "cond pair": "条件对",
     "cond single": "条件单",
     "conditioning": "条件",
-    "context": "上下文",
     "controlnet": "ControlNet",
     "create": "创建",
     "custom_sampling": "自定义采样",
@@ -2302,6 +2308,7 @@
     "deprecated": "已弃用",
     "detection": "检测",
     "edit_models": "编辑模型",
+    "experimental": "实验性",
     "flux": "Flux",
     "gligen": "GLIGEN",
     "guidance": "引导",
@@ -2317,7 +2324,6 @@
     "lotus": "lotus",
     "ltxv": "LTXV",
     "mask": "遮罩",
-    "math": "数学",
     "model": "模型",
     "model_merging": "模型合并",
     "model_patches": "模型微调",
@@ -2334,16 +2340,13 @@
     "save": "保存",
     "schedulers": "调度器",
     "scheduling": "调度",
-    "sd": "sd",
     "sd3": "SD3",
     "shader": "shader",
     "sigmas": "Sigmas",
     "stable_cascade": "StableCascade",
-    "string": "字符串",
     "style_model": "风格模型",
     "supir": "supir",
     "text": "文本",
-    "textgen": "textgen",
     "training": "训练",
     "transform": "变换",
     "unet": "U-Net",
@@ -3159,6 +3162,7 @@
       "deleteFailedTitle": "删除失败",
       "deleted": "工作流已删除",
       "dirtyClose": "以下文件已被更改。您想在关闭之前保存它们吗？",
+      "dirtyCloseAnyway": "仍然关闭",
       "dirtyCloseHint": "按住 Shift 关闭而不提示",
       "dirtyCloseTitle": "保存更改？",
       "workflowTreeType": {
diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json
index fee872aa56..a9683db499 100644
--- a/src/locales/zh/nodeDefs.json
+++ b/src/locales/zh/nodeDefs.json
@@ -3,7 +3,7 @@
     "display_name": "自适应投影引导",
     "inputs": {
       "eta": {
-        "name": "预计到达时间",
+        "name": "eta",
         "tooltip": "控制平行引导向量的缩放比例。默认 CFG 行为设置为 1。"
       },
       "model": {
@@ -24,6 +24,40 @@
       }
     }
   },
+  "ARVideoI2V": {
+    "display_name": "ARVideoI2V",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "长度"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "start_image": {
+        "name": "起始图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "添加噪波",
     "inputs": {
@@ -371,7 +405,7 @@
   },
   "BriaImageEditNode": {
     "description": "使用 Bria 最新模型编辑图像",
-    "display_name": "Bria 图像编辑",
+    "display_name": "Bria FIBO 图像编辑",
     "inputs": {
       "control_after_generate": {
         "name": "control after generate"
@@ -864,7 +898,7 @@
   },
   "ByteDanceSeedreamNode": {
     "description": "统一文本到图像生成，支持高达4K分辨率的精确单句编辑。",
-    "display_name": "字节跳动Seedream 4",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
     "inputs": {
       "control_after_generate": {
         "name": "生成后控制"
@@ -919,6 +953,50 @@
       }
     }
   },
+  "ByteDanceSeedreamNodeV2": {
+    "description": "统一的文本生成图像与精确的单句编辑，最高支持4K分辨率。",
+    "display_name": "ByteDance Seedream 4.5 & 5.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_fail_on_partial": {
+        "name": "部分失败时终止"
+      },
+      "model_height": {
+        "name": "高度"
+      },
+      "model_max_images": {
+        "name": "最大图像数"
+      },
+      "model_size_preset": {
+        "name": "尺寸预设"
+      },
+      "model_width": {
+        "name": "宽度"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于创建或编辑图像的文本提示。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成的种子。"
+      },
+      "watermark": {
+        "name": "水印",
+        "tooltip": "是否在图像上添加“AI生成”水印。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceTextToVideoNode": {
     "description": "通过API基于提示使用字节跳动模型生成视频",
     "display_name": "字节跳动文生视频",
@@ -1047,7 +1125,7 @@
     }
   },
   "CLIPLoader": {
-    "description": "[配方]\n\nStable Diffusion：clip-l\nStable Cascade：clip-g\nSD3：t5 / clip-g / clip-l\nStable Audio：t5\nMochi：t5\ncosmos：old t5 xxl",
+    "description": "[配方]\n\nstable_diffusion: clip-l\nstable_cascade: clip-g\nsd3: t5 xxl/ clip-g / clip-l\nstable_audio: t5 base\nmochi: t5 xxl\ncosmos: 旧 t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\nhidream: llama-3.1（推荐）或 t5\nomnigen2: qwen vl 2.5 3B",
     "display_name": "加载CLIP",
     "inputs": {
       "clip_name": {
@@ -1655,6 +1733,10 @@
       },
       "1": {
         "tooltip": null
+      },
+      "2": {
+        "name": "布尔值",
+        "tooltip": null
       }
     }
   },
@@ -1968,6 +2050,10 @@
     "description": "手动设置上下文窗口。",
     "display_name": "上下文窗口（手动）",
     "inputs": {
+      "causal_window_fix": {
+        "name": "causal_window_fix",
+        "tooltip": "是否为非0索引的上下文窗口添加因果修正帧。"
+      },
       "closed_loop": {
         "name": "闭环",
         "tooltip": "是否闭合上下文窗口循环；仅适用于循环调度。"
@@ -2932,6 +3018,28 @@
       }
     }
   },
+  "EmptyARVideoLatent": {
+    "display_name": "EmptyARVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStep1_5LatentAudio": {
     "display_name": "Empty Ace Step 1.5 潜空间音频",
     "inputs": {
@@ -3048,6 +3156,26 @@
       }
     }
   },
+  "EmptyHiDreamO1LatentImage": {
+    "description": "HiDream-O1-Image 的空像素空间潜空间。该模型在约 400 万像素下训练；分辨率过低会导致分布偏移，质量明显下降。训练分辨率：2048x2048、2304x1728、1728x2304、2560x1440、1440x2560、2496x1664、1664x2496、3104x1312、1312x3104、2304x1792、1792x2304。",
+    "display_name": "空 HiDream-O1 潜空间图像",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "空Latent图像（Hunyuan）",
     "inputs": {
@@ -3368,6 +3496,37 @@
       }
     }
   },
+  "Flux2ImageNode": {
+    "description": "通过Flux.2 [pro]或Flux.2 [max]，根据提示词和可选参考图像生成图像。",
+    "display_name": "Flux.2 图像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_height": {
+        "name": "高度"
+      },
+      "model_width": {
+        "name": "宽度"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成或编辑的提示词"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成噪声的随机种子。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Flux2MaxImageNode": {
     "description": "根据提示词和分辨率同步生成图像。",
     "display_name": "Flux.2 [max] 图像",
@@ -4145,6 +4304,54 @@
       }
     }
   },
+  "GeminiNanoBanana2V2": {
+    "description": "通过 Google Vertex API 同步生成或编辑图像。",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "model_thinking_level": {
+        "name": "thinking_level"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "描述要生成图像或要应用编辑的文本提示。请包含模型应遵循的任何约束、风格或细节。"
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "当 seed 固定为特定值时，模型会尽力为重复请求提供相同的响应，但不保证输出完全一致。此外，即使使用相同的 seed，修改模型或参数设置（如 temperature）也可能导致响应变化。默认情况下，使用随机 seed 值。"
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "决定 AI 行为的基础性指令。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      },
+      "2": {
+        "name": "thought_image",
+        "tooltip": "模型思考过程中的第一张图像。仅在 thinking_level 设为 HIGH 且 response_modalities 为 IMAGE+TEXT 时可用。"
+      }
+    }
+  },
   "GeminiNode": {
     "description": "使用 Google 的 Gemini AI 模型生成文本响应。您可以提供多种类型的输入（文本、图像、音频、视频）作为上下文，以生成更相关和有意义的响应。",
     "display_name": "Google Gemini",
@@ -4343,6 +4550,40 @@
       }
     }
   },
+  "GrokImageEditNodeV2": {
+    "description": "根据文本提示修改已有图像",
+    "display_name": "Grok 图像编辑",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_aspect_ratio": {
+        "name": "宽高比"
+      },
+      "model_number_of_images": {
+        "name": "图像数量"
+      },
+      "model_resolution": {
+        "name": "分辨率"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成图像的文本提示"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrokImageNode": {
     "description": "使用 Grok 根据文本提示生成图像",
     "display_name": "Grok 图像",
@@ -4684,6 +4925,70 @@
       }
     }
   },
+  "HiDreamO1PatchSeamSmoothing": {
+    "description": "在采样后期，将模型输出在多个偏移补丁网格位置上取平均。消除缝隙。",
+    "display_name": "HiDream-O1 补丁缝隙平滑",
+    "inputs": {
+      "blend": {
+        "name": "混合方式",
+        "tooltip": "average：等权重平均。window：Hann 窗加权，远离补丁边界权重更高。median：逐像素中值，剔除环绕异常遍数。"
+      },
+      "end_percent": {
+        "name": "结束百分比",
+        "tooltip": "混合关闭时的采样进度。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "passes": {
+        "name": "遍数",
+        "tooltip": "每步的遍数。2/4 = 固定。ramp_*：采样接近结束时遍数增加（缝隙最明显处更多平滑）。"
+      },
+      "pattern": {
+        "name": "模式",
+        "tooltip": "偏移布局。single_shift：一次自然补丁网格+其他偏移。symmetric：全部偏移，偏移围绕原点对称分布。"
+      },
+      "start_percent": {
+        "name": "起始百分比",
+        "tooltip": "混合开启时的采样进度（0=开始，1=结束）。"
+      },
+      "strength": {
+        "name": "强度",
+        "tooltip": "在自然网格预测（0）与平均结果（1）之间插值。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HiDreamO1ReferenceImages": {
+    "description": "为条件添加 1-10 张参考图像，一张用于编辑指令，多张用于主体个性化。",
+    "display_name": "HiDream-O1 参考图像",
+    "inputs": {
+      "images": {
+        "name": "参考图像",
+        "tooltip": "参考图像。1 张 = 指令编辑；2-10 张 = 多参考。"
+      },
+      "negative": {
+        "name": "负向"
+      },
+      "positive": {
+        "name": "正向"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负向",
+        "tooltip": null
+      }
+    }
+  },
   "HitPawGeneralImageEnhance": {
     "description": "将低分辨率图像放大至超分辨率，消除伪影和噪点。最大输出：3200万像素。",
     "display_name": "HitPaw 通用图像增强",
@@ -7937,6 +8242,21 @@
       }
     }
   },
+  "LoadBackgroundRemovalModel": {
+    "display_name": "加载背景移除模型",
+    "inputs": {
+      "bg_removal_name": {
+        "name": "背景移除模型名称",
+        "tooltip": "用于从图像中移除背景的模型"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bg_model",
+        "tooltip": null
+      }
+    }
+  },
   "LoadImage": {
     "display_name": "加载图像",
     "inputs": {
@@ -8327,6 +8647,42 @@
       }
     }
   },
+  "LumaImageEditNode2": {
+    "description": "使用 Luma UNI-1 模型，通过文本提示编辑已有图像。",
+    "display_name": "Luma UNI-1 图像编辑",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于编辑的模型。"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "期望编辑的描述。1–6000 字符。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "要编辑的源图像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageModifyNode": {
     "description": "根据提示词和宽高比同步修改图像。",
     "display_name": "Luma 图像到图像",
@@ -8403,6 +8759,41 @@
       }
     }
   },
+  "LumaImageNode2": {
+    "description": "使用 Luma UNI-1 模型，根据文本生成图像。",
+    "display_name": "Luma UNI-1 图像生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于生成的模型。"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_web_search": {
+        "name": "web_search"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "期望图像的文本描述。1–6000 字符。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LumaImageToVideoNode": {
     "description": "根据提示词、输入图像和输出尺寸同步生成视频。",
     "display_name": "Luma 图像转视频",
@@ -11347,6 +11738,18 @@
       }
     }
   },
+  "ModelNoiseScale": {
+    "display_name": "模型噪声尺度",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      },
+      "noise_scale": {
+        "name": "噪声尺度",
+        "tooltip": "绝对训练噪声尺度。例如 HiDream-O1 base: 8.0，dev: 7.5。"
+      }
+    }
+  },
   "ModelPatchLoader": {
     "display_name": "加载模型补丁",
     "inputs": {
@@ -11489,120 +11892,6 @@
       }
     }
   },
-  "MoonvalleyImg2VideoNode": {
-    "description": "Moonvalley Marey 图像转视频节点",
-    "display_name": "Moonvalley Marey 图像转视频",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成后控制"
-      },
-      "image": {
-        "name": "图像",
-        "tooltip": "用于生成视频的参考图像"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "负面提示词文本"
-      },
-      "prompt": {
-        "name": "提示词"
-      },
-      "prompt_adherence": {
-        "name": "提示词遵循度",
-        "tooltip": "用于生成控制的引导尺度"
-      },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "输出视频的分辨率"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "随机种子值"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "去噪步数"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyTxt2VideoNode": {
-    "display_name": "Moonvalley Marey 文本转视频",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成后控制"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "负面提示词文本"
-      },
-      "prompt": {
-        "name": "提示词"
-      },
-      "prompt_adherence": {
-        "name": "提示词遵循度",
-        "tooltip": "用于生成控制的引导尺度"
-      },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "输出视频的分辨率"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "随机种子值"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "推理步数"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "MoonvalleyVideo2VideoNode": {
-    "display_name": "Moonvalley Marey 视频转视频",
-    "inputs": {
-      "control_type": {
-        "name": "控制类型"
-      },
-      "motion_intensity": {
-        "name": "运动强度",
-        "tooltip": "仅在控制类型为'运动转移'时使用"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "负面提示词文本"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "描述要生成的视频"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "随机种子值"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "推理步数"
-      },
-      "video": {
-        "name": "视频",
-        "tooltip": "用于生成输出视频的参考视频。必须至少5秒长。超过5秒的视频将被自动裁剪。仅支持MP4格式。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "Morphology": {
     "display_name": "图像形态学",
     "inputs": {
@@ -11825,8 +12114,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "description": "通过 OpenAI 的 GPT Image 1 端点同步生成图像。",
-    "display_name": "OpenAI GPT Image 1",
+    "description": "通过 OpenAI 的 GPT Image 2 端点同步生成图像。",
+    "display_name": "OpenAI GPT Image 2",
     "inputs": {
       "background": {
         "name": "背景",
@@ -11860,7 +12149,7 @@
       },
       "prompt": {
         "name": "提示词",
-        "tooltip": "用于 GPT Image 1 的文本提示"
+        "tooltip": "用于 GPT Image 2 的文本提示"
       },
       "quality": {
         "name": "质量",
@@ -11881,6 +12170,50 @@
       }
     }
   },
+  "OpenAIGPTImageNodeV2": {
+    "description": "通过OpenAI的GPT Image端点生成图像。",
+    "display_name": "OpenAI GPT 图像 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_background": {
+        "name": "背景"
+      },
+      "model_custom_height": {
+        "name": "自定义高度"
+      },
+      "model_custom_width": {
+        "name": "自定义宽度"
+      },
+      "model_quality": {
+        "name": "质量"
+      },
+      "model_size": {
+        "name": "尺寸"
+      },
+      "n": {
+        "name": "数量",
+        "tooltip": "要生成的图像数量"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于GPT Image的文本提示"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "后端尚未实现"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIInputFiles": {
     "description": "加载并准备输入文件（文本、PDF等）作为OpenAI聊天节点的输入。生成响应时，OpenAI模型将读取这些文件。🛈 提示：可与其他OpenAI输入文件节点链式连接。",
     "display_name": "OpenAI ChatGPT Input Files",
@@ -11934,6 +12267,20 @@
       }
     }
   },
+  "OpticalFlowLoader": {
+    "display_name": "加载光流模型",
+    "inputs": {
+      "model_name": {
+        "name": "model_name",
+        "tooltip": "要加载的光流模型。文件必须放在 'optical_flow' 文件夹中。目前仅支持 torchvision 的 raft_large.pth。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "OptimalStepsScheduler": {
     "display_name": "OptimalSteps调度器",
     "inputs": {
@@ -12534,7 +12881,7 @@
   "PrimitiveInt": {
     "display_name": "整数",
     "inputs": {
-      "control_after_generate": {
+      "fixed": {
         "name": "生成后控制"
       },
       "value": {
@@ -13415,6 +13762,25 @@
       }
     }
   },
+  "RemoveBackground": {
+    "display_name": "移除背景",
+    "inputs": {
+      "bg_removal_model": {
+        "name": "背景移除模型",
+        "tooltip": "用于生成 mask 的背景移除模型"
+      },
+      "image": {
+        "name": "图像",
+        "tooltip": "要移除背景的输入图像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "mask",
+        "tooltip": "生成的前景 mask"
+      }
+    }
+  },
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
@@ -14424,6 +14790,20 @@
       }
     }
   },
+  "SamplerARVideo": {
+    "display_name": "采样器 AR 视频",
+    "inputs": {
+      "num_frame_per_block": {
+        "name": "num_frame_per_block",
+        "tooltip": "每个自回归块的帧数。1 = 按帧，3 = 按块。必须与 checkpoint 的训练模式一致。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerCustom": {
     "display_name": "自定义采样器",
     "inputs": {
@@ -14686,6 +15066,29 @@
       }
     }
   },
+  "SamplerLCM": {
+    "description": "具有可调每步噪声的LCM采样器。s_noise是模型训练噪声尺度的倍数",
+    "display_name": "SamplerLCM",
+    "inputs": {
+      "noise_clip_std": {
+        "name": "noise_clip_std",
+        "tooltip": "将每步噪声限制在±N*标准差。0为禁用。"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "第一步的每步噪声倍数（1.0 = 匹配训练）。"
+      },
+      "s_noise_end": {
+        "name": "s_noise_end",
+        "tooltip": "最后一步的每步噪声倍数。与s_noise相同则为恒定调度。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SamplerLCMUpscale": {
     "display_name": "LCM缩放采样器",
     "inputs": {
@@ -16624,6 +17027,9 @@
   "TextGenerate": {
     "display_name": "TextGenerate",
     "inputs": {
+      "audio": {
+        "name": "音频"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16667,6 +17073,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "如果模型自带系统提示/模板，则使用内置模板。"
+      },
+      "video": {
+        "name": "视频",
+        "tooltip": "视频帧作为图像批处理。假定为24帧/秒；内部降采样为1帧/秒。"
       }
     },
     "outputs": {
@@ -16679,6 +17089,9 @@
   "TextGenerateLTX2Prompt": {
     "display_name": "TextGenerateLTX2Prompt",
     "inputs": {
+      "audio": {
+        "name": "音频"
+      },
       "clip": {
         "name": "clip"
       },
@@ -16722,6 +17135,10 @@
       "use_default_template": {
         "name": "use_default_template",
         "tooltip": "如果模型自带系统提示/模板，则使用内置模板。"
+      },
+      "video": {
+        "name": "视频",
+        "tooltip": "视频帧作为图像批处理。假定为24帧/秒；内部降采样为1帧/秒。"
       }
     },
     "outputs": {
@@ -16905,6 +17322,45 @@
       }
     }
   },
+  "TopazVideoEnhanceV2": {
+    "description": "通过强大的放大和修复技术为视频注入新活力。",
+    "display_name": "Topaz 视频增强",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "动态压缩等级",
+        "tooltip": "CQP 等级。"
+      },
+      "interpolation_model": {
+        "name": "插值模型"
+      },
+      "upscaler_model": {
+        "name": "放大模型"
+      },
+      "upscaler_model_creativity": {
+        "name": "创造力"
+      },
+      "upscaler_model_prompt": {
+        "name": "提示词"
+      },
+      "upscaler_model_realism": {
+        "name": "真实感"
+      },
+      "upscaler_model_sharp": {
+        "name": "锐度"
+      },
+      "upscaler_model_upscaler_resolution": {
+        "name": "放大分辨率"
+      },
+      "video": {
+        "name": "视频"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torch编译模型",
     "inputs": {
@@ -17241,7 +17697,8 @@
         "name": "PBR"
       },
       "quad": {
-        "name": "四边形"
+        "name": "四边形",
+        "tooltip": "此参数已弃用，无任何作用。"
       },
       "texture": {
         "name": "纹理"
@@ -17761,6 +18218,127 @@
       }
     }
   },
+  "VOIDInpaintConditioning": {
+    "display_name": "VOIDInpaintConditioning",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "要处理的像素帧数。对于 CogVideoX-Fun-V1.5（patch_size_t=2），latent_t 必须为偶数——产生奇数 latent_t 的长度会向下取整（如 49 → 45）。"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "quadmask": {
+        "name": "quadmask",
+        "tooltip": "来自 VOIDQuadmaskPreprocess 的预处理 quadmask [T, H, W]"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "源视频帧 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDQuadmaskPreprocess": {
+    "display_name": "VOIDQuadmaskPreprocess",
+    "inputs": {
+      "dilate_width": {
+        "name": "dilate_width",
+        "tooltip": "主 mask 区域的膨胀半径（0 = 不膨胀）"
+      },
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "quadmask",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDSampler": {
+    "display_name": "VOIDSampler",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoise": {
+    "display_name": "VOIDWarpedNoise",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length",
+        "tooltip": "像素帧数。为满足 patch_size_t=2 的要求，向下取整使 latent_t 为偶数，例如 49 → 45。"
+      },
+      "optical_flow": {
+        "name": "optical_flow",
+        "tooltip": "来自 OpticalFlowLoader 的光流模型（RAFT-large）。"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "第一步输出的视频帧 [T, H, W, 3]"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "warped_noise",
+        "tooltip": null
+      }
+    }
+  },
+  "VOIDWarpedNoiseSource": {
+    "display_name": "VOIDWarpedNoiseSource",
+    "inputs": {
+      "warped_noise": {
+        "name": "warped_noise",
+        "tooltip": "来自 VOIDWarpedNoise 的 warped noise latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VPScheduler": {
     "display_name": "VPS调度器",
     "inputs": {
@@ -19088,6 +19666,156 @@
       }
     }
   },
+  "WanDancerEncodeAudio": {
+    "display_name": "WanDancerEncodeAudio",
+    "inputs": {
+      "audio": {
+        "name": "音频"
+      },
+      "audio_inject_scale": {
+        "name": "音频注入比例",
+        "tooltip": "将音频特征注入到视频模型时的比例。"
+      },
+      "video_frames": {
+        "name": "视频帧"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "音频编码器输出",
+        "tooltip": null
+      },
+      "1": {
+        "name": "fps字符串",
+        "tooltip": "根据音频长度和视频帧数计算得到的fps。用于提示词中。"
+      }
+    }
+  },
+  "WanDancerPadKeyframes": {
+    "display_name": "WanDancerPadKeyframes",
+    "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "用于计算总输出帧数并提取片段音频。"
+      },
+      "images": {
+        "name": "图像"
+      },
+      "segment_index": {
+        "name": "片段索引",
+        "tooltip": "这是第几个片段（第一个为0，第二个为1，以此类推）"
+      },
+      "segment_length": {
+        "name": "片段长度",
+        "tooltip": "该片段的长度（通常为149帧）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "关键帧序列",
+        "tooltip": "填充后的关键帧序列"
+      },
+      "1": {
+        "name": "关键帧掩码",
+        "tooltip": "指示有效帧的掩码"
+      },
+      "2": {
+        "name": "音频片段",
+        "tooltip": "该视频片段对应的音频片段"
+      }
+    }
+  },
+  "WanDancerPadKeyframesList": {
+    "display_name": "WanDancerPadKeyframesList",
+    "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "为每个输出片段切分音频。"
+      },
+      "images": {
+        "name": "图像"
+      },
+      "num_segments": {
+        "name": "片段数量",
+        "tooltip": "要以列表形式输出多少个填充片段。"
+      },
+      "segment_length": {
+        "name": "片段长度",
+        "tooltip": "每个片段的长度（通常为149帧）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "关键帧序列",
+        "tooltip": "填充后的关键帧序列"
+      },
+      "1": {
+        "name": "关键帧掩码",
+        "tooltip": "指示有效帧的掩码"
+      },
+      "2": {
+        "name": "音频片段",
+        "tooltip": "每个视频片段对应的音频片段"
+      }
+    }
+  },
+  "WanDancerVideo": {
+    "display_name": "WanDancerVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "音频编码器输出"
+      },
+      "clip_vision_output": {
+        "name": "clip视觉输出",
+        "tooltip": "第一帧的CLIP视觉嵌入。"
+      },
+      "clip_vision_output_ref": {
+        "name": "clip视觉参考输出",
+        "tooltip": "参考图像的CLIP视觉嵌入。"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "长度",
+        "tooltip": "生成视频的帧数。对于WanDancer应保持为149。"
+      },
+      "mask": {
+        "name": "掩码",
+        "tooltip": "用于起始图像的图像条件掩码。白色保留，黑色生成。用于局部生成。"
+      },
+      "negative": {
+        "name": "负向"
+      },
+      "positive": {
+        "name": "正向"
+      },
+      "start_image": {
+        "name": "起始图像",
+        "tooltip": "要编码的初始图像，可以为任意帧数。"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负向",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "空的latent。"
+      }
+    }
+  },
   "WanFirstLastFrameToVideo": {
     "display_name": "Wan首尾帧视频",
     "inputs": {
diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json
index 5d64012ecf..1f77b665bb 100644
--- a/src/locales/zh/settings.json
+++ b/src/locales/zh/settings.json
@@ -428,11 +428,11 @@
     "name": "校验工作流"
   },
   "Comfy_VueNodes_AutoScaleLayout": {
-    "name": "自动缩放布局（Vue节点）",
+    "name": "自动缩放布局（Nodes 2.0）",
     "tooltip": "切换到Vue渲染时自动缩放节点位置以防止重叠"
   },
   "Comfy_VueNodes_Enabled": {
-    "name": "现代节点设计（Vue节点）",
+    "name": "现代节点设计（Nodes 2.0）",
     "tooltip": "现代：基于DOM的渲染，具有增强的交互性、原生浏览器功能和更新的视觉设计。经典：传统的画布渲染。"
   },
   "Comfy_WidgetControlMode": {
diff --git a/src/platform/assets/components/AssetBrowserModal.vue b/src/platform/assets/components/AssetBrowserModal.vue
index c8d2c71275..5dfdd28b38 100644
--- a/src/platform/assets/components/AssetBrowserModal.vue
+++ b/src/platform/assets/components/AssetBrowserModal.vue
@@ -23,6 +23,7 @@
 
     <template #header>
       <div
+        :ref="primeVueOverlay.overlayScopeRef"
         class="flex w-full items-center justify-between gap-2"
         @click.self="focusedAsset = null"
       >
@@ -52,6 +53,7 @@
       <AssetFilterBar
         :assets="categoryFilteredAssets"
         :show-ownership-filter
+        :content-style="selectContentStyle"
         @filter-change="updateFilters"
         @click.self="focusedAsset = null"
       />
@@ -72,7 +74,12 @@
     </template>
 
     <template #rightPanel>
-      <ModelInfoPanel v-if="focusedAsset" :asset="focusedAsset" :cache-key />
+      <ModelInfoPanel
+        v-if="focusedAsset"
+        :asset="focusedAsset"
+        :cache-key
+        :select-content-style="selectContentStyle"
+      />
       <div
         v-else
         class="flex h-full items-center justify-center p-6 text-center wrap-break-word text-muted"
@@ -92,6 +99,7 @@ import SearchInput from '@/components/ui/search-input/SearchInput.vue'
 import Button from '@/components/ui/button/Button.vue'
 import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
 import LeftSidePanel from '@/components/widget/panel/LeftSidePanel.vue'
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import AssetFilterBar from '@/platform/assets/components/AssetFilterBar.vue'
 import AssetGrid from '@/platform/assets/components/AssetGrid.vue'
 import ModelInfoPanel from '@/platform/assets/components/modelInfo/ModelInfoPanel.vue'
@@ -109,6 +117,8 @@ const { t } = useI18n()
 const assetStore = useAssetsStore()
 const modelToNodeStore = useModelToNodeStore()
 const breakpoints = useBreakpoints(breakpointsTailwind)
+const primeVueOverlay = usePrimeVueOverlayChildStyle()
+const selectContentStyle = primeVueOverlay.contentStyle
 
 const props = defineProps<{
   nodeType?: string
diff --git a/src/platform/assets/components/AssetCard.stories.ts b/src/platform/assets/components/AssetCard.stories.ts
index 49464259c0..491532861f 100644
--- a/src/platform/assets/components/AssetCard.stories.ts
+++ b/src/platform/assets/components/AssetCard.stories.ts
@@ -17,7 +17,6 @@ const createAssetData = (
     { label: '2.1 GB', type: 'size' }
   ],
   stats: {
-    formattedDate: '3/15/25',
     downloadCount: '1.8k',
     stars: '4.2k'
   },
@@ -147,8 +146,7 @@ export const EdgeCases: Story = {
           name: 'No Stars',
           secondaryText: 'Testing missing stars data gracefully',
           stats: {
-            downloadCount: '1.8k',
-            formattedDate: '3/15/25'
+            downloadCount: '1.8k'
           }
         }),
         // No downloads
@@ -157,8 +155,7 @@ export const EdgeCases: Story = {
           name: 'No Downloads',
           secondaryText: 'Testing missing downloads data gracefully',
           stats: {
-            stars: '4.2k',
-            formattedDate: '3/15/25'
+            stars: '4.2k'
           }
         }),
         // No date
diff --git a/src/platform/assets/components/AssetCard.vue b/src/platform/assets/components/AssetCard.vue
index d9d1ac6648..4a9562c477 100644
--- a/src/platform/assets/components/AssetCard.vue
+++ b/src/platform/assets/components/AssetCard.vue
@@ -103,12 +103,9 @@
             <i class="icon-[lucide--download] size-3" />
             {{ asset.stats.downloadCount }}
           </span>
-          <span
-            v-if="asset.stats.formattedDate"
-            class="flex items-center gap-1"
-          >
+          <span v-if="formattedDate" class="flex items-center gap-1">
             <i class="icon-[lucide--clock] size-3" />
-            {{ asset.stats.formattedDate }}
+            {{ formattedDate }}
           </span>
         </div>
         <Button
@@ -162,7 +159,7 @@ const emit = defineEmits<{
   showInfo: [asset: AssetDisplayItem]
 }>()
 
-const { t } = useI18n()
+const { t, d } = useI18n()
 const settingStore = useSettingStore()
 const { closeDialog } = useDialogStore()
 const { isDownloadedThisSession, acknowledgeAsset } = useAssetDownloadStore()
@@ -176,6 +173,15 @@ const descId = useId()
 
 const displayName = computed(() => getAssetCardTitle(asset))
 
+// Format at render so locale switches re-flow; the upstream WeakMap caches
+// AssetItem -> AssetDisplayItem by reference, which would otherwise pin the
+// formatted string to whichever locale was active when first transformed.
+const formattedDate = computed(() =>
+  asset.created_at
+    ? d(new Date(asset.created_at), { dateStyle: 'short' })
+    : undefined
+)
+
 const isNewlyImported = computed(() => isDownloadedThisSession(asset.id))
 
 const showAssetOptions = computed(() => !(asset.is_immutable ?? true))
diff --git a/src/platform/assets/components/AssetFilterBar.vue b/src/platform/assets/components/AssetFilterBar.vue
index a85322a1e9..4157064e42 100644
--- a/src/platform/assets/components/AssetFilterBar.vue
+++ b/src/platform/assets/components/AssetFilterBar.vue
@@ -12,6 +12,7 @@
         v-model="activeFileFormatObjects"
         :label="$t('assetBrowser.fileFormats')"
         :options="availableFileFormats"
+        :content-style="contentStyle"
         class="min-w-32"
         data-component-id="asset-filter-file-formats"
         @update:model-value="handleFilterChange"
@@ -22,6 +23,7 @@
         v-model="activeBaseModelObjects"
         :label="$t('assetBrowser.baseModels')"
         :options="availableBaseModels"
+        :content-style="contentStyle"
         class="min-w-32"
         data-component-id="asset-filter-base-models"
         @update:model-value="handleFilterChange"
@@ -32,6 +34,7 @@
         v-model="ownership"
         :label="$t('assetBrowser.ownership')"
         :options="ownershipOptions"
+        :content-style="contentStyle"
         class="min-w-32"
         data-component-id="asset-filter-ownership"
         @update:model-value="handleFilterChange"
@@ -43,6 +46,7 @@
         v-model="sortBy"
         :label="$t('assetBrowser.sortBy')"
         :options="sortOptions"
+        :content-style="contentStyle"
         class="min-w-32"
         data-component-id="asset-filter-sort"
         @update:model-value="handleFilterChange"
@@ -57,6 +61,7 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import type { StyleValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import MultiSelect from '@/components/ui/multi-select/MultiSelect.vue'
@@ -78,9 +83,14 @@ const sortOptions = computed(() => [
   { name: t('assetBrowser.sortZA'), value: 'name-desc' as const }
 ])
 
-const { assets = [], showOwnershipFilter = false } = defineProps<{
+const {
+  assets = [],
+  showOwnershipFilter = false,
+  contentStyle
+} = defineProps<{
   assets?: AssetItem[]
   showOwnershipFilter?: boolean
+  contentStyle?: StyleValue
 }>()
 
 const selectedFileFormats = ref<SelectOption[]>([])
diff --git a/src/platform/assets/components/Media3DTop.test.ts b/src/platform/assets/components/Media3DTop.test.ts
new file mode 100644
index 0000000000..4c98ac0f47
--- /dev/null
+++ b/src/platform/assets/components/Media3DTop.test.ts
@@ -0,0 +1,220 @@
+import { render, screen } from '@testing-library/vue'
+import type * as VueUseCore from '@vueuse/core'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { AssetMeta } from '../schemas/mediaAssetSchema'
+import Media3DTop from './Media3DTop.vue'
+
+const {
+  mockUseIntersectionObserver,
+  mockFindServerPreviewUrl,
+  mockIsAssetPreviewSupported
+} = vi.hoisted(() => ({
+  mockUseIntersectionObserver: vi.fn(),
+  mockFindServerPreviewUrl: vi.fn(),
+  mockIsAssetPreviewSupported: vi.fn(() => true)
+}))
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const actual = await importOriginal<typeof VueUseCore>()
+  return {
+    ...actual,
+    useIntersectionObserver: mockUseIntersectionObserver
+  }
+})
+
+vi.mock('../utils/assetPreviewUtil', () => ({
+  findServerPreviewUrl: mockFindServerPreviewUrl,
+  isAssetPreviewSupported: mockIsAssetPreviewSupported
+}))
+
+function makeAsset(overrides: Partial<AssetMeta> = {}): AssetMeta {
+  return {
+    id: 'asset-1',
+    name: 'mesh.glb',
+    asset_hash: null,
+    mime_type: 'model/gltf-binary',
+    tags: [],
+    kind: '3D',
+    src: 'http://example.com/mesh.glb',
+    ...overrides
+  } as AssetMeta
+}
+
+function fireObserverIntersecting() {
+  mockUseIntersectionObserver.mockImplementation(
+    (
+      _target: unknown,
+      callback: (entries: { isIntersecting: boolean }[]) => void
+    ) => {
+      callback([{ isIntersecting: true }])
+      return { stop: vi.fn() }
+    }
+  )
+}
+
+function noopObserver() {
+  mockUseIntersectionObserver.mockImplementation(() => ({ stop: vi.fn() }))
+}
+
+async function flush() {
+  await new Promise<void>((resolve) => setTimeout(resolve, 0))
+}
+
+const globalConfig = { mocks: { $t: (key: string) => key } }
+
+describe('Media3DTop', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsAssetPreviewSupported.mockReturnValue(true)
+  })
+
+  it('renders the placeholder when no thumbnail has loaded', () => {
+    noopObserver()
+    const { container } = render(Media3DTop, {
+      props: { asset: makeAsset() },
+      global: globalConfig
+    })
+
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- <img> has no role until src is set
+    expect(container.querySelector('img')).not.toBeInTheDocument()
+    expect(
+      screen.getByText('assetBrowser.media.threeDModelPlaceholder')
+    ).toBeInTheDocument()
+  })
+
+  it('uses asset.preview_url directly when preview_id is already on the prop', async () => {
+    fireObserverIntersecting()
+    const { container } = render(Media3DTop, {
+      props: {
+        asset: makeAsset({
+          preview_id: 'p1',
+          preview_url: 'http://server/preview.png'
+        })
+      },
+      global: globalConfig
+    })
+    await flush()
+
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    const img = container.querySelector('img')
+    expect(img).toHaveAttribute('src', 'http://server/preview.png')
+    expect(mockFindServerPreviewUrl).not.toHaveBeenCalled()
+  })
+
+  it('queries the server for a preview when preview_id is missing on the prop', async () => {
+    fireObserverIntersecting()
+    mockFindServerPreviewUrl.mockResolvedValue('http://server/from-name.png')
+    const { container } = render(Media3DTop, {
+      props: { asset: makeAsset() },
+      global: globalConfig
+    })
+    await flush()
+
+    expect(mockFindServerPreviewUrl).toHaveBeenCalledWith('mesh.glb')
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    const img = container.querySelector('img')
+    expect(img).toHaveAttribute('src', 'http://server/from-name.png')
+  })
+
+  it('skips the server query when isAssetPreviewSupported is false', async () => {
+    fireObserverIntersecting()
+    mockIsAssetPreviewSupported.mockReturnValue(false)
+    render(Media3DTop, {
+      props: { asset: makeAsset() },
+      global: globalConfig
+    })
+    await flush()
+
+    expect(mockFindServerPreviewUrl).not.toHaveBeenCalled()
+  })
+
+  it('picks up a patched preview_url after the IntersectionObserver gate has closed', async () => {
+    // Initial render: observer fires, server has no preview yet — hasAttempted=true
+    fireObserverIntersecting()
+    mockFindServerPreviewUrl.mockResolvedValue(null)
+
+    const { container, rerender } = render(Media3DTop, {
+      props: {
+        asset: makeAsset({
+          preview_id: null,
+          preview_url: undefined
+        })
+      },
+      global: globalConfig
+    })
+    await flush()
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelector('img')).not.toBeInTheDocument()
+
+    // Simulate persistThumbnail patching the store: the prop arrives with the
+    // new preview. The watch on [preview_id, preview_url] should apply it
+    // directly even though the observer won't refire.
+    await rerender({
+      asset: makeAsset({
+        preview_id: 'p-new',
+        preview_url: 'http://server/patched.png'
+      })
+    })
+    await flush()
+
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    const img = container.querySelector('img')
+    expect(img).toHaveAttribute('src', 'http://server/patched.png')
+  })
+
+  it('does not overwrite a thumbnail that is already showing', async () => {
+    fireObserverIntersecting()
+    const { container, rerender } = render(Media3DTop, {
+      props: {
+        asset: makeAsset({
+          preview_id: 'p1',
+          preview_url: 'http://server/first.png'
+        })
+      },
+      global: globalConfig
+    })
+    await flush()
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelector('img')).toHaveAttribute(
+      'src',
+      'http://server/first.png'
+    )
+
+    await rerender({
+      asset: makeAsset({
+        preview_id: 'p2',
+        preview_url: 'http://server/second.png'
+      })
+    })
+    await flush()
+
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelector('img')).toHaveAttribute(
+      'src',
+      'http://server/first.png'
+    )
+  })
+
+  it('does not apply a patch with no preview_id', async () => {
+    fireObserverIntersecting()
+    mockFindServerPreviewUrl.mockResolvedValue(null)
+
+    const { container, rerender } = render(Media3DTop, {
+      props: { asset: makeAsset({ preview_id: null, preview_url: undefined }) },
+      global: globalConfig
+    })
+    await flush()
+
+    await rerender({
+      asset: makeAsset({
+        preview_id: null,
+        preview_url: 'http://server/no-id.png'
+      })
+    })
+    await flush()
+
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelector('img')).not.toBeInTheDocument()
+  })
+})
diff --git a/src/platform/assets/components/Media3DTop.vue b/src/platform/assets/components/Media3DTop.vue
index 8f479a30ca..d10a1dcd00 100644
--- a/src/platform/assets/components/Media3DTop.vue
+++ b/src/platform/assets/components/Media3DTop.vue
@@ -74,5 +74,20 @@ watch(
   }
 )
 
+watch(
+  () => [asset?.preview_id, asset?.preview_url] as const,
+  ([newPreviewId, newPreviewUrl], [, oldPreviewUrl]) => {
+    if (
+      newPreviewId &&
+      newPreviewUrl &&
+      newPreviewUrl !== oldPreviewUrl &&
+      !thumbnailSrc.value
+    ) {
+      thumbnailSrc.value = newPreviewUrl
+      hasAttempted.value = true
+    }
+  }
+)
+
 onBeforeUnmount(revokeThumbnail)
 </script>
diff --git a/src/platform/assets/components/UploadModelConfirmation.vue b/src/platform/assets/components/UploadModelConfirmation.vue
index 106d1190fb..ec5056a6df 100644
--- a/src/platform/assets/components/UploadModelConfirmation.vue
+++ b/src/platform/assets/components/UploadModelConfirmation.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="flex flex-col gap-4 text-sm text-muted-foreground">
+  <div
+    :ref="primeVueOverlay.overlayScopeRef"
+    class="flex flex-col gap-4 text-sm text-muted-foreground"
+  >
     <div class="flex flex-col gap-2">
       <p class="m-0">
         {{ $t('assetBrowser.modelAssociatedWithLink') }}
@@ -39,6 +42,7 @@
         "
         :options="modelTypes"
         :disabled="isLoading"
+        :content-style="selectContentStyle"
         data-attr="upload-model-step2-type-selector"
       />
     </div>
@@ -47,6 +51,7 @@
 
 <script setup lang="ts">
 import SingleSelect from '@/components/ui/single-select/SingleSelect.vue'
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
 import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
 
@@ -58,4 +63,6 @@ defineProps<{
 const modelValue = defineModel<string | undefined>()
 
 const { modelTypes, isLoading } = useModelTypes()
+const primeVueOverlay = usePrimeVueOverlayChildStyle()
+const selectContentStyle = primeVueOverlay.contentStyle
 </script>
diff --git a/src/platform/assets/components/modelInfo/ModelInfoPanel.vue b/src/platform/assets/components/modelInfo/ModelInfoPanel.vue
index d4b1deaff1..b9936caa2f 100644
--- a/src/platform/assets/components/modelInfo/ModelInfoPanel.vue
+++ b/src/platform/assets/components/modelInfo/ModelInfoPanel.vue
@@ -77,7 +77,7 @@
               :placeholder="t('assetBrowser.modelInfo.selectModelType')"
             />
           </SelectTrigger>
-          <SelectContent>
+          <SelectContent :style="selectContentStyle">
             <SelectItem
               v-for="option in modelTypes"
               :key="option.value"
@@ -210,6 +210,7 @@
 <script setup lang="ts">
 import { useDebounceFn } from '@vueuse/core'
 import { computed, ref, useTemplateRef, watch } from 'vue'
+import type { StyleValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import EditableText from '@/components/common/EditableText.vue'
@@ -257,9 +258,10 @@ const accordionClass = cn(
   'border-t border-border-default bg-modal-panel-background'
 )
 
-const { asset, cacheKey } = defineProps<{
+const { asset, cacheKey, selectContentStyle } = defineProps<{
   asset: AssetDisplayItem
   cacheKey?: string
+  selectContentStyle?: StyleValue
 }>()
 
 const assetsStore = useAssetsStore()
diff --git a/src/platform/assets/composables/media/assetMappers.test.ts b/src/platform/assets/composables/media/assetMappers.test.ts
new file mode 100644
index 0000000000..4bea3580b6
--- /dev/null
+++ b/src/platform/assets/composables/media/assetMappers.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { mapInputFileToAssetItem } from './assetMappers'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    apiURL: (path: string) => `/api${path}`
+  }
+}))
+
+vi.mock('@/platform/distribution/cloudPreviewUtil', () => ({
+  appendCloudResParam: vi.fn()
+}))
+
+describe('mapInputFileToAssetItem', () => {
+  it('preserves a clean filename', () => {
+    const asset = mapInputFileToAssetItem('photo.png', 0, 'input')
+
+    expect(asset.name).toBe('photo.png')
+    expect(asset.id).toBe('input-0-photo.png')
+    expect(asset.preview_url).toBe('/api/view?filename=photo.png&type=input')
+  })
+
+  it.for([
+    ['photo.png [input]', 'photo.png'],
+    ['photo.png [output]', 'photo.png'],
+    ['photo.png [temp]', 'photo.png'],
+    ['clip.mp4[input]', 'clip.mp4'],
+    ['MyFile.WEBP [Input]', 'MyFile.WEBP']
+  ])(
+    'strips ComfyUI directory annotation: %s -> %s',
+    ([input, expectedName]) => {
+      const asset = mapInputFileToAssetItem(input, 1, 'input')
+
+      expect(asset.name).toBe(expectedName)
+      expect(asset.id).toBe(`input-1-${expectedName}`)
+      expect(asset.preview_url).toBe(
+        `/api/view?filename=${encodeURIComponent(expectedName)}&type=input`
+      )
+    }
+  )
+
+  it('leaves non-annotation brackets in the filename intact', () => {
+    const asset = mapInputFileToAssetItem('my [draft] image.png', 0, 'input')
+
+    expect(asset.name).toBe('my [draft] image.png')
+  })
+
+  it('uses the directory passed in for the type query param', () => {
+    const asset = mapInputFileToAssetItem('clip.mp4 [output]', 0, 'output')
+
+    expect(asset.preview_url).toBe('/api/view?filename=clip.mp4&type=output')
+    expect(asset.tags).toEqual(['output'])
+  })
+})
diff --git a/src/platform/assets/composables/media/assetMappers.ts b/src/platform/assets/composables/media/assetMappers.ts
index da468ca9b3..67544a0e87 100644
--- a/src/platform/assets/composables/media/assetMappers.ts
+++ b/src/platform/assets/composables/media/assetMappers.ts
@@ -51,6 +51,17 @@ export function mapTaskOutputToAssetItem(
   }
 }
 
+/**
+ * Strips ComfyUI's trailing directory-type annotation (e.g. ` [input]`,
+ * ` [output]`, `[temp]`) from a filename returned by the OSS internal
+ * `/internal/files/{type}` endpoint. The annotation is part of the wire
+ * format LoadImage-style widgets expect, but for the assets sidebar we
+ * want the canonical on-disk filename so type detection / titles work.
+ */
+function stripDirectoryAnnotation(filename: string): string {
+  return filename.replace(/\s*\[(?:input|output|temp)\]\s*$/i, '')
+}
+
 /**
  * Maps input directory file to AssetItem format
  * @param filename The filename
@@ -63,13 +74,14 @@ export function mapInputFileToAssetItem(
   index: number,
   directory: 'input' | 'output' = 'input'
 ): AssetItem {
-  const params = new URLSearchParams({ filename, type: directory })
+  const cleanName = stripDirectoryAnnotation(filename)
+  const params = new URLSearchParams({ filename: cleanName, type: directory })
   const preview_url = api.apiURL(`/view?${params}`)
-  appendCloudResParam(params, filename)
+  appendCloudResParam(params, cleanName)
 
   return {
-    id: `${directory}-${index}-${filename}`,
-    name: filename,
+    id: `${directory}-${index}-${cleanName}`,
+    name: cleanName,
     size: 0,
     created_at: new Date().toISOString(),
     tags: [directory],
diff --git a/src/platform/assets/composables/useAssetBrowser.perf.test.ts b/src/platform/assets/composables/useAssetBrowser.perf.test.ts
new file mode 100644
index 0000000000..b15b44a492
--- /dev/null
+++ b/src/platform/assets/composables/useAssetBrowser.perf.test.ts
@@ -0,0 +1,113 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+
+import { useAssetBrowser } from '@/platform/assets/composables/useAssetBrowser'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import * as assetMetadataUtils from '@/platform/assets/utils/assetMetadataUtils'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key,
+  d: (date: Date) => date.toLocaleDateString()
+}))
+
+const ASSET_COUNT = 200
+const CATEGORIES = ['inputs', 'outputs'] as const
+const TAB_SWITCHES = 6
+
+function makeAsset(index: number): AssetItem {
+  const category = CATEGORIES[index % CATEGORIES.length]
+  return {
+    id: `asset-${index}`,
+    name: `asset-${index}.safetensors`,
+    asset_hash: `blake3:${index}`,
+    size: 1024,
+    mime_type: 'application/octet-stream',
+    tags: ['models', category],
+    created_at: '2024-01-01T00:00:00Z',
+    updated_at: '2024-01-01T00:00:00Z',
+    last_access_time: '2024-01-01T00:00:00Z',
+    is_immutable: false
+  }
+}
+
+describe('useAssetBrowser - filter tab switching perf (FE-229)', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.restoreAllMocks()
+  })
+
+  it('does not re-transform every asset on each filter tab switch', async () => {
+    const assets = Array.from({ length: ASSET_COUNT }, (_, i) => makeAsset(i))
+    const filenameSpy = vi.spyOn(assetMetadataUtils, 'getAssetFilename')
+
+    const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
+
+    // Initial materialization of the 'all' tab.
+    void filteredAssets.value
+    await nextTick()
+    const baselineCalls = filenameSpy.mock.calls.length
+
+    // Simulate the user clicking back and forth between All / Inputs / Outputs.
+    const tabs: ('all' | 'inputs' | 'outputs')[] = [
+      'inputs',
+      'outputs',
+      'all',
+      'inputs',
+      'outputs',
+      'all'
+    ]
+    expect(tabs).toHaveLength(TAB_SWITCHES)
+
+    for (const tab of tabs) {
+      selectedNavItem.value = tab
+      void filteredAssets.value
+      await nextTick()
+    }
+
+    const switchCalls = filenameSpy.mock.calls.length - baselineCalls
+
+    // Naive (no memoization) cost is approximately:
+    //   inputs (100) + outputs (100) + all (200) + inputs (100) + outputs (100) + all (200) = 800.
+    // With per-asset memoization the same asset object should never be transformed twice,
+    // so total work across all tab switches must stay within a small multiple of ASSET_COUNT.
+    const budget = ASSET_COUNT * 2
+    expect(switchCalls).toBeLessThanOrEqual(budget)
+  })
+
+  it('returns identical display item references for unchanged assets across tab switches', async () => {
+    const assets = Array.from({ length: ASSET_COUNT }, (_, i) => makeAsset(i))
+
+    const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
+
+    const firstAllSnapshot = new Map(
+      filteredAssets.value.map((item) => [item.id, item])
+    )
+    await nextTick()
+
+    selectedNavItem.value = 'inputs'
+    void filteredAssets.value
+    await nextTick()
+
+    selectedNavItem.value = 'all'
+    const secondAll = filteredAssets.value
+    await nextTick()
+
+    // If transformAssetForDisplay is memoized per asset, the display items for
+    // the unchanged underlying assets should be the very same object identity
+    // when we navigate back to 'all'. Without memoization every re-render
+    // produces brand-new objects, which forces downstream components
+    // (AssetGrid / AssetCard) to re-render every card.
+    const reusedReferences = secondAll.filter(
+      (item) => firstAllSnapshot.get(item.id) === item
+    ).length
+
+    expect(reusedReferences).toBe(ASSET_COUNT)
+  })
+})
diff --git a/src/platform/assets/composables/useAssetBrowser.ts b/src/platform/assets/composables/useAssetBrowser.ts
index 6879ae8125..03f042a4de 100644
--- a/src/platform/assets/composables/useAssetBrowser.ts
+++ b/src/platform/assets/composables/useAssetBrowser.ts
@@ -4,7 +4,7 @@ import { useFuse } from '@vueuse/integrations/useFuse'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import { storeToRefs } from 'pinia'
 
-import { d, t } from '@/i18n'
+import { t } from '@/i18n'
 import type {
   AssetFilterState,
   OwnershipOption
@@ -38,12 +38,51 @@ export interface AssetDisplayItem extends AssetItem {
   secondaryText: string
   badges: AssetBadge[]
   stats: {
-    formattedDate?: string
     downloadCount?: string
     stars?: string
   }
 }
 
+const displayItemCache = new WeakMap<AssetItem, AssetDisplayItem>()
+
+function buildDisplayItem(asset: AssetItem): AssetDisplayItem {
+  const badges: AssetBadge[] = []
+
+  const typeTag = asset.tags.find((tag) => tag !== 'models')
+  if (typeTag) {
+    const badgeLabel = typeTag.includes('/')
+      ? typeTag.substring(typeTag.indexOf('/') + 1)
+      : typeTag
+
+    badges.push({ label: badgeLabel, type: 'type' })
+  }
+
+  for (const model of getAssetBaseModels(asset)) {
+    badges.push({ label: model, type: 'base' })
+  }
+
+  // Intentionally no formatted date here — the WeakMap caches by AssetItem
+  // reference, so a pre-formatted string would pin the locale active at first
+  // transform. AssetCard formats `created_at` at render via `d()` instead.
+  return {
+    ...asset,
+    secondaryText: getAssetFilename(asset),
+    badges,
+    stats: {
+      downloadCount: undefined,
+      stars: undefined
+    }
+  }
+}
+
+function transformAssetForDisplay(asset: AssetItem): AssetDisplayItem {
+  const cached = displayItemCache.get(asset)
+  if (cached) return cached
+  const built = buildDisplayItem(asset)
+  displayItemCache.set(asset, built)
+  return built
+}
+
 /**
  * Asset Browser composable
  * Manages search, filtering, asset transformation and selection logic
@@ -82,46 +121,6 @@ export function useAssetBrowser(
     return selectedNavItem.value
   })
 
-  // Transform API asset to display asset
-  function transformAssetForDisplay(asset: AssetItem): AssetDisplayItem {
-    const secondaryText = getAssetFilename(asset)
-
-    const badges: AssetBadge[] = []
-
-    const typeTag = asset.tags.find((tag) => tag !== 'models')
-    // Type badge from non-root tag
-    if (typeTag) {
-      // Remove category prefix from badge label (e.g. "checkpoint/model" → "model")
-      const badgeLabel = typeTag.includes('/')
-        ? typeTag.substring(typeTag.indexOf('/') + 1)
-        : typeTag
-
-      badges.push({ label: badgeLabel, type: 'type' })
-    }
-
-    // Base model badges from metadata
-    const baseModels = getAssetBaseModels(asset)
-    for (const model of baseModels) {
-      badges.push({ label: model, type: 'base' })
-    }
-
-    // Create display stats from API data
-    const stats = {
-      formattedDate: asset.created_at
-        ? d(new Date(asset.created_at), { dateStyle: 'short' })
-        : undefined,
-      downloadCount: undefined, // Not available in API
-      stars: undefined // Not available in API
-    }
-
-    return {
-      ...asset,
-      secondaryText,
-      badges,
-      stats
-    }
-  }
-
   const typeCategories = computed<NavItemData[]>(() => {
     const categories = assets.value
       .filter((asset) => asset.tags.includes(MODELS_TAG))
diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts
index 375a90abec..60165076c9 100644
--- a/src/platform/assets/composables/useMediaAssetActions.test.ts
+++ b/src/platform/assets/composables/useMediaAssetActions.test.ts
@@ -78,13 +78,20 @@ vi.mock('@/composables/useCopyToClipboard', () => ({
   })
 }))
 
+const mockExportWorkflowAction = vi.hoisted(() => vi.fn())
+const mockOpenWorkflowAction = vi.hoisted(() => vi.fn())
 vi.mock('@/platform/workflow/core/services/workflowActionsService', () => ({
   useWorkflowActionsService: () => ({
-    openWorkflowAction: vi.fn(),
-    exportWorkflowAction: vi.fn()
+    openWorkflowAction: mockOpenWorkflowAction,
+    exportWorkflowAction: mockExportWorkflowAction
   })
 }))
 
+const mockExtractWorkflowFromAsset = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/workflow/utils/workflowExtractionUtil', () => ({
+  extractWorkflowFromAsset: mockExtractWorkflowFromAsset
+}))
+
 vi.mock('@/services/litegraphService', () => ({
   useLitegraphService: () => ({
     addNodeOnGraph: vi.fn().mockReturnValue(
@@ -167,6 +174,52 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
+const mockAppGraph = vi.hoisted(() => ({ value: { _nodes: [] as unknown[] } }))
+vi.mock('@/scripts/app', () => ({
+  app: {
+    get graph() {
+      return mockAppGraph.value
+    },
+    get rootGraph() {
+      return mockAppGraph.value
+    }
+  }
+}))
+
+const mockRemoveNodeOutputs = vi.hoisted(() => vi.fn())
+const mockRemoveNodeOutputsForNode = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/nodeOutputStore', () => ({
+  useNodeOutputStore: () => ({
+    removeNodeOutputs: mockRemoveNodeOutputs,
+    removeNodeOutputsForNode: mockRemoveNodeOutputsForNode
+  })
+}))
+
+const mockCaptureCanvasState = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    activeWorkflow: {
+      changeTracker: { captureCanvasState: mockCaptureCanvasState }
+    }
+  })
+}))
+
+const mockClearNodePreviewCache = vi.hoisted(() => vi.fn())
+vi.mock('../utils/clearNodePreviewCacheForValues', () => ({
+  clearNodePreviewCacheForValues: mockClearNodePreviewCache,
+  findNodesReferencingValues: vi.fn(() => [])
+}))
+
+const mockClearWidgetValues = vi.hoisted(() => vi.fn())
+vi.mock('../utils/clearDeletedAssetWidgetValues', () => ({
+  clearDeletedAssetWidgetValues: mockClearWidgetValues
+}))
+
+const mockMarkMissingMedia = vi.hoisted(() => vi.fn())
+vi.mock('../utils/markDeletedAssetsAsMissingMedia', () => ({
+  markDeletedAssetsAsMissingMedia: mockMarkMissingMedia
+}))
+
 function createMockAsset(overrides: Partial<AssetItem> = {}): AssetItem {
   return {
     id: 'test-asset-id',
@@ -330,6 +383,109 @@ describe('useMediaAssetActions', () => {
     })
   })
 
+  describe('exportWorkflow', () => {
+    const successResult = { success: true } as const
+    const cancelledResult = { success: false, cancelled: true } as const
+    const failureResult = { success: false, error: 'boom' } as const
+    const noWorkflowResult = {
+      success: false,
+      error: 'No workflow data available'
+    } as const
+
+    beforeEach(() => {
+      mockExtractWorkflowFromAsset.mockResolvedValue({
+        workflow: { version: 0.4 },
+        filename: 'export.json'
+      })
+    })
+
+    it('does not show a toast when the user cancels the filename prompt', async () => {
+      mockExportWorkflowAction.mockResolvedValue(cancelledResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportWorkflow(createMockAsset())
+
+      expect(useToast().add).not.toHaveBeenCalled()
+    })
+
+    it('shows a success toast on successful export', async () => {
+      mockExportWorkflowAction.mockResolvedValue(successResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportWorkflow(createMockAsset())
+
+      expect(useToast().add).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'success' })
+      )
+    })
+
+    it('shows an error toast on actual failure', async () => {
+      mockExportWorkflowAction.mockResolvedValue(failureResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportWorkflow(createMockAsset())
+
+      expect(useToast().add).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'error' })
+      )
+    })
+
+    it('shows a warning toast when the workflow is missing', async () => {
+      mockExportWorkflowAction.mockResolvedValue(noWorkflowResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportWorkflow(createMockAsset())
+
+      expect(useToast().add).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'warn' })
+      )
+    })
+
+    it('shows no toast when every asset in a bulk export is cancelled', async () => {
+      mockExportWorkflowAction.mockResolvedValue(cancelledResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportMultipleWorkflows([
+        createMockAsset({ id: 'a' }),
+        createMockAsset({ id: 'b' })
+      ])
+
+      expect(useToast().add).not.toHaveBeenCalled()
+    })
+
+    it('shows a success toast for the succeeded subset when some bulk exports are cancelled', async () => {
+      mockExportWorkflowAction
+        .mockResolvedValueOnce(successResult)
+        .mockResolvedValueOnce(cancelledResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportMultipleWorkflows([
+        createMockAsset({ id: 'a' }),
+        createMockAsset({ id: 'b' })
+      ])
+
+      expect(useToast().add).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'success' })
+      )
+    })
+
+    it('shows a partial-success warning toast when some bulk exports fail outright', async () => {
+      mockExportWorkflowAction
+        .mockResolvedValueOnce(successResult)
+        .mockResolvedValueOnce(failureResult)
+      const actions = useMediaAssetActions()
+
+      await actions.exportMultipleWorkflows([
+        createMockAsset({ id: 'a' }),
+        createMockAsset({ id: 'b' })
+      ])
+
+      expect(useToast().add).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'warn' })
+      )
+    })
+  })
+
   describe('downloadAssets', () => {
     it('downloads the injected media asset when called without explicit assets', () => {
       const mediaAsset = createMockMediaAsset({
@@ -793,4 +949,120 @@ describe('useMediaAssetActions', () => {
       expect(dialogProps.itemList).toEqual(['fallback-image.png'])
     })
   })
+
+  describe('deleteAssets — FE-230 preview cache clearing', () => {
+    beforeEach(() => {
+      mockIsCloud.value = true
+      mockGetAssetType.mockReturnValue('input')
+      mockDeleteAsset.mockReset()
+      mockShowDialog.mockImplementation(
+        (opts: {
+          props: {
+            onConfirm: () => Promise<void> | void
+          }
+        }) => {
+          void opts.props.onConfirm()
+        }
+      )
+      mockAppGraph.value = { _nodes: [] }
+    })
+
+    it('invokes clearNodePreviewCacheForValues with canonical widget-value variants', async () => {
+      mockDeleteAsset.mockResolvedValue(undefined)
+      const actions = useMediaAssetActions()
+      const asset = createMockAsset({
+        id: 'asset-match',
+        name: 'foo.png',
+        asset_hash: 'abc123.png',
+        tags: ['input']
+      })
+
+      await actions.deleteAssets(asset)
+
+      await vi.waitFor(() => {
+        expect(mockClearNodePreviewCache).toHaveBeenCalledTimes(1)
+      })
+      const [graphArg, valuesArg, removeArg] =
+        mockClearNodePreviewCache.mock.calls[0]
+      expect(graphArg).toBe(mockAppGraph.value)
+      expect(valuesArg).toEqual(
+        new Set(['foo.png', 'foo.png [input]', 'abc123.png'])
+      )
+      expect(typeof removeArg).toBe('function')
+
+      const sampleNode = { id: 42 }
+      removeArg(sampleNode)
+      expect(mockRemoveNodeOutputsForNode).toHaveBeenCalledWith(sampleNode)
+      // Locator is resolved from the node's own graph, not from the raw id —
+      // covers Load Image / Load Video nodes nested inside subgraphs.
+      expect(mockRemoveNodeOutputs).not.toHaveBeenCalled()
+
+      expect(mockClearWidgetValues).toHaveBeenCalledWith(
+        mockAppGraph.value,
+        new Set(['foo.png', 'foo.png [input]', 'abc123.png'])
+      )
+
+      expect(mockMarkMissingMedia).toHaveBeenCalledWith(
+        mockAppGraph.value,
+        new Set(['foo.png', 'foo.png [input]', 'abc123.png'])
+      )
+
+      // markMissing + previewCache must run before widget-value clearing,
+      // otherwise findNodesReferencingValues sees blanked widgets and matches
+      // nothing.
+      const markOrder = mockMarkMissingMedia.mock.invocationCallOrder[0]
+      const cacheOrder = mockClearNodePreviewCache.mock.invocationCallOrder[0]
+      const clearOrder = mockClearWidgetValues.mock.invocationCallOrder[0]
+      expect(markOrder).toBeLessThan(clearOrder)
+      expect(cacheOrder).toBeLessThan(clearOrder)
+
+      // Programmatic widget mutation doesn't go through DOM events, so the
+      // workflow won't be flagged as modified unless we capture explicitly.
+      expect(mockCaptureCanvasState).toHaveBeenCalled()
+    })
+
+    it('emits the [output]-annotated variant for output assets, including subfolder', async () => {
+      mockDeleteAsset.mockResolvedValue(undefined)
+      mockGetAssetType.mockReturnValue('output')
+      mockGetOutputAssetMetadata.mockReturnValue({
+        subfolder: 'outputs/2025'
+      })
+      const actions = useMediaAssetActions()
+      const asset = createMockAsset({
+        id: 'asset-output',
+        name: 'gen.png',
+        tags: ['output']
+      })
+
+      await actions.deleteAssets(asset)
+
+      await vi.waitFor(() => {
+        expect(mockClearNodePreviewCache).toHaveBeenCalledTimes(1)
+      })
+      const [, valuesArg] = mockClearNodePreviewCache.mock.calls[0]
+      expect(valuesArg).toEqual(new Set(['outputs/2025/gen.png [output]']))
+      expect(valuesArg.has('gen.png')).toBe(false)
+      expect(valuesArg.has('gen.png [input]')).toBe(false)
+    })
+
+    it('omits filenames of failed deletions and skips the helper when nothing was deleted', async () => {
+      mockDeleteAsset.mockRejectedValue(new Error('boom'))
+      const actions = useMediaAssetActions()
+      const asset = createMockAsset({
+        id: 'asset-failed',
+        name: 'failed.png',
+        asset_hash: 'failhash.png'
+      })
+
+      await actions.deleteAssets(asset)
+
+      await vi.waitFor(() => {
+        expect(mockDeleteAsset).toHaveBeenCalled()
+      })
+      expect(mockClearNodePreviewCache).not.toHaveBeenCalled()
+      expect(mockClearWidgetValues).not.toHaveBeenCalled()
+      expect(mockMarkMissingMedia).not.toHaveBeenCalled()
+      expect(mockCaptureCanvasState).not.toHaveBeenCalled()
+    })
+  })
 })
diff --git a/src/platform/assets/composables/useMediaAssetActions.ts b/src/platform/assets/composables/useMediaAssetActions.ts
index 3f9b8e6ab7..b45fed3458 100644
--- a/src/platform/assets/composables/useMediaAssetActions.ts
+++ b/src/platform/assets/composables/useMediaAssetActions.ts
@@ -7,16 +7,22 @@ import { downloadFile } from '@/base/common/downloadUtil'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { isCloud } from '@/platform/distribution/types'
 import { useWorkflowActionsService } from '@/platform/workflow/core/services/workflowActionsService'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { extractWorkflowFromAsset } from '@/platform/workflow/utils/workflowExtractionUtil'
 import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { getOutputAssetMetadata } from '../schemas/assetMetadataSchema'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useDialogStore } from '@/stores/dialogStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { getAssetDisplayName } from '../utils/assetMetadataUtils'
 import { getAssetType } from '../utils/assetTypeUtil'
 import { getAssetUrl } from '../utils/assetUrlUtil'
+import { clearDeletedAssetWidgetValues } from '../utils/clearDeletedAssetWidgetValues'
+import { clearNodePreviewCacheForValues } from '../utils/clearNodePreviewCacheForValues'
+import { markDeletedAssetsAsMissingMedia } from '../utils/markDeletedAssetsAsMissingMedia'
 import { getAssetOutputCount } from '../utils/outputAssetUtil'
 import { createAnnotatedPath } from '@/utils/createAnnotatedPath'
 import { detectNodeTypeFromFilename } from '@/utils/loaderNodeUtil'
@@ -30,6 +36,35 @@ import { assetService } from '../services/assetService'
 
 const EXCLUDED_TAGS = new Set(['models', 'input', 'output'])
 
+/**
+ * Canonical widget-value strings that may reference this asset, scoped by the
+ * asset's source type so basenames cannot cross-match across input/output.
+ *
+ * Output assets emit `<name> [output]` (and the subfolder-prefixed form when
+ * present in metadata). Input/temp assets emit the bare name plus the explicit
+ * annotation. `asset_hash` is included whenever present, since cloud-stored
+ * assets can be referenced by hash.
+ */
+function widgetValueVariantsForAsset(asset: AssetItem): string[] {
+  const variants: string[] = []
+  const type = getAssetType(asset, 'input')
+  const name = asset.name
+  if (name) {
+    if (type === 'output') {
+      const subfolder = getOutputAssetMetadata(asset.user_metadata)?.subfolder
+      const path = subfolder ? `${subfolder}/${name}` : name
+      variants.push(`${path} [output]`)
+    } else if (type === 'temp') {
+      variants.push(`${name} [temp]`)
+    } else {
+      variants.push(name)
+      variants.push(`${name} [input]`)
+    }
+  }
+  if (asset.asset_hash) variants.push(asset.asset_hash)
+  return variants
+}
+
 export function useMediaAssetActions() {
   const { t } = useI18n()
   const toast = useToast()
@@ -343,6 +378,8 @@ export function useMediaAssetActions() {
       filename
     )
 
+    if (result.cancelled) return
+
     if (!result.success) {
       const isNoWorkflow = result.error?.includes('No workflow')
       toast.add({
@@ -530,7 +567,7 @@ export function useMediaAssetActions() {
 
         if (result.success) {
           succeeded++
-        } else {
+        } else if (!result.cancelled) {
           failed++
         }
       } catch {
@@ -538,6 +575,9 @@ export function useMediaAssetActions() {
       }
     }
 
+    // All cancelled
+    if (succeeded === 0 && failed === 0) return
+
     if (failed === 0) {
       toast.add({
         severity: 'success',
@@ -639,6 +679,31 @@ export function useMediaAssetActions() {
                 await assetsStore.updateInputs()
               }
 
+              const rootGraph = app.rootGraph
+              if (rootGraph) {
+                const deletedValues = new Set<string>()
+                assetArray.forEach((asset, index) => {
+                  if (results[index].status !== 'fulfilled') return
+                  for (const value of widgetValueVariantsForAsset(asset)) {
+                    deletedValues.add(value)
+                  }
+                })
+                if (deletedValues.size > 0) {
+                  const nodeOutputStore = useNodeOutputStore()
+                  // Order matters: mark + cache-clear both look up nodes by
+                  // current widget.value, so they must run before
+                  // clearDeletedAssetWidgetValues blanks those values.
+                  markDeletedAssetsAsMissingMedia(rootGraph, deletedValues)
+                  clearNodePreviewCacheForValues(
+                    rootGraph,
+                    deletedValues,
+                    (node) => nodeOutputStore.removeNodeOutputsForNode(node)
+                  )
+                  clearDeletedAssetWidgetValues(rootGraph, deletedValues)
+                  useWorkflowStore().activeWorkflow?.changeTracker?.captureCanvasState()
+                }
+              }
+
               // Invalidate model caches for affected categories
               const modelCategories = new Set<string>()
 
diff --git a/src/platform/assets/mappings/modelNodeMappings.ts b/src/platform/assets/mappings/modelNodeMappings.ts
index fd2d60f590..9ce9da8667 100644
--- a/src/platform/assets/mappings/modelNodeMappings.ts
+++ b/src/platform/assets/mappings/modelNodeMappings.ts
@@ -52,9 +52,6 @@ export const MODEL_NODE_MAPPINGS: ReadonlyArray<
   // ---- SAM3 3D segmentation (comfyui-sam3) ----
   ['sam3', 'LoadSAM3Model', 'model_path'],
 
-  // ---- Ultralytics detection (comfyui-impact-subpack) ----
-  ['ultralytics', 'UltralyticsDetectorProvider', 'model_name'],
-
   // ---- DepthAnything (comfyui-depthanythingv2, comfyui-depthanythingv3) ----
   ['depthanything', 'DownloadAndLoadDepthAnythingV2Model', 'model'],
   ['depthanything3', 'DownloadAndLoadDepthAnythingV3Model', 'model'],
@@ -200,5 +197,18 @@ export const MODEL_NODE_MAPPINGS: ReadonlyArray<
   ['mediapipe', 'LivePortraitLoadMediaPipeCropper', ''],
 
   // ---- Superprompt text enhancement ----
-  ['superprompt-v1', 'Superprompt', '']
+  ['superprompt-v1', 'Superprompt', ''],
+
+  // ---- ComfyUI core background removal (v0.21+) ----
+  ['background_removal', 'LoadBackgroundRemovalModel', 'bg_removal_name'],
+
+  // ---- ComfyUI core frame interpolation (v0.21+) ----
+  ['frame_interpolation', 'FrameInterpolationModelLoader', 'model_name'],
+
+  // ---- FILM frame interpolation (ComfyUI-Frame-Interpolation) ----
+  ['film', 'FILM VFI', 'ckpt_name'],
+
+  // ---- Ultralytics YOLO detectors (ComfyUI-Impact-Pack) ----
+  ['ultralytics/bbox', 'UltralyticsDetectorProvider', 'model_name'],
+  ['ultralytics/segm', 'UltralyticsDetectorProvider', 'model_name']
 ] as const satisfies ReadonlyArray<readonly [string, string, string]>
diff --git a/src/platform/assets/schemas/assetSchema.ts b/src/platform/assets/schemas/assetSchema.ts
index bd31113009..0f7017fea7 100644
--- a/src/platform/assets/schemas/assetSchema.ts
+++ b/src/platform/assets/schemas/assetSchema.ts
@@ -1,3 +1,4 @@
+import { zListAssetsResponse } from '@comfyorg/ingest-types/zod'
 import { z } from 'zod'
 
 // Zod schemas for asset API validation matching ComfyUI Assets REST API spec
@@ -20,11 +21,11 @@ const zAsset = z.object({
   user_metadata: z.record(z.unknown()).optional() // API allows arbitrary key-value pairs
 })
 
-const zAssetResponse = z.object({
-  assets: z.array(zAsset).optional(),
-  total: z.number().optional(),
-  has_more: z.boolean().optional()
-})
+const zAssetResponse = zListAssetsResponse
+  .pick({ total: true, has_more: true })
+  .extend({
+    assets: z.array(zAsset)
+  })
 
 const zModelFolder = z.object({
   name: z.string(),
diff --git a/src/platform/assets/services/assetService.test.ts b/src/platform/assets/services/assetService.test.ts
index e718cb3d72..580919d10c 100644
--- a/src/platform/assets/services/assetService.test.ts
+++ b/src/platform/assets/services/assetService.test.ts
@@ -1,11 +1,12 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type {
+  AssetItem,
+  AssetResponse
+} from '@/platform/assets/schemas/assetSchema'
 import {
   MISSING_TAG,
-  assetService,
-  isBlake3AssetHash,
-  toBlake3AssetHash
+  assetService
 } from '@/platform/assets/services/assetService'
 import { api } from '@/scripts/api'
 
@@ -49,9 +50,10 @@ vi.mock('@/i18n', () => ({
 
 const fetchApiMock = vi.mocked(api.fetchApi)
 
-const validBlake3Hash =
-  '1111111111111111111111111111111111111111111111111111111111111111'
-const validBlake3AssetHash = `blake3:${validBlake3Hash}`
+type AssetListResponseOptions = {
+  hasMore?: AssetResponse['has_more']
+  total?: AssetResponse['total']
+}
 
 function buildResponse(
   body: unknown,
@@ -64,6 +66,13 @@ function buildResponse(
   } as unknown as Response
 }
 
+function buildAssetListResponse(
+  assets: AssetItem[],
+  { hasMore = false, total = assets.length }: AssetListResponseOptions = {}
+): Response {
+  return buildResponse({ assets, total, has_more: hasMore })
+}
+
 function validAsset(overrides: Partial<AssetItem> = {}): AssetItem {
   return {
     id: 'asset-1',
@@ -189,25 +198,6 @@ describe(assetService.getAssetMetadata, () => {
   })
 })
 
-describe(isBlake3AssetHash, () => {
-  it('accepts only prefixed 64-character blake3 hashes', () => {
-    expect(isBlake3AssetHash(validBlake3AssetHash)).toBe(true)
-    expect(isBlake3AssetHash('BLAKE3:' + validBlake3Hash.toUpperCase())).toBe(
-      true
-    )
-    expect(isBlake3AssetHash('blake3:abc')).toBe(false)
-    expect(isBlake3AssetHash(validBlake3Hash)).toBe(false)
-  })
-})
-
-describe(toBlake3AssetHash, () => {
-  it('normalizes 64-character blake3 hex values to asset hashes', () => {
-    expect(toBlake3AssetHash(validBlake3Hash)).toBe(validBlake3AssetHash)
-    expect(toBlake3AssetHash('abc')).toBeNull()
-    expect(toBlake3AssetHash(undefined)).toBeNull()
-  })
-})
-
 describe(assetService.uploadAssetFromUrl, () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -218,7 +208,7 @@ describe(assetService.uploadAssetFromUrl, () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(buildResponse({ id: 'missing-name' }))
 
     await assetService.getInputAssetsIncludingPublic()
@@ -240,7 +230,7 @@ describe(assetService.uploadAssetFromUrl, () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(
         buildResponse(validAsset({ id: 'uploaded-input', tags: ['input'] }))
       )
@@ -301,7 +291,7 @@ describe(assetService.uploadAssetFromBase64, () => {
       .spyOn(globalThis, 'fetch')
       .mockResolvedValueOnce(new Response('hello'))
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(buildResponse({ id: 'missing-name' }))
 
     await assetService.getInputAssetsIncludingPublic()
@@ -327,7 +317,7 @@ describe(assetService.uploadAssetFromBase64, () => {
       .spyOn(globalThis, 'fetch')
       .mockResolvedValueOnce(new Response('hello'))
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(
         buildResponse({
           ...validAsset({ id: 'uploaded-input', tags: ['input'] }),
@@ -421,17 +411,14 @@ describe(assetService.getAssetModelFolders, () => {
     vi.clearAllMocks()
   })
 
-  it('filters out missing-tagged assets and blacklisted directories, returning alphabetical unique folders without include_public', async () => {
+  it('requests missing-tag exclusion and returns alphabetical unique folders without include_public', async () => {
     fetchApiMock.mockResolvedValueOnce(
-      buildResponse({
-        assets: [
-          validAsset({ id: 'a', tags: ['models', 'loras'] }),
-          validAsset({ id: 'b', tags: ['models', 'checkpoints'] }),
-          validAsset({ id: 'c', tags: ['models', 'configs'] }),
-          validAsset({ id: 'd', tags: ['models', 'missing', 'controlnet'] }),
-          validAsset({ id: 'e', tags: ['models', 'loras'] })
-        ]
-      })
+      buildAssetListResponse([
+        validAsset({ id: 'a', tags: ['models', 'loras'] }),
+        validAsset({ id: 'b', tags: ['models', 'checkpoints'] }),
+        validAsset({ id: 'c', tags: ['models', 'configs'] }),
+        validAsset({ id: 'e', tags: ['models', 'loras'] })
+      ])
     )
 
     const folders = await assetService.getAssetModelFolders()
@@ -444,6 +431,7 @@ describe(assetService.getAssetModelFolders, () => {
     const requestedUrl = fetchApiMock.mock.calls[0]?.[0] as string
     const params = new URL(requestedUrl, 'http://localhost').searchParams
     expect(params.has('include_public')).toBe(false)
+    expect(params.get('exclude_tags')).toBe(MISSING_TAG)
   })
 })
 
@@ -490,14 +478,9 @@ describe(assetService.getAssetsByTag, () => {
     vi.clearAllMocks()
   })
 
-  it('forwards include_public=true by default and excludes missing-tagged assets', async () => {
+  it('forwards include_public=true by default and requests missing-tag exclusion', async () => {
     fetchApiMock.mockResolvedValueOnce(
-      buildResponse({
-        assets: [
-          validAsset({ id: 'visible', tags: ['input'] }),
-          validAsset({ id: 'hidden', tags: ['input', 'missing'] })
-        ]
-      })
+      buildAssetListResponse([validAsset({ id: 'visible', tags: ['input'] })])
     )
 
     const assets = await assetService.getAssetsByTag('input')
@@ -507,6 +490,20 @@ describe(assetService.getAssetsByTag, () => {
     const requestedUrl = fetchApiMock.mock.calls[0]?.[0] as string
     const params = new URL(requestedUrl, 'http://localhost').searchParams
     expect(params.get('include_public')).toBe('true')
+    expect(params.get('exclude_tags')).toBe(MISSING_TAG)
+  })
+
+  it('normalizes tag query parameters', async () => {
+    fetchApiMock.mockResolvedValueOnce(
+      buildAssetListResponse([validAsset({ id: 'visible', tags: ['input'] })])
+    )
+
+    await assetService.getAssetsByTag(' input ')
+
+    const requestedUrl = fetchApiMock.mock.calls[0]?.[0] as string
+    const params = new URL(requestedUrl, 'http://localhost').searchParams
+    expect(params.get('include_tags')).toBe('input')
+    expect(params.get('exclude_tags')).toBe(MISSING_TAG)
   })
 })
 
@@ -518,17 +515,16 @@ describe(assetService.getAllAssetsByTag, () => {
   it('paginates tagged asset requests with include_public=true', async () => {
     fetchApiMock
       .mockResolvedValueOnce(
-        buildResponse({
-          assets: [
+        buildAssetListResponse(
+          [
             validAsset({ id: 'a', tags: ['input'] }),
             validAsset({ id: 'b', tags: ['input'] })
-          ]
-        })
+          ],
+          { hasMore: true }
+        )
       )
       .mockResolvedValueOnce(
-        buildResponse({
-          assets: [validAsset({ id: 'c', tags: ['input'] })]
-        })
+        buildAssetListResponse([validAsset({ id: 'c', tags: ['input'] })])
       )
 
     const assets = await assetService.getAllAssetsByTag('input', true, {
@@ -540,63 +536,33 @@ describe(assetService.getAllAssetsByTag, () => {
     const firstUrl = fetchApiMock.mock.calls[0]?.[0] as string
     const firstParams = new URL(firstUrl, 'http://localhost').searchParams
     expect(firstParams.get('include_public')).toBe('true')
+    expect(firstParams.get('exclude_tags')).toBe(MISSING_TAG)
     expect(firstParams.get('limit')).toBe('2')
     expect(firstParams.has('offset')).toBe(false)
 
     const secondUrl = fetchApiMock.mock.calls[1]?.[0] as string
     const secondParams = new URL(secondUrl, 'http://localhost').searchParams
     expect(secondParams.get('include_public')).toBe('true')
+    expect(secondParams.get('exclude_tags')).toBe(MISSING_TAG)
     expect(secondParams.get('limit')).toBe('2')
     expect(secondParams.get('offset')).toBe('2')
   })
 
-  it('paginates from raw response size before filtering missing-tagged assets', async () => {
-    fetchApiMock
-      .mockResolvedValueOnce(
-        buildResponse({
-          assets: [
-            validAsset({ id: 'visible', tags: ['input'] }),
-            validAsset({ id: 'hidden', tags: ['input', MISSING_TAG] })
-          ]
-        })
-      )
-      .mockResolvedValueOnce(
-        buildResponse({
-          assets: [validAsset({ id: 'later-public', tags: ['input'] })]
-        })
-      )
-
-    const assets = await assetService.getAllAssetsByTag('input', true, {
-      limit: 2
-    })
-
-    expect(assets.map((a) => a.id)).toEqual(['visible', 'later-public'])
-    expect(fetchApiMock).toHaveBeenCalledTimes(2)
-
-    const secondUrl = fetchApiMock.mock.calls[1]?.[0]
-    if (typeof secondUrl !== 'string') {
-      throw new Error('Expected a second asset request URL')
-    }
-    const secondParams = new URL(secondUrl, 'http://localhost').searchParams
-    expect(secondParams.get('offset')).toBe('2')
-  })
-
   it('honors has_more when walking tagged asset pages', async () => {
     fetchApiMock
       .mockResolvedValueOnce(
-        buildResponse({
-          assets: [
+        buildAssetListResponse(
+          [
             validAsset({ id: 'first', tags: ['input'] }),
             validAsset({ id: 'second', tags: ['input'] })
           ],
-          has_more: true
-        })
+          { hasMore: true }
+        )
       )
       .mockResolvedValueOnce(
-        buildResponse({
-          assets: [validAsset({ id: 'later-public', tags: ['input'] })],
-          has_more: false
-        })
+        buildAssetListResponse([
+          validAsset({ id: 'later-public', tags: ['input'] })
+        ])
       )
 
     const assets = await assetService.getAllAssetsByTag('input', true, {
@@ -614,12 +580,41 @@ describe(assetService.getAllAssetsByTag, () => {
     expect(secondParams.get('offset')).toBe('2')
   })
 
+  it.for([
+    {
+      name: 'missing has_more',
+      body: {
+        assets: [validAsset({ id: 'a', tags: ['input'] })],
+        total: 1
+      }
+    },
+    {
+      name: 'missing total',
+      body: {
+        assets: [validAsset({ id: 'a', tags: ['input'] })],
+        has_more: false
+      }
+    },
+    {
+      name: 'non-boolean has_more',
+      body: {
+        assets: [validAsset({ id: 'a', tags: ['input'] })],
+        total: 1,
+        has_more: 'false'
+      }
+    }
+  ])('rejects asset responses with $name', async ({ body }) => {
+    fetchApiMock.mockResolvedValueOnce(buildResponse(body))
+
+    await expect(
+      assetService.getAllAssetsByTag('input', true, { limit: 2 })
+    ).rejects.toThrow(/Invalid asset response/)
+  })
+
   it('passes abort signals through paginated requests', async () => {
     const controller = new AbortController()
     fetchApiMock.mockResolvedValueOnce(
-      buildResponse({
-        assets: [validAsset({ id: 'a', tags: ['input'] })]
-      })
+      buildAssetListResponse([validAsset({ id: 'a', tags: ['input'] })])
     )
 
     await assetService.getAllAssetsByTag('input', true, {
@@ -636,12 +631,13 @@ describe(assetService.getAllAssetsByTag, () => {
     const controller = new AbortController()
     fetchApiMock.mockImplementationOnce(async () => {
       controller.abort()
-      return buildResponse({
-        assets: [
+      return buildAssetListResponse(
+        [
           validAsset({ id: 'a', tags: ['input'] }),
           validAsset({ id: 'b', tags: ['input'] })
-        ]
-      })
+        ],
+        { hasMore: true }
+      )
     })
 
     await expect(
@@ -666,7 +662,7 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
       validAsset({ id: 'user-input', tags: ['input'] }),
       validAsset({ id: 'public-input', tags: ['input'], is_immutable: true })
     ]
-    fetchApiMock.mockResolvedValueOnce(buildResponse({ assets }))
+    fetchApiMock.mockResolvedValueOnce(buildAssetListResponse(assets))
 
     const first = await assetService.getInputAssetsIncludingPublic()
     const second = await assetService.getInputAssetsIncludingPublic()
@@ -685,8 +681,8 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     const freshAssets = [validAsset({ id: 'fresh-input', tags: ['input'] })]
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
-      .mockResolvedValueOnce(buildResponse({ assets: freshAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
+      .mockResolvedValueOnce(buildAssetListResponse(freshAssets))
 
     await assetService.getInputAssetsIncludingPublic()
     assetService.invalidateInputAssetsIncludingPublic()
@@ -720,7 +716,7 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     await expect(first).rejects.toMatchObject({ name: 'AbortError' })
     expect(serviceSignal).toBeUndefined()
 
-    resolveResponse(buildResponse({ assets }))
+    resolveResponse(buildAssetListResponse(assets))
 
     await expect(second).resolves.toEqual(assets)
     expect(fetchApiMock).toHaveBeenCalledOnce()
@@ -750,7 +746,7 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     await expect(first).rejects.toMatchObject({ name: 'AbortError' })
     await expect(second).rejects.toMatchObject({ name: 'AbortError' })
 
-    resolveResponse(buildResponse({ assets }))
+    resolveResponse(buildAssetListResponse(assets))
     await Promise.resolve()
 
     await expect(assetService.getInputAssetsIncludingPublic()).resolves.toEqual(
@@ -770,12 +766,12 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
             resolveResponse = resolve
           })
       )
-      .mockResolvedValueOnce(buildResponse({ assets: freshAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(freshAssets))
 
     const inFlight = assetService.getInputAssetsIncludingPublic()
     assetService.invalidateInputAssetsIncludingPublic()
 
-    resolveResponse(buildResponse({ assets }))
+    resolveResponse(buildAssetListResponse(assets))
 
     await expect(inFlight).resolves.toEqual(assets)
     await expect(assetService.getInputAssetsIncludingPublic()).resolves.toEqual(
@@ -788,9 +784,9 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     const freshAssets = [validAsset({ id: 'fresh-input', tags: ['input'] })]
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(buildResponse(null))
-      .mockResolvedValueOnce(buildResponse({ assets: freshAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(freshAssets))
 
     await assetService.getInputAssetsIncludingPublic()
     await assetService.deleteAsset('stale-input')
@@ -809,9 +805,9 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     const uploadedAsset = validAsset({ id: 'uploaded-input', tags: ['input'] })
     const freshAssets = [uploadedAsset]
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(buildResponse(uploadedAsset))
-      .mockResolvedValueOnce(buildResponse({ assets: freshAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(freshAssets))
 
     await assetService.getInputAssetsIncludingPublic()
     await assetService.uploadAssetAsync({
@@ -827,7 +823,7 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
   it('does not invalidate cached input assets for pending async input uploads', async () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(
         buildResponse(
           { task_id: 'task-1', status: 'running' },
@@ -849,7 +845,7 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
   it('does not invalidate cached input assets for non-input uploads', async () => {
     const staleAssets = [validAsset({ id: 'stale-input', tags: ['input'] })]
     fetchApiMock
-      .mockResolvedValueOnce(buildResponse({ assets: staleAssets }))
+      .mockResolvedValueOnce(buildAssetListResponse(staleAssets))
       .mockResolvedValueOnce(buildResponse(validAsset({ tags: ['models'] })))
 
     await assetService.getInputAssetsIncludingPublic()
@@ -863,37 +859,3 @@ describe(assetService.getInputAssetsIncludingPublic, () => {
     expect(fetchApiMock).toHaveBeenCalledTimes(2)
   })
 })
-
-describe(assetService.checkAssetHash, () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it.each([
-    [200, 'exists'],
-    [404, 'missing'],
-    [400, 'invalid']
-  ] as const)('maps %s responses to %s', async (status, expected) => {
-    const hash =
-      'blake3:1111111111111111111111111111111111111111111111111111111111111111'
-    fetchApiMock.mockResolvedValueOnce(buildResponse(null, { status }))
-
-    await expect(assetService.checkAssetHash(hash)).resolves.toBe(expected)
-
-    expect(fetchApiMock).toHaveBeenCalledWith(
-      `/assets/hash/${encodeURIComponent(hash)}`,
-      {
-        method: 'HEAD',
-        signal: undefined
-      }
-    )
-  })
-
-  it('throws for unexpected responses', async () => {
-    fetchApiMock.mockResolvedValueOnce(buildResponse(null, { status: 500 }))
-
-    await expect(assetService.checkAssetHash('blake3:abc')).rejects.toThrow(
-      'Unexpected asset hash check status: 500'
-    )
-  })
-})
diff --git a/src/platform/assets/services/assetService.ts b/src/platform/assets/services/assetService.ts
index 65132bace7..3ac5dc2c71 100644
--- a/src/platform/assets/services/assetService.ts
+++ b/src/platform/assets/services/assetService.ts
@@ -36,6 +36,7 @@ interface AssetPaginationOptions extends PaginationOptions {
 
 interface AssetRequestOptions extends PaginationOptions {
   includeTags: string[]
+  excludeTags?: string[]
   includePublic?: boolean
   signal?: AbortSignal
 }
@@ -181,27 +182,12 @@ const INPUT_ASSETS_WITH_PUBLIC_LIMIT = 500
 export const MODELS_TAG = 'models'
 /** Asset tag used by the backend for placeholder records that are not installed. */
 export const MISSING_TAG = 'missing'
+const DEFAULT_EXCLUDED_ASSET_TAGS = [MISSING_TAG]
 
-/** Result of a HEAD lookup against an exact asset hash. */
-export type AssetHashStatus = 'exists' | 'missing' | 'invalid'
-
-const BLAKE3_ASSET_HASH_PATTERN = /^blake3:[0-9a-f]{64}$/i
-const BLAKE3_HEX_PATTERN = /^[0-9a-f]{64}$/i
 const uploadedAssetResponseSchema = assetItemSchema.extend({
   created_new: z.boolean()
 })
 
-/** Returns true for a prefixed BLAKE3 asset hash: `blake3:<64 hex>`. */
-export function isBlake3AssetHash(value: string): boolean {
-  return BLAKE3_ASSET_HASH_PATTERN.test(value)
-}
-
-/** Converts a raw 64-character BLAKE3 hex digest into an asset hash. */
-export function toBlake3AssetHash(hash: string | undefined): string | null {
-  if (!hash || !BLAKE3_HEX_PATTERN.test(hash)) return null
-  return `blake3:${hash}`
-}
-
 function createAbortError(): DOMException {
   return new DOMException('Aborted', 'AbortError')
 }
@@ -210,6 +196,10 @@ function throwIfAborted(signal?: AbortSignal): void {
   if (signal?.aborted) throw createAbortError()
 }
 
+function normalizeAssetTags(tags: string[]): string[] {
+  return tags.map((tag) => tag.trim()).filter(Boolean)
+}
+
 async function withCallerAbort<T>(
   promise: Promise<T>,
   signal?: AbortSignal
@@ -290,15 +280,22 @@ function createAssetService() {
   ): Promise<AssetResponse> {
     const {
       includeTags,
+      excludeTags = DEFAULT_EXCLUDED_ASSET_TAGS,
       limit = DEFAULT_LIMIT,
       offset,
       includePublic,
       signal
     } = options
+    const normalizedIncludeTags = normalizeAssetTags(includeTags)
+    const normalizedExcludeTags = normalizeAssetTags(excludeTags)
+
     const queryParams = new URLSearchParams({
-      include_tags: includeTags.join(','),
+      include_tags: normalizedIncludeTags.join(','),
       limit: limit.toString()
     })
+    if (normalizedExcludeTags.length > 0) {
+      queryParams.set('exclude_tags', normalizedExcludeTags.join(','))
+    }
     if (offset !== undefined && offset > 0) {
       queryParams.set('offset', offset.toString())
     }
@@ -337,15 +334,10 @@ function createAssetService() {
     // Blacklist directories we don't want to show
     const blacklistedDirectories = new Set(['configs'])
 
-    // Extract directory names from assets that actually exist, exclude missing assets
-    const discoveredFolders = new Set<string>(
-      data?.assets
-        ?.filter((asset) => !asset.tags.includes(MISSING_TAG))
-        ?.flatMap((asset) => asset.tags)
-        ?.filter(
-          (tag) => tag !== MODELS_TAG && !blacklistedDirectories.has(tag)
-        ) ?? []
-    )
+    const folderTags = data.assets
+      .flatMap((asset) => asset.tags)
+      .filter((tag) => tag !== MODELS_TAG && !blacklistedDirectories.has(tag))
+    const discoveredFolders = new Set<string>(folderTags)
 
     // Return only discovered folders in alphabetical order
     const sortedFolders = Array.from(discoveredFolders).toSorted()
@@ -363,17 +355,10 @@ function createAssetService() {
       `models for ${folder}`
     )
 
-    return (
-      data?.assets
-        ?.filter(
-          (asset) =>
-            !asset.tags.includes(MISSING_TAG) && asset.tags.includes(folder)
-        )
-        ?.map((asset) => ({
-          name: asset.name,
-          pathIndex: 0
-        })) ?? []
-    )
+    return data.assets.map((asset) => ({
+      name: asset.name,
+      pathIndex: 0
+    }))
   }
 
   /**
@@ -449,12 +434,7 @@ function createAssetService() {
     )
 
     // Return full AssetItem[] objects (don't strip like getAssetModels does)
-    return (
-      data?.assets?.filter(
-        (asset) =>
-          !asset.tags.includes(MISSING_TAG) && asset.tags.includes(category)
-      ) ?? []
-    )
+    return data.assets
   }
 
   /**
@@ -473,11 +453,8 @@ function createAssetService() {
     }
     const data = await res.json()
 
-    // Validate the single asset response against our schema
-    const result = assetResponseSchema.safeParse({ assets: [data] })
-    if (result.success && result.data.assets?.[0]) {
-      return result.data.assets[0]
-    }
+    const result = assetItemSchema.safeParse(data)
+    if (result.success) return result.data
 
     const error = result.error
       ? fromZodError(result.error)
@@ -503,18 +480,32 @@ function createAssetService() {
     includePublic: boolean = true,
     { limit = DEFAULT_LIMIT, offset = 0, signal }: AssetPaginationOptions = {}
   ): Promise<AssetItem[]> {
-    const data = await handleAssetRequest(
+    const data = await getAssetsPageByTag(tag, includePublic, {
+      limit,
+      offset,
+      signal
+    })
+
+    return data.assets
+  }
+
+  /**
+   * Gets one paginated asset response filtered by a specific tag.
+   */
+  async function getAssetsPageByTag(
+    tag: string,
+    includePublic: boolean = true,
+    { limit = DEFAULT_LIMIT, offset = 0, signal }: AssetPaginationOptions = {}
+  ): Promise<AssetResponse> {
+    return await handleAssetRequest(
       { includeTags: [tag], limit, offset, includePublic, signal },
       `assets for tag ${tag}`
     )
-
-    return (
-      data?.assets?.filter((asset) => !asset.tags.includes(MISSING_TAG)) ?? []
-    )
   }
 
   /**
    * Gets every asset for a tag by walking paginated asset API responses.
+   * Pagination follows the required server-provided `has_more` flag.
    *
    * @param tag - The tag to filter by (e.g., 'models', 'input')
    * @param includePublic - Whether to include public assets (default: true)
@@ -535,23 +526,19 @@ function createAssetService() {
     while (true) {
       if (signal?.aborted) throw createAbortError()
 
-      const data = await handleAssetRequest(
-        {
-          includeTags: [tag],
-          limit: pageSize,
-          offset,
-          includePublic,
-          signal
-        },
-        `assets for tag ${tag}`
-      )
-      const batch = data.assets ?? []
-      assets.push(...batch.filter((asset) => !asset.tags.includes(MISSING_TAG)))
+      const data = await getAssetsPageByTag(tag, includePublic, {
+        limit: pageSize,
+        offset,
+        signal
+      })
+      const batch = data.assets
+      if (batch.length === 0) {
+        return assets
+      }
 
-      const noMoreFromServer = data.has_more === false
-      const inferredLastPage =
-        data.has_more === undefined && batch.length < pageSize
-      if (batch.length === 0 || noMoreFromServer || inferredLastPage) {
+      assets.push(...batch)
+
+      if (!data.has_more) {
         return assets
       }
 
@@ -598,31 +585,6 @@ function createAssetService() {
     return await withCallerAbort(request, signal)
   }
 
-  /**
-   * Checks whether an asset exists for an exact asset hash.
-   *
-   * Uses the HEAD /assets/hash/{hash} endpoint and maps status-only responses:
-   * 200 -> exists, 404 -> missing, and 400 -> invalid hash format.
-   */
-  async function checkAssetHash(
-    assetHash: string,
-    signal?: AbortSignal
-  ): Promise<AssetHashStatus> {
-    const response = await api.fetchApi(
-      `${ASSETS_ENDPOINT}/hash/${encodeURIComponent(assetHash)}`,
-      {
-        method: 'HEAD',
-        signal
-      }
-    )
-
-    if (response.status === 200) return 'exists'
-    if (response.status === 404) return 'missing'
-    if (response.status === 400) return 'invalid'
-
-    throw new Error(`Unexpected asset hash check status: ${response.status}`)
-  }
-
   /**
    * Deletes an asset by ID
    * Only available in cloud environment
@@ -983,10 +945,10 @@ function createAssetService() {
     getAssetsForNodeType,
     getAssetDetails,
     getAssetsByTag,
+    getAssetsPageByTag,
     getAllAssetsByTag,
     getInputAssetsIncludingPublic,
     invalidateInputAssetsIncludingPublic,
-    checkAssetHash,
     deleteAsset,
     updateAsset,
     addAssetTags,
diff --git a/src/platform/assets/utils/assetMetadataUtils.ts b/src/platform/assets/utils/assetMetadataUtils.ts
index eabde69429..ff81ef0495 100644
--- a/src/platform/assets/utils/assetMetadataUtils.ts
+++ b/src/platform/assets/utils/assetMetadataUtils.ts
@@ -1,4 +1,5 @@
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { isCivitaiUrl } from '@/utils/formatUtil'
 
 /**
  * Type-safe utilities for extracting metadata from assets.
@@ -126,16 +127,9 @@ export function getAssetAdditionalTags(asset: AssetItem): string[] {
  * @returns Human-readable source name
  */
 export function getSourceName(url: string): string {
+  if (isCivitaiUrl(url)) return 'Civitai'
   try {
     const hostname = new URL(url).hostname.toLowerCase()
-    if (
-      hostname === 'civitai.com' ||
-      hostname.endsWith('.civitai.com') ||
-      hostname === 'civitai.red' ||
-      hostname.endsWith('.civitai.red')
-    ) {
-      return 'Civitai'
-    }
     if (hostname === 'huggingface.co' || hostname.endsWith('.huggingface.co')) {
       return 'Hugging Face'
     }
diff --git a/src/platform/assets/utils/assetPreviewUtil.test.ts b/src/platform/assets/utils/assetPreviewUtil.test.ts
index 738ef256a8..07c71a9b99 100644
--- a/src/platform/assets/utils/assetPreviewUtil.test.ts
+++ b/src/platform/assets/utils/assetPreviewUtil.test.ts
@@ -15,6 +15,7 @@ const mockGetServerFeature = vi.hoisted(() => vi.fn(() => false))
 const mockIsAssetAPIEnabled = vi.hoisted(() => vi.fn(() => false))
 const mockUploadAssetFromBase64 = vi.hoisted(() => vi.fn())
 const mockUpdateAsset = vi.hoisted(() => vi.fn())
+const mockSetAssetPreview = vi.hoisted(() => vi.fn())
 
 vi.mock('@/scripts/api', () => ({
   api: {
@@ -33,6 +34,10 @@ vi.mock('@/platform/assets/services/assetService', () => ({
   }
 }))
 
+vi.mock('@/stores/assetsStore', () => ({
+  useAssetsStore: () => ({ setAssetPreview: mockSetAssetPreview })
+}))
+
 function mockFetchResponse(assets: Record<string, unknown>[]) {
   mockFetchApi.mockResolvedValueOnce({
     ok: true,
@@ -264,4 +269,66 @@ describe('persistThumbnail', () => {
       preview_id: 'new-preview-id'
     })
   })
+
+  it('patches the assets store by name with the new preview after upload', async () => {
+    mockFetchEmpty()
+    mockFetchResponse([localAsset])
+    mockUploadAssetFromBase64.mockResolvedValue({ id: 'new-preview-id' })
+    mockUpdateAsset.mockResolvedValue({})
+
+    const blob = new Blob(['fake-png'], { type: 'image/png' })
+    await persistThumbnail('ComfyUI_00081_.glb', blob)
+
+    expect(mockSetAssetPreview).toHaveBeenCalledWith(
+      localAsset.name,
+      'new-preview-id',
+      'http://localhost:8188/assets/new-preview-id/content'
+    )
+  })
+
+  it('uses the cloud asset name (not the hash) when patching the store', async () => {
+    mockFetchResponse([cloudAsset])
+    mockUploadAssetFromBase64.mockResolvedValue({ id: 'new-preview-id' })
+    mockUpdateAsset.mockResolvedValue({})
+
+    const blob = new Blob(['fake-png'], { type: 'image/png' })
+    await persistThumbnail('c6cadcee57dd.glb', blob)
+
+    expect(mockSetAssetPreview).toHaveBeenCalledWith(
+      cloudAsset.name,
+      'new-preview-id',
+      'http://localhost:8188/assets/new-preview-id/content'
+    )
+  })
+
+  it('does not patch the store when the asset already has a preview', async () => {
+    mockFetchEmpty()
+    mockFetchResponse([localAssetWithPreview])
+
+    const blob = new Blob(['fake-png'], { type: 'image/png' })
+    await persistThumbnail('ComfyUI_00081_.glb', blob)
+
+    expect(mockSetAssetPreview).not.toHaveBeenCalled()
+  })
+
+  it('does not patch the store when no asset is found', async () => {
+    mockFetchEmpty()
+    mockFetchEmpty()
+
+    const blob = new Blob(['fake-png'], { type: 'image/png' })
+    await persistThumbnail('nonexistent.glb', blob)
+
+    expect(mockSetAssetPreview).not.toHaveBeenCalled()
+  })
+
+  it('does not patch the store when upload fails', async () => {
+    mockFetchEmpty()
+    mockFetchResponse([localAsset])
+    mockUploadAssetFromBase64.mockRejectedValue(new Error('upload failed'))
+
+    const blob = new Blob(['fake-png'], { type: 'image/png' })
+    await persistThumbnail('ComfyUI_00081_.glb', blob)
+
+    expect(mockSetAssetPreview).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/platform/assets/utils/assetPreviewUtil.ts b/src/platform/assets/utils/assetPreviewUtil.ts
index c9fbcce9ec..bdb604abac 100644
--- a/src/platform/assets/utils/assetPreviewUtil.ts
+++ b/src/platform/assets/utils/assetPreviewUtil.ts
@@ -1,5 +1,6 @@
 import { assetService } from '@/platform/assets/services/assetService'
 import { api } from '@/scripts/api'
+import { useAssetsStore } from '@/stores/assetsStore'
 
 interface AssetRecord {
   id: string
@@ -80,6 +81,9 @@ export async function persistThumbnail(
     await assetService.updateAsset(asset.id, {
       preview_id: uploaded.id
     })
+
+    const previewUrl = api.apiURL(`/assets/${uploaded.id}/content`)
+    useAssetsStore().setAssetPreview(asset.name, uploaded.id, previewUrl)
   } catch {
     // Non-critical — client still shows the rendered thumbnail
   }
diff --git a/src/platform/assets/utils/clearDeletedAssetWidgetValues.test.ts b/src/platform/assets/utils/clearDeletedAssetWidgetValues.test.ts
new file mode 100644
index 0000000000..239654eaa9
--- /dev/null
+++ b/src/platform/assets/utils/clearDeletedAssetWidgetValues.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import type { LGraph } from '@/lib/litegraph/src/litegraph'
+
+import { clearDeletedAssetWidgetValues } from './clearDeletedAssetWidgetValues'
+
+type MockWidget = {
+  name: string
+  value: unknown
+  callback?: (value: unknown) => void
+}
+type MockNode = {
+  id: number
+  widgets?: MockWidget[]
+  graph?: { setDirtyCanvas: (v: boolean) => void }
+  isSubgraphNode?: () => boolean
+  subgraph?: { nodes: MockNode[] }
+}
+
+function makeGraph(nodes: MockNode[]): LGraph {
+  return { nodes } as unknown as LGraph
+}
+
+describe('FE-230 clearDeletedAssetWidgetValues', () => {
+  it('clears widget.value and invokes widget.callback so consumers run their own change-handling', () => {
+    const setDirty = vi.fn()
+    const callback = vi.fn()
+    const node: MockNode = {
+      id: 1,
+      widgets: [{ name: 'image', value: 'outputs/foo.png [output]', callback }],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearDeletedAssetWidgetValues(
+      makeGraph([node]),
+      new Set(['outputs/foo.png [output]'])
+    )
+
+    expect(node.widgets![0].value).toBe('')
+    expect(callback).toHaveBeenCalledWith('')
+    expect(setDirty).toHaveBeenCalledWith(true)
+  })
+
+  it('leaves untouched widgets that do not match deleted values', () => {
+    const matchedCallback = vi.fn()
+    const keptCallback = vi.fn()
+    const node: MockNode = {
+      id: 2,
+      widgets: [
+        {
+          name: 'image',
+          value: 'outputs/foo.png [output]',
+          callback: matchedCallback
+        },
+        { name: 'mask', value: 'inputs/keep.png', callback: keptCallback }
+      ],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearDeletedAssetWidgetValues(
+      makeGraph([node]),
+      new Set(['outputs/foo.png [output]'])
+    )
+
+    expect(node.widgets![0].value).toBe('')
+    expect(node.widgets![1].value).toBe('inputs/keep.png')
+    expect(matchedCallback).toHaveBeenCalledWith('')
+    expect(keptCallback).not.toHaveBeenCalled()
+  })
+
+  it('leaves nodes alone when none of their widgets reference a deleted value (mask-editor case)', () => {
+    const setDirty = vi.fn()
+    const callback = vi.fn()
+    const node: MockNode = {
+      id: 3,
+      widgets: [
+        {
+          name: 'image',
+          value: 'clipspace/clipspace-painted-masked-1.png [input]',
+          callback
+        }
+      ],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearDeletedAssetWidgetValues(
+      makeGraph([node]),
+      new Set(['outputs/some-other-asset.png [output]'])
+    )
+
+    expect(node.widgets![0].value).toBe(
+      'clipspace/clipspace-painted-masked-1.png [input]'
+    )
+    expect(callback).not.toHaveBeenCalled()
+    expect(setDirty).not.toHaveBeenCalled()
+  })
+
+  it('no-ops when the deleted-values set is empty', () => {
+    const setDirty = vi.fn()
+    const callback = vi.fn()
+    const node: MockNode = {
+      id: 4,
+      widgets: [{ name: 'image', value: 'outputs/foo.png [output]', callback }],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearDeletedAssetWidgetValues(makeGraph([node]), new Set())
+
+    expect(node.widgets![0].value).toBe('outputs/foo.png [output]')
+    expect(callback).not.toHaveBeenCalled()
+    expect(setDirty).not.toHaveBeenCalled()
+  })
+
+  it('handles widgets without a callback (legacy nodes) without throwing', () => {
+    const node: MockNode = {
+      id: 5,
+      widgets: [{ name: 'image', value: 'outputs/foo.png [output]' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    expect(() =>
+      clearDeletedAssetWidgetValues(
+        makeGraph([node]),
+        new Set(['outputs/foo.png [output]'])
+      )
+    ).not.toThrow()
+
+    expect(node.widgets![0].value).toBe('')
+  })
+
+  it('clears all matching widgets across multiple nodes', () => {
+    const cbA = vi.fn()
+    const cbB = vi.fn()
+    const nodeA: MockNode = {
+      id: 6,
+      widgets: [
+        { name: 'image', value: 'outputs/a.png [output]', callback: cbA }
+      ],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+    const nodeB: MockNode = {
+      id: 7,
+      widgets: [
+        { name: 'image', value: 'outputs/a.png [output]', callback: cbB }
+      ],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearDeletedAssetWidgetValues(
+      makeGraph([nodeA, nodeB]),
+      new Set(['outputs/a.png [output]'])
+    )
+
+    expect(nodeA.widgets![0].value).toBe('')
+    expect(nodeB.widgets![0].value).toBe('')
+    expect(cbA).toHaveBeenCalledWith('')
+    expect(cbB).toHaveBeenCalledWith('')
+  })
+
+  it('does not affect nodes without widgets', () => {
+    const node: MockNode = {
+      id: 8,
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    expect(() =>
+      clearDeletedAssetWidgetValues(
+        makeGraph([node]),
+        new Set(['outputs/foo.png [output]'])
+      )
+    ).not.toThrow()
+  })
+})
diff --git a/src/platform/assets/utils/clearDeletedAssetWidgetValues.ts b/src/platform/assets/utils/clearDeletedAssetWidgetValues.ts
new file mode 100644
index 0000000000..daf3ba6299
--- /dev/null
+++ b/src/platform/assets/utils/clearDeletedAssetWidgetValues.ts
@@ -0,0 +1,40 @@
+import type { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
+
+import { findNodesReferencingValues } from './clearNodePreviewCacheForValues'
+
+/**
+ * Clear widget values that reference deleted assets so the persisted workflow
+ * JSON stops claiming the deleted asset is in use.
+ *
+ * Without this, after `useMediaAssetActions.deleteAssets` succeeds the
+ * in-memory preview is cleared (`clearNodePreviewCacheForValues`) but the
+ * widget value still points at the deleted asset. On reload the workflow JSON
+ * is restored verbatim and `useImageUploadWidget` re-fetches the URL — for
+ * output assets the file is still served (history-soft-delete), so the
+ * preview re-renders despite the asset being "deleted" everywhere else.
+ *
+ * Mutates `widget.value` (which `LGraphNode.serialize` re-reads to rebuild
+ * `widgets_values`) and invokes `widget.callback` so widgets like Load Image
+ * run their own change-handling (clearing `node.imgs`, calling
+ * `setNodeOutputs`, etc.).
+ *
+ * FE-230 — covers the post-reload case without re-introducing
+ * useMissingMediaPreviewSync, which couldn't distinguish deletion from
+ * verification false-positives (e.g. mask-editor saved values).
+ */
+export function clearDeletedAssetWidgetValues(
+  rootGraph: LGraph | Subgraph,
+  deletedValues: ReadonlySet<string>
+): void {
+  if (deletedValues.size === 0) return
+  for (const node of findNodesReferencingValues(rootGraph, deletedValues)) {
+    if (!node.widgets) continue
+    for (const widget of node.widgets) {
+      if (typeof widget.value !== 'string') continue
+      if (!deletedValues.has(widget.value)) continue
+      widget.value = ''
+      widget.callback?.('')
+    }
+    node.graph?.setDirtyCanvas(true)
+  }
+}
diff --git a/src/platform/assets/utils/clearNodePreviewCacheForValues.test.ts b/src/platform/assets/utils/clearNodePreviewCacheForValues.test.ts
new file mode 100644
index 0000000000..4d772db7f2
--- /dev/null
+++ b/src/platform/assets/utils/clearNodePreviewCacheForValues.test.ts
@@ -0,0 +1,241 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import {
+  clearNodePreviewCacheForValues,
+  findNodesReferencingValues
+} from './clearNodePreviewCacheForValues'
+
+type MockWidget = { name: string; value: unknown }
+type MockNode = {
+  id: number
+  widgets?: MockWidget[]
+  imgs?: unknown
+  videoContainer?: unknown
+  graph?: { setDirtyCanvas: (v: boolean) => void }
+  isSubgraphNode?: () => boolean
+  subgraph?: { nodes: MockNode[] }
+}
+
+function makeGraph(nodes: MockNode[]): LGraph {
+  return { nodes } as unknown as LGraph
+}
+
+describe('FE-230 clearNodePreviewCacheForValues', () => {
+  it('clears node.imgs and removes outputs when a widget value matches a deleted value', () => {
+    const setDirty = vi.fn()
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 7,
+      widgets: [{ name: 'image', value: 'foo.png' }],
+      imgs: [{ src: 'blob:stale' }],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['foo.png']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(node)
+    expect(setDirty).toHaveBeenCalledWith(true)
+  })
+
+  it('leaves unrelated nodes untouched', () => {
+    const setDirty = vi.fn()
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 8,
+      widgets: [{ name: 'image', value: 'unrelated.png' }],
+      imgs: [{ src: 'blob:keep' }],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['foo.png']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toEqual([{ src: 'blob:keep' }])
+    expect(remove).not.toHaveBeenCalled()
+    expect(setDirty).not.toHaveBeenCalled()
+  })
+
+  it('no-ops when the deleted value set is empty', () => {
+    const setDirty = vi.fn()
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 9,
+      widgets: [{ name: 'image', value: 'foo.png' }],
+      imgs: [{ src: 'blob:keep' }],
+      graph: { setDirtyCanvas: setDirty }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toEqual([{ src: 'blob:keep' }])
+    expect(remove).not.toHaveBeenCalled()
+    expect(setDirty).not.toHaveBeenCalled()
+  })
+
+  it('matches the [output]-annotated form for output assets', () => {
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 12,
+      widgets: [{ name: 'image', value: 'foo.png [output]' }],
+      imgs: [{ src: 'blob:stale' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['foo.png [output]']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(node)
+  })
+
+  it('matches the subfolder-prefixed annotated form when provided', () => {
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 13,
+      widgets: [{ name: 'image', value: 'sub/foo.png [output]' }],
+      imgs: [{ src: 'blob:stale' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['sub/foo.png [output]']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(node)
+  })
+
+  it('does not cross-match basenames across input/output sources', () => {
+    const remove = vi.fn()
+    const inputNode: MockNode = {
+      id: 1,
+      widgets: [{ name: 'image', value: 'foo.png' }],
+      imgs: [{ src: 'blob:input' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+    const outputNode: MockNode = {
+      id: 2,
+      widgets: [{ name: 'image', value: 'foo.png [output]' }],
+      imgs: [{ src: 'blob:output' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([inputNode, outputNode]),
+      new Set(['foo.png']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(inputNode.imgs).toBeUndefined()
+    expect(outputNode.imgs).toEqual([{ src: 'blob:output' }])
+    expect(remove).toHaveBeenCalledWith(inputNode)
+    expect(remove).not.toHaveBeenCalledWith(outputNode)
+  })
+
+  it('also clears videoContainer for video previews', () => {
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 15,
+      widgets: [{ name: 'video', value: 'clip.mp4' }],
+      videoContainer: { foo: 'bar' },
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['clip.mp4']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.videoContainer).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(node)
+  })
+
+  it('matches any widget on the node, not just "image"', () => {
+    const remove = vi.fn()
+    const node: MockNode = {
+      id: 10,
+      widgets: [
+        { name: 'seed', value: 42 },
+        { name: 'video', value: 'clip.mp4' }
+      ],
+      imgs: [{ src: 'blob:videostale' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+
+    clearNodePreviewCacheForValues(
+      makeGraph([node]),
+      new Set(['clip.mp4']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(node.imgs).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(node)
+  })
+
+  it('walks subgraph interiors and matches nested nodes', () => {
+    const inner: MockNode = {
+      id: 100,
+      widgets: [{ name: 'image', value: 'nested.png [output]' }],
+      imgs: [{ src: 'blob:nested' }],
+      graph: { setDirtyCanvas: vi.fn() }
+    }
+    const wrapper: MockNode = {
+      id: 50,
+      widgets: [],
+      isSubgraphNode: () => true,
+      subgraph: { nodes: [inner] }
+    }
+    const remove = vi.fn()
+
+    clearNodePreviewCacheForValues(
+      makeGraph([wrapper]),
+      new Set(['nested.png [output]']),
+      remove as unknown as (node: LGraphNode) => void
+    )
+
+    expect(inner.imgs).toBeUndefined()
+    expect(remove).toHaveBeenCalledWith(inner)
+  })
+})
+
+describe('FE-230 findNodesReferencingValues', () => {
+  it('skips subgraph wrapper nodes (only their interior nodes match)', () => {
+    const inner: MockNode = {
+      id: 100,
+      widgets: [{ name: 'image', value: 'foo.png' }]
+    }
+    const wrapper: MockNode = {
+      id: 50,
+      widgets: [{ name: 'image', value: 'foo.png' }],
+      isSubgraphNode: () => true,
+      subgraph: { nodes: [inner] }
+    }
+
+    const matches = findNodesReferencingValues(
+      makeGraph([wrapper]),
+      new Set(['foo.png'])
+    )
+
+    expect(matches).toEqual([inner])
+  })
+})
diff --git a/src/platform/assets/utils/clearNodePreviewCacheForValues.ts b/src/platform/assets/utils/clearNodePreviewCacheForValues.ts
new file mode 100644
index 0000000000..bbd6d9c5f2
--- /dev/null
+++ b/src/platform/assets/utils/clearNodePreviewCacheForValues.ts
@@ -0,0 +1,65 @@
+import type {
+  LGraph,
+  LGraphNode,
+  Subgraph
+} from '@/lib/litegraph/src/litegraph'
+import { collectAllNodes } from '@/utils/graphTraversalUtil'
+
+/**
+ * Clear cached Load Image / Load Video preview state on any node whose widget
+ * value matches one of the given values. Covers:
+ *   - the canvas renderer cache (`node.imgs`, `node.videoContainer`)
+ *   - the Vue preview source — must be cleared via `removeOutputsForNode`
+ *     so the Pinia reactive ref (`nodeOutputStore.nodeOutputs.value`) updates,
+ *     not just the legacy `app.nodeOutputs` mirror
+ *
+ * Comparison is full-string against the widget value as stored — callers must
+ * provide the canonical widget-value variants for each deleted asset (e.g.
+ * `foo.png`, `foo.png [output]`, `sub/foo.png [output]`, `<asset_hash>`). This
+ * avoids false matches when two distinct assets share a basename across
+ * input/output sources.
+ *
+ * Walks the full graph hierarchy via `collectAllNodes`, so Load Image / Load
+ * Video nodes inside subgraphs are also matched.
+ *
+ * FE-230 — invoked after successful asset deletion so the Load Image / Load
+ * Video node preview does not keep displaying a thumbnail for an asset that
+ * no longer exists.
+ */
+export function clearNodePreviewCacheForValues(
+  rootGraph: LGraph | Subgraph,
+  deletedValues: ReadonlySet<string>,
+  removeOutputsForNode: (node: LGraphNode) => void
+): void {
+  if (deletedValues.size === 0) return
+  for (const node of findNodesReferencingValues(rootGraph, deletedValues)) {
+    removeOutputsForNode(node)
+    node.imgs = undefined
+    node.videoContainer = undefined
+    node.graph?.setDirtyCanvas(true)
+  }
+}
+
+/**
+ * Walk the graph hierarchy and yield each leaf node whose widget value matches
+ * one of `deletedValues`. Used by both the preview-clearing path and the
+ * missing-media-marking path so the two stay in lockstep.
+ *
+ * Skips subgraph wrapper nodes — only their interior nodes are inspected.
+ */
+export function findNodesReferencingValues(
+  rootGraph: LGraph | Subgraph,
+  deletedValues: ReadonlySet<string>
+): LGraphNode[] {
+  if (deletedValues.size === 0) return []
+  const matches: LGraphNode[] = []
+  for (const node of collectAllNodes(rootGraph)) {
+    if (!node.widgets?.length) continue
+    if (node.isSubgraphNode?.()) continue
+    const referencesDeleted = node.widgets.some(
+      (w) => typeof w.value === 'string' && deletedValues.has(w.value)
+    )
+    if (referencesDeleted) matches.push(node)
+  }
+  return matches
+}
diff --git a/src/platform/assets/utils/createModelNodeFromAsset.test.ts b/src/platform/assets/utils/createModelNodeFromAsset.test.ts
index cdc42dc397..785fa0c82f 100644
--- a/src/platform/assets/utils/createModelNodeFromAsset.test.ts
+++ b/src/platform/assets/utils/createModelNodeFromAsset.test.ts
@@ -299,7 +299,7 @@ describe('createModelNodeFromAsset', () => {
     beforeEach(() => {
       vi.spyOn(console, 'error').mockImplementation(() => {})
     })
-    it.each([
+    it.for([
       {
         case: 'missing user_metadata with no fallback',
         overrides: { user_metadata: undefined, metadata: undefined, name: '' },
@@ -329,7 +329,7 @@ describe('createModelNodeFromAsset', () => {
         }
       }
     )
-    it.each([
+    it.for([
       {
         case: 'no tags',
         overrides: { tags: undefined },
diff --git a/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts
new file mode 100644
index 0000000000..705d65499e
--- /dev/null
+++ b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.test.ts
@@ -0,0 +1,185 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraph } from '@/lib/litegraph/src/litegraph'
+import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
+
+import { markDeletedAssetsAsMissingMedia } from './markDeletedAssetsAsMissingMedia'
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: true
+}))
+
+const mockScanNodeMediaCandidates = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/missingMedia/missingMediaScan', () => ({
+  scanNodeMediaCandidates: mockScanNodeMediaCandidates
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({ currentGraph: null })
+}))
+
+function makeGraph(nodes: unknown[]): LGraph {
+  return { nodes } as unknown as LGraph
+}
+
+describe('FE-230 markDeletedAssetsAsMissingMedia', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    mockScanNodeMediaCandidates.mockReset()
+    mockScanNodeMediaCandidates.mockReturnValue([])
+  })
+
+  it('adds missing-media candidates only for widgets whose value is in the deleted set', () => {
+    const node = {
+      id: 1,
+      type: 'LoadImage',
+      widgets: [
+        { name: 'image', value: 'sub/foo.png [output]' },
+        { name: 'mask', value: 'unrelated.png' }
+      ]
+    }
+    mockScanNodeMediaCandidates.mockReturnValue([
+      {
+        nodeId: '1',
+        nodeType: 'LoadImage',
+        widgetName: 'image',
+        mediaType: 'image',
+        name: 'sub/foo.png [output]'
+      },
+      {
+        nodeId: '1',
+        nodeType: 'LoadImage',
+        widgetName: 'mask',
+        mediaType: 'image',
+        name: 'unrelated.png'
+      }
+    ])
+
+    markDeletedAssetsAsMissingMedia(
+      makeGraph([node]),
+      new Set(['sub/foo.png [output]'])
+    )
+
+    const store = useMissingMediaStore()
+    expect(store.missingMediaCandidates).toEqual([
+      {
+        nodeId: '1',
+        nodeType: 'LoadImage',
+        widgetName: 'image',
+        mediaType: 'image',
+        name: 'sub/foo.png [output]',
+        isMissing: true
+      }
+    ])
+  })
+
+  it('does not cross-match basenames across input/output sources', () => {
+    const inputNode = {
+      id: 2,
+      type: 'LoadImage',
+      widgets: [{ name: 'image', value: 'foo.png' }]
+    }
+    const outputNode = {
+      id: 3,
+      type: 'LoadImage',
+      widgets: [{ name: 'image', value: 'foo.png [output]' }]
+    }
+
+    markDeletedAssetsAsMissingMedia(
+      makeGraph([inputNode, outputNode]),
+      new Set(['foo.png'])
+    )
+
+    expect(mockScanNodeMediaCandidates).toHaveBeenCalledTimes(1)
+    expect(mockScanNodeMediaCandidates).toHaveBeenCalledWith(
+      expect.anything(),
+      inputNode,
+      true
+    )
+  })
+
+  it('skips nodes with NEVER or BYPASS mode', () => {
+    const bypassed = {
+      id: 4,
+      type: 'LoadImage',
+      mode: 4,
+      widgets: [{ name: 'image', value: 'foo.png [output]' }]
+    }
+    const never = {
+      id: 5,
+      type: 'LoadImage',
+      mode: 2,
+      widgets: [{ name: 'image', value: 'foo.png [output]' }]
+    }
+
+    markDeletedAssetsAsMissingMedia(
+      makeGraph([bypassed, never]),
+      new Set(['foo.png [output]'])
+    )
+
+    expect(mockScanNodeMediaCandidates).not.toHaveBeenCalled()
+    const store = useMissingMediaStore()
+    expect(store.missingMediaCandidates).toBeNull()
+  })
+
+  it('walks subgraph interiors and marks nested nodes', () => {
+    const inner = {
+      id: 100,
+      type: 'LoadImage',
+      widgets: [{ name: 'image', value: 'nested.png [output]' }]
+    }
+    const wrapper = {
+      id: 50,
+      widgets: [],
+      isSubgraphNode: () => true,
+      subgraph: { nodes: [inner] }
+    }
+    mockScanNodeMediaCandidates.mockReturnValue([
+      {
+        nodeId: '50:100',
+        nodeType: 'LoadImage',
+        widgetName: 'image',
+        mediaType: 'image',
+        name: 'nested.png [output]'
+      }
+    ])
+
+    markDeletedAssetsAsMissingMedia(
+      makeGraph([wrapper]),
+      new Set(['nested.png [output]'])
+    )
+
+    const store = useMissingMediaStore()
+    expect(store.missingMediaCandidates).toEqual([
+      {
+        nodeId: '50:100',
+        nodeType: 'LoadImage',
+        widgetName: 'image',
+        mediaType: 'image',
+        name: 'nested.png [output]',
+        isMissing: true
+      }
+    ])
+  })
+
+  it('is a no-op when no nodes reference any deleted value', () => {
+    const node = {
+      id: 2,
+      type: 'LoadImage',
+      widgets: [{ name: 'image', value: 'kept.png' }]
+    }
+
+    markDeletedAssetsAsMissingMedia(makeGraph([node]), new Set(['gone.png']))
+
+    expect(mockScanNodeMediaCandidates).not.toHaveBeenCalled()
+    const store = useMissingMediaStore()
+    expect(store.missingMediaCandidates).toBeNull()
+  })
+
+  it('does nothing when the deleted value set is empty', () => {
+    markDeletedAssetsAsMissingMedia(makeGraph([]), new Set())
+    const store = useMissingMediaStore()
+    expect(store.missingMediaCandidates).toBeNull()
+  })
+})
diff --git a/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.ts b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.ts
new file mode 100644
index 0000000000..800e685147
--- /dev/null
+++ b/src/platform/assets/utils/markDeletedAssetsAsMissingMedia.ts
@@ -0,0 +1,50 @@
+import type { LGraph } from '@/lib/litegraph/src/litegraph'
+import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
+import { isCloud } from '@/platform/distribution/types'
+import { scanNodeMediaCandidates } from '@/platform/missingMedia/missingMediaScan'
+import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
+import type { MissingMediaCandidate } from '@/platform/missingMedia/types'
+
+import { findNodesReferencingValues } from './clearNodePreviewCacheForValues'
+
+/**
+ * After a successful asset deletion, surface the affected Load Image / Load
+ * Video / Load Audio nodes through the missing-media store. Without this, UI
+ * surfaces that filter against `missingMediaCandidates` (e.g. the Vue node
+ * widget dropdown) keep listing the deleted asset because the verification
+ * pipeline only runs on workflow load — there is no signal that the live
+ * deletion just invalidated some references.
+ *
+ * Walks the full graph hierarchy (including subgraphs) and skips bypassed /
+ * never-execute nodes, mirroring `scanAllMediaCandidates` so the live-delete
+ * path stays in lockstep with the workflow-load verification.
+ *
+ * Comparison is full-string against the widget value, so two distinct assets
+ * that share a basename across input/output sources do not cross-match.
+ */
+export function markDeletedAssetsAsMissingMedia(
+  rootGraph: LGraph,
+  deletedValues: ReadonlySet<string>
+): void {
+  if (deletedValues.size === 0) return
+
+  const matchedNodes = findNodesReferencingValues(rootGraph, deletedValues)
+  if (!matchedNodes.length) return
+
+  const candidates: MissingMediaCandidate[] = []
+  for (const node of matchedNodes) {
+    if (
+      node.mode === LGraphEventMode.NEVER ||
+      node.mode === LGraphEventMode.BYPASS
+    )
+      continue
+    for (const candidate of scanNodeMediaCandidates(rootGraph, node, isCloud)) {
+      if (!deletedValues.has(candidate.name)) continue
+      candidates.push({ ...candidate, isMissing: true })
+    }
+  }
+
+  if (candidates.length) {
+    useMissingMediaStore().addMissingMedia(candidates)
+  }
+}
diff --git a/src/platform/cloud/onboarding/CloudLoginView.vue b/src/platform/cloud/onboarding/CloudLoginView.vue
index 49c699f870..ce0ec8f790 100644
--- a/src/platform/cloud/onboarding/CloudLoginView.vue
+++ b/src/platform/cloud/onboarding/CloudLoginView.vue
@@ -7,7 +7,7 @@
           {{ t('auth.login.title') }}
         </h1>
         <i18n-t
-          v-if="isFreeTierEnabled"
+          v-if="isFreeTierEnabled && !googleSsoBlockedReason"
           keypath="auth.login.signUpFreeTierPromo"
           tag="p"
           class="my-0 text-base text-muted"
@@ -39,7 +39,12 @@
       <template v-if="!showEmailForm">
         <!-- OAuth Buttons (primary) -->
         <div class="flex flex-col gap-4">
-          <Button type="button" class="h-10 w-full" @click="signInWithGoogle">
+          <Button
+            v-if="!googleSsoBlockedReason"
+            type="button"
+            class="h-10 w-full"
+            @click="signInWithGoogle"
+          >
             <i class="pi pi-google mr-2"></i>
             {{ t('auth.login.loginWithGoogle') }}
           </Button>
@@ -116,6 +121,7 @@ import { useFreeTierOnboarding } from '@/platform/cloud/onboarding/composables/u
 import { getSafePreviousFullPath } from '@/platform/cloud/onboarding/utils/previousFullPath'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import type { SignInData } from '@/schemas/signInSchema'
+import { getGoogleSsoBlockedReason } from '@/base/webviewDetection'
 
 const { t } = useI18n()
 const router = useRouter()
@@ -126,6 +132,7 @@ const authError = ref('')
 const toastStore = useToastStore()
 const showEmailForm = ref(false)
 const { isFreeTierEnabled, freeTierCredits } = useFreeTierOnboarding()
+const googleSsoBlockedReason = getGoogleSsoBlockedReason()
 
 function switchToEmailForm() {
   showEmailForm.value = true
diff --git a/src/platform/cloud/onboarding/CloudSignupView.vue b/src/platform/cloud/onboarding/CloudSignupView.vue
index 10367252a2..65fd210277 100644
--- a/src/platform/cloud/onboarding/CloudSignupView.vue
+++ b/src/platform/cloud/onboarding/CloudSignupView.vue
@@ -23,7 +23,10 @@
       </Message>
 
       <template v-if="!showEmailForm">
-        <p v-if="isFreeTierEnabled" class="mb-4 text-sm text-muted-foreground">
+        <p
+          v-if="isFreeTierEnabled && !googleSsoBlockedReason"
+          class="mb-4 text-sm text-muted-foreground"
+        >
           {{
             freeTierCredits
               ? t('auth.login.freeTierDescription', {
@@ -35,7 +38,7 @@
 
         <!-- OAuth Buttons (primary) -->
         <div class="flex flex-col gap-4">
-          <div class="relative">
+          <div v-if="!googleSsoBlockedReason" class="relative">
             <Button type="button" class="h-10 w-full" @click="signInWithGoogle">
               <i class="pi pi-google mr-2"></i>
               {{ t('auth.signup.signUpWithGoogle') }}
@@ -86,7 +89,11 @@
             class="text-sm underline"
             @click="switchToSocialLogin"
           >
-            {{ t('auth.login.backToSocialLogin') }}
+            {{
+              googleSsoBlockedReason
+                ? t('auth.login.backToGithubLogin')
+                : t('auth.login.backToSocialLogin')
+            }}
           </Button>
         </div>
       </template>
@@ -141,6 +148,7 @@ import { useTelemetry } from '@/platform/telemetry'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import type { SignUpData } from '@/schemas/signInSchema'
 import { isInChina } from '@/utils/networkUtil'
+import { getGoogleSsoBlockedReason } from '@/base/webviewDetection'
 
 const { t } = useI18n()
 const router = useRouter()
@@ -158,6 +166,7 @@ const {
   switchToEmailForm,
   switchToSocialLogin
 } = useFreeTierOnboarding()
+const googleSsoBlockedReason = getGoogleSsoBlockedReason()
 
 const navigateToLogin = async () => {
   await router.push({ name: 'cloud-login', query: route.query })
diff --git a/src/platform/cloud/subscription/utils/tierBenefits.test.ts b/src/platform/cloud/subscription/utils/tierBenefits.test.ts
index 81adab9d82..815539654d 100644
--- a/src/platform/cloud/subscription/utils/tierBenefits.test.ts
+++ b/src/platform/cloud/subscription/utils/tierBenefits.test.ts
@@ -45,7 +45,7 @@ describe('getCommonTierBenefits', () => {
     expect(benefits.some((b) => b.key === 'monthlyCredits')).toBe(false)
   })
 
-  it.each(['free', 'standard', 'creator', 'pro', 'founder'] as const)(
+  it.for(['free', 'standard', 'creator', 'pro', 'founder'] as const)(
     'includes a tier-scoped maxDuration metric for %s',
     (tier) => {
       const benefits = getCommonTierBenefits(tier, translate, formatNumber)
@@ -70,7 +70,7 @@ describe('getCommonTierBenefits', () => {
     })
   })
 
-  it.each(['standard', 'creator', 'pro', 'founder'] as const)(
+  it.for(['standard', 'creator', 'pro', 'founder'] as const)(
     'adds the addCredits benefit for %s tier',
     (tier) => {
       const benefits = getCommonTierBenefits(tier, translate, formatNumber)
@@ -83,7 +83,7 @@ describe('getCommonTierBenefits', () => {
     expect(freeBenefits.some((b) => b.key === 'addCredits')).toBe(false)
   })
 
-  it.each(['creator', 'pro'] as const)(
+  it.for(['creator', 'pro'] as const)(
     'includes customLoRAs for %s tier',
     (tier) => {
       const benefits = getCommonTierBenefits(tier, translate, formatNumber)
@@ -91,7 +91,7 @@ describe('getCommonTierBenefits', () => {
     }
   )
 
-  it.each(['free', 'standard', 'founder'] as const)(
+  it.for(['free', 'standard', 'founder'] as const)(
     'omits customLoRAs for %s tier',
     (tier) => {
       const benefits = getCommonTierBenefits(tier, translate, formatNumber)
diff --git a/src/platform/keybindings/keyCombo.test.ts b/src/platform/keybindings/keyCombo.test.ts
index 6fe8ecc92c..082dd3993c 100644
--- a/src/platform/keybindings/keyCombo.test.ts
+++ b/src/platform/keybindings/keyCombo.test.ts
@@ -15,7 +15,7 @@ describe('KeyComboImpl', () => {
   }
 
   describe('getKeySequences', () => {
-    it.each([
+    it.for([
       {
         event: { key: 'Shift', shiftKey: true },
         expected: ['Shift'],
@@ -66,7 +66,7 @@ describe('KeyComboImpl', () => {
   })
 
   describe('isBrowserReserved', () => {
-    it.each([
+    it.for([
       { key: 't', ctrl: true, label: 'Ctrl + t' },
       { key: 'w', ctrl: true, label: 'Ctrl + w' },
       { key: 'F12', label: 'F12' },
@@ -83,7 +83,7 @@ describe('KeyComboImpl', () => {
       expect(combo.isBrowserReserved).toBe(true)
     })
 
-    it.each([
+    it.for([
       { key: 'k', ctrl: true, label: 'Ctrl + k' },
       { key: 's', alt: true, label: 'Alt + s' },
       { key: 'z', ctrl: true, label: 'Ctrl + z' },
diff --git a/src/platform/missingMedia/mediaPathDetectionUtil.test.ts b/src/platform/missingMedia/mediaPathDetectionUtil.test.ts
new file mode 100644
index 0000000000..d1393df680
--- /dev/null
+++ b/src/platform/missingMedia/mediaPathDetectionUtil.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  getAnnotatedMediaPathTypeForDetection,
+  getMediaPathDetectionNames,
+  normalizeAnnotatedMediaPathForDetection
+} from './mediaPathDetectionUtil'
+
+describe('normalizeAnnotatedMediaPathForDetection', () => {
+  it.for([
+    ['photo.png [input]', 'photo.png'],
+    ['result.png [output]', 'result.png'],
+    ['photo.png   [input]', 'photo.png'],
+    ['with spaces.png [output]', 'with spaces.png'],
+    ['nested/folder/video.mp4 [output]', 'nested/folder/video.mp4']
+  ])('strips Core-style annotation from %s', ([value, expected]) => {
+    expect(normalizeAnnotatedMediaPathForDetection(value)).toBe(expected)
+  })
+
+  it.for([
+    ['photo.png[input]', 'photo.png'],
+    ['result.png[output]', 'result.png'],
+    ['with spaces.png   [output]', 'with spaces.png']
+  ])('strips Cloud compact annotation from %s', ([value, expected]) => {
+    expect(
+      normalizeAnnotatedMediaPathForDetection(value, {
+        allowCompactSuffix: true
+      })
+    ).toBe(expected)
+  })
+
+  it('does not strip compact annotations in Core mode', () => {
+    expect(normalizeAnnotatedMediaPathForDetection('photo.png[input]')).toBe(
+      'photo.png[input]'
+    )
+  })
+
+  it.for(['photo.png [draft]', 'photo [output] copy.png', 'photo.png', ''])(
+    'leaves non-matching values unchanged: %s',
+    (value) => {
+      expect(normalizeAnnotatedMediaPathForDetection(value)).toBe(value)
+    }
+  )
+})
+
+describe('getMediaPathDetectionNames', () => {
+  it('returns raw and normalized names when an annotation is stripped', () => {
+    expect(getMediaPathDetectionNames('photo.png [input]')).toEqual([
+      'photo.png [input]',
+      'photo.png'
+    ])
+  })
+
+  it('returns only the raw name when no annotation is stripped', () => {
+    expect(getMediaPathDetectionNames('photo.png')).toEqual(['photo.png'])
+  })
+})
+
+describe('getAnnotatedMediaPathTypeForDetection', () => {
+  it.for([
+    ['photo.png [input]', 'input'],
+    ['photo.png [output]', 'output']
+  ])('returns the Core-style annotation type from %s', ([value, expected]) => {
+    expect(getAnnotatedMediaPathTypeForDetection(value)).toBe(expected)
+  })
+
+  it('returns the compact annotation type in Cloud mode', () => {
+    expect(
+      getAnnotatedMediaPathTypeForDetection('photo.png[output]', {
+        allowCompactSuffix: true
+      })
+    ).toBe('output')
+  })
+
+  it('returns undefined when no supported annotation is present', () => {
+    expect(getAnnotatedMediaPathTypeForDetection('photo.png [draft]')).toBe(
+      undefined
+    )
+  })
+})
diff --git a/src/platform/missingMedia/mediaPathDetectionUtil.ts b/src/platform/missingMedia/mediaPathDetectionUtil.ts
new file mode 100644
index 0000000000..2e27311f08
--- /dev/null
+++ b/src/platform/missingMedia/mediaPathDetectionUtil.ts
@@ -0,0 +1,44 @@
+// Missing-media-scoped helpers for deriving comparison keys from media widget paths.
+const CORE_ANNOTATED_MEDIA_PATTERN = /\s+\[(input|output)\]$/
+const CLOUD_ANNOTATED_MEDIA_PATTERN = /\s*\[(input|output)\]$/
+
+type AnnotatedMediaPathType = 'input' | 'output'
+
+interface AnnotatedMediaPathOptions {
+  allowCompactSuffix?: boolean
+}
+
+function getAnnotatedMediaPathMatch(
+  value: string,
+  options: AnnotatedMediaPathOptions = {}
+): RegExpMatchArray | null {
+  const pattern = options.allowCompactSuffix
+    ? CLOUD_ANNOTATED_MEDIA_PATTERN
+    : CORE_ANNOTATED_MEDIA_PATTERN
+  return value.match(pattern)
+}
+
+export function getAnnotatedMediaPathTypeForDetection(
+  value: string,
+  options: AnnotatedMediaPathOptions = {}
+): AnnotatedMediaPathType | undefined {
+  return getAnnotatedMediaPathMatch(value, options)?.[1] as
+    | AnnotatedMediaPathType
+    | undefined
+}
+
+export function normalizeAnnotatedMediaPathForDetection(
+  value: string,
+  options: AnnotatedMediaPathOptions = {}
+): string {
+  const match = getAnnotatedMediaPathMatch(value, options)
+  return match ? value.slice(0, match.index) : value
+}
+
+export function getMediaPathDetectionNames(
+  value: string,
+  options: AnnotatedMediaPathOptions = {}
+): string[] {
+  const normalized = normalizeAnnotatedMediaPathForDetection(value, options)
+  return normalized === value ? [value] : [value, normalized]
+}
diff --git a/src/platform/missingMedia/missingMediaAssetResolver.test.ts b/src/platform/missingMedia/missingMediaAssetResolver.test.ts
new file mode 100644
index 0000000000..c6eee64c47
--- /dev/null
+++ b/src/platform/missingMedia/missingMediaAssetResolver.test.ts
@@ -0,0 +1,325 @@
+import { fromAny } from '@total-typescript/shoehorn'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type * as AssetServiceModule from '@/platform/assets/services/assetService'
+import type * as FetchJobsModule from '@/platform/remote/comfyui/jobs/fetchJobs'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import {
+  getAssetDetectionNames,
+  resolveMissingMediaAssetSources
+} from './missingMediaAssetResolver'
+
+const { mockGetInputAssetsIncludingPublic, mockGetAssetsPageByTag } =
+  vi.hoisted(() => ({
+    mockGetInputAssetsIncludingPublic: vi.fn(),
+    mockGetAssetsPageByTag: vi.fn()
+  }))
+
+const { mockFetchHistoryPage } = vi.hoisted(() => ({
+  mockFetchHistoryPage: vi.fn()
+}))
+
+vi.mock('@/platform/assets/services/assetService', async () => {
+  const actual = await vi.importActual<typeof AssetServiceModule>(
+    '@/platform/assets/services/assetService'
+  )
+
+  return {
+    ...actual,
+    assetService: {
+      ...actual.assetService,
+      getInputAssetsIncludingPublic: mockGetInputAssetsIncludingPublic,
+      getAssetsPageByTag: mockGetAssetsPageByTag
+    }
+  }
+})
+
+vi.mock('@/platform/remote/comfyui/jobs/fetchJobs', async () => {
+  const actual = await vi.importActual<typeof FetchJobsModule>(
+    '@/platform/remote/comfyui/jobs/fetchJobs'
+  )
+
+  return {
+    ...actual,
+    fetchHistoryPage: mockFetchHistoryPage
+  }
+})
+
+function makeAsset(name: string, assetHash: string | null = null): AssetItem {
+  return {
+    id: name,
+    name,
+    asset_hash: assetHash,
+    mime_type: null,
+    tags: ['input']
+  }
+}
+
+function makeHistoryJob(
+  filename: string,
+  options: { id?: string; subfolder?: string } = {}
+): JobListItem {
+  return fromAny<JobListItem, unknown>({
+    id: options.id ?? filename,
+    status: 'completed',
+    create_time: 0,
+    priority: 0,
+    preview_output: {
+      filename,
+      subfolder: options.subfolder ?? '',
+      type: 'output',
+      nodeId: '1',
+      mediaType: 'images'
+    }
+  })
+}
+
+function makeHistoryPage(
+  jobs: JobListItem[],
+  options: { offset?: number; hasMore?: boolean; total?: number } = {}
+) {
+  return {
+    jobs,
+    total: options.total ?? jobs.length,
+    offset: options.offset ?? 0,
+    limit: 200,
+    hasMore: options.hasMore ?? false
+  }
+}
+
+function makeAssetPage(
+  assets: AssetItem[],
+  options: { hasMore?: boolean; total?: number } = {}
+) {
+  return {
+    assets,
+    total: options.total ?? assets.length,
+    has_more: options.hasMore ?? false
+  }
+}
+
+describe('resolveMissingMediaAssetSources', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetInputAssetsIncludingPublic.mockResolvedValue([])
+    mockGetAssetsPageByTag.mockResolvedValue(makeAssetPage([]))
+    mockFetchHistoryPage.mockResolvedValue(makeHistoryPage([]))
+  })
+
+  it('loads cloud input assets when requested', async () => {
+    const inputAsset = makeAsset('photo.png')
+    mockGetInputAssetsIncludingPublic.mockResolvedValue([inputAsset])
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: true,
+      includeGeneratedAssets: false,
+      generatedMatchNames: new Set(),
+      allowCompactSuffix: true
+    })
+
+    expect(result.inputAssets).toEqual([inputAsset])
+    expect(result.generatedAssets).toEqual([])
+    expect(mockGetInputAssetsIncludingPublic).toHaveBeenCalledWith(
+      expect.any(AbortSignal)
+    )
+    expect(mockFetchHistoryPage).not.toHaveBeenCalled()
+  })
+
+  it('loads cloud output assets by tag when generated candidates need verification', async () => {
+    const outputAsset = makeAsset('output.png')
+    mockGetAssetsPageByTag.mockResolvedValue(makeAssetPage([outputAsset]))
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: true,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set(['output.png']),
+      allowCompactSuffix: true
+    })
+
+    expect(result.generatedAssets).toEqual([outputAsset])
+    expect(mockGetAssetsPageByTag).toHaveBeenCalledWith(
+      'output',
+      true,
+      expect.objectContaining({
+        limit: 500,
+        offset: 0,
+        signal: expect.any(AbortSignal)
+      })
+    )
+    expect(mockFetchHistoryPage).not.toHaveBeenCalled()
+  })
+
+  it('stops reading cloud output asset pages once all requested names are found', async () => {
+    const target = 'target-output.png'
+    mockGetAssetsPageByTag.mockResolvedValueOnce(
+      makeAssetPage([makeAsset(target)], { hasMore: true, total: 501 })
+    )
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: true,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set([target]),
+      allowCompactSuffix: true
+    })
+
+    expect(result.generatedAssets).toEqual([makeAsset(target)])
+    expect(mockGetAssetsPageByTag).toHaveBeenCalledOnce()
+  })
+
+  it('aborts cloud output asset loading when input asset loading fails', async () => {
+    const inputError = new Error('input failed')
+    let rejectInputAssets!: (err: Error) => void
+    let resolveOutputAssets!: (page: ReturnType<typeof makeAssetPage>) => void
+    mockGetInputAssetsIncludingPublic.mockReturnValueOnce(
+      new Promise<AssetItem[]>((_, reject) => {
+        rejectInputAssets = reject
+      })
+    )
+    mockGetAssetsPageByTag.mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveOutputAssets = resolve
+      })
+    )
+
+    const promise = resolveMissingMediaAssetSources({
+      isCloud: true,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set(['target.png']),
+      allowCompactSuffix: true
+    })
+
+    await Promise.resolve()
+    expect(mockGetAssetsPageByTag).toHaveBeenCalledOnce()
+
+    rejectInputAssets(inputError)
+    await expect(promise).rejects.toBe(inputError)
+
+    resolveOutputAssets(makeAssetPage([makeAsset('other.png')]))
+    await Promise.resolve()
+
+    const outputSignal = mockGetAssetsPageByTag.mock.calls[0]?.[2]?.signal
+    expect(outputSignal).toBeInstanceOf(AbortSignal)
+    expect(outputSignal.aborted).toBe(true)
+    expect(mockFetchHistoryPage).not.toHaveBeenCalled()
+  })
+
+  it('stops reading generated history once all requested names are found', async () => {
+    const target = 'target.png'
+    mockFetchHistoryPage.mockResolvedValueOnce(
+      makeHistoryPage([makeHistoryJob(target)], {
+        hasMore: true,
+        total: 400
+      })
+    )
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: false,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set([target]),
+      allowCompactSuffix: true
+    })
+
+    expect(result.generatedAssets).toHaveLength(1)
+    expect(result.generatedAssets[0].name).toBe(target)
+    expect(mockFetchHistoryPage).toHaveBeenCalledOnce()
+  })
+
+  it('advances pagination from the requested offset, not the echoed offset', async () => {
+    const target = 'target.png'
+    mockFetchHistoryPage
+      .mockResolvedValueOnce(
+        makeHistoryPage(
+          Array.from({ length: 200 }, (_, index) =>
+            makeHistoryJob(`other-${index}.png`)
+          ),
+          { offset: 0, hasMore: true, total: 201 }
+        )
+      )
+      .mockResolvedValueOnce(
+        makeHistoryPage([makeHistoryJob(target)], {
+          offset: 0,
+          hasMore: true,
+          total: 201
+        })
+      )
+
+    await resolveMissingMediaAssetSources({
+      isCloud: false,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set([target]),
+      allowCompactSuffix: true
+    })
+
+    expect(mockFetchHistoryPage).toHaveBeenNthCalledWith(
+      1,
+      expect.any(Function),
+      200,
+      0
+    )
+    expect(mockFetchHistoryPage).toHaveBeenNthCalledWith(
+      2,
+      expect.any(Function),
+      200,
+      200
+    )
+  })
+
+  it('stops if history reports hasMore but returns an empty page', async () => {
+    mockFetchHistoryPage.mockResolvedValueOnce(
+      makeHistoryPage([], { hasMore: true, total: 1 })
+    )
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: false,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set(['missing.png']),
+      allowCompactSuffix: true
+    })
+
+    expect(result.generatedAssets).toEqual([])
+    expect(mockFetchHistoryPage).toHaveBeenCalledOnce()
+  })
+
+  it('stops if history repeats the same job page', async () => {
+    const repeatedJob = makeHistoryJob('other.png', { id: 'same-job' })
+    mockFetchHistoryPage
+      .mockResolvedValueOnce(
+        makeHistoryPage([repeatedJob], { hasMore: true, total: 2 })
+      )
+      .mockResolvedValueOnce(
+        makeHistoryPage([repeatedJob], { offset: 1, hasMore: true, total: 2 })
+      )
+
+    const result = await resolveMissingMediaAssetSources({
+      isCloud: false,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set(['missing.png']),
+      allowCompactSuffix: true
+    })
+
+    expect(result.generatedAssets).toHaveLength(1)
+    expect(mockFetchHistoryPage).toHaveBeenCalledTimes(2)
+  })
+
+  it('includes slash and backslash subfolder identifiers for detection', () => {
+    const names = getAssetDetectionNames(
+      {
+        ...makeAsset('child\\photo.png', 'hash.png'),
+        user_metadata: { subfolder: 'nested\\folder' }
+      },
+      { allowCompactSuffix: true }
+    )
+
+    expect(names).toEqual(
+      expect.arrayContaining([
+        'child\\photo.png',
+        'hash.png',
+        'nested/folder/child/photo.png',
+        'nested\\folder\\child\\photo.png'
+      ])
+    )
+    expect(names).not.toContain('nested/folder/hash.png')
+    expect(names).not.toContain('nested\\folder\\hash.png')
+  })
+})
diff --git a/src/platform/missingMedia/missingMediaAssetResolver.ts b/src/platform/missingMedia/missingMediaAssetResolver.ts
new file mode 100644
index 0000000000..00732f8dc5
--- /dev/null
+++ b/src/platform/missingMedia/missingMediaAssetResolver.ts
@@ -0,0 +1,286 @@
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { assetService } from '@/platform/assets/services/assetService'
+import { fetchHistoryPage } from '@/platform/remote/comfyui/jobs/fetchJobs'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { api } from '@/scripts/api'
+import { getFilePathSeparatorVariants, joinFilePath } from '@/utils/formatUtil'
+import { getMediaPathDetectionNames } from './mediaPathDetectionUtil'
+
+const HISTORY_MEDIA_ASSETS_PAGE_SIZE = 200
+const CLOUD_OUTPUT_ASSETS_PAGE_SIZE = 500
+
+interface MediaPathDetectionOptions {
+  allowCompactSuffix: boolean
+}
+
+export interface MissingMediaAssetSources {
+  inputAssets: AssetItem[]
+  generatedAssets: AssetItem[]
+}
+
+export interface ResolveMissingMediaAssetSourcesOptions {
+  signal?: AbortSignal
+  isCloud: boolean
+  includeGeneratedAssets: boolean
+  generatedMatchNames: ReadonlySet<string>
+  allowCompactSuffix: boolean
+}
+
+export type MissingMediaAssetResolver = (
+  options: ResolveMissingMediaAssetSourcesOptions
+) => Promise<MissingMediaAssetSources>
+
+export async function resolveMissingMediaAssetSources({
+  signal,
+  isCloud,
+  includeGeneratedAssets,
+  generatedMatchNames,
+  allowCompactSuffix
+}: ResolveMissingMediaAssetSourcesOptions): Promise<MissingMediaAssetSources> {
+  const pathOptions = { allowCompactSuffix }
+
+  const controller = new AbortController()
+  const abortFromCaller = () => controller.abort(signal?.reason)
+  if (signal?.aborted) {
+    abortFromCaller()
+  } else {
+    signal?.addEventListener('abort', abortFromCaller, { once: true })
+  }
+
+  try {
+    const [inputAssets, generatedAssets] = await Promise.all([
+      abortSiblingsOnFailure(
+        isCloud
+          ? assetService.getInputAssetsIncludingPublic(controller.signal)
+          : Promise.resolve<AssetItem[]>([]),
+        controller
+      ),
+      abortSiblingsOnFailure(
+        includeGeneratedAssets
+          ? fetchGeneratedAssets(controller.signal, {
+              isCloud,
+              generatedMatchNames,
+              pathOptions
+            })
+          : Promise.resolve<AssetItem[]>([]),
+        controller
+      )
+    ])
+
+    return { inputAssets, generatedAssets }
+  } finally {
+    signal?.removeEventListener('abort', abortFromCaller)
+  }
+}
+
+interface FetchGeneratedAssetsOptions {
+  isCloud: boolean
+  generatedMatchNames: ReadonlySet<string>
+  pathOptions: MediaPathDetectionOptions
+}
+
+export function getAssetDetectionNames(
+  asset: AssetItem,
+  options: MediaPathDetectionOptions
+): string[] {
+  const names = new Set<string>()
+  // Treat names and hashes as opaque match keys because Cloud may use either in widget values.
+  addPathDetectionNames(names, asset.asset_hash, options)
+  addPathDetectionNames(names, asset.name, options)
+
+  const subfolder = asset.user_metadata?.subfolder
+  if (typeof subfolder === 'string' && subfolder) {
+    addSubfolderPathDetectionNames(names, subfolder, asset.name, options)
+  }
+
+  return Array.from(names)
+}
+
+async function fetchGeneratedAssets(
+  signal: AbortSignal | undefined,
+  { isCloud, generatedMatchNames, pathOptions }: FetchGeneratedAssetsOptions
+): Promise<AssetItem[]> {
+  if (isCloud) {
+    return await fetchCloudGeneratedAssets(
+      signal,
+      generatedMatchNames,
+      pathOptions
+    )
+  }
+
+  return await fetchGeneratedHistoryAssets(
+    signal,
+    generatedMatchNames,
+    pathOptions
+  )
+}
+
+async function fetchCloudGeneratedAssets(
+  signal: AbortSignal | undefined,
+  targetNames: ReadonlySet<string>,
+  pathOptions: MediaPathDetectionOptions
+): Promise<AssetItem[]> {
+  const assets: AssetItem[] = []
+  const foundTargetNames = new Set<string>()
+  let offset = 0
+
+  while (true) {
+    signal?.throwIfAborted()
+
+    const assetPage = await assetService.getAssetsPageByTag('output', true, {
+      limit: CLOUD_OUTPUT_ASSETS_PAGE_SIZE,
+      offset,
+      signal
+    })
+
+    signal?.throwIfAborted()
+
+    const batch = assetPage.assets
+    if (batch.length === 0) return assets
+
+    for (const asset of batch) {
+      assets.push(asset)
+      rememberResolvedTargetNames(
+        asset,
+        targetNames,
+        foundTargetNames,
+        pathOptions
+      )
+    }
+
+    if (
+      !assetPage.has_more ||
+      hasResolvedAllTargetNames(targetNames, foundTargetNames)
+    ) {
+      return assets
+    }
+
+    offset += batch.length
+  }
+}
+
+async function fetchGeneratedHistoryAssets(
+  signal: AbortSignal | undefined,
+  targetNames: ReadonlySet<string>,
+  pathOptions: MediaPathDetectionOptions
+): Promise<AssetItem[]> {
+  const assets: AssetItem[] = []
+  const foundTargetNames = new Set<string>()
+  const seenJobIds = new Set<string>()
+  let offset = 0
+
+  while (true) {
+    signal?.throwIfAborted()
+
+    const requestedOffset = offset
+    const historyPage = await fetchHistoryPage(
+      api.fetchApi.bind(api),
+      HISTORY_MEDIA_ASSETS_PAGE_SIZE,
+      requestedOffset
+    )
+
+    signal?.throwIfAborted()
+
+    let newJobCount = 0
+    for (const job of historyPage.jobs) {
+      if (seenJobIds.has(job.id)) continue
+      seenJobIds.add(job.id)
+      newJobCount += 1
+
+      const asset = mapHistoryJobToAsset(job)
+      if (!asset) continue
+
+      assets.push(asset)
+      rememberResolvedTargetNames(
+        asset,
+        targetNames,
+        foundTargetNames,
+        pathOptions
+      )
+    }
+
+    if (
+      !historyPage.hasMore ||
+      historyPage.jobs.length === 0 ||
+      newJobCount === 0 ||
+      hasResolvedAllTargetNames(targetNames, foundTargetNames)
+    ) {
+      return assets
+    }
+
+    offset = requestedOffset + historyPage.jobs.length
+  }
+}
+
+async function abortSiblingsOnFailure<T>(
+  promise: Promise<T>,
+  controller: AbortController
+): Promise<T> {
+  try {
+    return await promise
+  } catch (err) {
+    if (!controller.signal.aborted) controller.abort(err)
+    throw err
+  }
+}
+
+function addPathDetectionNames(
+  names: Set<string>,
+  value: string | null | undefined,
+  options: MediaPathDetectionOptions
+) {
+  if (!value) return
+  for (const name of getMediaPathDetectionNames(value, options)) {
+    names.add(name)
+  }
+}
+
+function addSubfolderPathDetectionNames(
+  names: Set<string>,
+  subfolder: string,
+  value: string | null | undefined,
+  options: MediaPathDetectionOptions
+) {
+  if (!value) return
+
+  const filePath = joinFilePath(subfolder, value)
+  for (const path of getFilePathSeparatorVariants(filePath)) {
+    addPathDetectionNames(names, path, options)
+  }
+}
+
+function rememberResolvedTargetNames(
+  asset: AssetItem,
+  targetNames: ReadonlySet<string>,
+  foundTargetNames: Set<string>,
+  options: MediaPathDetectionOptions
+) {
+  if (targetNames.size === 0) return
+
+  for (const name of getAssetDetectionNames(asset, options)) {
+    if (targetNames.has(name)) foundTargetNames.add(name)
+  }
+}
+
+function hasResolvedAllTargetNames(
+  targetNames: ReadonlySet<string>,
+  foundTargetNames: ReadonlySet<string>
+): boolean {
+  return targetNames.size > 0 && foundTargetNames.size === targetNames.size
+}
+
+function mapHistoryJobToAsset(job: JobListItem): AssetItem | null {
+  const output = job.preview_output
+  if (job.status !== 'completed' || !output?.filename) return null
+
+  return {
+    id: `${job.id}-${output.filename}`,
+    name: output.filename,
+    display_name: output.display_name,
+    mime_type: null,
+    tags: ['output'],
+    user_metadata: {
+      subfolder: output.subfolder
+    }
+  }
+}
diff --git a/src/platform/missingMedia/missingMediaScan.test.ts b/src/platform/missingMedia/missingMediaScan.test.ts
index 8e77aae88c..80580a8960 100644
--- a/src/platform/missingMedia/missingMediaScan.test.ts
+++ b/src/platform/missingMedia/missingMediaScan.test.ts
@@ -6,21 +6,27 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IComboWidget } from '@/lib/litegraph/src/types/widgets'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import type * as AssetServiceModule from '@/platform/assets/services/assetService'
+import type * as FetchJobsModule from '@/platform/remote/comfyui/jobs/fetchJobs'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { MissingMediaAssetResolver } from './missingMediaAssetResolver'
 import {
   scanAllMediaCandidates,
   scanNodeMediaCandidates,
-  verifyCloudMediaCandidates,
+  verifyMediaCandidates,
   groupCandidatesByName,
   groupCandidatesByMediaType
 } from './missingMediaScan'
 import type { MissingMediaCandidate } from './types'
 
-const { mockCheckAssetHash, mockGetInputAssetsIncludingPublic } = vi.hoisted(
-  () => ({
-    mockCheckAssetHash: vi.fn(),
-    mockGetInputAssetsIncludingPublic: vi.fn()
-  })
-)
+const { mockGetInputAssetsIncludingPublic, mockGetAssetsPageByTag } =
+  vi.hoisted(() => ({
+    mockGetInputAssetsIncludingPublic: vi.fn(),
+    mockGetAssetsPageByTag: vi.fn()
+  }))
+
+const { mockFetchHistoryPage } = vi.hoisted(() => ({
+  mockFetchHistoryPage: vi.fn()
+}))
 
 vi.mock('@/utils/graphTraversalUtil', () => ({
   collectAllNodes: (graph: { _testNodes: LGraphNode[] }) => graph._testNodes,
@@ -39,12 +45,23 @@ vi.mock('@/platform/assets/services/assetService', async () => {
     ...actual,
     assetService: {
       ...actual.assetService,
-      checkAssetHash: mockCheckAssetHash,
-      getInputAssetsIncludingPublic: mockGetInputAssetsIncludingPublic
+      getInputAssetsIncludingPublic: mockGetInputAssetsIncludingPublic,
+      getAssetsPageByTag: mockGetAssetsPageByTag
     }
   }
 })
 
+vi.mock('@/platform/remote/comfyui/jobs/fetchJobs', async () => {
+  const actual = await vi.importActual<typeof FetchJobsModule>(
+    '@/platform/remote/comfyui/jobs/fetchJobs'
+  )
+
+  return {
+    ...actual,
+    fetchHistoryPage: mockFetchHistoryPage
+  }
+})
+
 function makeCandidate(
   nodeId: string,
   name: string,
@@ -104,6 +121,43 @@ function makeAsset(name: string, assetHash: string | null = null): AssetItem {
   }
 }
 
+function makeAssetResolver(
+  inputAssets: AssetItem[],
+  generatedAssets: AssetItem[] = []
+): MissingMediaAssetResolver {
+  return vi.fn(async () => ({ inputAssets, generatedAssets }))
+}
+
+function makeAssetPage(
+  assets: AssetItem[],
+  options: { hasMore?: boolean; total?: number } = {}
+) {
+  return {
+    assets,
+    total: options.total ?? assets.length,
+    has_more: options.hasMore ?? false
+  }
+}
+
+function makeHistoryJob(
+  filename: string,
+  options: { id?: string; subfolder?: string } = {}
+): JobListItem {
+  return fromAny<JobListItem, unknown>({
+    id: options.id ?? filename,
+    status: 'completed',
+    create_time: 0,
+    priority: 0,
+    preview_output: {
+      filename,
+      subfolder: options.subfolder ?? '',
+      type: 'output',
+      nodeId: '1',
+      mediaType: 'images'
+    }
+  })
+}
+
 describe('scanNodeMediaCandidates', () => {
   it('returns candidate for a LoadImage node with missing image', () => {
     const graph = makeGraph([])
@@ -149,6 +203,173 @@ describe('scanNodeMediaCandidates', () => {
 
     expect(result).toEqual([])
   })
+
+  it.for([false, true])(
+    'returns empty while a media upload is pending on the node (isCloud: %s)',
+    (isCloud) => {
+      const graph = makeGraph([])
+      const node = makeMediaNode(
+        1,
+        'LoadVideo',
+        [makeMediaCombo('file', 'clip.mp4', [])],
+        0
+      )
+      node.isUploading = true
+
+      const result = scanNodeMediaCandidates(graph, node, isCloud)
+
+      expect(result).toEqual([])
+    }
+  )
+
+  it('detects missing media again after upload state clears', () => {
+    const graph = makeGraph([])
+    const node = makeMediaNode(
+      1,
+      'LoadVideo',
+      [makeMediaCombo('file', 'clip.mp4', [])],
+      0
+    )
+
+    node.isUploading = true
+    expect(scanNodeMediaCandidates(graph, node, false)).toEqual([])
+
+    node.isUploading = false
+    expect(scanNodeMediaCandidates(graph, node, false)).toEqual([
+      expect.objectContaining({
+        nodeType: 'LoadVideo',
+        widgetName: 'file',
+        mediaType: 'video',
+        name: 'clip.mp4',
+        isMissing: true
+      })
+    ])
+  })
+
+  it.for([
+    {
+      nodeType: 'LoadImage',
+      widgetName: 'image',
+      mediaType: 'image',
+      value: 'photo.png [input]',
+      option: 'photo.png'
+    },
+    {
+      nodeType: 'LoadImageMask',
+      widgetName: 'image',
+      mediaType: 'image',
+      value: 'mask.png [input]',
+      option: 'mask.png'
+    },
+    {
+      nodeType: 'LoadVideo',
+      widgetName: 'file',
+      mediaType: 'video',
+      value: 'clip.mp4 [input]',
+      option: 'clip.mp4'
+    },
+    {
+      nodeType: 'LoadAudio',
+      widgetName: 'audio',
+      mediaType: 'audio',
+      value: 'sound.wav [input]',
+      option: 'sound.wav'
+    }
+  ])(
+    'matches annotated $nodeType values against clean OSS options',
+    ({ nodeType, widgetName, mediaType, value, option }) => {
+      const graph = makeGraph([])
+      const node = makeMediaNode(
+        1,
+        nodeType,
+        [makeMediaCombo(widgetName, value, [option])],
+        0
+      )
+
+      const result = scanNodeMediaCandidates(graph, node, false)
+
+      expect(result).toHaveLength(1)
+      expect(result[0]).toMatchObject({
+        nodeType,
+        widgetName,
+        mediaType,
+        name: value,
+        isMissing: false
+      })
+    }
+  )
+
+  it.for([
+    {
+      nodeType: 'LoadImage',
+      widgetName: 'image',
+      value: 'photo.png [output]'
+    },
+    {
+      nodeType: 'LoadVideo',
+      widgetName: 'file',
+      value: 'clip.mp4 [output]'
+    },
+    {
+      nodeType: 'LoadAudio',
+      widgetName: 'audio',
+      value: 'sound.wav [output]'
+    }
+  ])(
+    'leaves OSS $nodeType output annotations pending when not in options',
+    ({ nodeType, widgetName, value }) => {
+      const graph = makeGraph([])
+      const node = makeMediaNode(
+        1,
+        nodeType,
+        [makeMediaCombo(widgetName, value, ['other-file.png', value])],
+        0
+      )
+
+      const result = scanNodeMediaCandidates(graph, node, false)
+
+      expect(result[0]).toMatchObject({
+        nodeType,
+        widgetName,
+        name: value,
+        isMissing: undefined
+      })
+    }
+  )
+
+  it('marks OSS input annotations missing when the clean option is absent', () => {
+    const graph = makeGraph([])
+    const node = makeMediaNode(
+      1,
+      'LoadImage',
+      [makeMediaCombo('image', 'photo.png [input]', ['other.png'])],
+      0
+    )
+
+    const result = scanNodeMediaCandidates(graph, node, false)
+
+    expect(result[0]).toMatchObject({
+      name: 'photo.png [input]',
+      isMissing: true
+    })
+  })
+
+  it('does not treat compact Cloud annotations as valid OSS options', () => {
+    const graph = makeGraph([])
+    const node = makeMediaNode(
+      1,
+      'LoadImage',
+      [makeMediaCombo('image', 'photo.png[input]', ['photo.png'])],
+      0
+    )
+
+    const result = scanNodeMediaCandidates(graph, node, false)
+
+    expect(result[0]).toMatchObject({
+      name: 'photo.png[input]',
+      isMissing: true
+    })
+  })
 })
 
 describe('scanAllMediaCandidates', () => {
@@ -265,7 +486,7 @@ describe('groupCandidatesByMediaType', () => {
   })
 })
 
-describe('verifyCloudMediaCandidates', () => {
+describe('verifyMediaCandidates', () => {
   const existingHash =
     'blake3:1111111111111111111111111111111111111111111111111111111111111111'
   const missingHash =
@@ -273,36 +494,355 @@ describe('verifyCloudMediaCandidates', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockCheckAssetHash.mockResolvedValue('missing')
     mockGetInputAssetsIncludingPublic.mockResolvedValue([])
+    mockGetAssetsPageByTag.mockResolvedValue(makeAssetPage([]))
+    mockFetchHistoryPage.mockResolvedValue({
+      jobs: [],
+      total: 0,
+      offset: 0,
+      limit: 200,
+      hasMore: false
+    })
   })
 
-  it('marks candidates missing when the asset hash is not found', async () => {
+  it('matches candidates by available input asset name or hash', async () => {
     const candidates = [
-      makeCandidate('1', missingHash, { isMissing: undefined }),
-      makeCandidate('2', existingHash, { isMissing: undefined })
+      makeCandidate('1', 'photo.png', { isMissing: undefined }),
+      makeCandidate('2', existingHash, { isMissing: undefined }),
+      makeCandidate('3', missingHash, { isMissing: undefined })
     ]
+    const resolveAssetSources = makeAssetResolver([
+      makeAsset('photo.png', existingHash)
+    ])
 
-    const checkAssetHash = vi.fn(async (assetHash: string) =>
-      assetHash === existingHash ? ('exists' as const) : ('missing' as const)
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(candidates[0].isMissing).toBe(false)
+    expect(candidates[1].isMissing).toBe(false)
+    expect(candidates[2].isMissing).toBe(true)
+    expect(resolveAssetSources).toHaveBeenCalledWith({
+      signal: undefined,
+      isCloud: true,
+      includeGeneratedAssets: false,
+      generatedMatchNames: new Set(),
+      allowCompactSuffix: true
+    })
+  })
+
+  it('matches asset names when asset_hash is null', async () => {
+    const candidates = [
+      makeCandidate('1', 'legacy-photo.png', { isMissing: undefined }),
+      makeCandidate('2', 'missing-photo.png', { isMissing: undefined })
+    ]
+    const resolveAssetSources = makeAssetResolver([
+      makeAsset('legacy-photo.png', null)
+    ])
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(candidates[0].isMissing).toBe(false)
+    expect(candidates[1].isMissing).toBe(true)
+  })
+
+  it('matches annotated candidate names against clean asset names', async () => {
+    const candidates = [
+      makeCandidate('1', 'photo.png [input]', { isMissing: undefined }),
+      makeCandidate('2', 'clip.mp4[input]', {
+        nodeType: 'LoadVideo',
+        widgetName: 'file',
+        mediaType: 'video',
+        isMissing: undefined
+      }),
+      makeCandidate('3', 'missing.wav [output]', {
+        nodeType: 'LoadAudio',
+        widgetName: 'audio',
+        mediaType: 'audio',
+        isMissing: undefined
+      })
+    ]
+    const resolveAssetSources = makeAssetResolver(
+      [makeAsset('photo.png'), makeAsset('clip.mp4')],
+      []
     )
 
-    await verifyCloudMediaCandidates(candidates, undefined, checkAssetHash)
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
 
-    expect(candidates[0].isMissing).toBe(true)
-    expect(candidates[1].isMissing).toBe(false)
+    expect(candidates[0]).toMatchObject({
+      name: 'photo.png [input]',
+      isMissing: false
+    })
+    expect(candidates[1]).toMatchObject({
+      name: 'clip.mp4[input]',
+      isMissing: false
+    })
+    expect(candidates[2]).toMatchObject({
+      name: 'missing.wav [output]',
+      isMissing: true
+    })
   })
 
-  it('uses assetService.checkAssetHash by default', async () => {
+  it('matches output hash filenames against generated media assets', async () => {
+    const candidates = [
+      makeCandidate(
+        '1',
+        '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png [output]',
+        {
+          isMissing: undefined
+        }
+      )
+    ]
+    const resolveAssetSources = makeAssetResolver(
+      [],
+      [
+        makeAsset(
+          '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png'
+        )
+      ]
+    )
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(resolveAssetSources).toHaveBeenCalledWith({
+      signal: undefined,
+      isCloud: true,
+      includeGeneratedAssets: true,
+      generatedMatchNames: new Set([
+        '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png'
+      ]),
+      allowCompactSuffix: true
+    })
+    expect(candidates[0]).toMatchObject({
+      name: '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png [output]',
+      isMissing: false
+    })
+  })
+
+  it('does not satisfy output annotations with input assets of the same name', async () => {
+    const candidates = [
+      makeCandidate('1', 'photo.png [output]', { isMissing: undefined })
+    ]
+    const resolveAssetSources = makeAssetResolver([makeAsset('photo.png')])
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(candidates[0].isMissing).toBe(true)
+  })
+
+  it('does not satisfy input candidates with output assets of the same name', async () => {
+    const candidates = [
+      makeCandidate('1', 'photo.png', { isMissing: undefined })
+    ]
+    const resolveAssetSources = makeAssetResolver([], [makeAsset('photo.png')])
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(candidates[0].isMissing).toBe(true)
+  })
+
+  it('verifies OSS output candidates against generated history without cloud assets', async () => {
+    const candidates = [
+      makeCandidate('1', 'subfolder/photo.png [output]', {
+        isMissing: undefined
+      })
+    ]
+
+    mockFetchHistoryPage.mockResolvedValueOnce({
+      jobs: [makeHistoryJob('photo.png', { subfolder: 'subfolder' })],
+      total: 1,
+      offset: 0,
+      limit: 200,
+      hasMore: false
+    })
+
+    await verifyMediaCandidates(candidates, { isCloud: false })
+
+    expect(mockGetInputAssetsIncludingPublic).not.toHaveBeenCalled()
+    expect(mockFetchHistoryPage).toHaveBeenCalledWith(
+      expect.any(Function),
+      200,
+      0
+    )
+    expect(candidates[0]).toMatchObject({
+      name: 'subfolder/photo.png [output]',
+      isMissing: false
+    })
+  })
+
+  it('does not normalize compact annotations when verifying OSS candidates', async () => {
+    const candidates = [
+      makeCandidate('1', 'photo.png[output]', { isMissing: undefined })
+    ]
+    const resolveAssetSources = makeAssetResolver([makeAsset('photo.png')])
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: false,
+      resolveAssetSources
+    })
+
+    expect(resolveAssetSources).toHaveBeenCalledWith({
+      signal: undefined,
+      isCloud: false,
+      includeGeneratedAssets: false,
+      generatedMatchNames: new Set(),
+      allowCompactSuffix: false
+    })
+    expect(candidates[0].isMissing).toBe(true)
+  })
+
+  it('matches when the asset identifier itself is annotated', async () => {
+    const candidates = [
+      makeCandidate('1', 'clip.mp4[output]', { isMissing: undefined })
+    ]
+    const resolveAssetSources = makeAssetResolver(
+      [],
+      [makeAsset('clip.mp4 [output]')]
+    )
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources
+    })
+
+    expect(candidates[0].isMissing).toBe(false)
+  })
+
+  it('marks pending candidates missing when no input assets are available', async () => {
+    const candidates = [
+      makeCandidate('1', 'photo.png', { isMissing: undefined })
+    ]
+
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      resolveAssetSources: makeAssetResolver([])
+    })
+
+    expect(candidates[0].isMissing).toBe(true)
+  })
+
+  it('uses public input assets by default', async () => {
     const candidates = [
       makeCandidate('1', existingHash, { isMissing: undefined })
     ]
-    mockCheckAssetHash.mockResolvedValue('exists')
+    mockGetInputAssetsIncludingPublic.mockResolvedValue([
+      makeAsset('stored-photo.png', existingHash)
+    ])
 
-    await verifyCloudMediaCandidates(candidates)
+    await verifyMediaCandidates(candidates, { isCloud: true })
 
     expect(candidates[0].isMissing).toBe(false)
-    expect(mockCheckAssetHash).toHaveBeenCalledWith(existingHash, undefined)
+    expect(mockGetInputAssetsIncludingPublic).toHaveBeenCalledWith(
+      expect.any(AbortSignal)
+    )
+    expect(mockFetchHistoryPage).not.toHaveBeenCalled()
+  })
+
+  it('reads cloud output assets by tag for output candidates', async () => {
+    const outputHash =
+      '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png'
+    const candidates = [
+      makeCandidate('1', `${outputHash} [output]`, { isMissing: undefined })
+    ]
+    mockGetAssetsPageByTag.mockResolvedValue(
+      makeAssetPage([makeAsset(outputHash)])
+    )
+
+    await verifyMediaCandidates(candidates, { isCloud: true })
+
+    expect(mockGetInputAssetsIncludingPublic).toHaveBeenCalledWith(
+      expect.any(AbortSignal)
+    )
+    expect(mockGetAssetsPageByTag).toHaveBeenCalledWith(
+      'output',
+      true,
+      expect.objectContaining({
+        limit: 500,
+        offset: 0,
+        signal: expect.any(AbortSignal)
+      })
+    )
+    expect(mockFetchHistoryPage).not.toHaveBeenCalled()
+    expect(candidates[0].isMissing).toBe(false)
+  })
+
+  it('walks OSS generated history pages until hasMore is false', async () => {
+    const outputHash =
+      '147257c95a3e957e0deee73a077cfec89da2d906dd086ca70a2b0c897a9591d6e.png'
+    const candidates = [
+      makeCandidate('1', `${outputHash} [output]`, { isMissing: undefined })
+    ]
+    mockFetchHistoryPage
+      .mockResolvedValueOnce({
+        jobs: Array.from({ length: 200 }, (_, index) =>
+          makeHistoryJob(`other-${index}.png`)
+        ),
+        total: 201,
+        offset: 0,
+        limit: 200,
+        hasMore: true
+      })
+      .mockResolvedValueOnce({
+        jobs: [makeHistoryJob(outputHash)],
+        total: 201,
+        offset: 200,
+        limit: 200,
+        hasMore: false
+      })
+
+    await verifyMediaCandidates(candidates, { isCloud: false })
+
+    expect(mockFetchHistoryPage).toHaveBeenNthCalledWith(
+      1,
+      expect.any(Function),
+      200,
+      0
+    )
+    expect(mockFetchHistoryPage).toHaveBeenNthCalledWith(
+      2,
+      expect.any(Function),
+      200,
+      200
+    )
+    expect(candidates[0].isMissing).toBe(false)
+  })
+
+  it('trusts OSS history hasMore instead of page length', async () => {
+    const candidates = [
+      makeCandidate('1', 'missing-output.png [output]', {
+        isMissing: undefined
+      })
+    ]
+    mockFetchHistoryPage.mockResolvedValueOnce({
+      jobs: Array.from({ length: 200 }, (_, index) =>
+        makeHistoryJob(`other-${index}.png`)
+      ),
+      total: 200,
+      offset: 0,
+      limit: 200,
+      hasMore: false
+    })
+
+    await verifyMediaCandidates(candidates, { isCloud: false })
+
+    expect(mockFetchHistoryPage).toHaveBeenCalledOnce()
+    expect(candidates[0].isMissing).toBe(true)
   })
 
   it('respects abort signal before execution', async () => {
@@ -313,27 +853,33 @@ describe('verifyCloudMediaCandidates', () => {
       makeCandidate('1', missingHash, { isMissing: undefined })
     ]
 
-    await verifyCloudMediaCandidates(candidates, controller.signal)
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      signal: controller.signal
+    })
 
     expect(candidates[0].isMissing).toBeUndefined()
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
+    expect(mockGetInputAssetsIncludingPublic).not.toHaveBeenCalled()
   })
 
-  it('respects abort signal after hash verification', async () => {
+  it('respects abort signal after loading input assets', async () => {
     const controller = new AbortController()
     const candidates = [
       makeCandidate('1', existingHash, { isMissing: undefined })
     ]
-    const checkAssetHash = vi.fn(async () => {
+    const resolveAssetSources: MissingMediaAssetResolver = vi.fn(async () => {
       controller.abort()
-      return 'exists' as const
+      return {
+        inputAssets: [makeAsset('stored-photo.png', existingHash)],
+        generatedAssets: []
+      }
     })
 
-    await verifyCloudMediaCandidates(
-      candidates,
-      controller.signal,
-      checkAssetHash
-    )
+    await verifyMediaCandidates(candidates, {
+      isCloud: true,
+      signal: controller.signal,
+      resolveAssetSources
+    })
 
     expect(candidates[0].isMissing).toBeUndefined()
   })
@@ -341,52 +887,30 @@ describe('verifyCloudMediaCandidates', () => {
   it('skips candidates already resolved as true', async () => {
     const candidates = [makeCandidate('1', missingHash, { isMissing: true })]
 
-    await verifyCloudMediaCandidates(candidates)
+    await verifyMediaCandidates(candidates, { isCloud: true })
 
     expect(candidates[0].isMissing).toBe(true)
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
+    expect(mockGetInputAssetsIncludingPublic).not.toHaveBeenCalled()
   })
 
   it('skips candidates already resolved as false', async () => {
     const candidates = [makeCandidate('1', existingHash, { isMissing: false })]
 
-    await verifyCloudMediaCandidates(candidates)
+    await verifyMediaCandidates(candidates, { isCloud: true })
 
     expect(candidates[0].isMissing).toBe(false)
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
+    expect(mockGetInputAssetsIncludingPublic).not.toHaveBeenCalled()
   })
 
   it('skips entirely when no pending candidates', async () => {
     const candidates = [makeCandidate('1', missingHash, { isMissing: true })]
 
-    await verifyCloudMediaCandidates(candidates)
+    await verifyMediaCandidates(candidates, { isCloud: true })
 
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
+    expect(mockGetInputAssetsIncludingPublic).not.toHaveBeenCalled()
   })
 
-  it('falls back to input assets for non-blake3 candidate names', async () => {
-    const candidates = [
-      makeCandidate('1', 'photo.png', { isMissing: undefined }),
-      makeCandidate('2', 'missing.png', { isMissing: undefined })
-    ]
-    const fetchInputAssets = vi.fn(async () => [
-      makeAsset('stored-photo.png', 'photo.png')
-    ])
-
-    await verifyCloudMediaCandidates(
-      candidates,
-      undefined,
-      undefined,
-      fetchInputAssets
-    )
-
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
-    expect(fetchInputAssets).toHaveBeenCalledOnce()
-    expect(candidates[0].isMissing).toBe(false)
-    expect(candidates[1].isMissing).toBe(true)
-  })
-
-  it('uses public input assets for default legacy fallback', async () => {
+  it('loads public input assets for default verification', async () => {
     const candidates = [
       makeCandidate('1', 'public-photo.png', { isMissing: undefined })
     ]
@@ -396,135 +920,62 @@ describe('verifyCloudMediaCandidates', () => {
     inputAssets[42] = makeAsset('public-asset-record', 'public-photo.png')
     mockGetInputAssetsIncludingPublic.mockResolvedValue(inputAssets)
 
-    await verifyCloudMediaCandidates(candidates)
-
-    expect(mockGetInputAssetsIncludingPublic).toHaveBeenCalledWith(undefined)
-    expect(candidates[0].isMissing).toBe(false)
-  })
-
-  it('silences aborts while loading legacy fallback input assets', async () => {
-    const abortError = new Error('aborted')
-    abortError.name = 'AbortError'
-    const controller = new AbortController()
-    const candidates = [
-      makeCandidate('1', 'photo.png', { isMissing: undefined })
-    ]
-    const fetchInputAssets = vi.fn(async () => {
-      controller.abort()
-      throw abortError
-    })
-
-    await expect(
-      verifyCloudMediaCandidates(
-        candidates,
-        controller.signal,
-        undefined,
-        fetchInputAssets
-      )
-    ).resolves.toBeUndefined()
-
-    expect(candidates[0].isMissing).toBeUndefined()
-  })
-
-  it('silences aborts from the default legacy fallback input asset store path', async () => {
-    const abortError = new Error('aborted')
-    abortError.name = 'AbortError'
-    const controller = new AbortController()
-    const candidates = [
-      makeCandidate('1', 'photo.png', { isMissing: undefined })
-    ]
-    mockGetInputAssetsIncludingPublic.mockImplementationOnce(async () => {
-      controller.abort()
-      throw abortError
-    })
-
-    await expect(
-      verifyCloudMediaCandidates(candidates, controller.signal)
-    ).resolves.toBeUndefined()
+    await verifyMediaCandidates(candidates, { isCloud: true })
 
     expect(mockGetInputAssetsIncludingPublic).toHaveBeenCalledWith(
-      controller.signal
+      expect.any(AbortSignal)
     )
+    expect(candidates[0].isMissing).toBe(false)
+  })
+
+  it('silences aborts while loading input assets', async () => {
+    const abortError = new Error('aborted')
+    abortError.name = 'AbortError'
+    const controller = new AbortController()
+    const candidates = [
+      makeCandidate('1', 'photo.png', { isMissing: undefined })
+    ]
+    const resolveAssetSources: MissingMediaAssetResolver = vi.fn(async () => {
+      controller.abort()
+      throw abortError
+    })
+
+    await expect(
+      verifyMediaCandidates(candidates, {
+        isCloud: true,
+        signal: controller.signal,
+        resolveAssetSources
+      })
+    ).resolves.toBeUndefined()
+
     expect(candidates[0].isMissing).toBeUndefined()
   })
 
-  it('falls back to input assets when the hash endpoint returns 400', async () => {
+  it('forwards the signal to the default input asset fetcher and silences aborts', async () => {
+    const abortError = new Error('aborted')
+    abortError.name = 'AbortError'
+    const controller = new AbortController()
     const candidates = [
-      makeCandidate('1', existingHash, { isMissing: undefined })
+      makeCandidate('1', 'photo.png', { isMissing: undefined })
     ]
-    mockCheckAssetHash.mockResolvedValue('invalid')
-    const fetchInputAssets = vi.fn(async () => [
-      makeAsset('photo.png', existingHash)
-    ])
-
-    await verifyCloudMediaCandidates(
-      candidates,
-      undefined,
-      undefined,
-      fetchInputAssets
+    let serviceSignal: AbortSignal | undefined
+    mockGetInputAssetsIncludingPublic.mockImplementationOnce(
+      async (signal?: AbortSignal) => {
+        serviceSignal = signal
+        controller.abort()
+        throw abortError
+      }
     )
 
-    expect(mockCheckAssetHash).toHaveBeenCalledWith(existingHash, undefined)
-    expect(fetchInputAssets).toHaveBeenCalledOnce()
-    expect(candidates[0].isMissing).toBe(false)
-  })
+    await expect(
+      verifyMediaCandidates(candidates, {
+        isCloud: true,
+        signal: controller.signal
+      })
+    ).resolves.toBeUndefined()
 
-  it('falls back to input assets when hash verification fails', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const candidates = [
-      makeCandidate('1', existingHash, { isMissing: undefined })
-    ]
-    const checkAssetHash = vi.fn(async () => {
-      throw new Error('network failed')
-    })
-    const fetchInputAssets = vi.fn(async () => [
-      makeAsset('photo.png', existingHash)
-    ])
-
-    await verifyCloudMediaCandidates(
-      candidates,
-      undefined,
-      checkAssetHash,
-      fetchInputAssets
-    )
-
-    expect(fetchInputAssets).toHaveBeenCalledOnce()
-    expect(candidates[0].isMissing).toBe(false)
-    expect(warn).toHaveBeenCalledOnce()
-    warn.mockRestore()
-  })
-
-  it('does not call the hash endpoint for malformed blake3-looking values', async () => {
-    const malformedHash = 'blake3:abc'
-    const candidates = [
-      makeCandidate('1', malformedHash, { isMissing: undefined })
-    ]
-    const fetchInputAssets = vi.fn(async () => [
-      makeAsset('legacy.png', malformedHash)
-    ])
-
-    await verifyCloudMediaCandidates(
-      candidates,
-      undefined,
-      undefined,
-      fetchInputAssets
-    )
-
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
-    expect(fetchInputAssets).toHaveBeenCalledOnce()
-    expect(candidates[0].isMissing).toBe(false)
-  })
-
-  it('deduplicates checks for repeated candidate names', async () => {
-    const candidates = [
-      makeCandidate('1', missingHash, { isMissing: undefined }),
-      makeCandidate('2', missingHash, { isMissing: undefined })
-    ]
-
-    await verifyCloudMediaCandidates(candidates)
-
-    expect(mockCheckAssetHash).toHaveBeenCalledOnce()
-    expect(candidates[0].isMissing).toBe(true)
-    expect(candidates[1].isMissing).toBe(true)
+    expect(serviceSignal).toBeInstanceOf(AbortSignal)
+    expect(serviceSignal?.aborted).toBe(true)
+    expect(candidates[0].isMissing).toBeUndefined()
   })
 })
diff --git a/src/platform/missingMedia/missingMediaScan.ts b/src/platform/missingMedia/missingMediaScan.ts
index 5050996e06..9adb179f82 100644
--- a/src/platform/missingMedia/missingMediaScan.ts
+++ b/src/platform/missingMedia/missingMediaScan.ts
@@ -19,11 +19,17 @@ import {
 import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
 import { resolveComboValues } from '@/utils/litegraphUtil'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import type { AssetHashStatus } from '@/platform/assets/services/assetService'
+import { isAbortError } from '@/utils/typeGuardUtil'
 import {
-  assetService,
-  isBlake3AssetHash
-} from '@/platform/assets/services/assetService'
+  getAnnotatedMediaPathTypeForDetection,
+  getMediaPathDetectionNames,
+  normalizeAnnotatedMediaPathForDetection
+} from './mediaPathDetectionUtil'
+import {
+  getAssetDetectionNames,
+  resolveMissingMediaAssetSources
+} from './missingMediaAssetResolver'
+import type { MissingMediaAssetResolver } from './missingMediaAssetResolver'
 
 /** Map of node types to their media widget name and media type. */
 const MEDIA_NODE_WIDGETS: Record<
@@ -31,6 +37,7 @@ const MEDIA_NODE_WIDGETS: Record<
   { widgetName: string; mediaType: MediaType }
 > = {
   LoadImage: { widgetName: 'image', mediaType: 'image' },
+  LoadImageMask: { widgetName: 'image', mediaType: 'image' },
   LoadVideo: { widgetName: 'file', mediaType: 'video' },
   LoadAudio: { widgetName: 'audio', mediaType: 'audio' }
 }
@@ -42,7 +49,8 @@ function isComboWidget(widget: IBaseWidget): widget is IComboWidget {
 /**
  * Scan combo widgets on media nodes for file values that may be missing.
  *
- * OSS: `isMissing` resolved immediately via widget options.
+ * OSS: `isMissing` is resolved immediately via widget options unless an
+ * output annotation needs generated-history verification.
  * Cloud: `isMissing` left `undefined` for async verification.
  */
 export function scanAllMediaCandidates(
@@ -79,6 +87,7 @@ export function scanNodeMediaCandidates(
 
   const mediaInfo = MEDIA_NODE_WIDGETS[node.type]
   if (!mediaInfo) return []
+  if (node.isUploading) return []
 
   const executionId = getExecutionIdByNode(rootGraph, node)
   if (!executionId) return []
@@ -95,8 +104,17 @@ export function scanNodeMediaCandidates(
     if (isCloud) {
       isMissing = undefined
     } else {
-      const options = resolveComboValues(widget)
-      isMissing = !options.includes(value)
+      const type = getAnnotatedMediaPathTypeForDetection(value)
+      if (type === 'output') {
+        isMissing = undefined
+      } else {
+        const options = resolveComboValues(widget)
+        const detectionNames = getMediaPathDetectionNames(value)
+        const existsInOptions = detectionNames.some((name) =>
+          options.includes(name)
+        )
+        isMissing = !existsInOptions
+      }
     }
 
     candidates.push({
@@ -112,99 +130,57 @@ export function scanNodeMediaCandidates(
   return candidates
 }
 
-type AssetHashVerifier = (
-  assetHash: string,
+interface MediaVerificationOptions {
+  isCloud: boolean
   signal?: AbortSignal
-) => Promise<AssetHashStatus>
-
-type InputAssetFetcher = (signal?: AbortSignal) => Promise<AssetItem[]>
-
-function groupCandidatesForHashLookup(candidates: MissingMediaCandidate[]): {
-  candidatesByHash: Map<string, MissingMediaCandidate[]>
-  legacyCandidates: MissingMediaCandidate[]
-} {
-  const candidatesByHash = new Map<string, MissingMediaCandidate[]>()
-  const legacyCandidates: MissingMediaCandidate[] = []
-
-  for (const candidate of candidates) {
-    if (!isBlake3AssetHash(candidate.name)) {
-      legacyCandidates.push(candidate)
-      continue
-    }
-
-    const hashCandidates = candidatesByHash.get(candidate.name)
-    if (hashCandidates) hashCandidates.push(candidate)
-    else candidatesByHash.set(candidate.name, [candidate])
-  }
-
-  return { candidatesByHash, legacyCandidates }
-}
-
-async function verifyCandidatesByHash(
-  candidatesByHash: Map<string, MissingMediaCandidate[]>,
-  legacyCandidates: MissingMediaCandidate[],
-  signal: AbortSignal | undefined,
-  checkAssetHash: AssetHashVerifier
-): Promise<void> {
-  await Promise.all(
-    Array.from(candidatesByHash, async ([assetHash, hashCandidates]) => {
-      if (signal?.aborted) return
-
-      let status: AssetHashStatus
-      try {
-        status = await checkAssetHash(assetHash, signal)
-        if (signal?.aborted) return
-      } catch (err) {
-        if (signal?.aborted || isAbortError(err)) return
-        console.warn(
-          '[Missing Media Pipeline] Failed to verify asset hash:',
-          err
-        )
-        legacyCandidates.push(...hashCandidates)
-        return
-      }
-
-      if (status === 'invalid') {
-        legacyCandidates.push(...hashCandidates)
-        return
-      }
-
-      for (const candidate of hashCandidates) {
-        candidate.isMissing = status === 'missing'
-      }
-    })
-  )
+  resolveAssetSources?: MissingMediaAssetResolver
 }
 
 /**
- * Verify cloud media candidates by probing the asset hash endpoint first.
- * Invalid hash values fall back to the legacy input asset list check.
+ * Verify media candidates against assets available to the current runtime.
+ *
+ * A candidate's `name` may be either a filename or an opaque asset hash.
+ * Cloud-side `asset_hash` is not guaranteed to follow a single shape, so we
+ * match against the union of `asset.name` and `asset.asset_hash`. Output
+ * candidates are matched against Cloud output assets or Core generated-history
+ * assets because Core resolves those annotations against output folders, not
+ * input files.
+ * Cloud accepts compact annotated media paths, so only Cloud verification
+ * normalizes compact suffixes.
  */
-export async function verifyCloudMediaCandidates(
+export async function verifyMediaCandidates(
   candidates: MissingMediaCandidate[],
-  signal?: AbortSignal,
-  checkAssetHash: AssetHashVerifier = assetService.checkAssetHash,
-  fetchInputAssets: InputAssetFetcher = fetchMissingInputAssets
+  {
+    isCloud,
+    signal,
+    resolveAssetSources = resolveMissingMediaAssetSources
+  }: MediaVerificationOptions
 ): Promise<void> {
   if (signal?.aborted) return
 
   const pending = candidates.filter((c) => c.isMissing === undefined)
   if (pending.length === 0) return
 
-  const { candidatesByHash, legacyCandidates } =
-    groupCandidatesForHashLookup(pending)
-  await verifyCandidatesByHash(
-    candidatesByHash,
-    legacyCandidates,
-    signal,
-    checkAssetHash
+  // Core stores spaced annotations such as `file.png [output]`; Cloud also
+  // accepts compact forms such as `file.png[output]`.
+  const pathOptions = { allowCompactSuffix: isCloud }
+  const generatedMatchNames = getGeneratedCandidateMatchNames(
+    pending,
+    pathOptions
   )
 
-  if (signal?.aborted || legacyCandidates.length === 0) return
-
   let inputAssets: AssetItem[]
+  let generatedAssets: AssetItem[]
   try {
-    inputAssets = await fetchInputAssets(signal)
+    const assetSources = await resolveAssetSources({
+      signal,
+      isCloud,
+      includeGeneratedAssets: generatedMatchNames.size > 0,
+      generatedMatchNames,
+      allowCompactSuffix: isCloud
+    })
+    inputAssets = assetSources.inputAssets
+    generatedAssets = assetSources.generatedAssets
   } catch (err) {
     if (signal?.aborted || isAbortError(err)) return
     throw err
@@ -212,28 +188,62 @@ export async function verifyCloudMediaCandidates(
 
   if (signal?.aborted) return
 
-  const assetHashes = new Set(
-    inputAssets.map((a) => a.asset_hash).filter((h): h is string => !!h)
-  )
+  const inputAssetIdentifiers = new Set<string>()
+  const outputAssetIdentifiers = new Set<string>()
+  addAssetIdentifiers(inputAssetIdentifiers, inputAssets, pathOptions)
+  addAssetIdentifiers(outputAssetIdentifiers, generatedAssets, pathOptions)
 
-  for (const candidate of legacyCandidates) {
-    candidate.isMissing = !assetHashes.has(candidate.name)
+  for (const candidate of pending) {
+    const detectionNames = getMediaPathDetectionNames(
+      candidate.name,
+      pathOptions
+    )
+    const type = getAnnotatedMediaPathTypeForDetection(
+      candidate.name,
+      pathOptions
+    )
+    const identifiers =
+      type === 'output' ? outputAssetIdentifiers : inputAssetIdentifiers
+    candidate.isMissing = !detectionNames.some((name) => identifiers.has(name))
   }
 }
 
-async function fetchMissingInputAssets(
-  signal?: AbortSignal
-): Promise<AssetItem[]> {
-  return await assetService.getInputAssetsIncludingPublic(signal)
+function getGeneratedCandidateMatchNames(
+  candidates: MissingMediaCandidate[],
+  pathOptions: { allowCompactSuffix: boolean }
+): Set<string> {
+  const names = new Set<string>()
+  for (const candidate of candidates) {
+    if (!isGeneratedCandidate(candidate, pathOptions)) continue
+
+    names.add(
+      normalizeAnnotatedMediaPathForDetection(candidate.name, pathOptions)
+    )
+  }
+  return names
 }
 
-function isAbortError(err: unknown): boolean {
-  return (
-    typeof err === 'object' &&
-    err !== null &&
-    'name' in err &&
-    err.name === 'AbortError'
+function isGeneratedCandidate(
+  candidate: MissingMediaCandidate,
+  pathOptions: { allowCompactSuffix: boolean }
+): boolean {
+  const type = getAnnotatedMediaPathTypeForDetection(
+    candidate.name,
+    pathOptions
   )
+  return type === 'output'
+}
+
+function addAssetIdentifiers(
+  identifiers: Set<string>,
+  assets: AssetItem[],
+  pathOptions: { allowCompactSuffix: boolean }
+) {
+  for (const asset of assets) {
+    for (const name of getAssetDetectionNames(asset, pathOptions)) {
+      identifiers.add(name)
+    }
+  }
 }
 
 /** Group confirmed-missing candidates by file name into view models. */
diff --git a/src/platform/missingMedia/types.ts b/src/platform/missingMedia/types.ts
index a07433dc34..8f1f08a69b 100644
--- a/src/platform/missingMedia/types.ts
+++ b/src/platform/missingMedia/types.ts
@@ -16,7 +16,9 @@ export interface MissingMediaCandidate {
   /**
    * - `true`  — confirmed missing
    * - `false` — confirmed present
-   * - `undefined` — pending async verification (cloud only)
+   * - `undefined` — pending async verification. Cloud candidates start pending;
+   *   OSS output annotated paths may also be deferred to generated-history
+   *   verification.
    */
   isMissing: boolean | undefined
 }
diff --git a/src/platform/missingModel/missingModelScan.test.ts b/src/platform/missingModel/missingModelScan.test.ts
index 05326f8bb0..e365718d28 100644
--- a/src/platform/missingModel/missingModelScan.test.ts
+++ b/src/platform/missingModel/missingModelScan.test.ts
@@ -19,11 +19,6 @@ import activeSubgraphUnmatchedModel from '@/platform/missingModel/__fixtures__/a
 import bypassedSubgraphUnmatchedModel from '@/platform/missingModel/__fixtures__/bypassedSubgraphUnmatchedModel.json' with { type: 'json' }
 import type { MissingModelCandidate } from '@/platform/missingModel/types'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type * as AssetServiceModule from '@/platform/assets/services/assetService'
-
-const { mockCheckAssetHash } = vi.hoisted(() => ({
-  mockCheckAssetHash: vi.fn()
-}))
 
 vi.mock('@/utils/graphTraversalUtil', () => ({
   collectAllNodes: (graph: { _testNodes: LGraphNode[] }) => graph._testNodes,
@@ -33,20 +28,6 @@ vi.mock('@/utils/graphTraversalUtil', () => ({
   ) => node._testExecutionId ?? String(node.id)
 }))
 
-vi.mock('@/platform/assets/services/assetService', async () => {
-  const actual = await vi.importActual<typeof AssetServiceModule>(
-    '@/platform/assets/services/assetService'
-  )
-
-  return {
-    ...actual,
-    assetService: {
-      ...actual.assetService,
-      checkAssetHash: mockCheckAssetHash
-    }
-  }
-})
-
 /** Helper: create a combo widget mock */
 function makeComboWidget(
   name: string,
@@ -1391,23 +1372,14 @@ describe('OSS missing model detection (non-Cloud path)', () => {
   })
 })
 
-const {
-  mockUpdateModelsForNodeType,
-  mockIsModelLoading,
-  mockHasMore,
-  mockGetAssets
-} = vi.hoisted(() => ({
+const { mockUpdateModelsForNodeType, mockGetAssets } = vi.hoisted(() => ({
   mockUpdateModelsForNodeType: vi.fn().mockResolvedValue(undefined),
-  mockIsModelLoading: vi.fn().mockReturnValue(false),
-  mockHasMore: vi.fn().mockReturnValue(false),
   mockGetAssets: vi.fn().mockReturnValue([])
 }))
 
 vi.mock('@/stores/assetsStore', () => ({
   useAssetsStore: () => ({
     updateModelsForNodeType: mockUpdateModelsForNodeType,
-    isModelLoading: mockIsModelLoading,
-    hasMore: mockHasMore,
     getAssets: mockGetAssets
   })
 }))
@@ -1440,9 +1412,7 @@ function makeAssetCandidate(
 describe('verifyAssetSupportedCandidates', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockCheckAssetHash.mockResolvedValue('missing')
-    mockIsModelLoading.mockReturnValue(false)
-    mockHasMore.mockReturnValue(false)
+    mockUpdateModelsForNodeType.mockResolvedValue(undefined)
     mockGetAssets.mockReturnValue([])
   })
 
@@ -1458,84 +1428,15 @@ describe('verifyAssetSupportedCandidates', () => {
     )
   })
 
-  it('should resolve isMissing=false when the blake3 hash endpoint finds the asset', async () => {
-    const hash =
-      '1111111111111111111111111111111111111111111111111111111111111111'
-    const candidates = [
-      makeAssetCandidate('model.safetensors', {
-        hash,
-        hashType: 'blake3'
-      })
-    ]
-    mockCheckAssetHash.mockResolvedValue('exists')
-
-    await verifyAssetSupportedCandidates(candidates)
-
-    expect(candidates[0].isMissing).toBe(false)
-    expect(mockCheckAssetHash).toHaveBeenCalledWith(`blake3:${hash}`, undefined)
-    expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled()
-  })
-
-  it('should fall back to asset store matching when the blake3 hash is not found', async () => {
+  it('should match filenames regardless of hash metadata shape', async () => {
     const hash =
       '2222222222222222222222222222222222222222222222222222222222222222'
     const candidates = [
       makeAssetCandidate('my_model.safetensors', {
         hash,
         hashType: 'blake3'
-      })
-    ]
-    mockCheckAssetHash.mockResolvedValue('missing')
-    mockGetAssets.mockReturnValue([
-      {
-        id: '1',
-        name: 'my_model.safetensors',
-        asset_hash: null,
-        metadata: { filename: 'my_model.safetensors' }
-      }
-    ])
-
-    await verifyAssetSupportedCandidates(candidates)
-
-    expect(candidates[0].isMissing).toBe(false)
-    expect(mockUpdateModelsForNodeType).toHaveBeenCalledWith(
-      'CheckpointLoaderSimple'
-    )
-  })
-
-  it('should fall back to asset store matching when hash verification fails', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const hash =
-      '3333333333333333333333333333333333333333333333333333333333333333'
-    const candidates = [
-      makeAssetCandidate('my_model.safetensors', {
-        hash,
-        hashType: 'blake3'
-      })
-    ]
-    mockCheckAssetHash.mockRejectedValue(new Error('network failed'))
-    mockGetAssets.mockReturnValue([
-      {
-        id: '1',
-        name: 'my_model.safetensors',
-        asset_hash: null,
-        metadata: { filename: 'my_model.safetensors' }
-      }
-    ])
-
-    await verifyAssetSupportedCandidates(candidates)
-
-    expect(candidates[0].isMissing).toBe(false)
-    expect(mockUpdateModelsForNodeType).toHaveBeenCalledWith(
-      'CheckpointLoaderSimple'
-    )
-    expect(warn).toHaveBeenCalledOnce()
-    warn.mockRestore()
-  })
-
-  it('should skip malformed blake3 hashes and use asset store matching', async () => {
-    const candidates = [
-      makeAssetCandidate('my_model.safetensors', {
+      }),
+      makeAssetCandidate('other_model.safetensors', {
         hash: 'abc123',
         hashType: 'blake3'
       })
@@ -1546,38 +1447,25 @@ describe('verifyAssetSupportedCandidates', () => {
         name: 'my_model.safetensors',
         asset_hash: null,
         metadata: { filename: 'my_model.safetensors' }
+      },
+      {
+        id: '2',
+        name: 'other_model.safetensors',
+        asset_hash: null,
+        metadata: { filename: 'other_model.safetensors' }
       }
     ])
 
     await verifyAssetSupportedCandidates(candidates)
 
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
     expect(candidates[0].isMissing).toBe(false)
+    expect(candidates[1].isMissing).toBe(false)
+    expect(mockUpdateModelsForNodeType).toHaveBeenCalledWith(
+      'CheckpointLoaderSimple'
+    )
   })
 
-  it('should not warn or fall back when hash verification is aborted', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const abortError = new Error('aborted')
-    abortError.name = 'AbortError'
-    const hash =
-      '4444444444444444444444444444444444444444444444444444444444444444'
-    const candidates = [
-      makeAssetCandidate('my_model.safetensors', {
-        hash,
-        hashType: 'blake3'
-      })
-    ]
-    mockCheckAssetHash.mockRejectedValue(abortError)
-
-    await verifyAssetSupportedCandidates(candidates)
-
-    expect(candidates[0].isMissing).toBeUndefined()
-    expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled()
-    expect(warn).not.toHaveBeenCalled()
-    warn.mockRestore()
-  })
-
-  it('should resolve isMissing=false when asset with matching hash exists', async () => {
+  it('should resolve isMissing=false when asset with matching asset_hash exists', async () => {
     const candidates = [
       makeAssetCandidate('model.safetensors', {
         hash: 'abc123',
@@ -1591,7 +1479,6 @@ describe('verifyAssetSupportedCandidates', () => {
     await verifyAssetSupportedCandidates(candidates)
 
     expect(candidates[0].isMissing).toBe(false)
-    expect(mockCheckAssetHash).not.toHaveBeenCalled()
   })
 
   it('should resolve isMissing=false when asset with matching filename exists', async () => {
@@ -1675,6 +1562,55 @@ describe('verifyAssetSupportedCandidates', () => {
     expect(mockUpdateModelsForNodeType).toHaveBeenCalledWith('LoraLoader')
   })
 
+  it('should leave candidates unresolved when their node type fails to load', async () => {
+    const candidates = [
+      makeAssetCandidate('checkpoint.safetensors', {
+        nodeType: 'CheckpointLoaderSimple'
+      }),
+      makeAssetCandidate('lora.safetensors', { nodeType: 'LoraLoader' })
+    ]
+    mockUpdateModelsForNodeType.mockImplementation(async (nodeType: string) => {
+      if (nodeType === 'LoraLoader') throw new Error('load failed')
+    })
+    mockGetAssets.mockImplementation((nodeType: string) =>
+      nodeType === 'CheckpointLoaderSimple'
+        ? [
+            {
+              id: '1',
+              name: 'checkpoint.safetensors',
+              asset_hash: null,
+              metadata: { filename: 'checkpoint.safetensors' }
+            }
+          ]
+        : []
+    )
+
+    await verifyAssetSupportedCandidates(candidates)
+
+    expect(candidates[0].isMissing).toBe(false)
+    expect(candidates[1].isMissing).toBeUndefined()
+  })
+
+  it('should leave candidates unresolved when aborted after asset loads settle', async () => {
+    const controller = new AbortController()
+    const candidates = [makeAssetCandidate('model.safetensors')]
+    mockUpdateModelsForNodeType.mockImplementation(async () => {
+      controller.abort()
+    })
+    mockGetAssets.mockReturnValue([
+      {
+        id: '1',
+        name: 'model.safetensors',
+        asset_hash: null,
+        metadata: { filename: 'model.safetensors' }
+      }
+    ])
+
+    await verifyAssetSupportedCandidates(candidates, controller.signal)
+
+    expect(candidates[0].isMissing).toBeUndefined()
+  })
+
   it('should match filename with path prefix normalization', async () => {
     const candidates = [makeAssetCandidate('subfolder/my_model.safetensors')]
     mockGetAssets.mockReturnValue([
diff --git a/src/platform/missingModel/missingModelScan.ts b/src/platform/missingModel/missingModelScan.ts
index bef803112a..85f2b6b56c 100644
--- a/src/platform/missingModel/missingModelScan.ts
+++ b/src/platform/missingModel/missingModelScan.ts
@@ -24,11 +24,6 @@ import {
 } from '@/utils/graphTraversalUtil'
 import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
 import { resolveComboValues } from '@/utils/litegraphUtil'
-import type { AssetHashStatus } from '@/platform/assets/services/assetService'
-import {
-  assetService,
-  toBlake3AssetHash
-} from '@/platform/assets/services/assetService'
 
 export type MissingModelWorkflowData = FlattenableWorkflowGraph & {
   models?: ModelFile[]
@@ -450,16 +445,10 @@ interface AssetVerifier {
   getAssets: (nodeType: string) => AssetItem[] | undefined
 }
 
-type AssetHashVerifier = (
-  assetHash: string,
-  signal?: AbortSignal
-) => Promise<AssetHashStatus>
-
 export async function verifyAssetSupportedCandidates(
   candidates: MissingModelCandidate[],
   signal?: AbortSignal,
-  assetsStore?: AssetVerifier,
-  checkAssetHash: AssetHashVerifier = assetService.checkAssetHash
+  assetsStore?: AssetVerifier
 ): Promise<void> {
   if (signal?.aborted) return
 
@@ -468,52 +457,10 @@ export async function verifyAssetSupportedCandidates(
   )
   if (pendingCandidates.length === 0) return
 
-  const pendingNodeTypes = new Set<string>()
-  const candidatesByHash = new Map<string, MissingModelCandidate[]>()
-
-  for (const candidate of pendingCandidates) {
-    const assetHash = getBlake3AssetHash(candidate)
-    if (!assetHash) {
-      pendingNodeTypes.add(candidate.nodeType)
-      continue
-    }
-
-    const hashCandidates = candidatesByHash.get(assetHash)
-    if (hashCandidates) hashCandidates.push(candidate)
-    else candidatesByHash.set(assetHash, [candidate])
-  }
-
-  await Promise.all(
-    Array.from(candidatesByHash, async ([assetHash, hashCandidates]) => {
-      if (signal?.aborted) return
-
-      try {
-        const status = await checkAssetHash(assetHash, signal)
-        if (signal?.aborted) return
-
-        if (status === 'exists') {
-          for (const candidate of hashCandidates) {
-            candidate.isMissing = false
-          }
-          return
-        }
-      } catch (err) {
-        if (signal?.aborted || isAbortError(err)) return
-        console.warn(
-          '[Missing Model Pipeline] Failed to verify asset hash:',
-          err
-        )
-      }
-
-      for (const candidate of hashCandidates) {
-        pendingNodeTypes.add(candidate.nodeType)
-      }
-    })
+  const pendingNodeTypes = new Set(
+    pendingCandidates.map((candidate) => candidate.nodeType)
   )
 
-  if (signal?.aborted) return
-  if (pendingNodeTypes.size === 0) return
-
   const store =
     assetsStore ?? (await import('@/stores/assetsStore')).useAssetsStore()
 
@@ -544,20 +491,6 @@ export async function verifyAssetSupportedCandidates(
   }
 }
 
-function getBlake3AssetHash(candidate: MissingModelCandidate): string | null {
-  if (candidate.hashType?.toLowerCase() !== 'blake3') return null
-  return toBlake3AssetHash(candidate.hash)
-}
-
-function isAbortError(err: unknown): boolean {
-  return (
-    typeof err === 'object' &&
-    err !== null &&
-    'name' in err &&
-    err.name === 'AbortError'
-  )
-}
-
 function normalizePath(path: string): string {
   return path.replace(/\\/g, '/')
 }
diff --git a/src/platform/remote/comfyui/jobs/fetchJobs.test.ts b/src/platform/remote/comfyui/jobs/fetchJobs.test.ts
index 41b01606e2..53ad431f84 100644
--- a/src/platform/remote/comfyui/jobs/fetchJobs.test.ts
+++ b/src/platform/remote/comfyui/jobs/fetchJobs.test.ts
@@ -3,6 +3,7 @@ import { describe, expect, it, vi } from 'vitest'
 import {
   extractWorkflow,
   fetchHistory,
+  fetchHistoryPage,
   fetchJobDetail,
   fetchQueue
 } from '@/platform/remote/comfyui/jobs/fetchJobs'
@@ -29,15 +30,16 @@ function createMockJob(
 
 function createMockResponse(
   jobs: RawJobListItem[],
-  total: number = jobs.length
+  total: number = jobs.length,
+  pagination: Partial<JobsListResponse['pagination']> = {}
 ): JobsListResponse {
   return {
     jobs,
     pagination: {
-      offset: 0,
-      limit: 200,
+      offset: pagination.offset ?? 0,
+      limit: pagination.limit ?? 200,
       total,
-      has_more: false
+      has_more: pagination.has_more ?? false
     }
   }
 }
@@ -100,7 +102,8 @@ describe('fetchJobs', () => {
                 createMockJob('job4', 'completed'),
                 createMockJob('job5', 'completed')
               ],
-              10 // total of 10 jobs
+              10, // total of 10 jobs
+              { offset: 5 }
             )
           )
       })
@@ -185,6 +188,36 @@ describe('fetchJobs', () => {
       expect(result[1].id).toBe('text-job')
       expect(result[2].id).toBe('no-preview-job')
     })
+
+    it('returns server pagination metadata for history pages', async () => {
+      const mockFetch = vi.fn().mockResolvedValue({
+        ok: true,
+        json: () =>
+          Promise.resolve(
+            createMockResponse(
+              [
+                createMockJob('job4', 'completed'),
+                createMockJob('job5', 'completed')
+              ],
+              10,
+              { offset: 5, limit: 2, has_more: true }
+            )
+          )
+      })
+
+      const result = await fetchHistoryPage(mockFetch, 2, 5)
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        '/jobs?status=completed,failed,cancelled&limit=2&offset=5'
+      )
+      expect(result.jobs).toHaveLength(2)
+      expect(result.offset).toBe(5)
+      expect(result.limit).toBe(2)
+      expect(result.total).toBe(10)
+      expect(result.hasMore).toBe(true)
+      expect(result.jobs[0].priority).toBe(5)
+      expect(result.jobs[1].priority).toBe(4)
+    })
   })
 
   describe('fetchQueue', () => {
diff --git a/src/platform/remote/comfyui/jobs/fetchJobs.ts b/src/platform/remote/comfyui/jobs/fetchJobs.ts
index 6eee0e959c..25790a5ecd 100644
--- a/src/platform/remote/comfyui/jobs/fetchJobs.ts
+++ b/src/platform/remote/comfyui/jobs/fetchJobs.ts
@@ -22,6 +22,16 @@ interface FetchJobsRawResult {
   jobs: RawJobListItem[]
   total: number
   offset: number
+  limit: number
+  hasMore: boolean
+}
+
+export interface FetchHistoryPageResult {
+  jobs: JobListItem[]
+  total: number
+  offset: number
+  limit: number
+  hasMore: boolean
 }
 
 /**
@@ -40,13 +50,25 @@ async function fetchJobsRaw(
     const res = await fetchApi(url)
     if (!res.ok) {
       console.error(`[Jobs API] Failed to fetch jobs: ${res.status}`)
-      return { jobs: [], total: 0, offset: 0 }
+      return {
+        jobs: [],
+        total: 0,
+        offset,
+        limit: maxItems,
+        hasMore: false
+      }
     }
     const data = zJobsListResponse.parse(await res.json())
-    return { jobs: data.jobs, total: data.pagination.total, offset }
+    return {
+      jobs: data.jobs,
+      total: data.pagination.total,
+      offset: data.pagination.offset,
+      limit: data.pagination.limit,
+      hasMore: data.pagination.has_more
+    }
   } catch (error) {
     console.error('[Jobs API] Error fetching jobs:', error)
-    return { jobs: [], total: 0, offset: 0 }
+    return { jobs: [], total: 0, offset, limit: maxItems, hasMore: false }
   }
 }
 
@@ -76,14 +98,33 @@ export async function fetchHistory(
   maxItems: number = 200,
   offset: number = 0
 ): Promise<JobListItem[]> {
-  const { jobs, total } = await fetchJobsRaw(
+  const { jobs } = await fetchHistoryPage(fetchApi, maxItems, offset)
+  return jobs
+}
+
+/**
+ * Fetches one page of history with server-provided pagination metadata.
+ */
+export async function fetchHistoryPage(
+  fetchApi: (url: string) => Promise<Response>,
+  maxItems: number = 200,
+  offset: number = 0
+): Promise<FetchHistoryPageResult> {
+  const result = await fetchJobsRaw(
     fetchApi,
     ['completed', 'failed', 'cancelled'],
     maxItems,
     offset
   )
+
   // History gets priority based on total count (lower than queue)
-  return assignPriority(jobs, total - offset)
+  return {
+    jobs: assignPriority(result.jobs, result.total - result.offset),
+    total: result.total,
+    offset: result.offset,
+    limit: result.limit,
+    hasMore: result.hasMore
+  }
 }
 
 /**
diff --git a/src/platform/settings/components/SettingGroup.vue b/src/platform/settings/components/SettingGroup.vue
index 2ca49f5afd..de78f6938b 100644
--- a/src/platform/settings/components/SettingGroup.vue
+++ b/src/platform/settings/components/SettingGroup.vue
@@ -19,7 +19,7 @@
       v-for="setting in group.settings.filter((s) => !s.deprecated)"
       :key="setting.id"
       :data-setting-id="setting.id"
-      class="setting-item mb-2"
+      class="setting-item mb-3"
     >
       <SettingItem :setting="setting" />
     </div>
diff --git a/src/platform/settings/constants/coreSettings.ts b/src/platform/settings/constants/coreSettings.ts
index f805a4e067..1e5739b1ec 100644
--- a/src/platform/settings/constants/coreSettings.ts
+++ b/src/platform/settings/constants/coreSettings.ts
@@ -1,4 +1,8 @@
 import { LinkMarkerShape, LiteGraph } from '@/lib/litegraph/src/litegraph'
+import {
+  getDefaultLocale,
+  SUPPORTED_LOCALE_OPTIONS
+} from '@/locales/localeConfig'
 import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import type { SettingParams } from '@/platform/settings/types'
@@ -439,21 +443,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.Locale',
     name: 'Language',
     type: 'combo',
-    options: [
-      { value: 'en', text: 'English' },
-      { value: 'zh', text: '中文' },
-      { value: 'zh-TW', text: '繁體中文' },
-      { value: 'ru', text: 'Русский' },
-      { value: 'ja', text: '日本語' },
-      { value: 'ko', text: '한국어' },
-      { value: 'fr', text: 'Français' },
-      { value: 'es', text: 'Español' },
-      { value: 'ar', text: 'عربي' },
-      { value: 'tr', text: 'Türkçe' },
-      { value: 'pt-BR', text: 'Português (BR)' },
-      { value: 'fa', text: 'فارسی' }
-    ],
-    defaultValue: () => navigator.language.split('-')[0] || 'en'
+    options: SUPPORTED_LOCALE_OPTIONS,
+    defaultValue: getDefaultLocale
   },
   {
     id: 'Comfy.NodeBadge.NodeSourceBadgeMode',
@@ -659,7 +650,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     tooltip:
       'The maximum number of tasks added to the queue at one button click',
     type: 'number',
-    defaultValue: isCloud ? 32 : 100,
+    defaultValue: 100,
     versionAdded: '1.3.5'
   },
   {
diff --git a/src/platform/support/config.test.ts b/src/platform/support/config.test.ts
new file mode 100644
index 0000000000..7720b79e77
--- /dev/null
+++ b/src/platform/support/config.test.ts
@@ -0,0 +1,52 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const distribution = vi.hoisted(() => ({ isCloud: false, isNightly: false }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return distribution.isCloud
+  },
+  get isNightly() {
+    return distribution.isNightly
+  }
+}))
+
+describe('buildFeedbackTypeformUrl', () => {
+  beforeEach(() => {
+    distribution.isCloud = false
+    distribution.isNightly = false
+  })
+
+  async function build(source: 'topbar' | 'action-bar' | 'help-center') {
+    vi.resetModules()
+    const { buildFeedbackTypeformUrl } = await import('./config')
+    return buildFeedbackTypeformUrl(source)
+  }
+
+  it('tags Cloud builds with distribution=ccloud', async () => {
+    distribution.isCloud = true
+    expect(await build('topbar')).toBe(
+      'https://form.typeform.com/to/q7azbWPi#distribution=ccloud&source=topbar'
+    )
+  })
+
+  it('tags Nightly builds with distribution=oss-nightly', async () => {
+    distribution.isNightly = true
+    expect(await build('action-bar')).toBe(
+      'https://form.typeform.com/to/q7azbWPi#distribution=oss-nightly&source=action-bar'
+    )
+  })
+
+  it('tags OSS builds with distribution=oss', async () => {
+    expect(await build('help-center')).toBe(
+      'https://form.typeform.com/to/q7azbWPi#distribution=oss&source=help-center'
+    )
+  })
+
+  it('uses a URL fragment so distribution and source are not sent to the server', async () => {
+    distribution.isCloud = true
+    const url = new URL(await build('topbar'))
+    expect(url.search).toBe('')
+    expect(url.hash).toBe('#distribution=ccloud&source=topbar')
+  })
+})
diff --git a/src/platform/support/config.ts b/src/platform/support/config.ts
index 349bfb1ec9..38747ab4d8 100644
--- a/src/platform/support/config.ts
+++ b/src/platform/support/config.ts
@@ -15,7 +15,7 @@ const ZENDESK_FIELDS = {
 } as const
 
 /**
- * Gets the distribution identifier for Zendesk tracking.
+ * Gets the distribution identifier for tracking.
  * Helps distinguish feedback from different build types.
  */
 function getDistribution(): 'ccloud' | 'oss-nightly' | 'oss' {
@@ -25,17 +25,22 @@ function getDistribution(): 'ccloud' | 'oss-nightly' | 'oss' {
 }
 
 const SUPPORT_BASE_URL = 'https://support.comfy.org/hc/en-us/requests/new'
-const ZENDESK_FEEDBACK_FORM_ID = '43066738713236'
+const FEEDBACK_TYPEFORM_BASE_URL = 'https://form.typeform.com/to/q7azbWPi'
 
 /**
- * Builds the feedback form URL with the appropriate distribution tag.
+ * Builds the feedback Typeform URL tagged with the current build distribution
+ * and the UI source that opened it. Tags are passed via the URL fragment
+ * (Typeform's hidden-field convention) so survey responses can be segmented
+ * by distribution (cloud / oss-nightly / oss) and entry point.
  */
-export function buildFeedbackUrl(): string {
+export function buildFeedbackTypeformUrl(
+  source: 'topbar' | 'action-bar' | 'help-center'
+): string {
   const params = new URLSearchParams({
-    ticket_form_id: ZENDESK_FEEDBACK_FORM_ID,
-    [ZENDESK_FIELDS.DISTRIBUTION]: getDistribution()
+    distribution: getDistribution(),
+    source
   })
-  return `${SUPPORT_BASE_URL}?${params.toString()}`
+  return `${FEEDBACK_TYPEFORM_BASE_URL}#${params.toString()}`
 }
 
 /**
diff --git a/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts
index 3893b643b8..16a1b0f747 100644
--- a/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts
+++ b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts
@@ -1,239 +1,466 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+const mockMixpanel = vi.hoisted(() => ({
+  init: vi.fn(),
+  track: vi.fn(),
+  identify: vi.fn(),
+  reset: vi.fn(),
+  people: { set: vi.fn() }
+}))
 
-vi.mock('vue', async () => {
-  const actual = await vi.importActual('vue')
-  return {
-    ...actual,
-    watch: vi.fn()
-  }
-})
+vi.mock('mixpanel-browser', () => ({
+  default: mockMixpanel
+}))
 
+const mockOnUserResolved = vi.hoisted(() => vi.fn())
 vi.mock('@/composables/auth/useCurrentUser', () => ({
-  useCurrentUser: () => ({
-    onUserResolved: vi.fn()
+  useCurrentUser: () => ({ onUserResolved: mockOnUserResolved })
+}))
+
+vi.mock('@/composables/useAppMode', () => ({
+  useAppMode: () => ({
+    mode: { value: 'workflow' },
+    isAppMode: { value: false }
   })
 }))
 
-vi.mock('@/platform/telemetry/topupTracker', () => ({
-  checkForCompletedTopup: vi.fn(),
+const topupMocks = vi.hoisted(() => ({
+  startTopupTracking: vi.fn(),
   clearTopupTracking: vi.fn(),
-  startTopupTracking: vi.fn()
+  checkForCompletedTopup: vi.fn().mockReturnValue(true)
 }))
+vi.mock('@/platform/telemetry/topupTracker', () => topupMocks)
 
-const hoisted = vi.hoisted(() => ({
-  mockNodeDefsByName: {} as Record<string, unknown>,
-  mockNodes: [] as Pick<LGraphNode, 'type' | 'isSubgraphNode'>[],
-  mockActiveWorkflow: null as null | {
-    filename: string
-    fullFilename: string
-  },
-  mockKnownTemplateNames: new Set<string>(),
-  mockTemplateByName: null as null | { sourceModule?: string }
-}))
-
-vi.mock('@/stores/nodeDefStore', () => ({
-  useNodeDefStore: () => ({
-    nodeDefsByName: hoisted.mockNodeDefsByName
+vi.mock('@/platform/telemetry/utils/getExecutionContext', () => ({
+  getExecutionContext: () => ({
+    is_template: false,
+    workflow_name: 'untitled',
+    custom_node_count: 0,
+    total_node_count: 0,
+    subgraph_count: 0,
+    has_api_nodes: false,
+    api_node_names: [],
+    has_toolkit_nodes: false,
+    toolkit_node_names: []
   })
 }))
 
-vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
-  useWorkflowStore: () => ({
-    get activeWorkflow() {
-      return hoisted.mockActiveWorkflow
-    }
-  })
-}))
-
-vi.mock(
-  '@/platform/workflow/templates/repositories/workflowTemplatesStore',
-  () => ({
-    useWorkflowTemplatesStore: () => ({
-      get knownTemplateNames() {
-        return hoisted.mockKnownTemplateNames
-      },
-      getTemplateByName: (_name: string) => hoisted.mockTemplateByName,
-      getEnglishMetadata: () => null
-    })
-  })
-)
-
-function mockNode(
-  type: string,
-  isSubgraph = false
-): Pick<LGraphNode, 'type' | 'isSubgraphNode'> {
-  return {
-    type,
-    isSubgraphNode: (() => isSubgraph) as LGraphNode['isSubgraphNode']
-  }
-}
-
-vi.mock('@/utils/graphTraversalUtil', () => ({
-  reduceAllNodes: vi.fn((_graph, reducer, initial) => {
-    let result = initial
-    for (const node of hoisted.mockNodes) {
-      result = reducer(result, node)
-    }
-    return result
-  })
-}))
-
-vi.mock('@/scripts/app', () => ({
-  app: { rootGraph: {} }
+const mockNormalizeSurveyResponses = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/telemetry/utils/surveyNormalization', () => ({
+  normalizeSurveyResponses: mockNormalizeSurveyResponses
 }))
 
 vi.mock('@/platform/remoteConfig/remoteConfig', () => ({
   remoteConfig: { value: null }
 }))
 
-import { getExecutionContext } from '../../utils/getExecutionContext'
+import { MixpanelTelemetryProvider } from '@/platform/telemetry/providers/cloud/MixpanelTelemetryProvider'
+import type {
+  AuthMetadata,
+  DefaultViewSetMetadata,
+  EnterLinearMetadata,
+  ExecutionErrorMetadata,
+  ExecutionSuccessMetadata,
+  ShareFlowMetadata,
+  SurveyResponses,
+  TemplateLibraryClosedMetadata,
+  TemplateLibraryMetadata,
+  TemplateMetadata,
+  WorkflowImportMetadata,
+  WorkflowSavedMetadata
+} from '@/platform/telemetry/types'
+import { TelemetryEvents } from '@/platform/telemetry/types'
 
-describe('getExecutionContext', () => {
+const waitForMixpanelInit = () =>
+  vi.waitFor(() => expect(mockMixpanel.init).toHaveBeenCalled())
+
+type ConfigWindow = { __CONFIG__?: { mixpanel_token?: string } }
+
+describe('MixpanelTelemetryProvider — without configured token', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    hoisted.mockNodes.length = 0
-    for (const key of Object.keys(hoisted.mockNodeDefsByName)) {
-      delete hoisted.mockNodeDefsByName[key]
-    }
-    hoisted.mockActiveWorkflow = null
-    hoisted.mockKnownTemplateNames = new Set()
-    hoisted.mockTemplateByName = null
+    delete (window as unknown as ConfigWindow).__CONFIG__
   })
 
-  it('returns has_toolkit_nodes false when no toolkit nodes are present', () => {
-    hoisted.mockNodes.push(mockNode('KSampler'), mockNode('LoadImage'))
-    hoisted.mockNodeDefsByName['KSampler'] = {
-      name: 'KSampler',
-      python_module: 'nodes'
+  it('warns and disables itself when no mixpanel_token is configured', () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+
+    try {
+      const provider = new MixpanelTelemetryProvider()
+      provider.trackUserLoggedIn()
+
+      expect(warn).toHaveBeenCalledWith(
+        expect.stringContaining('Mixpanel token')
+      )
+      expect(mockMixpanel.track).not.toHaveBeenCalled()
+      expect(mockMixpanel.init).not.toHaveBeenCalled()
+    } finally {
+      warn.mockRestore()
     }
-    hoisted.mockNodeDefsByName['LoadImage'] = {
-      name: 'LoadImage',
-      python_module: 'nodes'
-    }
-
-    const context = getExecutionContext()
-
-    expect(context.has_toolkit_nodes).toBe(false)
-    expect(context.toolkit_node_names).toEqual([])
-    expect(context.toolkit_node_count).toBe(0)
-  })
-
-  it('detects individual toolkit nodes by type name', () => {
-    hoisted.mockNodes.push(mockNode('Canny'), mockNode('KSampler'))
-    hoisted.mockNodeDefsByName['Canny'] = {
-      name: 'Canny',
-      python_module: 'comfy_extras.nodes_canny'
-    }
-    hoisted.mockNodeDefsByName['KSampler'] = {
-      name: 'KSampler',
-      python_module: 'nodes'
-    }
-
-    const context = getExecutionContext()
-
-    expect(context.has_toolkit_nodes).toBe(true)
-    expect(context.toolkit_node_names).toEqual(['Canny'])
-    expect(context.toolkit_node_count).toBe(1)
-  })
-
-  it('detects blueprint toolkit nodes via python_module', () => {
-    const blueprintType = 'SubgraphBlueprint.text_to_image'
-    hoisted.mockNodes.push(mockNode(blueprintType, true))
-    hoisted.mockNodeDefsByName[blueprintType] = {
-      name: blueprintType,
-      python_module: 'comfy_essentials'
-    }
-
-    const context = getExecutionContext()
-
-    expect(context.has_toolkit_nodes).toBe(true)
-    expect(context.toolkit_node_names).toEqual([blueprintType])
-    expect(context.toolkit_node_count).toBe(1)
-  })
-
-  it('deduplicates toolkit_node_names when same type appears multiple times', () => {
-    hoisted.mockNodes.push(mockNode('Canny'), mockNode('Canny'))
-    hoisted.mockNodeDefsByName['Canny'] = {
-      name: 'Canny',
-      python_module: 'comfy_extras.nodes_canny'
-    }
-
-    const context = getExecutionContext()
-
-    expect(context.toolkit_node_names).toEqual(['Canny'])
-    expect(context.toolkit_node_count).toBe(2)
-  })
-
-  it('allows a node to appear in both api_node_names and toolkit_node_names', () => {
-    hoisted.mockNodes.push(mockNode('RecraftRemoveBackgroundNode'))
-    hoisted.mockNodeDefsByName['RecraftRemoveBackgroundNode'] = {
-      name: 'RecraftRemoveBackgroundNode',
-      python_module: 'comfy_extras.nodes_api',
-      api_node: true
-    }
-
-    const context = getExecutionContext()
-
-    expect(context.has_api_nodes).toBe(true)
-    expect(context.api_node_names).toEqual(['RecraftRemoveBackgroundNode'])
-    expect(context.has_toolkit_nodes).toBe(true)
-    expect(context.toolkit_node_names).toEqual(['RecraftRemoveBackgroundNode'])
-  })
-
-  it('uses node.type as tracking name when nodeDef is missing', () => {
-    hoisted.mockNodes.push(mockNode('ImageCrop'))
-
-    const context = getExecutionContext()
-
-    expect(context.has_toolkit_nodes).toBe(true)
-    expect(context.toolkit_node_names).toEqual(['ImageCrop'])
-  })
-
-  describe('template detection', () => {
-    it('detects a regular template by name', () => {
-      hoisted.mockKnownTemplateNames = new Set(['flux-dev'])
-      hoisted.mockTemplateByName = { sourceModule: 'default' }
-      hoisted.mockActiveWorkflow = {
-        filename: 'flux-dev',
-        fullFilename: 'flux-dev.json'
-      }
-
-      const context = getExecutionContext()
-
-      expect(context.is_template).toBe(true)
-      expect(context.workflow_name).toBe('flux-dev')
-    })
-
-    it('detects an app mode template whose name ends with .app', () => {
-      hoisted.mockKnownTemplateNames = new Set([
-        'templates-qwen_multiangle.app'
-      ])
-      hoisted.mockTemplateByName = { sourceModule: 'default' }
-      // getFilenameDetails strips ".app.json" as a compound extension, yielding
-      // filename = "templates-qwen_multiangle" — the previous code would fail here.
-      hoisted.mockActiveWorkflow = {
-        filename: 'templates-qwen_multiangle',
-        fullFilename: 'templates-qwen_multiangle.app.json'
-      }
-
-      const context = getExecutionContext()
-
-      expect(context.is_template).toBe(true)
-      expect(context.workflow_name).toBe('templates-qwen_multiangle.app')
-    })
-
-    it('does not flag a non-template workflow as a template', () => {
-      hoisted.mockKnownTemplateNames = new Set(['flux-dev'])
-      hoisted.mockActiveWorkflow = {
-        filename: 'my-custom-workflow',
-        fullFilename: 'my-custom-workflow.json'
-      }
-
-      const context = getExecutionContext()
-
-      expect(context.is_template).toBe(false)
-    })
+  })
+})
+
+describe('MixpanelTelemetryProvider — with configured token', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(window as unknown as ConfigWindow).__CONFIG__ = {
+      mixpanel_token: 'test-token'
+    }
+    mockMixpanel.init.mockImplementation((_token, config) => {
+      config?.loaded?.()
+    })
+    mockNormalizeSurveyResponses.mockImplementation((responses) => responses)
+  })
+
+  it('initializes Mixpanel and tracks events synchronously after the loaded callback fires', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+
+    provider.trackUserLoggedIn()
+
+    expect(mockMixpanel.init).toHaveBeenCalledWith(
+      'test-token',
+      expect.any(Object)
+    )
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.USER_LOGGED_IN,
+      {}
+    )
+  })
+
+  it('queues events fired before loaded() and flushes them once Mixpanel reports ready', async () => {
+    const captured: { trigger: (() => void) | null } = { trigger: null }
+    mockMixpanel.init.mockImplementationOnce((_token, config) => {
+      captured.trigger = config?.loaded ?? null
+    })
+
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+
+    provider.trackSignupOpened()
+    provider.trackUserLoggedIn()
+    expect(mockMixpanel.track).not.toHaveBeenCalled()
+
+    captured.trigger?.()
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.USER_SIGN_UP_OPENED,
+      {}
+    )
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.USER_LOGGED_IN,
+      {}
+    )
+  })
+
+  it('skips events that are in the default disabled set', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    const metadata: WorkflowImportMetadata = {
+      missing_node_count: 0,
+      missing_node_types: []
+    }
+    provider.trackWorkflowOpened(metadata)
+
+    expect(mockMixpanel.track).not.toHaveBeenCalled()
+  })
+
+  it.for<
+    [
+      'opened' | 'requested' | 'completed',
+      (typeof TelemetryEvents)[keyof typeof TelemetryEvents]
+    ]
+  >([
+    ['opened' as const, TelemetryEvents.USER_EMAIL_VERIFY_OPENED],
+    ['requested' as const, TelemetryEvents.USER_EMAIL_VERIFY_REQUESTED],
+    ['completed' as const, TelemetryEvents.USER_EMAIL_VERIFY_COMPLETED]
+  ])(
+    'trackEmailVerification(%s) dispatches %s',
+    async ([stage, expectedEvent]) => {
+      const provider = new MixpanelTelemetryProvider()
+      await waitForMixpanelInit()
+      mockMixpanel.track.mockClear()
+
+      provider.trackEmailVerification(stage)
+
+      expect(mockMixpanel.track).toHaveBeenCalledWith(expectedEvent, {})
+    }
+  )
+
+  it.for<
+    [
+      'modal_opened' | 'subscribe_clicked',
+      (typeof TelemetryEvents)[keyof typeof TelemetryEvents]
+    ]
+  >([
+    [
+      'modal_opened' as const,
+      TelemetryEvents.SUBSCRIPTION_REQUIRED_MODAL_OPENED
+    ],
+    ['subscribe_clicked' as const, TelemetryEvents.SUBSCRIBE_NOW_BUTTON_CLICKED]
+  ])('trackSubscription(%s) dispatches %s', async ([event, expectedEvent]) => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    provider.trackSubscription(event)
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(expectedEvent, {})
+  })
+
+  it('writes normalized survey properties to Mixpanel.people on submit', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+
+    const normalized = {
+      industry: 'tech',
+      industry_normalized: 'Software / IT / AI',
+      industry_raw: 'tech',
+      useCase: 'fun',
+      useCase_normalized: 'Personal & Hobby',
+      useCase_raw: 'fun'
+    }
+    mockNormalizeSurveyResponses.mockReturnValueOnce(normalized)
+
+    const responses: SurveyResponses = { industry: 'tech', useCase: 'fun' }
+    provider.trackSurvey('submitted', responses)
+
+    expect(mockNormalizeSurveyResponses).toHaveBeenCalledWith(responses)
+    expect(mockMixpanel.people.set).toHaveBeenCalledWith(normalized)
+  })
+
+  it('does not write to Mixpanel.people for survey "opened"', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.people.set.mockClear()
+
+    provider.trackSurvey('opened')
+
+    expect(mockMixpanel.people.set).not.toHaveBeenCalled()
+  })
+
+  it('forwards user identification when onUserResolved callback fires with a user id', async () => {
+    new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+
+    expect(mockOnUserResolved).toHaveBeenCalled()
+    const callback = mockOnUserResolved.mock.calls[0]?.[0] as (user: {
+      id?: string
+    }) => void
+    callback({ id: 'user-42' })
+
+    expect(mockMixpanel.identify).toHaveBeenCalledWith('user-42')
+  })
+})
+
+describe('MixpanelTelemetryProvider — direct event tracking methods', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(window as unknown as ConfigWindow).__CONFIG__ = {
+      mixpanel_token: 'test-token'
+    }
+    mockMixpanel.init.mockImplementation((_token, config) => {
+      config?.loaded?.()
+    })
+    mockNormalizeSurveyResponses.mockImplementation((responses) => responses)
+  })
+
+  type Trackable = (provider: MixpanelTelemetryProvider) => void
+
+  const templateMetadata: TemplateMetadata = { workflow_name: 't' }
+  const templateLibraryMetadata: TemplateLibraryMetadata = { source: 'menu' }
+  const templateLibraryClosedMetadata: TemplateLibraryClosedMetadata = {
+    template_selected: false,
+    time_spent_seconds: 0
+  }
+  const workflowImportMetadata: WorkflowImportMetadata = {
+    missing_node_count: 0,
+    missing_node_types: []
+  }
+  const workflowSavedMetadata: WorkflowSavedMetadata = {
+    is_app: false,
+    is_new: false
+  }
+  const defaultViewSetMetadata: DefaultViewSetMetadata = {
+    default_view: 'graph'
+  }
+  const enterLinearMetadata: EnterLinearMetadata = {}
+  const shareFlowMetadata: ShareFlowMetadata = { step: 'dialog_opened' }
+  const executionErrorMetadata: ExecutionErrorMetadata = { jobId: 'job-1' }
+  const executionSuccessMetadata: ExecutionSuccessMetadata = { jobId: 'job-1' }
+  const authMetadata: AuthMetadata = {}
+
+  it.for<
+    [string, Trackable, (typeof TelemetryEvents)[keyof typeof TelemetryEvents]]
+  >([
+    [
+      'trackAddApiCreditButtonClicked',
+      (p) => p.trackAddApiCreditButtonClicked(),
+      TelemetryEvents.ADD_API_CREDIT_BUTTON_CLICKED
+    ],
+    [
+      'trackMonthlySubscriptionSucceeded',
+      (p) => p.trackMonthlySubscriptionSucceeded(),
+      TelemetryEvents.MONTHLY_SUBSCRIPTION_SUCCEEDED
+    ],
+    [
+      'trackMonthlySubscriptionCancelled',
+      (p) => p.trackMonthlySubscriptionCancelled(),
+      TelemetryEvents.MONTHLY_SUBSCRIPTION_CANCELLED
+    ],
+    [
+      'trackApiCreditTopupSucceeded',
+      (p) => p.trackApiCreditTopupSucceeded(),
+      TelemetryEvents.API_CREDIT_TOPUP_SUCCEEDED
+    ],
+    [
+      'trackTemplate',
+      (p) => p.trackTemplate(templateMetadata),
+      TelemetryEvents.TEMPLATE_WORKFLOW_OPENED
+    ],
+    [
+      'trackTemplateLibraryOpened',
+      (p) => p.trackTemplateLibraryOpened(templateLibraryMetadata),
+      TelemetryEvents.TEMPLATE_LIBRARY_OPENED
+    ],
+    [
+      'trackTemplateLibraryClosed',
+      (p) => p.trackTemplateLibraryClosed(templateLibraryClosedMetadata),
+      TelemetryEvents.TEMPLATE_LIBRARY_CLOSED
+    ],
+    [
+      'trackWorkflowImported',
+      (p) => p.trackWorkflowImported(workflowImportMetadata),
+      TelemetryEvents.WORKFLOW_IMPORTED
+    ],
+    [
+      'trackWorkflowSaved',
+      (p) => p.trackWorkflowSaved(workflowSavedMetadata),
+      TelemetryEvents.WORKFLOW_SAVED
+    ],
+    [
+      'trackDefaultViewSet',
+      (p) => p.trackDefaultViewSet(defaultViewSetMetadata),
+      TelemetryEvents.DEFAULT_VIEW_SET
+    ],
+    [
+      'trackEnterLinear',
+      (p) => p.trackEnterLinear(enterLinearMetadata),
+      TelemetryEvents.ENTER_LINEAR_MODE
+    ],
+    [
+      'trackShareFlow',
+      (p) => p.trackShareFlow(shareFlowMetadata),
+      TelemetryEvents.SHARE_FLOW
+    ],
+    [
+      'trackExecutionError',
+      (p) => p.trackExecutionError(executionErrorMetadata),
+      TelemetryEvents.EXECUTION_ERROR
+    ],
+    [
+      'trackExecutionSuccess',
+      (p) => p.trackExecutionSuccess(executionSuccessMetadata),
+      TelemetryEvents.EXECUTION_SUCCESS
+    ],
+    [
+      'trackAuth',
+      (p) => p.trackAuth(authMetadata),
+      TelemetryEvents.USER_AUTH_COMPLETED
+    ],
+    [
+      'trackSignupOpened',
+      (p) => p.trackSignupOpened(),
+      TelemetryEvents.USER_SIGN_UP_OPENED
+    ]
+  ])('%s dispatches %s', async ([_name, invoke, expectedEvent]) => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    invoke(provider)
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      expectedEvent,
+      expect.anything()
+    )
+  })
+
+  it('trackApiCreditTopupButtonPurchaseClicked includes the credit_amount payload', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    provider.trackApiCreditTopupButtonPurchaseClicked(42)
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.API_CREDIT_TOPUP_BUTTON_PURCHASE_CLICKED,
+      { credit_amount: 42 }
+    )
+  })
+
+  it('trackRunButton populates RunButtonProperties from the execution context', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    provider.trackRunButton({
+      subscribe_to_run: true,
+      trigger_source: 'button'
+    })
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.RUN_BUTTON_CLICKED,
+      expect.objectContaining({
+        subscribe_to_run: true,
+        workflow_type: 'custom',
+        trigger_source: 'button',
+        view_mode: 'workflow',
+        is_app_mode: false
+      })
+    )
+  })
+
+  it('trackWorkflowExecution forwards the latest trigger_source from trackRunButton', async () => {
+    const provider = new MixpanelTelemetryProvider()
+    await waitForMixpanelInit()
+    mockMixpanel.track.mockClear()
+
+    provider.trackRunButton({ trigger_source: 'keybinding' })
+    provider.trackWorkflowExecution()
+
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.EXECUTION_START,
+      expect.objectContaining({ trigger_source: 'keybinding' })
+    )
+
+    mockMixpanel.track.mockClear()
+    provider.trackWorkflowExecution()
+    expect(mockMixpanel.track).toHaveBeenCalledWith(
+      TelemetryEvents.EXECUTION_START,
+      expect.objectContaining({ trigger_source: 'unknown' })
+    )
+  })
+})
+
+describe('MixpanelTelemetryProvider — topup delegation', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    delete (window as unknown as ConfigWindow).__CONFIG__
+  })
+
+  it('forwards topup lifecycle calls to the topupTracker utility', () => {
+    const provider = new MixpanelTelemetryProvider()
+
+    provider.startTopupTracking()
+    provider.clearTopupTracking()
+    const result = provider.checkForCompletedTopup([])
+
+    expect(topupMocks.startTopupTracking).toHaveBeenCalled()
+    expect(topupMocks.clearTopupTracking).toHaveBeenCalled()
+    expect(topupMocks.checkForCompletedTopup).toHaveBeenCalledWith([])
+    expect(result).toBe(true)
   })
 })
diff --git a/src/platform/telemetry/utils/getExecutionContext.test.ts b/src/platform/telemetry/utils/getExecutionContext.test.ts
new file mode 100644
index 0000000000..9878b1a254
--- /dev/null
+++ b/src/platform/telemetry/utils/getExecutionContext.test.ts
@@ -0,0 +1,215 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+const hoisted = vi.hoisted(() => ({
+  mockNodeDefsByName: {} as Record<string, unknown>,
+  mockNodes: [] as Pick<LGraphNode, 'type' | 'isSubgraphNode'>[],
+  mockActiveWorkflow: null as null | {
+    filename: string
+    fullFilename: string
+  },
+  mockKnownTemplateNames: new Set<string>(),
+  mockTemplateByName: null as null | { sourceModule?: string }
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    nodeDefsByName: hoisted.mockNodeDefsByName
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get activeWorkflow() {
+      return hoisted.mockActiveWorkflow
+    }
+  })
+}))
+
+vi.mock(
+  '@/platform/workflow/templates/repositories/workflowTemplatesStore',
+  () => ({
+    useWorkflowTemplatesStore: () => ({
+      get knownTemplateNames() {
+        return hoisted.mockKnownTemplateNames
+      },
+      getTemplateByName: (_name: string) => hoisted.mockTemplateByName,
+      getEnglishMetadata: () => null
+    })
+  })
+)
+
+function mockNode(
+  type: string,
+  isSubgraph = false
+): Pick<LGraphNode, 'type' | 'isSubgraphNode'> {
+  return {
+    type,
+    isSubgraphNode: (() => isSubgraph) as LGraphNode['isSubgraphNode']
+  }
+}
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  reduceAllNodes: vi.fn((_graph, reducer, initial) => {
+    let result = initial
+    for (const node of hoisted.mockNodes) {
+      result = reducer(result, node)
+    }
+    return result
+  })
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: { rootGraph: {} }
+}))
+
+import { getExecutionContext } from './getExecutionContext'
+
+describe('getExecutionContext', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    hoisted.mockNodes.length = 0
+    for (const key of Object.keys(hoisted.mockNodeDefsByName)) {
+      delete hoisted.mockNodeDefsByName[key]
+    }
+    hoisted.mockActiveWorkflow = null
+    hoisted.mockKnownTemplateNames = new Set()
+    hoisted.mockTemplateByName = null
+  })
+
+  it('returns has_toolkit_nodes false when no toolkit nodes are present', () => {
+    hoisted.mockNodes.push(mockNode('KSampler'), mockNode('LoadImage'))
+    hoisted.mockNodeDefsByName['KSampler'] = {
+      name: 'KSampler',
+      python_module: 'nodes'
+    }
+    hoisted.mockNodeDefsByName['LoadImage'] = {
+      name: 'LoadImage',
+      python_module: 'nodes'
+    }
+
+    const context = getExecutionContext()
+
+    expect(context.has_toolkit_nodes).toBe(false)
+    expect(context.toolkit_node_names).toEqual([])
+    expect(context.toolkit_node_count).toBe(0)
+  })
+
+  it('detects individual toolkit nodes by type name', () => {
+    hoisted.mockNodes.push(mockNode('Canny'), mockNode('KSampler'))
+    hoisted.mockNodeDefsByName['Canny'] = {
+      name: 'Canny',
+      python_module: 'comfy_extras.nodes_canny'
+    }
+    hoisted.mockNodeDefsByName['KSampler'] = {
+      name: 'KSampler',
+      python_module: 'nodes'
+    }
+
+    const context = getExecutionContext()
+
+    expect(context.has_toolkit_nodes).toBe(true)
+    expect(context.toolkit_node_names).toEqual(['Canny'])
+    expect(context.toolkit_node_count).toBe(1)
+  })
+
+  it('detects blueprint toolkit nodes via python_module', () => {
+    const blueprintType = 'SubgraphBlueprint.text_to_image'
+    hoisted.mockNodes.push(mockNode(blueprintType, true))
+    hoisted.mockNodeDefsByName[blueprintType] = {
+      name: blueprintType,
+      python_module: 'comfy_essentials'
+    }
+
+    const context = getExecutionContext()
+
+    expect(context.has_toolkit_nodes).toBe(true)
+    expect(context.toolkit_node_names).toEqual([blueprintType])
+    expect(context.toolkit_node_count).toBe(1)
+  })
+
+  it('deduplicates toolkit_node_names when same type appears multiple times', () => {
+    hoisted.mockNodes.push(mockNode('Canny'), mockNode('Canny'))
+    hoisted.mockNodeDefsByName['Canny'] = {
+      name: 'Canny',
+      python_module: 'comfy_extras.nodes_canny'
+    }
+
+    const context = getExecutionContext()
+
+    expect(context.toolkit_node_names).toEqual(['Canny'])
+    expect(context.toolkit_node_count).toBe(2)
+  })
+
+  it('allows a node to appear in both api_node_names and toolkit_node_names', () => {
+    hoisted.mockNodes.push(mockNode('RecraftRemoveBackgroundNode'))
+    hoisted.mockNodeDefsByName['RecraftRemoveBackgroundNode'] = {
+      name: 'RecraftRemoveBackgroundNode',
+      python_module: 'comfy_extras.nodes_api',
+      api_node: true
+    }
+
+    const context = getExecutionContext()
+
+    expect(context.has_api_nodes).toBe(true)
+    expect(context.api_node_names).toEqual(['RecraftRemoveBackgroundNode'])
+    expect(context.has_toolkit_nodes).toBe(true)
+    expect(context.toolkit_node_names).toEqual(['RecraftRemoveBackgroundNode'])
+  })
+
+  it('uses node.type as tracking name when nodeDef is missing', () => {
+    hoisted.mockNodes.push(mockNode('ImageCrop'))
+
+    const context = getExecutionContext()
+
+    expect(context.has_toolkit_nodes).toBe(true)
+    expect(context.toolkit_node_names).toEqual(['ImageCrop'])
+  })
+
+  describe('template detection', () => {
+    it('detects a regular template by name', () => {
+      hoisted.mockKnownTemplateNames = new Set(['flux-dev'])
+      hoisted.mockTemplateByName = { sourceModule: 'default' }
+      hoisted.mockActiveWorkflow = {
+        filename: 'flux-dev',
+        fullFilename: 'flux-dev.json'
+      }
+
+      const context = getExecutionContext()
+
+      expect(context.is_template).toBe(true)
+      expect(context.workflow_name).toBe('flux-dev')
+    })
+
+    it('detects an app mode template whose name ends with .app', () => {
+      hoisted.mockKnownTemplateNames = new Set([
+        'templates-qwen_multiangle.app'
+      ])
+      hoisted.mockTemplateByName = { sourceModule: 'default' }
+      // getFilenameDetails strips ".app.json" as a compound extension, yielding
+      // filename = "templates-qwen_multiangle" — the previous code would fail here.
+      hoisted.mockActiveWorkflow = {
+        filename: 'templates-qwen_multiangle',
+        fullFilename: 'templates-qwen_multiangle.app.json'
+      }
+
+      const context = getExecutionContext()
+
+      expect(context.is_template).toBe(true)
+      expect(context.workflow_name).toBe('templates-qwen_multiangle.app')
+    })
+
+    it('does not flag a non-template workflow as a template', () => {
+      hoisted.mockKnownTemplateNames = new Set(['flux-dev'])
+      hoisted.mockActiveWorkflow = {
+        filename: 'my-custom-workflow',
+        fullFilename: 'my-custom-workflow.json'
+      }
+
+      const context = getExecutionContext()
+
+      expect(context.is_template).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/workflow/core/services/workflowActionsService.test.ts b/src/platform/workflow/core/services/workflowActionsService.test.ts
new file mode 100644
index 0000000000..c2b2e9b659
--- /dev/null
+++ b/src/platform/workflow/core/services/workflowActionsService.test.ts
@@ -0,0 +1,92 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import { useWorkflowActionsService } from './workflowActionsService'
+
+const mockPrompt = vi.hoisted(() => vi.fn())
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({ prompt: mockPrompt })
+}))
+
+const mockGetSetting = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({ get: mockGetSetting })
+}))
+
+const mockDownloadBlob = vi.hoisted(() => vi.fn())
+vi.mock('@/scripts/utils', () => ({
+  downloadBlob: mockDownloadBlob
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({ createTemporary: vi.fn() })
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: () => ({ openWorkflow: vi.fn() })
+}))
+
+const minimalWorkflow: ComfyWorkflowJSON = {
+  version: 0.4,
+  last_node_id: 0,
+  last_link_id: 0,
+  nodes: [],
+  links: []
+}
+
+describe('workflowActionsService.exportWorkflowAction', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('returns { cancelled: true } when the user dismisses the filename prompt', async () => {
+    mockGetSetting.mockReturnValue(true)
+    mockPrompt.mockResolvedValue(null)
+    const { exportWorkflowAction } = useWorkflowActionsService()
+
+    const result = await exportWorkflowAction(minimalWorkflow, 'wf.json')
+
+    expect(result).toEqual({ success: false, cancelled: true })
+    expect(mockDownloadBlob).not.toHaveBeenCalled()
+  })
+
+  it('downloads with the prompted filename and returns success', async () => {
+    mockGetSetting.mockReturnValue(true)
+    mockPrompt.mockResolvedValue('custom')
+    const { exportWorkflowAction } = useWorkflowActionsService()
+
+    const result = await exportWorkflowAction(minimalWorkflow, 'wf.json')
+
+    expect(result).toEqual({ success: true })
+    expect(mockDownloadBlob).toHaveBeenCalledWith(
+      'custom.json',
+      expect.any(Blob)
+    )
+  })
+
+  it('skips the prompt and uses the default filename when the setting is off', async () => {
+    mockGetSetting.mockReturnValue(false)
+    const { exportWorkflowAction } = useWorkflowActionsService()
+
+    const result = await exportWorkflowAction(minimalWorkflow, 'default.json')
+
+    expect(result).toEqual({ success: true })
+    expect(mockPrompt).not.toHaveBeenCalled()
+    expect(mockDownloadBlob).toHaveBeenCalledWith(
+      'default.json',
+      expect.any(Blob)
+    )
+  })
+
+  it('returns the no-workflow error when given null', async () => {
+    const { exportWorkflowAction } = useWorkflowActionsService()
+
+    const result = await exportWorkflowAction(null, 'wf.json')
+
+    expect(result).toEqual({
+      success: false,
+      error: 'No workflow data available'
+    })
+    expect(mockDownloadBlob).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/platform/workflow/core/services/workflowActionsService.ts b/src/platform/workflow/core/services/workflowActionsService.ts
index ffff13fb76..bd7c8d8a6e 100644
--- a/src/platform/workflow/core/services/workflowActionsService.ts
+++ b/src/platform/workflow/core/services/workflowActionsService.ts
@@ -42,6 +42,7 @@ export function useWorkflowActionsService() {
     defaultFilename: string
   ): Promise<{
     success: boolean
+    cancelled?: boolean
     error?: string
   }> => {
     if (!workflow) {
@@ -59,7 +60,7 @@ export function useWorkflowActionsService() {
           defaultValue: filename
         })
         // User cancelled the prompt
-        if (!input) return { success: false }
+        if (!input) return { success: false, cancelled: true }
         filename = appendJsonExt(input)
       }
 
diff --git a/src/platform/workflow/core/services/workflowService.test.ts b/src/platform/workflow/core/services/workflowService.test.ts
index 73d4a151b2..d5d897b354 100644
--- a/src/platform/workflow/core/services/workflowService.test.ts
+++ b/src/platform/workflow/core/services/workflowService.test.ts
@@ -418,24 +418,51 @@ describe('useWorkflowService', () => {
       })
       vi.mocked(workflowStore.saveWorkflow).mockResolvedValue()
 
-      await useWorkflowService().saveWorkflow(workflow)
+      const result = await useWorkflowService().saveWorkflow(workflow)
 
+      expect(result).toBe(true)
       expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
     })
 
-    it('should call saveWorkflowAs for temporary workflows', async () => {
+    it('should return false when temporary workflow save is cancelled', async () => {
       const workflow = createModeTestWorkflow({
         path: 'workflows/Unsaved Workflow.json'
       })
       Object.defineProperty(workflow, 'isTemporary', { get: () => true })
       vi.spyOn(workflow, 'promptSave').mockResolvedValue(null)
 
-      await useWorkflowService().saveWorkflow(workflow)
+      const result = await useWorkflowService().saveWorkflow(workflow)
 
+      expect(result).toBe(false)
       expect(workflowStore.saveWorkflow).not.toHaveBeenCalled()
     })
   })
 
+  describe('closeWorkflow', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+    let service: ReturnType<typeof useWorkflowService>
+
+    beforeEach(() => {
+      workflowStore = useWorkflowStore()
+      service = useWorkflowService()
+    })
+
+    it('keeps a temporary workflow open when Save As is cancelled', async () => {
+      const workflow = createModeTestWorkflow({
+        path: 'workflows/Unsaved Workflow.json'
+      })
+      workflow.isModified = true
+      Object.defineProperty(workflow, 'isTemporary', { get: () => true })
+      vi.spyOn(workflow, 'promptSave').mockResolvedValue(null)
+      mockConfirm.mockResolvedValue(true)
+
+      const closed = await service.closeWorkflow(workflow)
+
+      expect(closed).toBe(false)
+      expect(workflowStore.closeWorkflow).not.toHaveBeenCalled()
+    })
+  })
+
   describe('afterLoadNewGraph', () => {
     let workflowStore: ReturnType<typeof useWorkflowStore>
     let existingWorkflow: LoadedComfyWorkflow
diff --git a/src/platform/workflow/core/services/workflowService.ts b/src/platform/workflow/core/services/workflowService.ts
index 15dc01879b..c7bc669d1d 100644
--- a/src/platform/workflow/core/services/workflowService.ts
+++ b/src/platform/workflow/core/services/workflowService.ts
@@ -174,40 +174,39 @@ export const useWorkflowService = () => {
    * Save a workflow
    * @param workflow The workflow to save
    */
-  const saveWorkflow = async (workflow: ComfyWorkflow) => {
+  const saveWorkflow = async (workflow: ComfyWorkflow): Promise<boolean> => {
     if (workflow.isTemporary) {
-      await saveWorkflowAs(workflow)
-    } else {
-      workflow.changeTracker?.prepareForSave()
-      const isApp = workflow.initialMode === 'app'
-      const expectedPath =
-        workflow.directory +
-        '/' +
-        appendWorkflowJsonExt(workflow.filename, isApp)
-      if (workflow.path !== expectedPath) {
-        const existing = workflowStore.getWorkflowByPath(expectedPath)
-        if (existing && !existing.isTemporary) {
-          if ((await confirmOverwrite(expectedPath)) !== true) {
-            await workflowStore.saveWorkflow(workflow)
-            return
-          }
-          await deleteWorkflow(existing, true)
-        }
-        await renameWorkflow(workflow, expectedPath)
-        toastStore.add({
-          severity: 'info',
-          summary: t(
-            isApp
-              ? 'workflowService.savedAsApp'
-              : 'workflowService.savedAsWorkflow'
-          ),
-          life: 3000
-        })
-      }
-
-      await workflowStore.saveWorkflow(workflow)
-      useTelemetry()?.trackWorkflowSaved({ is_app: isApp, is_new: false })
+      return await saveWorkflowAs(workflow)
     }
+
+    workflow.changeTracker?.prepareForSave()
+    const isApp = workflow.initialMode === 'app'
+    const expectedPath =
+      workflow.directory + '/' + appendWorkflowJsonExt(workflow.filename, isApp)
+    if (workflow.path !== expectedPath) {
+      const existing = workflowStore.getWorkflowByPath(expectedPath)
+      if (existing && !existing.isTemporary) {
+        if ((await confirmOverwrite(expectedPath)) !== true) {
+          await workflowStore.saveWorkflow(workflow)
+          return true
+        }
+        await deleteWorkflow(existing, true)
+      }
+      await renameWorkflow(workflow, expectedPath)
+      toastStore.add({
+        severity: 'info',
+        summary: t(
+          isApp
+            ? 'workflowService.savedAsApp'
+            : 'workflowService.savedAsWorkflow'
+        ),
+        life: 3000
+      })
+    }
+
+    await workflowStore.saveWorkflow(workflow)
+    useTelemetry()?.trackWorkflowSaved({ is_app: isApp, is_new: false })
+    return true
   }
 
   /**
@@ -284,13 +283,15 @@ export const useWorkflowService = () => {
         type: 'dirtyClose',
         message: t('sideToolbar.workflowTab.dirtyClose'),
         itemList: [workflow.path],
-        hint: options.hint
+        hint: options.hint,
+        denyLabel: t('sideToolbar.workflowTab.dirtyCloseAnyway')
       })
       // Cancel
       if (confirmed === null) return false
 
       if (confirmed === true) {
-        await saveWorkflow(workflow)
+        const saved = await saveWorkflow(workflow)
+        if (!saved) return false
       }
     }
 
diff --git a/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.test.ts b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.test.ts
index a5fe0fe6e5..852b3c9beb 100644
--- a/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.test.ts
+++ b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.test.ts
@@ -76,15 +76,25 @@ vi.mock(
   })
 )
 
+const commandStoreMocks = vi.hoisted(() => ({
+  execute: vi.fn()
+}))
+
 vi.mock('@/stores/commandStore', () => ({
   useCommandStore: () => ({
-    execute: vi.fn()
+    execute: commandStoreMocks.execute
   })
 }))
 
+const routeMocks = vi.hoisted(() => ({
+  query: {} as Record<string, unknown>
+}))
+
 vi.mock('vue-router', () => ({
   useRoute: () => ({
-    query: {}
+    get query() {
+      return routeMocks.query
+    }
   }),
   useRouter: () => ({
     replace: vi.fn()
@@ -97,13 +107,30 @@ vi.mock('@/composables/auth/useCurrentUser', () => ({
   })
 }))
 
+const preservedQueryMocks = vi.hoisted(() => ({
+  payloads: {} as Record<string, Record<string, string> | undefined>
+}))
+
 vi.mock('@/platform/navigation/preservedQueryManager', () => ({
   hydratePreservedQuery: vi.fn(),
-  mergePreservedQueryIntoQuery: vi.fn(() => null)
+  mergePreservedQueryIntoQuery: vi.fn(
+    (namespace: string, query: Record<string, unknown> = {}) => {
+      const payload = preservedQueryMocks.payloads[namespace]
+      if (!payload) return undefined
+      const next: Record<string, unknown> = { ...query }
+      let changed = false
+      for (const [key, value] of Object.entries(payload)) {
+        if (typeof next[key] === 'string') continue
+        next[key] = value
+        changed = true
+      }
+      return changed ? next : undefined
+    }
+  )
 }))
 
 vi.mock('@/platform/navigation/preservedQueryNamespaces', () => ({
-  PRESERVED_QUERY_NAMESPACES: { TEMPLATE: 'template' }
+  PRESERVED_QUERY_NAMESPACES: { TEMPLATE: 'template', SHARE: 'share' }
 }))
 
 vi.mock('@/platform/distribution/types', () => ({
@@ -178,6 +205,9 @@ describe('useWorkflowPersistenceV2', () => {
     mocks.apiMock.removeEventListener.mockImplementation(() => {})
     openWorkflowMock.mockReset()
     loadBlankWorkflowMock.mockReset()
+    commandStoreMocks.execute.mockReset()
+    routeMocks.query = {}
+    preservedQueryMocks.payloads = {}
   })
 
   afterEach(() => {
@@ -357,4 +387,43 @@ describe('useWorkflowPersistenceV2', () => {
       expect(openWorkflowMock).not.toHaveBeenCalled()
     })
   })
+
+  describe('loadDefaultWorkflow', () => {
+    it('opens templates browser for first-time users', async () => {
+      const { initializeWorkflow } = useWorkflowPersistenceV2()
+      await initializeWorkflow()
+
+      expect(loadBlankWorkflowMock).toHaveBeenCalled()
+      expect(commandStoreMocks.execute).toHaveBeenCalledWith(
+        'Comfy.BrowseTemplates'
+      )
+    })
+
+    it('does not open templates browser when share param is in URL', async () => {
+      routeMocks.query = { share: 'test-share-id' }
+
+      const { initializeWorkflow } = useWorkflowPersistenceV2()
+      await initializeWorkflow()
+
+      expect(loadBlankWorkflowMock).toHaveBeenCalled()
+      expect(commandStoreMocks.execute).not.toHaveBeenCalledWith(
+        'Comfy.BrowseTemplates'
+      )
+    })
+
+    it('does not open templates browser when share intent is preserved across /user-select redirect', async () => {
+      // No-local-user flow: ?share=... was captured into sessionStorage and the
+      // URL query was dropped during the /user-select redirect before
+      // initializeWorkflow() runs.
+      preservedQueryMocks.payloads.share = { share: 'test-share-id' }
+
+      const { initializeWorkflow } = useWorkflowPersistenceV2()
+      await initializeWorkflow()
+
+      expect(loadBlankWorkflowMock).toHaveBeenCalled()
+      expect(commandStoreMocks.execute).not.toHaveBeenCalledWith(
+        'Comfy.BrowseTemplates'
+      )
+    })
+  })
 })
diff --git a/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts
index 4091472d94..561399bccf 100644
--- a/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts
+++ b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts
@@ -48,6 +48,7 @@ export function useWorkflowPersistenceV2() {
   const sharedWorkflowUrlLoader = useSharedWorkflowUrlLoader()
   const templateUrlLoader = useTemplateUrlLoader()
   const TEMPLATE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.TEMPLATE
+  const SHARE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.SHARE
   const draftStore = useWorkflowDraftStoreV2()
   const tabState = useWorkflowTabState()
   const toast = useToast()
@@ -160,11 +161,20 @@ export function useWorkflowPersistenceV2() {
     })
   }
 
+  const hasSharedWorkflowIntent = () => {
+    if (typeof route.query.share === 'string') return true
+    hydratePreservedQuery(SHARE_NAMESPACE)
+    const merged = mergePreservedQueryIntoQuery(SHARE_NAMESPACE, route.query)
+    return typeof merged?.share === 'string'
+  }
+
   const loadDefaultWorkflow = async () => {
     if (!settingStore.get('Comfy.TutorialCompleted')) {
       await settingStore.set('Comfy.TutorialCompleted', true)
       await useWorkflowService().loadBlankWorkflow()
-      await useCommandStore().execute('Comfy.BrowseTemplates')
+      if (!hasSharedWorkflowIntent()) {
+        await useCommandStore().execute('Comfy.BrowseTemplates')
+      }
     } else {
       await comfyApp.loadGraphData()
     }
diff --git a/src/platform/workflow/validation/schemas/workflowSchema.test.ts b/src/platform/workflow/validation/schemas/workflowSchema.test.ts
index e6c608de47..1df45c09aa 100644
--- a/src/platform/workflow/validation/schemas/workflowSchema.test.ts
+++ b/src/platform/workflow/validation/schemas/workflowSchema.test.ts
@@ -199,7 +199,7 @@ describe('parseComfyWorkflow', () => {
       'valid/valid',
       'valid-username-with-dash/valid_github-repo-name-with-underscore'
     ]
-    it.each(validAuxIds)('valid aux_id: %s', async (aux_id) => {
+    it.for(validAuxIds)('valid aux_id: %s', async (aux_id) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.aux_id = aux_id
       await expect(validateComfyWorkflow(workflow)).resolves.not.toBeNull()
@@ -210,7 +210,7 @@ describe('parseComfyWorkflow', () => {
       'github-name/invalid spaces in repo',
       'not-both-names-with-slash'
     ]
-    it.each(invalidAuxIds)('invalid aux_id: %s', async (aux_id) => {
+    it.for(invalidAuxIds)('invalid aux_id: %s', async (aux_id) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.aux_id = aux_id
       await expect(validateComfyWorkflow(workflow)).resolves.toBeNull()
@@ -219,14 +219,14 @@ describe('parseComfyWorkflow', () => {
 
   describe('workflow.nodes.properties.cnr_id', () => {
     const validCnrIds = ['valid', 'valid-with-dash', 'valid_with_underscores']
-    it.each(validCnrIds)('valid cnr_id: %s', async (cnr_id) => {
+    it.for(validCnrIds)('valid cnr_id: %s', async (cnr_id) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.cnr_id = cnr_id
       await expect(validateComfyWorkflow(workflow)).resolves.not.toBeNull()
     })
 
     const invalidCnrIds = ['invalid cnr-id', 'invalid^cnr-id', 'invalid cnr id']
-    it.each(invalidCnrIds)('invalid cnr_id: %s', async (cnr_id) => {
+    it.for(invalidCnrIds)('invalid cnr_id: %s', async (cnr_id) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.cnr_id = cnr_id
       await expect(validateComfyWorkflow(workflow)).resolves.toBeNull()
@@ -248,7 +248,7 @@ describe('parseComfyWorkflow', () => {
       'v0.3.9-7-g1419dee',
       'v0.3.9-7-g1419dee-dirty'
     ]
-    it.each(validVersionStrings)('valid version: %s', async (ver) => {
+    it.for(validVersionStrings)('valid version: %s', async (ver) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.ver = ver
       await expect(validateComfyWorkflow(workflow)).resolves.not.toBeNull()
@@ -262,7 +262,7 @@ describe('parseComfyWorkflow', () => {
       // Git hash
       '080e6d4af809a46852d1c4b7ed85f06e8a3a72be-invalid'
     ]
-    it.each(invalidVersionStrings)('invalid version: %s', async (ver) => {
+    it.for(invalidVersionStrings)('invalid version: %s', async (ver) => {
       const workflow = JSON.parse(JSON.stringify(defaultGraph))
       workflow.nodes[0].properties.ver = ver
       await expect(validateComfyWorkflow(workflow)).resolves.toBeNull()
diff --git a/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
index 89195d9cb6..27425ba4ac 100644
--- a/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
+++ b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
@@ -68,10 +68,16 @@
       <span v-else class="text-base font-semibold text-base-foreground">{{
         displayedCredits
       }}</span>
-      <i
+      <Button
         v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
-        class="mr-auto icon-[lucide--circle-help] cursor-help text-base text-muted-foreground"
-      />
+        variant="muted-textonly"
+        size="icon-sm"
+        class="mr-auto"
+        :aria-label="$t('credits.unified.tooltip')"
+        data-testid="credits-info-button"
+      >
+        <i class="icon-[lucide--circle-help]" />
+      </Button>
       <!-- Upgrade to add credits (free tier) -->
       <Button
         v-if="isActiveSubscription && permissions.canTopUp && isFreeTier"
diff --git a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts
new file mode 100644
index 0000000000..9d49cbfd59
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.test.ts
@@ -0,0 +1,349 @@
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, ref } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import MembersPanelContent from './MembersPanelContent.vue'
+
+import type {
+  PendingInvite,
+  WorkspaceMember
+} from '../../../stores/teamWorkspaceStore'
+
+const mockHandleCopyInviteLink = vi.fn()
+const mockHandleRevokeInvite = vi.fn()
+const mockHandleCreateWorkspace = vi.fn()
+const mockShowSubscriptionDialog = vi.fn()
+const mockSelectMember = vi.fn()
+const mockToggleSort = vi.fn()
+
+const {
+  mockMembers,
+  mockPendingInvites,
+  mockFilteredMembers,
+  mockFilteredPendingInvites,
+  mockIsPersonalWorkspace,
+  mockIsSingleSeatPlan,
+  mockIsActiveSubscription,
+  mockActiveView,
+  mockSearchQuery,
+  mockPermissions,
+  mockUiConfig
+} = vi.hoisted(() => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/consistent-type-imports
+  const { ref } = require('vue') as typeof import('vue')
+
+  return {
+    mockMembers: ref<WorkspaceMember[]>([]),
+    mockPendingInvites: ref<PendingInvite[]>([]),
+    mockFilteredMembers: ref<WorkspaceMember[]>([]),
+    mockFilteredPendingInvites: ref<PendingInvite[]>([]),
+    mockIsPersonalWorkspace: ref(false),
+    mockIsSingleSeatPlan: ref(false),
+    mockIsActiveSubscription: ref(true),
+    mockActiveView: ref<'active' | 'pending'>('active'),
+    mockSearchQuery: ref(''),
+    mockPermissions: ref({
+      canViewOtherMembers: true,
+      canViewPendingInvites: true,
+      canInviteMembers: true,
+      canManageInvites: true,
+      canRemoveMembers: true,
+      canLeaveWorkspace: true,
+      canAccessWorkspaceMenu: true,
+      canManageSubscription: true,
+      canTopUp: true
+    }),
+    mockUiConfig: ref({
+      showMembersList: true,
+      showPendingTab: true,
+      showSearch: true,
+      showDateColumn: true,
+      showRoleBadge: true,
+      membersGridCols: 'grid-cols-[50%_40%_10%]',
+      pendingGridCols: 'grid-cols-[50%_20%_20%_10%]',
+      headerGridCols: 'grid-cols-[50%_40%_10%]',
+      showEditWorkspaceMenuItem: true,
+      workspaceMenuAction: 'delete' as 'leave' | 'delete' | null,
+      workspaceMenuDisabledTooltip: null as string | null
+    })
+  }
+})
+
+vi.mock('@/platform/workspace/composables/useMembersPanel', () => ({
+  useMembersPanel: () => ({
+    searchQuery: mockSearchQuery,
+    activeView: mockActiveView,
+    maxSeats: computed(() => 20),
+    isSingleSeatPlan: mockIsSingleSeatPlan,
+    personalWorkspaceMember: computed(() => ({
+      id: 'self',
+      name: 'Owner User',
+      email: 'owner@example.com',
+      role: 'owner' as const,
+      joinDate: new Date(0)
+    })),
+    filteredMembers: mockFilteredMembers,
+    filteredPendingInvites: mockFilteredPendingInvites,
+    memberMenuItems: computed(() => []),
+    isPersonalWorkspace: mockIsPersonalWorkspace,
+    members: mockMembers,
+    pendingInvites: mockPendingInvites,
+    permissions: mockPermissions,
+    uiConfig: mockUiConfig,
+    isActiveSubscription: mockIsActiveSubscription,
+    userPhotoUrl: ref(null),
+    isCurrentUser: (m: WorkspaceMember) =>
+      m.email.toLowerCase() === 'owner@example.com',
+    selectMember: mockSelectMember,
+    toggleSort: mockToggleSort,
+    showSubscriptionDialog: mockShowSubscriptionDialog,
+    handleCopyInviteLink: mockHandleCopyInviteLink,
+    handleRevokeInvite: mockHandleRevokeInvite,
+    handleCreateWorkspace: mockHandleCreateWorkspace,
+    handleRemoveMember: vi.fn()
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+const ButtonStub = {
+  name: 'Button',
+  template:
+    '<button :disabled="disabled" :aria-label="ariaLabel" @click="$emit(\'click\', $event)"><slot /></button>',
+  props: ['disabled', 'loading', 'variant', 'size', 'ariaLabel']
+}
+
+const SearchInputStub = {
+  name: 'SearchInput',
+  template:
+    '<input :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />',
+  props: ['modelValue', 'placeholder', 'size'],
+  emits: ['update:modelValue']
+}
+
+function renderComponent() {
+  return render(MembersPanelContent, {
+    global: {
+      plugins: [i18n],
+      stubs: {
+        Button: ButtonStub,
+        SearchInput: SearchInputStub,
+        UserAvatar: true,
+        Menu: { template: '<div />', props: ['model', 'popup'] }
+      },
+      directives: { tooltip: () => {} }
+    }
+  })
+}
+
+function createMember(
+  overrides: Partial<WorkspaceMember> = {}
+): WorkspaceMember {
+  return {
+    id: 'member-1',
+    name: 'Member One',
+    email: 'member1@example.com',
+    joinDate: new Date('2025-01-15'),
+    role: 'member',
+    ...overrides
+  }
+}
+
+function createInvite(overrides: Partial<PendingInvite> = {}): PendingInvite {
+  return {
+    id: 'invite-1',
+    email: 'invitee@example.com',
+    token: 'token-abc',
+    inviteDate: new Date('2025-03-01'),
+    expiryDate: new Date('2025-04-01'),
+    ...overrides
+  }
+}
+
+describe('MembersPanelContent', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockMembers.value = []
+    mockPendingInvites.value = []
+    mockFilteredMembers.value = []
+    mockFilteredPendingInvites.value = []
+    mockIsPersonalWorkspace.value = false
+    mockIsSingleSeatPlan.value = false
+    mockIsActiveSubscription.value = true
+    mockActiveView.value = 'active'
+    mockSearchQuery.value = ''
+    mockPermissions.value = {
+      canViewOtherMembers: true,
+      canViewPendingInvites: true,
+      canInviteMembers: true,
+      canManageInvites: true,
+      canRemoveMembers: true,
+      canLeaveWorkspace: true,
+      canAccessWorkspaceMenu: true,
+      canManageSubscription: true,
+      canTopUp: true
+    }
+    mockUiConfig.value = {
+      showMembersList: true,
+      showPendingTab: true,
+      showSearch: true,
+      showDateColumn: true,
+      showRoleBadge: true,
+      membersGridCols: 'grid-cols-[50%_40%_10%]',
+      pendingGridCols: 'grid-cols-[50%_20%_20%_10%]',
+      headerGridCols: 'grid-cols-[50%_40%_10%]',
+      showEditWorkspaceMenuItem: true,
+      workspaceMenuAction: 'delete',
+      workspaceMenuDisabledTooltip: null
+    }
+  })
+
+  describe('personal workspace', () => {
+    beforeEach(() => {
+      mockIsPersonalWorkspace.value = true
+      mockUiConfig.value.showMembersList = false
+      mockUiConfig.value.showSearch = false
+      mockUiConfig.value.showPendingTab = false
+    })
+
+    it('shows personal workspace message and create workspace button', () => {
+      renderComponent()
+      expect(
+        screen.getByText('workspacePanel.members.personalWorkspaceMessage')
+      ).toBeTruthy()
+      expect(
+        screen.getByText('workspacePanel.members.createNewWorkspace')
+      ).toBeTruthy()
+    })
+
+    it('calls handleCreateWorkspace when create button is clicked', async () => {
+      renderComponent()
+      await userEvent.click(
+        screen.getByText('workspacePanel.members.createNewWorkspace')
+      )
+      expect(mockHandleCreateWorkspace).toHaveBeenCalled()
+    })
+
+    it('does not show search input', () => {
+      renderComponent()
+      expect(screen.queryByRole('textbox')).toBeNull()
+    })
+  })
+
+  describe('team workspace - member list', () => {
+    it('renders filtered members', () => {
+      mockFilteredMembers.value = [
+        createMember({ name: 'Alice', email: 'alice@test.com' }),
+        createMember({
+          id: '2',
+          name: 'Bob',
+          email: 'bob@test.com'
+        })
+      ]
+      renderComponent()
+      expect(screen.getByText('Alice')).toBeTruthy()
+      expect(screen.getByText('Bob')).toBeTruthy()
+    })
+
+    it('shows more options button for non-current members', () => {
+      mockFilteredMembers.value = [
+        createMember({ name: 'Other', email: 'other@test.com' })
+      ]
+      renderComponent()
+      expect(
+        screen.queryAllByRole('button', { name: 'g.moreOptions' })
+      ).toHaveLength(1)
+    })
+
+    it('does not show more options for current user', () => {
+      mockFilteredMembers.value = [
+        createMember({ name: 'Owner User', email: 'owner@example.com' })
+      ]
+      renderComponent()
+      expect(
+        screen.queryAllByRole('button', { name: 'g.moreOptions' })
+      ).toHaveLength(0)
+    })
+  })
+
+  describe('pending invites tab', () => {
+    it('shows pending tab button when configured', () => {
+      mockPendingInvites.value = [createInvite()]
+      renderComponent()
+      expect(
+        screen.getByText(/workspacePanel\.members\.tabs\.pendingCount/)
+      ).toBeTruthy()
+    })
+
+    it('triggers handleRevokeInvite on revoke click', async () => {
+      mockActiveView.value = 'pending'
+      mockFilteredPendingInvites.value = [createInvite({ id: 'inv-42' })]
+      renderComponent()
+      const revokeBtn = screen.getByRole('button', {
+        name: 'workspacePanel.members.actions.revokeInvite'
+      })
+      await userEvent.click(revokeBtn)
+      expect(mockHandleRevokeInvite).toHaveBeenCalled()
+    })
+
+    it('triggers handleCopyInviteLink on copy click', async () => {
+      mockActiveView.value = 'pending'
+      mockFilteredPendingInvites.value = [createInvite({ id: 'inv-42' })]
+      renderComponent()
+      const copyBtn = screen.getByRole('button', {
+        name: 'workspacePanel.members.actions.copyLink'
+      })
+      await userEvent.click(copyBtn)
+      expect(mockHandleCopyInviteLink).toHaveBeenCalled()
+    })
+  })
+
+  describe('single seat plan', () => {
+    beforeEach(() => {
+      mockIsSingleSeatPlan.value = true
+    })
+
+    it('shows upsell banner', () => {
+      renderComponent()
+      expect(
+        screen.getByText('workspacePanel.members.upsellBannerUpgrade')
+      ).toBeTruthy()
+    })
+
+    it('opens subscription dialog on view plans click', async () => {
+      renderComponent()
+      const viewPlansBtn = screen.getByRole('button', {
+        name: /workspacePanel\.members\.viewPlans/
+      })
+      await userEvent.click(viewPlansBtn)
+      expect(mockShowSubscriptionDialog).toHaveBeenCalled()
+    })
+
+    it('hides search input', () => {
+      renderComponent()
+      expect(screen.queryByRole('textbox')).toBeNull()
+    })
+  })
+
+  describe('member count display', () => {
+    it('shows member count header for team workspace', () => {
+      mockFilteredMembers.value = [
+        createMember({ id: '1' }),
+        createMember({ id: '2' })
+      ]
+      mockMembers.value = mockFilteredMembers.value
+      renderComponent()
+      expect(
+        screen.getByText(/workspacePanel\.members\.membersCount/)
+      ).toBeTruthy()
+    })
+  })
+})
diff --git a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue
index c47c638b09..b62993c9cb 100644
--- a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue
+++ b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue
@@ -198,190 +198,47 @@
 </template>
 
 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
 import Menu from 'primevue/menu'
-import { useToast } from 'primevue/usetoast'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
+import { ref } from 'vue'
 
 import SearchInput from '@/components/ui/search-input/SearchInput.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useBillingContext } from '@/composables/billing/useBillingContext'
-import { TIER_TO_KEY } from '@/platform/cloud/subscription/constants/tierPricing'
 import MemberListItem from '@/platform/workspace/components/dialogs/settings/MemberListItem.vue'
 import MemberUpsellBanner from '@/platform/workspace/components/dialogs/settings/MemberUpsellBanner.vue'
 import PendingInvitesList from '@/platform/workspace/components/dialogs/settings/PendingInvitesList.vue'
-import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
-import type {
-  PendingInvite,
-  WorkspaceMember
-} from '@/platform/workspace/stores/teamWorkspaceStore'
-import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
-import { useDialogService } from '@/services/dialogService'
+import { useMembersPanel } from '@/platform/workspace/composables/useMembersPanel'
+import type { WorkspaceMember } from '@/platform/workspace/stores/teamWorkspaceStore'
 import { cn } from '@comfyorg/tailwind-utils'
 
-const { t } = useI18n()
-const toast = useToast()
-const { userPhotoUrl, userEmail, userDisplayName } = useCurrentUser()
-const {
-  showRemoveMemberDialog,
-  showRevokeInviteDialog,
-  showCreateWorkspaceDialog
-} = useDialogService()
-const workspaceStore = useTeamWorkspaceStore()
 const {
+  searchQuery,
+  activeView,
+  maxSeats,
+  isSingleSeatPlan,
+  personalWorkspaceMember,
+  filteredMembers,
+  filteredPendingInvites,
+  memberMenuItems,
+  isPersonalWorkspace,
   members,
   pendingInvites,
-  isInPersonalWorkspace: isPersonalWorkspace
-} = storeToRefs(workspaceStore)
-const { copyInviteLink } = workspaceStore
-const { permissions, uiConfig } = useWorkspaceUI()
-const {
+  permissions,
+  uiConfig,
   isActiveSubscription,
-  subscription,
+  userPhotoUrl,
+  isCurrentUser,
+  selectMember,
+  toggleSort,
   showSubscriptionDialog,
-  getMaxSeats
-} = useBillingContext()
-
-const maxSeats = computed(() => {
-  if (isPersonalWorkspace.value) return 1
-  const tier = subscription.value?.tier
-  if (!tier) return 1
-  const tierKey = TIER_TO_KEY[tier]
-  if (!tierKey) return 1
-  return getMaxSeats(tierKey)
-})
-
-const isSingleSeatPlan = computed(() => {
-  if (isPersonalWorkspace.value) return false
-  if (!isActiveSubscription.value) return true
-  return maxSeats.value <= 1
-})
-
-const personalWorkspaceMember = computed<WorkspaceMember>(() => ({
-  id: 'self',
-  name: userDisplayName.value ?? '',
-  email: userEmail.value ?? '',
-  role: 'owner' as const,
-  joinDate: new Date(0)
-}))
-
-const searchQuery = ref('')
-const activeView = ref<'active' | 'pending'>('active')
-const sortField = ref<'inviteDate' | 'expiryDate' | 'joinDate'>('inviteDate')
-const sortDirection = ref<'asc' | 'desc'>('desc')
+  handleCopyInviteLink,
+  handleRevokeInvite,
+  handleCreateWorkspace
+} = useMembersPanel()
 
 const memberMenu = ref<InstanceType<typeof Menu> | null>(null)
-const selectedMember = ref<WorkspaceMember | null>(null)
-
-const memberMenuItems = computed(() => [
-  {
-    label: t('workspacePanel.members.actions.removeMember'),
-    icon: 'pi pi-user-minus',
-    command: () => {
-      if (selectedMember.value) {
-        handleRemoveMember(selectedMember.value)
-      }
-    }
-  }
-])
 
 function showMemberMenu(event: Event, member: WorkspaceMember) {
-  selectedMember.value = member
+  selectMember(member)
   memberMenu.value?.toggle(event)
 }
-
-function isCurrentUser(member: WorkspaceMember): boolean {
-  return member.email.toLowerCase() === userEmail.value?.toLowerCase()
-}
-
-const filteredMembers = computed(() => {
-  let result = [...members.value]
-
-  if (searchQuery.value) {
-    const query = searchQuery.value.toLowerCase()
-    result = result.filter(
-      (member) =>
-        member.name.toLowerCase().includes(query) ||
-        member.email.toLowerCase().includes(query)
-    )
-  }
-
-  result.sort((a, b) => {
-    if (a.role === 'owner' && b.role !== 'owner') return -1
-    if (a.role !== 'owner' && b.role === 'owner') return 1
-
-    const aIsCurrentUser = isCurrentUser(a)
-    const bIsCurrentUser = isCurrentUser(b)
-    if (aIsCurrentUser && !bIsCurrentUser) return -1
-    if (!aIsCurrentUser && bIsCurrentUser) return 1
-
-    const aValue = a.joinDate.getTime()
-    const bValue = b.joinDate.getTime()
-    return sortDirection.value === 'asc' ? aValue - bValue : bValue - aValue
-  })
-
-  return result
-})
-
-const filteredPendingInvites = computed(() => {
-  let result = [...pendingInvites.value]
-
-  if (searchQuery.value) {
-    const query = searchQuery.value.toLowerCase()
-    result = result.filter((invite) =>
-      invite.email.toLowerCase().includes(query)
-    )
-  }
-
-  const field = sortField.value === 'joinDate' ? 'inviteDate' : sortField.value
-  result.sort((a, b) => {
-    const aDate = a[field]
-    const bDate = b[field]
-    if (!aDate || !bDate) return 0
-    const aValue = aDate.getTime()
-    const bValue = bDate.getTime()
-    return sortDirection.value === 'asc' ? aValue - bValue : bValue - aValue
-  })
-
-  return result
-})
-
-function toggleSort(field: 'inviteDate' | 'expiryDate' | 'joinDate') {
-  if (sortField.value === field) {
-    sortDirection.value = sortDirection.value === 'asc' ? 'desc' : 'asc'
-  } else {
-    sortField.value = field
-    sortDirection.value = 'desc'
-  }
-}
-
-async function handleCopyInviteLink(invite: PendingInvite) {
-  try {
-    await copyInviteLink(invite.id)
-    toast.add({
-      severity: 'success',
-      summary: t('g.copied'),
-      life: 2000
-    })
-  } catch {
-    toast.add({
-      severity: 'error',
-      summary: t('g.error')
-    })
-  }
-}
-
-function handleRevokeInvite(invite: PendingInvite) {
-  showRevokeInviteDialog(invite.id)
-}
-
-function handleCreateWorkspace() {
-  showCreateWorkspaceDialog()
-}
-
-function handleRemoveMember(member: WorkspaceMember) {
-  showRemoveMemberDialog(member.id)
-}
 </script>
diff --git a/src/platform/workspace/composables/useMembersPanel.test.ts b/src/platform/workspace/composables/useMembersPanel.test.ts
new file mode 100644
index 0000000000..7e9c71b29d
--- /dev/null
+++ b/src/platform/workspace/composables/useMembersPanel.test.ts
@@ -0,0 +1,501 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import type {
+  PendingInvite,
+  WorkspaceMember
+} from '@/platform/workspace/stores/teamWorkspaceStore'
+
+import {
+  filterBySearch,
+  sortMembers,
+  sortPendingInvites
+} from './useMembersPanel'
+
+function createMember(
+  overrides: Partial<WorkspaceMember> = {}
+): WorkspaceMember {
+  return {
+    id: 'member-1',
+    name: 'Member One',
+    email: 'member1@example.com',
+    joinDate: new Date('2025-01-15'),
+    role: 'member',
+    ...overrides
+  }
+}
+
+function createInvite(overrides: Partial<PendingInvite> = {}): PendingInvite {
+  return {
+    id: 'invite-1',
+    email: 'invitee@example.com',
+    token: 'token-abc',
+    inviteDate: new Date('2025-03-01'),
+    expiryDate: new Date('2025-04-01'),
+    ...overrides
+  }
+}
+
+describe('sortMembers', () => {
+  it('places owners before members', () => {
+    const owner = createMember({ id: 'o', role: 'owner', name: 'Owner' })
+    const member = createMember({ id: 'm', role: 'member', name: 'Member' })
+    const result = sortMembers([member, owner], null, 'desc')
+    expect(result[0].id).toBe('o')
+    expect(result[1].id).toBe('m')
+  })
+
+  it('places current user after owners but before others', () => {
+    const owner = createMember({
+      id: 'o',
+      role: 'owner',
+      email: 'boss@test.com',
+      joinDate: new Date('2025-03-01')
+    })
+    const current = createMember({
+      id: 'me',
+      role: 'member',
+      email: 'me@test.com',
+      joinDate: new Date('2025-02-01')
+    })
+    const other = createMember({
+      id: 'other',
+      role: 'member',
+      email: 'other@test.com',
+      joinDate: new Date('2025-01-01')
+    })
+
+    const result = sortMembers([other, current, owner], 'me@test.com', 'desc')
+    expect(result.map((m) => m.id)).toEqual(['o', 'me', 'other'])
+  })
+
+  it('sorts remaining members by joinDate descending', () => {
+    const early = createMember({
+      id: 'early',
+      joinDate: new Date('2025-01-01')
+    })
+    const late = createMember({
+      id: 'late',
+      joinDate: new Date('2025-06-01')
+    })
+    const result = sortMembers([early, late], null, 'desc')
+    expect(result[0].id).toBe('late')
+    expect(result[1].id).toBe('early')
+  })
+
+  it('sorts remaining members by joinDate ascending', () => {
+    const early = createMember({
+      id: 'early',
+      joinDate: new Date('2025-01-01')
+    })
+    const late = createMember({
+      id: 'late',
+      joinDate: new Date('2025-06-01')
+    })
+    const result = sortMembers([early, late], null, 'asc')
+    expect(result[0].id).toBe('early')
+    expect(result[1].id).toBe('late')
+  })
+
+  it('does not mutate the input array', () => {
+    const members = [
+      createMember({ id: 'b', joinDate: new Date('2025-06-01') }),
+      createMember({ id: 'a', joinDate: new Date('2025-01-01') })
+    ]
+    const original = [...members]
+    sortMembers(members, null, 'desc')
+    expect(members).toEqual(original)
+  })
+})
+
+describe('filterBySearch', () => {
+  const alice = createMember({
+    id: '1',
+    name: 'Alice',
+    email: 'alice@example.com'
+  })
+  const bob = createMember({
+    id: '2',
+    name: 'Bob',
+    email: 'bob@example.com'
+  })
+
+  it('returns all items when query is empty', () => {
+    expect(filterBySearch([alice, bob], '')).toEqual([alice, bob])
+  })
+
+  it('filters by name (case-insensitive)', () => {
+    const result = filterBySearch([alice, bob], 'alice')
+    expect(result).toEqual([alice])
+  })
+
+  it('filters by email', () => {
+    const result = filterBySearch([alice, bob], 'bob@')
+    expect(result).toEqual([bob])
+  })
+
+  it('filters pending invites by email only', () => {
+    const inv1 = createInvite({ id: 'i1', email: 'alice@test.com' })
+    const inv2 = createInvite({ id: 'i2', email: 'bob@test.com' })
+    const result = filterBySearch([inv1, inv2], 'alice')
+    expect(result).toEqual([inv1])
+  })
+})
+
+describe('sortPendingInvites', () => {
+  it('sorts by inviteDate descending by default', () => {
+    const early = createInvite({
+      id: 'e',
+      inviteDate: new Date('2025-01-01')
+    })
+    const late = createInvite({
+      id: 'l',
+      inviteDate: new Date('2025-06-01')
+    })
+    const result = sortPendingInvites([early, late], 'inviteDate', 'desc')
+    expect(result[0].id).toBe('l')
+    expect(result[1].id).toBe('e')
+  })
+
+  it('sorts by expiryDate ascending', () => {
+    const early = createInvite({
+      id: 'e',
+      expiryDate: new Date('2025-01-01')
+    })
+    const late = createInvite({
+      id: 'l',
+      expiryDate: new Date('2025-06-01')
+    })
+    const result = sortPendingInvites([early, late], 'expiryDate', 'asc')
+    expect(result[0].id).toBe('e')
+    expect(result[1].id).toBe('l')
+  })
+
+  it('falls back to inviteDate when sortField is joinDate', () => {
+    const early = createInvite({
+      id: 'e',
+      inviteDate: new Date('2025-01-01')
+    })
+    const late = createInvite({
+      id: 'l',
+      inviteDate: new Date('2025-06-01')
+    })
+    const result = sortPendingInvites([early, late], 'joinDate', 'desc')
+    expect(result[0].id).toBe('l')
+  })
+
+  it('does not mutate the input array', () => {
+    const invites = [
+      createInvite({
+        id: 'b',
+        inviteDate: new Date('2025-06-01')
+      }),
+      createInvite({
+        id: 'a',
+        inviteDate: new Date('2025-01-01')
+      })
+    ]
+    const original = [...invites]
+    sortPendingInvites(invites, 'inviteDate', 'desc')
+    expect(invites).toEqual(original)
+  })
+})
+
+const mockToastAdd = vi.fn()
+const mockCopyInviteLink = vi.fn()
+const mockShowRemoveMemberDialog = vi.fn()
+const mockShowRevokeInviteDialog = vi.fn()
+const mockShowCreateWorkspaceDialog = vi.fn()
+const mockShowSubscriptionDialog = vi.fn()
+
+const {
+  mockMembers,
+  mockPendingInvites,
+  mockIsInPersonalWorkspace,
+  mockPermissions,
+  mockUiConfig,
+  mockIsActiveSubscription,
+  mockSubscription
+} = vi.hoisted(() => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/consistent-type-imports
+  const { ref } = require('vue') as typeof import('vue')
+
+  return {
+    mockMembers: ref<WorkspaceMember[]>([]),
+    mockPendingInvites: ref<PendingInvite[]>([]),
+    mockIsInPersonalWorkspace: ref(false),
+    mockPermissions: ref({
+      canViewOtherMembers: true,
+      canViewPendingInvites: true,
+      canInviteMembers: true,
+      canManageInvites: true,
+      canRemoveMembers: true,
+      canLeaveWorkspace: true,
+      canAccessWorkspaceMenu: true,
+      canManageSubscription: true,
+      canTopUp: true
+    }),
+    mockUiConfig: ref({
+      showMembersList: true,
+      showPendingTab: true,
+      showSearch: true,
+      showDateColumn: true,
+      showRoleBadge: true,
+      membersGridCols: 'grid-cols-[50%_40%_10%]',
+      pendingGridCols: 'grid-cols-[50%_20%_20%_10%]',
+      headerGridCols: 'grid-cols-[50%_40%_10%]',
+      showEditWorkspaceMenuItem: true,
+      workspaceMenuAction: 'delete' as 'leave' | 'delete' | null,
+      workspaceMenuDisabledTooltip: null as string | null
+    }),
+    mockIsActiveSubscription: ref(true),
+    mockSubscription: ref<{ tier: string } | null>({ tier: 'PRO' })
+  }
+})
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({ add: mockToastAdd })
+}))
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: (key: string) => key })
+}))
+
+vi.mock('pinia', async (importOriginal) => {
+  const actual = await importOriginal()
+  return {
+    ...(actual as object),
+    storeToRefs: (store: Record<string, unknown>) => store
+  }
+})
+
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: () => ({
+    members: mockMembers,
+    pendingInvites: mockPendingInvites,
+    isInPersonalWorkspace: mockIsInPersonalWorkspace,
+    copyInviteLink: mockCopyInviteLink
+  })
+}))
+
+vi.mock('@/platform/workspace/composables/useWorkspaceUI', () => ({
+  useWorkspaceUI: () => ({
+    permissions: mockPermissions,
+    uiConfig: mockUiConfig
+  })
+}))
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({
+    userPhotoUrl: ref(null),
+    userEmail: ref('owner@example.com'),
+    userDisplayName: ref('Owner User')
+  })
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    isActiveSubscription: mockIsActiveSubscription,
+    subscription: mockSubscription,
+    showSubscriptionDialog: mockShowSubscriptionDialog,
+    getMaxSeats: (tierKey: string) => {
+      const seats: Record<string, number> = {
+        free: 1,
+        standard: 1,
+        creator: 5,
+        pro: 20
+      }
+      return seats[tierKey] ?? 1
+    }
+  })
+}))
+
+vi.mock('@/platform/cloud/subscription/constants/tierPricing', () => ({
+  TIER_TO_KEY: {
+    FREE: 'free',
+    STANDARD: 'standard',
+    CREATOR: 'creator',
+    PRO: 'pro',
+    FOUNDERS_EDITION: 'founder'
+  }
+}))
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({
+    showRemoveMemberDialog: mockShowRemoveMemberDialog,
+    showRevokeInviteDialog: mockShowRevokeInviteDialog,
+    showCreateWorkspaceDialog: mockShowCreateWorkspaceDialog
+  })
+}))
+
+describe('useMembersPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockMembers.value = []
+    mockPendingInvites.value = []
+    mockIsInPersonalWorkspace.value = false
+    mockIsActiveSubscription.value = true
+    mockSubscription.value = { tier: 'PRO' }
+  })
+
+  // Lazy import so mocks are in place
+  async function setup() {
+    const { useMembersPanel } = await import('./useMembersPanel')
+    return useMembersPanel()
+  }
+
+  describe('isSingleSeatPlan', () => {
+    it('is false for personal workspace', async () => {
+      mockIsInPersonalWorkspace.value = true
+      const panel = await setup()
+      expect(panel.isSingleSeatPlan.value).toBe(false)
+    })
+
+    it('is true when no active subscription', async () => {
+      mockIsActiveSubscription.value = false
+      const panel = await setup()
+      expect(panel.isSingleSeatPlan.value).toBe(true)
+    })
+
+    it('is true for standard tier (1 seat)', async () => {
+      mockSubscription.value = { tier: 'STANDARD' }
+      const panel = await setup()
+      expect(panel.isSingleSeatPlan.value).toBe(true)
+    })
+
+    it('is false for pro tier (20 seats)', async () => {
+      mockSubscription.value = { tier: 'PRO' }
+      const panel = await setup()
+      expect(panel.isSingleSeatPlan.value).toBe(false)
+    })
+  })
+
+  describe('maxSeats', () => {
+    it('returns 1 for personal workspace', async () => {
+      mockIsInPersonalWorkspace.value = true
+      const panel = await setup()
+      expect(panel.maxSeats.value).toBe(1)
+    })
+
+    it('returns tier-appropriate seats', async () => {
+      mockSubscription.value = { tier: 'CREATOR' }
+      const panel = await setup()
+      expect(panel.maxSeats.value).toBe(5)
+    })
+
+    it('returns 1 when no subscription', async () => {
+      mockSubscription.value = null
+      const panel = await setup()
+      expect(panel.maxSeats.value).toBe(1)
+    })
+  })
+
+  describe('personalWorkspaceMember', () => {
+    it('uses current user info', async () => {
+      const panel = await setup()
+      expect(panel.personalWorkspaceMember.value).toMatchObject({
+        id: 'self',
+        name: 'Owner User',
+        email: 'owner@example.com',
+        role: 'owner'
+      })
+    })
+  })
+
+  describe('isCurrentUser', () => {
+    it('matches by email (case-insensitive)', async () => {
+      const panel = await setup()
+      const member = createMember({ email: 'OWNER@EXAMPLE.COM' })
+      expect(panel.isCurrentUser(member)).toBe(true)
+    })
+
+    it('returns false for other users', async () => {
+      const panel = await setup()
+      const member = createMember({ email: 'other@example.com' })
+      expect(panel.isCurrentUser(member)).toBe(false)
+    })
+  })
+
+  describe('filteredMembers', () => {
+    it('filters and sorts members based on searchQuery', async () => {
+      const alice = createMember({
+        id: '1',
+        name: 'Alice',
+        email: 'alice@example.com'
+      })
+      const bob = createMember({
+        id: '2',
+        name: 'Bob',
+        email: 'bob@example.com'
+      })
+      mockMembers.value = [alice, bob]
+      const panel = await setup()
+
+      panel.searchQuery.value = 'alice'
+      expect(panel.filteredMembers.value).toHaveLength(1)
+      expect(panel.filteredMembers.value[0].name).toBe('Alice')
+    })
+  })
+
+  describe('toggleSort', () => {
+    it('changes sortField and resets to desc', async () => {
+      const panel = await setup()
+      panel.toggleSort('expiryDate')
+      expect(panel.sortField.value).toBe('expiryDate')
+      expect(panel.sortDirection.value).toBe('desc')
+    })
+
+    it('toggles direction when same field', async () => {
+      const panel = await setup()
+      panel.toggleSort('inviteDate')
+      expect(panel.sortDirection.value).toBe('asc')
+      panel.toggleSort('inviteDate')
+      expect(panel.sortDirection.value).toBe('desc')
+    })
+  })
+
+  describe('handleCopyInviteLink', () => {
+    it('shows success toast on success', async () => {
+      mockCopyInviteLink.mockResolvedValue(undefined)
+      const panel = await setup()
+      await panel.handleCopyInviteLink(createInvite({ id: 'inv-1' }))
+      expect(mockCopyInviteLink).toHaveBeenCalledWith('inv-1')
+      expect(mockToastAdd).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'success' })
+      )
+    })
+
+    it('shows error toast on failure', async () => {
+      mockCopyInviteLink.mockRejectedValue(new Error('fail'))
+      const panel = await setup()
+      await panel.handleCopyInviteLink(createInvite({ id: 'inv-1' }))
+      expect(mockToastAdd).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'error' })
+      )
+    })
+  })
+
+  describe('handleRevokeInvite', () => {
+    it('calls showRevokeInviteDialog', async () => {
+      const panel = await setup()
+      panel.handleRevokeInvite(createInvite({ id: 'inv-42' }))
+      expect(mockShowRevokeInviteDialog).toHaveBeenCalledWith('inv-42')
+    })
+  })
+
+  describe('handleCreateWorkspace', () => {
+    it('calls showCreateWorkspaceDialog', async () => {
+      const panel = await setup()
+      panel.handleCreateWorkspace()
+      expect(mockShowCreateWorkspaceDialog).toHaveBeenCalled()
+    })
+  })
+
+  describe('handleRemoveMember', () => {
+    it('calls showRemoveMemberDialog', async () => {
+      const panel = await setup()
+      panel.handleRemoveMember(createMember({ id: 'mem-7' }))
+      expect(mockShowRemoveMemberDialog).toHaveBeenCalledWith('mem-7')
+    })
+  })
+})
diff --git a/src/platform/workspace/composables/useMembersPanel.ts b/src/platform/workspace/composables/useMembersPanel.ts
new file mode 100644
index 0000000000..502c0d699b
--- /dev/null
+++ b/src/platform/workspace/composables/useMembersPanel.ts
@@ -0,0 +1,219 @@
+import { storeToRefs } from 'pinia'
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { TIER_TO_KEY } from '@/platform/cloud/subscription/constants/tierPricing'
+import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
+import type {
+  PendingInvite,
+  WorkspaceMember
+} from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogService } from '@/services/dialogService'
+
+type ActiveView = 'active' | 'pending'
+type SortField = 'inviteDate' | 'expiryDate' | 'joinDate'
+type SortDirection = 'asc' | 'desc'
+
+export function sortMembers(
+  members: WorkspaceMember[],
+  currentUserEmail: string | null,
+  sortDirection: SortDirection
+): WorkspaceMember[] {
+  return [...members].sort((a, b) => {
+    if (a.role === 'owner' && b.role !== 'owner') return -1
+    if (a.role !== 'owner' && b.role === 'owner') return 1
+
+    const aIsCurrent = a.email.toLowerCase() === currentUserEmail?.toLowerCase()
+    const bIsCurrent = b.email.toLowerCase() === currentUserEmail?.toLowerCase()
+    if (aIsCurrent && !bIsCurrent) return -1
+    if (!aIsCurrent && bIsCurrent) return 1
+
+    const aValue = a.joinDate.getTime()
+    const bValue = b.joinDate.getTime()
+    return sortDirection === 'asc' ? aValue - bValue : bValue - aValue
+  })
+}
+
+export function filterBySearch<T extends { email: string; name?: string }>(
+  items: T[],
+  query: string
+): T[] {
+  if (!query) return items
+  const q = query.toLowerCase()
+  return items.filter(
+    (item) =>
+      item.email.toLowerCase().includes(q) ||
+      ('name' in item && item.name?.toLowerCase().includes(q))
+  )
+}
+
+export function sortPendingInvites(
+  invites: PendingInvite[],
+  sortField: SortField,
+  sortDirection: SortDirection
+): PendingInvite[] {
+  const field = sortField === 'joinDate' ? 'inviteDate' : sortField
+  return [...invites].sort((a, b) => {
+    const aDate = a[field]
+    const bDate = b[field]
+    if (!aDate || !bDate) return 0
+    const aValue = aDate.getTime()
+    const bValue = bDate.getTime()
+    return sortDirection === 'asc' ? aValue - bValue : bValue - aValue
+  })
+}
+
+export function useMembersPanel() {
+  const { t } = useI18n()
+  const toast = useToast()
+  const { userPhotoUrl, userEmail, userDisplayName } = useCurrentUser()
+  const {
+    showRemoveMemberDialog,
+    showRevokeInviteDialog,
+    showCreateWorkspaceDialog
+  } = useDialogService()
+  const workspaceStore = useTeamWorkspaceStore()
+  const {
+    members,
+    pendingInvites,
+    isInPersonalWorkspace: isPersonalWorkspace
+  } = storeToRefs(workspaceStore)
+  const { copyInviteLink } = workspaceStore
+  const { permissions, uiConfig } = useWorkspaceUI()
+  const {
+    isActiveSubscription,
+    subscription,
+    showSubscriptionDialog,
+    getMaxSeats
+  } = useBillingContext()
+
+  const maxSeats = computed(() => {
+    if (isPersonalWorkspace.value) return 1
+    const tier = subscription.value?.tier
+    if (!tier) return 1
+    const tierKey = TIER_TO_KEY[tier]
+    if (!tierKey) return 1
+    return getMaxSeats(tierKey)
+  })
+
+  const isSingleSeatPlan = computed(() => {
+    if (isPersonalWorkspace.value) return false
+    if (!isActiveSubscription.value) return true
+    return maxSeats.value <= 1
+  })
+
+  const personalWorkspaceMember = computed<WorkspaceMember>(() => ({
+    id: 'self',
+    name: userDisplayName.value ?? '',
+    email: userEmail.value ?? '',
+    role: 'owner' as const,
+    joinDate: new Date(0)
+  }))
+
+  const searchQuery = ref('')
+  const activeView = ref<ActiveView>('active')
+  const sortField = ref<SortField>('inviteDate')
+  const sortDirection = ref<SortDirection>('desc')
+
+  const selectedMember = ref<WorkspaceMember | null>(null)
+
+  const memberMenuItems = computed(() => [
+    {
+      label: t('workspacePanel.members.actions.removeMember'),
+      icon: 'pi pi-user-minus',
+      command: () => {
+        if (selectedMember.value) {
+          handleRemoveMember(selectedMember.value)
+        }
+      }
+    }
+  ])
+
+  function selectMember(member: WorkspaceMember) {
+    selectedMember.value = member
+  }
+
+  function isCurrentUser(member: WorkspaceMember): boolean {
+    return member.email.toLowerCase() === userEmail.value?.toLowerCase()
+  }
+
+  const filteredMembers = computed(() => {
+    const searched = filterBySearch(members.value, searchQuery.value)
+    return sortMembers(searched, userEmail.value ?? null, sortDirection.value)
+  })
+
+  const filteredPendingInvites = computed(() => {
+    const searched = filterBySearch(pendingInvites.value, searchQuery.value)
+    return sortPendingInvites(searched, sortField.value, sortDirection.value)
+  })
+
+  function toggleSort(field: SortField) {
+    if (sortField.value === field) {
+      sortDirection.value = sortDirection.value === 'asc' ? 'desc' : 'asc'
+    } else {
+      sortField.value = field
+      sortDirection.value = 'desc'
+    }
+  }
+
+  async function handleCopyInviteLink(invite: PendingInvite) {
+    try {
+      await copyInviteLink(invite.id)
+      toast.add({
+        severity: 'success',
+        summary: t('g.copied'),
+        life: 2000
+      })
+    } catch {
+      toast.add({
+        severity: 'error',
+        summary: t('g.error')
+      })
+    }
+  }
+
+  function handleRevokeInvite(invite: PendingInvite) {
+    void showRevokeInviteDialog(invite.id)
+  }
+
+  function handleCreateWorkspace() {
+    void showCreateWorkspaceDialog()
+  }
+
+  function handleRemoveMember(member: WorkspaceMember) {
+    void showRemoveMemberDialog(member.id)
+  }
+
+  return {
+    searchQuery,
+    activeView,
+    sortField,
+    sortDirection,
+    selectedMember,
+    maxSeats,
+    isSingleSeatPlan,
+    personalWorkspaceMember,
+    filteredMembers,
+    filteredPendingInvites,
+    memberMenuItems,
+    isPersonalWorkspace,
+    members,
+    pendingInvites,
+    permissions,
+    uiConfig,
+    isActiveSubscription,
+    userPhotoUrl,
+    isCurrentUser,
+    selectMember,
+    toggleSort,
+    showSubscriptionDialog,
+    handleCopyInviteLink,
+    handleRevokeInvite,
+    handleCreateWorkspace,
+    handleRemoveMember
+  }
+}
diff --git a/src/platform/workspace/composables/useWorkspaceBilling.test.ts b/src/platform/workspace/composables/useWorkspaceBilling.test.ts
index 41d7785208..4253ece0c5 100644
--- a/src/platform/workspace/composables/useWorkspaceBilling.test.ts
+++ b/src/platform/workspace/composables/useWorkspaceBilling.test.ts
@@ -369,25 +369,22 @@ describe('useWorkspaceBilling', () => {
       )
     })
 
-    it.each([
+    it.for([
       ['empty string', ''],
       ['null', null]
-    ])(
-      'does not open a window when API returns %s url',
-      async (_label, url) => {
-        const openSpy = vi.fn()
-        vi.stubGlobal('open', openSpy)
+    ])('does not open a window when API returns %s url', async ([, url]) => {
+      const openSpy = vi.fn()
+      vi.stubGlobal('open', openSpy)
 
-        mockWorkspaceApi.getPaymentPortalUrl.mockResolvedValue({
-          url: url as string
-        })
+      mockWorkspaceApi.getPaymentPortalUrl.mockResolvedValue({
+        url: url as string
+      })
 
-        const billing = setupBilling()
-        await billing.manageSubscription()
+      const billing = setupBilling()
+      await billing.manageSubscription()
 
-        expect(openSpy).not.toHaveBeenCalled()
-      }
-    )
+      expect(openSpy).not.toHaveBeenCalled()
+    })
 
     it('records error when API call fails', async () => {
       mockWorkspaceApi.getPaymentPortalUrl.mockRejectedValue(
diff --git a/src/renderer/core/canvas/pathRenderer.test.ts b/src/renderer/core/canvas/pathRenderer.test.ts
index 031c472e7a..5d14b09e51 100644
--- a/src/renderer/core/canvas/pathRenderer.test.ts
+++ b/src/renderer/core/canvas/pathRenderer.test.ts
@@ -940,7 +940,7 @@ describe('CanvasPathRenderer', () => {
   })
 
   describe('direction offsets', () => {
-    it.each([
+    it.for([
       { dir: 'left', expectedInnerA: [-15, 0] },
       { dir: 'right', expectedInnerA: [15, 0] },
       { dir: 'up', expectedInnerA: [0, -15] },
diff --git a/src/renderer/core/layout/store/layoutStore.test.ts b/src/renderer/core/layout/store/layoutStore.test.ts
index 648acc069a..633b573e38 100644
--- a/src/renderer/core/layout/store/layoutStore.test.ts
+++ b/src/renderer/core/layout/store/layoutStore.test.ts
@@ -6,10 +6,25 @@ import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { LayoutSource } from '@/renderer/core/layout/types'
 import type {
   LayoutChange,
+  LayoutOperation,
   NodeLayout,
   SlotLayout
 } from '@/renderer/core/layout/types'
 
+function getOperationsAddedBy(action: () => void): LayoutOperation[] {
+  const operationCount = layoutStore.getOperationsSince(0).length
+  action()
+  return layoutStore.getOperationsSince(0).slice(operationCount)
+}
+
+function expectSingleOperation(
+  operations: LayoutOperation[],
+  expectedOperation: Record<string, unknown>
+): void {
+  expect(operations).toHaveLength(1)
+  expect(operations[0]).toEqual(expect.objectContaining(expectedOperation))
+}
+
 describe('layoutStore CRDT operations', () => {
   beforeEach(() => {
     // Clear the store before each test
@@ -576,9 +591,15 @@ describe('layoutStore CRDT operations', () => {
       actor: 'test'
     })
 
-    const originalTitleHeight = LiteGraph.NODE_TITLE_HEIGHT
-    // @ts-expect-error – intentionally simulate undefined runtime value
-    LiteGraph.NODE_TITLE_HEIGHT = undefined
+    const originalTitleHeightDescriptor = Object.getOwnPropertyDescriptor(
+      LiteGraph,
+      'NODE_TITLE_HEIGHT'
+    )
+    Object.defineProperty(LiteGraph, 'NODE_TITLE_HEIGHT', {
+      configurable: true,
+      value: undefined,
+      writable: true
+    })
 
     try {
       layoutStore.setSource(LayoutSource.DOM)
@@ -597,7 +618,13 @@ describe('layoutStore CRDT operations', () => {
       const nodeRef = layoutStore.getNodeLayoutRef(nodeId)
       expect(nodeRef.value?.size.height).toBe(layout.size.height)
     } finally {
-      LiteGraph.NODE_TITLE_HEIGHT = originalTitleHeight
+      if (originalTitleHeightDescriptor) {
+        Object.defineProperty(
+          LiteGraph,
+          'NODE_TITLE_HEIGHT',
+          originalTitleHeightDescriptor
+        )
+      }
     }
   })
 
@@ -646,3 +673,228 @@ describe('layoutStore CRDT operations', () => {
     }
   )
 })
+
+describe('layoutStore getNodeLayoutRef setter', () => {
+  beforeEach(() => {
+    layoutStore.initializeFromLiteGraph([])
+  })
+
+  function baseLayout(): NodeLayout {
+    return {
+      id: 'ref-node',
+      position: { x: 10, y: 20 },
+      size: { width: 100, height: 50 },
+      zIndex: 0,
+      visible: true,
+      bounds: { x: 10, y: 20, width: 100, height: 50 }
+    }
+  }
+
+  it('creates a node when setter receives a layout for an unknown id', () => {
+    const ref = layoutStore.getNodeLayoutRef('ref-node')
+    const layout = baseLayout()
+    expect(ref.value).toBeNull()
+
+    const operations = getOperationsAddedBy(() => {
+      ref.value = layout
+    })
+
+    expectSingleOperation(operations, {
+      type: 'createNode',
+      nodeId: 'ref-node',
+      layout
+    })
+    expect(ref.value).toEqual(layout)
+  })
+
+  it.for<{
+    name: string
+    nextLayout: NodeLayout
+    expectedOperation: Record<string, unknown>
+  }>([
+    {
+      name: 'moveNode',
+      nextLayout: {
+        ...baseLayout(),
+        position: { x: 99, y: 88 },
+        bounds: { x: 99, y: 88, width: 100, height: 50 }
+      },
+      expectedOperation: {
+        type: 'moveNode',
+        nodeId: 'ref-node',
+        position: { x: 99, y: 88 },
+        previousPosition: baseLayout().position
+      }
+    },
+    {
+      name: 'resizeNode',
+      nextLayout: {
+        ...baseLayout(),
+        size: { width: 200, height: 80 },
+        bounds: { x: 10, y: 20, width: 200, height: 80 }
+      },
+      expectedOperation: {
+        type: 'resizeNode',
+        nodeId: 'ref-node',
+        size: { width: 200, height: 80 },
+        previousSize: baseLayout().size
+      }
+    },
+    {
+      name: 'setNodeZIndex',
+      nextLayout: { ...baseLayout(), zIndex: 5 },
+      expectedOperation: {
+        type: 'setNodeZIndex',
+        nodeId: 'ref-node',
+        zIndex: 5,
+        previousZIndex: 0
+      }
+    }
+  ])(
+    'emits a $name operation for layout-only updates',
+    ({ nextLayout, expectedOperation }) => {
+      const ref = layoutStore.getNodeLayoutRef('ref-node')
+      ref.value = baseLayout()
+
+      const operations = getOperationsAddedBy(() => {
+        ref.value = nextLayout
+      })
+
+      expectSingleOperation(operations, expectedOperation)
+      expect(ref.value).toEqual(nextLayout)
+    }
+  )
+
+  it('emits a deleteNode operation when setter receives null', () => {
+    const ref = layoutStore.getNodeLayoutRef('ref-node')
+    const layout = baseLayout()
+    ref.value = layout
+
+    const operations = getOperationsAddedBy(() => {
+      ref.value = null
+    })
+
+    expectSingleOperation(operations, {
+      type: 'deleteNode',
+      nodeId: 'ref-node',
+      previousLayout: layout
+    })
+    expect(ref.value).toBeNull()
+  })
+})
+
+describe('layoutStore queries', () => {
+  beforeEach(() => {
+    layoutStore.initializeFromLiteGraph([])
+  })
+
+  const seedNode = (id: string, x: number, y: number, z = 0) => {
+    const layout: NodeLayout = {
+      id,
+      position: { x, y },
+      size: { width: 100, height: 50 },
+      zIndex: z,
+      visible: true,
+      bounds: { x, y, width: 100, height: 50 }
+    }
+    layoutStore.applyOperation({
+      type: 'createNode',
+      entity: 'node',
+      nodeId: id,
+      layout,
+      timestamp: Date.now(),
+      source: LayoutSource.External,
+      actor: 'test'
+    })
+  }
+
+  it('getNodesInBounds returns reactive node IDs that intersect bounds', () => {
+    seedNode('inside', 0, 0)
+    seedNode('outside', 1000, 1000)
+
+    const inBounds = layoutStore.getNodesInBounds({
+      x: 0,
+      y: 0,
+      width: 200,
+      height: 200
+    })
+
+    expect(inBounds.value).toContain('inside')
+    expect(inBounds.value).not.toContain('outside')
+  })
+
+  it('queryNodeAtPoint returns the top-zIndex node containing the point', () => {
+    seedNode('low', 0, 0, 0)
+    seedNode('high', 0, 0, 10)
+
+    const hit = layoutStore.queryNodeAtPoint({ x: 25, y: 25 })
+
+    expect(hit).toBe('high')
+  })
+
+  it('queryNodeAtPoint returns null when no node contains the point', () => {
+    seedNode('only', 0, 0)
+
+    const hit = layoutStore.queryNodeAtPoint({ x: 999, y: 999 })
+
+    expect(hit).toBeNull()
+  })
+})
+
+describe('layoutStore link layout updates', () => {
+  beforeEach(() => {
+    layoutStore.initializeFromLiteGraph([])
+  })
+
+  const stubPath = () => ({}) as unknown as Path2D
+  const baseLink = (path = stubPath()) => ({
+    id: 1 as const,
+    path,
+    bounds: { x: 0, y: 0, width: 50, height: 50 },
+    centerPos: { x: 25, y: 25 },
+    sourceNodeId: 'a',
+    targetNodeId: 'b',
+    sourceSlot: 0,
+    targetSlot: 0
+  })
+
+  it('updateLinkLayout short-circuits when bounds and centerPos are unchanged', () => {
+    layoutStore.updateLinkLayout(1, baseLink())
+    const newPath = stubPath()
+
+    layoutStore.updateLinkLayout(1, baseLink(newPath))
+
+    expect(layoutStore.getLinkLayout(1)?.path).toBe(newPath)
+  })
+
+  it('updateLinkLayout replaces stored layout when bounds change', () => {
+    layoutStore.updateLinkLayout(1, baseLink())
+    const moved = {
+      ...baseLink(),
+      bounds: { x: 10, y: 10, width: 50, height: 50 }
+    }
+
+    layoutStore.updateLinkLayout(1, moved)
+
+    expect(layoutStore.getLinkLayout(1)?.bounds.x).toBe(10)
+  })
+
+  it('deleteLinkLayout removes the link and its segment layouts', () => {
+    layoutStore.updateLinkLayout(1, baseLink())
+    layoutStore.updateLinkSegmentLayout(1, null, {
+      path: stubPath(),
+      bounds: { x: 0, y: 0, width: 5, height: 5 },
+      centerPos: { x: 1, y: 1 }
+    })
+
+    expect(layoutStore.queryLinkSegmentAtPoint({ x: 1, y: 1 })).toEqual({
+      linkId: 1,
+      rerouteId: null
+    })
+
+    layoutStore.deleteLinkLayout(1)
+
+    expect(layoutStore.getLinkLayout(1)).toBeNull()
+    expect(layoutStore.queryLinkSegmentAtPoint({ x: 1, y: 1 })).toBeNull()
+  })
+})
diff --git a/src/renderer/extensions/linearMode/MobileDisplay.vue b/src/renderer/extensions/linearMode/MobileDisplay.vue
index c497d4d288..2f5fce98ef 100644
--- a/src/renderer/extensions/linearMode/MobileDisplay.vue
+++ b/src/renderer/extensions/linearMode/MobileDisplay.vue
@@ -23,9 +23,9 @@ import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { cn } from '@comfyorg/tailwind-utils'
 
 const tabs = [
-  ['linearMode.mobileControls', 'icon-[lucide--play]'],
-  ['nodeHelpPage.outputs', 'icon-[comfy--image-ai-edit]'],
-  ['sideToolbar.assets', 'icon-[lucide--images]']
+  ['linearMode.mobileControls', 'icon-[lucide--play]', 'control'],
+  ['nodeHelpPage.outputs', 'icon-[comfy--image-ai-edit]', 'preview'],
+  ['sideToolbar.assets', 'icon-[lucide--images]', 'output']
 ]
 
 const canvasStore = useCanvasStore()
@@ -154,20 +154,24 @@ const menuEntries = computed<MenuItem[]>(() => [
 ])
 </script>
 <template>
-  <section class="absolute flex size-full flex-col bg-secondary-background">
+  <section
+    class="absolute flex size-full flex-col bg-secondary-background"
+    data-testid="linear-mobile"
+  >
     <header
       class="flex h-16 w-full items-center gap-3 border-b border-border-subtle bg-base-background px-4 py-3"
     >
       <DropdownMenu :entries="menuEntries" />
       <DropdownMenu
         :entries="workflowsEntries"
-        class="max-h-[40vh] w-(--reka-dropdown-menu-content-available-width)"
+        class="max-h-[40vh] w-(--reka-dropdown-menu-content-available-width) overflow-y-auto"
         :collision-padding="20"
       >
         <template #button>
           <!--TODO: Use button here? Probably too much work to destyle-->
           <div
             class="flex h-10 grow items-center gap-2 rounded-sm bg-secondary-background p-2"
+            data-testid="linear-mobile-workflows"
           >
             <i
               class="icon-[lucide--panels-top-left] shrink-0 bg-primary-background"
@@ -191,11 +195,23 @@ const menuEntries = computed<MenuItem[]>(() => [
         "
         :style="{ translate }"
       >
-        <div class="absolute h-full w-screen overflow-y-auto contain-size">
+        <div
+          id="mobile-app-control-panel"
+          class="absolute h-full w-screen overflow-y-auto contain-size"
+          role="tabpanel"
+          :aria-hidden="activeIndex !== 0"
+          aria-labelledby="mobile-app-control-tab"
+          :inert="activeIndex !== 0"
+        >
           <LinearControls mobile @navigate-outputs="activeIndex = 1" />
         </div>
         <div
+          id="mobile-app-preview-panel"
           class="absolute top-0 left-[100vw] flex h-full w-screen flex-col bg-base-background"
+          role="tabpanel"
+          :aria-hidden="activeIndex !== 1"
+          aria-labelledby="mobile-app-preview-tab"
+          :inert="activeIndex !== 1"
         >
           <MobileError
             v-if="executionErrorStore.isErrorOverlayOpen"
@@ -204,19 +220,29 @@ const menuEntries = computed<MenuItem[]>(() => [
           <LinearPreview v-else mobile @navigate-controls="activeIndex = 0" />
         </div>
         <AssetsSidebarTab
+          id="mobile-app-output-panel"
           class="absolute top-0 left-[200vw] h-full w-screen bg-base-background"
+          role="tabpanel"
+          :aria-hidden="activeIndex !== 2"
+          aria-labelledby="mobile-app-output-tab"
+          :inert="activeIndex !== 2"
         />
       </div>
     </div>
     <div
       ref="sliderPaneRef"
       class="flex h-22 w-full items-center justify-around gap-4 bg-secondary-background p-4"
+      role="tablist"
     >
       <Button
-        v-for="([label, icon], index) in tabs"
+        v-for="([label, icon, id], index) in tabs"
+        :id="`mobile-app-${id}-tab`"
         :key="label"
         :variant="index === activeIndex ? 'secondary' : 'muted-textonly'"
         class="h-14 grow flex-col"
+        role="tab"
+        :aria-selected="index === activeIndex"
+        :aria-controls="`mobile-app-${id}-panel`"
         @click="onClick(index)"
       >
         <div class="relative size-4">
diff --git a/src/renderer/extensions/linearMode/OutputHistory.test.ts b/src/renderer/extensions/linearMode/OutputHistory.test.ts
new file mode 100644
index 0000000000..dc1884013d
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputHistory.test.ts
@@ -0,0 +1,785 @@
+import type { RenderResult } from '@testing-library/vue'
+import { render, screen } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ComputedRef } from 'vue'
+import { computed, nextTick, ref } from 'vue'
+
+import type { IAssetsProvider } from '@/platform/assets/composables/media/IAssetsProvider'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type {
+  InProgressItem,
+  OutputSelection
+} from '@/renderer/extensions/linearMode/linearModeTypes'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+import OutputHistory from './OutputHistory.vue'
+
+const mediaRef = ref<AssetItem[]>([])
+const hasMoreRef = ref(false)
+const loadMoreFn = vi.fn()
+
+const selectedIdRef = ref<string | null>(null)
+const activeWorkflowInProgressItemsRef = ref<InProgressItem[]>([])
+
+const activeWorkflowPathRef = ref<string | undefined>('workflows/test.json')
+const hasOutputsRef = ref(false)
+
+const runningTasksRef = ref<Array<{ jobId: string }>>([])
+const pendingTasksRef = ref<Array<{ jobId: string }>>([])
+
+const selectFirstHistoryFn = vi.fn(() => {
+  const first = mediaRef.value[0]
+  selectedIdRef.value = first ? `history:${first.id}:0` : null
+})
+const mayBeActiveWorkflowPendingRef = ref(false)
+
+const allOutputsFn = vi.fn((): ResultItemImpl[] => [])
+
+const selectFn = vi.fn((id: string | null) => {
+  selectedIdRef.value = id
+})
+const selectAsLatestFn = vi.fn((id: string | null) => {
+  selectedIdRef.value = id
+})
+
+vi.mock('@/lib/litegraph/src/CanvasPointer', () => ({
+  CanvasPointer: class {
+    isTrackpadGesture() {
+      return false
+    }
+  }
+}))
+
+vi.mock('@/renderer/extensions/linearMode/useOutputHistory', () => ({
+  useOutputHistory: () => ({
+    outputs: {
+      media: mediaRef,
+      hasMore: hasMoreRef,
+      loadMore: loadMoreFn,
+      isLoadingMore: ref(false),
+      loading: ref(false),
+      error: ref(null),
+      fetchMediaList: vi.fn(),
+      refresh: vi.fn()
+    } satisfies IAssetsProvider,
+    allOutputs: allOutputsFn,
+    selectFirstHistory: selectFirstHistoryFn,
+    mayBeActiveWorkflowPending:
+      mayBeActiveWorkflowPendingRef as ComputedRef<boolean>,
+    isWorkflowActive: computed(() => false),
+    cancelActiveWorkflowJobs: vi.fn()
+  })
+}))
+
+vi.mock('@/renderer/extensions/linearMode/linearOutputStore', () => ({
+  useLinearOutputStore: () => ({
+    get activeWorkflowInProgressItems() {
+      return activeWorkflowInProgressItemsRef.value
+    },
+    get selectedId() {
+      return selectedIdRef.value
+    },
+    set selectedId(v: string | null) {
+      selectedIdRef.value = v
+    },
+    select: selectFn,
+    selectAsLatest: selectAsLatestFn
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get activeWorkflow() {
+      return activeWorkflowPathRef.value
+        ? { path: activeWorkflowPathRef.value }
+        : undefined
+    }
+  })
+}))
+
+vi.mock('@/stores/appModeStore', () => ({
+  useAppModeStore: () => ({
+    hasOutputs: hasOutputsRef
+  })
+}))
+
+vi.mock('@/stores/queueStore', () => ({
+  useQueueStore: () => ({
+    get runningTasks() {
+      return runningTasksRef.value
+    },
+    get pendingTasks() {
+      return pendingTasksRef.value
+    }
+  })
+}))
+
+vi.mock(
+  '@/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue',
+  () => ({
+    default: {
+      name: 'OutputHistoryActiveQueueItem',
+      template: '<div data-testid="output-active-queue-item" />'
+    }
+  })
+)
+
+vi.mock('@/renderer/extensions/linearMode/OutputHistoryItem.vue', () => ({
+  default: {
+    name: 'OutputHistoryItem',
+    props: ['output'],
+    template:
+      '<div data-testid="output-history-item">{{ output?.filename }}</div>'
+  }
+}))
+
+vi.mock('@/renderer/extensions/linearMode/OutputPreviewItem.vue', () => ({
+  default: {
+    name: 'OutputPreviewItem',
+    props: ['latentPreview'],
+    template: '<div data-testid="output-preview-item">{{ latentPreview }}</div>'
+  }
+}))
+
+function makeAsset(id: string): AssetItem {
+  return { id, name: `${id}.png`, tags: [], user_metadata: {} }
+}
+
+function makeResult(filename: string): ResultItemImpl {
+  return {
+    filename,
+    subfolder: '',
+    type: 'output',
+    nodeId: '1',
+    mediaType: 'images',
+    url: `http://localhost/${filename}`
+  } as unknown as ResultItemImpl
+}
+
+function makeInProgressItem(
+  id: string,
+  state: InProgressItem['state'] = 'skeleton',
+  opts?: Partial<InProgressItem>
+): InProgressItem {
+  return { id, jobId: `job-${id}`, state, ...opts }
+}
+
+let activeResult: RenderResult | null = null
+
+function mountComponent() {
+  const result = render(OutputHistory)
+  activeResult = result
+  return result
+}
+
+function lastEmission(result: RenderResult): OutputSelection {
+  const emitted = result.emitted('updateSelection') as
+    | Array<[OutputSelection]>
+    | undefined
+  expect(emitted).toBeDefined()
+  return emitted![emitted!.length - 1][0] as OutputSelection
+}
+
+function historySelectableItems(): HTMLElement[] {
+  return screen.getAllByTestId('linear-history-item')
+}
+
+function historyItems(): HTMLElement[] {
+  return screen.queryAllByTestId('output-history-item')
+}
+
+describe('OutputHistory', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mediaRef.value = []
+    hasMoreRef.value = false
+    selectedIdRef.value = null
+    activeWorkflowInProgressItemsRef.value = []
+    activeWorkflowPathRef.value = 'workflows/test.json'
+    hasOutputsRef.value = false
+    runningTasksRef.value = []
+    pendingTasksRef.value = []
+    mayBeActiveWorkflowPendingRef.value = false
+    allOutputsFn.mockReturnValue([])
+  })
+
+  afterEach(() => {
+    activeResult?.unmount()
+    activeResult = null
+  })
+
+  describe('rendering', () => {
+    it('renders selectable history items for assets with outputs', async () => {
+      const a1 = makeAsset('a1')
+      const a2 = makeAsset('a2')
+      mediaRef.value = [a1, a2]
+      allOutputsFn.mockImplementation((asset?: AssetItem) => {
+        if (asset?.id === 'a1') return [makeResult('a1.png')]
+        return []
+      })
+
+      mountComponent()
+      await nextTick()
+
+      expect(historyItems()).toHaveLength(1)
+      expect(historyItems()[0]).toHaveTextContent('a1.png')
+    })
+
+    it('renders a history item for each output in an asset', async () => {
+      const asset = makeAsset('a1')
+      const firstOutput = makeResult('first.png')
+      const secondOutput = makeResult('second.png')
+      mediaRef.value = [asset]
+      allOutputsFn.mockReturnValue([firstOutput, secondOutput])
+
+      mountComponent()
+      await nextTick()
+
+      expect(historyItems()).toHaveLength(2)
+      expect(historyItems()[0]).toHaveTextContent('first.png')
+      expect(historyItems()[1]).toHaveTextContent('second.png')
+    })
+
+    it('renders queue badge when queueCount > 1 and has active content', async () => {
+      runningTasksRef.value = [{ jobId: 'j1' }]
+      pendingTasksRef.value = [{ jobId: 'j2' }]
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+
+      mountComponent()
+      await nextTick()
+
+      expect(screen.getByTestId('output-active-queue-item')).toBeInTheDocument()
+    })
+
+    it('does not render queue badge when queue is empty', () => {
+      mountComponent()
+      expect(
+        screen.queryByTestId('output-active-queue-item')
+      ).not.toBeInTheDocument()
+    })
+
+    it('renders preview item for skeleton in-progress items', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+
+      mountComponent()
+      await nextTick()
+
+      expect(screen.getByTestId('output-preview-item')).toBeInTheDocument()
+    })
+
+    it('renders history item for image in-progress items with output prop', async () => {
+      const output = makeResult('out.png')
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'image', { output })
+      ]
+
+      mountComponent()
+      await nextTick()
+
+      expect(screen.getByTestId('output-history-item')).toHaveTextContent(
+        output.filename
+      )
+    })
+
+    it('renders both active and history content when both exist', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('a1.png')])
+
+      mountComponent()
+      await nextTick()
+
+      expect(screen.getByTestId('output-preview-item')).toBeInTheDocument()
+      expect(screen.getByTestId('output-history-item')).toBeInTheDocument()
+    })
+  })
+
+  describe('selection behavior', () => {
+    it('selects history item on click and updates data-state', async () => {
+      const asset = makeAsset('a1')
+      mediaRef.value = [asset]
+      allOutputsFn.mockReturnValue([makeResult('a1.png')])
+
+      const result = mountComponent()
+      await nextTick()
+
+      const items = historySelectableItems()
+      expect(items).toHaveLength(1)
+
+      await userEvent.click(items[0])
+      await nextTick()
+
+      expect(selectedIdRef.value).toBe('history:a1:0')
+      expect(selectFn).toHaveBeenCalledWith('history:a1:0')
+      expect(selectAsLatestFn).not.toHaveBeenCalledWith('history:a1:0')
+      expect(lastEmission(result)).toMatchObject({
+        asset,
+        output: expect.objectContaining({ filename: 'a1.png' }),
+        canShowPreview: true
+      })
+      expect(items[0]).toHaveAttribute('data-state', 'checked')
+      expect(items[0]).toHaveAttribute('tabindex', '0')
+    })
+
+    it('selects in-progress item on click', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+
+      mountComponent()
+      await nextTick()
+
+      const slots = screen.getAllByTestId('linear-in-progress-item')
+      expect(slots.length).toBeGreaterThanOrEqual(1)
+
+      vi.clearAllMocks()
+      await userEvent.click(slots[0])
+      expect(selectedIdRef.value).toBe('slot:ip1')
+      expect(selectFn).toHaveBeenCalledWith('slot:ip1')
+      expect(selectAsLatestFn).not.toHaveBeenCalledWith('slot:ip1')
+    })
+
+    it('marks unselected items with tabindex=-1', async () => {
+      const a1 = makeAsset('a1')
+      const a2 = makeAsset('a2')
+      mediaRef.value = [a1, a2]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      selectedIdRef.value = 'history:a1:0'
+
+      mountComponent()
+      await nextTick()
+
+      const unchecked = screen
+        .getAllByTestId('linear-history-item')
+        .filter((item) => item.dataset.state === 'unchecked')
+      for (const item of unchecked) {
+        expect(item).toHaveAttribute('tabindex', '-1')
+      }
+    })
+
+    it('selects pending slot on click', async () => {
+      mayBeActiveWorkflowPendingRef.value = true
+      runningTasksRef.value = [{ jobId: 'j1' }]
+
+      mountComponent()
+      await nextTick()
+
+      const pendingPreview = screen.getByTestId('output-preview-item')
+
+      await userEvent.click(pendingPreview)
+      expect(selectedIdRef.value).toBe('slot:pending')
+    })
+  })
+
+  describe('emit updateSelection', () => {
+    it('emits canShowPreview:true when no selection', async () => {
+      selectedIdRef.value = null
+
+      const result = mountComponent()
+      await nextTick()
+
+      expect(lastEmission(result)).toEqual({ canShowPreview: true })
+    })
+
+    it('emits showSkeleton for in-progress skeleton item', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+      selectedIdRef.value = 'slot:ip1'
+
+      const result = mountComponent()
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result)).toMatchObject({
+        canShowPreview: true,
+        showSkeleton: true
+      })
+    })
+
+    it('emits latentPreviewUrl for in-progress latent item', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'latent', {
+          latentPreviewUrl: 'blob:preview'
+        })
+      ]
+      selectedIdRef.value = 'slot:ip1'
+
+      const result = mountComponent()
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result)).toMatchObject({
+        canShowPreview: true,
+        latentPreviewUrl: 'blob:preview'
+      })
+    })
+
+    it('emits output for in-progress image item', async () => {
+      const output = makeResult('out.png')
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'image', { output })
+      ]
+      selectedIdRef.value = 'slot:ip1'
+
+      const result = mountComponent()
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result)).toMatchObject({
+        output,
+        canShowPreview: true
+      })
+    })
+
+    it('emits asset and output for history selection', async () => {
+      const asset = makeAsset('a1')
+      const output = makeResult('a1.png')
+      mediaRef.value = [asset]
+      allOutputsFn.mockReturnValue([output])
+      hasOutputsRef.value = true
+
+      const rendered = mountComponent()
+      await nextTick()
+
+      selectedIdRef.value = 'history:a1:0'
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(rendered)).toMatchObject({
+        asset,
+        output,
+        canShowPreview: true
+      })
+    })
+
+    it('emits the selected output for multi-output history assets', async () => {
+      const asset = makeAsset('a1')
+      const firstOutput = makeResult('first.png')
+      const secondOutput = makeResult('second.png')
+      mediaRef.value = [asset]
+      allOutputsFn.mockReturnValue([firstOutput, secondOutput])
+      hasOutputsRef.value = true
+
+      const result = mountComponent()
+      await nextTick()
+
+      selectedIdRef.value = 'history:a1:1'
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result)).toMatchObject({
+        asset,
+        output: secondOutput,
+        canShowPreview: true
+      })
+    })
+
+    it('sets canShowPreview:false for non-first history asset', async () => {
+      const a1 = makeAsset('a1')
+      const a2 = makeAsset('a2')
+      mediaRef.value = [a1, a2]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      const result = mountComponent()
+      await nextTick()
+
+      selectedIdRef.value = 'history:a2:0'
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result).canShowPreview).toBe(false)
+    })
+
+    it('emits skeleton for pending slot selection', async () => {
+      mayBeActiveWorkflowPendingRef.value = true
+      runningTasksRef.value = [{ jobId: 'j1' }]
+
+      const result = mountComponent()
+      await nextTick()
+
+      selectedIdRef.value = 'slot:pending'
+      await nextTick()
+      await nextTick()
+
+      expect(lastEmission(result)).toMatchObject({
+        canShowPreview: true,
+        showSkeleton: true
+      })
+    })
+  })
+
+  describe('workflow tab switch', () => {
+    it('selects first in-progress item on mount', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+
+      mountComponent()
+      await nextTick()
+
+      expect(selectAsLatestFn).toHaveBeenCalledWith('slot:ip1')
+    })
+
+    it('selects first history when no in-progress but outputs exist', async () => {
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('a1.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+
+      expect(selectFirstHistoryFn).toHaveBeenCalled()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+
+    it('clears selection when no outputs and no in-progress', async () => {
+      mountComponent()
+      await nextTick()
+
+      expect(selectAsLatestFn).toHaveBeenCalledWith(null)
+    })
+
+    it('reselects when workflow path changes after mount', async () => {
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('a1.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      // Simulate workflow tab switch
+      activeWorkflowPathRef.value = 'workflows/other.json'
+      await nextTick()
+
+      expect(selectFirstHistoryFn).toHaveBeenCalled()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+
+    it('does not reselect when path becomes falsy', async () => {
+      mountComponent()
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      activeWorkflowPathRef.value = undefined
+      await nextTick()
+
+      expect(selectAsLatestFn).not.toHaveBeenCalled()
+      expect(selectFirstHistoryFn).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('media change watcher', () => {
+    it('does not reselect when selection is a slot item', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+      selectedIdRef.value = 'slot:ip1'
+
+      mountComponent()
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      // New media arrives
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('a1.png')])
+      await nextTick()
+
+      // Selection stays on slot, doesn't jump to history
+      expect(selectFirstHistoryFn).not.toHaveBeenCalled()
+    })
+
+    it('reselects first history when selected asset disappears', async () => {
+      const a1 = makeAsset('a1')
+      const a2 = makeAsset('a2')
+      mediaRef.value = [a1, a2]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = 'history:a1:0'
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      // a1 disappears — length changes, selected asset is gone
+      mediaRef.value = [a2]
+      await nextTick()
+
+      expect(selectFirstHistoryFn).toHaveBeenCalled()
+    })
+
+    it('reselects latest history when a new asset is prepended while following latest', async () => {
+      const oldFirst = makeAsset('old-first')
+      mediaRef.value = [oldFirst]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = 'history:old-first:0'
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      mediaRef.value = [makeAsset('new-first'), oldFirst]
+      await nextTick()
+
+      expect(selectFirstHistoryFn).toHaveBeenCalled()
+      expect(selectedIdRef.value).toBe('history:new-first:0')
+    })
+
+    it('keeps older history selection stable when new assets arrive', async () => {
+      const currentFirst = makeAsset('current-first')
+      const selectedOlder = makeAsset('selected-older')
+      mediaRef.value = [currentFirst, selectedOlder]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = 'history:selected-older:0'
+      await nextTick()
+
+      vi.clearAllMocks()
+
+      mediaRef.value = [makeAsset('new-first'), currentFirst, selectedOlder]
+      await nextTick()
+
+      expect(selectFirstHistoryFn).not.toHaveBeenCalled()
+      expect(selectedIdRef.value).toBe('history:selected-older:0')
+    })
+  })
+
+  describe('keyboard navigation', () => {
+    function pressKey(key: string) {
+      document.body.dispatchEvent(
+        new KeyboardEvent('keydown', { key, bubbles: true })
+      )
+    }
+
+    it('navigates forward and backward with arrow keys', async () => {
+      const a1 = makeAsset('a1')
+      const a2 = makeAsset('a2')
+      mediaRef.value = [a1, a2]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+
+      // Set selection after mount (mount watcher may reset it)
+      selectedIdRef.value = 'history:a1:0'
+      await nextTick()
+
+      pressKey('ArrowRight')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a2:0')
+      expect(selectFn).toHaveBeenLastCalledWith('history:a2:0')
+      expect(selectAsLatestFn).not.toHaveBeenCalledWith('history:a2:0')
+
+      pressKey('ArrowLeft')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+      expect(selectFn).toHaveBeenLastCalledWith('history:a1:0')
+      expect(selectAsLatestFn).not.toHaveBeenCalledWith('history:a1:0')
+
+      pressKey('ArrowDown')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a2:0')
+
+      pressKey('ArrowUp')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+
+    it('clamps to first and last items', async () => {
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = 'history:a1:0'
+      await nextTick()
+
+      pressKey('ArrowLeft')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+
+      pressKey('ArrowRight')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+
+    it('ignores key events from input elements', async () => {
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+      hasOutputsRef.value = true
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = 'history:a1:0'
+      vi.clearAllMocks()
+      await nextTick()
+
+      const input = document.createElement('input')
+      document.body.appendChild(input)
+      input.dispatchEvent(
+        new KeyboardEvent('keydown', {
+          key: 'ArrowRight',
+          bubbles: true
+        })
+      )
+      await nextTick()
+
+      expect(selectFn).not.toHaveBeenCalled()
+      document.body.removeChild(input)
+    })
+
+    it('navigates across in-progress and history items', async () => {
+      activeWorkflowInProgressItemsRef.value = [
+        makeInProgressItem('ip1', 'skeleton')
+      ]
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+
+      mountComponent()
+      await nextTick()
+
+      // Mount watcher selects the in-progress item
+      expect(selectedIdRef.value).toBe('slot:ip1')
+
+      pressKey('ArrowRight')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+
+    it('selects first item when no current selection', async () => {
+      mediaRef.value = [makeAsset('a1')]
+      allOutputsFn.mockReturnValue([makeResult('out.png')])
+
+      mountComponent()
+      await nextTick()
+      selectedIdRef.value = null
+      await nextTick()
+
+      pressKey('ArrowRight')
+      await nextTick()
+      expect(selectedIdRef.value).toBe('history:a1:0')
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
index b45fce2fe1..7a1f2e6c1e 100644
--- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
+++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
@@ -134,6 +134,29 @@ describe('ImagePreview', () => {
     screen.getByRole('button', { name: 'Edit or mask image' })
   })
 
+  it('hides mask and download buttons when image fails to load', async () => {
+    renderImagePreview({
+      imageUrls: [defaultProps.imageUrls[0]]
+    })
+
+    expect(
+      screen.getByRole('button', { name: 'Edit or mask image' })
+    ).toBeInTheDocument()
+    expect(
+      screen.getByRole('button', { name: 'Download image' })
+    ).toBeInTheDocument()
+
+    await fireEvent.error(screen.getByTestId('main-image'))
+    await nextTick()
+
+    expect(
+      screen.queryByRole('button', { name: 'Edit or mask image' })
+    ).not.toBeInTheDocument()
+    expect(
+      screen.queryByRole('button', { name: 'Download image' })
+    ).not.toBeInTheDocument()
+  })
+
   it('handles download button click', async () => {
     renderImagePreview({
       imageUrls: [defaultProps.imageUrls[0]]
diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.vue b/src/renderer/extensions/vueNodes/components/ImagePreview.vue
index 5548f55d40..1fe1b8162e 100644
--- a/src/renderer/extensions/vueNodes/components/ImagePreview.vue
+++ b/src/renderer/extensions/vueNodes/components/ImagePreview.vue
@@ -80,7 +80,7 @@
       >
         <!-- Mask/Edit Button -->
         <button
-          v-if="!hasMultipleImages"
+          v-if="!hasMultipleImages && !imageError"
           :class="actionButtonClass"
           :title="$t('g.editOrMaskImage')"
           :aria-label="$t('g.editOrMaskImage')"
@@ -91,6 +91,7 @@
 
         <!-- Download Button -->
         <button
+          v-if="!imageError"
           :class="actionButtonClass"
           :title="$t('g.downloadImage')"
           :aria-label="$t('g.downloadImage')"
diff --git a/src/renderer/extensions/vueNodes/components/NodeFooter.test.ts b/src/renderer/extensions/vueNodes/components/NodeFooter.test.ts
index 5bebf4352f..d7c3250bbb 100644
--- a/src/renderer/extensions/vueNodes/components/NodeFooter.test.ts
+++ b/src/renderer/extensions/vueNodes/components/NodeFooter.test.ts
@@ -1,11 +1,19 @@
 import { render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
-import { beforeEach, describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import { RenderShape } from '@/lib/litegraph/src/litegraph'
 import NodeFooter from '@/renderer/extensions/vueNodes/components/NodeFooter.vue'
 
+vi.mock('@/renderer/core/layout/store/layoutStore', () => {
+  const isDraggingVueNodes = ref(false)
+  return { layoutStore: { isDraggingVueNodes } }
+})
+
+const { layoutStore } = await import('@/renderer/core/layout/store/layoutStore')
+
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
@@ -143,6 +151,33 @@ describe('NodeFooter', () => {
       await user.click(screen.getByText('Show Advanced Inputs'))
       expect(emitted()).toHaveProperty('toggleAdvanced')
     })
+
+    describe('drag-then-click suppression', () => {
+      beforeEach(() => {
+        layoutStore.isDraggingVueNodes.value = false
+      })
+
+      it('does not emit enterSubgraph when a node drag is in progress at pointerup', async () => {
+        const { emitted } = renderFooter({ isSubgraph: true })
+        layoutStore.isDraggingVueNodes.value = true
+        await user.click(screen.getByTestId('subgraph-enter-button'))
+
+        expect(emitted().enterSubgraph).toBeUndefined()
+      })
+
+      it('only suppresses the immediately following click, not later ones', async () => {
+        const { emitted } = renderFooter({ isSubgraph: true })
+        const button = screen.getByTestId('subgraph-enter-button')
+
+        layoutStore.isDraggingVueNodes.value = true
+        await user.click(button)
+        expect(emitted().enterSubgraph).toBeUndefined()
+
+        layoutStore.isDraggingVueNodes.value = false
+        await user.click(button)
+        expect(emitted()).toHaveProperty('enterSubgraph')
+      })
+    })
   })
 
   describe('shape-based radius classes (getBottomRadius)', () => {
diff --git a/src/renderer/extensions/vueNodes/components/NodeFooter.vue b/src/renderer/extensions/vueNodes/components/NodeFooter.vue
index c5c963f296..732b53af6b 100644
--- a/src/renderer/extensions/vueNodes/components/NodeFooter.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeFooter.vue
@@ -13,7 +13,8 @@
           errorRadiusClass
         )
       "
-      @click.stop="$emit('openErrors')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('openErrors')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{ t('g.error') }}</span>
@@ -32,7 +33,8 @@
         )
       "
       :style="headerColorStyle"
-      @click.stop="$emit('enterSubgraph')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('enterSubgraph')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{ t('g.enter') }}</span>
@@ -60,7 +62,8 @@
           errorRadiusClass
         )
       "
-      @click.stop="$emit('openErrors')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('openErrors')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{ t('g.error') }}</span>
@@ -78,7 +81,8 @@
         )
       "
       :style="headerColorStyle"
-      @click.stop="$emit('toggleAdvanced')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('toggleAdvanced')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{
@@ -111,7 +115,8 @@
           footerRadiusClass
         )
       "
-      @click.stop="$emit('openErrors')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('openErrors')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{ t('g.error') }}</span>
@@ -142,7 +147,8 @@
         )
       "
       :style="headerColorStyle"
-      @click.stop="$emit('enterSubgraph')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('enterSubgraph')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <span class="truncate">{{ t('g.enterSubgraph') }}</span>
@@ -172,7 +178,8 @@
         )
       "
       :style="headerColorStyle"
-      @click.stop="$emit('toggleAdvanced')"
+      @pointerup="snapshotDragOnPointerUp"
+      @click.stop="emitIfNotDragged('toggleAdvanced')"
     >
       <div class="flex size-full items-center justify-center gap-2">
         <template v-if="showAdvancedState">
@@ -197,6 +204,7 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import Button from '@/components/ui/button/Button.vue'
 import { RenderShape } from '@/lib/litegraph/src/litegraph'
+import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { cn } from '@comfyorg/tailwind-utils'
 
 const { t } = useI18n()
@@ -221,12 +229,29 @@ const {
   shape
 } = defineProps<Props>()
 
-defineEmits<{
+const emit = defineEmits<{
   enterSubgraph: []
   openErrors: []
   toggleAdvanced: []
 }>()
 
+let suppressNextClick = false
+
+function snapshotDragOnPointerUp() {
+  suppressNextClick = layoutStore.isDraggingVueNodes.value
+}
+
+function emitIfNotDragged(
+  name: 'enterSubgraph' | 'openErrors' | 'toggleAdvanced'
+) {
+  const wasDrag = suppressNextClick
+  suppressNextClick = false
+  if (wasDrag) return
+  if (name === 'enterSubgraph') emit('enterSubgraph')
+  else if (name === 'openErrors') emit('openErrors')
+  else emit('toggleAdvanced')
+}
+
 const RADIUS_CLASS = {
   'rounded-b-17': 'rounded-b-[17px]',
   'rounded-b-20': 'rounded-b-[20px]',
diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts b/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
index 2d4cf7706f..e88f492900 100644
--- a/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
+++ b/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
@@ -1,19 +1,31 @@
 import { createTestingPinia } from '@pinia/testing'
 import { render } from '@testing-library/vue'
-import { describe, expect, it } from 'vitest'
-import { defineComponent } from 'vue'
+import type { RenderOptions } from '@testing-library/vue'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, nextTick } from 'vue'
 import type { PropType } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
-import type {
-  INodeInputSlot,
-  INodeOutputSlot
-} from '@/lib/litegraph/src/interfaces'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
 import enMessages from '@/locales/en/main.json' with { type: 'json' }
+import type { NodeId as VueNodeId } from '@/renderer/core/layout/types'
+import { app } from '@/scripts/app'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { seedRequiredInputMissingNodeError } from '@/utils/__tests__/executionErrorTestUtils'
+import {
+  createMockNodeInputSlot,
+  createMockNodeOutputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
 
 import NodeSlots from './NodeSlots.vue'
 
+const toVueNodeId = (id: string | number): VueNodeId => String(id)
+
 const makeNodeData = (overrides: Partial<VueNodeData> = {}): VueNodeData => ({
   id: '123',
   title: 'Test Node',
@@ -28,22 +40,6 @@ const makeNodeData = (overrides: Partial<VueNodeData> = {}): VueNodeData => ({
   ...overrides
 })
 
-function makeInputSlot(
-  name: string,
-  type: string,
-  extra?: Partial<INodeInputSlot>
-): INodeInputSlot {
-  return { name, type, boundingRect: [0, 0, 0, 0], link: null, ...extra }
-}
-
-function makeOutputSlot(
-  name: string,
-  type: string,
-  extra?: Partial<INodeOutputSlot>
-): INodeOutputSlot {
-  return { name, type, boundingRect: [0, 0, 0, 0], links: [], ...extra }
-}
-
 // Explicit stubs to capture props for assertions
 interface StubSlotData {
   name?: string
@@ -54,6 +50,7 @@ interface StubSlotData {
 const STUB_SLOT_PROPS = {
   slotData: { type: Object as PropType<StubSlotData>, required: true },
   nodeId: { type: String, required: false, default: '' },
+  hasError: { type: Boolean, required: false, default: false },
   index: { type: Number, required: true },
   readonly: { type: Boolean, required: false, default: false }
 } as const
@@ -68,6 +65,7 @@ const InputSlotStub = defineComponent({
       :data-name="slotData && slotData.name ? slotData.name : ''"
       :data-type="slotData && slotData.type ? slotData.type : ''"
       :data-node-id="nodeId"
+      :data-has-error="hasError ? 'true' : 'false'"
       :data-readonly="readonly ? 'true' : 'false'"
     />
   `
@@ -88,6 +86,21 @@ const OutputSlotStub = defineComponent({
   `
 })
 
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: enMessages }
+})
+
+type SlotComponentStubs = NonNullable<
+  NonNullable<RenderOptions<typeof NodeSlots>['global']>['stubs']
+>
+
+const defaultSlotStubs: SlotComponentStubs = {
+  InputSlot: InputSlotStub,
+  OutputSlot: OutputSlotStub
+}
+
 function createTrackingStub(
   componentName: 'InputSlot' | 'OutputSlot',
   mountCounts: Map<string, number>
@@ -111,40 +124,10 @@ function createTrackingStub(
   })
 }
 
-const mountSlots = (nodeData: VueNodeData) => {
-  const i18n = createI18n({
-    legacy: false,
-    locale: 'en',
-    messages: { en: enMessages }
-  })
-  return render(NodeSlots, {
-    global: {
-      plugins: [i18n, createTestingPinia({ stubActions: false })],
-      stubs: {
-        InputSlot: InputSlotStub,
-        OutputSlot: OutputSlotStub
-      }
-    },
-    props: { nodeData }
-  })
-}
-
-function mountSlotsWithTracking(
+function renderSlots(
   nodeData: VueNodeData,
-  mountCounts: Map<string, number>,
-  trackingTarget: 'InputSlot' | 'OutputSlot'
+  stubs: SlotComponentStubs = defaultSlotStubs
 ) {
-  const i18n = createI18n({
-    legacy: false,
-    locale: 'en',
-    messages: { en: enMessages }
-  })
-  const trackingStub = createTrackingStub(trackingTarget, mountCounts)
-  const stubs =
-    trackingTarget === 'InputSlot'
-      ? { InputSlot: trackingStub, OutputSlot: OutputSlotStub }
-      : { InputSlot: InputSlotStub, OutputSlot: trackingStub }
-
   return render(NodeSlots, {
     global: {
       plugins: [i18n, createTestingPinia({ stubActions: false })],
@@ -154,9 +137,27 @@ function mountSlotsWithTracking(
   })
 }
 
+function renderSlotsWithTracking(
+  nodeData: VueNodeData,
+  mountCounts: Map<string, number>,
+  trackingTarget: 'InputSlot' | 'OutputSlot'
+) {
+  const trackingStub = createTrackingStub(trackingTarget, mountCounts)
+  const stubs =
+    trackingTarget === 'InputSlot'
+      ? { InputSlot: trackingStub, OutputSlot: OutputSlotStub }
+      : { InputSlot: InputSlotStub, OutputSlot: trackingStub }
+
+  return renderSlots(nodeData, stubs)
+}
+
 const INPUT_SLOT_SELECTOR = '.stub-input-slot'
 const OUTPUT_SLOT_SELECTOR = '.stub-output-slot'
 
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
 function querySlotElements(
   container: Element,
   selector: string
@@ -169,25 +170,42 @@ function querySlotElements(
 }
 
 function getRenderedSlotIndex(container: Element, slotName: string) {
+  return Number(getRenderedSlotElement(container, slotName).dataset.index)
+}
+
+function getRenderedSlotElement(container: Element, slotName: string) {
   // eslint-disable-next-line testing-library/no-node-access
   const el = container.querySelector(`[data-name="${slotName}"]`)
   if (!(el instanceof HTMLElement)) {
     throw new Error(`Slot element "${slotName}" not found`)
   }
-  return Number(el.dataset.index)
+  return el
+}
+
+function expectSlotError(
+  container: Element,
+  slotName: string,
+  hasError: boolean
+) {
+  expect(getRenderedSlotElement(container, slotName)).toHaveAttribute(
+    'data-has-error',
+    hasError ? 'true' : 'false'
+  )
 }
 
 describe('NodeSlots.vue', () => {
   it('filters out inputs with widget property and maps indexes correctly', () => {
-    const inputs: INodeInputSlot[] = [
-      makeInputSlot('objNoWidget', 'number'),
-      makeInputSlot('objWithWidget', 'number', {
+    const inputs = [
+      createMockNodeInputSlot({ name: 'objNoWidget', type: 'number' }),
+      createMockNodeInputSlot({
+        name: 'objWithWidget',
+        type: 'number',
         widget: { name: 'objWithWidget' }
       }),
-      makeInputSlot('stringInput', 'string')
+      createMockNodeInputSlot({ name: 'stringInput', type: 'string' })
     ]
 
-    const { container } = mountSlots(makeNodeData({ inputs }))
+    const { container } = renderSlots(makeNodeData({ inputs }))
 
     const inputEls = querySlotElements(container, INPUT_SLOT_SELECTOR)
     expect(inputEls).toHaveLength(2)
@@ -221,12 +239,12 @@ describe('NodeSlots.vue', () => {
   })
 
   it('maps outputs and passes correct indexes', () => {
-    const outputs: INodeOutputSlot[] = [
-      makeOutputSlot('outA', 'any'),
-      makeOutputSlot('outB', 'any')
+    const outputs = [
+      createMockNodeOutputSlot({ name: 'outA', type: 'any' }),
+      createMockNodeOutputSlot({ name: 'outB', type: 'any' })
     ]
 
-    const { container } = mountSlots(makeNodeData({ outputs }))
+    const { container } = renderSlots(makeNodeData({ outputs }))
     const outputEls = querySlotElements(container, OUTPUT_SLOT_SELECTOR)
 
     expect(outputEls).toHaveLength(2)
@@ -243,15 +261,100 @@ describe('NodeSlots.vue', () => {
     ])
   })
 
+  it('passes validation error state to matching input slots', async () => {
+    const inputs = [
+      createMockNodeInputSlot({ name: 'model', type: 'MODEL' }),
+      createMockNodeInputSlot({ name: 'steps', type: 'INT' })
+    ]
+    const nodeData = makeNodeData({ inputs })
+    const { container } = renderSlots(nodeData)
+    seedRequiredInputMissingNodeError(
+      useExecutionErrorStore(),
+      nodeData.id,
+      'model'
+    )
+    await nextTick()
+
+    expectSlotError(container, 'model', true)
+    expectSlotError(container, 'steps', false)
+  })
+
+  it('maps one-level subgraph execution ids to input slot errors', async () => {
+    const subgraph = createTestSubgraph()
+    const interiorNode = new LGraphNode('InteriorNode')
+    interiorNode.id = 70
+    interiorNode.addInput('model', 'MODEL')
+    interiorNode.addInput('steps', 'INT')
+    subgraph.add(interiorNode)
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 65 })
+    const graph = subgraphNode.rootGraph
+    graph.add(subgraphNode)
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
+
+    const nodeData = makeNodeData({
+      id: toVueNodeId(interiorNode.id),
+      subgraphId: subgraph.id,
+      inputs: interiorNode.inputs
+    })
+    const { container } = renderSlots(nodeData)
+    seedRequiredInputMissingNodeError(
+      useExecutionErrorStore(),
+      '65:70',
+      'model'
+    )
+    await nextTick()
+
+    expectSlotError(container, 'model', true)
+    expectSlotError(container, 'steps', false)
+  })
+
+  it('maps nested subgraph execution ids to input slot errors', async () => {
+    const innerSubgraph = createTestSubgraph()
+    const innerNode = new LGraphNode('InnerNode')
+    innerNode.id = 63
+    innerNode.addInput('image', 'IMAGE')
+    innerNode.addInput('mask', 'MASK')
+    innerSubgraph.add(innerNode)
+
+    const outerSubgraph = createTestSubgraph()
+    const innerSubgraphNode = createTestSubgraphNode(innerSubgraph, {
+      id: 70,
+      parentGraph: outerSubgraph
+    })
+    outerSubgraph.add(innerSubgraphNode)
+
+    const outerSubgraphNode = createTestSubgraphNode(outerSubgraph, { id: 65 })
+    const graph = outerSubgraphNode.rootGraph
+    graph.add(outerSubgraphNode)
+    vi.spyOn(app, 'rootGraph', 'get').mockReturnValue(graph)
+
+    const nodeData = makeNodeData({
+      id: toVueNodeId(innerNode.id),
+      subgraphId: innerSubgraph.id,
+      inputs: innerNode.inputs
+    })
+    const { container } = renderSlots(nodeData)
+    seedRequiredInputMissingNodeError(
+      useExecutionErrorStore(),
+      '65:70:63',
+      'mask'
+    )
+    await nextTick()
+
+    expectSlotError(container, 'image', false)
+    expectSlotError(container, 'mask', true)
+  })
+
   it('remounts OutputSlot when index shifts due to output removal', async () => {
     const mountCounts = new Map<string, number>()
     const outputs = [
-      makeOutputSlot('outA', 'IMAGE'),
-      makeOutputSlot('outB', 'VIDEO'),
-      makeOutputSlot('outC', 'AUDIO')
+      createMockNodeOutputSlot({ name: 'outA', type: 'IMAGE' }),
+      createMockNodeOutputSlot({ name: 'outB', type: 'VIDEO' }),
+      createMockNodeOutputSlot({ name: 'outC', type: 'AUDIO' })
     ]
 
-    const { container, rerender } = mountSlotsWithTracking(
+    const { container, rerender } = renderSlotsWithTracking(
       makeNodeData({ outputs }),
       mountCounts,
       'OutputSlot'
@@ -263,8 +366,8 @@ describe('NodeSlots.vue', () => {
     await rerender({
       nodeData: makeNodeData({
         outputs: [
-          makeOutputSlot('outA', 'IMAGE'),
-          makeOutputSlot('outC', 'AUDIO')
+          createMockNodeOutputSlot({ name: 'outA', type: 'IMAGE' }),
+          createMockNodeOutputSlot({ name: 'outC', type: 'AUDIO' })
         ]
       })
     })
@@ -274,21 +377,21 @@ describe('NodeSlots.vue', () => {
   })
 
   it('renders nothing when there are no inputs/outputs', () => {
-    const { container } = mountSlots(makeNodeData({ inputs: [], outputs: [] }))
+    const { container } = renderSlots(makeNodeData({ inputs: [], outputs: [] }))
     expect(querySlotElements(container, INPUT_SLOT_SELECTOR)).toHaveLength(0)
     expect(querySlotElements(container, OUTPUT_SLOT_SELECTOR)).toHaveLength(0)
   })
 
   it('passes correct actual indices for multi-group input layout', () => {
-    const inputs: INodeInputSlot[] = [
-      makeInputSlot('ref_images.img0', 'IMAGE'),
-      makeInputSlot('ref_images.img1', 'IMAGE'),
-      makeInputSlot('ref_images.img2', 'IMAGE'),
-      makeInputSlot('ref_videos.vid0', 'VIDEO'),
-      makeInputSlot('ref_videos.vid1', 'VIDEO')
+    const inputs = [
+      createMockNodeInputSlot({ name: 'ref_images.img0', type: 'IMAGE' }),
+      createMockNodeInputSlot({ name: 'ref_images.img1', type: 'IMAGE' }),
+      createMockNodeInputSlot({ name: 'ref_images.img2', type: 'IMAGE' }),
+      createMockNodeInputSlot({ name: 'ref_videos.vid0', type: 'VIDEO' }),
+      createMockNodeInputSlot({ name: 'ref_videos.vid1', type: 'VIDEO' })
     ]
 
-    const { container } = mountSlots(makeNodeData({ inputs }))
+    const { container } = renderSlots(makeNodeData({ inputs }))
 
     const inputEls = querySlotElements(container, INPUT_SLOT_SELECTOR)
 
@@ -310,11 +413,11 @@ describe('NodeSlots.vue', () => {
   it('remounts InputSlot when index shifts due to autogrow insertion', async () => {
     const mountCounts = new Map<string, number>()
     const initialInputs = [
-      makeInputSlot('ref_images.img0', 'IMAGE'),
-      makeInputSlot('ref_videos.vid0', 'VIDEO')
+      createMockNodeInputSlot({ name: 'ref_images.img0', type: 'IMAGE' }),
+      createMockNodeInputSlot({ name: 'ref_videos.vid0', type: 'VIDEO' })
     ]
 
-    const { container, rerender } = mountSlotsWithTracking(
+    const { container, rerender } = renderSlotsWithTracking(
       makeNodeData({ inputs: initialInputs }),
       mountCounts,
       'InputSlot'
@@ -326,9 +429,9 @@ describe('NodeSlots.vue', () => {
     await rerender({
       nodeData: makeNodeData({
         inputs: [
-          makeInputSlot('ref_images.img0', 'IMAGE'),
-          makeInputSlot('ref_images.img1', 'IMAGE'),
-          makeInputSlot('ref_videos.vid0', 'VIDEO')
+          createMockNodeInputSlot({ name: 'ref_images.img0', type: 'IMAGE' }),
+          createMockNodeInputSlot({ name: 'ref_images.img1', type: 'IMAGE' }),
+          createMockNodeInputSlot({ name: 'ref_videos.vid0', type: 'VIDEO' })
         ]
       })
     })
diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.vue b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
index 358d15398f..b1ae626202 100644
--- a/src/renderer/extensions/vueNodes/components/NodeSlots.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
@@ -13,6 +13,7 @@
         :slot-data="input"
         :node-type="nodeData?.type || ''"
         :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
+        :has-error="inputHasError(input)"
         :index="getActualInputIndex(input, index)"
       />
     </div>
@@ -44,6 +45,8 @@ import {
   linkedWidgetedInputs,
   nonWidgetedInputs
 } from '@/renderer/extensions/vueNodes/utils/nodeDataUtils'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { getLocatorIdFromNodeData } from '@/utils/graphTraversalUtil'
 import { cn } from '@comfyorg/tailwind-utils'
 
 import InputSlot from './InputSlot.vue'
@@ -55,6 +58,8 @@ interface NodeSlotsProps {
 }
 
 const { nodeData, unified = false } = defineProps<NodeSlotsProps>()
+const executionErrorStore = useExecutionErrorStore()
+const nodeLocatorId = computed(() => getLocatorIdFromNodeData(nodeData))
 
 const linkedWidgetInputs = computed(() =>
   unified ? linkedWidgetedInputs(nodeData) : []
@@ -65,6 +70,10 @@ const filteredInputs = computed(() => [
   ...linkedWidgetInputs.value
 ])
 
+function inputHasError(input: INodeSlot): boolean {
+  return executionErrorStore.slotHasError(nodeLocatorId.value, input.name)
+}
+
 const unifiedWrapperClass = computed((): string =>
   cn(
     unified &&
diff --git a/src/renderer/extensions/vueNodes/components/NodeWidgets.vue b/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
index 4f5fb9d8fc..3734fee4d2 100644
--- a/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
@@ -90,6 +90,7 @@ import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteracti
 import AppInput from '@/renderer/extensions/linearMode/AppInput.vue'
 import { useNodeZIndex } from '@/renderer/extensions/vueNodes/composables/useNodeZIndex'
 import { useProcessedWidgets } from '@/renderer/extensions/vueNodes/composables/useProcessedWidgets'
+import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking'
 import { cn } from '@comfyorg/tailwind-utils'
 
 import InputSlot from './InputSlot.vue'
@@ -134,4 +135,9 @@ const {
   processedWidgets,
   showAdvanced
 } = useProcessedWidgets(() => nodeData)
+
+// Tracks widget-row growth that the node-level RO can't see
+if (nodeData?.id != null) {
+  useVueElementTracking(String(nodeData.id), 'widgets-grid')
+}
 </script>
diff --git a/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
index 5f8d332cf8..5b711328ba 100644
--- a/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
+++ b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
@@ -59,6 +59,7 @@ const slotClass = computed(() =>
 
 <template>
   <div
+    data-testid="slot-connection-dot"
     :class="
       cn(
         'group/slot relative flex size-6 items-center justify-center after:absolute after:inset-y-0 after:w-5/2',
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts
index bdbd5fe8e0..cc3f0347f7 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts
@@ -134,7 +134,7 @@ describe('useSlotElementTracking', () => {
     mockClientPosToCanvasPos.mockClear()
   })
 
-  it.each([
+  it.for([
     { type: 'input' as const, isInput: true },
     { type: 'output' as const, isInput: false }
   ])('cleans up $type slot layout on unmount', async ({ type, isInput }) => {
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
index 9a4f440564..0f4966dd9d 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
@@ -29,7 +29,10 @@ const raf = createRafBatch(() => {
   flushScheduledSlotLayoutSync()
 })
 
-function scheduleSlotLayoutSync(nodeId: string) {
+export function scheduleSlotLayoutSync(nodeId: string) {
+  // Drop signals for unregistered nodes (e.g. preview nodes with synthetic
+  // ids from LGraphNodePreview) - they'd otherwise pump setDirty per RAF.
+  if (!useNodeSlotRegistryStore().getNode(nodeId)) return
   pendingNodes.add(nodeId)
   raf.schedule()
 }
diff --git a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.test.ts b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.test.ts
index cdb3016f63..e0a7e6d50e 100644
--- a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.test.ts
+++ b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.test.ts
@@ -43,7 +43,8 @@ const testState = vi.hoisted(() => ({
   nodeLayouts: new Map<NodeId, NodeLayout>(),
   batchUpdateNodeBounds: vi.fn(),
   setSource: vi.fn(),
-  syncNodeSlotLayoutsFromDOM: vi.fn()
+  syncNodeSlotLayoutsFromDOM: vi.fn(),
+  scheduleSlotLayoutSync: vi.fn()
 }))
 
 vi.mock('@vueuse/core', () => ({
@@ -73,6 +74,7 @@ vi.mock('@/renderer/core/layout/store/layoutStore', () => ({
 }))
 
 vi.mock('./useSlotElementTracking', () => ({
+  scheduleSlotLayoutSync: testState.scheduleSlotLayoutSync,
   syncNodeSlotLayoutsFromDOM: testState.syncNodeSlotLayoutsFromDOM
 }))
 
@@ -159,6 +161,7 @@ describe('useVueNodeResizeTracking', () => {
     testState.batchUpdateNodeBounds.mockReset()
     testState.setSource.mockReset()
     testState.syncNodeSlotLayoutsFromDOM.mockReset()
+    testState.scheduleSlotLayoutSync.mockReset()
     resizeObserverState.observe.mockReset()
     resizeObserverState.unobserve.mockReset()
     resizeObserverState.disconnect.mockReset()
@@ -317,4 +320,25 @@ describe('useVueNodeResizeTracking', () => {
     expect(testState.setSource).toHaveBeenCalledWith(LayoutSource.DOM)
     expect(testState.batchUpdateNodeBounds).toHaveBeenCalled()
   })
+
+  it('widgets-grid resize schedules a slot resync without writing node bounds', () => {
+    const parentNodeId: NodeId = 'parent-node'
+    const element = document.createElement('div')
+    element.dataset.widgetsGridNodeId = parentNodeId
+    const boxSizes = [{ inlineSize: 200, blockSize: 80 }]
+    const entry = {
+      target: element,
+      borderBoxSize: boxSizes,
+      contentBoxSize: boxSizes,
+      devicePixelContentBoxSize: boxSizes,
+      contentRect: new DOMRect(0, 0, 200, 80)
+    } satisfies ResizeEntryLike
+
+    resizeObserverState.callback?.([entry], createObserverMock())
+
+    expect(testState.scheduleSlotLayoutSync).toHaveBeenCalledWith(parentNodeId)
+    expect(testState.batchUpdateNodeBounds).not.toHaveBeenCalled()
+    expect(testState.setSource).not.toHaveBeenCalled()
+    expect(testState.syncNodeSlotLayoutsFromDOM).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
index b503752f3a..1534e76c6e 100644
--- a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
+++ b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
@@ -24,7 +24,10 @@ import {
 } from '@/renderer/core/layout/utils/geometry'
 import { removeNodeTitleHeight } from '@/renderer/core/layout/utils/nodeSizeUtil'
 
-import { syncNodeSlotLayoutsFromDOM } from './useSlotElementTracking'
+import {
+  scheduleSlotLayoutSync,
+  syncNodeSlotLayoutsFromDOM
+} from './useSlotElementTracking'
 
 /**
  * Generic update item for element bounds tracking
@@ -47,14 +50,14 @@ interface CachedNodeMeasurement {
 interface ElementTrackingConfig {
   /** Data attribute name (e.g., 'nodeId') */
   dataAttribute: string
-  /** Handler for processing bounds updates */
-  updateHandler: (updates: ElementBoundsUpdate[]) => void
+  /** Handler for processing bounds updates. Omit for signal-only entries. */
+  updateHandler?: (updates: ElementBoundsUpdate[]) => void
 }
 
 /**
  * Registry of tracking configurations by element type
  */
-const trackingConfigs: Map<string, ElementTrackingConfig> = new Map([
+const trackingConfigs = new Map<string, ElementTrackingConfig>([
   [
     'node',
     {
@@ -67,7 +70,10 @@ const trackingConfigs: Map<string, ElementTrackingConfig> = new Map([
         layoutStore.batchUpdateNodeBounds(nodeUpdates)
       }
     }
-  ]
+  ],
+  // Signal-only: outer node stays at its persisted min-h floor during
+  // widget hydration, so the inner grid's RO is the only slot-drift signal.
+  ['widgets-grid', { dataAttribute: 'widgetsGridNodeId' }]
 ])
 
 // Elements whose ResizeObserver fired while the tab was hidden
@@ -121,6 +127,14 @@ const resizeObserver = new ResizeObserver((entries) => {
     if (!(entry.target instanceof HTMLElement)) continue
     const element = entry.target
 
+    // Signal-only widgets-grid resize - route the parent node through the
+    // slot-layout pipeline and skip bounds processing entirely.
+    const widgetsGridParentNodeId = element.dataset.widgetsGridNodeId
+    if (widgetsGridParentNodeId) {
+      scheduleSlotLayoutSync(widgetsGridParentNodeId as NodeId)
+      continue
+    }
+
     // Find which type this element belongs to
     let elementType: string | undefined
     let elementId: string | undefined
@@ -238,7 +252,7 @@ const resizeObserver = new ResizeObserver((entries) => {
     // Flush per-type
     for (const [type, updates] of updatesByType) {
       const config = trackingConfigs.get(type)
-      if (config && updates.length) config.updateHandler(updates)
+      if (config?.updateHandler && updates.length) config.updateHandler(updates)
     }
   }
 
diff --git a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts
index fb1fba9f0b..4aa9717317 100644
--- a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts
+++ b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts
@@ -34,11 +34,21 @@ vi.mock('@/renderer/core/layout/transform/useTransformState', () => ({
   })
 }))
 
+const snapState = vi.hoisted(() => ({
+  shouldSnap: false,
+  applySnapToPosition: (pos: { x: number; y: number }) => pos,
+  applySnapToSize: (size: { width: number; height: number }) => size
+}))
+
 vi.mock('@/renderer/extensions/vueNodes/composables/useNodeSnap', () => ({
   useNodeSnap: () => ({
-    shouldSnap: vi.fn(() => false),
-    applySnapToPosition: vi.fn((pos: { x: number; y: number }) => pos),
-    applySnapToSize: vi.fn((size: { width: number; height: number }) => size)
+    shouldSnap: vi.fn(() => snapState.shouldSnap),
+    applySnapToPosition: vi.fn((pos: { x: number; y: number }) =>
+      snapState.applySnapToPosition(pos)
+    ),
+    applySnapToSize: vi.fn((size: { width: number; height: number }) =>
+      snapState.applySnapToSize(size)
+    )
   })
 }))
 
@@ -149,6 +159,9 @@ describe('useNodeResize', () => {
     vi.clearAllMocks()
     eventHandlers.pointermove = null
     eventHandlers.pointerup = null
+    snapState.shouldSnap = false
+    snapState.applySnapToPosition = (pos) => pos
+    snapState.applySnapToSize = (size) => size
 
     callback = vi.fn<ResizeCallback>()
     nodeElement = createMockNodeElement()
@@ -273,4 +286,230 @@ describe('useNodeResize', () => {
       expect(payload.position!.y).toBe(450)
     })
   })
+
+  describe('dynamic content height (re-measured per move)', () => {
+    function makeReflowingElement(
+      width: number,
+      height: number,
+      getMinContentHeight: () => number
+    ): HTMLElement {
+      const element = document.createElement('div')
+      element.setAttribute('data-node-id', 'test-node')
+      element.style.setProperty('min-width', `${MIN_NODE_WIDTH}px`)
+      element.getBoundingClientRect = () => {
+        const nodeHeight = element.style.getPropertyValue('--node-height')
+        const h = nodeHeight === '0px' ? getMinContentHeight() : height
+        return {
+          width,
+          height: h,
+          x: 0,
+          y: 0,
+          top: 0,
+          left: 0,
+          right: width,
+          bottom: h,
+          toJSON: () => {}
+        } as DOMRect
+      }
+      return element
+    }
+
+    async function setupDynamic(getMinContentHeight: () => number) {
+      vi.clearAllMocks()
+      eventHandlers.pointermove = null
+      eventHandlers.pointerup = null
+      const cb = vi.fn<ResizeCallback>()
+      const el = makeReflowingElement(300, 400, getMinContentHeight)
+      const h = createMockHandle(el)
+      const { useNodeResize } = await import('./useNodeResize')
+      const { startResize } = useNodeResize(cb)
+      return { cb, el, handle: h, startResize }
+    }
+
+    it('uses the latest measured content height when content reflows taller', async () => {
+      let currentMinHeight = 150
+      const {
+        cb,
+        handle: h,
+        startResize
+      } = await setupDynamic(() => currentMinHeight)
+
+      startResizeAt(startResize, h, 'SE')
+
+      // First move: clamp uses initial minContentHeight = 150
+      simulateMove(0, -300)
+      const firstPayload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(firstPayload.size.height).toBe(150)
+
+      // Content reflows taller (e.g. painter switches to compact layout)
+      currentMinHeight = 280
+
+      // Second move at the same position must reflect the new minimum,
+      // not the value captured at drag start.
+      simulateMove(0, -300)
+      const secondPayload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(secondPayload.size.height).toBe(280)
+    })
+
+    it('also re-measures for N corners and updates the y-position clamp', async () => {
+      let currentMinHeight = 150
+      const {
+        cb,
+        handle: h,
+        startResize
+      } = await setupDynamic(() => currentMinHeight)
+
+      startResizeAt(startResize, h, 'NW')
+
+      simulateMove(0, 500)
+      const firstPayload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(firstPayload.size.height).toBe(150)
+      expect(firstPayload.position!.y).toBe(450) // 200 + 400 - 150
+
+      currentMinHeight = 220
+
+      simulateMove(0, 500)
+      const secondPayload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(secondPayload.size.height).toBe(220)
+      expect(secondPayload.position!.y).toBe(380) // 200 + 400 - 220
+    })
+
+    it('stops responding to pointermove after pointerup', async () => {
+      const currentMinHeight = 150
+      const {
+        cb,
+        handle: h,
+        startResize
+      } = await setupDynamic(() => currentMinHeight)
+
+      startResizeAt(startResize, h, 'SE')
+      simulateMove(20, 20)
+      const callsBeforeUp = cb.mock.calls.length
+
+      const upEvent = createPointerEvent('pointerup', { pointerId: 1 })
+      eventHandlers.pointerup?.(upEvent)
+
+      // Subsequent moves should be ignored after cleanup
+      simulateMove(40, 40)
+      expect(cb.mock.calls.length).toBe(callsBeforeUp)
+    })
+
+    it('handles releasePointerCapture throwing without breaking cleanup', async () => {
+      const { cb, el, handle: h, startResize } = await setupDynamic(() => 150)
+      h.releasePointerCapture = vi.fn(() => {
+        throw new Error('already released')
+      })
+
+      startResizeAt(startResize, h, 'SE')
+      simulateMove(10, 10)
+
+      const upEvent = createPointerEvent('pointerup', { pointerId: 1 })
+      expect(() => eventHandlers.pointerup?.(upEvent)).not.toThrow()
+
+      // Further moves are ignored — cleanup still ran.
+      const callsAfterUp = cb.mock.calls.length
+      simulateMove(50, 50)
+      expect(cb.mock.calls.length).toBe(callsAfterUp)
+      expect(el).toBeDefined()
+    })
+
+    it('applies snap-to-grid on SE (size only)', async () => {
+      snapState.shouldSnap = true
+      snapState.applySnapToSize = ({ width, height }) => ({
+        width: Math.round(width / 10) * 10,
+        height: Math.round(height / 10) * 10
+      })
+
+      const { cb, handle: h, startResize } = await setupDynamic(() => 50)
+      startResizeAt(startResize, h, 'SE')
+      simulateMove(53, 27)
+
+      const payload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(payload.size.width).toBe(350) // 353 -> 350
+      expect(payload.size.height).toBe(430) // 427 -> 430
+      expect(payload.position).toBeUndefined()
+    })
+
+    it('applies snap-to-grid on NW (position + size compensation)', async () => {
+      snapState.shouldSnap = true
+      // Snap position down to nearest 10
+      snapState.applySnapToPosition = ({ x, y }) => ({
+        x: Math.floor(x / 10) * 10,
+        y: Math.floor(y / 10) * 10
+      })
+      snapState.applySnapToSize = ({ width, height }) => ({
+        width: Math.round(width / 10) * 10,
+        height: Math.round(height / 10) * 10
+      })
+
+      const { cb, handle: h, startResize } = await setupDynamic(() => 50)
+      startResizeAt(startResize, h, 'NW')
+      // delta: x=-53, y=-27 -> raw newX=47, newY=173
+      // applySnapToPosition floors -> {40, 170}
+      // size compensated: width += 47-40=7 (-> 360), height += 173-170=3 (-> 430)
+      // applySnapToSize rounds -> 360, 430
+      simulateMove(-53, -27)
+
+      const payload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(payload.position).toEqual({ x: 40, y: 170 })
+      expect(payload.size).toEqual({ width: 360, height: 430 })
+    })
+
+    it('restores --node-height after measuring (does not clobber state)', async () => {
+      const { el, handle: h, startResize } = await setupDynamic(() => 150)
+      el.style.setProperty('--node-height', '400px')
+
+      startResizeAt(startResize, h, 'SE')
+      simulateMove(10, 10)
+
+      // Probe value should be reverted, not left at '0px'
+      expect(el.style.getPropertyValue('--node-height')).toBe('400px')
+    })
+
+    it('measures with the candidate width applied (responsive breakpoint frame)', async () => {
+      // Simulate a responsive widget: when width < 350, content reflows to
+      // 280; when width >= 350, content fits in 150.
+      const breakpointAwareElement = (() => {
+        const element = document.createElement('div')
+        element.setAttribute('data-node-id', 'test-node')
+        element.style.setProperty('min-width', `${MIN_NODE_WIDTH}px`)
+        element.getBoundingClientRect = () => {
+          const nodeHeight = element.style.getPropertyValue('--node-height')
+          if (nodeHeight === '0px') {
+            const widthVar = element.style.getPropertyValue('--node-width')
+            const probedWidth = parseFloat(widthVar) || 300
+            const minH = probedWidth < 350 ? 280 : 150
+            return { width: probedWidth, height: minH } as DOMRect
+          }
+          return { width: 300, height: 400 } as DOMRect
+        }
+        return element
+      })()
+      const cb = vi.fn<ResizeCallback>()
+      const h = createMockHandle(breakpointAwareElement)
+      const { useNodeResize } = await import('./useNodeResize')
+      const { startResize } = useNodeResize(cb)
+
+      // Start at width=300 (still narrow side, but the breakpoint logic
+      // matters when the user attempts to shrink toward narrow on this frame).
+      breakpointAwareElement.style.setProperty('--node-width', '400px')
+      startResizeAt(startResize, h, 'SE')
+
+      // First move drives newWidth to 340 (below breakpoint). Probe must use
+      // 340, not the DOM's currently-applied 400, to return 280.
+      simulateMove(-60, -300)
+      const payload = cb.mock.calls.at(-1)![0] as ResizeCallbackPayload
+      expect(payload.size.height).toBe(280)
+    })
+
+    it('restores --node-width after probing (does not clobber state)', async () => {
+      const { el, handle: h, startResize } = await setupDynamic(() => 150)
+      el.style.setProperty('--node-width', '350px')
+
+      startResizeAt(startResize, h, 'SE')
+      simulateMove(10, 10)
+
+      expect(el.style.getPropertyValue('--node-width')).toBe('350px')
+    })
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
index 4fa73adf4d..132e1999a7 100644
--- a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
+++ b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
@@ -59,10 +59,17 @@ export function useNodeResize(
       height: rect.height / scale
     }
 
-    const savedNodeHeight = nodeElement.style.getPropertyValue('--node-height')
-    nodeElement.style.setProperty('--node-height', '0px')
-    const minContentHeight = nodeElement.getBoundingClientRect().height / scale
-    nodeElement.style.setProperty('--node-height', savedNodeHeight || '')
+    const measureMinContentHeight = (candidateWidth: number) => {
+      const savedWidth = nodeElement.style.getPropertyValue('--node-width')
+      const savedHeight = nodeElement.style.getPropertyValue('--node-height')
+      nodeElement.style.setProperty('--node-width', `${candidateWidth}px`)
+      nodeElement.style.setProperty('--node-height', '0px')
+      const measured = nodeElement.getBoundingClientRect().height
+      nodeElement.style.setProperty('--node-height', savedHeight || '')
+      nodeElement.style.setProperty('--node-width', savedWidth || '')
+      const currentScale = transformState.camera.z || 1
+      return measured / currentScale
+    }
 
     const nodeLayout = layoutStore.getNodeLayoutRef(nodeId).value
     const startPosition: Point = nodeLayout
@@ -165,6 +172,12 @@ export function useNodeResize(
         }
         newWidth = minWidth
       }
+      // Re-measure on each move with the candidate width applied: widget
+      // content (e.g. painter controls) can re-flow taller as width shrinks,
+      // raising the true minimum. Probing with newWidth — not the DOM's
+      // current width — keeps the clamp accurate on the frame that crosses
+      // a responsive breakpoint.
+      const minContentHeight = measureMinContentHeight(newWidth)
       if (newHeight < minContentHeight) {
         if (activeCorner.includes('N')) {
           newY =
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
index ee2b72a300..6436382e35 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
@@ -5,6 +5,9 @@
       :class="isEditing ? 'invisible' : 'visible'"
       tabindex="0"
       data-capture-wheel="true"
+      role="textarea"
+      :aria-label="widget.name || $t('g.markdown')"
+      aria-readonly="true"
       v-html="renderedHtml"
     />
 
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue b/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue
index 2580fd6a5b..8348bf45aa 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue
@@ -9,6 +9,8 @@ const {
   searcher = async () => {},
   updateKey,
   autofocus = false,
+  debounceMs = 250,
+  debounceMaxWaitMs = 1000,
   class: customClass
 } = defineProps<{
   searcher?: (
@@ -17,14 +19,16 @@ const {
   ) => Promise<void>
   updateKey?: MaybeRefOrGetter<unknown>
   autofocus?: boolean
+  debounceMs?: number
+  debounceMaxWaitMs?: number
   class?: HTMLAttributes['class']
 }>()
 
 const searchQuery = defineModel<string>({ default: '' })
 
 const isQuerying = ref(false)
-const debouncedSearchQuery = refDebounced(searchQuery, 250, {
-  maxWait: 1000
+const debouncedSearchQuery = refDebounced(searchQuery, debounceMs, {
+  maxWait: debounceMaxWaitMs
 })
 watch(searchQuery, (value) => {
   isQuerying.value = value !== debouncedSearchQuery.value
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
index 6d514c096f..08cede8aa0 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
@@ -349,7 +349,7 @@ describe('useComboWidget', () => {
     const HASH_FILENAME_2 =
       'a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456.jpg'
 
-    it.each([
+    it.for([
       { nodeClass: 'LoadImage', inputName: 'image' },
       { nodeClass: 'LoadVideo', inputName: 'video' },
       { nodeClass: 'LoadAudio', inputName: 'audio' }
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts
index 7dcac57f0a..5b6bff0145 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts
@@ -683,6 +683,95 @@ describe('useWidgetSelectItems', () => {
     })
   })
 
+  describe('output asset subfolder', () => {
+    it('prefixes the subfolder onto the annotated path so the load URL targets the right folder', async () => {
+      mockMediaAssets.media.value = [
+        {
+          id: 'asset-mesh-1',
+          name: 'ComfyUI_00105_.glb',
+          preview_url: '',
+          tags: ['output'],
+          user_metadata: {
+            jobId: 'job-mesh',
+            nodeId: '7',
+            subfolder: '3d'
+          }
+        }
+      ]
+
+      const { dropdownItems, filterSelected } = useWidgetSelectItems(
+        createDefaultOptions({
+          values: () => [],
+          modelValue: ref(undefined),
+          assetKind: () => 'mesh' as const
+        })
+      )
+      filterSelected.value = 'outputs'
+      await nextTick()
+
+      expect(dropdownItems.value).toHaveLength(1)
+      expect(dropdownItems.value[0].name).toBe('3d/ComfyUI_00105_.glb [output]')
+    })
+
+    it('omits the subfolder prefix when the asset has none', async () => {
+      mockMediaAssets.media.value = [
+        {
+          id: 'asset-mesh-2',
+          name: 'plain.glb',
+          preview_url: '',
+          tags: ['output'],
+          user_metadata: {
+            jobId: 'job-plain',
+            nodeId: '8',
+            subfolder: ''
+          }
+        }
+      ]
+
+      const { dropdownItems, filterSelected } = useWidgetSelectItems(
+        createDefaultOptions({
+          values: () => [],
+          modelValue: ref(undefined),
+          assetKind: () => 'mesh' as const
+        })
+      )
+      filterSelected.value = 'outputs'
+      await nextTick()
+
+      expect(dropdownItems.value).toHaveLength(1)
+      expect(dropdownItems.value[0].name).toBe('plain.glb [output]')
+    })
+
+    it('does not prefix the subfolder for non-mesh kinds even when present', async () => {
+      mockMediaAssets.media.value = [
+        {
+          id: 'asset-image-1',
+          name: 'photo.png',
+          preview_url: '',
+          tags: ['output'],
+          user_metadata: {
+            jobId: 'job-image',
+            nodeId: '9',
+            subfolder: 'sub'
+          }
+        }
+      ]
+
+      const { dropdownItems, filterSelected } = useWidgetSelectItems(
+        createDefaultOptions({
+          values: () => [],
+          modelValue: ref(undefined),
+          assetKind: () => 'image' as const
+        })
+      )
+      filterSelected.value = 'outputs'
+      await nextTick()
+
+      expect(dropdownItems.value).toHaveLength(1)
+      expect(dropdownItems.value[0].name).toBe('photo.png [output]')
+    })
+  })
+
   describe('FE-228: output dropdown label uses human-readable filename', () => {
     it('renders metadata.filename in label when asset.name is a hash', async () => {
       mockMediaAssets.media.value = [
@@ -782,4 +871,136 @@ describe('useWidgetSelectItems', () => {
       expect(selectedSet.value.has('missing-nonexistent.png')).toBe(true)
     })
   })
+
+  describe('FE-230 missing-media filtering', () => {
+    it('drops input items whose name is in the missing-media store', async () => {
+      const { useMissingMediaStore } =
+        await import('@/platform/missingMedia/missingMediaStore')
+      const store = useMissingMediaStore()
+      store.setMissingMedia([
+        {
+          nodeId: '1',
+          nodeType: 'LoadImage',
+          widgetName: 'image',
+          mediaType: 'image',
+          name: 'photo_abc.jpg',
+          isMissing: true
+        }
+      ])
+
+      const { dropdownItems } = useWidgetSelectItems(createDefaultOptions())
+      const names = dropdownItems.value.map((i) => i.name)
+      expect(names).not.toContain('photo_abc.jpg')
+      expect(names).toContain('img_001.png')
+    })
+
+    it('drops output items whose annotated path is in the missing-media store', async () => {
+      mockMediaAssets = createMockMediaAssets()
+      mockMediaAssets.media.value = [
+        {
+          id: 'a1',
+          name: 'gone.png',
+          size: 0,
+          tags: [],
+          created_at: '2025-01-01T00:00:00Z'
+        } as AssetItem,
+        {
+          id: 'a2',
+          name: 'kept.png',
+          size: 0,
+          tags: [],
+          created_at: '2025-01-01T00:00:00Z'
+        } as AssetItem
+      ]
+
+      const { useMissingMediaStore } =
+        await import('@/platform/missingMedia/missingMediaStore')
+      const store = useMissingMediaStore()
+      store.setMissingMedia([
+        {
+          nodeId: '7',
+          nodeType: 'LoadImage',
+          widgetName: 'image',
+          mediaType: 'image',
+          name: 'gone.png [output]',
+          isMissing: true
+        }
+      ])
+
+      const { dropdownItems } = useWidgetSelectItems(
+        createDefaultOptions({
+          values: () => [],
+          outputMediaAssets: mockMediaAssets
+        })
+      )
+      await nextTick()
+
+      const names = dropdownItems.value.map((i) => i.name)
+      expect(names).not.toContain('gone.png [output]')
+      expect(names).toContain('kept.png [output]')
+    })
+
+    it('does not cross-match basenames across input and output sources', async () => {
+      mockMediaAssets = createMockMediaAssets()
+      mockMediaAssets.media.value = [
+        {
+          id: 'a1',
+          name: 'photo_abc.jpg',
+          size: 0,
+          tags: [],
+          created_at: '2025-01-01T00:00:00Z'
+        } as AssetItem
+      ]
+
+      const { useMissingMediaStore } =
+        await import('@/platform/missingMedia/missingMediaStore')
+      const store = useMissingMediaStore()
+      store.setMissingMedia([
+        {
+          nodeId: '1',
+          nodeType: 'LoadImage',
+          widgetName: 'image',
+          mediaType: 'image',
+          name: 'photo_abc.jpg',
+          isMissing: true
+        }
+      ])
+
+      const { dropdownItems } = useWidgetSelectItems(
+        createDefaultOptions({ outputMediaAssets: mockMediaAssets })
+      )
+      await nextTick()
+
+      const names = dropdownItems.value.map((i) => i.name)
+      expect(names).not.toContain('photo_abc.jpg')
+      expect(names).toContain('photo_abc.jpg [output]')
+    })
+
+    it('does not surface a missing-value placeholder when the modelValue is confirmed missing', async () => {
+      const modelValue = ref<string | undefined>('gone.png [output]')
+
+      const { useMissingMediaStore } =
+        await import('@/platform/missingMedia/missingMediaStore')
+      const store = useMissingMediaStore()
+      store.setMissingMedia([
+        {
+          nodeId: '7',
+          nodeType: 'LoadImage',
+          widgetName: 'image',
+          mediaType: 'image',
+          name: 'gone.png [output]',
+          isMissing: true
+        }
+      ])
+
+      const { dropdownItems, selectedSet } = useWidgetSelectItems(
+        createDefaultOptions({ modelValue, values: () => [] })
+      )
+      await nextTick()
+
+      const names = dropdownItems.value.map((i) => i.name)
+      expect(names).not.toContain('gone.png [output]')
+      expect(selectedSet.value.size).toBe(0)
+    })
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts
index 55d27acd1b..8450bb0f46 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts
@@ -5,6 +5,7 @@ import type { MaybeRefOrGetter, Ref } from 'vue'
 import { t } from '@/i18n'
 import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { useAssetFilterOptions } from '@/platform/assets/composables/useAssetFilterOptions'
+import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
 import {
   filterItemByBaseModels,
   filterItemByOwnership
@@ -72,6 +73,14 @@ interface UseWidgetSelectItemsOptions {
 export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) {
   const { modelValue, outputMediaAssets, assetData } = options
 
+  const missingMediaStore = useMissingMediaStore()
+  const missingMediaValues = computed<ReadonlySet<string>>(
+    () =>
+      new Set(
+        missingMediaStore.missingMediaCandidates?.map((c) => c.name) ?? []
+      )
+  )
+
   const filterSelected = ref('all')
   const filterOptions = computed<FilterOption[]>(() => {
     const isAsset = toValue(options.isAssetMode)
@@ -153,12 +162,15 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) {
 
     const labelFn = toValue(options.getOptionLabel)
     const kind = toValue(options.assetKind)
-    return values.map((value, index) => ({
-      id: `input-${index}`,
-      preview_url: getMediaUrl(String(value), 'input', kind),
-      name: String(value),
-      label: getDisplayLabel(String(value), labelFn)
-    }))
+    const missing = missingMediaValues.value
+    return values
+      .filter((value) => !missing.has(String(value)))
+      .map((value, index) => ({
+        id: `input-${index}`,
+        preview_url: getMediaUrl(String(value), 'input', kind),
+        name: String(value),
+        label: getDisplayLabel(String(value), labelFn)
+      }))
   })
 
   const outputItems = computed<FormDropdownItem[]>(() => {
@@ -176,11 +188,20 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) {
       return resolved ?? [asset]
     })
 
+    const missing = missingMediaValues.value
     for (const asset of assets) {
       if (getMediaTypeFromFilename(asset.name) !== targetMediaType) continue
       if (seen.has(asset.id)) continue
       seen.add(asset.id)
-      const annotatedPath = `${asset.name} [output]`
+      const subfolder =
+        kind === 'mesh'
+          ? getOutputAssetMetadata(asset.user_metadata)?.subfolder
+          : undefined
+      const pathWithSubfolder = subfolder
+        ? `${subfolder}/${asset.name}`
+        : asset.name
+      const annotatedPath = `${pathWithSubfolder} [output]`
+      if (missing.has(annotatedPath)) continue
       const displayLabel = `${getAssetDisplayFilename(asset)} [output]`
       items.push({
         id: `output-${asset.id}`,
@@ -202,6 +223,8 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) {
     const labelFn = toValue(options.getOptionLabel)
     const kind = toValue(options.assetKind)
 
+    if (missingMediaValues.value.has(currentValue)) return undefined
+
     if (toValue(options.isAssetMode) && assetData) {
       const existsInAssets = assetData.assets.value.some(
         (asset) => getAssetFilename(asset) === currentValue
diff --git a/src/schemas/nodeDef/migration.test.ts b/src/schemas/nodeDef/migration.test.ts
index 7250918f11..61bfd0bb50 100644
--- a/src/schemas/nodeDef/migration.test.ts
+++ b/src/schemas/nodeDef/migration.test.ts
@@ -519,7 +519,7 @@ describe('ComfyNodeDefImpl', () => {
     expect(result.inputs['floatInput']).toBeDefined()
   })
 
-  it.each([
+  it.for([
     { api_node: true, expected: true },
     { api_node: false, expected: false },
     { api_node: undefined, expected: false }
diff --git a/src/schemas/nodeDefSchema.ts b/src/schemas/nodeDefSchema.ts
index 14135ab121..e1040a4fcb 100644
--- a/src/schemas/nodeDefSchema.ts
+++ b/src/schemas/nodeDefSchema.ts
@@ -1,379 +1 @@
-import { z } from 'zod'
-import { fromZodError } from 'zod-validation-error'
-
-import { resultItemType } from '@/schemas/apiSchema'
-import { CONTROL_OPTIONS } from '@/types/simplifiedWidget'
-
-const zComboOption = z.union([z.string(), z.number()])
-const zRemoteWidgetConfig = z.object({
-  route: z.string().url().or(z.string().startsWith('/')),
-  refresh: z.number().gte(128).safe().or(z.number().lte(0).safe()).optional(),
-  response_key: z.string().optional(),
-  query_params: z.record(z.string(), z.string()).optional(),
-  refresh_button: z.boolean().optional(),
-  control_after_refresh: z.enum(['first', 'last']).optional(),
-  timeout: z.number().gte(0).optional(),
-  max_retries: z.number().gte(0).optional()
-})
-const zMultiSelectOption = z.object({
-  placeholder: z.string().optional(),
-  chip: z.boolean().optional()
-})
-
-export const zBaseInputOptions = z
-  .object({
-    default: z.any().optional(),
-    defaultInput: z.boolean().optional(),
-    display_name: z.string().optional(),
-    forceInput: z.boolean().optional(),
-    tooltip: z.string().optional(),
-    socketless: z.boolean().optional(),
-    hidden: z.boolean().optional(),
-    advanced: z.boolean().optional(),
-    widgetType: z.string().optional(),
-    /** Backend-only properties. */
-    rawLink: z.boolean().optional(),
-    lazy: z.boolean().optional()
-  })
-  .passthrough()
-
-const zNumericInputOptions = zBaseInputOptions.extend({
-  min: z.number().optional(),
-  max: z.number().optional(),
-  step: z.number().optional(),
-  /** Note: Many node authors are using INT/FLOAT to pass list of INT/FLOAT. */
-  default: z.union([z.number(), z.array(z.number())]).optional(),
-  display: z.enum(['slider', 'number', 'knob', 'gradientslider']).optional()
-})
-
-export const zIntInputOptions = zNumericInputOptions.extend({
-  /**
-   * If true, a linked widget will be added to the node to select the mode
-   * of `control_after_generate`.
-   */
-  control_after_generate: z
-    .union([z.boolean(), z.enum(CONTROL_OPTIONS)])
-    .optional()
-})
-
-export const zColorStop = z.object({
-  offset: z.number(),
-  color: z.tuple([z.number(), z.number(), z.number()])
-})
-
-export const zFloatInputOptions = zNumericInputOptions.extend({
-  round: z.union([z.number(), z.literal(false)]).optional(),
-  gradient_stops: z.array(zColorStop).optional()
-})
-
-export const zBooleanInputOptions = zBaseInputOptions.extend({
-  label_on: z.string().optional(),
-  label_off: z.string().optional(),
-  default: z.boolean().optional()
-})
-
-export const zStringInputOptions = zBaseInputOptions.extend({
-  default: z.string().optional(),
-  multiline: z.boolean().optional(),
-  dynamicPrompts: z.boolean().optional(),
-
-  // Multiline-only fields
-  defaultVal: z.string().optional(),
-  placeholder: z.string().optional()
-})
-
-export const zComboInputOptions = zBaseInputOptions.extend({
-  control_after_generate: z
-    .union([z.boolean(), z.enum(CONTROL_OPTIONS)])
-    .optional(),
-  image_upload: z.boolean().optional(),
-  image_folder: resultItemType.optional(),
-  allow_batch: z.boolean().optional(),
-  video_upload: z.boolean().optional(),
-  audio_upload: z.boolean().optional(),
-  mesh_upload: z.boolean().optional(),
-  upload_subfolder: z.string().optional(),
-  animated_image_upload: z.boolean().optional(),
-  options: z.array(zComboOption).optional(),
-  remote: zRemoteWidgetConfig.optional(),
-  /** Whether the widget is a multi-select widget. */
-  multi_select: zMultiSelectOption.optional()
-})
-
-const zIntInputSpec = z.tuple([z.literal('INT'), zIntInputOptions.optional()])
-const zFloatInputSpec = z.tuple([
-  z.literal('FLOAT'),
-  zFloatInputOptions.optional()
-])
-const zBooleanInputSpec = z.tuple([
-  z.literal('BOOLEAN'),
-  zBooleanInputOptions.optional()
-])
-const zStringInputSpec = z.tuple([
-  z.literal('STRING'),
-  zStringInputOptions.optional()
-])
-/**
- * Legacy combo syntax.
- * @deprecated Use `zComboInputSpecV2` instead.
- */
-const zComboInputSpec = z.tuple([
-  z.array(zComboOption),
-  zComboInputOptions.optional()
-])
-const zComboInputSpecV2 = z.tuple([
-  z.literal('COMBO'),
-  zComboInputOptions.optional()
-])
-
-export function isComboInputSpecV1(
-  inputSpec: InputSpec
-): inputSpec is ComboInputSpec {
-  return Array.isArray(inputSpec[0])
-}
-
-export function isIntInputSpec(
-  inputSpec: InputSpec
-): inputSpec is IntInputSpec {
-  return inputSpec[0] === 'INT'
-}
-
-export function isFloatInputSpec(
-  inputSpec: InputSpec
-): inputSpec is FloatInputSpec {
-  return inputSpec[0] === 'FLOAT'
-}
-
-export function isComboInputSpecV2(
-  inputSpec: InputSpec
-): inputSpec is ComboInputSpecV2 {
-  return inputSpec[0] === 'COMBO'
-}
-
-export function isComboInputSpec(
-  inputSpec: InputSpec
-): inputSpec is ComboInputSpec | ComboInputSpecV2 {
-  return isComboInputSpecV1(inputSpec) || isComboInputSpecV2(inputSpec)
-}
-
-export function isMediaUploadComboInput(inputSpec: InputSpec): boolean {
-  const [inputName, inputOptions] = inputSpec
-  if (!inputOptions) return false
-
-  const isUploadInput =
-    inputOptions['image_upload'] === true ||
-    inputOptions['video_upload'] === true ||
-    inputOptions['animated_image_upload'] === true
-
-  return (
-    isUploadInput && (isComboInputSpecV1(inputSpec) || inputName === 'COMBO')
-  )
-}
-
-/**
- * Get the type of an input spec.
- *
- * @param inputSpec - The input spec to get the type of.
- * @returns The type of the input spec.
- */
-export function getInputSpecType(inputSpec: InputSpec): string {
-  return isComboInputSpec(inputSpec) ? 'COMBO' : inputSpec[0]
-}
-
-/**
- * Get the combo options from a combo input spec.
- *
- * @param inputSpec - The input spec to get the combo options from.
- * @returns The combo options.
- */
-export function getComboSpecComboOptions(
-  inputSpec: ComboInputSpec | ComboInputSpecV2
-): (number | string)[] {
-  return (
-    (isComboInputSpecV2(inputSpec) ? inputSpec[1]?.options : inputSpec[0]) ?? []
-  )
-}
-
-const excludedLiterals = new Set(['INT', 'FLOAT', 'BOOLEAN', 'STRING', 'COMBO'])
-const zCustomInputSpec = z.tuple([
-  z.string().refine((value) => !excludedLiterals.has(value)),
-  zBaseInputOptions.optional()
-])
-
-const zInputSpec = z.union([
-  zIntInputSpec,
-  zFloatInputSpec,
-  zBooleanInputSpec,
-  zStringInputSpec,
-  zComboInputSpec,
-  zComboInputSpecV2,
-  zCustomInputSpec
-])
-
-const zComfyInputsSpec = z.object({
-  required: z.record(zInputSpec).optional(),
-  optional: z.record(zInputSpec).optional(),
-  // Frontend repo is not using it, but some custom nodes are using the
-  // hidden field to pass various values.
-  hidden: z.record(z.any()).optional()
-})
-
-const zComfyNodeDataType = z.string()
-const zComfyComboOutput = z.array(zComboOption)
-const zComfyOutputTypesSpec = z.array(
-  z.union([zComfyNodeDataType, zComfyComboOutput])
-)
-
-/**
- * Widget dependency with type information.
- * Provides strong type enforcement for JSONata evaluation context.
- */
-const zWidgetDependency = z.object({
-  name: z.string(),
-  type: z.string()
-})
-
-export type WidgetDependency = z.infer<typeof zWidgetDependency>
-
-/**
- * Schema for price badge depends_on field.
- * Specifies which widgets and inputs the pricing expression depends on.
- * Widgets must be specified as objects with name and type.
- */
-const zPriceBadgeDepends = z.object({
-  widgets: z.array(zWidgetDependency).optional().default([]),
-  inputs: z.array(z.string()).optional().default([]),
-  /**
-   * Autogrow input group names to track.
-   * For each group, the count of connected inputs will be available in the
-   * JSONata context as `g.<groupName>`.
-   * Example: `input_groups: ["reference_videos"]` makes `g.reference_videos`
-   * available with the count of connected inputs like `reference_videos.character1`, etc.
-   */
-  input_groups: z.array(z.string()).optional().default([])
-})
-
-/**
- * Schema for price badge definition.
- * Used to calculate and display pricing information for API nodes.
- * The `expr` field contains a JSONata expression that returns a PricingResult.
- */
-const zPriceBadge = z.object({
-  engine: z.literal('jsonata').optional().default('jsonata'),
-  depends_on: zPriceBadgeDepends
-    .optional()
-    .default({ widgets: [], inputs: [], input_groups: [] }),
-  expr: z.string()
-})
-
-export type PriceBadge = z.infer<typeof zPriceBadge>
-
-export const zComfyNodeDef = z.object({
-  input: zComfyInputsSpec.optional(),
-  output: zComfyOutputTypesSpec.optional(),
-  output_is_list: z.array(z.boolean()).optional(),
-  output_name: z.array(z.string()).optional(),
-  output_tooltips: z.array(z.string()).optional(),
-  output_matchtypes: z.array(z.string().optional()).optional(),
-  name: z.string(),
-  display_name: z.string(),
-  description: z.string(),
-  help: z.string().optional(),
-  category: z.string(),
-  main_category: z.string().optional(),
-  output_node: z.boolean(),
-  python_module: z.string(),
-  deprecated: z.boolean().optional(),
-  experimental: z.boolean().optional(),
-  dev_only: z.boolean().optional(),
-  /**
-   * Whether the node is an API node. Running API nodes requires login to
-   * Comfy Org account.
-   * https://docs.comfy.org/tutorials/api-nodes/overview
-   */
-  api_node: z.boolean().optional(),
-  /**
-   * Specifies the order of inputs for each input category.
-   * Used to ensure consistent widget ordering regardless of JSON serialization.
-   * Keys are 'required', 'optional', etc., values are arrays of input names.
-   */
-  input_order: z.record(z.array(z.string())).optional(),
-  /**
-   * Alternative names for search. Useful for synonyms, abbreviations,
-   * or old names after renaming a node.
-   */
-  search_aliases: z.array(z.string()).optional(),
-  /**
-   * Price badge definition for API nodes.
-   * Contains a JSONata expression to calculate pricing based on widget values
-   * and input connectivity.
-   */
-  price_badge: zPriceBadge.optional(),
-  /** Category for the Essentials tab. If set, the node appears in Essentials. */
-  essentials_category: z.string().optional(),
-  /** Whether the blueprint is a global/installed blueprint (not user-created). */
-  isGlobal: z.boolean().optional()
-})
-
-export const zAutogrowOptions = z.object({
-  ...zBaseInputOptions.shape,
-  template: z.object({
-    input: zComfyInputsSpec,
-    names: z.array(z.string()).optional(),
-    max: z.number().optional(),
-    //Backend defines as mandatory with min 1, Frontend is more forgiving
-    min: z.number().optional(),
-    prefix: z.string().optional()
-  })
-})
-
-export const zDynamicComboInputSpec = z.tuple([
-  z.literal('COMFY_DYNAMICCOMBO_V3'),
-  zBaseInputOptions.extend({
-    options: z.array(
-      z.object({
-        inputs: zComfyInputsSpec,
-        key: z.string()
-      })
-    )
-  })
-])
-
-export const zMatchTypeOptions = z.object({
-  ...zBaseInputOptions.shape,
-  type: z.literal('COMFY_MATCHTYPE_V3'),
-  template: z.object({
-    allowed_types: z.string(),
-    template_id: z.string()
-  })
-})
-
-// `/object_info`
-export type ComfyInputsSpec = z.infer<typeof zComfyInputsSpec>
-export type ComfyOutputTypesSpec = z.infer<typeof zComfyOutputTypesSpec>
-export type ComfyNodeDef = z.infer<typeof zComfyNodeDef>
-export type RemoteWidgetConfig = z.infer<typeof zRemoteWidgetConfig>
-
-export type ComboInputOptions = z.infer<typeof zComboInputOptions>
-export type NumericInputOptions = z.infer<typeof zNumericInputOptions>
-
-export type IntInputSpec = z.infer<typeof zIntInputSpec>
-export type FloatInputSpec = z.infer<typeof zFloatInputSpec>
-export type ComboInputSpec = z.infer<typeof zComboInputSpec>
-export type ComboInputSpecV2 = z.infer<typeof zComboInputSpecV2>
-export type InputSpec = z.infer<typeof zInputSpec>
-
-export function validateComfyNodeDef(
-  data: unknown,
-  onError: (error: string) => void = console.warn
-): ComfyNodeDef | null {
-  const result = zComfyNodeDef.safeParse(data)
-  if (!result.success) {
-    const zodError = fromZodError(result.error)
-    onError(
-      `Invalid ComfyNodeDef: ${JSON.stringify(data)}\n${zodError.message}`
-    )
-    return null
-  }
-  return result.data
-}
+export * from '@comfyorg/object-info-parser'
diff --git a/src/scripts/api.ts b/src/scripts/api.ts
index 23f074b99c..1acc69717d 100644
--- a/src/scripts/api.ts
+++ b/src/scripts/api.ts
@@ -1005,13 +1005,14 @@ export class ComfyApi extends EventTarget {
    * Gets the current state of the queue
    * @returns The currently running and queued items
    */
-  async getQueue(): Promise<{
+  async getQueue(options?: { throwOnError?: boolean }): Promise<{
     Running: JobListItem[]
     Pending: JobListItem[]
   }> {
     try {
       return await fetchQueue(this.fetchApi.bind(this))
     } catch (error) {
+      if (options?.throwOnError) throw error
       console.error('Failed to fetch queue:', error)
       return { Running: [], Pending: [] }
     }
diff --git a/src/scripts/app.test.ts b/src/scripts/app.test.ts
index 138a759376..548bf08ca4 100644
--- a/src/scripts/app.test.ts
+++ b/src/scripts/app.test.ts
@@ -436,4 +436,30 @@ describe('ComfyApp', () => {
       )
     })
   })
+
+  describe('drop handler', () => {
+    it('syncs graph_mouse from the drop event before downstream handlers run', async () => {
+      // graph_mouse is only updated on mousemove, so when files are dragged in
+      // from another window the canvas-space cursor is stale. The drop handler
+      // must derive the position from the drop event itself.
+      const graphMouse: [number, number] = [-999, -999]
+      const adjustMouseEvent = vi.fn((e: DragEvent) => {
+        ;(e as DragEvent & { canvasX: number; canvasY: number }).canvasX = 123
+        ;(e as DragEvent & { canvasX: number; canvasY: number }).canvasY = 456
+      })
+      app.canvas = {
+        ...mockCanvas,
+        graph_mouse: graphMouse,
+        adjustMouseEvent
+      } as unknown as LGraphCanvas
+
+      ;(app as unknown as { addDropHandler(): void }).addDropHandler()
+
+      document.dispatchEvent(new DragEvent('drop'))
+      await Promise.resolve()
+
+      expect(adjustMouseEvent).toHaveBeenCalledTimes(1)
+      expect(graphMouse).toEqual([123, 456])
+    })
+  })
 })
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index 5b6c8b214b..d6a7702ffd 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -96,7 +96,7 @@ import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
 import type { MissingMediaCandidate } from '@/platform/missingMedia/types'
 import {
   scanAllMediaCandidates,
-  verifyCloudMediaCandidates
+  verifyMediaCandidates
 } from '@/platform/missingMedia/missingMediaScan'
 
 import { anyItemOverlapsRect } from '@/utils/mathUtil'
@@ -591,6 +591,13 @@ export class ComfyApp {
         event.preventDefault()
         event.stopPropagation()
 
+        // graph_mouse is only updated on mousemove, so when files are dragged
+        // in from another window the canvas-space cursor is stale. Sync it
+        // from the drop event so nodes created below land at the cursor.
+        this.canvas.adjustMouseEvent(event)
+        this.canvas.graph_mouse[0] = event.canvasX
+        this.canvas.graph_mouse[1] = event.canvasY
+
         const n = this.dragOverNode
         this.dragOverNode = null
         // Node handles file drop, we dont use the built in onDropFile handler as its buggy
@@ -1508,9 +1515,13 @@ export class ComfyApp {
       return
     }
 
-    if (isCloud) {
+    const pending = candidates.some((c) => c.isMissing === undefined)
+    if (pending) {
       const controller = missingMediaStore.createVerificationAbortController()
-      void verifyCloudMediaCandidates(candidates, controller.signal)
+      void verifyMediaCandidates(candidates, {
+        isCloud,
+        signal: controller.signal
+      })
         .then(() => {
           if (controller.signal.aborted) return
           // Re-check ancestor after async verification (see model pipeline).
diff --git a/src/scripts/changeTracker.ts b/src/scripts/changeTracker.ts
index 0218a793ae..da7d861405 100644
--- a/src/scripts/changeTracker.ts
+++ b/src/scripts/changeTracker.ts
@@ -24,20 +24,12 @@ function isActiveTracker(tracker: ChangeTracker): boolean {
   return useWorkflowStore().activeWorkflow?.changeTracker === tracker
 }
 
-const reportedInactiveCalls = new Set<string>()
-
 /**
  * Report a ChangeTracker method being called on an inactive tracker —
  * a lifecycle violation that usually indicates stale extension state or
- * an incorrect call ordering. Reports once per method per workflow per
- * session so the signal is not drowned out by hot-path invocations while
- * still distinguishing between workflows.
+ * an incorrect call ordering.
  */
 function reportInactiveTrackerCall(method: string, workflowPath: string) {
-  const key = `${method}:${workflowPath}`
-  if (reportedInactiveCalls.has(key)) return
-  reportedInactiveCalls.add(key)
-
   console.warn(`${method}() called on inactive tracker for: ${workflowPath}`)
 
   if (isDesktop) {
diff --git a/src/scripts/metadata/__fixtures__/with_metadata.png b/src/scripts/metadata/__fixtures__/with_metadata.png
new file mode 100644
index 0000000000..257a354b3d
Binary files /dev/null and b/src/scripts/metadata/__fixtures__/with_metadata.png differ
diff --git a/src/services/dialogService.renderer.test.ts b/src/services/dialogService.renderer.test.ts
new file mode 100644
index 0000000000..ce10784161
--- /dev/null
+++ b/src/services/dialogService.renderer.test.ts
@@ -0,0 +1,63 @@
+/**
+ * Phase 1 dialog migration regression net: when `dialogService.prompt()`,
+ * `dialogService.confirm()`, or `dialogService.showBillingComingSoonDialog()`
+ * is invoked, the dialog stack item must carry `renderer: 'reka'`. Catches
+ * accidental reverts of the Reka renderer flip.
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const showDialog = vi.hoisted(() => vi.fn())
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({ showDialog })
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => ({ trackEvent: vi.fn() })
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    isActiveSubscription: { value: true },
+    isFreeTier: { value: false },
+    type: { value: 'legacy' }
+  })
+}))
+
+import { useDialogService } from '@/services/dialogService'
+
+describe('dialogService Reka renderer opt-in (Phase 1)', () => {
+  beforeEach(() => {
+    showDialog.mockReset()
+  })
+
+  it("prompt() sets renderer 'reka' and size 'md'", () => {
+    void useDialogService().prompt({ title: 'T', message: 'M' })
+    const [args] = showDialog.mock.calls[0]
+    expect(args.dialogComponentProps.renderer).toBe('reka')
+    expect(args.dialogComponentProps.size).toBe('md')
+  })
+
+  it("confirm() sets renderer 'reka' and size 'md'", () => {
+    void useDialogService().confirm({ title: 'T', message: 'M' })
+    const [args] = showDialog.mock.calls[0]
+    expect(args.dialogComponentProps.renderer).toBe('reka')
+    expect(args.dialogComponentProps.size).toBe('md')
+  })
+
+  it("showBillingComingSoonDialog() sets renderer 'reka', size 'sm', and 360px contentClass", () => {
+    useDialogService().showBillingComingSoonDialog()
+    const [args] = showDialog.mock.calls[0]
+    expect(args.dialogComponentProps.renderer).toBe('reka')
+    expect(args.dialogComponentProps.size).toBe('sm')
+    expect(args.dialogComponentProps.contentClass).toBe('max-w-[360px]')
+  })
+})
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index 41993c64ad..4b1fb67de8 100644
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -42,6 +42,31 @@ export type ConfirmationDialogType =
   | 'reinstall'
   | 'info'
 
+interface BaseConfirmOptions {
+  /** Dialog heading */
+  title: string
+  /** The main message body */
+  message: string
+  /** Displayed as an unordered list immediately below the message body */
+  itemList?: string[]
+  hint?: string
+}
+
+type ConfirmOptions = BaseConfirmOptions &
+  (
+    | {
+        /** Pre-configured dialog type */
+        type: 'dirtyClose'
+        /** Override the deny button label. Defaults to `g.no`. */
+        denyLabel?: string
+      }
+    | {
+        /** Pre-configured dialog type */
+        type?: Exclude<ConfirmationDialogType, 'dirtyClose'>
+        denyLabel?: never
+      }
+  )
+
 /**
  * Minimal interface for execution error dialogs.
  * Satisfied by both ExecutionErrorWsMessage (WebSocket) and ExecutionError (Jobs API).
@@ -226,6 +251,8 @@ export const useDialogService = () => {
           placeholder
         },
         dialogComponentProps: {
+          renderer: 'reka',
+          size: 'md',
           onClose: () => {
             resolve(null)
           }
@@ -244,18 +271,9 @@ export const useDialogService = () => {
     message,
     type = 'default',
     itemList = [],
-    hint
-  }: {
-    /** Dialog heading */
-    title: string
-    /** The main message body */
-    message: string
-    /** Pre-configured dialog type */
-    type?: ConfirmationDialogType
-    /** Displayed as an unordered list immediately below the message body */
-    itemList?: string[]
-    hint?: string
-  }): Promise<boolean | null> {
+    hint,
+    denyLabel
+  }: ConfirmOptions): Promise<boolean | null> {
     return new Promise((resolve) => {
       const options: ShowDialogOptions = {
         key: 'global-prompt',
@@ -266,9 +284,12 @@ export const useDialogService = () => {
           type,
           itemList,
           onConfirm: resolve,
-          hint
+          hint,
+          denyLabel
         },
         dialogComponentProps: {
+          renderer: 'reka',
+          size: 'md',
           onClose: () => resolve(null)
         }
       }
@@ -555,9 +576,9 @@ export const useDialogService = () => {
         onConfirm: () => {}
       },
       dialogComponentProps: {
-        pt: {
-          root: { class: 'max-w-[360px]' }
-        }
+        renderer: 'reka',
+        size: 'sm',
+        contentClass: 'max-w-[360px]'
       }
     })
   }
diff --git a/src/services/useNewUserService.test.ts b/src/services/useNewUserService.test.ts
index 1fd590b21a..9a6f7a54d9 100644
--- a/src/services/useNewUserService.test.ts
+++ b/src/services/useNewUserService.test.ts
@@ -26,9 +26,6 @@ vi.mock('@/platform/settings/settingStore', () => ({
   useSettingStore: () => mockSettingStore
 }))
 
-//@ts-expect-error Define global for the test
-global.__COMFYUI_FRONTEND_VERSION__ = '1.24.0'
-
 import { useNewUserService } from '@/services/useNewUserService'
 
 describe('useNewUserService', () => {
@@ -120,6 +117,73 @@ describe('useNewUserService', () => {
       expect(service.isNewUser()).toBe(false)
     })
 
+    it('should identify existing user when V1 draft store keys exist', async () => {
+      mockSettingStore.settingValues = {}
+      mockSettingStore.get.mockReturnValue(undefined)
+      mockLocalStorage.getItem.mockImplementation((key: string) => {
+        if (key === 'Comfy.Workflow.Drafts') return '{}'
+        return null
+      })
+
+      await service.initializeIfNewUser()
+
+      expect(service.isNewUser()).toBe(false)
+    })
+
+    it('should identify existing user when V1 draft order key exists', async () => {
+      mockSettingStore.settingValues = {}
+      mockSettingStore.get.mockReturnValue(undefined)
+      mockLocalStorage.getItem.mockImplementation((key: string) => {
+        if (key === 'Comfy.Workflow.DraftOrder') return '[]'
+        return null
+      })
+
+      await service.initializeIfNewUser()
+
+      expect(service.isNewUser()).toBe(false)
+    })
+
+    it('should identify existing user when V2 draft index has entries', async () => {
+      mockSettingStore.settingValues = {}
+      mockSettingStore.get.mockReturnValue(undefined)
+      mockLocalStorage.getItem.mockImplementation((key: string) => {
+        if (key === 'Comfy.Workflow.DraftIndex.v2:personal')
+          return '{"v":2,"updatedAt":1,"order":["abc"],"entries":{"abc":{"path":"workflows/Untitled.json","name":"Untitled","isTemporary":true,"updatedAt":1}}}'
+        return null
+      })
+
+      await service.initializeIfNewUser()
+
+      expect(service.isNewUser()).toBe(false)
+    })
+
+    it('should identify new user when V2 draft index exists but is empty', async () => {
+      mockSettingStore.settingValues = {}
+      mockSettingStore.get.mockReturnValue(undefined)
+      mockLocalStorage.getItem.mockImplementation((key: string) => {
+        if (key === 'Comfy.Workflow.DraftIndex.v2:personal')
+          return '{"v":2,"updatedAt":1,"order":[],"entries":{}}'
+        return null
+      })
+
+      await service.initializeIfNewUser()
+
+      expect(service.isNewUser()).toBe(true)
+    })
+
+    it('should identify new user when V2 draft index is malformed', async () => {
+      mockSettingStore.settingValues = {}
+      mockSettingStore.get.mockReturnValue(undefined)
+      mockLocalStorage.getItem.mockImplementation((key: string) => {
+        if (key === 'Comfy.Workflow.DraftIndex.v2:personal') return 'not json'
+        return null
+      })
+
+      await service.initializeIfNewUser()
+
+      expect(service.isNewUser()).toBe(true)
+    })
+
     it('should identify new user when tutorial is explicitly false', async () => {
       mockSettingStore.settingValues = { 'Comfy.TutorialCompleted': false }
       mockSettingStore.get.mockImplementation((key: string) => {
diff --git a/src/services/useNewUserService.ts b/src/services/useNewUserService.ts
index 093c273bd2..6eef5b8c7b 100644
--- a/src/services/useNewUserService.ts
+++ b/src/services/useNewUserService.ts
@@ -2,6 +2,24 @@ import { ref, shallowRef } from 'vue'
 import { createSharedComposable } from '@vueuse/core'
 import { useSettingStore } from '@/platform/settings/settingStore'
 
+function hasV2DraftHistory(raw: string | null): boolean {
+  if (!raw) return false
+  try {
+    const parsed = JSON.parse(raw) as {
+      order?: unknown
+      entries?: unknown
+    }
+    const orderLength = Array.isArray(parsed.order) ? parsed.order.length : 0
+    const entriesCount =
+      parsed.entries && typeof parsed.entries === 'object'
+        ? Object.keys(parsed.entries as Record<string, unknown>).length
+        : 0
+    return orderLength > 0 || entriesCount > 0
+  } catch {
+    return false
+  }
+}
+
 function _useNewUserService() {
   const settingStore = useSettingStore()
   const pendingCallbacks = shallowRef<Array<() => Promise<void>>>([])
@@ -18,12 +36,32 @@ function _useNewUserService() {
     const isNewUserSettings =
       Object.keys(settingStore.settingValues).length === 0 ||
       !settingStore.get('Comfy.TutorialCompleted')
-    const hasNoWorkflow = !localStorage.getItem('workflow')
-    const hasNoPreviousWorkflow = !localStorage.getItem(
-      'Comfy.PreviousWorkflow'
+
+    // Legacy keys (pre-V1 and V1 persistence)
+    const hasNoLegacyWorkflow =
+      !localStorage.getItem('workflow') &&
+      !localStorage.getItem('Comfy.PreviousWorkflow')
+
+    // V1 draft store keys
+    const hasNoV1Drafts =
+      !localStorage.getItem('Comfy.Workflow.Drafts') &&
+      !localStorage.getItem('Comfy.Workflow.DraftOrder')
+
+    // V2 draft index key (scoped to personal workspace; cloud workspace id
+    // comes from sessionStorage which may not be set yet at this point).
+    // Check for actual draft history rather than key existence: an empty
+    // index is written by `migrateV1toV2()` for genuine new users during
+    // startup, so key presence alone is not evidence of prior usage.
+    const hasNoV2DraftIndex = !hasV2DraftHistory(
+      localStorage.getItem('Comfy.Workflow.DraftIndex.v2:personal')
     )
 
-    return isNewUserSettings && hasNoWorkflow && hasNoPreviousWorkflow
+    return (
+      isNewUserSettings &&
+      hasNoLegacyWorkflow &&
+      hasNoV1Drafts &&
+      hasNoV2DraftIndex
+    )
   }
 
   async function registerInitCallback(callback: () => Promise<void>) {
diff --git a/src/stores/assetsStore.test.ts b/src/stores/assetsStore.test.ts
index 6f60606108..f5fb088cdc 100644
--- a/src/stores/assetsStore.test.ts
+++ b/src/stores/assetsStore.test.ts
@@ -542,6 +542,88 @@ describe('assetsStore - Refactored (Option A)', () => {
     })
   })
 
+  describe('setAssetPreview', () => {
+    it('patches preview_id and preview_url on the matching history asset by name', async () => {
+      const mockHistory = Array.from({ length: 3 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+      await store.updateHistory()
+
+      const target = store.historyAssets[1]
+      const targetName = target.name
+
+      store.setAssetPreview(
+        targetName,
+        'preview-xyz',
+        '/assets/preview-xyz/content'
+      )
+
+      const updated = store.historyAssets.find((a) => a.name === targetName)
+      expect(updated?.preview_id).toBe('preview-xyz')
+      expect(updated?.preview_url).toBe('/assets/preview-xyz/content')
+    })
+
+    it('matches by name even when ids differ between APIs', async () => {
+      const mockHistory = [createMockJobItem(0)]
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+      await store.updateHistory()
+
+      const historyAssetId = store.historyAssets[0].id
+      const targetName = store.historyAssets[0].name
+
+      // Simulate the cloud-api side using a different id space
+      store.setAssetPreview(targetName, 'p1', '/assets/p1/content')
+
+      expect(store.historyAssets[0].id).toBe(historyAssetId)
+      expect(store.historyAssets[0].preview_id).toBe('p1')
+      expect(store.historyAssets[0].preview_url).toBe('/assets/p1/content')
+    })
+
+    it('does nothing when no asset with that name is loaded', async () => {
+      const mockHistory = Array.from({ length: 2 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+      await store.updateHistory()
+
+      const before = store.historyAssets.map((a) => ({ ...a }))
+      store.setAssetPreview('does-not-exist.glb', 'p', '/p')
+
+      expect(store.historyAssets).toEqual(before)
+    })
+
+    it('only patches the asset whose name matches exactly', async () => {
+      const mockHistory = Array.from({ length: 3 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+      await store.updateHistory()
+
+      // Patch using a non-matching prefix; the other assets must stay untouched
+      store.setAssetPreview('output_1', 'p', '/p')
+
+      for (const asset of store.historyAssets) {
+        expect(asset.preview_id).toBeUndefined()
+      }
+    })
+
+    it('replaces the asset object so reactivity fires for v-for keyed by id', async () => {
+      const mockHistory = [createMockJobItem(0)]
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+      await store.updateHistory()
+
+      const before = store.historyAssets[0]
+      const targetName = before.name
+
+      store.setAssetPreview(targetName, 'p', '/p')
+
+      // setAssetPreview replaces the item with a new object via list[idx] = {...}
+      // (rather than mutating in place) so Vue triggers dependent watchers.
+      expect(store.historyAssets[0]).not.toBe(before)
+    })
+  })
+
   describe('jobDetailView Support', () => {
     it('should include outputCount and allOutputs in user_metadata', async () => {
       const mockHistory = Array.from({ length: 5 }, (_, i) =>
@@ -1148,13 +1230,20 @@ describe('assetsStore - Model Assets Cache (Cloud)', () => {
         'featured'
       ])
     })
+  })
 
-    it('rolls back the cache when removeAssetTags succeeds but addAssetTags rejects', async () => {
-      // Documents the known recovery gap on partial-failure during a
-      // "change category" mutation: remove succeeds server-side, add fails,
-      // and the cache is restored to the original tags. The server now has
-      // the old category tag removed, so the cache and backend diverge until
-      // the next refetch — surface that gap here rather than papering over it.
+  describe('updateAssetTags partial-failure compensation', () => {
+    let consoleSpy: ReturnType<typeof vi.spyOn>
+
+    beforeEach(() => {
+      consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    })
+
+    afterEach(() => {
+      consoleSpy.mockRestore()
+    })
+
+    it('re-adds removed tags when add fails so cache and server converge', async () => {
       const store = useAssetsStore()
       const asset = createMockAsset('tags-partial-fail', ['models', 'loras'])
 
@@ -1167,10 +1256,12 @@ describe('assetsStore - Model Assets Cache (Cloud)', () => {
         removed: ['loras'],
         total_tags: ['models']
       })
-      vi.mocked(assetService.addAssetTags).mockRejectedValueOnce(
-        new Error('500 add failed')
-      )
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      vi.mocked(assetService.addAssetTags)
+        .mockRejectedValueOnce(new Error('500 add failed'))
+        .mockResolvedValueOnce({
+          added: ['loras'],
+          total_tags: ['models', 'loras']
+        })
 
       await store.updateAssetTags(
         asset,
@@ -1178,20 +1269,161 @@ describe('assetsStore - Model Assets Cache (Cloud)', () => {
         'LoraLoader'
       )
 
-      expect(vi.mocked(assetService.removeAssetTags)).toHaveBeenCalledWith(
-        'tags-partial-fail',
-        ['loras']
-      )
-      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenCalledWith(
+      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenNthCalledWith(
+        1,
         'tags-partial-fail',
         ['checkpoints']
       )
-      // Cache restored to original tags even though the server has already
-      // removed 'loras'. This codifies a known divergence — fix the recovery
-      // semantics in updateAssetTags to address it (e.g. invalidate the
-      // category cache, or reconcile against the last confirmed total_tags).
+      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenNthCalledWith(
+        2,
+        'tags-partial-fail',
+        ['loras']
+      )
       expect(store.getAssets('LoraLoader')[0].tags).toEqual(['models', 'loras'])
-      consoleSpy.mockRestore()
+    })
+
+    it('invalidates the category cache when compensation also fails', async () => {
+      const store = useAssetsStore()
+      const asset = createMockAsset('tags-compensation-fail', [
+        'models',
+        'loras'
+      ])
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce([
+        asset
+      ])
+      await store.updateModelsForNodeType('LoraLoader')
+
+      vi.mocked(assetService.removeAssetTags).mockResolvedValueOnce({
+        removed: ['loras'],
+        total_tags: ['models']
+      })
+      vi.mocked(assetService.addAssetTags)
+        .mockRejectedValueOnce(new Error('500 add failed'))
+        .mockRejectedValueOnce(new Error('503 compensation failed'))
+
+      await store.updateAssetTags(
+        asset,
+        ['models', 'checkpoints'],
+        'LoraLoader'
+      )
+
+      expect(store.hasCategory('loras')).toBe(false)
+      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenCalledTimes(2)
+    })
+
+    it('invalidates overlapping tag caches that also contain the asset when cacheKey is provided', async () => {
+      const store = useAssetsStore()
+      const asset = createMockAsset('tags-overlap-fail', ['models', 'loras'])
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce([
+        asset
+      ])
+      await store.updateModelsForNodeType('LoraLoader')
+      vi.mocked(assetService.getAssetsByTag).mockResolvedValueOnce([asset])
+      await store.updateModelsForTag('models')
+
+      expect(store.hasCategory('loras')).toBe(true)
+      expect(store.hasCategory('tag:models')).toBe(true)
+
+      vi.mocked(assetService.removeAssetTags).mockResolvedValueOnce({
+        removed: ['loras'],
+        total_tags: ['models']
+      })
+      vi.mocked(assetService.addAssetTags)
+        .mockRejectedValueOnce(new Error('500 add failed'))
+        .mockRejectedValueOnce(new Error('503 compensation failed'))
+
+      await store.updateAssetTags(
+        asset,
+        ['models', 'checkpoints'],
+        'LoraLoader'
+      )
+
+      expect(store.hasCategory('loras')).toBe(false)
+      expect(store.hasCategory('tag:models')).toBe(false)
+    })
+
+    it('does not attempt compensation when only the add was attempted', async () => {
+      const store = useAssetsStore()
+      const asset = createMockAsset('tags-add-only-fail', ['models'])
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce([
+        asset
+      ])
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+
+      vi.mocked(assetService.addAssetTags).mockRejectedValueOnce(
+        new Error('500 add failed')
+      )
+
+      await store.updateAssetTags(
+        asset,
+        ['models', 'featured'],
+        'CheckpointLoaderSimple'
+      )
+
+      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenCalledTimes(1)
+      expect(vi.mocked(assetService.removeAssetTags)).not.toHaveBeenCalled()
+      expect(store.getAssets('CheckpointLoaderSimple')[0].tags).toEqual([
+        'models'
+      ])
+    })
+
+    it('treats removeAssetTags resolution as success even when removed is empty', async () => {
+      const store = useAssetsStore()
+      const asset = createMockAsset('tags-empty-removed', ['models', 'loras'])
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce([
+        asset
+      ])
+      await store.updateModelsForNodeType('LoraLoader')
+
+      vi.mocked(assetService.removeAssetTags).mockResolvedValueOnce({
+        removed: [],
+        not_present: ['loras'],
+        total_tags: ['models']
+      })
+      vi.mocked(assetService.addAssetTags).mockRejectedValueOnce(
+        new Error('500 add failed')
+      )
+
+      await store.updateAssetTags(
+        asset,
+        ['models', 'checkpoints'],
+        'LoraLoader'
+      )
+
+      expect(vi.mocked(assetService.addAssetTags)).toHaveBeenCalledTimes(1)
+      expect(store.getAssets('LoraLoader')[0].tags).toEqual(['models', 'loras'])
+    })
+
+    it('invalidates every category containing the asset when no cacheKey is provided', async () => {
+      const store = useAssetsStore()
+      const asset = createMockAsset('tags-no-cachekey', ['models', 'loras'])
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce([
+        asset
+      ])
+      await store.updateModelsForNodeType('LoraLoader')
+      vi.mocked(assetService.getAssetsByTag).mockResolvedValueOnce([asset])
+      await store.updateModelsForTag('models')
+
+      expect(store.hasCategory('loras')).toBe(true)
+      expect(store.hasCategory('tag:models')).toBe(true)
+
+      vi.mocked(assetService.removeAssetTags).mockResolvedValueOnce({
+        removed: ['loras'],
+        total_tags: ['models']
+      })
+      vi.mocked(assetService.addAssetTags)
+        .mockRejectedValueOnce(new Error('500 add failed'))
+        .mockRejectedValueOnce(new Error('503 compensation failed'))
+
+      await store.updateAssetTags(asset, ['models', 'checkpoints'])
+
+      expect(store.hasCategory('loras')).toBe(false)
+      expect(store.hasCategory('tag:models')).toBe(false)
     })
   })
 })
diff --git a/src/stores/assetsStore.ts b/src/stores/assetsStore.ts
index 34f9910e94..e6792c0de0 100644
--- a/src/stores/assetsStore.ts
+++ b/src/stores/assetsStore.ts
@@ -6,7 +6,10 @@ import {
   mapInputFileToAssetItem,
   mapTaskOutputToAssetItem
 } from '@/platform/assets/composables/media/assetMappers'
-import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type {
+  AssetItem,
+  TagsOperationResult
+} from '@/platform/assets/schemas/assetSchema'
 import { assetService } from '@/platform/assets/services/assetService'
 import type { PaginationOptions } from '@/platform/assets/services/assetService'
 import { isCloud } from '@/platform/distribution/types'
@@ -252,6 +255,32 @@ export const useAssetsStore = defineStore('assets', () => {
     }
   }
 
+  /**
+   * Patch preview_id/preview_url for a single asset already in memory,
+   * matched by name. Used after persistThumbnail succeeds so an open Asset
+   * panel reflects the new thumbnail without refetching the whole history.
+   * Match by name because the cloud assets API and the history API use
+   * different id spaces; name is the stable cross-API identifier.
+   */
+  const setAssetPreview = (
+    name: string,
+    previewId: string,
+    previewUrl: string
+  ) => {
+    const patch = (list: AssetItem[]) => {
+      const idx = list.findIndex((a) => a.name === name)
+      if (idx < 0) return
+      list[idx] = {
+        ...list[idx],
+        preview_id: previewId,
+        preview_url: previewUrl
+      }
+    }
+    patch(historyAssets.value)
+    patch(allHistoryItems.value)
+    patch(inputAssets.value)
+  }
+
   /**
    * Map of asset hash filename to asset item for O(1) lookup
    * Cloud assets use asset_hash for the hash-based filename
@@ -610,11 +639,16 @@ export const useAssetsStore = defineStore('assets', () => {
 
         updateAssetInCache(asset.id, { tags: newTags }, cacheKey)
 
+        let removedTagsOnServer: string[] = []
         try {
-          const removeResult =
-            tagsToRemove.length > 0
-              ? await assetService.removeAssetTags(asset.id, tagsToRemove)
-              : undefined
+          let removeResult: TagsOperationResult | undefined
+          if (tagsToRemove.length > 0) {
+            removeResult = await assetService.removeAssetTags(
+              asset.id,
+              tagsToRemove
+            )
+            removedTagsOnServer = removeResult.removed ?? tagsToRemove
+          }
 
           const addResult =
             tagsToAdd.length > 0
@@ -628,6 +662,33 @@ export const useAssetsStore = defineStore('assets', () => {
         } catch (error) {
           console.error('Failed to update asset tags:', error)
           updateAssetInCache(asset.id, { tags: originalTags }, cacheKey)
+
+          if (removedTagsOnServer.length > 0) {
+            try {
+              await assetService.addAssetTags(asset.id, removedTagsOnServer)
+            } catch (compensationError) {
+              console.error(
+                'Failed to restore tags after partial failure; invalidating cache to force refetch:',
+                compensationError
+              )
+              const categoriesToInvalidate = new Set<string>()
+              const resolved = cacheKey ? resolveCategory(cacheKey) : undefined
+              if (resolved) {
+                categoriesToInvalidate.add(resolved)
+              }
+              for (const [
+                category,
+                state
+              ] of modelStateByCategory.value.entries()) {
+                if (state.assets?.has(asset.id)) {
+                  categoriesToInvalidate.add(category)
+                }
+              }
+              for (const category of categoriesToInvalidate) {
+                invalidateCategory(category)
+              }
+            }
+          }
         }
       }
 
@@ -747,6 +808,7 @@ export const useAssetsStore = defineStore('assets', () => {
     updateInputs,
     updateHistory,
     loadMoreHistory,
+    setAssetPreview,
 
     // Input mapping helpers
     inputAssetsByFilename,
diff --git a/src/stores/authStore.test.ts b/src/stores/authStore.test.ts
index 0b4080bf04..4f9ec2a483 100644
--- a/src/stores/authStore.test.ts
+++ b/src/stores/authStore.test.ts
@@ -593,7 +593,7 @@ describe('useAuthStore', () => {
         )
       })
 
-      it.each(['loginWithGoogle', 'loginWithGithub'] as const)(
+      it.for(['loginWithGoogle', 'loginWithGithub'] as const)(
         '%s should track is_new_user=true when Firebase says new user',
         async (method) => {
           vi.mocked(firebaseAuth.getAdditionalUserInfo).mockReturnValue({
@@ -610,7 +610,7 @@ describe('useAuthStore', () => {
         }
       )
 
-      it.each(['loginWithGoogle', 'loginWithGithub'] as const)(
+      it.for(['loginWithGoogle', 'loginWithGithub'] as const)(
         '%s should track is_new_user=true when UI options say new user',
         async (method) => {
           vi.mocked(firebaseAuth.getAdditionalUserInfo).mockReturnValue({
@@ -627,7 +627,7 @@ describe('useAuthStore', () => {
         }
       )
 
-      it.each(['loginWithGoogle', 'loginWithGithub'] as const)(
+      it.for(['loginWithGoogle', 'loginWithGithub'] as const)(
         '%s should track is_new_user=false when neither source says new user',
         async (method) => {
           vi.mocked(firebaseAuth.getAdditionalUserInfo).mockReturnValue({
@@ -644,7 +644,7 @@ describe('useAuthStore', () => {
         }
       )
 
-      it.each(['loginWithGoogle', 'loginWithGithub'] as const)(
+      it.for(['loginWithGoogle', 'loginWithGithub'] as const)(
         '%s should track is_new_user=false when getAdditionalUserInfo returns null',
         async (method) => {
           vi.mocked(firebaseAuth.getAdditionalUserInfo).mockReturnValue(null)
diff --git a/src/stores/dialogStore.ts b/src/stores/dialogStore.ts
index 6742b5459c..4bb3161391 100644
--- a/src/stores/dialogStore.ts
+++ b/src/stores/dialogStore.ts
@@ -4,9 +4,10 @@ import { merge } from 'es-toolkit/compat'
 import { defineStore } from 'pinia'
 import type { DialogPassThroughOptions } from 'primevue/dialog'
 import { markRaw, ref } from 'vue'
-import type { Component } from 'vue'
+import type { Component, HTMLAttributes } from 'vue'
 
 import type GlobalDialog from '@/components/dialog/GlobalDialog.vue'
+import type { DialogContentSize } from '@/components/ui/dialog/dialog.variants'
 import type { ComponentAttrs } from 'vue-component-type-helpers'
 
 type DialogPosition =
@@ -20,6 +21,14 @@ type DialogPosition =
   | 'bottomleft'
   | 'bottomright'
 
+/**
+ * Selects the dialog renderer used by `GlobalDialog`. `'primevue'` is the
+ * current default and runs the legacy PrimeVue `Dialog` path. `'reka'` opts
+ * into the Reka-UI primitive set under `src/components/ui/dialog/`. Migration
+ * tracked in `temp/plans/adr-0009-dialog-reka-migration-DRAFT.md`.
+ */
+type DialogRenderer = 'primevue' | 'reka'
+
 interface CustomDialogComponentProps {
   maximizable?: boolean
   maximized?: boolean
@@ -32,6 +41,13 @@ interface CustomDialogComponentProps {
   dismissableMask?: boolean
   unstyled?: boolean
   headless?: boolean
+  renderer?: DialogRenderer
+  size?: DialogContentSize
+  /**
+   * Class applied to the Reka-UI `DialogContent` element. Ignored on the
+   * PrimeVue path — use `pt` for that renderer.
+   */
+  contentClass?: HTMLAttributes['class']
 }
 
 export type DialogComponentProps = ComponentAttrs<typeof GlobalDialog> &
diff --git a/src/stores/executionStore.test.ts b/src/stores/executionStore.test.ts
index dc143d844f..392883f7a7 100644
--- a/src/stores/executionStore.test.ts
+++ b/src/stores/executionStore.test.ts
@@ -440,6 +440,57 @@ describe('useExecutionStore - reconcileInitializingJobs', () => {
   })
 })
 
+describe('useExecutionStore - clearActiveJobIfStale', () => {
+  let store: ReturnType<typeof useExecutionStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useExecutionStore()
+  })
+
+  it('clears the active job and progress state when not in the active set', () => {
+    store.activeJobId = 'job-1'
+    store.queuedJobs = { 'job-1': { nodes: { 'node-1': false } } }
+    store.nodeProgressStates = {
+      'node-1': {
+        value: 5,
+        max: 10,
+        state: 'running',
+        node_id: 'node-1',
+        display_node_id: 'node-1',
+        prompt_id: 'job-1'
+      }
+    }
+
+    store.clearActiveJobIfStale(new Set(['job-2']))
+
+    expect(store.activeJobId).toBeNull()
+    expect(store.queuedJobs['job-1']).toBeUndefined()
+    expect(store.nodeProgressStates).toEqual({})
+  })
+
+  it('preserves the active job when present in the active set', () => {
+    store.activeJobId = 'job-1'
+    store.queuedJobs = { 'job-1': { nodes: {} } }
+
+    store.clearActiveJobIfStale(new Set(['job-1', 'job-2']))
+
+    expect(store.activeJobId).toBe('job-1')
+    expect(store.queuedJobs['job-1']).toBeDefined()
+  })
+
+  it('is a no-op when there is no active job', () => {
+    store.activeJobId = null
+    store.queuedJobs = { other: { nodes: {} } }
+
+    store.clearActiveJobIfStale(new Set())
+
+    expect(store.activeJobId).toBeNull()
+    expect(store.queuedJobs['other']).toBeDefined()
+  })
+})
+
 describe('useExecutionStore - progress_text startup guard', () => {
   let store: ReturnType<typeof useExecutionStore>
 
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 1df4702858..d438dfd220 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -485,6 +485,16 @@ export const useExecutionStore = defineStore('execution', () => {
     clearInitializationByJobIds(orphaned)
   }
 
+  /**
+   * Clears the active job if the server's queue snapshot doesn't list it.
+   * Used after WS reconnect to recover from stale state when a job finished
+   * during the disconnect window.
+   */
+  function clearActiveJobIfStale(activeJobIds: Set<JobId>) {
+    const id = activeJobId.value
+    if (id && !activeJobIds.has(id)) resetExecutionState(id)
+  }
+
   function isJobInitializing(jobId: JobId | number | undefined): boolean {
     if (!jobId) return false
     return initializingJobIds.value.has(String(jobId))
@@ -643,6 +653,7 @@ export const useExecutionStore = defineStore('execution', () => {
     clearInitializationByJobId,
     clearInitializationByJobIds,
     reconcileInitializingJobs,
+    clearActiveJobIfStale,
     bindExecutionEvents,
     unbindExecutionEvents,
     storeJob,
diff --git a/src/stores/maskEditorStore.test.ts b/src/stores/maskEditorStore.test.ts
index 5c7e6f1851..a3f21d2309 100644
--- a/src/stores/maskEditorStore.test.ts
+++ b/src/stores/maskEditorStore.test.ts
@@ -256,13 +256,13 @@ describe('maskEditorStore', () => {
   })
 
   describe('canvas → ctx watchers', () => {
-    it.each([
+    it.for([
       ['maskCanvas', 'maskCtx'],
       ['rgbCanvas', 'rgbCtx'],
       ['imgCanvas', 'imgCtx']
     ] as const)(
       'should derive %s using getContext with willReadFrequently',
-      async (canvasKey, ctxKey) => {
+      async ([canvasKey, ctxKey]) => {
         const store = useMaskEditorStore()
         const canvas = makeCanvas()
 
@@ -276,13 +276,13 @@ describe('maskEditorStore', () => {
       }
     )
 
-    it.each([
+    it.for([
       ['maskCanvas', 'maskCtx'],
       ['rgbCanvas', 'rgbCtx'],
       ['imgCanvas', 'imgCtx']
     ] as const)(
       'should leave existing %s ctx untouched when canvas is cleared',
-      async (canvasKey, ctxKey) => {
+      async ([canvasKey, ctxKey]) => {
         const store = useMaskEditorStore()
         const canvas = makeCanvas()
         store[canvasKey] = canvas
diff --git a/src/stores/missingMediaPreviewRegression.test.ts b/src/stores/missingMediaPreviewRegression.test.ts
new file mode 100644
index 0000000000..d8f349c18b
--- /dev/null
+++ b/src/stores/missingMediaPreviewRegression.test.ts
@@ -0,0 +1,93 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
+import type * as GraphTraversalUtil from '@/utils/graphTraversalUtil'
+
+const mockRemoveNodeOutputs = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/nodeOutputStore', () => ({
+  useNodeOutputStore: () => ({ removeNodeOutputs: mockRemoveNodeOutputs })
+}))
+
+const mockApp = vi.hoisted(() => ({
+  isGraphReady: true,
+  rootGraph: { nodes: [], _nodes: [] } as unknown as LGraph
+}))
+vi.mock('@/scripts/app', () => ({ app: mockApp }))
+
+const mockGetNodeByExecutionId = vi.hoisted(() => vi.fn())
+vi.mock('@/utils/graphTraversalUtil', async () => {
+  const actual = await vi.importActual<typeof GraphTraversalUtil>(
+    '@/utils/graphTraversalUtil'
+  )
+  return {
+    ...actual,
+    getNodeByExecutionId: mockGetNodeByExecutionId
+  }
+})
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback)
+}))
+
+vi.mock('@/platform/distribution/types', () => ({ isCloud: false }))
+
+vi.mock('@/stores/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({ get: vi.fn(() => false) }))
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({ get: vi.fn(() => false) }))
+}))
+
+vi.mock(
+  '@/platform/missingModel/composables/useMissingModelInteractions',
+  () => ({ clearMissingModelState: vi.fn() })
+)
+
+import { useExecutionErrorStore } from './executionErrorStore'
+
+function makeNodeWithPreview(id: number): LGraphNode {
+  return {
+    id,
+    imgs: [{ src: 'blob:mask-edited' }],
+    videoContainer: undefined,
+    graph: { setDirtyCanvas: vi.fn() }
+  } as unknown as LGraphNode
+}
+
+describe('FE-230 regression — workflow-load missing-media flagging must not wipe node previews', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    mockApp.isGraphReady = true
+    mockApp.rootGraph = { nodes: [], _nodes: [] } as unknown as LGraph
+    mockRemoveNodeOutputs.mockReset()
+    mockGetNodeByExecutionId.mockReset()
+  })
+
+  it('does not clear node.imgs when verification flags a Load Image as missing on workflow load (e.g. mask-editor saved value)', async () => {
+    const node = makeNodeWithPreview(42)
+    mockGetNodeByExecutionId.mockReturnValue(node)
+
+    useExecutionErrorStore()
+    const missingMediaStore = useMissingMediaStore()
+
+    missingMediaStore.setMissingMedia([
+      {
+        nodeId: '42',
+        nodeType: 'LoadImage',
+        widgetName: 'image',
+        mediaType: 'image',
+        name: 'clipspace/clipspace-painted-masked-1.png [input]',
+        isMissing: true
+      }
+    ])
+    await nextTick()
+    await nextTick()
+
+    expect(node.imgs).toEqual([{ src: 'blob:mask-edited' }])
+    expect(mockRemoveNodeOutputs).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/stores/modelToNodeStore.test.ts b/src/stores/modelToNodeStore.test.ts
index d5725190d3..af577d9fb8 100644
--- a/src/stores/modelToNodeStore.test.ts
+++ b/src/stores/modelToNodeStore.test.ts
@@ -31,7 +31,6 @@ const EXPECTED_DEFAULT_TYPES = [
   'latent_upscale_models',
   'sam2',
   'sams',
-  'ultralytics',
   'depthanything',
   'ipadapter',
   'segformer_b2_clothes',
@@ -84,7 +83,6 @@ const MOCK_NODE_NAMES = [
   'LatentUpscaleModelLoader',
   'DownloadAndLoadSAM2Model',
   'SAMLoader',
-  'UltralyticsDetectorProvider',
   'DownloadAndLoadDepthAnythingV2Model',
   'IPAdapterModelLoader',
   'LS_LoadSegformerModel',
@@ -255,20 +253,18 @@ describe('useModelToNodeStore', () => {
       expect(provider?.key).toBe('')
     })
 
-    it.each([
+    it.for([
       ['sam2', 'DownloadAndLoadSAM2Model', 'model'],
       ['sams', 'SAMLoader', 'model_name'],
       ['ipadapter', 'IPAdapterModelLoader', 'ipadapter_file'],
       ['depthanything', 'DownloadAndLoadDepthAnythingV2Model', 'model'],
-      ['ultralytics/bbox', 'UltralyticsDetectorProvider', 'model_name'],
-      ['ultralytics/segm', 'UltralyticsDetectorProvider', 'model_name'],
       ['FlashVSR', 'FlashVSRNode', ''],
       ['FlashVSR-v1.1', 'FlashVSRNode', ''],
       ['segformer_b2_clothes', 'LS_LoadSegformerModel', 'model_name'],
       ['segformer_b3_fashion', 'LS_LoadSegformerModel', 'model_name']
     ])(
       'should return correct provider for %s',
-      (modelType, expectedNodeName, expectedKey) => {
+      ([modelType, expectedNodeName, expectedKey]) => {
         const modelToNodeStore = useModelToNodeStore()
         modelToNodeStore.registerDefaults()
 
@@ -277,6 +273,16 @@ describe('useModelToNodeStore', () => {
         expect(provider?.key).toBe(expectedKey)
       }
     )
+
+    it.for(['ultralytics', 'ultralytics/bbox', 'ultralytics/segm'])(
+      'should not register %s as a default provider, so the node falls back to its static combo (regression for #8468)',
+      (modelType) => {
+        const modelToNodeStore = useModelToNodeStore()
+        modelToNodeStore.registerDefaults()
+
+        expect(modelToNodeStore.getNodeProvider(modelType)).toBeUndefined()
+      }
+    )
   })
 
   describe('getAllNodeProviders', () => {
diff --git a/src/stores/nodeOutputStore.ts b/src/stores/nodeOutputStore.ts
index 74cdcdedeb..e8cc0752fb 100644
--- a/src/stores/nodeOutputStore.ts
+++ b/src/stores/nodeOutputStore.ts
@@ -367,22 +367,11 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     }
   }
 
-  /**
-   * Remove node outputs for a specific node
-   * Clears both outputs and preview images
-   */
-  function removeNodeOutputs(nodeId: number | string) {
-    const nodeLocatorId = nodeIdToNodeLocatorId(Number(nodeId))
-    if (!nodeLocatorId) return false
-
-    // Clear from app.nodeOutputs
+  function removeOutputsByLocatorId(nodeLocatorId: NodeLocatorId) {
     const hadOutputs = !!app.nodeOutputs[nodeLocatorId]
     delete app.nodeOutputs[nodeLocatorId]
-
-    // Clear from reactive state
     delete nodeOutputs.value[nodeLocatorId]
 
-    // Clear preview images
     if (app.nodePreviewImages[nodeLocatorId]) {
       const previews = app.nodePreviewImages[nodeLocatorId]
       if (previews?.[Symbol.iterator]) {
@@ -397,6 +386,22 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     return hadOutputs
   }
 
+  /**
+   * Remove node outputs for a specific node
+   * Clears both outputs and preview images
+   */
+  function removeNodeOutputs(nodeId: number | string) {
+    const nodeLocatorId = nodeIdToNodeLocatorId(Number(nodeId))
+    if (!nodeLocatorId) return false
+    return removeOutputsByLocatorId(nodeLocatorId)
+  }
+
+  // Resolves the locator from the node's own graph, so interior subgraph nodes
+  // are addressed correctly even when the user has a different graph active.
+  function removeNodeOutputsForNode(node: LGraphNode) {
+    return removeOutputsByLocatorId(nodeToNodeLocatorId(node))
+  }
+
   function snapshotOutputs(): Record<string, ExecutedWsMessage['output']> {
     return clone(app.nodeOutputs)
   }
@@ -493,6 +498,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     revokeAllPreviews,
     revokeSubgraphPreviews,
     removeNodeOutputs,
+    removeNodeOutputsForNode,
     snapshotOutputs,
     restoreOutputs,
     resetAllOutputsAndPreviews,
diff --git a/src/stores/queueStore.test.ts b/src/stores/queueStore.test.ts
index 9b5a62d2d6..2f5a72611a 100644
--- a/src/stores/queueStore.test.ts
+++ b/src/stores/queueStore.test.ts
@@ -5,6 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 import type { TaskOutput } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
+import { useExecutionStore } from '@/stores/executionStore'
 import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
 
 // Fixture factory for JobListItem
@@ -340,11 +341,11 @@ describe('useQueueStore', () => {
       expect(store.isLoading).toBe(false)
     })
 
-    it('should clear loading state even if API fails', async () => {
+    it('should clear loading state even if the queue fetch fails', async () => {
       mockGetQueue.mockRejectedValue(new Error('API error'))
       mockGetHistory.mockResolvedValue([])
 
-      await expect(store.update()).rejects.toThrow('API error')
+      await store.update()
       expect(store.isLoading).toBe(false)
     })
   })
@@ -1018,10 +1019,9 @@ describe('useQueueStore', () => {
       const firstUpdate = store.update()
       void store.update() // coalesces, sets dirty
 
-      // First call rejects — but dirty flag triggers re-fetch
-      await expect(firstUpdate).rejects.toThrow('network error')
-
-      // Re-fetch was triggered
+      // First call resolves (allSettled absorbs the failure) but the dirty
+      // flag still triggers a re-fetch when the in-flight request finishes.
+      await firstUpdate
       expect(mockGetQueue).toHaveBeenCalledTimes(2)
 
       resolveSecond({ Running: [], Pending: [createPendingJob(2, 'new-job')] })
@@ -1032,4 +1032,86 @@ describe('useQueueStore', () => {
       expect(store.isLoading).toBe(false)
     })
   })
+
+  describe('update() partial failures', () => {
+    it('reconciles when the queue fetch succeeds, even with an empty snapshot', async () => {
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+      const executionStore = useExecutionStore()
+      const reconcileSpy = vi.spyOn(executionStore, 'reconcileInitializingJobs')
+
+      await store.update()
+
+      expect(reconcileSpy).toHaveBeenCalledWith(new Set())
+    })
+
+    it('preserves prior queue state and skips reconcile when the queue fetch fails', async () => {
+      mockGetQueue
+        .mockResolvedValueOnce({
+          Running: [createRunningJob(0, 'run-1')],
+          Pending: []
+        })
+        .mockRejectedValueOnce(new Error('network down'))
+      mockGetHistory.mockResolvedValue([])
+      const executionStore = useExecutionStore()
+      const reconcileSpy = vi.spyOn(executionStore, 'reconcileInitializingJobs')
+
+      await store.update()
+      await store.update()
+
+      // First update reconciles with run-1; second update's queue fetch
+      // rejects, so reconcile must not be called again.
+      expect(reconcileSpy).toHaveBeenCalledTimes(1)
+      expect(reconcileSpy).toHaveBeenLastCalledWith(new Set(['run-1']))
+      expect(store.runningTasks).toHaveLength(1)
+      expect(store.runningTasks[0].jobId).toBe('run-1')
+    })
+
+    it('still updates history when only the queue fetch fails', async () => {
+      mockGetQueue.mockRejectedValue(new Error('queue down'))
+      mockGetHistory.mockResolvedValue([createHistoryJob(0, 'hist-1')])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].jobId).toBe('hist-1')
+    })
+
+    it('still updates queue when only the history fetch fails', async () => {
+      mockGetQueue.mockResolvedValue({
+        Running: [createRunningJob(0, 'run-1')],
+        Pending: []
+      })
+      mockGetHistory.mockRejectedValue(new Error('history down'))
+
+      await store.update()
+
+      expect(store.runningTasks).toHaveLength(1)
+      expect(store.runningTasks[0].jobId).toBe('run-1')
+    })
+
+    it('preserves prior state and skips reconcile when both fetches fail', async () => {
+      mockGetQueue
+        .mockResolvedValueOnce({
+          Running: [createRunningJob(0, 'run-1')],
+          Pending: []
+        })
+        .mockRejectedValueOnce(new Error('queue down'))
+      mockGetHistory
+        .mockResolvedValueOnce([createHistoryJob(0, 'hist-1')])
+        .mockRejectedValueOnce(new Error('history down'))
+      const executionStore = useExecutionStore()
+      const reconcileSpy = vi.spyOn(executionStore, 'reconcileInitializingJobs')
+
+      await store.update()
+      await store.update()
+
+      expect(reconcileSpy).toHaveBeenCalledTimes(1)
+      expect(store.runningTasks).toHaveLength(1)
+      expect(store.runningTasks[0].jobId).toBe('run-1')
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].jobId).toBe('hist-1')
+      expect(store.isLoading).toBe(false)
+    })
+  })
 })
diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts
index f0f660c1db..d1a909fe09 100644
--- a/src/stores/queueStore.ts
+++ b/src/stores/queueStore.ts
@@ -525,68 +525,74 @@ export const useQueueStore = defineStore('queue', () => {
     dirty = false
     isLoading.value = true
     try {
-      const [queue, history] = await Promise.all([
-        api.getQueue(),
+      const [queueResult, historyResult] = await Promise.allSettled([
+        api.getQueue({ throwOnError: true }),
         api.getHistory(maxHistoryItems.value)
       ])
 
-      // API returns pre-sorted data (sort_by=create_time&order=desc)
-      runningTasks.value = queue.Running.map((job) => new TaskItemImpl(job))
-      pendingTasks.value = queue.Pending.map((job) => new TaskItemImpl(job))
+      if (queueResult.status === 'fulfilled') {
+        const queue = queueResult.value
+        // API returns pre-sorted data (sort_by=create_time&order=desc)
+        runningTasks.value = queue.Running.map((job) => new TaskItemImpl(job))
+        pendingTasks.value = queue.Pending.map((job) => new TaskItemImpl(job))
 
-      const currentHistory = toValue(historyTasks)
+        const appearedTasks = [...pendingTasks.value, ...runningTasks.value]
+        const executionStore = useExecutionStore()
+        appearedTasks.forEach((task) => {
+          const jobIdString = String(task.jobId)
+          const workflowId = task.workflowId
+          if (workflowId && jobIdString) {
+            executionStore.registerJobWorkflowIdMapping(jobIdString, workflowId)
+          }
+        })
 
-      const appearedTasks = [...pendingTasks.value, ...runningTasks.value]
-      const executionStore = useExecutionStore()
-      appearedTasks.forEach((task) => {
-        const jobIdString = String(task.jobId)
-        const workflowId = task.workflowId
-        if (workflowId && jobIdString) {
-          executionStore.registerJobWorkflowIdMapping(jobIdString, workflowId)
-        }
-      })
-
-      // Only reconcile when the queue fetch returned data. api.getQueue()
-      // returns empty Running/Pending on transient errors, which would
-      // incorrectly clear all initializing prompts.
-      const queueHasData = queue.Running.length > 0 || queue.Pending.length > 0
-      if (queueHasData) {
         const activeJobIds = new Set([
           ...queue.Running.map((j) => j.id),
           ...queue.Pending.map((j) => j.id)
         ])
         executionStore.reconcileInitializingJobs(activeJobIds)
+      } else {
+        console.error('Failed to fetch queue:', queueResult.reason)
       }
 
-      // Sort by create_time descending and limit to maxItems
-      const sortedHistory = [...history]
-        .sort((a, b) => b.create_time - a.create_time)
-        .slice(0, toValue(maxHistoryItems))
+      if (historyResult.status === 'fulfilled') {
+        const history = historyResult.value
+        const currentHistory = toValue(historyTasks)
 
-      // Reuse existing TaskItemImpl instances or create new
-      // Must recreate if outputs_count changed (e.g., API started returning it)
-      const existingByJobId = new Map(
-        currentHistory.map((impl) => [impl.jobId, impl])
-      )
+        // Sort by create_time descending and limit to maxItems
+        const sortedHistory = [...history]
+          .sort((a, b) => b.create_time - a.create_time)
+          .slice(0, toValue(maxHistoryItems))
 
-      const nextHistoryTasks = sortedHistory.map((job) => {
-        const existing = existingByJobId.get(job.id)
-        if (!existing) return new TaskItemImpl(job)
-        // Recreate if outputs_count changed to ensure lazy loading works
-        if (existing.outputsCount !== (job.outputs_count ?? undefined)) {
-          return new TaskItemImpl(job)
+        // Reuse existing TaskItemImpl instances or create new
+        // Must recreate if outputs_count changed (e.g., API started returning it)
+        const existingByJobId = new Map(
+          currentHistory.map((impl) => [impl.jobId, impl])
+        )
+
+        const nextHistoryTasks = sortedHistory.map((job) => {
+          const existing = existingByJobId.get(job.id)
+          if (!existing) return new TaskItemImpl(job)
+          // Recreate if outputs_count changed to ensure lazy loading works
+          if (existing.outputsCount !== (job.outputs_count ?? undefined)) {
+            return new TaskItemImpl(job)
+          }
+          return existing
+        })
+
+        const isHistoryUnchanged =
+          nextHistoryTasks.length === currentHistory.length &&
+          nextHistoryTasks.every(
+            (task, index) => task === currentHistory[index]
+          )
+
+        if (!isHistoryUnchanged) {
+          historyTasks.value = nextHistoryTasks
         }
-        return existing
-      })
-
-      const isHistoryUnchanged =
-        nextHistoryTasks.length === currentHistory.length &&
-        nextHistoryTasks.every((task, index) => task === currentHistory[index])
-
-      if (!isHistoryUnchanged) {
-        historyTasks.value = nextHistoryTasks
+        hasFetchedHistorySnapshot.value = true
+      } else {
+        console.error('Failed to fetch history:', historyResult.reason)
       }
-      hasFetchedHistorySnapshot.value = true
     } finally {
       isLoading.value = false
       inFlight = false
diff --git a/src/stores/userStore.test.ts b/src/stores/userStore.test.ts
new file mode 100644
index 0000000000..365fc53be4
--- /dev/null
+++ b/src/stores/userStore.test.ts
@@ -0,0 +1,74 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useUserStore } from './userStore'
+
+const getUserConfig = vi.fn()
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getUserConfig: (...args: unknown[]) => getUserConfig(...args)
+  }
+}))
+
+describe('userStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    getUserConfig.mockReset()
+    localStorage.clear()
+  })
+
+  describe('initialize', () => {
+    it('fetches user config on first call', async () => {
+      getUserConfig.mockResolvedValue({})
+      const store = useUserStore()
+
+      await store.initialize()
+
+      expect(getUserConfig).toHaveBeenCalledTimes(1)
+      expect(store.initialized).toBe(true)
+    })
+
+    it('is a no-op once already initialized', async () => {
+      getUserConfig.mockResolvedValue({})
+      const store = useUserStore()
+      await store.initialize()
+      getUserConfig.mockClear()
+
+      await store.initialize()
+
+      expect(getUserConfig).not.toHaveBeenCalled()
+    })
+
+    it('retries on a subsequent call when the first fetch failed', async () => {
+      getUserConfig.mockRejectedValueOnce(new Error('network down'))
+      getUserConfig.mockResolvedValueOnce({})
+      const store = useUserStore()
+
+      await expect(store.initialize()).rejects.toThrow('network down')
+      expect(store.initialized).toBe(false)
+      await expect(store.initialize()).resolves.toBeUndefined()
+
+      expect(getUserConfig).toHaveBeenCalledTimes(2)
+      expect(store.initialized).toBe(true)
+    })
+
+    it('deduplicates concurrent calls before the first fetch resolves', async () => {
+      let resolveConfig: (value: unknown) => void = () => {}
+      getUserConfig.mockImplementation(
+        () =>
+          new Promise((resolve) => {
+            resolveConfig = resolve
+          })
+      )
+      const store = useUserStore()
+
+      const a = store.initialize()
+      const b = store.initialize()
+      resolveConfig({})
+      await Promise.all([a, b])
+
+      expect(getUserConfig).toHaveBeenCalledTimes(1)
+    })
+  })
+})
diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
index e9e34e7cb6..282d69467a 100644
--- a/src/stores/userStore.ts
+++ b/src/stores/userStore.ts
@@ -36,12 +36,22 @@ export const useUserStore = defineStore('user', () => {
   )
   const initialized = computed(() => userConfig.value !== null)
 
+  let initializePromise: Promise<void> | null = null
+
   /**
    * Initialize the user store.
    */
   async function initialize() {
-    userConfig.value = await api.getUserConfig()
-    currentUserId.value = localStorage['Comfy.userId']
+    initializePromise ??= (async () => {
+      try {
+        userConfig.value = await api.getUserConfig()
+        currentUserId.value = localStorage['Comfy.userId']
+      } catch (err) {
+        initializePromise = null
+        throw err
+      }
+    })()
+    return initializePromise
   }
 
   /**
diff --git a/src/types/nodeSource.ts b/src/types/nodeSource.ts
index b2089d7625..e1040a4fcb 100644
--- a/src/types/nodeSource.ts
+++ b/src/types/nodeSource.ts
@@ -1,97 +1 @@
-export const BLUEPRINT_CATEGORY = 'Subgraph Blueprints'
-
-export enum NodeSourceType {
-  Core = 'core',
-  CustomNodes = 'custom_nodes',
-  Blueprint = 'blueprint',
-  Essentials = 'essentials',
-  Unknown = 'unknown'
-}
-export const CORE_NODE_MODULES = ['nodes', 'comfy_extras', 'comfy_api_nodes']
-
-export type NodeSource = {
-  type: NodeSourceType
-  className: string
-  displayText: string
-  badgeText: string
-}
-
-const UNKNOWN_NODE_SOURCE: NodeSource = {
-  type: NodeSourceType.Unknown,
-  className: 'comfy-unknown',
-  displayText: 'Unknown',
-  badgeText: '?'
-}
-
-function shortenNodeName(name: string) {
-  return name
-    .replace(/^(ComfyUI-|ComfyUI_|Comfy-|Comfy_)/, '')
-    .replace(/(-ComfyUI|_ComfyUI|-Comfy|_Comfy)$/, '')
-}
-
-export function getNodeSource(
-  python_module?: string,
-  essentials_category?: string
-): NodeSource {
-  if (!python_module) {
-    return UNKNOWN_NODE_SOURCE
-  }
-  const modules = python_module.split('.')
-  if (essentials_category) {
-    const moduleName = modules[1] ?? modules[0] ?? 'essentials'
-    const displayName = shortenNodeName(moduleName.split('@')[0])
-    return {
-      type: NodeSourceType.Essentials,
-      className: 'comfy-essentials',
-      displayText: displayName,
-      badgeText: displayName
-    }
-  } else if (CORE_NODE_MODULES.includes(modules[0])) {
-    return {
-      type: NodeSourceType.Core,
-      className: 'comfy-core',
-      displayText: 'Comfy Core',
-      badgeText: '🦊'
-    }
-  } else if (modules[0] === 'blueprint') {
-    return {
-      type: NodeSourceType.Blueprint,
-      className: 'blueprint',
-      displayText: 'Blueprint',
-      badgeText: 'bp'
-    }
-  } else if (modules[0] === 'custom_nodes') {
-    const moduleName = modules[1]
-    if (!moduleName) {
-      return UNKNOWN_NODE_SOURCE
-    }
-    const customNodeName = moduleName.split('@')[0]
-    const displayName = shortenNodeName(customNodeName)
-    return {
-      type: NodeSourceType.CustomNodes,
-      className: 'comfy-custom-nodes',
-      displayText: displayName,
-      badgeText: displayName
-    }
-  } else {
-    return UNKNOWN_NODE_SOURCE
-  }
-}
-
-interface NodeDefLike {
-  nodeSource: NodeSource
-}
-
-export function isEssentialNode(node: NodeDefLike): boolean {
-  return node.nodeSource.type === NodeSourceType.Essentials
-}
-
-export function isCustomNode(node: NodeDefLike): boolean {
-  return node.nodeSource.type === NodeSourceType.CustomNodes
-}
-
-export enum NodeBadgeMode {
-  None = 'None',
-  ShowAll = 'Show all',
-  HideBuiltIn = 'Hide built-in'
-}
+export * from '@comfyorg/object-info-parser'
diff --git a/src/utils/__tests__/executionErrorTestUtils.ts b/src/utils/__tests__/executionErrorTestUtils.ts
new file mode 100644
index 0000000000..8ec051a6d8
--- /dev/null
+++ b/src/utils/__tests__/executionErrorTestUtils.ts
@@ -0,0 +1,30 @@
+import type { NodeError } from '@/schemas/apiSchema'
+import type { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import type { NodeExecutionId } from '@/types/nodeIdentification'
+
+type ExecutionErrorStore = ReturnType<typeof useExecutionErrorStore>
+
+function createRequiredInputMissingNodeError(inputName: string): NodeError {
+  return {
+    errors: [
+      {
+        type: 'required_input_missing',
+        message: 'Missing',
+        details: '',
+        extra_info: { input_name: inputName }
+      }
+    ],
+    dependent_outputs: [],
+    class_type: 'TestNode'
+  }
+}
+
+export function seedRequiredInputMissingNodeError(
+  store: ExecutionErrorStore,
+  executionId: NodeExecutionId,
+  inputName: string
+): void {
+  store.lastNodeErrors = {
+    [executionId]: createRequiredInputMissingNodeError(inputName)
+  }
+}
diff --git a/src/utils/__tests__/litegraphTestUtils.ts b/src/utils/__tests__/litegraphTestUtils.ts
index 77b8e2ef6f..56b11d4737 100644
--- a/src/utils/__tests__/litegraphTestUtils.ts
+++ b/src/utils/__tests__/litegraphTestUtils.ts
@@ -179,8 +179,12 @@ export function createMockNodeInputSlot(
   overrides: Partial<INodeInputSlot> = {}
 ): INodeInputSlot {
   return {
+    name: 'input',
+    type: '*',
+    boundingRect: [0, 0, 0, 0],
+    link: null,
     ...overrides
-  } as INodeInputSlot
+  }
 }
 
 /**
@@ -190,8 +194,12 @@ export function createMockNodeOutputSlot(
   overrides: Partial<INodeOutputSlot> = {}
 ): INodeOutputSlot {
   return {
+    name: 'output',
+    type: '*',
+    boundingRect: [0, 0, 0, 0],
+    links: null,
     ...overrides
-  } as INodeOutputSlot
+  }
 }
 
 /**
diff --git a/src/utils/categoryUtil.test.ts b/src/utils/categoryUtil.test.ts
index dede54c0e9..9e06ba1e05 100644
--- a/src/utils/categoryUtil.test.ts
+++ b/src/utils/categoryUtil.test.ts
@@ -28,6 +28,7 @@ describe('getProviderIcon', () => {
   it('returns icon class for simple provider name', () => {
     expect(getProviderIcon('BFL')).toBe('icon-[comfy--bfl]')
     expect(getProviderIcon('OpenAI')).toBe('icon-[comfy--openai]')
+    expect(getProviderIcon('Anthropic')).toBe('icon-[comfy--anthropic]')
   })
 
   it('converts spaces to hyphens', () => {
@@ -47,6 +48,7 @@ describe('getProviderBorderStyle', () => {
     expect(getProviderBorderStyle('BFL')).toBe('#ffffff')
     expect(getProviderBorderStyle('OpenAI')).toBe('#B6B6B6')
     expect(getProviderBorderStyle('Bria')).toBe('#B6B6B6')
+    expect(getProviderBorderStyle('Anthropic')).toBe('#D97757')
   })
 
   it('returns gradient for dual-color providers', () => {
diff --git a/src/utils/categoryUtil.ts b/src/utils/categoryUtil.ts
index 240713e50b..876a3c5192 100644
--- a/src/utils/categoryUtil.ts
+++ b/src/utils/categoryUtil.ts
@@ -56,6 +56,7 @@ export const getCategoryIcon = (categoryId: string): string => {
  * Each entry can be a single color or [color1, color2] for gradient.
  */
 const PROVIDER_COLORS: Record<string, string | [string, string]> = {
+  anthropic: '#D97757',
   bfl: '#ffffff',
   bria: '#B6B6B6',
   elevenlabs: '#B6B6B6',
diff --git a/src/utils/colorUtil.test.ts b/src/utils/colorUtil.test.ts
index b0c9672f6f..c1a3746124 100644
--- a/src/utils/colorUtil.test.ts
+++ b/src/utils/colorUtil.test.ts
@@ -218,7 +218,7 @@ describe('colorUtil conversions', () => {
   })
 
   describe('parseToRgb edge cases', () => {
-    it.each(['', 'not-a-color', '#GGGGGG', 'cmky(1,2,3,4)'])(
+    it.for(['', 'not-a-color', '#GGGGGG', 'cmky(1,2,3,4)'])(
       'returns black for unrecognized input %s',
       (input) => {
         expect(parseToRgb(input)).toEqual({ r: 0, g: 0, b: 0 })
@@ -309,8 +309,8 @@ describe('colorUtil - adjustColor', () => {
     })
   }
 
-  describe.each(Object.entries(colors))('%s color', (_colorName, color) => {
-    describe.each(formats)('%s format', (format) => {
+  describe.for(Object.entries(colors))('%s color', ([_colorName, color]) => {
+    describe.for(formats)('%s format', (format) => {
       runAdjustColorTests(color, format as ColorFormat)
     })
   })
diff --git a/src/utils/hostWhitelist.test.ts b/src/utils/hostWhitelist.test.ts
index 9cf71b6a54..bb634b2131 100644
--- a/src/utils/hostWhitelist.test.ts
+++ b/src/utils/hostWhitelist.test.ts
@@ -4,7 +4,7 @@ import { isHostWhitelisted, normalizeHost } from '@/utils/hostWhitelist'
 
 describe('hostWhitelist utils', () => {
   describe('normalizeHost', () => {
-    it.each([
+    it.for([
       ['LOCALHOST', 'localhost'],
       ['localhost.', 'localhost'], // trims trailing dot
       ['localhost:5173', 'localhost'], // strips :port
@@ -17,7 +17,7 @@ describe('hostWhitelist utils', () => {
       ['example.com.', 'example.com'], // trims trailing dot
       ['[2001:db8::1]:8443', '2001:db8::1'], // IPv6 with brackets+port
       ['2001:db8::1', '2001:db8::1'] // plain IPv6 stays
-    ])('normalizeHost(%o) -> %o', (input, expected) => {
+    ])('normalizeHost(%o) -> %o', ([input, expected]) => {
       expect(normalizeHost(input)).toBe(expected)
     })
 
@@ -29,7 +29,7 @@ describe('hostWhitelist utils', () => {
 
   describe('isHostWhitelisted', () => {
     describe('localhost label', () => {
-      it.each([
+      it.for([
         'localhost',
         'LOCALHOST',
         'localhost.',
@@ -42,7 +42,7 @@ describe('hostWhitelist utils', () => {
         expect(isHostWhitelisted(input)).toBe(true)
       })
 
-      it.each([
+      it.for([
         'localhost.com',
         'evil-localhost',
         'notlocalhost',
@@ -53,7 +53,7 @@ describe('hostWhitelist utils', () => {
     })
 
     describe('IPv4 127/8 loopback', () => {
-      it.each([
+      it.for([
         '127.0.0.1',
         '127.1.2.3',
         '127.255.255.255',
@@ -64,7 +64,7 @@ describe('hostWhitelist utils', () => {
         expect(isHostWhitelisted(input)).toBe(true)
       })
 
-      it.each([
+      it.for([
         '126.0.0.1',
         '127.256.0.1',
         '127.-1.0.1',
@@ -82,7 +82,7 @@ describe('hostWhitelist utils', () => {
     })
 
     describe('IPv6 loopback ::1 (all textual forms)', () => {
-      it.each([
+      it.for([
         '::1',
         '[::1]',
         '[::1]:5173',
@@ -97,7 +97,7 @@ describe('hostWhitelist utils', () => {
         expect(isHostWhitelisted(input)).toBe(true)
       })
 
-      it.each([
+      it.for([
         '::2',
         '::',
         '::0',
@@ -121,7 +121,7 @@ describe('hostWhitelist utils', () => {
     })
 
     describe('comfy.org hosts', () => {
-      it.each([
+      it.for([
         'staging.comfy.org',
         'stagingcloud.comfy.org',
         'pr-123.testingcloud.comfy.org',
@@ -130,7 +130,7 @@ describe('hostWhitelist utils', () => {
         expect(isHostWhitelisted(input)).toBe(true)
       })
 
-      it.each([
+      it.for([
         'comfy.org.evil.com',
         'evil-comfy.org',
         'comfy.organization',
diff --git a/src/utils/litegraphUtil.test.ts b/src/utils/litegraphUtil.test.ts
index fecea538f2..67e67947e9 100644
--- a/src/utils/litegraphUtil.test.ts
+++ b/src/utils/litegraphUtil.test.ts
@@ -1,9 +1,20 @@
-import { describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
+import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { createTestSubgraph } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
 
-import { resolveNode } from './litegraphUtil'
+import { createNode, resolveNode } from './litegraphUtil'
+
+const mockBringNodeToFront = vi.fn()
+
+vi.mock('@/renderer/extensions/vueNodes/composables/useNodeZIndex', () => ({
+  useNodeZIndex: () => ({ bringNodeToFront: mockBringNodeToFront })
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({ addAlert: vi.fn() })
+}))
 
 describe('resolveNode', () => {
   it('returns undefined when graph is null', () => {
@@ -68,3 +79,66 @@ describe('resolveNode', () => {
     expect(resolveNode(targetNode.id, rootGraph)).toBe(targetNode)
   })
 })
+
+describe('createNode', () => {
+  function makeCanvas(graph: LGraph): LGraphCanvas {
+    return {
+      graph,
+      graph_mouse: [100, 200] as [number, number]
+    } as Partial<LGraphCanvas> as LGraphCanvas
+  }
+
+  beforeEach(() => {
+    mockBringNodeToFront.mockClear()
+  })
+
+  it('returns null when name is empty', async () => {
+    const result = await createNode(makeCanvas(new LGraph()), '')
+    expect(result).toBeNull()
+    expect(mockBringNodeToFront).not.toHaveBeenCalled()
+  })
+
+  it('places the new node at the canvas graph_mouse position', async () => {
+    const newNode = new LGraphNode('LoadImage')
+    const spy = vi.spyOn(LiteGraph, 'createNode').mockReturnValue(newNode)
+    const graph = new LGraph()
+
+    const result = await createNode(makeCanvas(graph), 'LoadImage')
+
+    expect(result).toBe(newNode)
+    expect(Array.from(newNode.pos)).toEqual([100, 200])
+    spy.mockRestore()
+  })
+
+  it('brings the new node to front so it renders above existing nodes', async () => {
+    const newNode = new LGraphNode('LoadImage')
+    const spy = vi.spyOn(LiteGraph, 'createNode').mockReturnValue(newNode)
+    const graph = new LGraph()
+
+    const result = await createNode(makeCanvas(graph), 'LoadImage')
+
+    expect(result).toBe(newNode)
+    expect(mockBringNodeToFront).toHaveBeenCalledTimes(1)
+    expect(mockBringNodeToFront).toHaveBeenCalledWith(newNode.id)
+    spy.mockRestore()
+  })
+
+  it('does not bring node to front when LiteGraph.createNode returns null', async () => {
+    const spy = vi.spyOn(LiteGraph, 'createNode').mockReturnValue(null)
+    await createNode(makeCanvas(new LGraph()), 'NonexistentNode')
+    expect(mockBringNodeToFront).not.toHaveBeenCalled()
+    spy.mockRestore()
+  })
+
+  it('does not bring node to front when graph.add returns null', async () => {
+    const newNode = new LGraphNode('LoadImage')
+    const spy = vi.spyOn(LiteGraph, 'createNode').mockReturnValue(newNode)
+    const graph = new LGraph()
+    vi.spyOn(graph, 'add').mockReturnValue(null as unknown as LGraphNode)
+
+    await createNode(makeCanvas(graph), 'LoadImage')
+
+    expect(mockBringNodeToFront).not.toHaveBeenCalled()
+    spy.mockRestore()
+  })
+})
diff --git a/src/utils/litegraphUtil.ts b/src/utils/litegraphUtil.ts
index e140d5a7df..e794db591f 100644
--- a/src/utils/litegraphUtil.ts
+++ b/src/utils/litegraphUtil.ts
@@ -24,6 +24,7 @@ import type {
 import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useNodeZIndex } from '@/renderer/extensions/vueNodes/composables/useNodeZIndex'
 import { app } from '@/scripts/app'
 import { t } from '@/i18n'
 
@@ -57,7 +58,10 @@ export async function createNode(
     newNode.pos = [posX, posY]
     const addedNode = graph.add(newNode) ?? null
 
-    if (addedNode) graph.change()
+    if (addedNode) {
+      useNodeZIndex().bringNodeToFront(addedNode.id)
+      graph.change()
+    }
     return addedNode
   } else {
     useToastStore().addAlert(t('assetBrowser.failedToCreateNode'))
diff --git a/src/utils/migration/migrateReroute.test.ts b/src/utils/migration/migrateReroute.test.ts
index a6fa00bf6a..d80bc125de 100644
--- a/src/utils/migration/migrateReroute.test.ts
+++ b/src/utils/migration/migrateReroute.test.ts
@@ -14,7 +14,7 @@ describe('migrateReroute', () => {
       return JSON.parse(fileContent) as WorkflowJSON04
     }
 
-    it.each([
+    it.for([
       'branching.json',
       'single_connected.json',
       'floating.json',
diff --git a/src/views/GraphView.test.ts b/src/views/GraphView.test.ts
new file mode 100644
index 0000000000..a1fc5242c2
--- /dev/null
+++ b/src/views/GraphView.test.ts
@@ -0,0 +1,214 @@
+import { createTestingPinia } from '@pinia/testing'
+import { render } from '@testing-library/vue'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import type * as VueUseCore from '@vueuse/core'
+import { useReconnectQueueRefresh } from '@/composables/useReconnectQueueRefresh'
+import { useReconnectingNotification } from '@/composables/useReconnectingNotification'
+import type * as DistTypes from '@/platform/distribution/types'
+import type * as I18nModule from '@/i18n'
+
+const apiMock = vi.hoisted(() => new EventTarget())
+
+vi.mock('@/scripts/api', () => ({ api: apiMock }))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: { getNodeById: vi.fn(), nodes: [] },
+    ui: {
+      menuContainer: { style: { setProperty: vi.fn() } },
+      restoreMenuPosition: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/composables/useReconnectQueueRefresh', () => {
+  const refreshOnReconnect = vi.fn(async () => {})
+  return { useReconnectQueueRefresh: () => refreshOnReconnect }
+})
+
+vi.mock('@/composables/useReconnectingNotification', () => {
+  const onReconnected = vi.fn()
+  const onReconnecting = vi.fn()
+  return {
+    useReconnectingNotification: () => ({ onReconnected, onReconnecting })
+  }
+})
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const actual = await importOriginal<typeof VueUseCore>()
+  return { ...actual, useIntervalFn: vi.fn(() => ({ pause: vi.fn() })) }
+})
+
+vi.mock('@/base/common/async', () => ({ runWhenGlobalIdle: vi.fn() }))
+vi.mock('@/composables/useBrowserTabTitle', () => ({
+  useBrowserTabTitle: vi.fn()
+}))
+vi.mock('@/composables/useCoreCommands', () => ({ useCoreCommands: () => [] }))
+vi.mock('@/platform/remote/comfyui/useQueuePolling', () => ({
+  useQueuePolling: vi.fn()
+}))
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    wrapWithErrorHandling: (f: unknown) => f,
+    wrapWithErrorHandlingAsync: (f: unknown) => f
+  })
+}))
+vi.mock('@/composables/useProgressFavicon', () => ({
+  useProgressFavicon: vi.fn()
+}))
+vi.mock('@/i18n', async (importOriginal) => {
+  const actual = await importOriginal<typeof I18nModule>()
+  return { ...actual, loadLocale: vi.fn().mockResolvedValue(undefined) }
+})
+vi.mock('@/platform/distribution/types', async (importOriginal) => {
+  const actual = await importOriginal<typeof DistTypes>()
+  return { ...actual, isCloud: false, isDesktop: false }
+})
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({ get: vi.fn(() => undefined), set: vi.fn() })
+}))
+vi.mock('@/platform/telemetry', () => ({ useTelemetry: () => undefined }))
+vi.mock('@/platform/updates/common/useFrontendVersionMismatchWarning', () => ({
+  useFrontendVersionMismatchWarning: vi.fn()
+}))
+vi.mock('@/platform/updates/common/versionCompatibilityStore', () => ({
+  useVersionCompatibilityStore: () => ({
+    initialize: vi.fn().mockResolvedValue(undefined)
+  })
+}))
+vi.mock('@/renderer/core/canvas/canvasStore', async () => {
+  const { defineStore } = await import('pinia')
+  return {
+    useCanvasStore: defineStore('canvas-test-stub', () => ({
+      linearMode: ref(false)
+    }))
+  }
+})
+vi.mock('@/services/autoQueueService', () => ({
+  setupAutoQueueHandler: vi.fn()
+}))
+vi.mock('@/platform/keybindings/keybindingService', () => ({
+  useKeybindingService: () => ({
+    registerCoreKeybindings: vi.fn(),
+    keybindHandler: vi.fn()
+  })
+}))
+vi.mock('@/composables/useAppMode', () => ({
+  useAppMode: () => ({ isBuilderMode: ref(false) })
+}))
+vi.mock('@/stores/assetsStore', () => ({
+  useAssetsStore: () => ({ updateHistory: vi.fn() })
+}))
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({ registerCommands: vi.fn() })
+}))
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: () => ({
+    bindExecutionEvents: vi.fn(),
+    unbindExecutionEvents: vi.fn(),
+    activeJobId: null,
+    clearActiveJobIfStale: vi.fn()
+  })
+}))
+vi.mock('@/stores/authStore', () => ({
+  useAuthStore: () => ({ isAuthenticated: false })
+}))
+vi.mock('@/stores/menuItemStore', () => ({
+  useMenuItemStore: () => ({ registerCoreMenuCommands: vi.fn() })
+}))
+vi.mock('@/stores/modelStore', () => ({ useModelStore: () => ({}) }))
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({}),
+  useNodeFrequencyStore: () => ({})
+}))
+vi.mock('@/stores/queueStore', () => ({
+  useQueueStore: () => ({
+    update: vi.fn(),
+    runningTasks: [],
+    pendingTasks: [],
+    tasks: [],
+    maxHistoryItems: 64
+  }),
+  useQueuePendingTaskCountStore: () => ({ update: vi.fn() })
+}))
+vi.mock('@/stores/serverConfigStore', () => ({
+  useServerConfigStore: () => ({})
+}))
+vi.mock('@/stores/workspace/bottomPanelStore', () => ({
+  useBottomPanelStore: () => ({
+    registerCoreBottomPanelTabs: vi.fn().mockResolvedValue(undefined)
+  })
+}))
+vi.mock('@/stores/workspace/colorPaletteStore', () => ({
+  useColorPaletteStore: () => ({
+    completedActivePalette: { light_theme: true, colors: { comfy_base: {} } }
+  })
+}))
+vi.mock('@/stores/workspace/sidebarTabStore', () => ({
+  useSidebarTabStore: () => ({
+    registerCoreSidebarTabs: vi.fn(),
+    activeSidebarTabId: null
+  })
+}))
+vi.mock('@/utils/envUtil', () => ({
+  electronAPI: () => ({
+    changeTheme: vi.fn(),
+    Events: { incrementUserProperty: vi.fn(), trackEvent: vi.fn() }
+  })
+}))
+
+// Module-mock heavy child components so we don't pay their import cost.
+const stubModule = { default: { template: '<div />' } }
+vi.mock('@/components/graph/GraphCanvas.vue', () => stubModule)
+vi.mock('@/views/LinearView.vue', () => stubModule)
+vi.mock('@/components/builder/BuilderToolbar.vue', () => stubModule)
+vi.mock('@/components/builder/BuilderMenu.vue', () => stubModule)
+vi.mock('@/components/builder/BuilderFooterToolbar.vue', () => stubModule)
+vi.mock(
+  '@/workbench/extensions/manager/components/ManagerProgressToast.vue',
+  () => stubModule
+)
+vi.mock(
+  '@/platform/cloud/notification/components/DesktopCloudNotificationController.vue',
+  () => stubModule
+)
+vi.mock(
+  '@/platform/assets/components/ModelImportProgressDialog.vue',
+  () => stubModule
+)
+vi.mock(
+  '@/platform/assets/components/AssetExportProgressDialog.vue',
+  () => stubModule
+)
+vi.mock(
+  '@/platform/workspace/components/toasts/InviteAcceptedToast.vue',
+  () => stubModule
+)
+vi.mock('@/components/toast/GlobalToast.vue', () => stubModule)
+vi.mock('@/components/toast/RerouteMigrationToast.vue', () => stubModule)
+vi.mock('@/components/MenuHamburger.vue', () => stubModule)
+vi.mock('@/components/dialog/UnloadWindowConfirmDialog.vue', () => stubModule)
+
+describe('GraphView - reconnect wiring', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('wires the reconnected event to the toast and queue refresh', async () => {
+    const GraphView = (await import('./GraphView.vue')).default
+    render(GraphView)
+
+    apiMock.dispatchEvent(new Event('reconnected'))
+
+    const { onReconnected } = useReconnectingNotification()
+    const refreshOnReconnect = useReconnectQueueRefresh()
+    await vi.waitFor(() => {
+      expect(onReconnected).toHaveBeenCalledTimes(1)
+      expect(refreshOnReconnect).toHaveBeenCalledTimes(1)
+    })
+  })
+})
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index f9f42823c7..e9b16fd8b1 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -56,11 +56,12 @@ import { useBrowserTabTitle } from '@/composables/useBrowserTabTitle'
 import { useCoreCommands } from '@/composables/useCoreCommands'
 import { useQueuePolling } from '@/platform/remote/comfyui/useQueuePolling'
 import { useErrorHandling } from '@/composables/useErrorHandling'
+import { useReconnectQueueRefresh } from '@/composables/useReconnectQueueRefresh'
 import { useReconnectingNotification } from '@/composables/useReconnectingNotification'
 import { useProgressFavicon } from '@/composables/useProgressFavicon'
 import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
 import type { ServerConfig, ServerConfigValue } from '@/constants/serverConfig'
-import { i18n, loadLocale } from '@/i18n'
+import { setActiveLocale } from '@/i18n'
 import AssetExportProgressDialog from '@/platform/assets/components/AssetExportProgressDialog.vue'
 import ModelImportProgressDialog from '@/platform/assets/components/ModelImportProgressDialog.vue'
 import DesktopCloudNotificationController from '@/platform/cloud/notification/components/DesktopCloudNotificationController.vue'
@@ -189,15 +190,17 @@ watchEffect(() => {
 
 watchEffect(async () => {
   const locale = settingStore.get('Comfy.Locale')
-  if (locale) {
-    // Load the locale dynamically if not already loaded
-    try {
-      await loadLocale(locale)
-      // Type assertion is safe here as loadLocale validates the locale exists
-      i18n.global.locale.value = locale as typeof i18n.global.locale.value
-    } catch (error) {
-      console.error(`Failed to switch to locale "${locale}":`, error)
+  if (!locale) return
+  try {
+    const resolved = await setActiveLocale(locale)
+    // Self-heal: a stored value from an older build (e.g. 'de') would otherwise
+    // leave the language dropdown — derived from SUPPORTED_LOCALE_OPTIONS —
+    // showing nothing selected until the user picks one manually.
+    if (resolved !== locale) {
+      await settingStore.set('Comfy.Locale', resolved)
     }
+  } catch (error) {
+    console.error(`Failed to switch to locale "${locale}":`, error)
   }
 })
 
@@ -248,11 +251,17 @@ const onExecutionSuccess = async () => {
 }
 
 const { onReconnecting, onReconnected } = useReconnectingNotification()
+const refreshOnReconnect = useReconnectQueueRefresh()
+
+const handleReconnected = async () => {
+  onReconnected()
+  await refreshOnReconnect()
+}
 
 useEventListener(api, 'status', onStatus)
 useEventListener(api, 'execution_success', onExecutionSuccess)
 useEventListener(api, 'reconnecting', onReconnecting)
-useEventListener(api, 'reconnected', onReconnected)
+useEventListener(api, 'reconnected', handleReconnected)
 
 onMounted(() => {
   executionStore.bindExecutionEvents()
diff --git a/src/views/LinearView.vue b/src/views/LinearView.vue
index 09a041330d..86aeae5d46 100644
--- a/src/views/LinearView.vue
+++ b/src/views/LinearView.vue
@@ -147,6 +147,7 @@ function dragDrop(e: DragEvent) {
       </SplitterPanel>
       <SplitterPanel
         id="linearCenterPanel"
+        data-testid="linear-center-panel"
         :size="CENTER_PANEL_SIZE"
         class="relative flex min-w-[20vw] flex-col gap-4 text-muted-foreground outline-none"
         @drop="dragDrop"
diff --git a/src/views/UserSelectView.test.ts b/src/views/UserSelectView.test.ts
new file mode 100644
index 0000000000..a8bf0263a2
--- /dev/null
+++ b/src/views/UserSelectView.test.ts
@@ -0,0 +1,118 @@
+import { render, screen, waitFor } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import PrimeVue from 'primevue/config'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import UserSelectView from './UserSelectView.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
+
+const mockRouterPush = vi.hoisted(() => vi.fn())
+vi.mock('vue-router', () => ({
+  useRouter: () => ({ push: mockRouterPush })
+}))
+
+const userStoreMock = vi.hoisted(() => ({
+  users: [] as Array<{ userId: string; username: string }>,
+  initialize: vi.fn().mockResolvedValue(undefined),
+  createUser: vi.fn(),
+  login: vi.fn().mockResolvedValue(undefined)
+}))
+vi.mock('@/stores/userStore', () => ({
+  useUserStore: () => userStoreMock
+}))
+
+vi.mock('@/views/templates/BaseViewTemplate.vue', () => ({
+  default: {
+    name: 'BaseViewTemplate',
+    template: '<div><slot /></div>'
+  }
+}))
+
+const mountView = () =>
+  render(UserSelectView, {
+    global: {
+      plugins: [i18n, PrimeVue]
+    }
+  })
+
+describe('UserSelectView', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    userStoreMock.users = []
+  })
+
+  it('initializes the user store on mount', async () => {
+    mountView()
+
+    await waitFor(() =>
+      expect(userStoreMock.initialize).toHaveBeenCalledTimes(1)
+    )
+  })
+
+  it('shows an error when login is attempted without a selection', async () => {
+    mountView()
+
+    await userEvent.click(
+      screen.getByRole('button', { name: 'userSelect.next' })
+    )
+
+    expect(await screen.findByText('No user selected')).toBeInTheDocument()
+    expect(userStoreMock.login).not.toHaveBeenCalled()
+    expect(mockRouterPush).not.toHaveBeenCalled()
+  })
+
+  it('creates a new user, logs in, and navigates home', async () => {
+    const newUser = { userId: 'u1', username: 'bob' }
+    userStoreMock.createUser.mockResolvedValueOnce(newUser)
+    mountView()
+
+    await userEvent.type(
+      screen.getByPlaceholderText('userSelect.enterUsername'),
+      'bob'
+    )
+    await userEvent.click(
+      screen.getByRole('button', { name: 'userSelect.next' })
+    )
+
+    expect(userStoreMock.createUser).toHaveBeenCalledWith('bob')
+    expect(userStoreMock.login).toHaveBeenCalledWith(newUser)
+    expect(mockRouterPush).toHaveBeenCalledWith('/')
+  })
+
+  it('shows an error when the entered username already exists', async () => {
+    userStoreMock.users = [{ userId: 'u1', username: 'bob' }]
+    mountView()
+
+    await userEvent.type(
+      screen.getByPlaceholderText('userSelect.enterUsername'),
+      'bob'
+    )
+
+    expect(
+      await screen.findByText('User "bob" already exists')
+    ).toBeInTheDocument()
+  })
+
+  it('surfaces createUser failures as a login error', async () => {
+    userStoreMock.createUser.mockRejectedValueOnce(new Error('boom'))
+    mountView()
+
+    await userEvent.type(
+      screen.getByPlaceholderText('userSelect.enterUsername'),
+      'bob'
+    )
+    await userEvent.click(
+      screen.getByRole('button', { name: 'userSelect.next' })
+    )
+
+    expect(await screen.findByText('boom')).toBeInTheDocument()
+    expect(userStoreMock.login).not.toHaveBeenCalled()
+    expect(mockRouterPush).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/views/UserSelectView.vue b/src/views/UserSelectView.vue
index 38e6bcea4a..fae042a46a 100644
--- a/src/views/UserSelectView.vue
+++ b/src/views/UserSelectView.vue
@@ -89,8 +89,6 @@ const login = async () => {
 onMounted(async () => {
   document.getElementById('splash-loader')?.remove()
 
-  if (!userStore.initialized) {
-    await userStore.initialize()
-  }
+  await userStore.initialize()
 })
 </script>
diff --git a/src/workbench/extensions/manager/components/manager/ManagerDialog.vue b/src/workbench/extensions/manager/components/manager/ManagerDialog.vue
index bf4e115f2c..67903c5205 100644
--- a/src/workbench/extensions/manager/components/manager/ManagerDialog.vue
+++ b/src/workbench/extensions/manager/components/manager/ManagerDialog.vue
@@ -14,16 +14,21 @@
     </template>
 
     <template #header>
-      <div class="flex w-full items-center justify-between gap-2">
+      <div
+        :ref="primeVueOverlay.overlayScopeRef"
+        class="flex w-full items-center justify-between gap-2"
+      >
         <div class="flex w-full items-center gap-2">
           <SingleSelect
             v-model="searchMode"
             class="min-w-34"
             :options="filterOptions"
+            :content-style="selectContentStyle"
           />
           <SearchAutocomplete
             v-model="searchQuery"
             :suggestions="suggestions"
+            :content-style="selectContentStyle"
             :placeholder="$t('manager.searchPlaceholder')"
             option-label="query"
             autofocus
@@ -87,6 +92,7 @@
           v-model="sortField"
           :label="$t('g.sort')"
           :options="availableSortOptions"
+          :content-style="selectContentStyle"
           class="w-48"
         >
           <template #icon>
@@ -163,6 +169,7 @@ import Button from '@/components/ui/button/Button.vue'
 import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
 import LeftSidePanel from '@/components/widget/panel/LeftSidePanel.vue'
 import { useExternalLink } from '@/composables/useExternalLink'
+import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
 import type { components } from '@/types/comfyRegistryTypes'
@@ -197,6 +204,8 @@ const { initialTab, initialPackId, onClose } = defineProps<{
 provide(OnCloseKey, onClose)
 
 const { t } = useI18n()
+const primeVueOverlay = usePrimeVueOverlayChildStyle()
+const selectContentStyle = primeVueOverlay.contentStyle
 const { buildDocsUrl } = useExternalLink()
 const comfyManagerStore = useComfyManagerStore()
 const { getPackById } = useComfyRegistryStore()
diff --git a/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
index 035d56c242..8a8ddcb067 100644
--- a/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
+++ b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
@@ -1,6 +1,7 @@
 import { createTestingPinia } from '@pinia/testing'
 import ProgressSpinner from 'primevue/progressspinner'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
 
 import { render, screen } from '@testing-library/vue'
 
@@ -56,7 +57,8 @@ vi.mock('@vueuse/core', () => ({
   createSharedComposable: vi.fn((fn) => {
     let cached: ReturnType<typeof fn>
     return (...args: Parameters<typeof fn>) => (cached ??= fn(...args))
-  })
+  }),
+  useDocumentVisibility: vi.fn(() => ref<'visible' | 'hidden'>('visible'))
 }))
 
 vi.mock('@/config', () => ({
diff --git a/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts b/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
index 0c45c2d493..4a9307d532 100644
--- a/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
@@ -61,7 +61,7 @@ const _useWorkflowPacks = () => {
 
     // Check if node is a core node
     const nodeDef = nodeDefStore.nodeDefsByName[nodeName]
-    if (nodeDef?.nodeSource.type === 'core') {
+    if (nodeDef?.isCoreNode) {
       if (!systemStatsStore.systemStats) {
         await systemStatsStore.refetchSystemStats()
       }
diff --git a/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts b/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
index 1571624b33..fc8e00d549 100644
--- a/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
+++ b/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
@@ -340,7 +340,7 @@ describe('useComfyManagerStore', () => {
   ]
 
   describe('isPackEnabled', () => {
-    it.each(testCases)(
+    it.for(testCases)(
       '$expectState when $desc',
       async ({ installed, expectState, packName }) => {
         packName ??= 'name'